cvs: php4 / Makefile.in acinclude.m4 configure.in

sas Thu May 18 13:35:17 2000 EDT Modified files: /php4 Makefile.in acinclude.m4 configure.in Log: Make the shared library suffix dynamic. Improve workaround for libtool's inflexibility WRT -avoid-version to support various numbers of .0 Index: php4/Makefile.in diff -u php4/Makefile.in:1.89 php4/Makefile.in:1.90 --- php4/Makefile.in:1.89 Thu May 18 12:36:35 2000 +++ php4/Makefile.in Thu May 18 13:35:16 2000 @@ -38,8 +38,13 @@ 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) Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.84 php4/acinclude.m4:1.85 --- php4/acinclude.m4:1.84 Wed May 17 21:08:44 2000 +++ php4/acinclude.m4 Thu May 18 13:35:16 2000 @@ -1,8 +1,18 @@ -dnl $Id: acinclude.m4,v 1.84 2000/05/17 19:08:44 sas Exp $ +dnl $Id: acinclude.m4,v 1.85 2000/05/18 11:35:16 sas Exp $ dnl 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" Index: php4/configure.in diff -u php4/configure.in:1.129 php4/configure.in:1.130 --- php4/configure.in:1.129 Thu May 18 12:36:35 2000 +++ php4/configure.in Thu May 18 13:35:17 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.129 2000/05/18 10:36:35 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.130 2000/05/18 11:35:17 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -114,12 +114,13 @@ 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_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)