Add a configure option for disabling the gtk-widgets library

Makefile.am

@@ -1,4 +1,11 @@
-SUBDIRS = mx mx-gtk data tests docs po
+SUBDIRS = mx
+
+if ENABLE_GTK_WIDGETS
+SUBDIRS += mx-gtk
+endif
+
+SUBDIRS += data tests docs po
+
 
 ACLOCAL_AMFLAGS=-I m4
 
@@ -16,13 +23,19 @@ GITIGNOREFILES= $(top_srcdir)/docs/reference/libmx/tmpl \
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-pcfiles = mx-$(MX_API_VERSION).pc mx-gtk-$(MX_API_VERSION).pc
+pcfiles = mx-$(MX_API_VERSION).pc
+
+if ENABLE_GTK_WIDGETS
+pcfiles += mx-gtk-$(MX_API_VERSION).pc
+endif
 
 mx-$(MX_API_VERSION).pc: mx.pc
 	@cp -f $< $@
 
+if ENABLE_GTK_WIDGETS
 mx-gtk-$(MX_API_VERSION).pc: mx-gtk.pc
 	@cp -f $< $@
+endif
 
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig

configure.ac

@@ -194,6 +194,19 @@ AS_IF([test "x$with_glade" = xyes],
 AM_CONDITIONAL(WITH_GLADE, test "x$with_glade" = xyes)
 AC_SUBST([catalogdir])
 
+
+#
+# Gtk+ widgets library
+#
+
+AC_ARG_ENABLE([gtk-widgets],
+              [AC_HELP_STRING([--disable-gtk-widgets],
+                              [disable building the gtk+ widgets library])],
+              [],
+              [enable_gtk_widgets=yes])
+
+AM_CONDITIONAL(ENABLE_GTK_WIDGETS, test "x$enable_gtk_widgets" = xyes)
+
 dnl ***************************************************************************
 dnl Internationalization
 dnl ***************************************************************************

tests/Makefile.am

@@ -1,9 +1,12 @@
 NULL =
 
-AM_CFLAGS = $(MX_CFLAGS) $(GTK_CFLAGS)  $(MX_MAINTAINER_CFLAGS)
-LDADD = $(top_builddir)/mx/libmx-$(MX_API_VERSION).la \
-        $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
+AM_CFLAGS = $(MX_CFLAGS) $(MX_MAINTAINER_CFLAGS)
+LDADD = $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
 
+if ENABLE_GTK_WIDGETS
+AM_CFLAGS += $(GTK_CFLAGS)
+LDADD += $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
+endif
 
 INCLUDES = \
 	-I$(top_srcdir) \
@@ -15,7 +18,6 @@ noinst_PROGRAMS = 			\
 	test-draggable			\
 	test-droppable			\
 	test-grid 			\
-	test-gtk			\
 	test-path-bar			\
 	test-shaders			\
 	test-table   			\
@@ -27,11 +29,16 @@ noinst_PROGRAMS = 			\
 	test-mx				\
 	$(NULL)
 
+if ENABLE_GTK_WIDGETS
+noinst_PROGRAMS += test-gtk
+
+test_gtk_SOURCES = test-gtk.c
+endif
+
 test_table_SOURCES = test-table.c
 test_table_2_SOURCES = test-table-2.c
 test_texture_frame_SOURCES = test-texture-frame.c
 test_grid_SOURCES = test-grid.c
-test_gtk_SOURCES = test-gtk.c
 test_views_SOURCES = test-views.c
 
 test_mx_SOURCES = test-mx.c \