[libgnomecanvas] Make glade support optional at configure time. Patch by Sven Neumann and Robert Ancell. Closes bug #



commit 14bf9e52eba179043e55de358b9eaed422764e6f
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Sep 30 19:00:50 2009 +0200

    Make glade support optional at configure time. Patch by Sven Neumann and Robert Ancell. Closes bug #73134

 configure.in      |   22 +++++++++++++++++++++-
 glade/Makefile.am |    3 +++
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 0ac5bdf..2819c46 100644
--- a/configure.in
+++ b/configure.in
@@ -97,7 +97,15 @@ if test "$enable_maintainer_mode" = "yes"; then
 	AC_SUBST(LIBGNOMECANVAS_DEPRECATED_CFLAGS)
 fi
 
-PKG_CHECK_MODULES(CANVAS_GLADE, $CANVAS_MODULES libglade-2.0 >= libglade_required_version)
+AC_ARG_ENABLE(glade,
+              AC_HELP_STRING([--enable-glade],
+	                     [enable glade support]),,
+	      [enable_glade=no])
+AM_CONDITIONAL(USE_GLADE, test "$enable_glade" = yes)
+
+if test "$enable_glade" = yes; then
+  PKG_CHECK_MODULES(CANVAS_GLADE, $CANVAS_MODULES libglade-2.0 >= libglade_required_version)
+fi
 
 AC_MSG_CHECKING([for native Win32])
 case "$host" in
@@ -202,3 +210,15 @@ docs/reference/Makefile
 ])
 
 AC_OUTPUT
+
+echo "
+Configure summary:
+
+	Compiler....................: ${CC}
+	Compiler Flags..............: ${CFLAGS}
+	Prefix .....................: ${prefix}
+
+	Glade support...............: ${enable_glade}
+	Rebuilds....................: ${enable_rebuilds}
+	Win32.......................: ${platform_win32}
+"
diff --git a/glade/Makefile.am b/glade/Makefile.am
index 2c5b9fb..6b3efa8 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -11,7 +11,10 @@ INCLUDES = \
 	$(CANVAS_GLADE_CFLAGS)
 
 glademoduledir = $(libdir)/libglade/2.0
+
+if USE_GLADE
 glademodule_LTLIBRARIES = libcanvas.la
+endif
 
 libcanvas_la_LIBADD = \
 	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la	\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]