sniper Fri Oct 11 19:28:01 2002 EDT
Modified files:
/php4/sapi/embed config.m4
Log:
- Removed the unnecessary extra configure option --enable-shared-embed
- Changed --enable-embed to accept parameters shared/static and default
to static build.
Index: php4/sapi/embed/config.m4
diff -u php4/sapi/embed/config.m4:1.1 php4/sapi/embed/config.m4:1.2
--- php4/sapi/embed/config.m4:1.1 Sun Sep 29 12:22:48 2002
+++ php4/sapi/embed/config.m4 Fri Oct 11 19:28:01 2002
@@ -1,14 +1,30 @@
-PHP_ARG_ENABLE(embed,whether to enable the embedded SAPI module,
-[ --enable-embed])
+dnl
+dnl $Id: config.m4,v 1.2 2002/10/11 23:28:01 sniper Exp $
+dnl
-PHP_ARG_ENABLE(embed-shared,whether to build it as shared library,
-[ --enable-embed-shared])
+AC_MSG_CHECKING(for embedded SAPI library support)
-if test "$PHP_EMBED" = "yes"; then
- if test "$PHP_EMBED_SHARED" = "yes"; then
- ac_type=shared
- else
- ac_type=static
- fi
- PHP_SELECT_SAPI(embed, $ac_type, php_embed.c)
+AC_ARG_ENABLE(embed,
+[ --enable-embed[=TYPE] Enable building embedded SAPI library of PHP
+ TYPE is either 'shared' or 'static'. Defaults to 'static'
+library.],
+[
+ case $enableval in
+ yes|static)
+ PHP_EMBED_TYPE=static
+ ;;
+ shared)
+ PHP_EMBED_TYPE=shared
+ ;;
+ *)
+ PHP_EMBED_TYPE=no
+ ;;
+ esac
+],[
+ PHP_EMBED=no
+])
+
+AC_MSG_RESULT($PHP_EMBED_TYPE)
+
+if test "$PHP_EMBED_TYPE" != "no"; then
+ PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
