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
# XXX need to set a var AC_CHECK_HEADER(pcap.h,,)
#
- # The user didn't specify a directory in which libpcap resides;
- # we assume that the current library search path will work,
- # but we may have to look for the header in a "pcap"
- # subdirectory of "/usr/include" or "/usr/local/include",
- # as some systems apparently put "pcap.h" in a "pcap"
- # subdirectory, and we also check "$prefix/include" - and
- # "$prefix/include/pcap", in case $prefix is set to
- # "/usr/include" or "/usr/local/include".
+ # The user didn't specify a directory in which libpcap resides.
+ # First, look for a pcap-config script.
#
- # XXX - should we just add "$prefix/include" to the include
- # search path and "$prefix/lib" to the library search path?
- #
- AC_MSG_CHECKING(for extraneous pcap header directories)
- found_pcap_dir=""
- pcap_dir_list="/usr/include/pcap $prefix/include/pcap $prefix/include"
- if test "x$ac_cv_enable_usr_local" = "xyes" ; then
- pcap_dir_list="$pcap_dir_list /usr/local/include/pcap"
+ AC_PATH_PROG(PCAP_CONFIG, pcap-config)
+
+ if test -n "$PCAP_CONFIG" ; then
+ #
+ # 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
- for pcap_dir in $pcap_dir_list
- do
- if test -d $pcap_dir ; then
+ 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`"
+ else
+ #
+ # Didn't find it; we have to look for libpcap ourselves.
+ # We assume that the current library search path will work,
+ # but we may have to look for the header in a "pcap"
+ # subdirectory of "/usr/include" or "/usr/local/include",
+ # as some systems apparently put "pcap.h" in a "pcap"
+ # subdirectory, and we also check "$prefix/include" - and
+ # "$prefix/include/pcap", in case $prefix is set to
+ # "/usr/include" or "/usr/local/include".
+ #
+ # XXX - should we just add "$prefix/include" to the include
+ # search path and "$prefix/lib" to the library search path?
+ #
+ AC_MSG_CHECKING(for extraneous pcap header directories)
+ found_pcap_dir=""
+ pcap_dir_list="/usr/include/pcap $prefix/include/pcap $prefix/include"
+ if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ pcap_dir_list="$pcap_dir_list /usr/local/include/pcap"
+ fi
+ for pcap_dir in $pcap_dir_list
+ do
+ if test -d $pcap_dir ; then
if test x$pcap_dir != x/usr/include -a x$pcap_dir != x/usr/local/include ; then
CFLAGS="$CFLAGS -I$pcap_dir"
CPPFLAGS="$CPPFLAGS -I$pcap_dir"
fi
found_pcap_dir=" $found_pcap_dir -I$pcap_dir"
break
- fi
- done
+ fi
+ done
- if test "$found_pcap_dir" != "" ; then
- AC_MSG_RESULT(found --$found_pcap_dir added to CFLAGS)
- else
- AC_MSG_RESULT(not found)
+ if test "$found_pcap_dir" != "" ; then
+ AC_MSG_RESULT(found --$found_pcap_dir added to CFLAGS)
+ else
+ AC_MSG_RESULT(not found)
+ fi
fi
else
#
binary package of libpcap, is there also a developer's package of libpcap,
and did you also install that package?]]))
- #
- # Check to see if we find "pcap_open_live" in "-lpcap".
- # Also check for various additional libraries that libpcap might
- # require.
- #
- AC_CHECK_LIB(pcap, pcap_open_live,
- [
- PCAP_LIBS=-lpcap
- AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
- ], [
- ac_wireshark_extras_found=no
- ac_save_LIBS="$LIBS"
- for extras in "-lcfg -lodm" "-lpfring"
- do
+ if test -n "$PCAP_CONFIG" ; then
+ #
+ # We have pcap-config; we assume that means we have libpcap
+ # installed and that pcap-config will tell us whatever
+ # libraries libpcap needs.
+ #
+ if test x$enable_static = xyes; then
+ PCAP_LIBS="`\"$PCAP_CONFIG\" --libs --static`"
+ else
+ PCAP_LIBS="`\"$PCAP_CONFIG\" --libs`"
+ fi
+ AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+ else
+ #
+ # Check to see if we find "pcap_open_live" in "-lpcap".
+ # Also check for various additional libraries that libpcap might
+ # require.
+ #
+ AC_CHECK_LIB(pcap, pcap_open_live,
+ [
+ PCAP_LIBS=-lpcap
+ AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+ ], [
+ ac_wireshark_extras_found=no
+ ac_save_LIBS="$LIBS"
+ for extras in "-lcfg -lodm" "-lpfring"
+ do
AC_MSG_CHECKING([for pcap_open_live in -lpcap with $extras])
LIBS="-lpcap $extras"
#
then
break
fi
- done
- if test x$ac_wireshark_extras_found = xno
- then
+ done
+ if test x$ac_wireshark_extras_found = xno
+ then
AC_MSG_ERROR([Can't link with library libpcap.])
- fi
- LIBS=$ac_save_LIBS
- ], $SOCKET_LIBS $NSL_LIBS)
+ fi
+ LIBS=$ac_save_LIBS
+ ], $SOCKET_LIBS $NSL_LIBS)
+ fi
AC_SUBST(PCAP_LIBS)
#
AC_CHECK_FUNCS(pcap_datalink_val_to_description)
AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink pcap_lib_version)
AC_CHECK_FUNCS(pcap_get_selectable_fd pcap_free_datalinks)
+ AC_CHECK_FUNCS(pcap_create bpf_image)
fi
LIBS="$ac_save_LIBS"
])
then
lua_dir_list="$lua_dir_list /usr/local/include/lua5.1"
fi
- for lua_dir in $lua_dir_list
+ for lua_dir_ent in $lua_dir_list
do
- if test -d $lua_dir
+ if test -d $lua_dir_ent
then
- LUA_INCLUDES="-I$prefix/include/lua5.1"
+ LUA_INCLUDES="-I$lua_dir_ent"
+ found_lua_dir="$lua_dir_ent"
+ break
fi
- found_lua_dir="$lua_dir"
- break
done
if test "x$found_lua_dir" != "x"
AC_MSG_RESULT(found -- $found_lua_dir)
else
AC_MSG_RESULT(not found)
+ #
+ # Restore the versions of CFLAGS, CPPFLAGS,
+ # LDFLAGS, and LIBS before we added the
+ # "--with-lua=" directory, as we didn't
+ # actually find lua there.
+ #
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LDFLAGS="$wireshark_save_LDFLAGS"
+ LIBS="$wireshark_save_LIBS"
+ LUA_LIBS=""
if test "x$want_lua" = "xyes"
then
# we found lua5.1/lua.h, but we don't know which include dir contains it
fi
],
[
+ #
+ # Restore the versions of CFLAGS, CPPFLAGS,
+ # LDFLAGS, and LIBS before we added the
+ # "--with-lua=" directory, as we didn't
+ # actually find lua there.
+ #
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LDFLAGS="$wireshark_save_LDFLAGS"
+ LIBS="$wireshark_save_LIBS"
+ LUA_LIBS=""
if test "x$lua_dir" != "x"
then
#
CFLAGS="$CFLAGS -I$krb5_dir/include"
CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
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"
+ # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5
+ ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+ 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
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
#
])
#
-# AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK
+# AC_WIRESHARK_OSX_INTEGRATION_CHECK
#
# Checks for the presence of OS X integration functions in the GTK+ framework
# or as a separate library.
#
-# http://developer.imendio.com/projects/gtk-macosx/integration
+# http://sourceforge.net/apps/trac/gtk-osx/wiki/Integrate
#
-AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK],
+# http://live.gnome.org/GTK%2B/OSX/Integration
+# for the old Carbon-based integration functions
+#
+# http://gtk-osx.sourceforge.net/ige-mac-integration/
+# for the new Cocoa-based integration functions
+#
+AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK],
[
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
- AC_CHECK_LIB(Gtk, ige_mac_menu_set_menu_bar,
+
+ #
+ # Check for the new integration functions in a -ligemacintegration
+ # library.
+ #
+ AC_CHECK_LIB(igemacintegration, gtk_osxapplication_set_menu_bar,
[
- AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
- [Define to 1 if the the Gtk+ framework or a separate library inclues the Imendio IGE Mac OS X Integration functions.])
+ AC_DEFINE(HAVE_GTKOSXAPPLICATION, 1,
+ [Define to 1 if -ligemacintegration includes the GtkOSXApplication Integration functions.])
have_ige_mac=yes
# We don't want gtk stuff in LIBS (which is reset below) so
# manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -lGtk"
+ GTK_LIBS="$GTK_LIBS -ligemacintegration"
])
if test x$have_ige_mac == x
then
+ #
+ # Not found - check for the old integration functions in
+ # the Gtk framework.
+ #
+ AC_CHECK_LIB(Gtk, ige_mac_menu_set_menu_bar,
+ [
+ AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
+ [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
+ have_ige_mac=yes
+ # We don't want gtk stuff in LIBS (which is reset below) so
+ # manually set GTK_LIBS (which is more appropriate)
+ GTK_LIBS="$GTK_LIBS -lGtk"
+ ])
+ fi
+
+ if test x$have_ige_mac == x
+ then
+ #
+ # Not found - check for the old integration functions in
+ # a -ligemacintegration library.
+ #
AC_CHECK_LIB(igemacintegration, ige_mac_menu_set_menu_bar,
[
AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
- [Define to 1 if the the Gtk+ framework or a separate library inclues the Imendio IGE Mac OS X Integration functions.])
+ [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
+ have_ige_mac=yes
# We don't want gtk stuff in LIBS (which is reset below) so
# manually set GTK_LIBS (which is more appropriate)
GTK_LIBS="$GTK_LIBS -ligemacintegration"
git.samba.org / obnox / wireshark / wip.git / blobdiff