diff --git a/ChangeLog b/ChangeLog index 7e6ad8b9a..bea77da5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-03-07 Mike Kestner + + * configure.in.in: add --disable-glade-sharp configure option + to explicitly disable the conditional build. [Fixes #423131] + 2009-03-04 Christian Hoff * gtk/NodeStore.cs: reimplement NodeStore as a managed TreeModel using GInterface implementation diff --git a/configure.in.in b/configure.in.in index 4834ed8ff..d9adae5a1 100644 --- a/configure.in.in +++ b/configure.in.in @@ -196,9 +196,13 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) GLADE_REQUIRED_VERSION=2.3.6 -PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no) -AC_SUBST(GLADE_CFLAGS) -AC_SUBST(GLADE_LIBS) +enable_glade=no +AC_ARG_ENABLE(glade-sharp, AC_HELP_STRING([--disable-glade-sharp], [Disable glade-sharp bindings])) +if test "x$enable_glade_sharp" != "xno"; then + PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no) + AC_SUBST(GLADE_CFLAGS) + AC_SUBST(GLADE_LIBS) +fi AC_PATH_PROG(MDOC, mdoc, no) if test "x$MDOC" = "xno"; then @@ -287,7 +291,11 @@ echo " * $CS compiler: $CSC $CSFLAGS" echo "" echo " Optional assemblies included in the build:" echo "" +if test "x$enable_glade_sharp" = "xno"; then +echo " * glade-sharp.dll: disabled" +else echo " * glade-sharp.dll: $enable_glade" +fi echo " * gtk-dotnet.dll: $enable_dotnet" echo " * Mono.Cairo.dll: $cairo_comment" echo ""