diff options
author | Justin Erenkrantz <jerenkrantz@apache.org> | 2004-08-01 00:52:20 +0000 |
---|---|---|
committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2004-08-01 00:52:20 +0000 |
commit | 0de7b85bb6546a8e98418d352eeffdc7fd96387d (patch) | |
tree | fbd64f660138c73d8c13c22a8c3b5bad480ed10e /build/find_apr.m4 | |
parent | 87087f1d0518f9cc89ab5f04376195980fc9fb06 (diff) | |
download | apr-0de7b85bb6546a8e98418d352eeffdc7fd96387d.tar.gz |
Only install apr-$MAJOR-config and add appropriate detection code to
find_apr.m4 (APR_FIND_APR).
Justin made a few changes to Max's latest patch:
- Emit a warning at autoconf-time and default to [0 1] if 4th arg is missing.
- Fix some tpyos
- Change apr-config.in to not use multiple @APR_MAJOR_VERSION@ substs.
Submitted by: Max Bowsher
Reviewed by: Justin Erenkrantz
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@65293 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/find_apr.m4')
-rw-r--r-- | build/find_apr.m4 | 106 |
1 files changed, 77 insertions, 29 deletions
diff --git a/build/find_apr.m4 b/build/find_apr.m4 index 90865aeca..5ff75a7c7 100644 --- a/build/find_apr.m4 +++ b/build/find_apr.m4 @@ -6,17 +6,23 @@ dnl library. It provides a standardized mechanism for using APR. It supports dnl embedding APR into the application source, or locating an installed dnl copy of APR. dnl -dnl APR_FIND_APR([srcdir [, builddir, implicit-install-check]]) +dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors) dnl dnl where srcdir is the location of the bundled APR source directory, or dnl empty if source is not bundled. dnl -dnl where blddir is the location where the bundled APR will will be built, +dnl where builddir is the location where the bundled APR will will be built, dnl or empty if the build will occur in the srcdir. dnl dnl where implicit-install-check set to 1 indicates if there is no dnl --with-apr option specified, we will look for installed copies. dnl +dnl where acceptable-majors is a space separated list of acceptable major +dnl version numbers. Often only a single major version will be acceptable. +dnl If multiple versions are specified, and --with-apr=PREFIX or the +dnl implicit installed search are used, then the first (leftmost) version +dnl in the list that is found will be used. Currently defaults to [0 1]. +dnl dnl Sets the following variables on exit: dnl dnl apr_found : "yes", "no", "reconfig" @@ -47,56 +53,98 @@ AC_DEFUN(APR_FIND_APR, [ TEST_X="test -x" fi + m4_if([$4], [], + [ + AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x]) + acceptable_majors="0 1" + ], [acceptable_majors="$4"]) + + apr_temp_acceptable_apr_config="" + for apr_temp_major in $acceptable_majors + do + case $apr_temp_major in + 0) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config" + ;; + *) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config" + ;; + esac + done + AC_MSG_CHECKING(for APR) AC_ARG_WITH(apr, - [ --with-apr=DIR|FILE prefix for installed APR, path to APR build tree, + [ --with-apr=PATH prefix for installed APR, path to APR build tree, or the full path to apr-config], [ if test "$withval" = "no" || test "$withval" = "yes"; then - AC_MSG_ERROR([--with-apr requires a directory to be provided]) + AC_MSG_ERROR([--with-apr requires a directory or file to be provided]) fi - if $TEST_X "$withval/bin/apr-config"; then - apr_found="yes" - apr_config="$withval/bin/apr-config" - elif $TEST_X "$withval/apr-config"; then - apr_found="yes" - apr_config="$withval/apr-config" - elif $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + for lookdir in "$withval/bin" "$withval" + do + if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then + apr_found="yes" + apr_config="$lookdir/$apr_temp_apr_config_file" + break 2 + fi + done + done + + if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then apr_found="yes" apr_config="$withval" fi - dnl if --with-apr is used, then the target prefix/directory must be valid + dnl if --with-apr is used, it is a fatal error for its argument + dnl to be invalid if test "$apr_found" != "yes"; then - AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a -build directory, or an apr-config file.]) + AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.]) fi ],[ dnl if we have a bundled source directory, use it if test -d "$1"; then apr_temp_abs_srcdir="`cd $1 && pwd`" apr_found="reconfig" + echo "sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"" + apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`" + case $apr_bundled_major in + "") + AC_MSG_ERROR([failed to find major version of bundled APR]) + ;; + 0) + apr_temp_apr_config_file="apr-config" + ;; + *) + apr_temp_apr_config_file="apr-$apr_bundled_major-config" + ;; + esac if test -n "$2"; then - apr_config="$2/apr-config" + apr_config="$2/$apr_temp_apr_config_file" else - apr_config="$1/apr-config" + apr_config="$1/$apr_temp_apr_config_file" fi fi if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then - if apr-config --help > /dev/null 2>&1 ; then - apr_found="yes" - apr_config="apr-config" - else - dnl look in some standard places (apparently not in builtin/default) - for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do - if $TEST_X "$lookdir/bin/apr-config"; then - apr_found="yes" - apr_config="$lookdir/bin/apr-config" - break - fi - done - fi + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then + apr_found="yes" + apr_config="$apr_temp_apr_config_file" + break + else + dnl look in some standard places (apparently not in builtin/default) + for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do + if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then + apr_found="yes" + apr_config="$lookdir/bin/$apr_temp_apr_config_file" + break 2 + fi + done + fi + done fi ]) |