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

This commit is contained in:
Kjartan Maraas 2009-09-30 19:00:50 +02:00
parent 8c5054da11
commit 14bf9e52eb
2 changed files with 24 additions and 1 deletions

View File

@ -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}
"

View File

@ -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 \