Make sure to link lyx and tex2lyx against libiconv.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14814 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Makefile.am b/src/Makefile.am
index 597b7ab39f2f1a9dd0e2709873d1b2b292afd925..4364e251185ae27d58c2523e5293aa0cde6c646f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
 
 BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(BOOST_LIBS) $(LIBICONV) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 bin_PROGRAMS = lyx
 noinst_PROGRAMS = $(FRONTENDS_PROGS)

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 2a0935ac7773c313aa7a7108a9679fbb3797a3bc..37174b69c48227c8eb5a732452a6772c69fc285f 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -57,7 +57,7 @@ tex2lyx_SOURCES = \
 
 tex2lyx_LDADD = \
        $(top_builddir)/src/support/libsupport.la \
-       $(BOOST_LIBS) $(COMPRESSIONLIB)
+       $(BOOST_LIBS) $(LIBICONV) $(COMPRESSIONLIB)
 
 $(LINKED_FILES) :
        @rm -f $@ ; \