diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-28 00:37:31 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-28 00:37:31 +0000 |
| commit | 6e5c80fc97dec3db70dcfe6059046c8e953fbf07 (patch) | |
| tree | b611516730f708d21d91f9d3cd9f67b7035428c3 /wiretap | |
| parent | 14eba910707a719b99d22031b39d4cc8c0a48822 (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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6107 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/configure.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/wiretap/configure.in b/wiretap/configure.in index c72b9250bc..34469bb001 100644 --- a/wiretap/configure.in +++ b/wiretap/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.39 2002/08/14 14:42:42 jmayer Exp $ +# $Id: configure.in,v 1.40 2002/08/28 00:37:31 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 @@ -94,8 +94,14 @@ else esac fi -# Check for glib. -AM_PATH_GLIB(1.1.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS") +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 Look in /usr/local for header files and libraries ? AC_ARG_ENABLE(usr-local, |