(Trivial) Escape a '?' in an error message.

[obnox/wireshark/wip.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 36f125c6f80c37e7b15223f074c838e640010ba8..ecc28bd7d9abf2d99f6357710d977ad3c262daec 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -69,6 +69,40 @@ case "$host_os" in
 esac
 ])
 
+#
+# AC_WIRESHARK_TIMEZONE_ABBREV
+#
+
+AC_DEFUN([AC_WIRESHARK_TIMEZONE_ABBREV],
+[
+  AC_CACHE_CHECK([for tm_zone in struct tm],
+    ac_cv_wireshark_have_tm_zone,
+    [
+      AC_TRY_COMPILE(
+        [#include <time.h>],
+        [struct tm t; t.tm_zone;],
+        ac_cv_wireshark_have_tm_zone=yes,
+        ac_cv_wireshark_have_tm_zone=no)
+    ])
+  if test $ac_cv_wireshark_have_tm_zone = yes; then
+    AC_DEFINE(HAVE_TM_ZONE, 1, [Define if tm_zone field exists in struct tm])
+  else
+    AC_CACHE_CHECK([for tzname],
+      ac_cv_wireshark_have_tzname,
+      [
+        AC_TRY_LINK(
+[#include <time.h>
+#include <stdio.h>],
+          [printf("%s", tzname[0]);],
+          ac_cv_wireshark_have_tzname=yes,
+          ac_cv_wireshark_have_tzname=no)
+      ])
+    if test $ac_cv_wireshark_have_tzname = yes; then
+      AC_DEFINE(HAVE_TZNAME, 1, [Define if tzname array exists])
+    fi
+  fi
+])
+
 
 #
 # AC_WIRESHARK_STRUCT_SA_LEN
@@ -294,10 +328,38 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
          # First, look for a pcap-config script.
          #
          AC_PATH_PROG(PCAP_CONFIG, pcap-config)
+
          if test -n "$PCAP_CONFIG" ; then
            #
-           # Found - use it to get the include flags for
-           # libpcap.
+           # Found it.
+           #
+           # Now check whether it's the libpcap 1.0 version, which
+           # put a space after "-L" - on some platforms, that doesn't
+           # work.
+           #
+           AC_MSG_CHECKING(for broken pcap-config)
+           case "`\"$PCAP_CONFIG\" --libs`" in
+
+           "-L "*)
+             #
+             # Space after -L.  Pretend pcap-config doesn't exist.
+             #
+             AC_MSG_RESULT(yes)
+             PCAP_CONFIG=""
+             ;;
+
+           *)
+             #
+             # No space after -L.
+             #
+             AC_MSG_RESULT(no)
+             ;;
+           esac
+         fi
+         if test -n "$PCAP_CONFIG" ; then
+           #
+           # Found it, and it's usable; use it to get the include flags
+           # for libpcap.
            #
            CFLAGS="$CFLAGS `\"$PCAP_CONFIG\" --cflags`"
            CPPFLAGS="$CPPFLAGS `\"$PCAP_CONFIG\" --cflags`"
@@ -1616,6 +1678,36 @@ AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK],
        fi
 ])
 
+#AC_WIRESHARK_GCC_LDFLAGS_CHECK
+#
+# $1 : ldflag(s) to test
+#
+# The macro first determines if the compiler is GCC. Then compile with the
+# defined ldflags. The defined flags are added to LDFLAGS only if the
+# compilation succeeds.
+#
+AC_DEFUN([AC_WIRESHARK_GCC_LDFLAGS_CHECK],
+[GCC_OPTION="$1"
+AC_MSG_CHECKING(whether we can add $GCC_OPTION to LDFLAGS)
+if test "x$GCC" != "x"; then
+  LDFLAGS_saved="$CFLAGS"
+  LDFLAGS="$LDFLAGS $GCC_OPTION"
+  AC_LINK_IFELSE([
+    AC_LANG_SOURCE([[
+               main() { return; }
+                  ]])],
+                  [
+                    AC_MSG_RESULT(yes)
+                  ],
+                  [
+                    AC_MSG_RESULT(no)
+                    LDFLAGS="$LDFLAGS_saved"
+                  ])
+else
+  AC_MSG_RESULT(no)
+fi
+])
+
 #
 # AC_WIRESHARK_GCC_CFLAGS_CHECK
 #