aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch
diff options
context:
space:
mode:
authorMatthieu CRAPET <Matthieu.CRAPET@ingenico.com>2014-02-20 10:13:49 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-23 23:17:32 +0100
commitffade38e6bd4018ef6c14fa10b3b46f8b77247e9 (patch)
treeb44626c9925645163cc065485bca3a3493eb3dbc /meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch
parent4db6b3db631485d59bd1a107864aa72b34a9f921 (diff)
downloadmeta-openembedded-contrib-ffade38e6bd4018ef6c14fa10b3b46f8b77247e9.tar.gz
meta-openembedded-contrib-ffade38e6bd4018ef6c14fa10b3b46f8b77247e9.tar.bz2
meta-openembedded-contrib-ffade38e6bd4018ef6c14fa10b3b46f8b77247e9.zip
xmlstarlet: add new recipe for version 1.5.0
Useful CLI tool for XML data manipulation. Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch')
-rw-r--r--meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch
new file mode 100644
index 0000000000..e55f4f3b13
--- /dev/null
+++ b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch
@@ -0,0 +1,28 @@
+configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure
+
+Same behavior for xslt-config.
+
+diff --git a/configure.ac b/configure.ac
+index ed04e0c..39d5d4c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,7 +40,8 @@ AC_ARG_PROGRAM dnl Transforming Program Names When Installing
+ AC_PROG_SED
+ AC_PROG_AWK
+
+-XSTAR_LIB_CHECK([LIBXML], [xml2-config])
++AS_IF([test "x$LIBXML_PREFIX" = x],
++ [XSTAR_LIB_CHECK([LIBXML], [xml2-config])])
+
+ AS_IF([test "x$LIBXML_SRCDIR" != x],
+ [LIBXML_INCDIR="$LIBXML_SRCDIR/include"])
+@@ -56,7 +57,8 @@ AS_IF([test "x$STATIC_LIBS" != xno],
+ [LIBXML_LDFLAGS="-L$LIBXML_LIBDIR"]
+
+
+-XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])
++AS_IF([test "x$LIBXSLT_PREFIX" = x],
++ [XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])])
+
+ AS_IF([test "x$LIBXSLT_SRCDIR" != x],
+ [XSLTPROC_PATH="$LIBXSLT_SRCDIR/xsltproc:$PATH"