cvs: /php4/ext/xml Makefile.am config.m4

ssb Thu Sep 2 14:22:07 1999 EDT Modified files: /php4/ext/xml Makefile.am config.m4 Log: clean up library naming Index: php4/ext/xml/Makefile.am diff -u php4/ext/xml/Makefile.am:1.3 php4/ext/xml/Makefile.am:1.4 --- php4/ext/xml/Makefile.am:1.3 Fri Jul 23 20:56:56 1999 +++ php4/ext/xml/Makefile.am Thu Sep 2 14:22:07 1999 @@ -1,12 +1,15 @@ -# $Id: Makefile.am,v 1.3 1999/07/24 00:56:56 sas Exp $ +# $Id: Makefile.am,v 1.4 1999/09/02 18:22:07 ssb Exp $ 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= Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.7 php4/ext/xml/config.m4:1.8 --- php4/ext/xml/config.m4:1.7 Sat Jul 24 17:40:37 1999 +++ php4/ext/xml/config.m4 Thu Sep 2 14:22:07 1999 @@ -1,5 +1,5 @@ # $Source: /local/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.7 1999/07/24 21:40:37 sas Exp $ +# $Id: config.m4,v 1.8 1999/09/02 18:22:07 ssb Exp $ AC_MSG_CHECKING(for XML support) AC_ARG_WITH(xml, @@ -40,10 +40,15 @@ 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_MSG_RESULT(no) ]) AC_SUBST(XML_LIBS) +AC_SUBST(XML_INCLUDE) +AC_SUBST(XML_STATIC) +AC_SUBST(XML_SHARED)