Wireshark · Ethereal-users: [Ethereal-users] Minor configuration fixes

[Corey Minyard <cminyard@xxxxxxxxxx>]

The following patch makes building ethereal cross (on one platform for 
another platform) a little easier.  The most important change is to 
configure.in, the -lethereal is not correct here.  The other changes 
rely on the Makefile macros instead of the autoconf macros.  This allows 
the macros to be overridden when make is run, and is generally better style.

Thanks,

-Corey

--- ethereal-0.10.10.old/configure.in.old	2005-03-29 20:39:38.968285000 -0600
+++ ethereal-0.10.10/configure.in	2005-03-29 20:40:04.068092912 -0600
@@ -1202,7 +1202,7 @@
 #
 # The plugin dissectors reside in ./plugins/PROTO/
 #
-PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
+PLUGIN_LIBS="-L../../epan \$(top_builddir)/epan/libethereal.la $GLIB_LIBS"
 AC_SUBST(PLUGIN_LIBS)
 
 dnl libtool defs
diff -ur ethereal-0.10.10.old/epan/ftypes/Makefile.am ethereal-0.10.10/epan/ftypes/Makefile.am
--- ethereal-0.10.10.old/epan/ftypes/Makefile.am	2005-03-10 09:53:07.000000000 -0600
+++ ethereal-0.10.10/epan/ftypes/Makefile.am	2005-03-30 13:58:55.468246936 -0600
@@ -44,7 +44,7 @@
 	ftype-time.c	\
 	ftype-tvbuff.c
 
-libftypes_la_LIBADD = @GLIB_LIBS@ @PCRE_LIBS@
+libftypes_la_LIBADD = $(GLIB_LIBS) $(PCRE_LIBS)
 
 EXTRA_DIST = \
 	Makefile.nmake
diff -ur ethereal-0.10.10.old/Makefile.am ethereal-0.10.10/Makefile.am
--- ethereal-0.10.10.old/Makefile.am	2005-03-10 09:53:46.000000000 -0600
+++ ethereal-0.10.10/Makefile.am	2005-03-30 14:06:45.850606570 -0600
@@ -205,8 +205,8 @@
 # we should probably split this into stuff needed both
 # by ethereal and tethereal and stuff needed only by one or the
 # other.
-ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ \
-	@STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@
+ethereal_optional_objects = $(SNPRINTF_O) $(STRERROR_O) \
+	$(STRCASECMP_O) $(STRNCASECMP_O) $(MKSTEMP_O) $(STRPTIME_O)
 
 # Additional libs that I know how to build. These will be
 # linked into the ethereal executable.
@@ -238,10 +238,10 @@
 ethereal_LDADD = \
 	$(ethereal_optional_objects)	\
 	$(ethereal_additional_libs)	\
-	@SNMP_LIBS@ @SSL_LIBS@ 		\
+	$(SNMP_LIBS) $(SSL_LIBS) 	\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
-	@PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@
+	$(PCRE_LIBS)			\
+	$(PCAP_LIBS) $(GTK_LIBS) $(ADNS_LIBS) $(KRB5_LIBS) $(FRAMEWORKS)
 
 # Additional libs that I know how to build. These will be
 # linked into the tethereal executable.
@@ -259,11 +259,11 @@
 tethereal_LDADD = \
 	$(ethereal_optional_objects)	\
 	$(tethereal_additional_libs)	\
-	@SNMP_LIBS@ @SSL_LIBS@		\
+	$(SNMP_LIBS) $(SSL_LIBS)	\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
-	@GLIB_LIBS@ -lm			\
-	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
+	$(PCRE_LIBS)			\
+	$(GLIB_LIBS) -lm			\
+	$(PCAP_LIBS) $(SOCKET_LIBS) $(NSL_LIBS) $(ADNS_LIBS) $(KRB5_LIBS)
 
 if ENABLE_STATIC
 tethereal_LDFLAGS = -Wl,-static -all-static
@@ -273,13 +273,13 @@
 
 # Optional objects that I know how to build, and that are needed by
 # text2pcap.
-text2pcap_optional_objects = @STRERROR_O@ @STRPTIME_O@
+text2pcap_optional_objects = $(STRERROR_O) $(STRPTIME_O)
 
 text2pcap_DEPENDENCIES = text2pcap.h
 
 # This automake variable adds to the link-line for the executable
 text2pcap_LDADD = $(text2pcap_optional_objects) \
-	@GLIB_LIBS@ -lm
+	$(GLIB_LIBS) -lm
 
 mergecap_DEPENDENCIES = wiretap/libwiretap.la
 
@@ -288,9 +288,9 @@
 editcap_DEPENDENCIES = wiretap/libwiretap.la
 
 # This automake variable adds to the link-line for the executable
-capinfos_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
-editcap_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
-mergecap_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
+capinfos_LDADD = wiretap/libwiretap.la $(GLIB_LIBS)
+editcap_LDADD = wiretap/libwiretap.la $(GLIB_LIBS)
+mergecap_LDADD = wiretap/libwiretap.la $(GLIB_LIBS)
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
@@ -359,8 +359,8 @@
 
 randpkt_LDADD = \
 	$(randpkt_additional_libs) \
-	@GLIB_LIBS@ -lm			\
-	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
+	$(GLIB_LIBS) -lm		\
+	$(PCAP_LIBS) $(SOCKET_LIBS) $(NSL_LIBS) $(ADNS_LIBS)
 
 dftest_additional_libs =		\
 	wiretap/libwiretap.la		\
@@ -375,11 +375,11 @@
 dftest_LDADD = \
 	$(ethereal_optional_objects)	\
 	$(dftest_additional_libs)	\
- 	@SNMP_LIBS@ @SSL_LIBS@		\
+	$(SNMP_LIBS) $(SSL_LIBS)	\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
-	@GLIB_LIBS@ -lm			\
-	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
+	$(PCRE_LIBS)			\
+	$(GLIB_LIBS) -lm			\
+	$(PCAP_LIBS) $(SOCKET_LIBS) $(NSL_LIBS) $(ADNS_LIBS) $(KRB5_LIBS)
 
 dftest_LDFLAGS = -export-dynamic
 
@@ -390,7 +390,7 @@
 #
 CLEANFILES =		\
 	svnversion.h	\
-	@rdps_bin@	\
+	$(rdps_bin)	\
 	idl2eth		\
 	*~
 
@@ -578,9 +578,9 @@
 DIST_SUBDIRS = tools wiretap doc epan plugins packaging gtk help
 
 if HAVE_PLUGINS
-SUBDIRS = tools wiretap doc epan plugins packaging help @ethereal_SUBDIRS@
+SUBDIRS = tools wiretap doc epan plugins packaging help $(ethereal_SUBDIRS)
 else
-SUBDIRS = tools wiretap doc epan packaging help @ethereal_SUBDIRS@
+SUBDIRS = tools wiretap doc epan packaging help $(ethereal_SUBDIRS)
 endif
 
 ethereal.1: doc/ethereal.pod AUTHORS-SHORT-FORMAT
diff -ur ethereal-0.10.10.old/plugins/acn/Makefile.am ethereal-0.10.10/plugins/acn/Makefile.am
--- ethereal-0.10.10.old/plugins/acn/Makefile.am	2005-03-10 09:53:03.000000000 -0600
+++ ethereal-0.10.10/plugins/acn/Makefile.am	2005-03-30 14:11:56.675181597 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = acn.la
 acn_la_SOURCES = packet-acn.c moduleinfo.h acn.h
 acn_la_LDFLAGS = -module -avoid-version
-acn_la_LIBADD = @PLUGIN_LIBS@
+acn_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/agentx/Makefile.am ethereal-0.10.10/plugins/agentx/Makefile.am
--- ethereal-0.10.10.old/plugins/agentx/Makefile.am	2005-03-10 09:53:02.000000000 -0600
+++ ethereal-0.10.10/plugins/agentx/Makefile.am	2005-03-30 14:11:52.925657226 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = agentx.la
 agentx_la_SOURCES = packet-agentx.c moduleinfo.h
 agentx_la_LDFLAGS = -module -avoid-version
-agentx_la_LIBADD = @PLUGIN_LIBS@
+agentx_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/artnet/Makefile.am ethereal-0.10.10/plugins/artnet/Makefile.am
--- ethereal-0.10.10.old/plugins/artnet/Makefile.am	2005-03-10 09:53:03.000000000 -0600
+++ ethereal-0.10.10/plugins/artnet/Makefile.am	2005-03-30 14:11:47.886296469 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = artnet.la
 artnet_la_SOURCES = packet-artnet.c moduleinfo.h
 artnet_la_LDFLAGS = -module -avoid-version
-artnet_la_LIBADD = @PLUGIN_LIBS@
+artnet_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/asn1/Makefile.am ethereal-0.10.10/plugins/asn1/Makefile.am
--- ethereal-0.10.10.old/plugins/asn1/Makefile.am	2005-03-10 09:53:03.000000000 -0600
+++ ethereal-0.10.10/plugins/asn1/Makefile.am	2005-03-30 14:11:44.535721489 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = asn1.la
 asn1_la_SOURCES = packet-asn1.c moduleinfo.h
 asn1_la_LDFLAGS = -module -avoid-version
-asn1_la_LIBADD = @PLUGIN_LIBS@
+asn1_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/ciscosm/Makefile.am ethereal-0.10.10/plugins/ciscosm/Makefile.am
--- ethereal-0.10.10.old/plugins/ciscosm/Makefile.am	2005-03-10 09:53:03.000000000 -0600
+++ ethereal-0.10.10/plugins/ciscosm/Makefile.am	2005-03-30 14:11:41.455112263 -0600
@@ -30,7 +30,7 @@
 plugin_LTLIBRARIES = ciscosm.la
 ciscosm_la_SOURCES = packet-sm.c moduleinfo.h
 ciscosm_la_LDFLAGS = -module -avoid-version
-ciscosm_la_LIBADD = @PLUGIN_LIBS@
+ciscosm_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/docsis/Makefile.am ethereal-0.10.10/plugins/docsis/Makefile.am
--- ethereal-0.10.10.old/plugins/docsis/Makefile.am	2005-03-10 09:53:01.000000000 -0600
+++ ethereal-0.10.10/plugins/docsis/Makefile.am	2005-03-30 14:11:36.860695062 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = docsis.la
 docsis_la_SOURCES = packet-intrngreq.c packet-type29ucd.c packet-docsis.c packet-bpkmattr.c packet-dsarsp.c packet-macmgmt.c packet-rngrsp.c packet-bpkmreq.c packet-dscack.c packet-map.c packet-tlv.c packet-bpkmrsp.c packet-dscreq.c packet-regack.c packet-uccreq.c packet-dscrsp.c packet-regreq.c packet-uccrsp.c packet-dsaack.c packet-dsdreq.c packet-regrsp.c packet-ucd.c packet-dsareq.c packet-dsdrsp.c packet-rngreq.c packet-vendor.c packet-docsis.h packet-tlv.h moduleinfo.h
 docsis_la_LDFLAGS = -module -avoid-version
-docsis_la_LIBADD = @PLUGIN_LIBS@
+docsis_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/enttec/Makefile.am ethereal-0.10.10/plugins/enttec/Makefile.am
--- ethereal-0.10.10.old/plugins/enttec/Makefile.am	2005-03-10 09:53:01.000000000 -0600
+++ ethereal-0.10.10/plugins/enttec/Makefile.am	2005-03-30 14:11:32.367265050 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = enttec.la
 enttec_la_SOURCES = packet-enttec.c moduleinfo.h
 enttec_la_LDFLAGS = -module -avoid-version
-enttec_la_LIBADD = @PLUGIN_LIBS@
+enttec_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/giop/Makefile.am ethereal-0.10.10/plugins/giop/Makefile.am
--- ethereal-0.10.10.old/plugins/giop/Makefile.am	2005-03-10 09:53:04.000000000 -0600
+++ ethereal-0.10.10/plugins/giop/Makefile.am	2005-03-30 14:11:28.411766800 -0600
@@ -32,11 +32,11 @@
 plugin_LTLIBRARIES = cosnaming.la coseventcomm.la
 cosnaming_la_SOURCES = packet-cosnaming.c moduleinfo.h
 cosnaming_la_LDFLAGS = -module -avoid-version
-cosnaming_la_LIBADD = @PLUGIN_LIBS@
+cosnaming_la_LIBADD = $(PLUGIN_LIBS)
 
 coseventcomm_la_SOURCES = packet-coseventcomm.c moduleinfo.h
 coseventcomm_la_LDFLAGS = -module -avoid-version
-coseventcomm_la_LIBADD = @PLUGIN_LIBS@
+coseventcomm_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/gryphon/Makefile.am ethereal-0.10.10/plugins/gryphon/Makefile.am
--- ethereal-0.10.10.old/plugins/gryphon/Makefile.am	2005-03-10 09:53:04.000000000 -0600
+++ ethereal-0.10.10/plugins/gryphon/Makefile.am	2005-03-30 14:11:21.555636491 -0600
@@ -31,7 +31,7 @@
 plugin_LTLIBRARIES = gryphon.la
 gryphon_la_SOURCES = packet-gryphon.c packet-gryphon.h moduleinfo.h
 gryphon_la_LDFLAGS = -module -avoid-version
-gryphon_la_LIBADD = @PLUGIN_LIBS@
+gryphon_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/irda/Makefile.am ethereal-0.10.10/plugins/irda/Makefile.am
--- ethereal-0.10.10.old/plugins/irda/Makefile.am	2005-03-10 09:53:01.000000000 -0600
+++ ethereal-0.10.10/plugins/irda/Makefile.am	2005-03-30 14:11:14.877483602 -0600
@@ -30,7 +30,7 @@
 irda_la_SOURCES = packet-irda.c moduleinfo.h irda-appl.h packet-ircomm.c \
 	packet-sir.c
 irda_la_LDFLAGS = -module -avoid-version
-irda_la_LIBADD = @PLUGIN_LIBS@
+irda_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/lwres/Makefile.am ethereal-0.10.10/plugins/lwres/Makefile.am
--- ethereal-0.10.10.old/plugins/lwres/Makefile.am	2005-03-10 09:53:04.000000000 -0600
+++ ethereal-0.10.10/plugins/lwres/Makefile.am	2005-03-30 14:11:11.938856360 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = lwres.la
 lwres_la_SOURCES = packet-lwres.c moduleinfo.h
 lwres_la_LDFLAGS = -module -avoid-version
-lwres_la_LIBADD = @PLUGIN_LIBS@
+lwres_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/mate/Makefile.am ethereal-0.10.10/plugins/mate/Makefile.am
--- ethereal-0.10.10.old/plugins/mate/Makefile.am	2005-03-10 09:53:02.000000000 -0600
+++ ethereal-0.10.10/plugins/mate/Makefile.am	2005-03-30 14:11:08.889243197 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = mate.la
 mate_la_SOURCES = moduleinfo.h mate.h  mate_util.h packet-mate.c mate_runtime.c mate_setup.c mate_util.c mate_plugin.c
 mate_la_LDFLAGS = -module -avoid-version
-mate_la_LIBADD = @PLUGIN_LIBS@
+mate_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/megaco/Makefile.am ethereal-0.10.10/plugins/megaco/Makefile.am
--- ethereal-0.10.10.old/plugins/megaco/Makefile.am	2005-03-10 09:53:03.000000000 -0600
+++ ethereal-0.10.10/plugins/megaco/Makefile.am	2005-03-30 14:11:06.060602003 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = megaco.la
 megaco_la_SOURCES = packet-megaco.c moduleinfo.h
 megaco_la_LDFLAGS = -module -avoid-version
-megaco_la_LIBADD = @PLUGIN_LIBS@
+megaco_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/mgcp/Makefile.am ethereal-0.10.10/plugins/mgcp/Makefile.am
--- ethereal-0.10.10.old/plugins/mgcp/Makefile.am	2005-03-10 09:53:04.000000000 -0600
+++ ethereal-0.10.10/plugins/mgcp/Makefile.am	2005-03-30 14:11:03.143971969 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = mgcp.la
 mgcp_la_SOURCES = packet-mgcp.c packet-mgcp.h moduleinfo.h
 mgcp_la_LDFLAGS = -module -avoid-version
-mgcp_la_LIBADD = @PLUGIN_LIBS@
+mgcp_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/opsi/Makefile.am ethereal-0.10.10/plugins/opsi/Makefile.am
--- ethereal-0.10.10.old/plugins/opsi/Makefile.am	2005-03-10 09:53:05.000000000 -0600
+++ ethereal-0.10.10/plugins/opsi/Makefile.am	2005-03-30 14:10:59.788397614 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = opsi.la
 opsi_la_SOURCES = packet-opsi.c packet-opsi.h moduleinfo.h
 opsi_la_LDFLAGS = -module -avoid-version
-opsi_la_LIBADD = @PLUGIN_LIBS@
+opsi_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/pcli/Makefile.am ethereal-0.10.10/plugins/pcli/Makefile.am
--- ethereal-0.10.10.old/plugins/pcli/Makefile.am	2005-03-10 09:53:04.000000000 -0600
+++ ethereal-0.10.10/plugins/pcli/Makefile.am	2005-03-30 14:10:55.990879318 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = pcli.la
 pcli_la_SOURCES = packet-pcli.c moduleinfo.h
 pcli_la_LDFLAGS = -module -avoid-version
-pcli_la_LIBADD = @PLUGIN_LIBS@
+pcli_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/rdm/Makefile.am ethereal-0.10.10/plugins/rdm/Makefile.am
--- ethereal-0.10.10.old/plugins/rdm/Makefile.am	2005-03-10 09:53:01.000000000 -0600
+++ ethereal-0.10.10/plugins/rdm/Makefile.am	2005-03-30 14:10:48.698804291 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = rdm.la
 rdm_la_SOURCES = packet-rdm.c moduleinfo.h
 rdm_la_LDFLAGS = -module -avoid-version
-rdm_la_LIBADD = @PLUGIN_LIBS@
+rdm_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/rlm/Makefile.am ethereal-0.10.10/plugins/rlm/Makefile.am
--- ethereal-0.10.10.old/plugins/rlm/Makefile.am	2005-03-10 09:53:02.000000000 -0600
+++ ethereal-0.10.10/plugins/rlm/Makefile.am	2005-03-30 14:10:44.088389102 -0600
@@ -30,7 +30,7 @@
 plugin_LTLIBRARIES = rlm.la
 rlm_la_SOURCES = packet-rlm.c moduleinfo.h
 rlm_la_LDFLAGS = -module -avoid-version
-rlm_la_LIBADD = @PLUGIN_LIBS@
+rlm_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/rtnet/Makefile.am ethereal-0.10.10/plugins/rtnet/Makefile.am
--- ethereal-0.10.10.old/plugins/rtnet/Makefile.am	2005-03-10 09:53:03.000000000 -0600
+++ ethereal-0.10.10/plugins/rtnet/Makefile.am	2005-03-30 14:10:40.712817278 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = rtnet.la
 rtnet_la_SOURCES = packet-rtnet.c moduleinfo.h
 rtnet_la_LDFLAGS = -module -avoid-version
-rtnet_la_LIBADD = @PLUGIN_LIBS@
+rtnet_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/rudp/Makefile.am ethereal-0.10.10/plugins/rudp/Makefile.am
--- ethereal-0.10.10.old/plugins/rudp/Makefile.am	2005-03-10 09:53:05.000000000 -0600
+++ ethereal-0.10.10/plugins/rudp/Makefile.am	2005-03-30 14:10:34.333626447 -0600
@@ -30,7 +30,7 @@
 plugin_LTLIBRARIES = rudp.la
 rudp_la_SOURCES = packet-rudp.c moduleinfo.h
 rudp_la_LDFLAGS = -module -avoid-version
-rudp_la_LIBADD = @PLUGIN_LIBS@
+rudp_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/stats_tree/Makefile.am ethereal-0.10.10/plugins/stats_tree/Makefile.am
--- ethereal-0.10.10.old/plugins/stats_tree/Makefile.am	2005-03-10 09:53:05.000000000 -0600
+++ ethereal-0.10.10/plugins/stats_tree/Makefile.am	2005-03-30 14:10:24.248905640 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = stats_tree.la
 stats_tree_la_SOURCES = http_stats_tree.c stats_tree_plugin.c
 stats_tree_la_LDFLAGS = -module -avoid-version
-stats_tree_la_LIBADD = @PLUGIN_LIBS@
+stats_tree_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/v5ua/Makefile.am ethereal-0.10.10/plugins/v5ua/Makefile.am
--- ethereal-0.10.10.old/plugins/v5ua/Makefile.am	2005-03-10 09:53:04.000000000 -0600
+++ ethereal-0.10.10/plugins/v5ua/Makefile.am	2005-03-30 14:10:12.571386862 -0600
@@ -29,7 +29,7 @@
 plugin_LTLIBRARIES = v5ua.la
 v5ua_la_SOURCES = packet-v5ua.c moduleinfo.h
 v5ua_la_LDFLAGS = -module -avoid-version
-v5ua_la_LIBADD = @PLUGIN_LIBS@
+v5ua_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,
diff -ur ethereal-0.10.10.old/plugins/xml/Makefile.am ethereal-0.10.10/plugins/xml/Makefile.am
--- ethereal-0.10.10.old/plugins/xml/Makefile.am	2005-03-10 09:53:05.000000000 -0600
+++ ethereal-0.10.10/plugins/xml/Makefile.am	2005-03-30 14:09:49.751281428 -0600
@@ -32,11 +32,11 @@
 	xml_lexer.l \
 	packet-xml.c \
 	xml_plugin.c
-	
+
 #	dtd.h dtd.c dtd_lexer.l dtd_prep.l dtd_parser.c dtd_parser.h
 
 xml_la_LDFLAGS = -module -avoid-version
-xml_la_LIBADD = @PLUGIN_LIBS@
+xml_la_LIBADD = $(PLUGIN_LIBS)
 
 # Libs must be cleared, or else libtool won't create a shared module.
 # If your module needs to be linked against any particular libraries,