cvs: php-src(PHP_5_0) / acinclude.m4

hyanantha Fri Sep 23 04:27:54 2005 EDT Modified files: (Branch: PHP_5_0) /php-src acinclude.m4 Log: In NetWare two binaries with the same name can not be loaded in kernel address space(This is the default behaviour for NetWare apache webserver and hence PHP extensions also get loaded in kernel address space) simultaneoulsy. As the current autoconf built mysql extension is built as mysql.nlm this forbids the loading of mysql client binary. To work around this NetWare idiosyncrasy prefixing all the extensions with "php" except php5lib(phpts.dll eqivalent of Windows). I could have named this extensions prefixed with "php_" but "_" is eaten by the exported symbol prefix by the GCC cross compiler for NetWare so sticking to "php". This fixes the issue of not needing "PHP_SUBST(EXTENSIONNAME_SHARED_LIBADD)" in all the extensions especially when they need to be built shared. --Kamesh http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.22&r2=1.271.2.23&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.271.2.22 php-src/acinclude.m4:1.271.2.23 --- php-src/acinclude.m4:1.271.2.22 Mon Jul 25 18:31:07 2005 +++ php-src/acinclude.m4 Fri Sep 23 04:27:52 2005 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.271.2.22 2005/07/25 22:31:07 helly Exp $ -*- autoconf -*- +dnl $Id: acinclude.m4,v 1.271.2.23 2005/09/23 08:27:52 hyanantha Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -1197,7 +1197,7 @@ ;; *netware*[)] suffix=nlm - link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php5lib, , -L$(top_builddir)/netware -lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)' ;; *[)] suffix=la @@ -1289,10 +1289,12 @@ 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) + PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6) + ;; + *) + PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6) ;; 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 fi