29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
diff -uNr xmlstarlet-1.0.3-original/configure.ac xmlstarlet-1.0.3/configure.ac
|
|
--- xmlstarlet-1.0.3-original/configure.ac 2010-11-17 14:47:55.000000000 -0500
|
|
+++ xmlstarlet-1.0.3/configure.ac 2010-12-17 11:59:27.090514304 -0500
|
|
@@ -29,18 +29,18 @@
|
|
XSTAR_LIB_CHECK([LIBXML], [xml2-config])
|
|
AS_IF([test "x$LIBXML_SRCDIR" != x],
|
|
[LIBXML_INCDIR="$LIBXML_SRCDIR/include"],
|
|
- [: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}])
|
|
-[LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"]
|
|
-[LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"]
|
|
+ [: ${LIBXML_INCDIR="`xml2-config --cflags`"}])
|
|
+[LIBXML_LIBS="`xml2-config --libs`"]
|
|
+[LIBXML_CPPFLAGS="$LIBXML_INCDIR"]
|
|
|
|
XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])
|
|
[: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}]
|
|
AS_IF([test "x$LIBXSLT_SRCDIR" != x],
|
|
[LIBXSLT_INCDIR="$LIBXSLT_SRCDIR"
|
|
LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"],
|
|
- [LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"])
|
|
-[: ${LIBSLT_INCDIR="$LIBXSLT_PREFIX/include"}]
|
|
-[LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"]
|
|
+ [LIBXSLT_LIBS="`xslt-config --libs` -lexslt"])
|
|
+[: ${LIBSLT_INCDIR="`xslt-config --cflags`"}]
|
|
+[LIBXSLT_CPPFLAGS="$LIBXSLT_INCDIR"]
|
|
|
|
[WIN32_EXTRA_LDFLAGS=]
|
|
[WIN32_EXTRA_LIBS=]
|