fix doxygen generation
[obnox/wireshark/wip.git] / acinclude.m4
index 4f263ac2d7593cc84a7f16fb6f0df03a99066d22..6b089c4ea42e8334de1357dfad1da4fdfd3f71d2 100644 (file)
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
 dnl This file is part of the Autoconf packaging for Ethereal.
 dnl Copyright (C) 1998-2000 by Gerald Combs.
 dnl
-dnl $Id: acinclude.m4,v 1.72 2004/04/22 20:02:58 obiot Exp $
+dnl $Id$
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -92,6 +92,49 @@ if test $ac_cv_ethereal_struct_sa_len = yes; then
 fi
 ])
 
+
+dnl
+dnl Check whether a given format can be used to print 64-bit integers
+dnl
+AC_DEFUN([AC_ETHEREAL_CHECK_64BIT_FORMAT],
+[
+  AC_MSG_CHECKING([whether %$1x can be used to format 64-bit integers])
+  AC_RUN_IFELSE(
+    [
+      AC_LANG_SOURCE(
+       [[
+#        ifdef HAVE_INTTYPES_H
+         #include <inttypes.h>
+#        endif
+         #include <glibconfig.h>
+         #include <stdio.h>
+         #include <sys/types.h>
+
+         main()
+         {
+           guint64 t = 1;
+           char strbuf[16+1];
+           sprintf(strbuf, "%016$1x", t << 32);
+           if (strcmp(strbuf, "0000000100000000") == 0)
+             exit(0);
+           else
+             exit(1);
+         }
+       ]])
+    ],
+    [
+      AC_DEFINE(PRId64, "$1d", [Format for printing 64-bit signed decimal numbers])
+      AC_DEFINE(PRIo64, "$1o", [Format for printing 64-bit unsigned octal numbers])
+      AC_DEFINE(PRIx64, "$1x", [Format for printing 64-bit unsigned hexadecimal numbers])
+      AC_DEFINE(PRIu64, "$1u", [Format for printing 64-bit unsigned decimal numbers])
+      AC_MSG_RESULT(yes)
+    ],
+    [
+      AC_MSG_RESULT(no)
+      $2
+    ])
+])
+
 #
 # AC_ETHEREAL_IPV6_STACK
 #
@@ -376,9 +419,57 @@ and did you also install that package?]]))
        else
                AC_MSG_RESULT(no)
        fi
-       AC_CHECK_FUNCS(pcap_findalldevs pcap_lib_version pcap_open_dead)
-       AC_CHECK_FUNCS(pcap_datalink_val_to_name pcap_datalink_name_to_val)
-       AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink)
+       AC_CHECK_FUNCS(pcap_open_dead)
+       #
+       # Later versions of Mac OS X 10.3[.x] ship a pcap.h that
+       # doesn't define pcap_if_t but ship an 0.8[.x] libpcap,
+       # so the library has "pcap_findalldevs()", but pcap.h
+       # doesn't define "pcap_if_t" so you can't actually *use*
+       # "pcap_findalldevs()".
+       #
+       # That even appears to be true of systems shipped with
+       # 10.3.4, so it doesn't appear only to be a case of
+       # Software Update not updating header files.
+       #
+       # (You can work around this by installing the 0.8 header
+       # files.)
+       #
+       AC_CACHE_CHECK([whether pcap_findalldevs is present and usable],
+         [ac_cv_func_pcap_findalldevs],
+         [
+           AC_LINK_IFELSE(
+             [
+               AC_LANG_SOURCE(
+                 [[
+                   #include <pcap.h>
+                   main()
+                   {
+                     pcap_if_t *devpointer;
+                     char errbuf[1];
+
+                     pcap_findalldevs(&devpointer, errbuf);
+                   }
+                 ]])
+             ],
+             [
+               ac_cv_func_pcap_findalldevs=yes
+             ],
+             [
+               ac_cv_func_pcap_findalldevs=no
+             ])
+         ])
+       #
+       # Don't check for other new routines that showed up after
+       # "pcap_findalldevs()" if we don't have a usable
+       # "pcap_findalldevs()", so we don't end up using them if the
+       # "pcap.h" is crufty and old and doesn't declare them.
+       #
+       if test $ac_cv_func_pcap_findalldevs = "yes" ; then
+         AC_DEFINE(HAVE_PCAP_FINDALLDEVS, 1,
+          [Define to 1 if you have the `pcap_findalldevs' function and a pcap.h that declares pcap_if_t.])
+         AC_CHECK_FUNCS(pcap_datalink_val_to_name pcap_datalink_name_to_val)
+         AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink pcap_lib_version)
+       fi
        LIBS="$ac_save_LIBS"
 ])
 
@@ -677,9 +768,13 @@ AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
                # libraries on various platforms, such as "-ldes425"
                # in "/usr/kerberos/lib" on some versions of Red
                # Hat Linux, or "-lkstat" on Solaris.
-               # XXX - it may also require "-lcrypto" on some platforms;
-               # we should check for that as well, rather than requiring
-               # users to explicitly indicate whether it's required.
+               #
+               # It might also require "-lcrypto" on some platforms;
+               # if the user didn't specify --with-ssl, we check
+               # whether it would have made a difference and, if so,
+               # we tell the user that they needed to request it.
+               # (There are annoying licensing issues with it and
+               # GPL'ed code, so we don't include it by default.)
                #
                # XXX - autoconf really needs a way to test for
                # a given routine in a given library *and* to test
@@ -689,23 +784,64 @@ AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
                # needed after the library *and* to cache all that
                # information.
                #
+               ethereal_save_LIBS="$LIBS"
+               found_sprint_realloc_objid=no
                for extras in "" "-L/usr/kerberos/lib -ldes425" "-lkstat"
                do
-                       AC_CHECK_LIB(snmp, sprint_realloc_objid,
-                         [
-                               SNMP_LIBS="-lsnmp $extras"; break
-                         ],
-                         [
+                       LIBS="-lsnmp $extras $SOCKET_LIBS $NSL_LIBS $SSL_LIBS"
+                       if test -z "$extras"
+                       then
+                               AC_MSG_CHECKING([whether UCD SNMP includes sprint_realloc_objid])
+                       else
+                               AC_MSG_CHECKING([whether UCD SNMP includes sprint_realloc_objid (linking with $extras)])
+                       fi
+                       AC_TRY_LINK(
+                           [
+                           ],
+                           [
+                               sprint_realloc_objid();
+                           ],
+                           [
+                               #
+                               # We found "sprint_realloc_objid()",
+                               # and required the libraries in
+                               # extras as well.
+                               #
+                               AC_MSG_RESULT(yes)
+                               SNMP_LIBS="-lsnmp $extras"; break;
+                               found_sprint_realloc_objid=yes
+                               break
+                           ],
+                           [
                                #
-                               # Throw away the cached "we didn't find it"
-                               # answer, so that if we rerun "configure",
-                               # we still do all these checks and don't
-                               # just blithely assume we don't need
-                               # the extra libraries.
+                               # The link failed.  If they didn't ask
+                               # for SSL, try linking with -lcrypto
+                               # as well, and if *that* succeeds,
+                               # tell them they'll need to specify
+                               # --want-ssl.
                                #
-                               unset ac_cv_lib_snmp_sprint_realloc_objid
-                         ], $SOCKET_LIBS $NSL_LIBS $SSL_LIBS $extras)
+                               AC_MSG_RESULT(no)
+                               if test "x$want_ssl" = "xno"
+                               then
+                                       LIBS="$LIBS -lcrypto"
+                                       AC_TRY_LINK(
+                                           [
+                                           ],
+                                           [
+                                               sprint_realloc_objid();
+                                           ],
+                                           [
+                                               #
+                                               # It worked with -lcrypto; tell
+                                               # them they'll need to specify
+                                               # --with-ssl.
+                                               #
+                                               AC_MSG_ERROR([UCD SNMP requires -lcrypto but --with-ssl not specified])
+                                           ])
+                               fi
+                           ])
                done
+               LIBS="$ethereal_save_LIBS"
 
                #
                # If we didn't find "sprint_realloc_objid()", fail.
@@ -713,7 +849,7 @@ AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
                # with "sprint_realloc_objid()", or they may need to
                # specify "--with-ssl".
                #
-               if test "$ac_cv_lib_snmp_sprint_realloc_objid" = no; then
+               if test "$found_snmp_sprint_realloc_objid" = no; then
                    AC_MSG_ERROR([UCD SNMP header files found, but sprint_realloc_objid not found in SNMP library.])
                fi
 
@@ -734,47 +870,6 @@ AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
        ])
 ])
 
-#
-# AC_ETHEREAL_SSL_CHECK
-#
-AC_DEFUN([AC_ETHEREAL_SSL_CHECK],
-[
-       want_ssl=defaultyes
-
-       AC_ARG_WITH(ssl,
-changequote(<<, >>)dnl
-<<  --with-ssl[=DIR]        use SSL crypto library (located in directory DIR, if supplied).   [default=yes, if present]>>,
-changequote([, ])dnl
-       [
-       if   test "x$withval" = "xno";  then
-               want_ssl=no
-       elif test "x$withval" = "xyes"; then
-               want_ssl=yes
-       elif test -d "$withval"; then
-               want_ssl=yes
-               AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
-       fi
-       ])
-
-       if test "x$want_ssl" = "xdefaultyes"; then
-               want_ssl=yes
-               withval=/usr/local/ssl
-               if test -d "$withval"; then
-                       AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
-               fi
-       fi
-
-       if test "x$want_ssl" = "xyes"; then
-               AC_CHECK_LIB(crypto, EVP_md5,
-                 [
-                   SSL_LIBS=-lcrypto
-                 ],,
-               )
-       else
-               AC_MSG_RESULT(not required)
-       fi
-])
-
 #
 # AC_ETHEREAL_RPM_CHECK
 # Looks for the rpm program, and checks to see if we can redefine "_topdir".
@@ -860,6 +955,8 @@ changequote([, ])dnl
 #
 AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
 [
+       ethereal_save_CFLAGS="$CFLAGS"
+       ethereal_save_CPPFLAGS="$CPPFLAGS"
        if test "x$krb5_dir" != "x"
        then
          #
@@ -874,34 +971,53 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
          # as the compiler and/or linker will search that other
          # directory before it searches the specified directory.
          #
-         ethereal_save_CFLAGS="$CFLAGS"
          CFLAGS="$CFLAGS -I$krb5_dir/include"
-         ethereal_save_CPPFLAGS="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
-         ethereal_save_LIBS="$LIBS"
-         LIBS="$LIBS -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv"
-         ethereal_save_LDFLAGS="$LDFLAGS"
-         LDFLAGS="$LDFLAGS -L$krb5_dir/lib"
+         ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
+         ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+         ac_krb5_version="$ac_heimdal_version$ac_mit_version"
+         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 -lk5crypto -lcom_err"
+         fi
+         if test "x$ac_krb5_version" = "xMIT"
+         then
+         AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
+         fi
        else
          AC_PATH_PROG(KRB5_CONFIG, krb5-config) 
-         if test -x $KRB5_CONFIG
+         if test -x "$KRB5_CONFIG"
          then
-           KRB5_FLAGS=`$KRB5_CONFIG --cflags`
+           KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
+           KRB5_LIBS=`"$KRB5_CONFIG" --libs`
            CFLAGS="$CFLAGS $KRB5_FLAGS"
-            CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
-           KRB5_LIBS=`$KRB5_CONFIG --libs`
-           # Looks like krb5-config is lacking -lresolv on some systems
-           AC_MSG_CHECKING(whether library list looks OK)
-           if echo "$KRB5_LIBS" | grep resolv >/dev/null
-           then
-               AC_MSG_RESULT(yes)
-           else
-               KRB5_LIBS="$KRB5_LIBS -lresolv"
-               AC_MSG_RESULT(Adding -lresolv to libs)
-           fi
-
-           LIBS="$LIBS $KRB5_LIBS"
-           ac_krb5_version=`$KRB5_CONFIG --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
+           CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
+           #
+           # If -lcrypto is in KRB5_FLAGS, we require it to build
+           # with Heimdal/MIT.  We don't want to built with it by
+           # default, due to annoying license incompatibilities
+           # between the OpenSSL license and the GPL, so:
+           #
+           #   if SSL_LIBS is set to a non-empty string, we
+           #   remove -lcrypto from KRB5_LIBS and replace
+           #   it with SSL_LIBS;
+           #
+           #   if SSL_LIBS is not set to a non-empty string
+           #   we fail with an appropriate error message.
+           #
+           case "$KRB5_LIBS" in
+           *-lcrypto*)
+               if test ! -z "$SSL_LIBS"
+               then
+                   KRB5_LIBS=`echo $KRB5_LIBS | sed 's/-lcrypto//'`
+                   KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
+               else
+                   AC_MSG_ERROR([Kerberos library requires -lcrypto but --with-ssl not specified])
+               fi
+               ;;
+           esac
+           ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed -e 's/^.*heimdal.*$/HEIMDAL/' -e 's/^Kerberos .*$/MIT/'`
          fi
        fi
 
@@ -935,48 +1051,132 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
                # library, as it's probably not present.
                #
                want_krb5=no
+               AC_MSG_RESULT(No Heimdal or MIT header found - disabling dissection for some kerberos data in packet decoding)
              fi
            fi
          ])
 
-       if test "x$want_krb5" != "xno" -a "x$ac_krb5_version" = "xHEIMDAL"
+       if test "x$want_krb5" != "xno"
        then
+           #
+           # Well, we at least have the krb5 header file.
+           # Check whether this is Heimdal or MIT.
+           #
+           AC_MSG_CHECKING(whether the Kerberos library is Heimdal or MIT)
+           if test "x$ac_krb5_version" = "xHEIMDAL" -o "x$ac_krb5_version" = "xMIT"
+           then
                #
-               # Well, we at least have the krb5 header file.
+               # Yes.
+               # Check whether we have krb5_kt_resolve - and whether
+               # we need to link with -lresolv when linking with
+               # the Kerberos library.
                #
-               AC_CHECK_LIB(krb5, krb5_kt_resolve,
-               [
-                       if test "x$krb5_dir" != "x"
-                       then
-                               #
-                               # Put the "-I" and "-L" flags for pcre at
-                               # the beginning of CFLAGS, CPPFLAGS,
-                               # LDFLAGS, and LIBS.
-                               #
-                               KRB5_LIBS="-L$krb5_dir/lib $KRB5_LIBS"
-                       fi
-                       AC_DEFINE(HAVE_KERBEROS, 1, [Define to use kerberos])
-                       AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define to use heimdal kerberos])
-               ],[
-                       if test "x$krb5_dir" != "x"
-                       then
-                               #
-                               # Restore the versions of CFLAGS, CPPFLAGS,
-                               # LDFLAGS, and LIBS before we added the
-                               # "--with-krb5=" directory, as we didn't
-                               # actually find kerberos there.
-                               #
-                               CFLAGS="$ethereal_save_CFLAGS"
-                               CPPFLAGS="$ethereal_save_CPPFLAGS"
-                               LDFLAGS="$ethereal_save_LDFLAGS"
-                               LIBS="$ethereal_save_LIBS"
-                               KRB5_LIBS=""
-                       fi
+               AC_MSG_RESULT($ac_krb5_version)
+               ethereal_save_LIBS="$LIBS"
+               found_krb5_kt_resolve=no
+               for extras in "" "-lresolv"
+               do
+                   LIBS="$KRB5_LIBS $extras"
+                   if test -z "$extras"
+                   then
+                       AC_MSG_CHECKING([whether $ac_krb5_version includes krb5_kt_resolve])
+                   else
+                       AC_MSG_CHECKING([whether $ac_krb5_version includes krb5_kt_resolve (linking with $extras)])
+                   fi
+                   AC_TRY_LINK(
+                       [
+                       ],
+                       [
+                           krb5_kt_resolve();
+                       ],
+                       [
+                           #
+                           # We found "krb5_kt_resolve()", and required
+                           # the libraries in extras as well.
+                           #
+                           AC_MSG_RESULT(yes)
+                           KRB5_LIBS="$LIBS"
+                           AC_DEFINE(HAVE_KERBEROS, 1, [Define to use kerberos])
+                           if test "x$ac_krb5_version" = "xHEIMDAL"
+                           then
+                               AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define to use heimdal kerberos])
+                           fi
+                           if test "x$ac_krb5_version" = "xMIT"
+                           then
+                               AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
+                           fi
+                           found_krb5_kt_resolve=yes
+                           break
+                       ],
+                       [
+                           AC_MSG_RESULT(no)
+                       ])
+               done
+               if test "$found_krb5_kt_resolve" = no
+               then
+                   #
+                   # We didn't find "krb5_kt_resolve()" in the
+                   # Kerberos library, even when we tried linking
+                   # with -lresolv; we can't link with kerberos.
+                   #
+                   if test "x$want_krb5" = "xyes"
+                   then
+                       #
+                       # The user tried to force us to use the library,
+                       # but we can't do so; report an error.
+                       #
+                       AC_MSG_ERROR(Usable $ac_krb5_version not found)
+                   else
+                       #
+                       # Restore the versions of CFLAGS and CPPFLAGS
+                       # from before we added the flags for Kerberos.
+                       #
+                       AC_MSG_RESULT(Usable $ac_krb5_version not found - disabling dissection for some kerberos data in packet decoding)
+                       CFLAGS="$ethereal_save_CFLAGS"
+                       CPPFLAGS="$ethereal_save_CPPFLAGS"
+                       KRB5_LIBS=""
                        want_krb5=no
-               ])
-               AC_SUBST(KRB5_LIBS)
+                   fi
+               fi
+               LIBS="$ethereal_save_LIBS"
+           else
+               #
+               # It's not Heimdal or MIT.
+               #
+               AC_MSG_RESULT(no)
+               if test "x$want_krb5" = "xyes"
+               then
+                   #
+                   # The user tried to force us to use the library,
+                   # but we can't do so; report an error.
+                   #
+                   AC_MSG_ERROR(Kerberos not found)
+               else
+                   #
+                   # Restore the versions of CFLAGS and CPPFLAGS
+                   # from before we added the flags for Kerberos.
+                   #
+                   AC_MSG_RESULT(Kerberos not found - disabling dissection for some kerberos data in packet decoding)
+                   CFLAGS="$ethereal_save_CFLAGS"
+                   CPPFLAGS="$ethereal_save_CPPFLAGS"
+                   KRB5_LIBS=""
+                   want_krb5=no
+               fi
+           fi
        else
-               want_krb5=no
+           #
+           # The user asked us not to use Kerberos, or they didn't
+           # say whether they wanted us to use it but we found
+           # that we couldn't.
+           #
+           # Restore the versions of CFLAGS and CPPFLAGS
+           # from before we added the flags for Kerberos.
+           #
+           CFLAGS="$ethereal_save_CFLAGS"
+           CPPFLAGS="$ethereal_save_CPPFLAGS"
+           KRB5_LIBS=""
+           want_krb5=no
        fi
+       AC_SUBST(KRB5_LIBS)
 ])