hooking the managed bindings into the build, step one

diff --git a/bindings/managed/Makefile.am b/bindings/managed/Makefile.am
index d14aeabc8d1f3f6490911fb8af8f03300f25042f..99c044e1fc822b38614005ccb8ce1ac039f0a4d7 100644 (file)
--- a/bindings/managed/Makefile.am
+++ b/bindings/managed/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = \
-       champlain-cil    \
-       champlain-gtk-cil    \
-       examples
+       champlain        \
+       champlain-gtk    \
+       samples
 
-DIST_SUBDIRS = champlain-cil champlain-gtk-cil examples
+DIST_SUBDIRS = champlain champlain-gtk samples

diff --git a/bindings/managed/configure.ac b/bindings/managed/configure.ac
deleted file mode 100644 (file)
index c9b856e..0000000
--- a/bindings/managed/configure.ac
+++ /dev/null
@@ -1,96 +0,0 @@
-AC_INIT(README)
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(champlain-sharp, 0.3)
-
-AM_MAINTAINER_MODE
-
-AC_PATH_PROG(MONO, mono, no)
-if test "x$MONO" = "xno"; then
-       AC_MSG_ERROR([Cannot find the "mono" runtime in your PATH])
-fi
-
-AC_PATH_PROG(MCS, gmcs, no)
-if test "x$MCS" = "xno"; then
-       AC_MSG_ERROR([Cannot find the "gmcs" compiler in your PATH])
-fi
-
-AC_PATH_PROG(GACUTIL, gacutil, no)
-if test "x$GACUTIL" = "xno"; then
-       AC_MSG_ERROR([Cannot find the "gacutil" program in your PATH])
-fi
-
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
-       AC_MSG_ERROR([Cannot find the "pkg-config" program in your PATH])
-fi
-
-AC_ARG_ENABLE(docs,
-              AC_HELP_STRING([--disable-docs],
-                             [Do not build Monodoc documentation]),
-              with_docs=no, with_docs=yes)
-
-if test "x$with_docs" = "xyes"; then
-       AC_PATH_PROG(MONODOCER, monodocer, no)
-       if test "x$MONODOCER" = "xno"; then
-               AC_MSG_ERROR([You need to install monodoc])
-       fi
-
-       AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
-       if test "x$MDASSEMBLER" = "xno"; then
-               AC_MSG_ERROR([You need to install mdassembler])
-       fi
-
-       DOCDIR=`$PKG_CONFIG monodoc --variable=sourcesdir`
-       AC_SUBST(DOCDIR)
-
-       AM_CONDITIONAL(BUILD_DOCS, true)
-else
-       AC_MSG_NOTICE([not building API documentation])
-       AM_CONDITIONAL(BUILD_DOCS, false)
-fi
-
-PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.1)
-AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no)
-AC_SUBST(GAPI_PARSER)
-AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
-AC_SUBST(GAPI_CODEGEN)
-AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
-AC_SUBST(GAPI_FIXUP)
-
-PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 > 2.3.92)
-AC_SUBST(GTKSHARP_LIBS)
-
-PKG_CHECK_MODULES(CLUTTERSHARP, clutter-sharp >= 0.8.0)
-AC_SUBST(CLUTTER_SHARP_LIBS)
-
-PKG_CHECK_MODULES(CLUTTER_GTK_SHARP, clutter-gtk-sharp >= 0.8.0)
-AC_SUBST(CLUTTER_GTK_SHARP_LIBS)
-
-PKG_CHECK_MODULES(CHAMPLAIN, champlain-0.3 >= 0.3)
-
-dnl CHAMPLAIN_APIVERSION=$(pkg-config --variable apiversion champlain-0.3)
-CHAMPLAIN_APIVERSION=0.3
-CHAMPLAIN_GTK_APIVERSION=0.2
-
-CHAMPLAIN_GTK_REQUIRED_VERSION=0.3
-PKG_CHECK_MODULES(CHAMPLAIN_GTK, champlain-gtk-0.3 >= $CHAMPLAIN_GTK_REQUIRED_VERSION, enable_gtk=yes, enable_gtk=no)
-
-AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes")
-
-AC_SUBST(CHAMPLAIN_APIVERSION)
-AC_SUBST(CHAMPLAIN_GTK_APIVERSION)
-
-AC_OUTPUT([
-       Makefile
-       champlain-cil/champlain-sharp.pc
-       champlain-cil/Makefile
-       champlain-cil/AssemblyInfo.cs
-       champlain-cil/champlain-sharp.dll.config
-       champlain-gtk-cil/champlain-gtk-sharp.pc
-       champlain-gtk-cil/Makefile
-       champlain-gtk-cil/AssemblyInfo.cs
-       champlain-gtk-cil/champlain-gtk-sharp.dll.config
-       examples/Makefile
-])
-

diff --git a/configure.ac b/configure.ac
index 2c78886e241e963888a060a341bdb739e4f7ec2c..e42afb733c3ccda147499afcc5a965e748bc3874 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ if test x$enable_debug = xyes; then
 fi
 
 # -----------------------------------------------------------
-# Enable debug
+# Enable gtk
 # -----------------------------------------------------------
 
 AC_ARG_ENABLE(gtk,
@@ -77,6 +77,60 @@ if test x$enable_gtk = xyes; then
 fi
 
 AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes")
+
+# -----------------------------------------------------------
+# Enable managed (default to "no")
+# -----------------------------------------------------------
+AC_ARG_ENABLE(managed,
+  AC_HELP_STRING([--enable-managed],[Build champlain-sharp (and champlain-gtk-sharp)]),
+    enable_managed=$enableval, enable_managed=no )
+
+if test x$enable_managed = xyes; then
+  AC_PATH_PROG(MCS, gmcs)
+  AC_SUBST(MCS)
+
+  AC_PATH_PROG(GACUTIL, gacutil)
+  AC_SUBST(GACUTIL)
+
+  PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.1)
+  AC_PATH_PROG(GAPI_PARSER, gapi2-parser)
+  AC_SUBST(GAPI_PARSER)
+
+  AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen)
+  AC_SUBST(GAPI_CODEGEN)
+
+  AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup)
+  AC_SUBST(GAPI_FIXUP)
+  
+  PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 > 2.3.92)
+  AC_SUBST(GTKSHARP_LIBS)
+  
+  PKG_CHECK_MODULES(CLUTTERSHARP, clutter-sharp >= 0.8.0)
+  AC_SUBST(CLUTTER_SHARP_LIBS)
+  
+  PKG_CHECK_MODULES(CLUTTER_GTK_SHARP, clutter-gtk-sharp >= 0.8.0)
+  AC_SUBST(CLUTTER_GTK_SHARP_LIBS)
+
+  CHAMPLAIN_APIVERSION=0.3
+  CHAMPLAIN_GTK_APIVERSION=0.2
+  AC_SUBST(CHAMPLAIN_APIVERSION)
+  AC_SUBST(CHAMPLAIN_GTK_APIVERSION)
+
+AC_CONFIG_FILES([
+       bindings/managed/Makefile
+       bindings/managed/champlain/Makefile
+       bindings/managed/champlain-gtk/Makefile
+])
+
+
+  if test x$enable_gtk = xyes; then
+    enable_gtk_managed = yes
+  fi
+fi
+
+AM_CONDITIONAL(ENABLE_MANAGED, test "x$enable_managed" = "xyes")
+AM_CONDITIONAL(ENABLE_GTK_MANAGED, test "x$enable_managed" = "xyes" && test "x$enable_gtk" = "xyes")
+
 # -----------------------------------------------------------
 
 AC_CONFIG_FILES([Makefile
@@ -91,8 +145,12 @@ AC_OUTPUT
 echo ""
 echo " libchamplain $VERSION"
 echo ""
-echo "         Prefix: ${prefix}"
-echo " Compiler flags: ${CPPFLAGS}"
-echo "          Debug: ${enable_debug}"
-echo "      Gtk+ View: ${enable_gtk}"
+echo "          Prefix: ${prefix}"
+echo "  Compiler flags: ${CPPFLAGS}"
+echo "           Debug: ${enable_debug}"
+echo "       Gtk+ View: ${enable_gtk}"
+echo ""
+echo "Bindings:"
+echo " champlain-sharp: ${enable_managed}"
+echo ""