Remove SAPI_TARGET and use PHP_SAPI completely.

The target filename is now available as SAPI_PROGRAM, SAPI_SHARED, and
SAPI_STATIC.

diff --git a/configure.in b/configure.in
index 4df77505ef4fd6c325a2ad1415e82c615ab170c8..40daa151a9a2727f244214e54839711b383ea81f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -623,8 +623,11 @@ AC_MSG_RESULT($DMALLOC_RESULT)
 
 dnl ## This is the default server API.
 PHP_SAPI=cgi
-SAPI_TARGET=php
 PHP_BUILD_PROGRAM
+dnl paths to the targets relative to the build directory
+SAPI_PROGRAM=php
+SAPI_SHARED=libs/libphp4.so
+SAPI_STATIC=libs/libphp4.a
 
 esyscmd(./scripts/config-stubs sapi)
 
@@ -761,7 +764,7 @@ if true; then
   fi
 
   # Warn about CGI version with no extra security options.
-  if test "$SAPI_TARGET" = "php"; then
+  if test "$PHP_SAPI" = "cgi"; then
     if test "$REDIRECT" = "0"; then
       if test "$DISCARD_PATH" = "0"; then
         echo "+--------------------------------------------------------------------+"

diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index 1ca096ecda8b712070ecd14949edae1c7cd28545..9f2cb75379996cfca14949ba8c5358bbaf40e213 100644 (file)
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -15,7 +15,7 @@ AC_ARG_WITH(aolserver,
        AC_DEFINE(HAVE_AOLSERVER)
        PHP_SAPI=aolserver
        PHP_BUILD_SHARED
-       INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 libs/libphp4.so $NS_DIR/root/bin/libphp4.so"
+       INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $NS_DIR/root/bin/"
        RESULT=yes
 ])
 AC_MSG_RESULT($RESULT)

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 67e311aaf4ee314f2231e9ae0b9369a8b98345ad..649dd2bf6405fdc3de7edd4c7e12cb95903621e0 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -17,8 +17,7 @@ AC_ARG_WITH(apxs,
        AC_ADD_INCLUDE($APXS_INCLUDEDIR)
     PHP_EXTENSION(apache)
        PHP_SAPI=apache
-       SAPI_TARGET=libphp4.so
-    APACHE_INSTALL="$APXS -i -a -n php4 libs/libphp4.so"
+    APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED"
        PHP_BUILD_SHARED
        STRONGHOLD=
        AC_DEFINE(APACHE)
@@ -31,7 +30,7 @@ AC_ARG_WITH(apxs,
 
 APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module"
 
-if test "$SAPI_TARGET" != "libphp4.so"; then
+if test "$PHP_SAPI" != "apache"; then
 AC_MSG_CHECKING(for Apache module support)
 AC_ARG_WITH(apache,
 [  --with-apache[=DIR]    Build Apache module.  DIR is the top-level Apache
@@ -49,8 +48,7 @@ AC_ARG_WITH(apache,
                        APACHE_INCLUDE=-I$withval/src
                        APACHE_TARGET=$withval/src
                        PHP_SAPI=apache
-                       SAPI_TARGET=libphp4.a
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_INSTALL_FILES $APACHE_TARGET"
+                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
                        PHP_LIBS="-L. -lphp3"
                        AC_DEFINE(APACHE)
                        AC_MSG_RESULT(yes - Apache 1.2.x)
@@ -66,8 +64,7 @@ AC_ARG_WITH(apache,
                                mkdir $APACHE_TARGET
                        fi
                        PHP_SAPI=apache
-                       SAPI_TARGET=libs/libphp4.a
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
                        PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
                        AC_DEFINE(APACHE)
                        AC_MSG_RESULT(yes - Apache 1.3.x)
@@ -96,9 +93,8 @@ AC_ARG_WITH(apache,
                                mkdir $APACHE_TARGET
                        fi
                        PHP_SAPI=apache
-                       SAPI_TARGET=libs/libphp4.a
                        PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
                        AC_DEFINE(APACHE)
                        AC_MSG_RESULT(yes - Apache 1.3.x)
                        STRONGHOLD=
@@ -120,9 +116,8 @@ AC_ARG_WITH(apache,
                        APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
                        APACHE_TARGET=$withval/apache
                        PHP_SAPI=apache
-                       SAPI_TARGET=libs/libphp4.a
                        PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
+                       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
                        STRONGHOLD=-DSTRONGHOLD=1
                        AC_DEFINE(APACHE)
                        AC_MSG_RESULT(yes - StrongHold)

diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4
index 4722f33b16c5fb5c48f7a3197f588c3d3b2c8082..cd872d5cbc86f8cb3e7eef91d4df35afd7423159 100644 (file)
--- a/sapi/cgi/config.m4
+++ b/sapi/cgi/config.m4
@@ -1,5 +1,5 @@
 
-if test "$SAPI_TARGET" = "php"; then
+if test "$PHP_SAPI" = "cgi"; then
 AC_MSG_CHECKING(whether to force Apache CGI redirect)
 AC_ARG_ENABLE(force-cgi-redirect,
 [  --enable-force-cgi-redirect
@@ -45,8 +45,8 @@ AC_ARG_ENABLE(discard_path,
 ]) 
 fi
 
-if test "$SAPI_TARGET" = "php" ; then
-  INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_TARGET \$(bindir)/$SAPI_TARGET"
+if test "$PHP_SAPI" = "cgi" ; then
+  INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_CGI"
 fi
 
 AC_MSG_CHECKING(for fhttpd module support)
@@ -54,28 +54,29 @@ AC_ARG_WITH(fhttpd,
 [  --with-fhttpd[=DIR]     Build fhttpd module.  DIR is the fhttpd sources
                           directory, defaults to /usr/local/src/fhttpd.],
 [
-       if test "$withval" = "yes"; then
-         # fhttpd source directory
-         withval=/usr/local/src/fhttpd
-       fi
-       if test "$withval" != "no"; then
+    if test "$withval" = "yes"; then
+      # fhttpd source directory
+      withval=/usr/local/src/fhttpd
+    fi
+    if test "$withval" != "no"; then
 # For fhttpd 0.3.x
-         if test -f $withval/servproc.h; then 
-           FHTTPD_INCLUDE=-I$withval/
-            FHTTPD_LIB=$withval/servproc.o
-           FHTTPD_TARGET=$withval/
-           SAPI_TARGET=php
-           AC_DEFINE(FHTTPD)
-           AC_MSG_RESULT(yes - fhttpd 0.3.x)
-         else
-           AC_MSG_RESULT(no)
-           AC_MSG_ERROR(Invalid fhttpd directory - unable to find servproc.h under $withval)
-         fi
-       else
-         AC_MSG_RESULT(no)
-       fi
+      if test -f $withval/servproc.h; then 
+        FHTTPD_INCLUDE=-I$withval/
+        FHTTPD_LIB=$withval/servproc.o
+        FHTTPD_TARGET=$withval/
+        PHP_BUILD_STATIC
+               PHP_SAPI=cgi
+        AC_DEFINE(FHTTPD)
+        AC_MSG_RESULT(yes - fhttpd 0.3.x)
+      else
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR(Invalid fhttpd directory - unable to find servproc.h under $withval)
+      fi
+    else
+      AC_MSG_RESULT(no)
+    fi
 ],[
-       AC_MSG_RESULT(no)
+    AC_MSG_RESULT(no)
 ])
 INCLUDES="$INCLUDES $FHTTPD_INCLUDE"
 dnl## AC_SUBST(FHTTPD_INCLUDE)

diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index 89fe714150e29b4b283817dc94a96d4d59638829..2f9e8f4249ecc0ff7a2ed059a5d910e4bfe57526 100644 (file)
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -18,7 +18,7 @@ dnl           fi
 dnl            AC_DEFINE(WITH_ZEUS)
 dnl            AC_ADD_INCLUDE($zeuspath/web/include)
 dnl            PHP_SAPI=isapi
-dnl            SAPI_TARGET=php4isapi.so
+dnl            PHP_BUILD_SHARED
 dnl    else
 dnl            AC_MSG_RESULT(no)
 dnl    fi