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

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

CVS commit to /cvsroot/buoh/buoh/src by carlosgc

Modified Files:
	Makefile.am main.c 
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/src/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /cvsroot/buoh/buoh/src/Makefile.am	2005/11/15 13:02:12	1.12
+++ /cvsroot/buoh/buoh/src/Makefile.am	2006/10/20 16:15:04	1.13
@@ -4,6 +4,10 @@
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
+if HAVE_LIBGNOMEUI
+INCLUDES += $(LIBGNOMEUI_CFLAGS)
+endif
+
 bin_PROGRAMS = buoh
 
 buoh_SOURCES = 							\
@@ -24,3 +28,6 @@
 
 buoh_LDADD = $(BUOH_LIBS)
 
+if HAVE_LIBGNOMEUI
+buoh_LDADD += $(LIBGNOMEUI_LIBS)
+endif
===================================================================
RCS file: /cvsroot/buoh/buoh/src/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /cvsroot/buoh/buoh/src/main.c	2006/09/25 18:18:33	1.10
+++ /cvsroot/buoh/buoh/src/main.c	2006/10/20 16:15:04	1.11
@@ -25,8 +25,14 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+
+#ifdef HAVE_LIBGNOMEUI
 #include <libgnome/libgnome.h>
 #include <libgnomeui/libgnomeui.h>
+#else
+#include <gtk/gtkmain.h>
+#include <gtk/gtkwindow.h>
+#endif /* HAVE_LIBGNOMEUI */
 
 #include "buoh.h"
 
@@ -42,10 +48,14 @@
         textdomain (GETTEXT_PACKAGE);
 #endif
 
+#ifdef HAVE_LIBGNOMEUI
 	gnome_program_init (PACKAGE, VERSION,
 			    LIBGNOMEUI_MODULE,
 			    argc, argv,
 			    GNOME_PARAM_NONE);
+#else
+	gtk_init (&argc, &argv);
+#endif /* HAVE_LIBGNOMEUI */
 
 	g_set_application_name (_("Buoh online comics browser"));
 	gtk_window_set_default_icon_name ("buoh");