diff options
| author | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-01 15:38:10 +0000 |
|---|---|---|
| committer | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-01 15:38:10 +0000 |
| commit | f08161df2b0e9f46271a5bb3ba5a15694642b169 (patch) | |
| tree | 47342081c0b14ff6151fa3347335bfbbed5af8b7 /configure.ac | |
| parent | f9e7d06dfb68dceb66fa7abac603a621e02198d9 (diff) | |
| download | telepathy-logger-f08161df2b0e9f46271a5bb3ba5a15694642b169.tar.gz | |
imported tests from telepathy-gabble
* test folder imported from telepathy-gabble, twisted/ still not working but cleaned-up of clearly useless tests.
it still needs a further clean-up and adaptation in order to be used.
* basic C tests written
* autotools (configure and Makefile .au) updated for Python and Twisted checking.
* autotools (configure and Makefile .au) updated for DBus and DBus-glib basic requirement
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 95d6640..3b95fbb 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,8 @@ AC_COPYRIGHT([ # Minimal version required GLIB_REQUIRED=2.22.0 +DBUS_REQUIRED=1.1.0 +DBUS_GLIB_REQUIRED=0.82 TELEPATHY_GLIB_REQUIRED=0.9.0 # Use --enable-maintainer-mode to disabled deprecated symbols @@ -64,11 +66,29 @@ AM_GCONF_SOURCE_2 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` AC_SUBST(GLIB_GENMARSHAL) +# ----------------------------------------------------------- +# Check for code generation tools +# ----------------------------------------------------------- +XSLTPROC= AC_CHECK_PROGS([XSLTPROC], [xsltproc]) if test -z "$XSLTPROC"; then AC_MSG_ERROR([xsltproc (from libxslt) is required]) fi +# ----------------------------------------------------------- +# Check for a Python >= 2.5 with Twisted, to run the tests +# ----------------------------------------------------------- +AM_PATH_PYTHON([2.5]) +AC_MSG_CHECKING([for Python with Twisted]) +if $PYTHON -c "import twisted.internet.reactor" >/dev/null 2>&1; then + TEST_PYTHON="$PYTHON" +else + TEST_PYTHON=false +fi +AC_MSG_RESULT([$TEST_PYTHON]) +AC_SUBST(TEST_PYTHON) +AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON") + # ----------------------------------------------------------- # Error flags @@ -126,7 +146,8 @@ PKG_CHECK_MODULES(LIBTPL, PKG_CHECK_MODULES(TPL, [ - dbus-glib-1 + dbus-1 >= $DBUS_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED glib-2.0 >= $GLIB_REQUIRED gobject-2.0 libxml-2.0 @@ -150,7 +171,7 @@ fi # ----------------------------------------------------------- AC_ARG_ENABLE(coding-style-checks, AC_HELP_STRING([--disable-coding-style-checks], - [don't check coding style using grep]), + [do not check coding style using grep]), [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes]) AC_SUBST([ENABLE_CODING_STYLE_CHECKS]) @@ -165,6 +186,7 @@ AC_OUTPUT([ telepathy-logger/Makefile telepathy-logger/libtelepathy-logger.pc tools/Makefile + tests/Makefile shave shave-libtool ]) @@ -177,4 +199,5 @@ Configure summary: Prefix......................: ${prefix} Shaved build................: ${enable_shave} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} + Python Twisted tests........: ${TEST_PYTHON} " |