diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-07-13 18:17:32 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-07-13 18:17:32 +0000 |
| commit | a832d689c6723f75fba9ebdd330f7cdc16a87505 (patch) | |
| tree | ea7c536125331094ad4c3c1de2419a96c9f461ad /Makefile.am | |
| parent | 8b9e4e40e4fcb3d210a5a95d97b148eacf4e60bb (diff) | |
Under Solaris (9, at least) the "iconv.h" header supplied with GNU libiconv
is incompatible with the iconv routines in libc. Add an aclocal macro from
Bruno Haible that sorts everything out.
svn path=/trunk/; revision=18729
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f1c8a901cb..5f0dabb06b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -314,6 +314,7 @@ wireshark_LDADD = \ $(plugin_ldadd) \ @PCRE_LIBS@ \ @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \ + @LIBICONV@ \ @LIBGNUTLS_LIBS@ # Additional libs that I know how to build. These will be @@ -520,6 +521,7 @@ EXTRA_DIST = \ aclocal-fallback/glib.m4 \ aclocal-fallback/gtk-2.0.m4 \ aclocal-fallback/gtk.m4 \ + aclocal-fallback/iconv.m4 \ aclocal-flags \ autogen.sh \ capinfos.c \ |