Avoid libapr's .la from breaking libiconv search.

diff --git a/Makefile.am b/Makefile.am
index 8e6b3649ff2af0d4aef16c2a69ea50a728dc7950..63878198c33708638a1494ec99818eed02f2e601 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,14 @@ AM_CPPFLAGS = -Werror -fno-common -I$(srcdir)/include -DYYDEBUG=1
 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp

-libcycript_la_LDFLAGS = -no-undefined $(LTLIBICONV) -ldl
+libcycript_la_LDFLAGS = -no-undefined $(LTLIBAPR) $(LTLIBICONV) -ldl

 
 libcycript_la_SOURCES += Cycript.tab.cc
 libcycript_la_SOURCES += lex.cy.cpp
 
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
 
 libcycript_la_SOURCES += Cycript.tab.cc
 libcycript_la_SOURCES += lex.cy.cpp
 
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp

-cycript_LDFLAGS = -ldl
+cycript_LDFLAGS = $(LTLIBAPR) -ldl

 cycript_LDADD = libcycript.la
 
 ldid = true
 cycript_LDADD = libcycript.la
 
 ldid = true

diff --git a/configure.ac b/configure.ac
index eea1ad1009f331289e561bd34ac970bde5be69c0..351d8fd961067d352d2d4dd73d95d9d0d8f4a60c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,8 @@ dnl APR_FIND_APR {{{
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
     AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
     AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])

-    AC_LIB_APPENDTOVAR([LIBS], [`$apr_config --link-libtool`])
+    AC_LIB_APPENDTOVAR([LTLIBAPR], [`$apr_config --link-libtool`])
+    AC_SUBST([LTLIBAPR])

 ], [AC_MSG_ERROR([missing "libapr"])])
 dnl }}}
 
 ], [AC_MSG_ERROR([missing "libapr"])])
 dnl }}}