diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-05-20 14:30:01 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-05-20 14:30:01 +0000 |
| commit | 607fe3be71bbed005f21a62f7230eb062afebb77 (patch) | |
| tree | 41a163b7b10da625f7e4b056a1c0cb1d9ee93d8f | |
| parent | 5f16de65dd809f337ba2914c8c587054a2993733 (diff) | |
Undo rev 24518 and (re)fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2291 .
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25327 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/ftypes/Makefile.am | 2 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am index 9880feedf8..c0b6665e97 100644 --- a/epan/ftypes/Makefile.am +++ b/epan/ftypes/Makefile.am @@ -52,7 +52,7 @@ libftypes_la_SOURCES = \ ftype-time.c \ ftype-tvbuff.c -libftypes_la_LIBADD = @PCRE_LIBS@ +libftypes_la_LIBADD = @GLIB_LIBS@ @PCRE_LIBS@ EXTRA_DIST = \ Makefile.nmake diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index ffe0781fae..179f1ec729 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -67,7 +67,7 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) -libwiretap_la_LIBADD = libwiretap_generated.la +libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) libwiretap_la_DEPENDENCIES = libwiretap_generated.la RUNLEX = $(top_srcdir)/tools/runlex.sh |