cvs: php4 / acinclude.m4 /sapi/apache libphp4.module.in

sniper Sun Apr 28 00:53:40 2002 EDT Modified files: /php4 acinclude.m4 /php4/sapi/apache libphp4.module.in Log: Fix build when openssl is enabled. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.185 php4/acinclude.m4:1.186 --- php4/acinclude.m4:1.185 Tue Apr 23 01:06:51 2002 +++ php4/acinclude.m4 Sun Apr 28 00:53:40 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.185 2002/04/23 05:06:51 sas Exp $ +dnl $Id: acinclude.m4,v 1.186 2002/04/28 04:53:40 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -240,8 +240,8 @@ -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) Index: php4/sapi/apache/libphp4.module.in diff -u php4/sapi/apache/libphp4.module.in:1.12 php4/sapi/apache/libphp4.module.in:1.13 --- php4/sapi/apache/libphp4.module.in:1.12 Fri Apr 26 06:23:16 2002 +++ php4/sapi/apache/libphp4.module.in Sun Apr 28 00:53:40 2002 @@ -3,7 +3,7 @@ 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