From d38d7dc1849973d5a4e29cd2e3460bedfa041ee2 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Thu, 12 Jun 2008 18:58:31 +0000 Subject: * configure.in, Makefile.am: Fix makefile so that it does not directly depend on MD core and it can always be built standalone. * ValaBinding.mdp: Enable makefile synchronization. svn path=/trunk/monodevelop/; revision=105718 --- extras/ValaBinding/configure.in | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) (limited to 'extras/ValaBinding/configure.in') diff --git a/extras/ValaBinding/configure.in b/extras/ValaBinding/configure.in index f4a6a01089..cf89db3421 100644 --- a/extras/ValaBinding/configure.in +++ b/extras/ValaBinding/configure.in @@ -50,6 +50,7 @@ fi dnl hard dependencies MONOADDINS_REQUIRED_VERSION=0.3 GTKSHARP_REQUIRED_VERSION=2.8.0 +MONODEVELOP_REQUIRED_VERSION=1.9 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION) AC_SUBST(MONO_ADDINS_LIBS) @@ -63,6 +64,10 @@ PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(GTK_SHARP_LIBS) PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(GLADE_SHARP_LIBS) +PKG_CHECK_MODULES(MONODEVELOP, monodevelop >= $MONODEVELOP_REQUIRED_VERSION) +AC_SUBST(MONODEVELOP_LIBS) +PKG_CHECK_MODULES(MONODEVELOP_CORE_ADDINS, monodevelop-core-addins >= $MONODEVELOP_REQUIRED_VERSION) +AC_SUBST(MONODEVELOP_CORE_ADDINS_LIBS) dnl soft dependencies PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_sharp=yes], [gnome_sharp=no]) @@ -80,9 +85,6 @@ AC_SUBST(gtksharp_prefix) platform_bindings="" -enable_vala=yes -AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes]) - CSC_FLAGS="-debug -codepage:utf8" AC_SUBST(LIB_SUFFIX) @@ -90,29 +92,6 @@ AC_SUBST(LIB_PREFIX) AC_SUBST(ASSEMBLY_VERSION) AC_SUBST(CSC_FLAGS) - -MD_DIR='$(prefix)/lib/monodevelop' - -# Standalone build -AC_ARG_ENABLE(standalone, AC_HELP_STRING([--enable-standalone], [enable standalone build [default=no]]), enable_standalone=${enableval}, enable_standalone=no) - -if test x$enable_standalone = xyes; then - MD_BUILDDIR=./build - MD_ASSEMBLY_DIR="$prefix/lib/monodevelop/bin" - MD_ADDIN_DIR="$prefix/lib/monodevelop/AddIns" - echo "Building standalone" -else - MD_BUILDDIR=../../main/build - MD_ASSEMBLY_DIR="$MD_BUILDDIR/bin" - MD_ADDIN_DIR="$MD_BUILDDIR/AddIns" - echo "Building as part of MonoDevelop" -fi - -AC_SUBST(MD_BUILDDIR) -AC_SUBST(MD_ASSEMBLY_DIR) -AC_SUBST(MD_ADDIN_DIR) -AC_SUBST(MD_DIR) - AC_OUTPUT([ Makefile ]) -- cgit v1.2.3