Revision: 1984
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1984&view=rev
Author: teuf
Date: 2008-05-25 05:27:09 -0700 (Sun, 25 May 2008)
Log Message:
-----------
* configure.ac: libxml presence is mandatory unless
--disable-libxml is passed to configure
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/configure.ac
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2008-05-25 11:28:39 UTC (rev 1983)
+++ libgpod/trunk/ChangeLog 2008-05-25 12:27:09 UTC (rev 1984)
@@ -1,5 +1,10 @@
2008-05-25 Christophe Fergeau <teuf at gnome.org>
+ * configure.ac: libxml presence is mandatory unless
+ --disable-libxml is passed to configure
+
+2008-05-25 Christophe Fergeau <teuf at gnome.org>
+
* src/itdb_device.c: don't insert NULL firewire IDs in the SysInfo
hash table
Modified: libgpod/trunk/configure.ac
===================================================================
--- libgpod/trunk/configure.ac 2008-05-25 11:28:39 UTC (rev 1983)
+++ libgpod/trunk/configure.ac 2008-05-25 12:27:09 UTC (rev 1984)
@@ -138,17 +138,10 @@
esac])
AH_TEMPLATE([HAVE_LIBXML], [Whether libxml is installed, it's used to parse
SysInfoExtended])
if test x$enable_libxml != xno; then
- PKG_CHECK_MODULES(LIBXML, libxml-2.0, have_libxml=yes, have_libxml=no)
- if test x"$enable_libxml" = xyes -a x"$have_libxml" = xno; then
- AC_MSG_ERROR([libxml support explicitly requested but libxml couldn't be
found])
- fi
-fi
-if test x"$have_libxml" = xyes; then
+ PKG_CHECK_MODULES(LIBXML, libxml-2.0)
AC_DEFINE_UNQUOTED(HAVE_LIBXML, 1)
LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $LIBXML_CFLAGS"
LIBGPOD_LIBS="$LIBGPOD_LIBS $LIBXML_LIBS"
-else
- have_libxml=no
fi
dnl **************************************************
@@ -306,7 +299,6 @@
Compiler .............: $CC $CFLAGS $LIBGPOD_CFLAGS
Linker ...............: $CC $LDFLAGS $LIBS $LIBGPOD_LIBS
Artwork support ......: $have_gdkpixbuf
- libxml support .......: $have_libxml
Python bindings ......: $with_python
PyGObject support ....: $have_pygobject
@@ -314,7 +306,7 @@
and then 'make install' for installation.
"
-if test x"$have_libxml" = xno; then
+if test x"$enable_libxml" = xno; then
echo "
**WARNING** libxml support is disabled, libgpod won't be able to
parse SysInfoExtended. This means it can't take advantage of the
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
