All our programs link against glib so don't there's no need to link our libraries against it too. This should allow us to build Wireshark (with dynamic libs) with static glib (read: it should fix the OS X buildbot building with glib-1.2).

svn path=/trunk/; revision=24518

epan/ftypes/Makefile.am

@@ -6,17 +6,17 @@
 # By Gerald Combs <gerald@wireshark.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.
@@ -52,7 +52,7 @@ libftypes_la_SOURCES =	\
 	ftype-time.c	\
 	ftype-tvbuff.c
 
-libftypes_la_LIBADD = @GLIB_LIBS@ @PCRE_LIBS@
+libftypes_la_LIBADD = @PCRE_LIBS@
 
 EXTRA_DIST = \
 	Makefile.nmake

wiretap/Makefile.am

@@ -67,7 +67,7 @@ EXTRA_DIST = \
 	$(GENERATOR_FILES) 	\
 	$(GENERATED_FILES)
 
-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS)
+libwiretap_la_LIBADD = libwiretap_generated.la
 libwiretap_la_DEPENDENCIES = libwiretap_generated.la
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh