Re: [PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2008-03-09 Thread Lars Strojny 
Hi Hannes,

and again I have to change my opinion. As stated in
http://www.telana.com/peruser.php, peruser is - unlike its predecessor
metux - non-threaded. So it is completely correct to build PHP without
thread safety in cases of prefork, itk *and* peruser.

cu, Lars

Am Sonntag, den 09.03.2008, 12:08 +0100 schrieb Hannes Magnusson:
> 2008/3/9 Lars Strojny <[EMAIL PROTECTED]>:
> > lstrojnySun Mar  9 01:10:13 2008 UTC
> >
> >   Modified files:
> > /php-src/sapi/apache2filter config.m4
> > /php-src/sapi/apache2handlerconfig.m4
> >   Log:
> >   Adding itk and and peruser MPM to the list of threaded Apache MPMs
> >
> >
> >  
> > http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.45&r2=1.46&diff_format=u
> >  Index: php-src/sapi/apache2filter/config.m4
> >  diff -u php-src/sapi/apache2filter/config.m4:1.45 
> > php-src/sapi/apache2filter/config.m4:1.46
> >  --- php-src/sapi/apache2filter/config.m4:1.45   Wed Jul 11 23:10:14 2007
> >  +++ php-src/sapi/apache2filter/config.m4Sun Mar  9 01:10:13 2008
> >  @@ -1,5 +1,5 @@
> >   dnl
> >  -dnl $Id: config.m4,v 1.45 2007/07/11 23:10:14 jani Exp $
> >  +dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $
> >   dnl
> >
> >   PHP_ARG_WITH(apxs2filter,,
> >  @@ -110,7 +110,7 @@
> >  `ln -s $APXS_BINDIR/httpd _APP_`
> >  EXTRA_LIBS="$EXTRA_LIBS _APP_"
> >  PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
> > php_functions.c, $APACHE_CFLAGS)
> >  -INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
> >  +INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
> >  ;;
> >*)
> >  PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
> > php_functions.c, $APACHE_CFLAGS)
> >  @@ -118,7 +118,7 @@
> >  ;;
> >esac
> >
> >  -  if test "$APXS_MPM" != "prefork"; then
> >  +  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && 
> > test "$APXS_MPM" != "itk"; then
> >  PHP_BUILD_THREAD_SAFE
> 
> peruser is threaded, itk is not.
> 
> -Hannes
> 


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil

[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2008-03-09 Thread Lars Strojny 
lstrojnySun Mar  9 12:37:05 2008 UTC

  Modified files:  
/php-src/sapi/apache2filter config.m4 
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  sapi/apache2(handler|filter)/config.m4: Removing itk from the list of 
threaded MPMs (thanks Hannes)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.46&r2=1.47&diff_format=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.46 
php-src/sapi/apache2filter/config.m4:1.47
--- php-src/sapi/apache2filter/config.m4:1.46   Sun Mar  9 01:10:13 2008
+++ php-src/sapi/apache2filter/config.m4Sun Mar  9 12:37:05 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $
+dnl $Id: config.m4,v 1.47 2008/03/09 12:37:05 lstrojny Exp $
 dnl
 
 PHP_ARG_WITH(apxs2filter,,
@@ -118,7 +118,7 @@
 ;;
   esac
 
-  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test 
"$APXS_MPM" != "itk"; then
+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.19&r2=1.20&diff_format=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.19 
php-src/sapi/apache2handler/config.m4:1.20
--- php-src/sapi/apache2handler/config.m4:1.19  Sun Mar  9 01:10:13 2008
+++ php-src/sapi/apache2handler/config.m4   Sun Mar  9 12:37:05 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.19 2008/03/09 01:10:13 lstrojny Exp $
+dnl $Id: config.m4,v 1.20 2008/03/09 12:37:05 lstrojny Exp $
 dnl
 
 PHP_ARG_WITH(apxs2,,
@@ -117,7 +117,7 @@
 ;;
   esac
 
-  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test 
"$APXS_MPM" != "itk"; then
+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)



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

Re: [PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2008-03-09 Thread Lars Strojny 
Hi Hannes,

Am Sonntag, den 09.03.2008, 12:08 +0100 schrieb Hannes Magnusson:
> peruser is threaded, itk is not.

Thanks for pointing that out. Don't know why I was sure that both are
threaded.

cu, Lars


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil

Re: [PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2008-03-09 Thread Hannes Magnusson 
2008/3/9 Lars Strojny <[EMAIL PROTECTED]>:
> lstrojnySun Mar  9 01:10:13 2008 UTC
>
>   Modified files:
> /php-src/sapi/apache2filter config.m4
> /php-src/sapi/apache2handlerconfig.m4
>   Log:
>   Adding itk and and peruser MPM to the list of threaded Apache MPMs
>
>
>  
> http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.45&r2=1.46&diff_format=u
>  Index: php-src/sapi/apache2filter/config.m4
>  diff -u php-src/sapi/apache2filter/config.m4:1.45 
> php-src/sapi/apache2filter/config.m4:1.46
>  --- php-src/sapi/apache2filter/config.m4:1.45   Wed Jul 11 23:10:14 2007
>  +++ php-src/sapi/apache2filter/config.m4Sun Mar  9 01:10:13 2008
>  @@ -1,5 +1,5 @@
>   dnl
>  -dnl $Id: config.m4,v 1.45 2007/07/11 23:10:14 jani Exp $
>  +dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $
>   dnl
>
>   PHP_ARG_WITH(apxs2filter,,
>  @@ -110,7 +110,7 @@
>  `ln -s $APXS_BINDIR/httpd _APP_`
>  EXTRA_LIBS="$EXTRA_LIBS _APP_"
>  PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
> php_functions.c, $APACHE_CFLAGS)
>  -INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
>  +INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
>  ;;
>*)
>  PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
> php_functions.c, $APACHE_CFLAGS)
>  @@ -118,7 +118,7 @@
>  ;;
>esac
>
>  -  if test "$APXS_MPM" != "prefork"; then
>  +  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test 
> "$APXS_MPM" != "itk"; then
>  PHP_BUILD_THREAD_SAFE

peruser is threaded, itk is not.

-Hannes

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

Re: [PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2008-03-08 Thread Jani Taskinen 


How about using 'case' instead of those multiple if's? It would make it a bit 
cleaner.


--Jani

Lars Strojny kirjoitti:

lstrojnySun Mar  9 01:10:13 2008 UTC

  Modified files:  
/php-src/sapi/apache2filter	config.m4 
/php-src/sapi/apache2handler	config.m4 
  Log:

  Adding itk and and peruser MPM to the list of threaded Apache MPMs
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.45&r2=1.46&diff_format=u

Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.45 
php-src/sapi/apache2filter/config.m4:1.46
--- php-src/sapi/apache2filter/config.m4:1.45   Wed Jul 11 23:10:14 2007
+++ php-src/sapi/apache2filter/config.m4Sun Mar  9 01:10:13 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.45 2007/07/11 23:10:14 jani Exp $
+dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $
 dnl
 
 PHP_ARG_WITH(apxs2filter,,

@@ -110,7 +110,7 @@
 `ln -s $APXS_BINDIR/httpd _APP_`
 EXTRA_LIBS="$EXTRA_LIBS _APP_"
 PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c, $APACHE_CFLAGS)
-INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
+INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"

 ;;
   *)
 PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) 
@@ -118,7 +118,7 @@

 ;;
   esac
 
-  if test "$APXS_MPM" != "prefork"; then

+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" 
!= "itk"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.18&r2=1.19&diff_format=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.18 
php-src/sapi/apache2handler/config.m4:1.19
--- php-src/sapi/apache2handler/config.m4:1.18  Wed Jul 11 23:10:14 2007
+++ php-src/sapi/apache2handler/config.m4   Sun Mar  9 01:10:13 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.18 2007/07/11 23:10:14 jani Exp $
+dnl $Id: config.m4,v 1.19 2008/03/09 01:10:13 lstrojny Exp $
 dnl
 
 PHP_ARG_WITH(apxs2,,

@@ -117,7 +117,7 @@
 ;;
   esac
 
-  if test "$APXS_MPM" != "prefork"; then

+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" 
!= "itk"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)






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

[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2008-03-08 Thread Lars Strojny 
lstrojnySun Mar  9 01:10:13 2008 UTC

  Modified files:  
/php-src/sapi/apache2filter config.m4 
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  Adding itk and and peruser MPM to the list of threaded Apache MPMs
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.45&r2=1.46&diff_format=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.45 
php-src/sapi/apache2filter/config.m4:1.46
--- php-src/sapi/apache2filter/config.m4:1.45   Wed Jul 11 23:10:14 2007
+++ php-src/sapi/apache2filter/config.m4Sun Mar  9 01:10:13 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.45 2007/07/11 23:10:14 jani Exp $
+dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $
 dnl
 
 PHP_ARG_WITH(apxs2filter,,
@@ -110,7 +110,7 @@
 `ln -s $APXS_BINDIR/httpd _APP_`
 EXTRA_LIBS="$EXTRA_LIBS _APP_"
 PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c, $APACHE_CFLAGS)
-INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
+INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
 ;;
   *)
 PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c, $APACHE_CFLAGS) 
@@ -118,7 +118,7 @@
 ;;
   esac
 
-  if test "$APXS_MPM" != "prefork"; then
+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test 
"$APXS_MPM" != "itk"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.18&r2=1.19&diff_format=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.18 
php-src/sapi/apache2handler/config.m4:1.19
--- php-src/sapi/apache2handler/config.m4:1.18  Wed Jul 11 23:10:14 2007
+++ php-src/sapi/apache2handler/config.m4   Sun Mar  9 01:10:13 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.18 2007/07/11 23:10:14 jani Exp $
+dnl $Id: config.m4,v 1.19 2008/03/09 01:10:13 lstrojny Exp $
 dnl
 
 PHP_ARG_WITH(apxs2,,
@@ -117,7 +117,7 @@
 ;;
   esac
 
-  if test "$APXS_MPM" != "prefork"; then
+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test 
"$APXS_MPM" != "itk"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)



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

[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2005-09-01 Thread Jani Taskinen 
sniper  Thu Sep  1 10:33:37 2005 EDT

  Modified files:  
/php-src/sapi/apache2filter config.m4 
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  - Revert -a to -A change, bad idea: It disables EXISTING lines too!
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.41&r2=1.42&ty=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.41 
php-src/sapi/apache2filter/config.m4:1.42
--- php-src/sapi/apache2filter/config.m4:1.41   Fri Aug  5 04:14:52 2005
+++ php-src/sapi/apache2filter/config.m4Thu Sep  1 10:33:36 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.41 2005/08/05 08:14:52 sniper Exp $
+dnl $Id: config.m4,v 1.42 2005/09/01 14:33:36 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -76,7 +76,7 @@
 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
-   -i -A -n php5"
+   -i -a -n php5"
   fi
 
   case $host_alias in
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.14&r2=1.15&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.14 
php-src/sapi/apache2handler/config.m4:1.15
--- php-src/sapi/apache2handler/config.m4:1.14  Fri Aug  5 04:14:54 2005
+++ php-src/sapi/apache2handler/config.m4   Thu Sep  1 10:33:37 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.14 2005/08/05 08:14:54 sniper Exp $
+dnl $Id: config.m4,v 1.15 2005/09/01 14:33:37 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -75,7 +75,7 @@
 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
-   -i -A -n php5"
+   -i -a -n php5"
   fi
 
   case $host_alias in

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

[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2005-08-05 Thread Jani Taskinen 
sniper  Fri Aug  5 04:14:55 2005 EDT

  Modified files:  
/php-src/sapi/apache2filter config.m4 
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  - Changed -a to -A to prevent enabling PHP in httpd.conf automatically.
  # Most distributions use separate file in a conf.d/ directory to enable
  # PHP, using -a would add unnecessary line in the main httpd.conf and
  # causes a warning during startup.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.40&r2=1.41&ty=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.40 
php-src/sapi/apache2filter/config.m4:1.41
--- php-src/sapi/apache2filter/config.m4:1.40   Sun May 29 19:16:45 2005
+++ php-src/sapi/apache2filter/config.m4Fri Aug  5 04:14:52 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.40 2005/05/29 23:16:45 sniper Exp $
+dnl $Id: config.m4,v 1.41 2005/08/05 08:14:52 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -76,7 +76,7 @@
 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
-   -i -a -n php5"
+   -i -A -n php5"
   fi
 
   case $host_alias in
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.13&r2=1.14&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.13 
php-src/sapi/apache2handler/config.m4:1.14
--- php-src/sapi/apache2handler/config.m4:1.13  Sun May 29 19:16:46 2005
+++ php-src/sapi/apache2handler/config.m4   Fri Aug  5 04:14:54 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.13 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.14 2005/08/05 08:14:54 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -75,7 +75,7 @@
 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
-   -i -a -n php5"
+   -i -A -n php5"
   fi
 
   case $host_alias in

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

[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2004-08-23 Thread Derick Rethans 
derick  Mon Aug 23 05:01:27 2004 EDT

  Modified files:  
/php-src/sapi/apache2filter config.m4 
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  - MFB: Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Patch by Joe Orton)
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.36&r2=1.37&ty=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.36 
php-src/sapi/apache2filter/config.m4:1.37
--- php-src/sapi/apache2filter/config.m4:1.36   Fri Oct  3 01:24:27 2003
+++ php-src/sapi/apache2filter/config.m4Mon Aug 23 05:01:27 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.36 2003/10/03 05:24:27 sniper Exp $
+dnl $Id: config.m4,v 1.37 2004/08/23 09:01:27 derick Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -40,8 +40,14 @@
   APU_BINDIR=`$APXS -q APU_BINDIR`
   APR_BINDIR=`$APXS -q APR_BINDIR`
 
-  APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
-  APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
+  # Pick up ap[ru]-N-config if using httpd >=2.1
+  APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+echo $APR_BINDIR/apr-config`
+  APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+echo $APU_BINDIR/apu-config`
+
+  APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+  APU_CFLAGS="`$APU_CONFIG --includes`"
 
   for flag in $APXS_CFLAGS; do
 case $flag in
@@ -49,7 +55,7 @@
 esac
   done
 
-  APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
+  APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
 
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.9 
php-src/sapi/apache2handler/config.m4:1.10
--- php-src/sapi/apache2handler/config.m4:1.9   Tue Oct 21 07:48:31 2003
+++ php-src/sapi/apache2handler/config.m4   Mon Aug 23 05:01:27 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.9 2003/10/21 11:48:31 sniper Exp $
+dnl $Id: config.m4,v 1.10 2004/08/23 09:01:27 derick Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -39,8 +39,14 @@
   APU_BINDIR=`$APXS -q APU_BINDIR`
   APR_BINDIR=`$APXS -q APR_BINDIR`
 
-  APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
-  APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
+  # Pick up ap[ru]-N-config if using httpd >=2.1
+  APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+echo $APR_BINDIR/apr-config`
+  APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+echo $APU_BINDIR/apu-config`
+
+  APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+  APU_CFLAGS="`$APU_CONFIG --includes`"
 
   for flag in $APXS_CFLAGS; do
 case $flag in
@@ -48,7 +54,7 @@
 esac
   done
 
-  APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
+  APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
 
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)

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

[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2003-07-15 Thread Jani Taskinen 
sniper  Wed Jul 16 01:46:36 2003 EDT

  Modified files:  
/php-src/sapi/apache2filter config.m4 
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  - Use the correct paths to apu-config / apr-config
  
  
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.34 
php-src/sapi/apache2filter/config.m4:1.35
--- php-src/sapi/apache2filter/config.m4:1.34   Tue Jul  8 10:12:56 2003
+++ php-src/sapi/apache2filter/config.m4Wed Jul 16 01:46:36 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.34 2003/07/08 14:12:56 sniper Exp $
+dnl $Id: config.m4,v 1.35 2003/07/16 05:46:36 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -36,9 +36,11 @@
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
   APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_MPM=`$APXS -q MPM_NAME`
+  APU_BINDIR=`$APXS -q APU_BINDIR`
+  APR_BINDIR=`$APXS -q APR_BINDIR`
 
-  APU_INCLUDEDIR="`$APXS_BINDIR/apu-config --includes`"
-  APR_INCLUDEDIR="`$APXS_BINDIR/apr-config --includes`"
+  APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
+  APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
 
   for flag in $APXS_CFLAGS; do
 case $flag in
@@ -81,11 +83,11 @@
 dnl the linker does not recursively look at the bundle loader and
 dnl pull in its dependencies.  Therefore, we must pull in the APR
 dnl and APR-util libraries.
-if test -x "$APXS_BINDIR/apr-config"; then
-MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`"
+if test -x "$APR_BINDIR/apr-config"; then
+MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld --libs`"
 fi
-if test -x "$APXS_BINDIR/apu-config"; then
-MH_BUNDLE_FLAGS="`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` 
$MH_BUNDLE_FLAGS"
+if test -x "$APU_BINDIR/apu-config"; then
+MH_BUNDLE_FLAGS="`$APU_BINDIR/apu-config --ldflags --link-ld --libs` 
$MH_BUNDLE_FLAGS"
 fi
 MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
 PHP_SUBST(MH_BUNDLE_FLAGS)
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.7 
php-src/sapi/apache2handler/config.m4:1.8
--- php-src/sapi/apache2handler/config.m4:1.7   Tue Jul  8 09:53:34 2003
+++ php-src/sapi/apache2handler/config.m4   Wed Jul 16 01:46:36 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7 2003/07/08 13:53:34 sniper Exp $
+dnl $Id: config.m4,v 1.8 2003/07/16 05:46:36 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -36,9 +36,11 @@
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
   APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_MPM=`$APXS -q MPM_NAME`
+  APU_BINDIR=`$APXS -q APU_BINDIR`
+  APR_BINDIR=`$APXS -q APR_BINDIR`
 
-  APU_INCLUDEDIR="`$APXS_BINDIR/apu-config --includes`"
-  APR_INCLUDEDIR="`$APXS_BINDIR/apr-config --includes`"
+  APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
+  APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
 
   for flag in $APXS_CFLAGS; do
 case $flag in
@@ -81,11 +83,11 @@
 dnl the linker does not recursively look at the bundle loader and
 dnl pull in its dependencies.  Therefore, we must pull in the APR
 dnl and APR-util libraries.
-if test -x "$APXS_BINDIR/apr-config"; then
-MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`"
+if test -x "$APR_BINDIR/apr-config"; then
+MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld --libs`"
 fi
-if test -x "$APXS_BINDIR/apu-config"; then
-MH_BUNDLE_FLAGS="`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` 
$MH_BUNDLE_FLAGS"
+if test -x "$APU_BINDIR/apu-config"; then
+MH_BUNDLE_FLAGS="`$APU_BINDIR/apu-config --ldflags --link-ld --libs` 
$MH_BUNDLE_FLAGS"
 fi
 MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
 PHP_SUBST(MH_BUNDLE_FLAGS)



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

[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

2003-07-08 Thread Jani Taskinen 
sniper  Tue Jul  8 09:53:34 2003 EDT

  Modified files:  
/php-src/sapi/apache2filter config.m4 
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  - Fixed bug #24537 (apache2 compile missing include directories)
  
  
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.32 
php-src/sapi/apache2filter/config.m4:1.33
--- php-src/sapi/apache2filter/config.m4:1.32   Wed May 28 10:11:21 2003
+++ php-src/sapi/apache2filter/config.m4Tue Jul  8 09:53:34 2003
@@ -1,8 +1,8 @@
 dnl
-dnl $Id: config.m4,v 1.32 2003/05/28 14:11:21 sniper Exp $
+dnl $Id: config.m4,v 1.33 2003/07/08 13:53:34 sniper Exp $
 dnl
 
-AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
+AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
 AC_ARG_WITH(apxs2filter,
 [  --with-apxs2filter[=FILE]   EXPERIMENTAL: Build shared Apache 2.0 module. FILE is 
the optional
   pathname to the Apache apxs tool; defaults to "apxs".],[
@@ -32,22 +32,28 @@
   fi 
 
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
+  APXS_BINDIR=`$APXS -q BINDIR`
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
   APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_MPM=`$APXS -q MPM_NAME`
 
+  APU_INCLUDEDIR="`$APXS_BINDIR/apu-config --includes`"
+  APR_INCLUDEDIR="`$APXS_BINDIR/apr-config --includes`"
+
   for flag in $APXS_CFLAGS; do
 case $flag in
--D*) CPPFLAGS="$CPPFLAGS $flag";;
+-D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";;
 esac
   done
 
+  APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
+
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -le 200; then
 AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  
Please use the appropiate switch --with-apxs (without the 2)])
-  elif test "$APACHE_VERSION" -lt 240; then
-AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required.])
+  elif test "$APACHE_VERSION" -lt 244; then
+AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required.])
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
@@ -67,7 +73,7 @@
   case $host_alias in
   *aix*)
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c)
+PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c, $APACHE_CFLAGS)
 INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
 ;;
   *darwin*)
@@ -75,43 +81,40 @@
 dnl the linker does not recursively look at the bundle loader and
 dnl pull in its dependencies.  Therefore, we must pull in the APR
 dnl and APR-util libraries.
-APXS_BINDIR=`$APXS -q BINDIR`
-if test -f $APXS_BINDIR/apr-config; then
+if test -x "$APXS_BINDIR/apr-config"; then
 MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`"
 fi
-if test -f $APXS_BINDIR/apu-config; then
+if test -x "$APXS_BINDIR/apu-config"; then
 MH_BUNDLE_FLAGS="`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` 
$MH_BUNDLE_FLAGS"
 fi
 MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
 PHP_SUBST(MH_BUNDLE_FLAGS)
-PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c 
php_functions.c)
+PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c 
php_functions.c, $APACHE_CFLAGS)
 SAPI_SHARED=libs/libphp5.so
 INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
 ;;
   *beos*)
-APXS_BINDIR=`$APXS -q BINDIR`
 if test -f _APP_; then `rm _APP_`; fi
 `ln -s $APXS_BINDIR/httpd _APP_`
 EXTRA_LIBS="$EXTRA_LIBS _APP_"
-PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c)
+PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c, $APACHE_CFLAGS)
 INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
 ;;
   *)
-PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c) 
+PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c 
php_functions.c, $APACHE_CFLAGS) 
 INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
 ;;
   esac
 
-  PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
   if test "$APXS_MPM" != "prefork"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)
+  
+  PHP_SUBST(APXS)
 ],[
   AC_MSG_RESULT(no)
 ])
-
-PHP_SUBST(APXS)
 
 dnl ## Local Variables:
 dnl ## tab-width: 4
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.6 
php-src/sapi/apache2handler/config.m4:1.7
--- php-src/sapi/apache2handler/config.m4:1.6   Wed May 28 10:11:21 2003
+++ php-src/sapi/apache2handler/config.m4   Tue Jul  8 09:53:34 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.6 2003/05/28 14:11:21 sniper Exp $
+dnl $Id: config.m4,v 1.7 2003/07/08 13:53:34 sni