dnl Macros that test for specific features.
-dnl This file is part of the Autoconf packaging for Ethereal.
+dnl This file is part of the Autoconf packaging for Wireshark.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
dnl $Id$
dnl Roland McGrath, Noah Friedman, david d zuhn, and many others.
#
-# AC_ETHEREAL_ADD_DASH_L
+# AC_WIRESHARK_ADD_DASH_L
#
# Add to the variable specified as the first argument a "-L" flag for the
# directory specified as the second argument, and, on Solaris, add a
# XXX - IRIX, and other OSes, may require some flag equivalent to
# "-R" here.
#
-AC_DEFUN([AC_ETHEREAL_ADD_DASH_L],
+AC_DEFUN([AC_WIRESHARK_ADD_DASH_L],
[$1="$$1 -L$2"
case "$host_os" in
solaris*)
#
-# AC_ETHEREAL_STRUCT_SA_LEN
+# AC_WIRESHARK_STRUCT_SA_LEN
#
dnl AC_STRUCT_ST_BLKSIZE extracted from the file in question,
dnl "acspecific.m4" in GNU Autoconf 2.12, and turned into
-dnl AC_ETHEREAL_STRUCT_SA_LEN, which checks if "struct sockaddr"
+dnl AC_WIRESHARK_STRUCT_SA_LEN, which checks if "struct sockaddr"
dnl has the 4.4BSD "sa_len" member, and defines HAVE_SA_LEN; that's
dnl what's in this file.
dnl Done by Guy Harris <guy@alum.mit.edu> on 1998-11-14.
dnl ### Checks for structure members
-AC_DEFUN([AC_ETHEREAL_STRUCT_SA_LEN],
-[AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_ethereal_struct_sa_len,
+AC_DEFUN([AC_WIRESHARK_STRUCT_SA_LEN],
+[AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_wireshark_struct_sa_len,
[AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>], [struct sockaddr s; s.sa_len;],
-ac_cv_ethereal_struct_sa_len=yes, ac_cv_ethereal_struct_sa_len=no)])
-if test $ac_cv_ethereal_struct_sa_len = yes; then
+ac_cv_wireshark_struct_sa_len=yes, ac_cv_wireshark_struct_sa_len=no)])
+if test $ac_cv_wireshark_struct_sa_len = yes; then
AC_DEFINE(HAVE_SA_LEN, 1, [Define if sa_len field exists in struct sockaddr])
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_DEFUN([AC_WIRESHARK_CHECK_64BIT_FORMAT],
[
AC_MSG_CHECKING([whether %$1x can be used to format 64-bit integers])
AC_RUN_IFELSE(
])
#
-# AC_ETHEREAL_IPV6_STACK
+# AC_WIRESHARK_IPV6_STACK
#
# By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net>
#
-AC_DEFUN([AC_ETHEREAL_IPV6_STACK],
+AC_DEFUN([AC_WIRESHARK_IPV6_STACK],
[
v6type=unknown
v6lib=none
])
#
-# AC_ETHEREAL_GETHOSTBY_LIB_CHECK
+# AC_WIRESHARK_GETHOSTBY_LIB_CHECK
#
# Checks whether we need "-lnsl" to get "gethostby*()", which we use
# in "resolv.c".
# GNU Autoconf 2.13; the comment came from there.
# Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14.
#
-AC_DEFUN([AC_ETHEREAL_GETHOSTBY_LIB_CHECK],
+AC_DEFUN([AC_WIRESHARK_GETHOSTBY_LIB_CHECK],
[
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
# to get the SysV transport functions.
])
#
-# AC_ETHEREAL_SOCKET_LIB_CHECK
+# AC_WIRESHARK_SOCKET_LIB_CHECK
#
# Checks whether we need "-lsocket" to get "socket()", which is used
# by libpcap on some platforms - and, in effect, "gethostby*()" on
#
# We use "connect" because that's what AC_PATH_XTRA did.
#
-AC_DEFUN([AC_ETHEREAL_SOCKET_LIB_CHECK],
+AC_DEFUN([AC_WIRESHARK_SOCKET_LIB_CHECK],
[
# lieder@skyler.mavd.honeywell.com says without -lsocket,
# socket/setsockopt and other routines are undefined under SCO ODT
])
#
-# AC_ETHEREAL_PCAP_CHECK
+# AC_WIRESHARK_PCAP_CHECK
#
-AC_DEFUN([AC_ETHEREAL_PCAP_CHECK],
+AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
[
if test -z "$pcap_dir"
then
#
CFLAGS="$CFLAGS -I$pcap_dir/include"
CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
- AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
+ AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
fi
# Pcap header check
PCAP_LIBS=-lpcap
AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
], [
- ac_ethereal_extras_found=no
+ ac_wireshark_extras_found=no
ac_save_LIBS="$LIBS"
for extras in "-lcfg -lodm" "-lpfring"
do
pcap_open_live(NULL, 0, 0, 0, NULL);
],
[
- ac_ethereal_extras_found=yes
+ ac_wireshark_extras_found=yes
AC_MSG_RESULT([yes])
PCAP_LIBS="-lpcap $extras"
AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
[
AC_MSG_RESULT([no])
])
- if test x$ac_ethereal_extras_found = xyes
+ if test x$ac_wireshark_extras_found = xyes
then
break
fi
done
- if test x$ac_ethereal_extras_found = xno
+ if test x$ac_wireshark_extras_found = xno
then
AC_MSG_ERROR([Can't link with library libpcap.])
fi
else
AC_MSG_RESULT(no)
fi
- AC_CHECK_FUNCS(pcap_open_dead pcap_freecode)
+ AC_CHECK_FUNCS(pcap_open_dead pcap_freecode pcap_breakloop)
#
# 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,
])
#
-# AC_ETHEREAL_ZLIB_CHECK
+# AC_WIRESHARK_ZLIB_CHECK
#
-AC_DEFUN([AC_ETHEREAL_ZLIB_CHECK],
+AC_DEFUN([AC_WIRESHARK_ZLIB_CHECK],
[
if test "x$zlib_dir" != "x"
then
# as the compiler and/or linker will search that other
# directory before it searches the specified directory.
#
- ethereal_save_CFLAGS="$CFLAGS"
+ wireshark_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I$zlib_dir/include"
- ethereal_save_CPPFLAGS="$CPPFLAGS"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
- ethereal_save_LIBS="$LIBS"
- AC_ETHEREAL_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ wireshark_save_LIBS="$LIBS"
+ AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
fi
#
# LIBS.
#
LIBS=""
- AC_ETHEREAL_ADD_DASH_L(LIBS, $zlib_dir/lib)
- LIBS="$LIBS -lz $ethereal_save_LIBS"
+ AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ LIBS="$LIBS -lz $wireshark_save_LIBS"
else
LIBS="-lz $LIBS"
fi
# zlib there, or didn't find a zlib that
# contains gzgets there.
#
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
- LIBS="$ethereal_save_LIBS"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LIBS="$wireshark_save_LIBS"
fi
want_zlib=no
])
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS -lz $LIBS"
AC_MSG_CHECKING([for gzgets missing when linking with X11])
- AC_TRY_LINK_FUNC(gzgets, AC_MSG_RESULT(no),
+ AC_TRY_LINK_FUNC(gzgets, AC_MSG_RESULT(no),
[
AC_MSG_RESULT(yes)
AC_MSG_ERROR(old zlib found when linking with X11 - get rid of old zlib.)
])
#
-# AC_ETHEREAL_LIBPCRE_CHECK
+# AC_WIRESHARK_LIBPCRE_CHECK
#
-AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
+AC_DEFUN([AC_WIRESHARK_LIBPCRE_CHECK],
[
if test "x$pcre_dir" != "x"
then
# as the compiler and/or linker will search that other
# directory before it searches the specified directory.
#
- ethereal_save_CFLAGS="$CFLAGS"
+ wireshark_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I$pcre_dir/include"
- ethereal_save_CPPFLAGS="$CPPFLAGS"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
- ethereal_save_LIBS="$LIBS"
+ wireshark_save_LIBS="$LIBS"
LIBS="$LIBS -lpcre"
- ethereal_save_LDFLAGS="$LDFLAGS"
+ wireshark_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$pcre_dir/lib"
fi
# the beginning of CFLAGS, CPPFLAGS,
# LDFLAGS, and LIBS.
#
- PCRE_LIBS="-L$pcre_dir/lib -lpcre $ethereal_save_LIBS"
+ PCRE_LIBS="-L$pcre_dir/lib -lpcre $wireshark_save_LIBS"
else
PCRE_LIBS="-lpcre"
fi
# "--with-pcre=" directory, as we didn't
# actually find pcre there.
#
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
- LDFLAGS="$ethereal_save_LDFLAGS"
- LIBS="$ethereal_save_LIBS"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LDFLAGS="$wireshark_save_LDFLAGS"
+ LIBS="$wireshark_save_LIBS"
PCRE_LIBS=""
fi
want_pcre=no
])
#
-# AC_ETHEREAL_LIBLUA_CHECK
+# AC_WIRESHARK_LIBLUA_CHECK
#
-AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
+AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
if test "x$lua_dir" != "x"
then
# as the compiler and/or linker will search that other
# directory before it searches the specified directory.
#
- ethereal_save_CFLAGS="$CFLAGS"
+ wireshark_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I$lua_dir/include"
- ethereal_save_CPPFLAGS="$CPPFLAGS"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$lua_dir/include"
- ethereal_save_LIBS="$LIBS"
- LIBS="$LIBS -L$lua_dir/lib -llua"
- ethereal_save_LDFLAGS="$LDFLAGS"
+ wireshark_save_LIBS="$LIBS"
+ LIBS="$LIBS -L$lua_dir/lib -llua -lm"
+ wireshark_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$lua_dir/lib"
else
#
# The user specified no directory in which liblua resides,
# so just add "-llua -lliblua" to the used libs.
#
- ethereal_save_CFLAGS="$CFLAGS"
- ethereal_save_CPPFLAGS="$CPPFLAGS"
- ethereal_save_LDFLAGS="$LDFLAGS"
- ethereal_save_LIBS="$LIBS"
- LIBS="$LIBS -llua"
+ wireshark_save_CFLAGS="$CFLAGS"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
+ wireshark_save_LDFLAGS="$LDFLAGS"
+ wireshark_save_LIBS="$LIBS"
+ LIBS="$LIBS -llua -lm"
fi
#
#
AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h,,
[
- if test "x$lua_dir" != "x"
- then
- #
- # The user used "--with-lua=" to specify a directory
- # containing liblua, but we didn't find the header file
- # there; that either means they didn't specify the
- # right directory or are confused about whether liblua
- # is, in fact, installed. Report the error and give up.
- #
- AC_MSG_ERROR([liblua header not found in directory specified in --with-lua])
- else
- if test "x$want_lua" = "xyes"
+ AC_CHECK_HEADERS(lua5.1/lua.h lua5.1/lualib.h lua5.1/lauxlib.h,
+ [
+ if test "x$lua_dir" != "x"
then
- #
- # The user tried to force us to use the library, but we
- # couldn't find the header file; report an error.
- #
- AC_MSG_ERROR(Header file lua.h not found.)
+ LUA_INCLUDES="-I$lua_dir/include/lua5.1"
else
+ # we found lua5.1/lua.h, but we don't know which include dir contains it
+ AC_MSG_ERROR(Header file lua.h was found as lua5.1/lua.h but we can't use it. Please set the PATH for the --with-lua configure parameter. \n probably it is /usr.)
+ fi
+
+ ],
+ [
+ if test "x$lua_dir" != "x"
+ then
#
- # We couldn't find the header file; don't use the
- # library, as it's probably not present.
+ # The user used "--with-lua=" to specify a directory
+ # containing liblua, but we didn't find the header file
+ # there; that either means they didn't specify the
+ # right directory or are confused about whether liblua
+ # is, in fact, installed. Report the error and give up.
#
- want_lua=no
+ AC_MSG_ERROR([liblua header not found in directory specified in --with-lua])
+ else
+ if test "x$want_lua" = "xyes"
+ then
+ #
+ # The user tried to force us to use the library, but we
+ # couldn't find the header file; report an error.
+ #
+ AC_MSG_ERROR(Header file lua.h not found.)
+ else
+ #
+ # We couldn't find the header file; don't use the
+ # library, as it's probably not present.
+ #
+ want_lua=no
+ fi
fi
- fi
+ ])
])
if test "x$want_lua" != "xno"
# the beginning of CFLAGS, CPPFLAGS,
# LDFLAGS, and LIBS.
#
- LUA_LIBS="-L$lua_dir/lib -llua"
+ LUA_LIBS="-L$lua_dir/lib -llua -lm"
LUA_INCLUDES="-I$lua_dir/include"
else
- LUA_LIBS="-llua"
+ LUA_LIBS="-llua -lm"
LUA_INCLUDES=""
fi
# do we have 5.1?
#
- LIBS="$ethereal_save_LIBS $LUA_LIBS"
+ LIBS="$wireshark_save_LIBS $LUA_LIBS"
AC_CHECK_LIB(lua, luaL_register,
[
#
if test "x$lua_dir" != "x"
then
- #
- # 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="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
- LDFLAGS="$ethereal_save_LDFLAGS"
- LIBS="$ethereal_save_LIBS"
- LUA_LIBS=""
+ #
+ # 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=""
fi
# User requested --with-lua but it isn't available
if test "x$want_lua" = "xyes"
then
- AC_MSG_ERROR(Linking with liblualib failed.)
+ AC_MSG_ERROR(Linking with liblualib failed.)
fi
want_lua=no
])
])
+ ],[
+ #
+ # We could not find the libs, maybe we have version number in the lib name
+ #
+
+ LIBS="$wireshark_save_LIBS -llua5.1 -lm"
+
+ AC_CHECK_LIB(lua5.1, luaL_register,
+ [
+ #
+ # Lua 5.1 found
+ #
+ AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+ LUA_LIBS=" -llua5.1 -lm"
+ ],[
+ #
+ # 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=""
+ # User requested --with-lua but it isn't available
+ if test "x$want_lua" = "xyes"
+ then
+ AC_MSG_ERROR(Linking with liblua failed.)
+ fi
+ want_lua=no
+ ])
+ ])
+
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LDFLAGS="$wireshark_save_LDFLAGS"
+ LIBS="$wireshark_save_LIBS"
+ AC_SUBST(LUA_LIBS)
+ AC_SUBST(LUA_INCLUDES)
+
+ fi
+])
+
+#
+# AC_WIRESHARK_LIBPORTAUDIO_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[
+
+ if test "x$portaudio_dir" != "x"
+ then
+ #
+ # The user specified a directory in which libportaudio
+ # resides, so add the "include" subdirectory of that directory to
+ # the include file search path and the "lib" subdirectory
+ # of that directory to the library search path.
+ #
+ # XXX - if there's also a libportaudio in a directory that's
+ # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
+ # make us find the version in the specified directory,
+ # as the compiler and/or linker will search that other
+ # directory before it searches the specified directory.
+ #
+ wireshark_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I$portaudio_dir/include"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$portaudio_dir/include"
+ wireshark_save_LIBS="$LIBS"
+ LIBS="$LIBS -L$portaudio_dir/lib -lportaudio"
+ wireshark_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -L$portaudio_dir/lib"
+ else
+ #
+ # The user specified no directory in which libportaudio resides,
+ # so just add "-lportaudio" to the used libs.
+ #
+ wireshark_save_CFLAGS="$CFLAGS"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
+ wireshark_save_LDFLAGS="$LDFLAGS"
+ wireshark_save_LIBS="$LIBS"
+ LIBS="$LIBS -lportaudio"
+ fi
+
+ #
+ # Make sure we have "portaudio.h". If we don't, it means we probably
+ # don't have libportaudio, so don't use it.
+ #
+ AC_CHECK_HEADERS(portaudio.h,,
+ [
+ if test "x$portaudio_dir" != "x"
+ then
+ #
+ # The user used "--with-portaudio=" to specify a directory
+ # containing libportaudio, but we didn't find the header file
+ # there; that either means they didn't specify the
+ # right directory or are confused about whether libportaudio
+ # is, in fact, installed. Report the error and give up.
+ #
+ AC_MSG_ERROR([libportaudio header not found in directory specified in --with-portaudio])
+ else
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LDFLAGS="$wireshark_save_LDFLAGS"
+ LIBS="$wireshark_save_LIBS"
+ PORTAUDIO_LIBS=""
+ if test "x$want_portaudio" = "xyes"
+ then
+ #
+ # The user tried to force us to use the library, but we
+ # couldn't find the header file; report an error.
+ #
+ AC_MSG_ERROR(Header file portaudio.h not found.)
+ else
+ #
+ # We couldn't find the header file; don't use the
+ # library, as it's probably not present.
+ #
+ want_portaudio=no
+ fi
+ fi
+ ])
+
+ #
+ # Check whether we have the right version of portaudio
+ #
+ if test "x$want_portaudio" != "xno"
+ then
+ AC_CHECK_TYPE(PortAudioStream,
+ AC_DEFINE(PORTAUDIO_API_1, 1, [Define if we are using version of of the Portaudio library API]),
+ ,
+ [#include <portaudio.h>])
+ fi
+
+ if test "x$want_portaudio" != "xno"
+ then
+ #
+ # Well, we at least have the portaudio header file.
+ #
+ # let's check if the libs are there
+ #
+
+ AC_CHECK_LIB(portaudio, Pa_Initialize,
+ [
+ if test "x$portaudio_dir" != "x"
+ then
+ #
+ # Put the "-I" and "-L" flags for portaudio at
+ # the beginning of CFLAGS, CPPFLAGS,
+ # LDFLAGS, and LIBS.
+ #
+ PORTAUDIO_LIBS="-L$portaudio_dir/lib -lportaudio"
+ PORTAUDIO_INCLUDES="-I$portaudio_dir/include"
+ else
+ PORTAUDIO_LIBS="-lportaudio"
+ PORTAUDIO_INCLUDES=""
+ fi
+ AC_DEFINE(HAVE_LIBPORTAUDIO, 1, [Define to use libportaudio library])
+ want_portaudio=yes
],[
#
# Restore the versions of CFLAGS, CPPFLAGS,
# LDFLAGS, and LIBS before we added the
- # "--with-lua=" directory, as we didn't
- # actually find lua there.
+ # "--with-portaudio=" directory, as we didn't
+ # actually find portaudio there.
#
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
- LDFLAGS="$ethereal_save_LDFLAGS"
- LIBS="$ethereal_save_LIBS"
- LUA_LIBS=""
- # User requested --with-lua but it isn't available
- if test "x$want_lua" = "xyes"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LDFLAGS="$wireshark_save_LDFLAGS"
+ LIBS="$wireshark_save_LIBS"
+ PORTAUDIO_LIBS=""
+ # User requested --with-portaudio but it isn't available
+ if test "x$want_portaudio" = "xyes"
then
- AC_MSG_ERROR(Linking with liblua failed.)
+ AC_MSG_ERROR(Linking with libportaudio failed.)
fi
- want_lua=no
+ want_portaudio=no
])
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
- LDFLAGS="$ethereal_save_LDFLAGS"
- LIBS="$ethereal_save_LIBS"
- AC_SUBST(LUA_LIBS)
- AC_SUBST(LUA_INCLUDES)
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LDFLAGS="$wireshark_save_LDFLAGS"
+ LIBS="$wireshark_save_LIBS"
+ AC_SUBST(PORTAUDIO_LIBS)
+ AC_SUBST(PORTAUDIO_INCLUDES)
fi
])
#
-# AC_ETHEREAL_NETSNMP_CHECK
+# AC_WIRESHARK_NETSNMP_CHECK
#
-AC_DEFUN([AC_ETHEREAL_NETSNMP_CHECK],
+AC_DEFUN([AC_WIRESHARK_NETSNMP_CHECK],
[
dnl get the net-snmp-config binary
if test "x$netsnmpconfig" = "x" ; then
else
NETSNMPCONFIG=$netsnmpconfig
if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
- NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config
+ NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config
if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
AC_MSG_ERROR(Invalid net-snmp-config: $netsnmpconfig)
fi
# searching for the Net-SNMP headers, we look in whatever
# directory that output specifies.
#
- ethereal_save_CFLAGS="$CFLAGS"
- ethereal_save_CPPFLAGS="$CPPFLAGS"
+ wireshark_save_CFLAGS="$CFLAGS"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
else
AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP)
fi
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
SNMP_LIBS=
else
AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for Net-SNMP])
# of '$NETSNMPCONFIG --cflags", as we
# didn't actually find Net-SNMP there.
#
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
fi
fi
fi
])
#
-# AC_ETHEREAL_UCDSNMP_CHECK
-#
-AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
-[
- if test "x$ucdsnmp_dir" != "x"
- then
- #
- # The user specified a directory in which UCD SNMP resides,
- # so add the "include" subdirectory of that directory to
- # the include file search path and the "lib" subdirectory
- # of that directory to the library search path.
- #
- # XXX - if there's also a libpcap in a directory that's
- # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
- # make us find the version in the specified directory,
- # as the compiler and/or linker will search that other
- # directory before it searches the specified directory.
- #
- CFLAGS="$CFLAGS -I$ucdsnmp_dir/include"
- CPPFLAGS="$CPPFLAGS -I$ucdsnmp_dir/include"
- AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $ucdsnmp_dir/lib)
- fi
-
- #
- # Check for one of the UCD SNMP header files we include,
- # to see whether we have UCD SNMP installed.
- #
- AC_CHECK_HEADER(ucd-snmp/ucd-snmp-config.h,
- [
- #
- # UCD SNMP or Net-SNMP might require various helper
- # libraries on various platforms, such as "-ldes425"
- # in "/usr/kerberos/lib" on some versions of Red
- # Hat Linux, or "-lkstat" on Solaris.
- #
- # 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
- # whether additional "-L"/"-R"/whatever flags are
- # needed *before* the "-l" flag for the library
- # and to test whether additional libraries are
- # 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
- 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
- ],
- [
- #
- # 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.
- #
- 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.
- # Either the user needs a newer version of UCD SNMP
- # with "sprint_realloc_objid()", or they may need to
- # specify "--with-ssl".
- #
- 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
-
- #
- # We found it, so we have UCD SNMP.
- #
- AC_DEFINE(HAVE_UCD_SNMP, 1, [Define to enable support for UCD-SNMP])
- have_ucd_snmp="yes"
- ],[
- #
- # No, we don't have it.
- # If the user explicitly asked for UCD SNMP, fail,
- # otherwise just don't use the UCD SNMP library.
- #
- if test "x$want_ucdsnmp" = "xyes" ; then
- AC_MSG_ERROR(Header file ucd-snmp/snmp.h not found.)
- fi
- ])
-])
-
-#
-# AC_ETHEREAL_RPM_CHECK
+# AC_WIRESHARK_RPM_CHECK
# Looks for the rpm program, and checks to see if we can redefine "_topdir".
#
-AC_DEFUN([AC_ETHEREAL_RPM_CHECK],
+AC_DEFUN([AC_WIRESHARK_RPM_CHECK],
[
- AC_CHECK_PROG(ac_cv_ethereal_have_rpm, rpm, "yes", "no")
- if test "x$ac_cv_ethereal_have_rpm" = "xyes"; then
+ AC_CHECK_PROG(ac_cv_wireshark_have_rpm, rpm, "yes", "no")
+ if test "x$ac_cv_wireshark_have_rpm" = "xyes"; then
rpm --define '_topdir /tmp' > /dev/null 2>&1
AC_MSG_CHECKING(to see if we can redefine _topdir)
if test $? -eq 0 ; then
])
#
-# AC_ETHEREAL_GNU_SED_CHECK
+# AC_WIRESHARK_GNU_SED_CHECK
# Checks if GNU sed is the first sed in PATH.
#
-AC_DEFUN([AC_ETHEREAL_GNU_SED_CHECK],
+AC_DEFUN([AC_WIRESHARK_GNU_SED_CHECK],
[
AC_MSG_CHECKING(for GNU sed as first sed in PATH)
if ( sh -c "sed --version" </dev/null 2> /dev/null | grep "GNU sed" 2>&1 > /dev/null ) ; then
])
#
-# AC_ETHEREAL_ADNS_CHECK
+# AC_WIRESHARK_ADNS_CHECK
#
-AC_DEFUN([AC_ETHEREAL_ADNS_CHECK],
+AC_DEFUN([AC_WIRESHARK_ADNS_CHECK],
[
want_adns=defaultyes
if test "x$want_adns" = "xdefaultyes"; then
want_adns=yes
- withval=/usr/local
- if test -d "$withval"; then
- AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+ if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ withval=/usr/local
+ if test -d "$withval"; then
+ AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+ fi
fi
fi
#
-# AC_ETHEREAL_KRB5_CHECK
+# AC_WIRESHARK_KRB5_CHECK
#
-AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
+AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
[
- ethereal_save_CFLAGS="$CFLAGS"
- ethereal_save_CPPFLAGS="$CPPFLAGS"
+ wireshark_save_CFLAGS="$CFLAGS"
+ wireshark_save_CPPFLAGS="$CPPFLAGS"
if test "x$krb5_dir" != "x"
then
#
# the Kerberos library.
#
AC_MSG_RESULT($ac_krb5_version)
- ethereal_save_LIBS="$LIBS"
+ wireshark_save_LIBS="$LIBS"
found_krb5_kt_resolve=no
for extras in "" "-lresolv"
do
# 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"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
KRB5_LIBS=""
want_krb5=no
fi
AC_MSG_RESULT(no)
])
fi
- LIBS="$ethereal_save_LIBS"
+ LIBS="$wireshark_save_LIBS"
else
#
# It's not Heimdal or MIT.
# 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"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
KRB5_LIBS=""
want_krb5=no
fi
# Restore the versions of CFLAGS and CPPFLAGS
# from before we added the flags for Kerberos.
#
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
KRB5_LIBS=""
want_krb5=no
fi
AC_SUBST(KRB5_LIBS)
])
-dnl Autoconf macros for libgnutls
-
-# Modified for LIBGNUTLS -- nmav
-# Configure paths for LIBGCRYPT
-# Shamelessly stolen from the one of XDELTA by Owen Taylor
-# Werner Koch 99-12-09
-
-dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBGNUTLS],
-[dnl
-dnl Get the cflags and libraries from the libgnutls-config script
-dnl
-AC_ARG_WITH(libgnutls-prefix,
- [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)],
- libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
-
- if test x$libgnutls_config_prefix != x ; then
- if test x${LIBGNUTLS_CONFIG+set} != xset ; then
- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
- fi
- fi
-
- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
- min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
- AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
- no_libgnutls=""
- if test "$LIBGNUTLS_CONFIG" = "no" ; then
- no_libgnutls=yes
- else
- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
- LIBS="$LIBS $LIBGNUTLS_LIBS"
-dnl
-dnl Now check if the installed libgnutls is sufficiently new. Also sanity
-dnl checks the results of libgnutls-config to some extent
-dnl
- rm -f conf.libgnutlstest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls/gnutls.h>
-
-int
-main ()
-{
- system ("touch conf.libgnutlstest");
-
- if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
- {
- printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
- "$libgnutls_config_version", gnutls_check_version(NULL) );
- printf("*** was found! If libgnutls-config was correct, then it is best\n");
- printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
- printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
- else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
- {
- printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
- printf("*** library (version %s)\n", gnutls_check_version(NULL) );
- }
- else
- {
- if ( gnutls_check_version( "$min_libgnutls_version" ) )
- {
- return 0;
- }
- else
- {
- printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
- gnutls_check_version(NULL) );
- printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
- "$min_libgnutls_version" );
- printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
- printf("*** \n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
- printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_libgnutls" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- if test -f conf.libgnutlstest ; then
- :
- else
- AC_MSG_RESULT(no)
- fi
- if test "$LIBGNUTLS_CONFIG" = "no" ; then
- echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
- echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
- echo "*** full path to libgnutls-config."
- else
- if test -f conf.libgnutlstest ; then
- :
- else
- echo "*** Could not run libgnutls test program, checking why..."
- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
- LIBS="$LIBS $LIBGNUTLS_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls/gnutls.h>
-], [ return !!gnutls_check_version(NULL); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
- echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- echo "***" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
- echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
- echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- LIBGNUTLS_CFLAGS=""
- LIBGNUTLS_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- rm -f conf.libgnutlstest
- AC_SUBST(LIBGNUTLS_CFLAGS)
- AC_SUBST(LIBGNUTLS_LIBS)
-])
git.samba.org / obnox / wireshark / wip.git / blobdiff