gtkhtml r8810 - in trunk: . components/editor

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Apr  4 05:09:52 2008
New Revision: 8810
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8810&view=rev

Log:
2008-04-04  Matthew Barnes  <mbarnes redhat com>

	* configure.in:
	Add a --with-glade-catalog option for installing Glade 3 catalog
	files (for maintainers only).  Defaults to 'no'.  Fixes several
	reported build breaks.  (#525977)



Modified:
   trunk/ChangeLog
   trunk/components/editor/Makefile.am
   trunk/configure.in

Modified: trunk/components/editor/Makefile.am
==============================================================================
--- trunk/components/editor/Makefile.am	(original)
+++ trunk/components/editor/Makefile.am	Fri Apr  4 05:09:52 2008
@@ -100,7 +100,7 @@
 	gtkhtml-editor.glade.bak		\
 	gtkhtml-editor.gladep.bak
 
-if MAINTAINER_MODE
+if GLADE_CATALOG
 
 gladecatalog_DATA = gtkhtml-editor.xml
 gladecatalogdir = `$(PKG_CONFIG) --variable=catalogdir gladeui-1.0`

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Apr  4 05:09:52 2008
@@ -93,7 +93,7 @@
 # Bonobo editor module
 AC_ARG_WITH(bonobo-editor,
         AC_HELP_STRING([--with-bonobo-editor],
-                [build the older Bonobo-based editor [default=no]]),
+                [build the older Bonobo-based editor [[default=no]]]),
         bonobo_editor="$withval", bonobo_editor="no")
 if test "x$bonobo_editor" = "xyes"; then
         EDITOR_MODULES="${GTKHTML_MODULES} libbonobo-2.0 >= libbonobo_minimum_version libbonoboui-2.0 >= libbonoboui_minimum_version"
@@ -103,6 +103,17 @@
 fi
 AM_CONDITIONAL(BONOBO_EDITOR, test x$bonobo_editor = xyes)
 
+# Glade catalog files
+AC_ARG_WITH(glade-catalog,
+	AC_HELP_STRING([--with-glade-catalog],
+		[install the catalog files for Glade 3 ]
+		[(for maintainers only) [[default=no]]]),
+	glade_catalog="$withval", glade_catalog="no")
+if test "x$glade_catalog" = "xyes"; then
+	PKG_CHECK_MODULES(GLADEUI, gladeui-1.0)
+fi
+AM_CONDITIONAL(GLADE_CATALOG, test x$glade_catalog = xyes)
+
 # These are still needed for 'dist' targets.
 BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 AC_SUBST(BONOBO_IDL_INCLUDES)