Fix build when openssl is enabled.

diff --git a/acinclude.m4 b/acinclude.m4
index d8d439337b4d8c07e3935965271c9b1bd318358e..989b99c43496f018ca047283a37faeaeeb8e8556 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -240,8 +240,8 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
     -L$OPENSSL_LIBDIR
   ])
 
-  AC_SUBST(OPENSSL_INCDIR)
-
+  OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
+  AC_SUBST(OPENSSL_INCDIR_OPT)
 ])
 
 dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)

diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in
index 8a95655e6e9514ebd168d9ba815cb39ce3fb9c0c..ccb97493a72fcc7c4a6d402eb5103594e1cba729 100644 (file)
--- a/sapi/apache/libphp4.module.in
+++ b/sapi/apache/libphp4.module.in
@@ -3,7 +3,7 @@ ConfigStart
        RULE_WANTHSREGEX=no
        RULE_HIDE=yes
        PHP_LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS"
-       PHP_CFLAGS="$CFLAGS -I@php_abs_top_builddir@/main -I@php_abs_top_builddir@/Zend -I@php_abs_top_builddir@/TSRM -I@php_abs_top_srcdir@ -I@php_abs_top_srcdir@/sapi/apache -I@php_abs_top_srcdir@/main -I@php_abs_top_srcdir@/Zend -I@php_abs_top_srcdir@/TSRM"
+       PHP_CFLAGS="$CFLAGS @OPENSSL_INCDIR_OPT@ -I@php_abs_top_builddir@/main -I@php_abs_top_builddir@/Zend -I@php_abs_top_builddir@/TSRM -I@php_abs_top_srcdir@ -I@php_abs_top_srcdir@/sapi/apache -I@php_abs_top_srcdir@/main -I@php_abs_top_srcdir@/Zend -I@php_abs_top_srcdir@/TSRM"
        my_outfile="Makefile.config"
        echo "PHP_CFLAGS=$PHP_CFLAGS" >>$my_outfile
        echo "PHP_LIBS=$PHP_LIBS" >>$my_outfile