sas Fri Dec 6 01:27:01 2002 EDT
Modified files:
/php4/ext/ircg config.m4
Log:
enable shared build
Index: php4/ext/ircg/config.m4
diff -u php4/ext/ircg/config.m4:1.17 php4/ext/ircg/config.m4:1.18
--- php4/ext/ircg/config.m4:1.17 Tue Dec 3 05:13:36 2002
+++ php4/ext/ircg/config.m4 Fri Dec 6 01:27:01 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.17 2002/12/03 10:13:36 sas Exp $
+dnl $Id: config.m4,v 1.18 2002/12/06 06:27:01 sas Exp $
dnl
PHP_ARG_WITH(ircg, for IRCG support,
@@ -9,8 +9,8 @@
[ --with-ircg-config=PATH IRCG: Path to the ircg-config script],
[ IRCG_CONFIG=$withval ],
[
-if test "$with_ircg" != "yes" && test "$with_ircg" != "no"; then
- IRCG_CONFIG=$with_ircg/bin/ircg-config
+if test "$PHP_IRCG" != "yes" && test "$PHP_IRCG" != "no"; then
+ IRCG_CONFIG=$PHP_IRCG/bin/ircg-config
else
IRCG_CONFIG=ircg-config
fi
@@ -22,19 +22,21 @@
AC_MSG_ERROR([I cannot run the ircg-config script which should have been
installed by IRCG. Please ensure that the script is in your PATH or point
--with-ircg-config to the path of the script.])
fi
- PHP_EVAL_LIBLINE(`$IRCG_CONFIG --ldflags`)
+ PHP_EVAL_LIBLINE(`$IRCG_CONFIG --ldflags`, IRCG_SHARED_LIBADD)
PHP_EVAL_INCLINE(`$IRCG_CONFIG --cppflags`)
- PHP_ADD_LIBRARY_WITH_PATH(ircg, $PHP_IRCG/lib)
+ PHP_ADD_LIBRARY_WITH_PATH(ircg, $PHP_IRCG/lib, IRCG_SHARED_LIBADD)
PHP_ADD_INCLUDE($PHP_IRCG/include)
- PHP_NEW_EXTENSION(ircg,[ ircg.c ircg_scanner.c php_ircg_cache.c \
- php_ircg_conversion.c php_ircg_error.c php_ircg_tokenizer.c],
- $ext_shared)
+ PHP_SUBST(IRCG_SHARED_LIBADD)
+ ircg_src="ircg_common.c"
if test "$PHP_SAPI" = "thttpd"; then
+ ircg_src=
PHP_ADD_SOURCES(PHP_EXT_DIR(ircg),ircg_thttpd.c,[],sapi)
PHP_ADD_SOURCES(PHP_EXT_DIR(ircg),ircg_common.c,[],cli)
- else
- PHP_ADD_SOURCES(PHP_EXT_DIR(ircg),ircg_common.c)
fi
+ PHP_NEW_EXTENSION(ircg,[ ircg.c ircg_scanner.c php_ircg_cache.c $ircg_src \
+ php_ircg_conversion.c php_ircg_error.c php_ircg_tokenizer.c],
+ $ext_shared)
+ unset ircg_src
AC_DEFINE(HAVE_IRCG, 1, [Whether you want IRCG support])
PHP_ADD_MAKEFILE_FRAGMENT
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
