From e6ad21f277bc016481dbf725314a76f415a4ba72 Mon Sep 17 00:00:00 2001
From: wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 18 Oct 2007 23:14:25 +0000
Subject: Build against apr-iconv (with libs and includes and stuff, maybe?)

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@586169 13f79535-47bb-0310-9956-ffa450edef68
---
 build/apu-iconv.m4 | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'build')

diff --git a/build/apu-iconv.m4 b/build/apu-iconv.m4
index 01759833..ef7a6e92 100644
--- a/build/apu-iconv.m4
+++ b/build/apu-iconv.m4
@@ -43,14 +43,18 @@ AC_ARG_WITH(iconv,[  --with-iconv[=DIR]        path to iconv installation],
       have_iconv="0"
       want_iconv="0"
     elif test "$apu_iconv_dir" != "yes"; then
-      APR_ADDTO(CPPFLAGS,[-I$apu_iconv_dir/include])
-      APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib])
-    fi
-    if test -f "$apu_iconv_dir/include/api_version.h"; then
-      have_apr_iconv="1"
-      have_iconv="0"
-      APR_REMOVEFROM(LIBS,[-lapriconv])
-      AC_MSG_RESULT("Using apr-iconv")
+      if test -f "$apu_iconv_dir/include/apr-1/api_version.h"; then
+        have_apr_iconv="1"
+        have_iconv="0"
+        APR_ADDTO(APRUTIL_INCLUDES,[-I$apu_iconv_dir/include/apr-1])
+        APR_ADDTO(APRUTIL_LIBS,[$apu_iconv_dir/lib/libapriconv-1.la])
+        AC_MSG_RESULT(using apr-iconv)
+      elif test -f "$apu_iconv_dir/include/iconv.h"; then
+        have_apr_iconv="0"
+        have_iconv="1"
+        APR_ADDTO(CPPFLAGS,[-I$apu_iconv_dir/include])
+        APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib])
+      fi
     fi
   ])
 
-- 
cgit v1.2.1