diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-28 00:37:31 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-28 00:37:31 +0000 |
| commit | 8874c97191c120ca1dac2a0a5b2f422aa28ad2d4 (patch) | |
| tree | b611516730f708d21d91f9d3cd9f67b7035428c3 /epan/configure.in | |
| parent | 33008beffa58e754253db3bfcd093ffa5cfed285 (diff) | |
Add gtk2/glib2 handling to configure. Use --enable-gtk2 to use
gtk2 instead of gtk and glib2 instead of glib.
Right now, --enable-gtk2 will fail during compile unless
acompanied by --disable-ethereal, as ethereal does not yet
support gtk2 (but does support glib2 alone).
svn path=/trunk/; revision=6107
Diffstat (limited to 'epan/configure.in')
| -rw-r--r-- | epan/configure.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/epan/configure.in b/epan/configure.in index c3545069ca..6bc245604c 100644 --- a/epan/configure.in +++ b/epan/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.27 2002/08/17 17:53:33 gerald Exp $ +# $Id: configure.in,v 1.28 2002/08/28 00:37:29 jmayer Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -105,8 +105,14 @@ DATAFILE_DIR=`( AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$DATAFILE_DIR") AC_SUBST(DATAFILE_DIR) -# Checks for glib first, or gtk+ if not present -AM_PATH_GLIB(1.1.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule) +AC_ARG_ENABLE(gtk2, +[ --enable-gtk2 build Glib2/Gtk2+-based (t)ethereal. [default=no]],enable_gtk2=yes,enable_gtk2=no) + +if test "x$enable_gtk2" = "xyes" ; then + AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule) +else + AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule) +fi dnl Checks for header files AC_HEADER_STDC |