cvs: php4 / acinclude.m4
| From: | Jani Taskinen | Date: | Tue, 23 Apr 2002 02:47:34 +0000 |
| Subject: | cvs: php4 / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11321@lists.php.net to get a copy of this message | ||
sniper Mon Apr 22 22:47:34 2002 EDT
Modified files:
/php4 acinclude.m4
Log:
Part 1 of commits to fix some issues with static apache (1.3.x) compile:
- Made the OPENSSL_INCDIR available to be added in the PHP_CFLAGS
in libphp4.module
- Make it possible to set SAPI specific include dirs
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.183 php4/acinclude.m4:1.184
--- php4/acinclude.m4:1.183 Thu Apr 11 01:47:03 2002
+++ php4/acinclude.m4 Mon Apr 22 22:47:34 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.183 2002/04/11 05:47:03 sas Exp $
+dnl $Id: acinclude.m4,v 1.184 2002/04/23 02:47:34 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -239,6 +239,9 @@
],[
-L$OPENSSL_LIBDIR
])
+
+ AC_SUBST(OPENSSL_INCDIR)
+
])
dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)
@@ -1091,7 +1094,7 @@
])
dnl
-dnl PHP_SELECT_SAPI(name, type[, sources])
+dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags]])
dnl
dnl Selects the SAPI name and type (static, shared, programm)
dnl and optionally also the source-files for the SAPI-specific
@@ -1106,8 +1109,10 @@
bundle) PHP_BUILD_BUNDLE;;
program) PHP_BUILD_PROGRAM;;
esac
+
+ ifelse($,,ac_extra=,[ac_extra=$4])
- ifelse($3,,,[PHP_ADD_SOURCES(sapi/$1, $3,,sapi)])
+ ifelse($3,,,[PHP_ADD_SOURCES(sapi/$1, $3, $ac_extra, sapi)])
])
dnl deprecated