[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/macros libXML.m4
From: |
strk |
Subject: |
[Gnash-commit] gnash/macros libXML.m4 |
Date: |
Mon, 23 Jan 2006 14:33:19 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: strk <address@hidden> 06/01/23 14:33:19
Modified files:
macros : libXML.m4
Log message:
Always seek XML dev files if everything else (--with-xml... and
pkg-config)
fails. This allows build for cases in which pkg-config has no knowledge
about an actually installed libXML.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.6 gnash/macros/libXML.m4:1.7
--- gnash/macros/libXML.m4:1.6 Thu Jan 19 23:50:11 2006
+++ gnash/macros/libXML.m4 Mon Jan 23 14:33:19 2006
@@ -37,9 +37,13 @@
LIBXML_CFLAGS="-I$libxml_prefix/include"
fi
- no_libxml=""
- AC_PATH_PROG(PKG_CONFIG, pkg-config, , ,[$PATH])
AC_MSG_CHECKING(for libxml2)
+
+ dnl
+ dnl Give pkg-config a chance
+ dnl
+ #no_libxml=""
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, , ,[$PATH])
if test "x$PKG_CONFIG" != "x" ; then
if test "x$LIBXML_CFLAGS" = "x" ; then
LIBXML_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0`
@@ -48,21 +52,30 @@
if test "x$LIBXML_LIBS" = "x" ; then
LIBXML_LIBS=`$PKG_CONFIG --libs libxml-2.0`
fi
- else
+ fi
+
+ dnl
+ dnl Try finding out yourself
+ dnl
+ if test "x$LIBXML_CFLAGS" = "x" -o "x$LIBXML_LIBS" = "x"; then
dirlist="/usr /usr/local /opt /home/latest"
for i in $dirlist; do
- for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
- if test -f $j/libxml/parser.h; then
- LIBXML_CFLAGS=-I`(cd $j; pwd)`
- break
- fi
- done
- for j in `ls -dr $i/lib 2>/dev/null ` ; do
+ if test "x$LIBXML_CFLAGS" = "x"; then
+ for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
+ if test -f $j/libxml/parser.h; then
+ LIBXML_CFLAGS=-I`(cd $j; pwd)`
+ break
+ fi
+ done
+ fi
+ if test "x$LIBXML_LIBS" = "x"; then
+ for j in `ls -dr $i/lib 2>/dev/null ` ; do
if test -f $j/libxml2.so; then
LIBXML_LIBS="-L`(cd $j; pwd)` -lxml2"
break
fi
- done
+ done
+ fi
done
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/macros libXML.m4,
strk <=