evince r2976 - trunk
- From: carlosgc svn gnome org
- To: svn-commits-list gnome org
- Subject: evince r2976 - trunk
- Date: Sat, 22 Mar 2008 15:36:31 +0000 (GMT)
Author: carlosgc
Date: Sat Mar 22 15:36:31 2008
New Revision: 2976
URL: http://svn.gnome.org/viewvc/evince?rev=2976&view=rev
Log:
2008-03-22 Carlos Garcia Campos <carlosgc gnome org>
* configure.ac:
Add a configure option to enable/diable DBus. Patch by RÃmi
Cardona. Fixes bug 521797.
Modified:
trunk/ChangeLog
trunk/configure.ac
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Mar 22 15:36:31 2008
@@ -104,25 +104,31 @@
AC_SUBST(GLIB_GENMARSHAL)
dnl ========= Check for DBUS
-PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
+AC_ARG_ENABLE(dbus,
+ [AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])],
+ enable_dbus="$enableval",enable_dbus=yes)
+if test "x$enable_dbus" != "xno"; then
+ PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
[enable_dbus=yes],[enable_dbus=no])
-AC_SUBST([DBUS_CFLAGS])
-AC_SUBST([DBUS_LIBS])
-
-if test "x$enable_dbus" = "xno"; then
- AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
-fi
-if test "x$enable_dbus" = "xyes" ; then
- AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+ if test "x$enable_dbus" = "xno"; then
+ AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
+ fi
+
+ if test "x$enable_dbus" = "xyes" ; then
+ AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+
+ if test x$DBUS_BINDING_TOOL = "xno" ; then
+ AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
+ fi
- if test x$DBUS_BINDING_TOOL = "xno" ; then
- AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
- fi
-
- AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+ AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+ fi
fi
+AC_SUBST([DBUS_CFLAGS])
+AC_SUBST([DBUS_LIBS])
+
LIB_CFLAGS="$LIB_CFLAGS $GNOME_CFLAGS"
LIB_LIBS="$LIB_LIBS $GNOME_LIBS"
AC_SUBST(LIB_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]