Try to fix some of the build problems, it still bumms out on:

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

diff --git a/acinclude.m4 b/acinclude.m4
index 9309a523c1b490326c7b73e45ea9353d338baac2..7409bd7067057dc1e4a5b6535a85c3029f368dc3 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -493,25 +493,7 @@ and did you also install that package?]]))
        # libpcap.
        #
        ac_save_LIBS="$LIBS"
-       AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
        LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
-       AC_TRY_LINK(
-          [
-#      include <stdio.h>
-       extern char *pcap_version;
-          ],
-          [
-       printf ("%s\n", pcap_version);
-          ],
-          ac_cv_pcap_version_defined=yes,
-          ac_cv_pcap_version_defined=no,
-          [echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       if test "$ac_cv_pcap_version_defined" = yes ; then
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_PCAP_VERSION, 1, [Define if libpcap version is known])
-       else
-               AC_MSG_RESULT(no)
-       fi
        AC_CHECK_FUNCS(pcap_open_dead pcap_freecode)
        #
        # pcap_breakloop may be present in the library but not declared
@@ -1290,8 +1272,9 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
          ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
          ac_krb5_version="$ac_heimdal_version$ac_mit_version_olddir$ac_mit_version_newdir"
          if test "x$ac_krb5_version" = "xHEIMDAL"
-             KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt"
          then
+             KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt"
+         else
              KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lk5crypto -lcom_err"
          fi
          if test "x$ac_krb5_version" = "xMIT"
@@ -1544,6 +1527,13 @@ AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK],
                have_good_geoip=yes
                  ],,
                )
+               if test "x$have_good_geoip" = "xyes"; then
+                       AC_CHECK_LIB(GeoIP, GeoIP_country_name_by_ipnum_v6,
+                         [
+                               AC_DEFINE(HAVE_GEOIP_V6, 1, [Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later)])
+                         ],,
+                       )
+               fi
        else
                AC_MSG_RESULT(not required)
        fi