httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1232575 - /httpd/httpd/trunk/configure.in
Date Tue, 17 Jan 2012 21:12:19 GMT
Author: minfrin
Date: Tue Jan 17 21:12:19 2012
New Revision: 1232575

URL: http://svn.apache.org/viewvc?rev=1232575&view=rev
Log:
configure: Improve the error message when --with-included-apr is specified
but either APR or APR-Util is not included.

Modified:
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1232575&r1=1232574&r2=1232575&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Tue Jan 17 21:12:19 2012
@@ -10,6 +10,14 @@ AC_INIT(ABOUT_APACHE)
 AC_CONFIG_HEADER(include/ap_config_auto.h)
 AC_CONFIG_AUX_DIR(build)
 
+dnl Absolute source/build directory
+abs_srcdir=`(cd $srcdir && pwd)`
+abs_builddir=`pwd`
+
+dnl Ensure that the httpd version is included
+HTTPD_VERSION=`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/ap_release.h AP_SERVER`
+AC_SUBST(HTTPD_VERSION)
+
 dnl #
 dnl # Include our own M4 macros along with those for APR and libtool
 dnl #
@@ -88,6 +96,9 @@ if test "$apr_found" = "no"; then
 fi
 
 if test "$apr_found" = "reconfig"; then
+  if test ! -d srclib/apr; then
+    AC_MSG_ERROR([Bundled APR requested but not found at srclib/apr. Download and unpack
the corresponding httpd-${HTTPD_VERSION}-deps package over this one.])
+  fi
   APR_SUBDIR_CONFIG(srclib/apr,
                     [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
                     [--enable-layout=*|\'--enable-layout=*])
@@ -149,6 +160,9 @@ yes.reconfig)
 esac  
 
 if test "$apu_found" = "reconfig"; then
+  if test ! -d srclib/apr-util; then
+    AC_MSG_ERROR([Bundled APR-Util requested but not found at srclib/apr-util. Download and
unpack the corresponding httpd-${HTTPD_VERSION}-deps package over this one.])
+  fi
   APR_SUBDIR_CONFIG(srclib/apr-util,
                     [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir],
                     [--enable-layout=*|\'--enable-layout=*])
@@ -185,10 +199,6 @@ if test "x${cache_file}" = "x/dev/null";
   export CC; export CPP
 fi
 
-dnl Absolute source/build directory
-abs_srcdir=`(cd $srcdir && pwd)`
-abs_builddir=`pwd`
-
 AC_ARG_WITH(pcre,
 APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
 
@@ -806,10 +816,6 @@ AC_SUBST(ap_make_delimiter)
 dnl Ensure that docs/conf is created.
 test -d docs/conf||$mkdir_p docs/conf
 
-dnl Ensure that the httpd version is included
-HTTPD_VERSION=`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/ap_release.h AP_SERVER`
-AC_SUBST(HTTPD_VERSION)
-
 AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf
docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf
docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf
docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-policy.conf docs/conf/extra/httpd-ssl.conf
docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf
include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std
support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile
build/rules.mk build/pkg/pkginfo build/config_vars.sh,[true],[
   APACHE_GEN_MAKEFILES
 ])



Mime
View raw message