File xmlstarlet-1.0.0-no_static_linking.diff of Package xmlstarlet

Overview Repositories Revisions Requests Users Attributes Meta

File xmlstarlet-1.0.0-no_static_linking.diff of Package xmlstarlet

Index: xmlstarlet-1.0.1/configure.in
===================================================================
--- xmlstarlet-1.0.1.orig/configure.in
+++ xmlstarlet-1.0.1/configure.in
@@ -228,7 +228,7 @@ dnl Set LIBXML include path
 dnl
 if test "x$LIBXML_CFLAGS" = "x"
 then
-	LIBXML_CFLAGS="-I${LIBXML_PREFIX}/include/libxml2"
+	LIBXML_CFLAGS="`${LIBXML_PREFIX}/bin/xml2-config --cflags`"
 fi
 
 dnl
@@ -236,7 +236,7 @@ dnl Set LIBXML libraries location
 dnl
 if test "x$LIBXML_LIBS" = "x"
 then
-	LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.a -lz -lm -lpthread -ldl"
+	LIBXML_LIBS="`${LIBXML_PREFIX}/bin/xml2-config --libs`"
 fi
 
 dnl
@@ -244,7 +244,7 @@ dnl Set LIBXSLT include path
 dnl
 if test "x$LIBXSLT_CFLAGS" = "x"
 then
-	LIBXSLT_CFLAGS="-I${LIBXSLT_PREFIX}/include/libxslt -I${LIBXSLT_PREFIX}/include/libexslt"
+	LIBXSLT_CFLAGS="`${LIBXSLT_PREFIX}/bin/xslt-config --cflags`"
 fi
 
 dnl
@@ -252,13 +252,13 @@ dnl Set LIBXSLT libraries location
 dnl
 if test "x$LIBXSLT_LIBS" = "x"
 then
-	LIBXSLT_LIBS="${LIBXSLT_PREFIX}/lib/libxslt.a ${LIBXSLT_PREFIX}/lib/libexslt.a -lz -lm -lpthread"
+	LIBXSLT_LIBS="`${LIBXSLT_PREFIX}/bin/pkg-config --libs libexslt`"
 fi
 
 dnl
 dnl Set LIBICONV include path
 dnl
-if test "x$LIBICONV_CFLAGS" = "x"
+if test "x$LIBICONV_CFLAGS" = "x" && test "$LIBICONV_PREFIX" != "/usr"
 then
 	LIBICONV_CFLAGS="-I${LIBICONV_PREFIX}/include"
 fi
@@ -266,7 +266,7 @@ fi
 dnl
 dnl Set LIBICONV libraries location
 dnl
-if test "x$LIBICONV_LIBS" = "x"
+if test "x$LIBICONV_LIBS" = "x" && test "$LIBXSLT_PREFIX" != "/usr"
 then
 	LIBICONV_LIBS="-L${LIBXSLT_PREFIX}/lib"
 fi

Places

File xmlstarlet-1.0.0-no_static_linking.diff of Package xmlstarlet

Places