diff options
author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-31 01:25:59 +0000 |
---|---|---|
committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-31 01:25:59 +0000 |
commit | d294e48397ef7eab3745f44b46ff1b5004ee1ad0 (patch) | |
tree | 5646b9f7dd3520a0c05592894522c6a0897d469d | |
parent | 1adef157aa05d1aaec0e5cacf1b4137354a5ebca (diff) |
No longer needed after merging epan/configure.in into configure.in
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10530 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | epan/acinclude.m4 | 417 | ||||
-rw-r--r-- | epan/configure.in | 410 |
2 files changed, 0 insertions, 827 deletions
diff --git a/epan/acinclude.m4 b/epan/acinclude.m4 deleted file mode 100644 index a848de9476..0000000000 --- a/epan/acinclude.m4 +++ /dev/null @@ -1,417 +0,0 @@ -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.8 2004/03/20 10:32:02 jmayer Exp $ -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 -dnl the Free Software Foundation; either version 2, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception, the Free Software Foundation gives unlimited -dnl permission to copy, distribute and modify the configure scripts that -dnl are the output of Autoconf. You need not follow the terms of the GNU -dnl General Public License when using or distributing such scripts, even -dnl though portions of the text of Autoconf appear in them. The GNU -dnl General Public License (GPL) does govern all other use of the material -dnl that constitutes the Autoconf program. -dnl -dnl Certain portions of the Autoconf source text are designed to be copied -dnl (in certain cases, depending on the input) into the output of -dnl Autoconf. We call these the "data" portions. The rest of the Autoconf -dnl source text consists of comments plus executable code that decides which -dnl of the data portions to output in any given case. We call these -dnl comments and executable code the "non-data" portions. Autoconf never -dnl copies any of the non-data portions into its output. -dnl -dnl This special exception to the GPL applies to versions of Autoconf -dnl released by the Free Software Foundation. When you make and -dnl distribute a modified version of Autoconf, you may extend this special -dnl exception to the GPL to apply to your modified version as well, *unless* -dnl your modified version has the potential to copy into its output some -dnl of the text that was the non-data portion of the version that you started -dnl with. (In other words, unless your change moves or copies text from -dnl the non-data portions to the data portions.) If your modification has -dnl such potential, you must delete any notice of this special exception -dnl to the GPL from your modified version. -dnl -dnl Written by David MacKenzie, with help from -dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, -dnl Roland McGrath, Noah Friedman, david d zuhn, and many others. - -# -# AC_ETHEREAL_IPV6_STACK -# -# By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net> -# -AC_DEFUN(AC_ETHEREAL_IPV6_STACK, -[ - v6type=unknown - v6lib=none - - AC_MSG_CHECKING([ipv6 stack type]) - for i in v6d toshiba kame inria zeta linux linux-glibc; do - case $i in - v6d) - AC_EGREP_CPP(yes, [ -#include </usr/local/v6/include/sys/types.h> -#ifdef __V6D__ -yes -#endif], - [v6type=$i; v6lib=v6; - v6libdir=/usr/local/v6/lib; - CFLAGS="-I/usr/local/v6/include $CFLAGS"]) - ;; - toshiba) - AC_EGREP_CPP(yes, [ -#include <sys/param.h> -#ifdef _TOSHIBA_INET6 -yes -#endif], - [v6type=$i; v6lib=inet6; - v6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - kame) - AC_EGREP_CPP(yes, [ -#include <netinet/in.h> -#ifdef __KAME__ -yes -#endif], - [v6type=$i; v6lib=inet6; - v6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - inria) - AC_EGREP_CPP(yes, [ -#include <netinet/in.h> -#ifdef IPV6_INRIA_VERSION -yes -#endif], - [v6type=$i; CFLAGS="-DINET6 $CFLAGS"]) - ;; - zeta) - AC_EGREP_CPP(yes, [ -#include <sys/param.h> -#ifdef _ZETA_MINAMI_INET6 -yes -#endif], - [v6type=$i; v6lib=inet6; - v6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - linux) - if test -d /usr/inet6; then - v6type=$i - v6lib=inet6 - v6libdir=/usr/inet6 - CFLAGS="-DINET6 $CFLAGS" - fi - ;; - linux-glibc) - AC_EGREP_CPP(yes, [ -#include <features.h> -#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) -#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __GLIBC__ > 2 -yes -#endif -#endif], - [v6type=$i; v6lib=inet6; CFLAGS="-DINET6 $CFLAGS"]) - ;; - esac - if test "$v6type" != "unknown"; then - break - fi - done - - if test "$v6lib" != "none"; then - for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do - if test -d $dir -a -f $dir/lib$v6lib.a; then - LIBS="-L$dir $LIBS -l$v6lib" - break - fi - done - enable_ipv6="yes" - else - enable_ipv6="no" - fi - AC_MSG_RESULT(["$v6type, $v6lib"]) -]) - -# -# AC_ETHEREAL_ADNS_CHECK -# -AC_DEFUN(AC_ETHEREAL_ADNS_CHECK, -[ - want_adns=defaultyes - - AC_ARG_WITH(adns, -changequote(<<, >>)dnl -<< --with-adns[=DIR] use GNU ADNS (located in directory DIR, if supplied). [default=yes, if present]>>, -changequote([, ])dnl - [ - if test "x$withval" = "xno"; then - want_adns=no - elif test "x$withval" = "xyes"; then - want_adns=yes - elif test -d "$withval"; then - want_adns=yes - fi - ]) - - if test "x$want_adns" = "xdefaultyes"; then - want_adns=yes - fi - - if test "x$want_adns" = "xyes"; then - AC_CHECK_LIB(adns, adns_init, - AC_DEFINE(HAVE_GNU_ADNS, 1, [Define to use GNU ADNS library]),, - ) - else - AC_MSG_RESULT(not required) - fi -]) - -# -# AC_ETHEREAL_LIBPCRE_CHECK -# -AC_DEFUN(AC_ETHEREAL_LIBPCRE_CHECK, -[ - if test "x$pcre_dir" != "x" - then - # - # The user specified a directory in which libpcre 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 libpcre 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. - # - ethereal_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$pcre_dir/include" - ethereal_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$pcre_dir/include" - ethereal_save_LIBS="$LIBS" - LIBS="$LIBS -lpcre" - ethereal_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$pcre_dir/lib" - fi - - # - # Make sure we have "pcre.h". If we don't, it means we probably - # don't have libpcre, so don't use it. - # - AC_CHECK_HEADER(pcre.h,, - [ - if test "x$pcre_dir" != "x" - then - # - # The user used "--with-pcre=" to specify a directory - # containing libpcre, but we didn't find the header file - # there; that either means they didn't specify the - # right directory or are confused about whether libpcre - # is, in fact, installed. Report the error and give up. - # - AC_MSG_ERROR([libpcre header not found in directory specified in --with-pcre]) - else - if test "x$want_pcre" = "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 pcre.h not found.) - else - # - # We couldn't find the header file; don't use the - # library, as it's probably not present. - # - want_pcre=no - fi - fi - ]) - - if test "x$want_pcre" != "xno" - then - # - # Well, we at least have the pcre header file. - # - # We're only using standard functions from libpcre, - # so we don't need to perform extra checks. - # - AC_CHECK_LIB(pcre, pcre_compile, - [ - if test "x$pcre_dir" != "x" - then - # - # Put the "-I" and "-L" flags for pcre at - # the beginning of CFLAGS, CPPFLAGS, - # LDFLAGS, and LIBS. - # - PCRE_LIBS="-L$pcre_dir/lib -lpcre $ethereal_save_LIBS" - else - PCRE_LIBS="-lpcre" - fi - AC_DEFINE(HAVE_LIBPCRE, 1, [Define to use libpcre library]) - ],[ - if test "x$pcre_dir" != "x" - then - # - # Restore the versions of CFLAGS, CPPFLAGS, - # LDFLAGS, and LIBS before we added the - # "--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" - PCRE_LIBS="" - fi - want_pcre=no - ]) - AC_SUBST(PCRE_LIBS) - fi -]) - - -# -# AC_ETHEREAL_KRB5_CHECK -# -AC_DEFUN(AC_ETHEREAL_KRB5_CHECK, -[ - if test "x$krb5_dir" != "x" - then - # - # The user specified a directory in which kerberos 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 kerberos 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. - # - 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" - else - AC_PATH_PROG(KRB5_CONFIG, krb5-config) - if test -x $KRB5_CONFIG - then - KRB5_FLAGS=`$KRB5_CONFIG --cflags` - 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'` - fi - fi - - # - # Make sure we have "krb5.h". If we don't, it means we probably - # don't have kerberos, so don't use it. - # - AC_CHECK_HEADER(krb5.h,, - [ - if test "x$krb5_dir" != "x" - then - # - # The user used "--with-krb5=" to specify a directory - # containing kerberos, but we didn't find the header file - # there; that either means they didn't specify the - # right directory or are confused about whether kerberos - # is, in fact, installed. Report the error and give up. - # - AC_MSG_ERROR([kerberos header not found in directory specified in --with-krb5]) - else - if test "x$want_krb5" = "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 krb5.h not found.) - else - # - # We couldn't find the header file; don't use the - # library, as it's probably not present. - # - want_krb5=no - fi - fi - ]) - - if test "x$want_krb5" != "xno" -a "x$ac_krb5_version" = "xHEIMDAL" - then - # - # Well, we at least have the krb5 header file. - # - 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 - want_krb5=no - ]) - AC_SUBST(KRB5_LIBS) - else - want_krb5=no - fi -]) - diff --git a/epan/configure.in b/epan/configure.in deleted file mode 100644 index 344978c80c..0000000000 --- a/epan/configure.in +++ /dev/null @@ -1,410 +0,0 @@ -# $Id: configure.in,v 1.68 2004/03/22 17:03:30 gerald Exp $ -# -AC_INIT(epan.c) - -AC_PREREQ(2.52) - -dnl Check for CPU / vendor / OS -AC_CANONICAL_HOST -AC_CANONICAL_TARGET - -AM_INIT_AUTOMAKE(libethereal.a, 0.10.3) -AM_CONFIG_HEADER(config.h) - -AM_DISABLE_STATIC - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CPP -AC_PROG_YACC -AM_PROG_LEX -AC_PROG_LIBTOOL -AC_PATH_PROG(LEX, flex) -AC_PATH_PROG(PERL, perl) -AC_PATH_PROG(PYTHON, python) - -AC_SUBST(FLEX_PATH) -AC_SUBST(PERL) -AC_SUBST(PYTHON) - -# -# If we're running gcc, add '-Wall -W' to CFLAGS, and add -# '-D_U_="__attribute__((unused))"' as well, so we can use _U_ to -# flag unused function arguments and not get warnings about them. -# If "--with-extra-gcc-checks" was specified, add "-Wcast-qual -# -Wcast-align" as well. (Add more checks here in the future?) -# -# Otherwise, add '-D_U_=""', so that _U_ used to flag an unused function -# argument will compile with non-GCC compilers. -# -AC_ARG_WITH(extra-gcc-checks, -[ --with-extra-gcc-checks Do additional -W checks in GCC. [default=no]], -[ - if test $withval != no - then - ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic" - fi -],) -AC_MSG_CHECKING(to see if we can add '-Wall -W$ethereal_extra_gcc_flags' to CFLAGS) -if test x$GCC != x ; then - CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W $ethereal_extra_gcc_flags $CFLAGS" - AC_MSG_RESULT(yes) -else - CFLAGS="-D_U_=\"\" $CFLAGS" - AC_MSG_RESULT(no) -fi - -# -# Add any platform-specific compiler flags needed. -# -AC_MSG_CHECKING(for platform-specific compiler flags) -if test "x$GCC" = x -then - # - # Not GCC - assume it's the vendor's compiler. - # - case "$host_os" in - hpux*) - # - # HP's ANSI C compiler; flags suggested by Jost Martin. - # "-Ae" for ANSI C plus extensions such as "long long". - # "+O2", for optimization. XXX - works with "-g"? - # - CFLAGS="-Ae +O2 $CFLAGS" - AC_MSG_RESULT(HP ANSI C compiler - added -Ae +O2) - ;; - darwin*) - # - # It may be called "cc", but it's really a GCC derivative - # with a problematic special precompiler and precompiled - # headers; turn off the special precompiler, as some - # apparently-legal code won't compile with its precompiled - # headers. - # - CFLAGS="-no-cpp-precomp $CFLAGS" - AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp) - ;; - *) - AC_MSG_RESULT(none needed) - ;; - esac -else - case "$host_os" in - darwin*) - # - # See comments above about Apple's lovely C compiler. - # - CFLAGS="-no-cpp-precomp $CFLAGS" - AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp) - ;; - *) - AC_MSG_RESULT(none needed) - ;; - esac -fi - -dnl Look in /usr/local for header files and libraries ? -dnl XXX FIXME don't include /usr/local if it is already in the system -dnl search path as this causes gcc 3.2 on Linux to complain about a change -dnl of the system search order for includes -AC_ARG_ENABLE(usr-local, -[ --enable-usr-local look for headers and libs in /usr/local tree. [default=yes]],enable_usr_local=$enableval,enable_usr_local=yes) - -AC_MSG_CHECKING(whether to use /usr/local for headers and libraries) -if test "x$enable_usr_local" = "xyes" ; then - AC_MSG_RESULT(yes) - # - # Arrange that we search for header files in the source directory - # and in its "wiretap" subdirectory, as well as in "/usr/local/include", - # as various packages we use ("libpcap", "zlib", an SNMP library) - # may have been installed under "/usr/local/include". - # - CFLAGS="$CFLAGS -I/usr/local/include" - CPPFLAGS="$CPPFLAGS -I/usr/local/include" -else - AC_MSG_RESULT(no) -fi - -AC_ARG_ENABLE(profile-build, -[ --enable-profile-build build profile-ready binaries. [default=no]],enable_profile_build=$enableval,enable_profile_build=no) -AM_CONDITIONAL(USE_PROFILE_BUILD, test x$enable_profile_build = xyes) -AC_MSG_CHECKING(if profile builds must be generated) -if test "x$enable_profile_build" = "xyes" ; then - if test -n "$GCC" ; then - AC_MSG_RESULT(yes) - CFLAGS=" -pg $CFLAGS" - else - AC_MSG_RESULT(no) - echo "Building profile binaries currently only supported for GCC." - fi -else - AC_MSG_RESULT(no) -fi - -# Create DATAFILE_DIR #define for config.h -datafiledir=$datadir/ethereal -datafiledir=`( - test "x$prefix" = xNONE && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - eval echo "$datafiledir" -)` -AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data]) - -AC_ARG_ENABLE(gtk2, -[ --enable-gtk2 build Glib2/Gtk2+-based (t)ethereal. [default=no]],enable_gtk2=$enableval,enable_gtk2=no) - -if test "x$enable_gtk2" = "xyes" ; then - AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule) -else - AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule) -fi - -dnl Checks for header files -AC_HEADER_STDC -AC_CHECK_HEADERS(stdarg.h direct.h dirent.h fcntl.h netdb.h unistd.h) -AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/stat.h sys/time.h sys/types.h) -AC_CHECK_HEADERS(netinet/in.h) -AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h) - -dnl ipv6 check -AC_ARG_ENABLE(ipv6, -[ --enable-ipv6 use ipv6 name resolution, if available. [default=yes]],enable_ipv6=$enableval,enable_ipv6=yes) - -AC_MSG_CHECKING(whether to enable ipv6 name resolution if available) -if test "x$enable_ipv6" = "xno" ; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - AC_ETHEREAL_IPV6_STACK -fi - - -dnl kerberos/heimdal check -AC_MSG_CHECKING(whether to use kerberos/heimdal) - -AC_ARG_WITH(krb5, -changequote(<<, >>)dnl -<< --with-krb5[=DIR] use kerberos/heimdal (located in directory DIR, if supplied) to use in kerberos dissection [default=no]>>, -changequote([, ])dnl -[ - if test $withval = no - then - want_krb5=no - elif test $withval = yes - then - want_krb5=yes - else - want_krb5=no - krb5_dir=$withval - fi -],[ - # - # Use kerberos/heimdal if it's present, otherwise don't. - # - want_krb5=no - krb5_dir= -]) -if test "x$want_krb5" = "xno" ; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - AC_ETHEREAL_KRB5_CHECK - if test "x$want_krb5" = "xno" ; then - AC_MSG_RESULT(heimdal not found - disabling dissection for some kerberos data in packet decoding) - fi -fi - - -AC_CHECK_FUNC(inet_aton, INET_ATON_O="", - INET_ATON_O="inet_aton.lo") -if test "$ac_cv_func_inet_aton" = no ; then - INET_ATON_C="inet_aton.c" - INET_ATON_O="inet_aton.lo" - AC_DEFINE(NEED_INET_ATON_H, 1, [Define if inet/aton.h needs to be included]) -fi -AC_SUBST(INET_ATON_C) -AC_SUBST(INET_ATON_O) - -AC_SEARCH_LIBS(inet_pton, [socket nsl], [ - dnl check for pre-BIND82 inet_pton() bug. - AC_MSG_CHECKING(for broken inet_pton) - AC_TRY_RUN([#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -int main() -{ -#ifdef AF_INET6 - char buf[16]; - /* this should return 0 (error) */ - return inet_pton(AF_INET6, "0:1:2:3:4:5:6:7:", buf); -#else - return 1; -#endif -}], [AC_MSG_RESULT(ok); -have_inet_pton=yes], [AC_MSG_RESULT(broken); -have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken); -have_inet_pton=no])], -have_inet_pton=no) -if test "$have_inet_pton" = no; then - INET_PTON_C="inet_pton.c" - INET_PTON_O="inet_pton.lo" -else - INET_PTON_C="" - INET_PTON_O="" -fi -AC_SUBST(INET_PTON_C) -AC_SUBST(INET_PTON_O) - -AC_SEARCH_LIBS(inet_ntop, [socket nsl], [ - AC_MSG_CHECKING([for inet_ntop prototype]) - AC_TRY_COMPILE([#include <stdio.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> - -extern const char *inet_ntop(int, const void *, char *, size_t);],, [ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INET_NTOP_PROTO, 1, - [Define if inet_ntop() prototype exists])], [ - AC_TRY_COMPILE([#include <stdio.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> - -extern const char *inet_ntop(int, const void *, char *, socklen_t);],, [ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INET_NTOP_PROTO, 1, - [Define if inet_ntop() prototype exists])], [ - AC_MSG_RESULT(no)])]) - INET_NTOP_O=""], [ - INET_NTOP_C="inet_ntop.c" - INET_NTOP_O="inet_ntop.lo" - AC_DEFINE(NEED_INET_V6DEFS_H, 1, - [Define if inet/v6defs.h needs to be included])]) -AC_SUBST(INET_NTOP_C) -AC_SUBST(INET_NTOP_O) - -AC_CHECK_FUNC(strptime, , - [AC_DEFINE(NEED_STRPTIME_H, 1, [Define if strptime.h needs to be included]) -]) - -dnl pcre check -AC_MSG_CHECKING(whether to use libpcre for regular expressions in dfilters) -AC_ARG_WITH(pcre, -changequote(<<, >>)dnl -<< --with-pcre[=DIR] use libpcre (located in directory DIR, if supplied) to use in dfilter regular expressions. [default=yes, if present]>>, -changequote([, ])dnl -[ - if test $withval = no - then - want_pcre=no - elif test $withval = yes - then - want_pcre=yes - else - want_pcre=yes - pcre_dir=$withval - fi -],[ - # - # Use libpcre if it's present, otherwise don't. - # - want_pcre=ifpresent - pcre_dir= -]) -if test "x$want_pcre" = "xno" ; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - AC_ETHEREAL_LIBPCRE_CHECK - if test "x$want_pcre" = "xno" ; then - AC_MSG_RESULT(libpcre not found - disabling support for perl compatible regular expressions in dfilters) - fi -fi - -dnl ADNS Check -AC_MSG_CHECKING(whether to use the GNU ADNS library if available) -if test "x$enable_adns" = "xno" ; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - AC_ETHEREAL_ADNS_CHECK -fi - -# -# Check whether GLib modules are supported, to determine whether we -# can support plugins. -# -AC_MSG_CHECKING(whether GLib supports loadable modules) -#ac_save_CFLAGS="$CFLAGS" -#ac_save_LIBS="$LIBS" -#CFLAGS="$CFLAGS $GLIB_CFLAGS" -#LIBS="$GLIB_LIBS $LIBS" -AC_TRY_RUN([ -#include <glib.h> -#include <gmodule.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - if (g_module_supported()) - return 0; /* success */ - else - return 1; /* failure */ -} -], ac_cv_glib_supports_modules=yes, ac_cv_glib_supports_modules=no, - [echo $ac_n "cross compiling; assumed OK... $ac_c"]) -#CFLAGS="$ac_save_CFLAGS" -#LIBS="$ac_save_LIBS" -if test "$ac_cv_glib_supports_modules" = yes ; then - AC_MSG_RESULT(yes) - have_plugins=yes -else - AC_MSG_RESULT(no) - have_plugins=no -fi - -dnl -dnl check whether plugins should be enabled; we don't set plugindir, -dnl as that's set by the top-level configure script -dnl -AC_ARG_WITH(plugins, -changequote(<<, >>)dnl -<< --with-plugins[=DIR] support plugins (installed in DIR, if supplied).>>, -changequote([, ])dnl - [ - case "$withval" in - "" | y | ye | yes ) - ;; - n | no) - have_plugins=no - ;; - *) - ;; - esac - ] -) - -AM_CONDITIONAL(HAVE_PLUGINS, test x$have_plugins = xyes) -if test x$have_plugins = xyes -then - AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) -fi - -AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes) -if test x$enable_static = xyes -a x$have_plugins = xyes -then - AC_DEFINE(ENABLE_STATIC, 1, [Link plugins statically into Ethereal]) -fi -AC_SUBST(ENABLE_STATIC) - -AC_OUTPUT( - Makefile - dfilter/Makefile - ftypes/Makefile -) |