From 41a208da038726015093e7a36d9ce18cca8a10fb Mon Sep 17 00:00:00 2001 From: Anantha Kesari H Y Date: Fri, 23 Sep 2005 09:20:22 +0000 Subject: [PATCH] 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 from 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 --- acinclude.m4 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d2f9bebb24..3ef9c706f4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1197,7 +1197,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[ ;; *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, php4lib, , -L$(top_builddir)/netware -lphp4lib) $(translit(ifelse($1, php4lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)' ;; *[)] suffix=la @@ -1289,10 +1289,12 @@ 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(php4lib, 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 -- 2.40.0