[PHP-CVS] cvs: php4 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2003-05-29 Thread Jani Taskinen 
sniper  Wed May 28 10:11:21 2003 EDT

  Modified files:  
/php4/sapi/apache   config.m4 
/php4/sapi/apache2filterconfig.m4 
/php4/sapi/apache2handler   config.m4 
  Log:
  - Fix the error message if apxs|2 is fubar.
  
  
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.70 php4/sapi/apache/config.m4:1.71
--- php4/sapi/apache/config.m4:1.70 Sun Mar 30 13:36:04 2003
+++ php4/sapi/apache/config.m4  Wed May 28 10:11:21 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.70 2003/03/30 18:36:04 sas Exp $
+dnl $Id: config.m4,v 1.71 2003/05/28 14:11:21 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
@@ -26,7 +26,7 @@
 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
+$APXS -q CFLAGS
 AC_MSG_ERROR([Aborting]) 
   fi 
 
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.31 php4/sapi/apache2filter/config.m4:1.32
--- php4/sapi/apache2filter/config.m4:1.31  Mon Apr 28 15:42:55 2003
+++ php4/sapi/apache2filter/config.m4   Wed May 28 10:11:21 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.31 2003/04/28 19:42:55 sas Exp $
+dnl $Id: config.m4,v 1.32 2003/05/28 14:11:21 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
@@ -27,7 +27,7 @@
 AC_MSG_RESULT([3. Apache was not built using --enable-so (the apxs usage page is 
displayed)])
 AC_MSG_RESULT()
 AC_MSG_RESULT([The output of $APXS follows:])
-$APXS
+$APXS -q CFLAGS
 AC_MSG_ERROR([Aborting])
   fi 
 
Index: php4/sapi/apache2handler/config.m4
diff -u php4/sapi/apache2handler/config.m4:1.5 php4/sapi/apache2handler/config.m4:1.6
--- php4/sapi/apache2handler/config.m4:1.5  Mon Apr 28 15:43:09 2003
+++ php4/sapi/apache2handler/config.m4  Wed May 28 10:11:21 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.5 2003/04/28 19:43:09 sas Exp $
+dnl $Id: config.m4,v 1.6 2003/05/28 14:11:21 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -27,7 +27,7 @@
 AC_MSG_RESULT([3. Apache was not built using --enable-so (the apxs usage page is 
displayed)])
 AC_MSG_RESULT()
 AC_MSG_RESULT([The output of $APXS follows:])
-$APXS
+$APXS -q CFLAGS
 AC_MSG_ERROR([Aborting])
   fi 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2003-02-22 Thread Jani Taskinen 
sniper  Sun Feb 23 02:32:03 2003 EDT

  Modified files:  
/php4/sapi/apache   config.m4 
/php4/sapi/apache2filterconfig.m4 
/php4/sapi/apache2handler   config.m4 
  Log:
  - Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT)
  
  
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.66 php4/sapi/apache/config.m4:1.67
--- php4/sapi/apache/config.m4:1.66 Thu Feb 13 02:47:21 2003
+++ php4/sapi/apache/config.m4  Sun Feb 23 02:32:03 2003
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.66 2003/02/13 07:47:21 sniper Exp $
+dnl $Id: config.m4,v 1.67 2003/02/23 07:32:03 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
 -70,7 +70,19 
   if test $? != 0; then
 APACHE_INSTALL=$APXS -i -a -n php4 $SAPI_SHARED # Old apxs does not have -S 
option
   else 
-APACHE_INSTALL=\$(mkinstalldirs) \\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\  
$APXS -S LIBEXECDIR=\\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\ -i -a -n php4 
$SAPI_SHARED
+APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+if test -z `$APXS -q SYSCONFDIR`; then
+  APACHE_INSTALL=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
+   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -i -n php4 $SAPI_SHARED
+else
+  APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+  APACHE_INSTALL=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
+  \$(mkinstalldirs) '$APXS_SYSCONFDIR'  \
+   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -i -a -n php4 $SAPI_SHARED
+fi
   fi
 
   if test -z `$APXS -q LD_SHLIB` || test `$APXS -q LIBEXECDIR` = modules; then
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.27 php4/sapi/apache2filter/config.m4:1.28
--- php4/sapi/apache2filter/config.m4:1.27  Mon Feb  3 12:35:10 2003
+++ php4/sapi/apache2filter/config.m4   Sun Feb 23 02:32:03 2003
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.27 2003/02/03 17:35:10 sniper Exp $
+dnl $Id: config.m4,v 1.28 2003/02/23 07:32:03 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
 -52,12 +52,17 
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
   if test -z `$APXS -q SYSCONFDIR`; then
-optarg=
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+   -i -n php4
   else
-optarg=-a
+APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
+\$(mkinstalldirs) '$APXS_SYSCONFDIR'  \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+   -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+   -i -a -n php4
   fi
-
-  INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR  $APXS -S 
LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4
 
   case $host_alias in
   *aix*)
Index: php4/sapi/apache2handler/config.m4
diff -u php4/sapi/apache2handler/config.m4:1.1 php4/sapi/apache2handler/config.m4:1.2
--- php4/sapi/apache2handler/config.m4:1.1  Tue Feb 11 12:40:11 2003
+++ php4/sapi/apache2handler/config.m4  Sun Feb 23 02:32:03 2003
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.1 2003/02/11 17:40:11 ianh Exp $
+dnl $Id: config.m4,v 1.2 2003/02/23 07:32:03 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
 -52,12 +52,17 
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
   if test -z `$APXS -q SYSCONFDIR`; then
-optarg=
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+   -i -n php4
   else
-optarg=-a
+APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
+\$(mkinstalldirs) '$APXS_SYSCONFDIR'  \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+   -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+   -i -a -n php4
   fi
-
-  INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR  $APXS -S 
LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4
 
   case $host_alias in
   *aix*)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php