summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2008-07-25 12:36:34 (GMT)
committerJani Taskinen <jani@php.net>2008-07-25 12:36:34 (GMT)
commit395e75bc5de02a1bc73847212caeb2bd713ae13d (patch)
tree40acd758bd90acef7e451e044b176af343b7c91a /scripts
parentfd3b5bcc5a84d98600d512d861326d0413e0ee54 (diff)
downloadphp-395e75bc5de02a1bc73847212caeb2bd713ae13d.tar.gz
MFH: Fixed a minor problem in not enabling c++/g++ when not needed.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/phpize.m412
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index c8a8102..9ce50b6 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -70,10 +70,14 @@ sinclude(config.m4)
enable_static=no
enable_shared=yes
-dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX)
-dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler
-AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX])
-AC_DEFUN([AC_PROG_CXX], [])])
+dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX).
+dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler.
+AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [
+ undefine([AC_PROG_CXX])
+ AC_DEFUN([AC_PROG_CXX], [])
+ undefine([AC_PROG_CXXCPP])
+ AC_DEFUN([AC_PROG_CXXCPP], [])
+])
AC_PROG_LIBTOOL
all_targets='$(PHP_MODULES)'