cvs: php-src / configure.in
| From: | Jani Taskinen | Date: | Mon, 14 Mar 2005 21:11:36 +0000 |
| Subject: | cvs: php-src / configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30938@lists.php.net to get a copy of this message | ||
sniper Mon Mar 14 16:11:36 2005 EDT
Modified files:
/php-src configure.in
Log:
- Fixed bug #32200 (prevent using both --with-apxs2 and --with-apxs2filter)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.542&r2=1.543&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.542 php-src/configure.in:1.543
--- php-src/configure.in:1.542 Thu Feb 24 14:27:10 2005
+++ php-src/configure.in Mon Mar 14 16:11:33 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.542 2005/02/24 19:27:10 sniper Exp $ -*- autoconf -*-
+dnl ## $Id: configure.in,v 1.543 2005/03/14 21:11:33 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -82,7 +82,11 @@
AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together])
fi
+if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then
+ AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together])
+fi
+
dnl Settings we want to make before the checks.
dnl -------------------------------------------------------------------------