Index: configure.ac --- configure.ac.orig +++ configure.ac @@ -91,122 +91,29 @@ AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspecti ########################### AC_PATH_PROG([VALA_API_GEN], [vapigen]) -AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$VALA_API_GEN" != "x"]) +AM_CONDITIONAL(HAVE_VAPIGEN, [false]) ########################### # Vala Compiler support ########################### AM_PROG_VALAC([0.14.0]) -AM_CONDITIONAL(HAVE_VALAC, [test "x$VALAC" != "x"]) +AM_CONDITIONAL(HAVE_VALAC, [false]) ########################### # Check for Mono support ########################### -MONO_REQUIRED_VERSION=1.0 -PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) -AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"]) +has_mono=no +has_nunit=no +enable_mono_test=no -AC_PATH_PROG(AL, al, no) -if test "x$AL" = "xno" ; then - AC_MSG_NOTICE([No al tool found. You need to install Mono.]) -fi - -if test "x$has_mono" = "xtrue" ; then - GENERATED_SOURCES=generated/*.cs - AC_PATH_PROG(RUNTIME, mono, no) - - if test "x$RUNTIME" != "no" ; then - RUNTIME=mono - fi - - AC_PATH_PROG(CSC, gmcs, no) - LIB_PREFIX=.so - LIB_SUFFIX= -fi - -if test "x$CSC" = "xno" ; then - AC_MSG_NOTICE([No Mono compiler found.]) -fi - -AC_PATH_PROG(GACUTIL, gacutil, no) -if test "x$GACUTIL" = "xno" ; then - AC_MSG_NOTICE([No gacutil tool found]) -fi - -AC_SUBST(RUNTIME) -AC_SUBST(CSC) -AC_SUBST(GACUTIL) -AC_SUBST(LIB_PREFIX) -AC_SUBST(LIB_SUFFIX) -AC_SUBST(GENERATED_SOURCES) - -GLIB_SHARP_REQ_VERSION=2.12.1 -GTK_SHARP_REQ_VERSION=2.12 -PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false) - -PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false) -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) - -# Check for nunit -AC_ARG_ENABLE([mono-test], - AC_HELP_STRING([--disable-mono-test], [Disable mono test]),, - [enable_mono_test=auto]) - -if test x"$enable_mono_test" != x"no" ; then - PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7, - [have_nunit=yes], - [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit, - [have_nunit=yes], - [have_nunit=no]) - ]) - if test x${enable_mono_test} = xyes && test x${have_nunit} = xno; then - AC_MSG_ERROR([Mono test configured but nunit not found]) - fi -else - have_nunit=no -fi -AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes) - ########################### # Check to see if we're local ########################### with_localinstall="no" AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) - -########################### -# Python -########################### - -PYGTK_REQUIRED=2.14.0 -PYGOBJECT_REQUIRED=0.22 - -AM_PATH_PYTHON(2.3.5) -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) - -PKG_CHECK_MODULES(APPINDICATOR_PYTHON, - [ - pygtk-2.0 >= $PYGTK_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED_VERSION - pygobject-2.0 >= $PYGOBJECT_REQUIRED - ]) - -AC_MSG_CHECKING(for pygtk defs) -PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -AC_SUBST(PYGTK_DEFSDIR) -AC_MSG_RESULT($PYGTK_DEFSDIR) - -AC_MSG_CHECKING(for pygtk codegen) -PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" -AC_SUBST(PYGTK_CODEGEN) -AC_MSG_RESULT($PYGTK_CODEGEN) ######################### # Check if build tests