sniper Tue Jan 25 08:02:26 2005 EDT
Modified files:
/php-src acinclude.m4
Log:
- Fix macosx shared extension build
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.289&r2=1.290&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.289 php-src/acinclude.m4:1.290
--- php-src/acinclude.m4:1.289 Fri Jan 21 20:31:53 2005
+++ php-src/acinclude.m4 Tue Jan 25 08:02:25 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.289 2005/01/22 01:31:53 sniper Exp $
+dnl $Id: acinclude.m4,v 1.290 2005/01/25 13:02:25 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1174,14 +1174,26 @@
dnl
AC_DEFUN([PHP_SHARED_MODULE],[
install_modules="install-modules"
- PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la"
+
+ case $host_alias in
+ *darwin*[)]
+ suffix=so
+ link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle
-undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS)
-o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+ ;;
+ *[)]
+ suffix=la
+ link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)])
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir)
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+ ;;
+ esac
+
+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.$suffix"
PHP_SUBST($2)
cat >>Makefile.objects<<EOF
-\$(phplibdir)/$1.la: $3/$1.la
- \$(LIBTOOL) --mode=install cp $3/$1.la \$(phplibdir)
+\$(phplibdir)/$1.$suffix: $3/$1.$suffix
+ \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
-$3/$1.la: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
- \$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS)
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) -o \[$]@ -export-dynamic
-avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS)
\$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
+ $link_cmd
EOF
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
