summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeif Lotfy <seif@lotfy.com>2013-03-14 01:15:41 +0100
committerSeif Lotfy <seif@lotfy.com>2013-03-14 01:15:41 +0100
commitb7d3f7f230930f1f93f711cf5012baa2937398c5 (patch)
tree94564b72e1044d8df5998962a5ef8e83d6f1a5b9
parent2e024582d669fcf8b6dcd48f0f61c1fb80c9b5b6 (diff)
More configure.ac fixingHEADmaster
-rw-r--r--configure.ac33
1 files changed, 20 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 27c8729..7d67664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,22 +79,29 @@ dnl Optional dependencies
dnl ==============================================
AC_ARG_ENABLE([telepathy],
- AS_HELP_STRING([--enable-telepathy],[Build with Telepathy support]),
- [enable_telepathy=$enableval],
- [enable_telepathy="no"])
+ AS_HELP_STRING([--disable-telepathy],
+ [Disables the Telepathy]
+ ),
+ [
+ if test "x$enableval" != "xno"; then
+ with_telepathy=yes
+ else
+ with_telepathy=no
+ fi
+ ],
+ [with_telepathy=yes])
-if test "x$enable_telepathy" != "xno" ; then
- PKG_CHECK_EXISTS([telepathy-glib >= $MIN_TP_GLIB_VERSION], \
- enable_telepathy="yes", enable_telepathy="no")
-fi
+AM_CONDITIONAL(ENABLE_TELEPATHY, test "x$with_telepathy" = "xyes")
-if test "x$enable_telepathy" != "xno" ; then
- PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= $MIN_TP_GLIB_VERSION])
- DATAHUB_MODULES_CFLAGS="$DATAHUB_MODULES_CFLAGS $TELEPATHY_GLIB_CFLAGS"
- DATAHUB_MODULES_LIBS="$DATAHUB_MODULES_LIBS $TELEPATHY_GLIB_LIBS"
+if test "x$with_telepathy" = "xyes"; then
+ AC_DEFINE([ENABLE_TELEPATHY], [1], [Is the Telepathy enabled?])
+ PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= $MIN_TP_GLIB_VERSION])
+ DATAHUB_MODULES_CFLAGS="$DATAHUB_MODULES_CFLAGS $TELEPATHY_GLIB_CFLAGS"
+ DATAHUB_MODULES_LIBS="$DATAHUB_MODULES_LIBS $TELEPATHY_GLIB_LIBS"
+else
+ AC_DEFINE([ENABLE_TELEPATHY], [0], [Is the Telepathy enabled?])
fi
-AM_CONDITIONAL(ENABLE_TELEPATHY, test x"$enable_telepathy" = "xyes")
dnl Expansions
dnl AS_AC_EXPAND([PKGDATADIR], [$datadir/$PACKAGE_NAME])
@@ -122,6 +129,6 @@ ${PACKAGE}-${VERSION}
Optional Providers
Downloads Directory Monitor: ${with_downloads_monitor}
- Telepathy Logger : ${enable_telepathy}
+ Telepathy Logger : ${with_telepathy}
EOF