[libgnome-media-profiles] build: Fix build system for glade catalog

[Vincent Untz <vuntz src gnome org>]

commit c2d18dddb46a87347d1171b0ebcfefb2abc485d3
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Oct 5 15:37:50 2011 +0200

    build: Fix build system for glade catalog

 Makefile.am       |    1 +
 configure.ac      |    7 ++++---
 glade/Makefile.am |   10 +++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 374937e..662e1b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = \
 	libgnome-media-profiles	\
 	data			\
+	glade			\
 	po			\
 	help
 
diff --git a/configure.ac b/configure.ac
index 424bfd9..eaa2033 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,15 +42,15 @@ dnl Profiles glade ui: needed to edit .ui files with glade3
 have_gladeui=no
 
 # gladeui-3.0 is hypothetical
-PKG_CHECK_MODULES(GLADEUI, [gladeui-3.0], have_gladeui=yes, have_gladeui=no)
+PKG_CHECK_MODULES(GLADEUI, [gladeui-2.0], have_gladeui=yes, have_gladeui=no)
 AC_SUBST(GLADEUI_CFLAGS)
 AC_SUBST(GLADEUI_LIBS)
 AM_CONDITIONAL(HAVE_GLADEUI, [test x$have_gladeui = xyes])
 
-GLADEUI_CATALOG_DIR="`$PKG_CONFIG --variable=catalogdir gladeui-3.0`"
+GLADEUI_CATALOG_DIR="`$PKG_CONFIG --variable=catalogdir gladeui-2.0`"
 AC_SUBST(GLADEUI_CATALOG_DIR)
 
-GLADEUI_MODULE_DIR="`$PKG_CONFIG --variable=moduledir gladeui-3.0`"
+GLADEUI_MODULE_DIR="`$PKG_CONFIG --variable=moduledir gladeui-2.0`"
 AC_SUBST(GLADEUI_MODULE_DIR)
 
 dnl=======================================================================
@@ -90,6 +90,7 @@ Makefile
 libgnome-media-profiles/Makefile
 data/Makefile
 data/gnome-media-profiles.schemas.in
+glade/Makefile
 help/Makefile
 po/Makefile.in
 ])
diff --git a/glade/Makefile.am b/glade/Makefile.am
index e026f65..67aabfe 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -1,6 +1,10 @@
 # this is provided for editing gnome-media UI files, not for any other
 # purposes
 
+libgnome_media_profiles_la_SOURCES = gnome-media-profiles-catalog.c
+gladecatalog_DATA_dist = gnome-media-profiles.xml
+
+if HAVE_GLADEUI
 glademoduledir = @GLADEUI_MODULE_DIR@
 glademodule_LTLIBRARIES = libgnome-media-profiles.la
 
@@ -9,18 +13,18 @@ defines = \
 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
 	$(DISABLE_DEPRECATED)
 
-libgnome_media_profiles_la_SOURCES = gnome-media-profiles-catalog.c
 libgnome_media_profiles_la_CFLAGS = $(GMP_CFLAGS) $(GLADEUI_CFLAGS) $(defines) -I$(top_srcdir)
 libgnome_media_profiles_la_LIBADD = $(GMP_LIBS) $(GLADEUI_LIBS) $(top_builddir)/libgnome-media-profiles/libgnome-media-profiles-3.0.la
 libgnome_media_profiles_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
 
+gladecatalog_DATA = $(gladecatalog_DATA_dist)
 gladecatalogdir = @GLADEUI_CATALOG_DIR@
-gladecatalog_DATA = gnome-media-profiles.xml
 
 check-catalog:
 	xmllint --dtdvalid glade-catalog.dtd --noout $(gladecatalog_DATA)
+endif
 
 EXTRA_DIST = \
-	$(gladecatalog_DATA)
+	$(gladecatalog_DATA_dist)
 
 -include $(top_srcdir)/git.mk