[Buoh-dev] CVS commit to /cvsroot/buoh/buoh by carlosgc

[noreply at forge.novell.com (noreply forge novell com)]

CVS commit to /cvsroot/buoh/buoh by carlosgc

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-10-20  Carlos Garcia Campos  <carlosgc gnome org>
	* configure.in:
	* src/Makefile.am:
	* src/main.c:
	Make libgnomeui an optional dependency enabled by default when
	available

===================================================================
RCS file: /cvsroot/buoh/buoh/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- /cvsroot/buoh/buoh/ChangeLog	2006/10/08 19:01:06	1.99
+++ /cvsroot/buoh/buoh/ChangeLog	2006/10/20 16:15:04	1.100
@@ -1,3 +1,12 @@
+2006-10-20  Carlos Garcia Campos  <carlosgc gnome org>
+
+	* configure.in:
+	* src/Makefile.am:
+	* src/main.c:
+
+	Make libgnomeui an optional dependency enabled by default when
+	available
+
 2006-10-08  Carlos Garcia Campos  <carlosgc gnome org>
 
 	* src/buoh-comic-manager-date.c:
===================================================================
RCS file: /cvsroot/buoh/buoh/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- /cvsroot/buoh/buoh/configure.in	2006/09/25 18:18:32	1.15
+++ /cvsroot/buoh/buoh/configure.in	2006/10/20 16:15:04	1.16
@@ -28,20 +28,41 @@
 dnl ******************************************
 
 GLIB_REQUIRED=2.6.0
-LIBGNOMEUI_REQUIRED=2.6.0
 GTK_REQUIRED=2.6.0
 LIBSOUP_REQUIRED=2.2.0
 GCONF_REQUIRED=2.2.0
 
 PKG_CHECK_MODULES(BUOH, 
 		  glib-2.0       >= $GLIB_REQUIRED
-		  libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED 
 		  gtk+-2.0       >= $GTK_REQUIRED 
 		  libsoup-2.2    >= $LIBSOUP_REQUIRED
 		  gconf-2.0      >= $GCONF_REQUIRED) 
 AC_SUBST(BUOH_CFLAGS)
 AC_SUBST(BUOH_LIBS)
 
+AC_ARG_WITH(libgnomeui,
+	    [AC_HELP_STRING([--with-libgnomeui], [Compile with print support [default=auto]])],
+	    with_libgnomeui=$withval,
+	    with_libgnomeui="auto")
+
+LIBGNOMEUI_REQUIRED=2.6.0
+
+PKG_CHECK_MODULES(LIBGNOMEUI, 
+		  libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED,
+		  have_libgnomeui=yes, have_libgnomeui=no)
+
+enable_libgnomeui=no
+if test x$have_libgnomeui = xyes; then
+   if test x$with_libgnomeui = xyes -o x$with_libgnomeui = xauto; then
+      AC_SUBST(LIBGNOMEUI_CFLAGS)
+      AC_SUBST(LIBGNOMEUI_LIBS)
+      AC_DEFINE([HAVE_LIBGNOMEUI],[1],[Enable GNOME UI.])
+      enable_libgnomeui=yes
+   fi
+fi
+
+AM_CONDITIONAL(HAVE_LIBGNOMEUI, test x$enable_libgnomeui = xyes)
+
 AM_GCONF_SOURCE_2
 
 AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])