diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | globals.c | 2 | ||||
| -rw-r--r-- | libxml-2.0.pc.in | 2 |
4 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Dec 9 14:59:23 CET 2001 Daniel Veillard <daniel@veillard.com> + + * globals.c: do not reference strdup() ! + * configure.in libxml-2.0.pc.in: trying to fix the libs + of the various config extraction modules + Fri Dec 7 15:21:33 CET 2001 Daniel Veillard <daniel@veillard.com> * configure.in : preparing 2.4.12 diff --git a/configure.in b/configure.in index cc4f0fbe..819f83e5 100644 --- a/configure.in +++ b/configure.in @@ -447,7 +447,8 @@ iconv (cd, NULL, NULL, NULL, NULL);],[ LIBS="${_libs}" LDFLAGS="${_ldflags}"])])) fi -XML_LIBS="-lxml2 $Z_LIBS $ICONV_LIBS -lm $LIBS" +M_LIBS="-lm" +XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS" AC_SUBST(WITH_ICONV) AC_ARG_WITH(debug, [ --with-debug Add the debugging module (on)]) @@ -55,7 +55,7 @@ xmlStrdupFunc xmlMemStrdup = (xmlStrdupFunc) xmlMemoryStrdup; xmlFreeFunc xmlFree = (xmlFreeFunc) free; xmlMallocFunc xmlMalloc = (xmlMallocFunc) malloc; xmlReallocFunc xmlRealloc = (xmlReallocFunc) realloc; -xmlStrdupFunc xmlMemStrdup = (xmlStrdupFunc) strdup; +xmlStrdupFunc xmlMemStrdup = (xmlStrdupFunc) xmlStrdup; #endif #include <libxml/threads.h> diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in index 80caf554..8002efb8 100644 --- a/libxml-2.0.pc.in +++ b/libxml-2.0.pc.in @@ -8,5 +8,5 @@ Name: libXML Version: @VERSION@ Description: libXML library version2. Requires: -Libs: -L${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@ +Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @M_LIBS@ @LIBS@ Cflags: -I${includedir}/libxml2 @XML_CFLAGS@ |