Give libethereal its own configuration file, and have that configuration

file, rather than the top-level Ethereal configuration file, check for
"inet_aton()", "inet_pton()", and "inet_ntop()".  Then make its
Makefile.am include the appropriate object files if necessary.
Otherwise, they don't get built and put into libethereal, and therefore
attempts to link with anything in libethereal that uses them fail on
platforms that lack ethem, causing the build to fail.

That means a bunch of things need to be fixed to cope with libethereal
having its own "config.h" file; this means removing the include of
"config.h" from some libethereal header files.  Move the definitions of
the path names used only by "resolv.c" to "resolv.c" from "resolv.h" (so
"resolv.h" doesn't need "config.h", define HAVE_PLUGINS in the configure
script (so we don't have to include it in "plugins.h" to check whether
HAVE_DLFCN_H is defined).

Unfortunately, stuff outside libethereal needs to know PLUGIN_DIR; for
now, define that in the top-level configuration file, and have Ethereal
and Tethereal pass it as an argument to "epan_init()" - that should be
cleaned up at some point.

Remove from the top-level configure script checks for things used only
in libethereal.

svn path=/trunk/; revision=2498

acconfig.h

@@ -1,7 +1,7 @@
 /* acconfig.h
  * #ifdefs to be controlled by "configure"
  *
- * $Id: acconfig.h,v 1.16 2000/07/14 07:11:52 guy Exp $
+ * $Id: acconfig.h,v 1.17 2000/10/16 23:18:03 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,10 +31,6 @@
 
 #undef DATAFILE_DIR
 
-#undef NEED_INET_ATON_H
-
-#undef NEED_INET_V6DEFS_H
-
 #undef NEED_SNPRINTF_H
 
 #undef NEED_STRERROR_H

autogen.sh

@@ -2,7 +2,7 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id: autogen.sh,v 1.11 2000/10/14 04:09:04 gram Exp $
+# $Id: autogen.sh,v 1.12 2000/10/16 23:18:03 guy Exp $
 
 DIE=true
 PROJECT="Ethereal"
@@ -77,7 +77,7 @@ if test -z "$*"; then
 fi
 
 aclocal_flags="`./aclocal-flags`"
-for dir in . wiretap ;  do
+for dir in . epan wiretap ;  do
   echo processing $dir
   (
     cd $dir

configure.in

@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.103 2000/09/27 04:54:24 gram Exp $
+# $Id: configure.in,v 1.104 2000/10/16 23:18:03 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
@@ -239,13 +239,13 @@ fi
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h stdarg.h netdb.h dirent.h)
+AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h stdarg.h netdb.h)
 AC_CHECK_HEADERS(sys/stat.h sys/sockio.h sys/types.h sys/socket.h)
-AC_CHECK_HEADERS(sys/wait.h sys/param.h)
+AC_CHECK_HEADERS(sys/wait.h)
 AC_CHECK_HEADERS(netinet/in.h)
 AC_CHECK_HEADERS(stddef.h)
 AC_CHECK_HEADERS(dlfcn.h)
-AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h)
+AC_CHECK_HEADERS(arpa/inet.h)
 
 dnl SNMP Check
 AC_ARG_ENABLE(snmp,
@@ -359,57 +359,6 @@ fi
 AC_SUBST(MKSTEMP_C)
 AC_SUBST(MKSTEMP_O)
 
-AC_CHECK_FUNC(inet_aton, INET_ATON_O="",
-  INET_ATON_O="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)
-fi
-AC_SUBST(INET_ATON_C)
-AC_SUBST(INET_ATON_O)
-
-AC_CHECK_FUNC(inet_pton, [
-  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.o"
-else
-  INET_PTON_C=""
-  INET_PTON_O=""
-fi
-AC_SUBST(INET_PTON_C)
-AC_SUBST(INET_PTON_O)
-
-AC_CHECK_FUNC(inet_ntop, INET_NTOP_O="",
-  INET_NTOP_O="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)
-fi
-AC_SUBST(INET_NTOP_C)
-AC_SUBST(INET_NTOP_O)
-
 AC_CHECK_FUNCS(getprotobynumber gethostbyname2)
 
 dnl blank for now, but will be used in future

epan/AUTHORS

@@ -0,0 +1,8 @@
+Authors
+-------
+Gilbert Ramirez		<gram@xiexie.org>
+Guy Harris		<guy@alum.mit.edu>
+Laurent Deniel		<deniel@worldnet.fr>
+
+[XXX - throw into this list all the other Ethereal contributors whose
+code got moved here]

epan/Makefile.am

@@ -2,7 +2,7 @@
 # Automake file for the EPAN library
 # (Ethereal Protocol ANalyzer Library)
 #
-# $Id: Makefile.am,v 1.9 2000/10/14 04:31:25 gram Exp $
+# $Id: Makefile.am,v 1.10 2000/10/16 23:17:39 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -30,8 +30,11 @@ YFLAGS=-d -p dfilter_
 # EPAN will eventually be a shared library. While I move source code around,
 # however, it is an archive library.
 
+ACLOCAL_AMFLAGS = `../aclocal-flags`
+
 noinst_LIBRARIES = libethereal.a
 
+INCLUDES = -I$(srcdir)/..
 
 libethereal_a_SOURCES = \
 	conversation.c		\
@@ -82,6 +85,12 @@ CLEANFILES = \
 	libethereal.a	\
 	*~
 
+#
+# Add the object files for missing routines, if any.
+#
+libethereal_a_LIBADD = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@
+libethereal_a_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@
+
 dfilter-scanner.c : dfilter-scanner.l
 	$(LEX) -Pdfilter_ -odfilter-scanner.c $(srcdir)/dfilter-scanner.l
 

epan/NEWS

@@ -0,0 +1,2 @@
+epan 0.0.0:
+* Initial public release (in ethereal CVS tree)

epan/README

@@ -0,0 +1,3 @@
+$Id: README,v 1.1 2000/10/16 23:17:39 guy Exp $
+
+XXX - put something here

epan/acconfig.h

@@ -0,0 +1,32 @@
+/* acconfig.h
+ * #ifdefs to be controlled by "configure"
+ *
+ * $Id: acconfig.h,v 1.1 2000/10/16 23:17:39 guy 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

epan/configure.in

@@ -0,0 +1,119 @@
+# $Id: configure.in,v 1.1 2000/10/16 23:17:39 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
+dnl defines SHELL, and "Makefile.in" has
+dnl
+dnl	SHELL = @SHELL@
+dnl
+dnl which requires it to be defined - and there may be other problems
+dnl with pre-2.13 "autoconf" as well.
+dnl
+AC_INIT(epan.c)
+
+AC_PREREQ(2.13)
+
+AM_INIT_AUTOMAKE(libethereal.a, 0.0.0)
+AM_CONFIG_HEADER(config.h)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_YACC
+AM_PROG_LEX
+AC_PROG_RANLIB
+AC_PATH_PROG(LEX, flex)
+
+AC_SUBST(FLEX_PATH)
+
+# If we're running gcc, add '-Wall' to CFLAGS.
+AC_MSG_CHECKING(to see if we can add '-Wall' to CFLAGS)
+if test x$GCC != x ; then
+  CFLAGS="-Wall $CFLAGS"
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
+# Create DATAFILE_DIR #define for config.h
+DATAFILE_DIR=$sysconfdir
+DATAFILE_DIR=`(
+    test "x$prefix" = xNONE && prefix=$ac_default_prefix
+    test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
+    eval echo "$DATAFILE_DIR"
+)`
+AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$DATAFILE_DIR")
+AC_SUBST(DATAFILE_DIR)
+
+# Checks for glib first, or gtk+ if not present
+AM_PATH_GLIB(1.1.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS")
+
+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)
+AC_CHECK_HEADERS(dlfcn.h)
+
+#
+# XXX - we should also somehow arrange to support dynamic linking on
+# HP-UX, even though it hasn't yet, apparently, implemented the
+# UNIX standard "dlopen()" interface atop its own interface.
+#
+if test "$ac_cv_header_dlfcn_h" = yes ; then
+  AC_DEFINE(HAVE_PLUGINS)
+fi
+
+AC_CHECK_FUNC(inet_aton, INET_ATON_O="",
+  INET_ATON_O="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)
+fi
+AC_SUBST(INET_ATON_C)
+AC_SUBST(INET_ATON_O)
+
+AC_CHECK_FUNC(inet_pton, [
+  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.o"
+else
+  INET_PTON_C=""
+  INET_PTON_O=""
+fi
+AC_SUBST(INET_PTON_C)
+AC_SUBST(INET_PTON_O)
+
+AC_CHECK_FUNC(inet_ntop, INET_NTOP_O="",
+  INET_NTOP_O="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)
+fi
+AC_SUBST(INET_NTOP_C)
+AC_SUBST(INET_NTOP_O)
+
+AC_OUTPUT(Makefile)

epan/epan.c

@@ -1,3 +1,10 @@
+/* epan.h
+ *
+ * $Id: epan.c,v 1.4 2000/10/16 23:17:39 guy Exp $
+ *
+ * Ethereal Protocol Analyzer Library
+ *
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -14,16 +21,37 @@
 #include "proto.h"
 #include "tvbuff.h"
 
+/*
+ * XXX - this takes the plugin directory as an argument, because
+ * libethereal now has its own configure script and "config.h" file,
+ * which is what code in the "epan" directory includes, but we need
+ * to define PLUGIN_DIR in the top-level directory, as it's used by,
+ * for example, the Makefile for the Gryphon plugin, so it knows
+ * where to install the plugin.
+ *
+ * Eventually, we should probably have an "epan-configure" script
+ * (or "libethereal-configure", or whatever), along the lines of what
+ * GTK+ and GLib have, that can print, among other things, the directory
+ * into which plugins should be installed.  That way, only libethereal
+ * need know what directory that is; programs using it won't, *and*
+ * Makefiles for plugins can just use "epan-configure" to figure out
+ * where to install the plugins.
+ *
+ * (Would that *more* libraries had configure scripts like that, so
+ * that configure scripts didn't have to go through various contortions
+ * to figure out where the header files and libraries for various
+ * libraries are located.)
+ */
 void
-epan_init(void)
+epan_init(const char *plugin_dir)
 {
 	except_init();
 	tvbuff_init();
 	packet_init();
 	proto_init();
 	dfilter_init();
 #ifdef HAVE_PLUGINS
-	init_plugins();
+	init_plugins(plugin_dir);
 #endif
 }
 

epan/epan.h

@@ -1,4 +1,6 @@
 /* epan.h
+ *
+ * $Id: epan.h,v 1.4 2000/10/16 23:17:39 guy Exp $
  *
  * Ethereal Protocol Analyzer Library
  *
@@ -12,7 +14,7 @@
 /* XXX - for now */
 #include "packet.h"
 
-void epan_init(void);
+void epan_init(const char *);
 void epan_cleanup(void);
 void epan_conversation_init(void);