diff options
| author | Stig Bakken <ssb@php.net> | 1999-09-02 18:22:07 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 1999-09-02 18:22:07 +0000 |
| commit | 1bce4ebfd8cdd7e48f2e033f8bcb090f7f9e0cfe (patch) | |
| tree | d388f5d14e8fced63dfc2ac7c32e8ed4a8994738 | |
| parent | 9e959a0b8aba2ddf946ae6c4470b082c87f53ae2 (diff) | |
| download | php-git-1bce4ebfd8cdd7e48f2e033f8bcb090f7f9e0cfe.tar.gz | |
clean up library naming
| -rw-r--r-- | ext/xml/Makefile.am | 13 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 10 |
2 files changed, 17 insertions, 6 deletions
diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am index 9f2ca1b1be..072ef1c64e 100644 --- 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 df323399dc..d0ada5b18c 100644 --- 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) |