diff options
| author | Ted Gould <ted@gould.cx> | 2012-01-27 16:14:37 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-01-27 16:14:37 -0600 |
| commit | dea1a71b60e0a099d7f8596c1b01d2399c0b9127 (patch) | |
| tree | 8a627883e5535ea53054371d0e79b8a810825212 /configure.ac | |
| parent | bc49dd8e9acfd1069e99999fd573609a404de869 (diff) | |
| parent | d006f9d8b40a0a6dd2da09cf41d939787d0505ea (diff) | |
| download | libayatana-appindicator-dea1a71b60e0a099d7f8596c1b01d2399c0b9127.tar.gz libayatana-appindicator-dea1a71b60e0a099d7f8596c1b01d2399c0b9127.tar.bz2 libayatana-appindicator-dea1a71b60e0a099d7f8596c1b01d2399c0b9127.zip | |
Update to trunk
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d271627..fe2d754 100644 --- a/configure.ac +++ b/configure.ac @@ -153,7 +153,25 @@ AC_SUBST(GAPI_CODEGEN) AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) AC_SUBST(GAPI_FIXUP) -PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7) +# 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 @@ -189,6 +207,14 @@ 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 +######################### +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Disable tests]),, + [enable_tests=yes]) +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) + ########################### # Files ########################### @@ -226,4 +252,6 @@ Libappindicator Configuration: Prefix: $prefix GTK+ Version: $with_gtk + Tests: $enable_tests + Mono tests: $have_nunit ]) |