eog r4963 - in trunk: . cut-n-paste/toolbar-editor doc/reference

[friemann svn gnome org]

Author: friemann
Date: Tue Jan 20 15:52:48 2009
New Revision: 4963
URL: http://svn.gnome.org/viewvc/eog?rev=4963&view=rev

Log:
2009-01-20  Felix Riemann  <friemann svn gnome org>

	* configure.ac: Separate libxml from other library checks.
	* cut-n-paste/toolbar-editor/Makefile.am:
	* doc/reference/Makefile.am:
	Fix build error with -Wl,--as-needed. Fixes bug #568410.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/cut-n-paste/toolbar-editor/Makefile.am
   trunk/doc/reference/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jan 20 15:52:48 2009
@@ -91,7 +91,6 @@
 GNOME_ICON_THEME_REQUIRED=2.19.1
 SHARED_MIME_INFO_REQUIRED=0.20
 EXEMPI_REQUIRED=1.99.5
-LIBXML2_REQUIRED=2.0
 
 EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED \
              glib-2.0 >= $GLIB_REQUIRED \
@@ -102,8 +101,7 @@
              libart-2.0 >= $LIBART_REQUIRED \
              gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED \
 	     gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED \
-	     shared-mime-info >= $SHARED_MIME_INFO_REQUIRED \
-	     libxml-2.0 >= $LIBXML2_REQUIRED"
+	     shared-mime-info >= $SHARED_MIME_INFO_REQUIRED"
 
 # ***************
 # ZLIB (required)
@@ -251,6 +249,13 @@
 
 AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"])
 
+# ************************************
+# libXML2 (required for toolbareditor)
+# ************************************
+
+LIBXML2_REQUIRED=2.0
+PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= $LIBXML2_REQUIRED])
+
 # ****************
 # CFLAGS/LIBS init
 # ****************

Modified: trunk/cut-n-paste/toolbar-editor/Makefile.am
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/Makefile.am	(original)
+++ trunk/cut-n-paste/toolbar-editor/Makefile.am	Tue Jan 20 15:52:48 2009
@@ -23,9 +23,12 @@
 	-I$(top_builddir)/lib/egg		\
 	$(AM_CPPFLAGS)
 
+libtoolbareditor_la_LIBADD = $(LIBXML2_LIBS)
+
 libtoolbareditor_la_CFLAGS = \
 	$(EOG_CFLAGS)				\
 	$(WARN_CFLAGS)				\
+	$(LIBXML2_CFLAGS)			\
 	-DCURSOR_DIR=\"$(pkgdatadir)\"
 
 BUILT_SOURCES = \

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Tue Jan 20 15:52:48 2009
@@ -93,11 +93,6 @@
 	-I$(top_srcdir)/cut-n-paste/totem-screensaver		\
 	$(EOG_CFLAGS)
 
-if ENABLE_PYTHON
-BINDING_LIBS = $(top_builddir)/bindings/python/eog.la
-MORE_GTKDOC_LIBS = $(PYTHON_LIBS)
-endif
-
 if ENABLE_JPEG
 jpeg_LIB = $(top_builddir)/jpegutils/libeog-jpegutils.la
 endif