apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r359848 - in /apr/apr-util/trunk: CHANGES configure.in
Date Thu, 29 Dec 2005 17:07:10 GMT
Author: rooneg
Date: Thu Dec 29 09:07:08 2005
New Revision: 359848

URL: http://svn.apache.org/viewcvs?rev=359848&view=rev
Log:
Stop automatically linking against apr-iconv when the apr-iconv source
is found in ../apr-iconv.  Instead, add a --with-apr-iconv option to the
configure script that lets you specify the path to the apr-iconv source.

This makes use of apr-iconv more like other optional packages, and makes
it possible to build with apr-iconv if you don't happen to have it in a
directory named apr-iconv.

* configure.in: Add new --with-apr-iconv option.

* CHANGES: Note change.

Modified:
    apr/apr-util/trunk/CHANGES
    apr/apr-util/trunk/configure.in

Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/CHANGES?rev=359848&r1=359847&r2=359848&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES (original)
+++ apr/apr-util/trunk/CHANGES Thu Dec 29 09:07:08 2005
@@ -1,5 +1,11 @@
 Changes with APR-util 1.3.0
 
+  *) On platforms that use autoconf stop automatically linking against
+     apr-iconv when an apr-iconv source dir is found in ../apr-iconv.
+     Instead, add a --with-apr-iconv option to configure that lets you
+     specify the relative path to your apr-iconv source directory.
+     [Garrett Rooney]
+
   *) APR_FIND_APU macro now supports customisable detailed checks on
      each installed apr-util. [Justin Erenkrantz, Colm MacCarthaigh]
 

Modified: apr/apr-util/trunk/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/configure.in?rev=359848&r1=359847&r2=359848&view=diff
==============================================================================
--- apr/apr-util/trunk/configure.in (original)
+++ apr/apr-util/trunk/configure.in Thu Dec 29 09:07:08 2005
@@ -100,16 +100,33 @@
 dnl
 dnl  Find the APR-ICONV directory.
 dnl
-if test -d ../apr-iconv; then
-  APR_SUBDIR_CONFIG(../apr-iconv,
-                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-                    [--enable-layout=*|\'--enable-layout=*])
-  APRUTIL_EXPORT_LIBS="$abs_srcdir/../apr-iconv/lib/libapriconv.la $APRUTIL_EXPORT_LIBS"
-  APRUTIL_INCLUDES="-I$abs_srcdir/../apr-iconv/include $APRUTIL_INCLUDES"
-  APR_ICONV_DIR=../apr-iconv
-else
-  APR_ICONV_DIR=""
-fi
+AC_ARG_WITH(apr-iconv,
+            [  --with-apr-iconv=DIR    relative path to apr-iconv source],
+  [ apu_apriconv_dir="$withval"
+    if test "$apu_apriconv_dir" != "no"; then
+      if test -d "$apu_apriconv_dir"; then
+        APR_SUBDIR_CONFIG("$apu_apriconv_dir",
+                          [$apache_apr_flags \
+                             --prefix=$prefix \
+                             --exec-prefix=$exec_prefix \
+                             --libdir=$libdir \
+                             --includedir=$includedir \
+                             --bindir=$bindir \
+                             --datadir=$datadir \
+                             --with-installbuilddir=$installbuilddir],
+                          [--enable-layout=*|\'--enable-layout=*])
+        APRUTIL_EXPORT_LIBS="$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \
+                             $APRUTIL_EXPORT_LIBS"
+        APRUTIL_INCLUDES="-I$abs_srcdir/apu_apriconv_dir/include \
+                          $APRUTIL_INCLUDES"
+        APR_ICONV_DIR="$apu_apriconv_dir"
+      else
+       APR_ICONV_DIR=""
+      fi
+    else
+      APR_ICONV_DIR=""
+    fi
+  ])
 AC_SUBST(APR_ICONV_DIR)
 
 dnl Find LDAP library



Mime
View raw message