diff options
Diffstat (limited to 'ext/xml')
| -rw-r--r-- | ext/xml/Makefile.am | 7 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 2 | ||||
| -rw-r--r-- | ext/xml/xml.c | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am index 17d3f47864..2299ba2ce0 100644 --- a/ext/xml/Makefile.am +++ b/ext/xml/Makefile.am @@ -2,11 +2,10 @@ SRC=xml.c 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) +noinst_LTLIBRARIES=@XML_STATIC@ +EXTRA_LTLIBRARIES=libphpext_xml.la xml.la +libphpext_xml_la_SOURCES=$(SRC) 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) diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 7a597e7916..8c55e8eac3 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -41,7 +41,7 @@ AC_ARG_WITH(xml, EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS" AC_ADD_INCLUDE($XML_INCLUDE) XML_INCLUDE="" - XML_STATIC="libphpext_xml.a" + XML_STATIC="libphpext_xml.la" else XML_INCLUDE="-I$XML_INCLUDE" XML_SHARED="xml.la" diff --git a/ext/xml/xml.c b/ext/xml/xml.c index f66d6415cf..b8f1bf4bc4 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -20,11 +20,6 @@ /* $Id$ */ #define IS_EXT_MODULE -/* boldly assume that if PIC is defined, we are being compiled dynamically */ -#ifdef PIC -# define COMPILE_DL 1 -#endif - #if COMPILE_DL # include "dl/phpdl.h" #endif |