apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r586169 - /apr/apr-util/trunk/build/apu-iconv.m4
Date Thu, 18 Oct 2007 23:14:26 GMT
Author: wrowe
Date: Thu Oct 18 16:14:25 2007
New Revision: 586169

URL: http://svn.apache.org/viewvc?rev=586169&view=rev
Log:
Build against apr-iconv (with libs and includes and stuff, maybe?)

Modified:
    apr/apr-util/trunk/build/apu-iconv.m4

Modified: apr/apr-util/trunk/build/apu-iconv.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-iconv.m4?rev=586169&r1=586168&r2=586169&view=diff
==============================================================================
--- apr/apr-util/trunk/build/apu-iconv.m4 (original)
+++ apr/apr-util/trunk/build/apu-iconv.m4 Thu Oct 18 16:14:25 2007
@@ -43,14 +43,18 @@
       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
   ])
 



Mime
View raw message