diff options
| author | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2005-12-29 17:07:08 +0000 |
|---|---|---|
| committer | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2005-12-29 17:07:08 +0000 |
| commit | ce0d9559b3aeb1617234f16da9dbfb5d4783b191 (patch) | |
| tree | 8bfc672c5eb6a9326f7df07c73af83a011598aa7 /configure.in | |
| parent | 88db719ebb3a53808031830fd7e2b1b61eaf4000 (diff) | |
| download | libapr-util-ce0d9559b3aeb1617234f16da9dbfb5d4783b191.tar.gz | |
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.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@359848 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 79a3bd4b..6a6ec006 100644 --- a/configure.in +++ b/configure.in @@ -100,16 +100,33 @@ APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`) 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 |