|
Line 0
Link Here
|
|
|
1 |
configure.in | 35 +++++++++++++++++++++++++---------- |
| 2 |
1 files changed, 25 insertions(+), 10 deletions(-) |
| 3 |
|
| 4 |
diff --git a/configure.in b/configure.in |
| 5 |
index 515f053..03eda8c 100644 |
| 6 |
--- a/configure.in |
| 7 |
+++ b/configure.in |
| 8 |
@@ -60,13 +60,6 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [ |
| 9 |
AC_SUBST(TYPING_BREAK) |
| 10 |
AC_SUBST(SCREENSAVER_LIBS) |
| 11 |
|
| 12 |
-PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, [ |
| 13 |
- CANBERRA_GTK=1 |
| 14 |
- AC_SUBST(LIBCANBERRA_GTK_CFLAGS) |
| 15 |
- AC_SUBST(LIBCANBERRA_GTK_LIBS) |
| 16 |
- ], [:]) |
| 17 |
-AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1") |
| 18 |
- |
| 19 |
AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break) |
| 20 |
|
| 21 |
dnl keyboard-properties-capplet |
| 22 |
@@ -96,6 +89,22 @@ COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl |
| 23 |
gconf-2.0 dnl |
| 24 |
libglade-2.0 >= 2.0.0 dnl |
| 25 |
gnome-desktop-2.0 >= 2.25.1" |
| 26 |
+ |
| 27 |
+AC_ARG_ENABLE([canberra], |
| 28 |
+ AC_HELP_STRING([--enable-canberra], |
| 29 |
+ [Enable canberra support @<:@default=yes@:>@]), |
| 30 |
+ enable_canberra=$enableval, enable_canberra=yes) |
| 31 |
+ |
| 32 |
+CANBERRA_GTK=0 |
| 33 |
+if test x$enable_canberra = xyes; then |
| 34 |
+ PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, |
| 35 |
+ [CANBERRA_GTK=1 |
| 36 |
+ AC_SUBST(LIBCANBERRA_GTK_CFLAGS) |
| 37 |
+ AC_SUBST(LIBCANBERRA_GTK_LIBS)], []) |
| 38 |
+fi |
| 39 |
+ |
| 40 |
+AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1") |
| 41 |
+ |
| 42 |
PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0) |
| 43 |
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) |
| 44 |
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1) |
| 45 |
@@ -199,15 +208,21 @@ AC_ARG_ENABLE([aboutme], |
| 46 |
[enable_aboutme=no]) |
| 47 |
AC_MSG_RESULT([$enable_aboutme]) |
| 48 |
|
| 49 |
+AC_ARG_ENABLE([policykit-gnome], |
| 50 |
+ AC_HELP_STRING([--enable-policykit-gnome], |
| 51 |
+ [Enable PolicyKit-gnome support @<:@default=yes@:>@]), |
| 52 |
+ enable_polkit=$enableval, enable_polkit=yes) |
| 53 |
+ |
| 54 |
if test "x$enable_aboutme" = "xyes"; then |
| 55 |
PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90], |
| 56 |
[AC_DEFINE([HAVE_LIBEBOOK], 1, |
| 57 |
[Define if evolution-data-server libebook-1.2 is available])]) |
| 58 |
- dnl PolicyKit-gnome is optional |
| 59 |
+ if test "x$enable_polkit" = "xyes"; then |
| 60 |
PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome], |
| 61 |
[AC_DEFINE([HAVE_POLKIT], 1, |
| 62 |
- [Define if PolicyKit-gnome is available])], |
| 63 |
- has_polkit=false) |
| 64 |
+ [Define if PolicyKit-gnome is available])], |
| 65 |
+ has_polkit=false) |
| 66 |
+ fi |
| 67 |
fi |
| 68 |
|
| 69 |
AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes") |
