apache1-mod_suphp-apr.patch

   1 diff -ur suphp-0.6.1/acinclude.m4 suphp-0.6.1.apr/acinclude.m4
   2 --- suphp-0.6.1/acinclude.m4    2005-11-26 20:45:49.000000000 +0100
   3 +++ suphp-0.6.1.apr/acinclude.m4        2006-01-27 18:53:40.000000000 +0100
   4 @@ -40,7 +40,7 @@
   5  dnl value of apr_config to fetch any necessary build/link information.
   6  dnl
   7
   8 -AC_DEFUN(APR_FIND_APR, [
   9 +AC_DEFUN([APR_FIND_APR], [
  10    apr_found="no"
  11
  12    if test "$ac_cv_emxos2" = "yes"; then
  13 @@ -53,18 +53,18 @@
  14    AC_MSG_CHECKING(for APR)
  15    AC_ARG_WITH(apr,
  16    [  --with-apr=DIR|FILE     prefix for installed APR, path to APR build tree,
  17 -                          or the full path to apr-config],
  18 +                          or the full path to apr-1-config],
  19    [
  20      if test "$withval" = "no" || test "$withval" = "yes"; then
  21        AC_MSG_ERROR([--with-apr requires a directory to be provided])
  22      fi
  23
  24 -    if $TEST_X "$withval/bin/apr-config"; then
  25 +    if $TEST_X "$withval/bin/apr-1-config"; then
  26        apr_found="yes"
  27 -      apr_config="$withval/bin/apr-config"
  28 -    elif $TEST_X "$withval/apr-config"; then
  29 +      apr_config="$withval/bin/apr-1-config"
  30 +    elif $TEST_X "$withval/apr-1-config"; then
  31        apr_found="yes"
  32 -      apr_config="$withval/apr-config"
  33 +      apr_config="$withval/apr-1-config"
  34      elif $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
  35        apr_found="yes"
  36        apr_config="$withval"
  37 @@ -73,7 +73,7 @@
  38      dnl if --with-apr is used, then the target prefix/directory must be valid
  39      if test "$apr_found" != "yes"; then
  40        AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a
  41 -build directory, or an apr-config file.])
  42 +build directory, or an apr-1-config file.])
  43      fi
  44    ],[
  45      dnl if we have a bundled source directory, use it
  46 @@ -81,21 +81,21 @@
  47        apr_temp_abs_srcdir="`cd $1 && pwd`"
  48        apr_found="reconfig"
  49        if test -n "$2"; then
  50 -        apr_config="$2/apr-config"
  51 +        apr_config="$2/apr-1-config"
  52        else
  53 -        apr_config="$1/apr-config"
  54 +        apr_config="$1/apr-1-config"
  55        fi
  56      fi
  57      if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
  58 -      if apr-config --help > /dev/null 2>&1 ; then
  59 +      if apr-1-config --help > /dev/null 2>&1 ; then
  60          apr_found="yes"
  61 -        apr_config="apr-config"
  62 +        apr_config="apr-1-config"
  63        else
  64          dnl look in some standard places (apparently not in builtin/default)
  65          for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
  66 -          if $TEST_X "$lookdir/bin/apr-config"; then
  67 +          if $TEST_X "$lookdir/bin/apr-1-config"; then
  68              apr_found="yes"
  69 -            apr_config="$lookdir/bin/apr-config"
  70 +            apr_config="$lookdir/bin/apr-1-config"
  71              break
  72            fi
  73          done