cvs: php4 / Makefile.in configure.in
| From: | Sascha Schumann | Date: | Thu, 18 May 2000 10:36:35 +0000 |
| Subject: | cvs: php4 / Makefile.in configure.in | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-15185@lists.php.net to get a copy of this message | ||
sas Thu May 18 12:36:35 2000 EDT
Modified files:
/php4 Makefile.in configure.in
Log:
Fix workaround for systems where libtool cannot handle -avoid-version
correctly.
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.88 php4/Makefile.in:1.89
--- php4/Makefile.in:1.88 Wed May 17 21:12:51 2000
+++ php4/Makefile.in Thu May 18 12:36:35 2000
@@ -38,6 +38,9 @@
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; \
+ fi
$(INSTALL_IT)
install-modules:
Index: php4/configure.in
diff -u php4/configure.in:1.128 php4/configure.in:1.129
--- php4/configure.in:1.128 Wed May 17 21:08:44 2000
+++ php4/configure.in Thu May 18 12:36:35 2000
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.128 2000/05/17 19:08:44 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.129 2000/05/18 10:36:35 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -119,7 +119,7 @@
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.s*
+SAPI_SHARED=libs/libphp4.so
SAPI_STATIC=libs/libphp4.a
PHP_CONFIGURE_PART(Configuring SAPI modules)