apache-mod_suphp-apr.patch

   1 diff -urN suphp-0.6.2.org/src/apache2/mod_suphp.c suphp-0.5.2/src/apache2/mod_suphp.c
   2 --- suphp-0.6.2.org/src/apache2/mod_suphp.c     2004-10-23 12:58:09.156787800 +0200
   3 +++ suphp-0.6.2/src/apache2/mod_suphp.c 2004-10-23 12:59:23.461491768 +0200
   4 @@ -313,8 +313,8 @@
   5      AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF,
   6                    "User and group scripts shall be run as"),
   7  #endif
   8 -    AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
   9 -    AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
  10 +    AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
  11 +    AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
  12      {NULL}
  13  };
  14
  15 --- suphp-0.6.2/acinclude.m4.orig       2007-09-17 14:42:24.000000000 +0000
  16 +++ suphp-0.6.2/acinclude.m4    2007-09-17 14:44:54.000000000 +0000
  17 @@ -40,7 +40,7 @@
  18  dnl value of apr_config to fetch any necessary build/link information.
  19  dnl
  20
  21 -AC_DEFUN(APR_FIND_APR, [
  22 +AC_DEFUN([APR_FIND_APR], [
  23    apr_found="no"
  24
  25    if test "$ac_cv_emxos2" = "yes"; then
  26 @@ -53,18 +53,18 @@
  27    AC_MSG_CHECKING(for APR)
  28    AC_ARG_WITH(apr,
  29    [  --with-apr=DIR|FILE     prefix for installed APR, path to APR build tree,
  30 -                          or the full path to apr-config],
  31 +                          or the full path to apr-1-config],
  32    [
  33      if test "$withval" = "no" || test "$withval" = "yes"; then
  34        AC_MSG_ERROR([--with-apr requires a directory to be provided])
  35      fi
  36
  37 -    if $TEST_X "$withval/bin/apr-config"; then
  38 +    if $TEST_X "$withval/bin/apr-1-config"; then
  39        apr_found="yes"
  40 -      apr_config="$withval/bin/apr-config"
  41 -    elif $TEST_X "$withval/apr-config"; then
  42 +      apr_config="$withval/bin/apr-1-config"
  43 +    elif $TEST_X "$withval/apr-1-config"; then
  44        apr_found="yes"
  45 -      apr_config="$withval/apr-config"
  46 +      apr_config="$withval/apr-1-config"
  47      elif $TEST_X "$withval/bin/apr-1-config"; then
  48        apr_found="yes"
  49        apr_config="$withval/bin/apr-1-config"
  50 @@ -79,7 +79,7 @@
  51      dnl if --with-apr is used, then the target prefix/directory must be valid
  52      if test "$apr_found" != "yes"; then
  53        AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a
  54 -build directory, or an apr-config file.])
  55 +build directory, or an apr-1-config file.])
  56      fi
  57    ],[
  58      dnl if we have a bundled source directory, use it
  59 @@ -87,21 +87,21 @@
  60        apr_temp_abs_srcdir="`cd $1 && pwd`"
  61        apr_found="reconfig"
  62        if test -n "$2"; then
  63 -        apr_config="$2/apr-config"
  64 +        apr_config="$2/apr-1-config"
  65        else
  66 -        apr_config="$1/apr-config"
  67 +        apr_config="$1/apr-1-config"
  68        fi
  69      fi
  70      if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
  71 -      if apr-config --help > /dev/null 2>&1 ; then
  72 +      if apr-1-config --help > /dev/null 2>&1 ; then
  73          apr_found="yes"
  74 -        apr_config="apr-config"
  75 +        apr_config="apr-1-config"
  76        else
  77          dnl look in some standard places (apparently not in builtin/default)
  78          for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
  79 -          if $TEST_X "$lookdir/bin/apr-config"; then
  80 +          if $TEST_X "$lookdir/bin/apr-1-config"; then
  81              apr_found="yes"
  82 -            apr_config="$lookdir/bin/apr-config"
  83 +            apr_config="$lookdir/bin/apr-1-config"
  84              break
  85            fi
  86          done