Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple

[obnox/wireshark/wip.git] / configure.in

diff --git a/configure.in b/configure.in
index 75f7d9a6d79d4e2082467836d890b409f68bd2b8..27de1d7ab4f543dbdcb677e732a296394f2d3322 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -654,6 +654,17 @@ datafiledir=`(
 )`
 AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data])
 
+# Create DOC_DIR #define for config.h
+docdir=`(
+    test "x$prefix" = xNONE && prefix=$ac_default_prefix
+    test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
+    # Ugly hack, but I don't see how this problem can be solved
+    # properly that DOC_DIR had a value starting with
+    # "${prefix}/" instead of e.g. "/usr/local/"
+    eval eval echo "$docdir"
+)`
+AC_DEFINE_UNQUOTED(DOC_DIR, "$docdir", [Directory for docs])
+
 # GTK checks; we require GTK+ 2.4 or later.
 # We don't add $GLIB_LIBS to LIBS, because we don't want to force all
 # programs to be built with GTK+.
@@ -663,6 +674,7 @@ if test "x$enable_wireshark" = "xyes"; then
        [
                CFLAGS="$CFLAGS $GTK_CFLAGS"
                CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+               AC_DEFINE(HAVE_GTK, 1, [Define to 1 if compiling with GTK])
        ], GTK_OK=no, gthread)
 else
        GTK_OK=no
@@ -1146,6 +1158,12 @@ else
        fi
 fi
 
+if test "x$want_zlib" != "xno" ; then
+       AC_CHECK_LIB(z, gzclearerr,
+       [
+               AC_DEFINE(HAVE_GZCLEARERR, 1, [Define if we have gzclearerr])
+       ])
+fi
 
 dnl pcre check
 AC_MSG_CHECKING(whether to use libpcre for regular expressions in dfilters)
@@ -1508,7 +1526,7 @@ AC_SUBST(GEOIP_LIBS)
 dnl Python devel Check
 AC_ARG_WITH(python,
     AC_HELP_STRING( [--with-python@<:@=DIR@:>@],
-                    [use python interpretor (installed in DIR, if supplied). @<:@default=no@:>@ (EXPERIMENTAL)]),
+                    [use python interpreter (installed in DIR, if supplied). @<:@default=yes@:>@ (EXPERIMENTAL)]),
 [
 pythondir='${libdir}/wireshark/python/${VERSION}'
 if test "x$withval" = "xno"; then
@@ -1533,7 +1551,7 @@ AC_DEFINE(WS_VAR_IMPORT, extern, [Define as the string to precede external varia
 
 AC_ARG_ENABLE(airpcap,
   AC_HELP_STRING( [--enable-airpcap],
-                  [use airpcap in wireshark.  @<:@default=no@:>@]),
+                  [use airpcap in wireshark.  @<:@default=yes@:>@]),
   enable_airpcap=$enableval
   if test x$enable_airpcap != xno; then
        AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
@@ -1736,7 +1754,8 @@ AC_ARG_ENABLE(new-packet-list,
 AC_MSG_CHECKING(if new packet list is used);
 if test "x$new_packet_list" = "xyes" ; then
        AC_MSG_RESULT(yes)
-       CFLAGS=" -DNEW_PACKET_LIST $CFLAGS"
+       AC_DEFINE(NEW_PACKET_LIST, 1,
+           [Use the new packet list code])
 else
        AC_MSG_RESULT(no)
 fi