sniper Mon Jun 20 07:06:55 2005 EDT
Modified files:
/php-src configure.in acinclude.m4
/php-src/sapi/cli config.m4
Log:
Some netware related build issues fixed (patch by: Kamesh Jayachandran
<kameshj at fastmail dot fm>
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.563&r2=1.564&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.563 php-src/configure.in:1.564
--- php-src/configure.in:1.563 Sat Jun 11 13:03:41 2005
+++ php-src/configure.in Mon Jun 20 07:06:53 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.563 2005/06/11 17:03:41 andi Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.564 2005/06/20 11:06:53 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -183,7 +183,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
@@ -1217,7 +1221,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/acinclude.m4?r1=1.320&r2=1.321&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.320 php-src/acinclude.m4:1.321
--- php-src/acinclude.m4:1.320 Sun Jun 19 20:20:45 2005
+++ php-src/acinclude.m4 Mon Jun 20 07:06:53 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.320 2005/06/20 00:20:45 sniper Exp $
+dnl $Id: acinclude.m4,v 1.321 2005/06/20 11:06:53 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -950,6 +950,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/sapi/cli/config.m4?r1=1.20&r2=1.21&ty=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.20 php-src/sapi/cli/config.m4:1.21
--- php-src/sapi/cli/config.m4:1.20 Sun May 29 19:16:46 2005
+++ php-src/sapi/cli/config.m4 Mon Jun 20 07:06:54 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.20 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.21 2005/06/20 11:06:54 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
