diff options
| author | foobar <sniper@php.net> | 2002-04-28 04:53:40 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-04-28 04:53:40 +0000 |
| commit | 2c8e8e040601613f0933dbf47ff5dfd877d3e019 (patch) | |
| tree | e80d122f88a19be4d5d6ac1282e3e36d68edff92 | |
| parent | c1c8a4fcfac3211c0d2dce02cacd805b9a4adf03 (diff) | |
| download | php-git-2c8e8e040601613f0933dbf47ff5dfd877d3e019.tar.gz | |
Fix build when openssl is enabled.
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | sapi/apache/libphp4.module.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d8d439337b..989b99c434 100644 --- 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 8a95655e6e..ccb97493a7 100644 --- 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 |