clean up library naming

diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am
index 9f2ca1b1bea3cb410fc395d61b71b25d6e7f676d..072ef1c64e1c54a3cb44e3e40df4060549e82171 100644 (file)
--- a/ext/xml/Makefile.am
+++ b/ext/xml/Makefile.am
@@ -3,10 +3,13 @@
 phplibdir=$(libdir)/php
 
 SRC=xml.c
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
-noinst_LIBRARIES=libphpext_xml.a
-phplib_LTLIBRARIES=libphpext_xml.la
+INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend
+noinst_LIBRARIES=@XML_STATIC@
+EXTRA_LIBRARIES=libphpext_xml.a
 libphpext_xml_a_SOURCES=$(SRC)
-libphpext_xml_la_SOURCES=$(SRC)
-libphpext_xml_la_LIBADD=@XML_LIBS@
+phplib_LTLIBRARIES=@XML_SHARED@
+EXTRA_LTLIBRARIES=xml.la
+xml_la_SOURCES=$(SRC)
+xml_la_LIBADD=@XML_LIBS@
+xml_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir)
 EXTRA_LIBS=

diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index df323399dc1dda38ca2ab94aed60a27e7ca2de71..d0ada5b18c5f977cf84343aad64d623d92744940 100644 (file)
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -40,10 +40,15 @@ AC_ARG_WITH(xml,
       fi
     fi
     AC_DEFINE(HAVE_LIBEXPAT, 1)
-    AC_ADD_INCLUDE($XML_INCLUDE)
     PHP_EXTENSION(xml, $shared)
     if test "$shared" != "yes"; then
       EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS"
+      AC_ADD_INCLUDE($XML_INCLUDE)
+      XML_INCLUDE=""
+      XML_STATIC="libphpext_xml.a"
+    else
+      XML_INCLUDE="-I$XML_INCLUDE"
+      XML_SHARED="xml.la"
     fi
   else
     AC_MSG_RESULT(no)
@@ -52,3 +57,6 @@ AC_ARG_WITH(xml,
   AC_MSG_RESULT(no)
 ]) 
 AC_SUBST(XML_LIBS)
+AC_SUBST(XML_INCLUDE)
+AC_SUBST(XML_STATIC)
+AC_SUBST(XML_SHARED)