sniper Mon Jun 20 07:48:26 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src acinclude.m4 configure.in
/php-src/sapi/cli config.m4
Log:
MFH
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.17&r2=1.271.2.18&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271.2.17 php-src/acinclude.m4:1.271.2.18
--- php-src/acinclude.m4:1.271.2.17 Sat Apr 30 05:29:44 2005
+++ php-src/acinclude.m4 Mon Jun 20 07:48:22 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271.2.17 2005/04/30 09:29:44 sniper Exp $ -*-
autoconf -*-
+dnl $Id: acinclude.m4,v 1.271.2.18 2005/06/20 11:48:22 sniper Exp $ -*-
autoconf -*-
dnl
dnl This file contains local autoconf functions.
@@ -1274,6 +1274,11 @@
if test "$3" = "shared" || test "$3" = "yes"; then
dnl ---------------------------------------------- Shared module
PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
+ case $host_alias in
+ *netware*)
+ PHP_ADD_LIBRARY_WITH_PATH(php5lib, netware,
translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+ ;;
+ esac
PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to
build $1 as dynamic module)
fi
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.53&r2=1.514.2.54&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.53 php-src/configure.in:1.514.2.54
--- php-src/configure.in:1.514.2.53 Tue Jun 7 13:22:55 2005
+++ php-src/configure.in Mon Jun 20 07:48:23 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.53 2005/06/07 17:22:55 sniper Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.514.2.54 2005/06/20 11:48:23 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -220,7 +220,11 @@
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross
compiler host])
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross
compiler host])
PHP_BUILD_PROGRAM
- PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS,php)
+ PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
+ PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
+ PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\)
+ PHP_SUBST(PHP5LIB_SHARED_LIBADD)
+ PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware)
;;
esac
@@ -1279,7 +1283,16 @@
plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
PHP_ADD_SOURCES(/main, internal_functions.c,, sapi)
-PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+
+case $host_alias in
+*netware*)
+ PHP_ADD_BUILD_DIR(win32)
+ PHP_ADD_BUILD_DIR(netware)
+ ;;
+*)
+ PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+ ;;
+esac
PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c)
http://cvs.php.net/diff.php/php-src/sapi/cli/config.m4?r1=1.18.2.1&r2=1.18.2.2&ty=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.18.2.1 php-src/sapi/cli/config.m4:1.18.2.2
--- php-src/sapi/cli/config.m4:1.18.2.1 Thu Apr 21 11:13:16 2005
+++ php-src/sapi/cli/config.m4 Mon Jun 20 07:48:25 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.18.2.1 2005/04/21 15:13:16 sniper Exp $
+dnl $Id: config.m4,v 1.18.2.2 2005/06/20 11:48:25 sniper Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -22,6 +22,9 @@
*darwin*)
BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
+ *netware*)
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS)
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o
\$(SAPI_CLI_PATH)"
+ ;;
*)
BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS)
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_CLI_PATH)"
;;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
