Remove libltdl from the build. The directory is still in CVS, but it is

not used in the build. I'll wait a few days to remove the libltdl
directory, just in case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1490 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 95ba9f7e328c769d7634a2378ee1131612c119bb..7e0df2fbeee139b83e3a511cb491bac8a57dfd80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.154 2000/01/15 09:46:27 guy Exp $
+# $Id: Makefile.am,v 1.155 2000/01/15 13:25:13 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -31,15 +31,6 @@ sysconf_DATA = manuf
 # Any POSIX-compatible YACC should honor the -p flag
 YFLAGS=-d -p dfilter_
 
-## use @LIBLTDL@ because some broken makes do not accept macros in targets
-## we can only do this because our LIBLTDL does not contain ${top_builddir}
-@LIBLTDL@: libtool libltdl/libtool libltdl/config.h \
-       $(srcdir)/libltdl/ltdl.c $(srcdir)/libltdl/ltdl.h
-       (cd libltdl; $(MAKE) `echo $(LIBLTDL) | sed 's,.*\.\./libltdl/,,g'`)
-# Without the following line, the check may fail if libltdl/libtool is
-# removed after libltdl is configured
-libltdl/libtool libltdl/config.h:
-
 DISSECTOR_SOURCES = \
        packet-aarp.c  \
        packet-afs.c   \
@@ -276,7 +267,6 @@ ethereal_additional_libs = wiretap/libwiretap.a gtk/libui.a
 ethereal_DEPENDENCIES = \
        $(ethereal_optional_objects)    \
        $(ethereal_additional_libs)     \
-       @LIBLTDL@
        plugins/gryphon/gryphon.la
 
 # This automake variable adds to the link-line for the executable.
@@ -290,7 +280,7 @@ ethereal_LDADD = \
        $(ethereal_optional_objects)    \
        $(ethereal_additional_libs)     \
        @SNMP_LIBS@                     \
-       @LIBLTDL@ "-dlopen" self        \
+       "-dlopen" self  \
        "-dlopen" plugins/gryphon/gryphon.la @PCAP_LIBS@ @GTK_LIBS@
 
 ethereal_LDFLAGS = -export-dynamic
@@ -308,7 +298,6 @@ tethereal_additional_libs = wiretap/libwiretap.a
 tethereal_DEPENDENCIES = \
        $(ethereal_optional_objects)    \
        $(tethereal_additional_libs)    \
-       @LIBLTDL@
        plugins/gryphon/gryphon.la
 
 # This automake variable adds to the link-line for the executable
@@ -316,7 +305,7 @@ tethereal_LDADD = wiretap/libwiretap.a      \
        $(ethereal_optional_objects)    \
        $(tethereal_additional_libs)    \
        @SNMP_LIBS@                     \
-       @LIBLTDL@ "-dlopen" self        \
+       "-dlopen" self  \
        "-dlopen" plugins/gryphon/gryphon.la @GLIB_LIBS@ -lm \
        @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
 
@@ -421,7 +410,7 @@ EXTRA_DIST = \
 dist-hook:
        @rm -f $(distdir)/register.c
 
-SUBDIRS = wiretap gtk plugins libltdl @ethereal_SUBDIRS@
+SUBDIRS = wiretap gtk plugins @ethereal_SUBDIRS@
 
 ethereal.1: ethereal doc/ethereal.pod.template
        (cd doc ; \
@@ -438,7 +427,5 @@ editcap.1: doc/editcap.pod
 dfilter-scanner.c : dfilter-scanner.l
        $(LEX) -Pdfilter_ -t $(srcdir)/dfilter-scanner.l > dfilter-scanner.c
 
-INCLUDES = -I$(srcdir)/libltdl
-
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck

diff --git a/configure.in b/configure.in
index 27fd59c55d24d5e844f4b93bac9c0cb514f0c052..3bacd693d6a6e57403472c55a8b423bda3ecf93c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.76 2000/01/15 09:46:28 guy Exp $
+# $Id: configure.in,v 1.77 2000/01/15 13:25:13 gram 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
@@ -341,14 +341,12 @@ AC_DEFINE_UNQUOTED(PLUGIN_DIR,"$PLUGIN_DIR", [Plugin installation directory])
 AC_SUBST(PLUGIN_DIR)
 
 dnl libtool defs
-AC_LIBLTDL_CONVENIENCE(libltdl)
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
-AC_SUBST(LIBLTDL)
 AC_SUBST(LIBTOOL_DEPS)
 
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SUBDIRS(wiretap libltdl)
+AC_CONFIG_SUBDIRS(wiretap)
 AC_OUTPUT(
   Makefile
   ethereal.spec

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 202b5ac1d05f0e881e7f68bf7797d15fc59c9a11..1a99a8d0d31b9b4011d75788295b9d7918b8f589 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for the GTK interface routines for Ethereal
 #
-# $Id: Makefile.am,v 1.19 2000/01/10 01:43:58 guy Exp $
+# $Id: Makefile.am,v 1.20 2000/01/15 13:25:22 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -67,5 +67,3 @@ libui_a_SOURCES = \
        summary_dlg.h   \
        ui_util.c
 
-INCLUDES = -I$(srcdir)/../libltdl
-