Make the shared library suffix dynamic. Improve workaround for libtool's

inflexibility WRT -avoid-version to support various numbers of .0

diff --git a/Makefile.in b/Makefile.in
index f6e863f7e1573ee1adf7762f086844412ae9e209..11e9709d2d9aa046a334a525bb148843a86841f5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,8 +38,13 @@ include $(top_srcdir)/build/program.mk
 install-sapi:
        @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
        -@$(mkinstalldirs) $(bindir)
-       -@if ! test -r $(phptempdir)/libphp4.so && test -r $(phptempdir)/libphp4.so.0.0; then \
-               $(LN_S) $(phptempdir)/libphp4.so.0.0 $(phptempdir)/libphp4.so; \
+       -@if ! test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+               for i in 0.0.0 0.0 0; do \
+                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+                               $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
+                               break; \
+                       fi; \
+               done; \
        fi
        $(INSTALL_IT)
 

diff --git a/acinclude.m4 b/acinclude.m4
index 3b9f6a2298d7a06344b3c6e4f9cc47e0f2481447..fea266109eac04047b7d5799d497348c36416dbf 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,6 +4,16 @@ dnl This file contains local autoconf functions.
 
 sinclude(dynlib.m4)
 
+AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
+  PHP_SUBST(SHLIB_SUFFIX_NAME)
+  SHLIB_SUFFIX_NAME=so
+  case "$host_alias" in
+  *hpux*)
+       SHLIB_SUFFIX_NAME=sl
+       ;;
+  esac
+])
+
 AC_DEFUN(PHP_DEBUG_MACRO,[
   DEBUG_LOG="$1"
   cat >$1 <<X

diff --git a/configure.in b/configure.in
index d044f027c9d5d045e3be77bc4bd1ecc5fcb6e098..54c03c9f7af6ca0124450d5f6c219498dac0851a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -114,12 +114,13 @@ divert(2)
 
 PTHREADS_CHECK
 
+PHP_SHLIB_SUFFIX_NAME
+
 PHP_SAPI=cgi
 PHP_BUILD_PROGRAM
 dnl paths to the targets relative to the build directory
 SAPI_PROGRAM=php
-dnl on HP-UX, the extension is .sl. Need to improve this
-SAPI_SHARED=libs/libphp4.so
+SAPI_SHARED=libs/libphp4.$SHLIB_SUFFIX_NAME
 SAPI_STATIC=libs/libphp4.a
 
 PHP_CONFIGURE_PART(Configuring SAPI modules)
@@ -725,6 +726,7 @@ PHP_SUBST(LEX)
 PHP_SUBST(LEX_OUTPUT_ROOT)
 PHP_SUBST(LFLAGS)
 PHP_SUBST(LIBTOOL)
+PHP_SUBST(LN_S)
 PHP_SUBST(NATIVE_RPATHS)
 PHP_SUBST(PEAR_DIR)
 PHP_SUBST(PHP_BUILD_DATE)