apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r264828 - /apr/apr-util/trunk/build/apu-iconv.m4
Date Tue, 30 Aug 2005 19:06:30 GMT
Author: jerenkrantz
Date: Tue Aug 30 12:06:24 2005
New Revision: 264828

URL: http://svn.apache.org/viewcvs?rev=264828&view=rev
Log:
* build/apu-iconv.m4: Correctly support --without-iconv option.

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

Modified: apr/apr-util/trunk/build/apu-iconv.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/build/apu-iconv.m4?rev=264828&r1=264827&r2=264828&view=diff
==============================================================================
--- apr/apr-util/trunk/build/apu-iconv.m4 (original)
+++ apr/apr-util/trunk/build/apu-iconv.m4 Tue Aug 30 12:06:24 2005
@@ -35,9 +35,14 @@
 
 apu_iconv_dir="unknown"
 have_apr_iconv="0"
+want_iconv="1"
 AC_ARG_WITH(iconv,[  --with-iconv[=DIR]        path to iconv installation],
   [ apu_iconv_dir="$withval"
-    if test "$apu_iconv_dir" != "yes"; then
+    if test "$apu_iconv_dir" = "no"; then
+      have_apr_iconv="0"
+      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
@@ -49,7 +54,7 @@
     fi
   ])
 
-if test "$have_apr_iconv" != "1"; then
+if test "$want_iconv" = "1" -a "$have_apr_iconv" != "1"; then
   AC_CHECK_HEADER(iconv.h, [
     APU_TRY_ICONV([ have_iconv="1" ], [
 
@@ -67,7 +72,7 @@
   ], [ have_iconv="0" ])
 fi
 
-if test "$apu_iconv_dir" != "unknown"; then
+if test "$want_iconv" = "1" -a "$apu_iconv_dir" != "unknown"; then
   if test "$have_iconv" != "1"; then
     if test "$have_apr_iconv" != "1"; then 
       AC_MSG_ERROR([iconv support requested, but not found])



Mime
View raw message