From 812bb90bb091c1b4d64dbd8abf3a70f5f05d935a Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Sat, 15 Jun 2013 00:36:36 -0700
Subject: [PATCH] Avoid libapr's .la from breaking libiconv search.

---
 Makefile.am  | 4 ++--
 configure.ac | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8e6b364..6387819 100644
--- 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
-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
-cycript_LDFLAGS = -ldl
+cycript_LDFLAGS = $(LTLIBAPR) -ldl
 cycript_LDADD = libcycript.la
 
 ldid = true
diff --git a/configure.ac b/configure.ac
index eea1ad1..351d8fd 100644
--- 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`])
-    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 }}}
 
-- 
2.47.2