Commit 3c872837 authored by Graham Leggett's avatar Graham Leggett
Browse files

configure: Move the --with-included-apr check so that srcdir!=builddir builds 

aren't broken by it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232838 13f79535-47bb-0310-9956-ffa450edef68
parent 5978912c

configure.in

+10 −10
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ APACHE_HELP_STRING(--with-included-apr,Use bundled copies of APR/APR-Util)) 


if test "x$with_included_apr" = "xyes"; then

  apr_found=reconfig

  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

else 

  APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2)

fi
@@ -96,9 +99,6 @@ 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=*])
@@ -136,6 +136,9 @@ if test "x${apr_major_version}" = "x2"; then 
  apu_found=obsolete

elif test "x$with_included_apr" = "xyes"; then

  apu_found=reconfig

  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

else 

   dnl If httpd is buildconf'ed against an apr 2.x tree, then 1.x

   dnl isn't supported.
@@ -160,9 +163,6 @@ 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=*])