]> granicus.if.org Git - php/commitdiff
s/^I/ / and some re-indenting. Also align the APXS checking code
authorSascha Schumann <sas@php.net>
Sat, 19 May 2001 17:13:09 +0000 (17:13 +0000)
committerSascha Schumann <sas@php.net>
Sat, 19 May 2001 17:13:09 +0000 (17:13 +0000)
with the standard scheme.

sapi/apache/config.m4

index f31b0f11f83512040148662e695b5e0c36e5e9a6..49fd4911b97104216d98b84eb584841b78c4cb1b 100644 (file)
@@ -14,58 +14,57 @@ AC_MSG_CHECKING(for Apache module support via DSO through APXS)
 AC_ARG_WITH(apxs,
 [  --with-apxs[=FILE]      Build shared Apache module. FILE is the optional
                           pathname to the Apache apxs tool; defaults to "apxs".],[
-       if test "$withval" = "yes"; then
-               APXS=apxs
-                if $APXS -q CFLAGS >/dev/null 2>&1; then
-                  :
-                else
-                  if test -x /usr/sbin/apxs ; then #SUSE 6.x 
-                    APXS=/usr/sbin/apxs
-                  fi
-                fi
-       else
-               PHP_EXPAND_PATH($withval, APXS)
-       fi
+  if test "$withval" = "yes"; then
+    APXS=apxs
+    $APXS -q CFLAGS >/dev/null 2>&1
+    if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x 
+      APXS=/usr/sbin/apxs
+    fi
+  else
+    PHP_EXPAND_PATH($withval, APXS)
+  fi
 
-    if $APXS -q CFLAGS >/dev/null 2>&1; then
-      :
-    else
-      AC_MSG_RESULT()
-      $APXS
-      AC_MSG_RESULT([Sorry, I was not able to successfully run APXS.  Possible reasons:])
-      AC_MSG_RESULT([1.  Perl is not installed;])
-      AC_MSG_RESULT([2.  Apache was not compiled with DSO support (--enable-module=so);])
-      AC_MSG_RESULT([3.  'apxs' is not in your path.])
-      AC_MSG_ERROR([;]) 
-    fi 
+  $APXS -q CFLAGS >/dev/null 2>&1
+  if test "$?" != "0"; then
+    AC_MSG_RESULT()
+    AC_MSG_RESULT()
+    AC_MSG_RESULT([Sorry, I was not able to successfully run APXS.  Possible reasons:])
+    AC_MSG_RESULT()
+    AC_MSG_RESULT([1.  Perl is not installed;])
+    AC_MSG_RESULT([2.  Apache was not compiled with DSO support (--enable-module=so);])
+    AC_MSG_RESULT([3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs])
+    AC_MSG_RESULT([The output of $APXS follows])
+    $APXS
+    AC_MSG_ERROR([Aborting]) 
+  fi 
 
-       APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
-       APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
-       APXS_CFLAGS=`$APXS -q CFLAGS`
-       for flag in $APXS_CFLAGS; do
-               case $flag in
-               -D*) CPPFLAGS="$CPPFLAGS $flag";;
-               esac
-       done
-       PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
-       PHP_SAPI=apache
-       APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED"
-       PHP_BUILD_SHARED
-       if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
-               PHP_APXS_BROKEN=yes
-       fi
-       STRONGHOLD=
-       AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-       AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
-       AC_MSG_RESULT(yes)
-       case $host_alias in
-       *aix*)
-               APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
-               LDFLAGS="$LDFLAGS -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-               ;;
-       esac
+  APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
+  APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
+  APXS_CFLAGS=`$APXS -q CFLAGS`
+  for flag in $APXS_CFLAGS; do
+    case $flag in
+    -D*) CPPFLAGS="$CPPFLAGS $flag";;
+    esac
+  done
+  PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
+  PHP_SAPI=apache
+  APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED"
+  PHP_BUILD_SHARED
+  if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
+    PHP_APXS_BROKEN=yes
+  fi
+  STRONGHOLD=
+  AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
+  AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
+  AC_MSG_RESULT(yes)
+  case $host_alias in
+  *aix*)
+    APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
+    LDFLAGS="$LDFLAGS -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
+    ;;
+  esac
 ],[
-       AC_MSG_RESULT(no)
+  AC_MSG_RESULT(no)
 ])
 
 APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module"
@@ -75,142 +74,142 @@ AC_MSG_CHECKING(for Apache module support)
 AC_ARG_WITH(apache,
 [  --with-apache[=DIR]     Build Apache module. DIR is the top-level Apache
                           build directory, defaults to /usr/local/etc/httpd.],[
-       if test "$withval" = "yes"; then
-         # Apache's default directory
-         withval=/usr/local/apache
-       fi
-       if test "$withval" != "no"; then
-               APACHE_MODULE=yes
-               PHP_EXPAND_PATH($withval, withval)
-               # For Apache 1.2.x
-               if test -f $withval/src/httpd.h; then 
-                       APACHE_INCLUDE=-I$withval/src
-                       APACHE_TARGET=$withval/src
-                       PHP_SAPI=apache
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
-                       PHP_LIBS="-L. -lphp3"
-                       AC_MSG_RESULT(yes - Apache 1.2.x)
-                       STRONGHOLD=
-                       if test -f $withval/src/ap_config.h; then
-                               AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-                       fi
-               # For Apache 2.0.x
-               elif test -f $withval/src/include/httpd.h &&
-                    test -f $withval/src/lib/apr/include/apr_general.h ; then
-                       APACHE_HAS_REGEX=1
-                       APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix -I$withval/src/lib/apr/include"
-                       APACHE_TARGET=$withval/src/modules/php4
-                       if test ! -d $APACHE_TARGET; then
-                               mkdir $APACHE_TARGET
-                       fi
-                       PHP_SAPI=apache
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-                       PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-                       AC_MSG_RESULT(yes - Apache 2.0.X)
-                       STRONGHOLD=
-                       if test -f $withval/src/include/ap_config.h; then
-                               AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-                       fi
-                       if test -f $withval/src/include/ap_compat.h; then
-                               AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
-                               if test ! -f $withval/src/include/ap_config_auto.h; then
-                                       AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
-                               fi
-                       else
-                               if test -f $withval/src/include/compat.h; then
-                                       AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
-                               fi
-                       fi
-               # For Apache 1.3.x
-               elif test -f $withval/src/main/httpd.h; then
-                       APACHE_HAS_REGEX=1
-                       APACHE_INCLUDE="-I$withval/src/main -I$withval/src/os/unix -I$withval/src/ap"
-                       APACHE_TARGET=$withval/src/modules/php4
-                       if test ! -d $APACHE_TARGET; then
-                               mkdir $APACHE_TARGET
-                       fi
-                       PHP_SAPI=apache
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-                       PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-                       AC_MSG_RESULT(yes - Apache 1.3.x)
-                       STRONGHOLD=
-                       if test -f $withval/src/include/ap_config.h; then
-                               AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-                       fi
-                       if test -f $withval/src/include/ap_compat.h; then
-                               AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
-                               if test ! -f $withval/src/include/ap_config_auto.h; then
-                                       AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
-                               fi
-                       else
-                               if test -f $withval/src/include/compat.h; then
-                                       AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
-                               fi
-                       fi
-               # Also for Apache 1.3.x
-               elif test -f $withval/src/include/httpd.h; then
-                       APACHE_HAS_REGEX=1
-                       APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
-                       APACHE_TARGET=$withval/src/modules/php4
-                       if test ! -d $APACHE_TARGET; then
-                               mkdir $APACHE_TARGET
-                       fi
-                       PHP_SAPI=apache
-                       PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-                       AC_MSG_RESULT(yes - Apache 1.3.x)
-                       STRONGHOLD=
-                       if test -f $withval/src/include/ap_config.h; then
-                               AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-                       fi
-                       if test -f $withval/src/include/ap_compat.h; then
-                               AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
-                               if test ! -f $withval/src/include/ap_config_auto.h; then
-                                       AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
-                               fi
-                       else
-                               if test -f $withval/src/include/compat.h; then
-                                       AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
-                               fi
-                       fi
-               # For StrongHold 2.2
-               elif test -f $withval/apache/httpd.h; then
-                       APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
-                       APACHE_TARGET=$withval/apache
-                       PHP_SAPI=apache
-                       PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
-                       STRONGHOLD=-DSTRONGHOLD=1
-                       AC_MSG_RESULT(yes - StrongHold)
-                       if test -f $withval/apache/ap_config.h; then
-                               AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-                       fi
-                       if test -f $withval/src/ap_compat.h; then
-                               AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
-                               if test ! -f $withval/src/include/ap_config_auto.h; then
-                                       AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
-                               fi
-                       else
-                               if test -f $withval/src/compat.h; then
-                                       AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
-                               fi
-                       fi
-               else
-                       AC_MSG_RESULT(no)
-                       AC_MSG_ERROR(Invalid Apache directory - unable to find httpd.h under $withval)
-               fi
-       else
-               AC_MSG_RESULT(no)
-       fi
+  if test "$withval" = "yes"; then
+    # Apache's default directory
+    withval=/usr/local/apache
+  fi
+  if test "$withval" != "no"; then
+    APACHE_MODULE=yes
+    PHP_EXPAND_PATH($withval, withval)
+    # For Apache 1.2.x
+    if test -f $withval/src/httpd.h; then 
+      APACHE_INCLUDE=-I$withval/src
+      APACHE_TARGET=$withval/src
+      PHP_SAPI=apache
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
+      PHP_LIBS="-L. -lphp3"
+      AC_MSG_RESULT(yes - Apache 1.2.x)
+      STRONGHOLD=
+      if test -f $withval/src/ap_config.h; then
+        AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
+      fi
+    # For Apache 2.0.x
+    elif test -f $withval/src/include/httpd.h &&
+         test -f $withval/src/lib/apr/include/apr_general.h ; then
+      APACHE_HAS_REGEX=1
+      APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix -I$withval/src/lib/apr/include"
+      APACHE_TARGET=$withval/src/modules/php4
+      if test ! -d $APACHE_TARGET; then
+        mkdir $APACHE_TARGET
+      fi
+      PHP_SAPI=apache
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+      PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
+      AC_MSG_RESULT(yes - Apache 2.0.X)
+      STRONGHOLD=
+      if test -f $withval/src/include/ap_config.h; then
+        AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
+      fi
+      if test -f $withval/src/include/ap_compat.h; then
+        AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
+        if test ! -f $withval/src/include/ap_config_auto.h; then
+          AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
+        fi
+      else
+        if test -f $withval/src/include/compat.h; then
+          AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
+        fi
+      fi
+    # For Apache 1.3.x
+    elif test -f $withval/src/main/httpd.h; then
+      APACHE_HAS_REGEX=1
+      APACHE_INCLUDE="-I$withval/src/main -I$withval/src/os/unix -I$withval/src/ap"
+      APACHE_TARGET=$withval/src/modules/php4
+      if test ! -d $APACHE_TARGET; then
+        mkdir $APACHE_TARGET
+      fi
+      PHP_SAPI=apache
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+      PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
+      AC_MSG_RESULT(yes - Apache 1.3.x)
+      STRONGHOLD=
+      if test -f $withval/src/include/ap_config.h; then
+        AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
+      fi
+      if test -f $withval/src/include/ap_compat.h; then
+        AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
+        if test ! -f $withval/src/include/ap_config_auto.h; then
+          AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
+        fi
+      else
+        if test -f $withval/src/include/compat.h; then
+          AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
+        fi
+      fi
+    # Also for Apache 1.3.x
+    elif test -f $withval/src/include/httpd.h; then
+      APACHE_HAS_REGEX=1
+      APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
+      APACHE_TARGET=$withval/src/modules/php4
+      if test ! -d $APACHE_TARGET; then
+        mkdir $APACHE_TARGET
+      fi
+      PHP_SAPI=apache
+      PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+      AC_MSG_RESULT(yes - Apache 1.3.x)
+      STRONGHOLD=
+      if test -f $withval/src/include/ap_config.h; then
+        AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
+      fi
+      if test -f $withval/src/include/ap_compat.h; then
+        AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
+        if test ! -f $withval/src/include/ap_config_auto.h; then
+          AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
+        fi
+      else
+        if test -f $withval/src/include/compat.h; then
+          AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
+        fi
+      fi
+    # For StrongHold 2.2
+    elif test -f $withval/apache/httpd.h; then
+      APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
+      APACHE_TARGET=$withval/apache
+      PHP_SAPI=apache
+      PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
+      STRONGHOLD=-DSTRONGHOLD=1
+      AC_MSG_RESULT(yes - StrongHold)
+      if test -f $withval/apache/ap_config.h; then
+        AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
+      fi
+      if test -f $withval/src/ap_compat.h; then
+        AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
+        if test ! -f $withval/src/include/ap_config_auto.h; then
+          AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
+        fi
+      else
+        if test -f $withval/src/compat.h; then
+          AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
+        fi
+      fi
+    else
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR(Invalid Apache directory - unable to find httpd.h under $withval)
+    fi
+  else
+    AC_MSG_RESULT(no)
+  fi
 ],[
-       AC_MSG_RESULT(no)
+  AC_MSG_RESULT(no)
 ])
 
-INCLUDES="$INCLUDES $APACHE_INCLUDE"
+  INCLUDES="$INCLUDES $APACHE_INCLUDE"
 fi
 
 if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
-       APXS_EXP=-bE:sapi/apache/mod_php4.exp
+  APXS_EXP=-bE:sapi/apache/mod_php4.exp
 fi
 
 PHP_SUBST(APXS_EXP)
@@ -225,10 +224,10 @@ AC_MSG_CHECKING(for mod_charset compatibility option)
 AC_ARG_WITH(mod_charset,
 [  --with-mod_charset      Enable transfer tables for mod_charset (Rus Apache).],
 [
-       AC_MSG_RESULT(yes)
-    AC_DEFINE(USE_TRANSFER_TABLES,1,[ ])
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(USE_TRANSFER_TABLES,1,[ ])
 ],[
-       AC_MSG_RESULT(no)
+  AC_MSG_RESULT(no)
 ])
 
 if test -n "$APACHE_MODULE"; then