diff options
-rw-r--r-- | acconfig.h | 56 | ||||
-rw-r--r-- | acinclude.m4 | 15 | ||||
-rw-r--r-- | configure.in | 27 | ||||
-rw-r--r-- | epan/acconfig.h | 34 | ||||
-rw-r--r-- | epan/configure.in | 14 | ||||
-rw-r--r-- | wiretap/acconfig.h | 28 | ||||
-rw-r--r-- | wiretap/acinclude.m4 | 4 |
7 files changed, 37 insertions, 141 deletions
diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index 21df05c078..0000000000 --- a/acconfig.h +++ /dev/null @@ -1,56 +0,0 @@ -/* acconfig.h - * #ifdefs to be controlled by "configure" - * - * $Id: acconfig.h,v 1.28 2003/01/02 20:45:14 guy Exp $ - * - * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@ethereal.com> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#undef PACKAGE - -#undef VERSION - -#undef HAVE_PLUGINS - -#undef HAVE_SA_LEN - -#undef DATAFILE_DIR - -#undef NEED_SNPRINTF_H - -#undef NEED_STRERROR_H - -#undef NEED_STRPTIME_H - -#undef HAVE_LIBPCAP - -#undef HAVE_PCAP_VERSION - -#undef HAVE_LIBZ - -#undef HAVE_NET_SNMP - -#undef HAVE_UCD_SNMP - -#undef PLUGIN_DIR - -@BOTTOM@ -#if defined(HAVE_NET_SNMP) || defined(HAVE_UCD_SNMP) -#define HAVE_SOME_SNMP -#endif diff --git a/acinclude.m4 b/acinclude.m4 index 70327a30a1..978817faae 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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.51 2003/02/11 02:31:22 guy Exp $ +dnl $Id: acinclude.m4,v 1.52 2003/02/26 20:08:30 guy 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 @@ -88,7 +88,7 @@ AC_DEFUN(AC_ETHEREAL_STRUCT_SA_LEN, #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_DEFINE(HAVE_SA_LEN) + AC_DEFINE(HAVE_SA_LEN, 1, [Define if sa_len field exists in struct sockaddr]) fi ]) @@ -323,8 +323,8 @@ and did you also install that package?]])) AC_CHECK_LIB(pcap, pcap_open_live, [ PCAP_LIBS=-lpcap - AC_DEFINE(HAVE_LIBPCAP) - ], AC_MSG_ERROR(Library libpcap not found.), + AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library]) + ], [AC_MSG_ERROR(Library libpcap not found.)], $SOCKET_LIBS $NSL_LIBS) AC_SUBST(PCAP_LIBS) ]) @@ -353,7 +353,7 @@ AC_DEFUN(AC_ETHEREAL_PCAP_VERSION_CHECK, LIBS="$ac_save_LIBS" if test "$ac_cv_pcap_version_defined" = yes ; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PCAP_VERSION) + AC_DEFINE(HAVE_PCAP_VERSION, 1, [Define if libpcap version is known]) else AC_MSG_RESULT(no) fi @@ -461,7 +461,7 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK, else LIBS="-lz $LIBS" fi - AC_DEFINE(HAVE_LIBZ) + AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library]) ],[ if test "x$zlib_dir" != "x" then @@ -592,7 +592,8 @@ AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK, # # We found it, so we have UCD SNMP. # - AC_DEFINE(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. diff --git a/configure.in b/configure.in index c4f60febd0..5d7f41d36c 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.195 2003/01/30 10:20:41 jmayer Exp $ +# $Id: configure.in,v 1.196 2003/02/26 20:08:30 guy Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -172,7 +172,7 @@ datafiledir=`( test "x$exec_prefix" = xNONE && exec_prefix=${prefix} eval echo "$datafiledir" )` -AC_DEFINE_UNQUOTED(DATAFILE_DIR, "$datafiledir") +AC_DEFINE_UNQUOTED(DATAFILE_DIR, "$datafiledir", [Directory for data]) # # If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a @@ -598,7 +598,8 @@ if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCO CFLAGS="$CFLAGS `net-snmp-config --cflags`" CPPFLAGS="$CPPLAGS `net-snmp-config --cflags`" SNMP_LIBS=`net-snmp-config --libs` - AC_DEFINE(HAVE_NET_SNMP) + AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for NET-SNMP]) + have_net_snmp="yes" AC_MSG_RESULT(yes (net-snmp)) else # technically, we should retry ucd-snmp but it's @@ -618,6 +619,10 @@ else fi fi +if test "x$have_net_snmp" = "xyes" && test "x$have_ucd_snmp" = "xyes"; then + AC_DEFINE(HAVE_SOME_SNMP, 1, [Define to if some SNMP support is to be used]) +fi + AC_SUBST(SNMP_LIBS) dnl Checks for typedefs, structures, and compiler characteristics. @@ -640,7 +645,9 @@ AC_PROG_GCC_TRADITIONAL SNPRINTF_C="" SNPRINTF_O="" AC_CHECK_FUNC(snprintf, SNPRINTF_O="", - SNPRINTF_O="snprintf.o" [AC_DEFINE(NEED_SNPRINTF_H)]) + [SNPRINTF_O="snprintf.o" + AC_DEFINE(NEED_SNPRINTF_H, 1, [Define if sprintf.h needs to be included]) +]) if test "$ac_cv_func_snprintf" = no ; then SNPRINTF_C="snprintf.c" SNPRINTF_O="snprintf.o" @@ -649,7 +656,9 @@ AC_SUBST(SNPRINTF_C) AC_SUBST(SNPRINTF_O) AC_CHECK_FUNC(strerror, STRERROR_O="", - STRERROR_O="strerror.o" [AC_DEFINE(NEED_STRERROR_H)]) + [STRERROR_O="strerror.o" + AC_DEFINE(NEED_STRERROR_H, 1, [Define if strerror.h needs to be included]) +]) if test "$ac_cv_func_strerror" = no ; then STRERROR_C="strerror.c" STRERROR_O="strerror.o" @@ -685,7 +694,9 @@ AC_SUBST(MKSTEMP_C) AC_SUBST(MKSTEMP_O) AC_CHECK_FUNC(strptime, STRPTIME_O="", - STRPTIME_O="strptime.o" [AC_DEFINE(NEED_STRPTIME_H)]) + [STRPTIME_O="strptime.o" + AC_DEFINE(NEED_STRPTIME_H, 1, [Define if strptime.h needs to be included]) +]) if test "$ac_cv_func_strptime" = no ; then STRPTIME_C="strptime.c" STRPTIME_O="strptime.o" @@ -730,7 +741,7 @@ AC_ARG_WITH(plugins, AM_CONDITIONAL(HAVE_PLUGINS, test x$have_plugins = xyes) if test x$have_plugins = xyes then - AC_DEFINE(HAVE_PLUGINS) + AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) plugindir=`( test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=${prefix} @@ -738,7 +749,7 @@ then )` AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$plugindir", [Plugin installation directory]) else - AC_DEFINE(PLUGIN_DIR, NULL) + AC_DEFINE(PLUGIN_DIR, NULL, [Plugin installation directory]) fi AC_SUBST(plugindir) diff --git a/epan/acconfig.h b/epan/acconfig.h deleted file mode 100644 index 86a955d873..0000000000 --- a/epan/acconfig.h +++ /dev/null @@ -1,34 +0,0 @@ -/* acconfig.h - * #ifdefs to be controlled by "configure" - * - * $Id: acconfig.h,v 1.3 2002/08/28 20:40:43 jmayer Exp $ - * - * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> - * Copyright 1998 Gerald Combs - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#undef HAVE_PLUGINS - -#undef DATAFILE_DIR - -#undef NEED_INET_ATON_H - -#undef NEED_INET_V6DEFS_H - -#undef NEED_STRPTIME_H diff --git a/epan/configure.in b/epan/configure.in index 9766dd5eab..5ebd346136 100644 --- a/epan/configure.in +++ b/epan/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.36 2003/01/30 10:20:47 jmayer Exp $ +# $Id: configure.in,v 1.37 2003/02/26 20:08:32 guy Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -113,7 +113,7 @@ DATAFILE_DIR=`( test "x$exec_prefix" = xNONE && exec_prefix=${prefix} eval echo "$DATAFILE_DIR" )` -AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$DATAFILE_DIR") +AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$DATAFILE_DIR", [Directory for data]) AC_SUBST(DATAFILE_DIR) AC_ARG_ENABLE(gtk2, @@ -149,7 +149,7 @@ AC_CHECK_FUNC(inet_aton, INET_ATON_O="", if test "$ac_cv_func_inet_aton" = no ; then INET_ATON_C="inet_aton.c" INET_ATON_O="inet_aton.o" - AC_DEFINE(NEED_INET_ATON_H) + 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) @@ -190,12 +190,14 @@ AC_CHECK_FUNC(inet_ntop, INET_NTOP_O="", if test "$ac_cv_func_inet_ntop" = no ; then INET_NTOP_C="inet_ntop.c" INET_NTOP_O="inet_ntop.o" - AC_DEFINE(NEED_INET_V6DEFS_H) + AC_DEFINE(NEED_INET_V6DEFS_H, 1, [Define if inet/v6defs.h needs to be included]) fi AC_SUBST(INET_NTOP_C) AC_SUBST(INET_NTOP_O) -AC_CHECK_FUNC(strptime, , [AC_DEFINE(NEED_STRPTIME_H)]) +AC_CHECK_FUNC(strptime, , + [AC_DEFINE(NEED_STRPTIME_H, 1, [Define if strptime.h needs to be included]) +]) # # Check whether GLib modules are supported, to determine whether we @@ -254,7 +256,7 @@ AC_ARG_WITH(plugins, AM_CONDITIONAL(HAVE_PLUGINS, test x$have_plugins = xyes) if test x$have_plugins = xyes then - AC_DEFINE(HAVE_PLUGINS) + AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) fi AC_OUTPUT( diff --git a/wiretap/acconfig.h b/wiretap/acconfig.h deleted file mode 100644 index 1648fd60c6..0000000000 --- a/wiretap/acconfig.h +++ /dev/null @@ -1,28 +0,0 @@ -/* acconfig.h - * - * $Id: acconfig.h,v 1.8 2002/08/28 20:30:44 jmayer Exp $ - * - * Wiretap Library - * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#undef PACKAGE - -#undef VERSION - -#undef HAVE_LIBZ diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4 index ba8b23691d..7fb4f74c6f 100644 --- a/wiretap/acinclude.m4 +++ b/wiretap/acinclude.m4 @@ -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.16 2003/01/21 20:38:32 jmayer Exp $ +dnl $Id: acinclude.m4,v 1.17 2003/02/26 20:08:33 guy Exp $ dnl # @@ -183,7 +183,7 @@ AC_DEFUN(AC_WIRETAP_ZLIB_CHECK, else LIBS="-lz $LIBS" fi - AC_DEFINE(HAVE_LIBZ) + AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library]) ],[ if test "x$zlib_dir" != "x" then |