diff options
| author | Joe Orton <jorton@apache.org> | 2011-11-11 03:01:33 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2011-11-11 03:01:33 +0000 |
| commit | 80765aa7fe900a47486b57204e94f5fda3fa99ad (patch) | |
| tree | b9e06fe0cd72c50d051380f78ce24dced3986a83 /configure.in | |
| parent | 283d57c597fc10ab03eb7bb48e0138a2da9d2472 (diff) | |
| download | httpd-80765aa7fe900a47486b57204e94f5fda3fa99ad.tar.gz | |
A stab at libapreq build integration, still disabled by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200715 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/configure.in b/configure.in index f95125ba17..ec87191cfb 100644 --- a/configure.in +++ b/configure.in @@ -92,8 +92,6 @@ if test "$apr_found" = "reconfig"; then [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir], [--enable-layout=*|\'--enable-layout=*]) dnl We must be the first to build and the last to be cleaned -dnl AP_BUILD_SRCLIB_DIRS="apr libapreq $AP_BUILD_SRCLIB_DIRS" -dnl AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS libapreq apr" AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS" AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr" @@ -121,10 +119,6 @@ APR_VERSION=`$apr_config --version` apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'` APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config" -dnl echo $ac_n "${nl}Configuring Apache Request Library...${nl}" -dnl APR_SUBDIR_CONFIG(srclib/libapreq, [--with-apr=../apr/apr-2-config --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir]) -dnl APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/srclib/libapreq/include]) - echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}" if test "x${apr_major_version}" = "x2"; then @@ -744,6 +738,23 @@ AC_ARG_ENABLE(load-all-modules,APACHE_HELP_STRING(--enable-load-all-modules,Load LOAD_ALL_MODULES="no" ]) +### libapreq build integration. +if test -d $abs_srcdir/srclib/libapreq && false; then + get_version="$abs_srcdir/build/get-version.sh" + version_hdr="$abs_srcdir/srclib/libapreq/include/apreq_version.h" + APREQ_MAJOR_VERSION="`$get_version major $version_hdr APREQ`" + APREQ_LIBTOOL_VERSION="`$get_version libtool $version_hdr APREQ`" + + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/srclib/libapreq/include]) + AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS libapreq" + AP_CLEAN_SRCLIB_DIRS="libapreq $AP_BUILD_SRCLIB_DIRS" + + APACHE_FAST_OUTPUT(srclib/libapreq/Makefile srclib/libapreq/library/Makefile) + + AC_CONFIG_FILES([srclib/libapreq/apreq2-config]) + AC_CONFIG_COMMANDS([apreq], [chmod 755 srclib/libapreq/apreq2-config]) +fi + APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) APACHE_FAST_OUTPUT(os/Makefile server/Makefile) APACHE_FAST_OUTPUT(support/Makefile) |