|
Lines 57-76
Link Here
|
| 57 |
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
59 |
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
| 58 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
60 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
| 59 |
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
61 |
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
| 60 |
@@ -210,17 +248,25 @@ |
62 |
@@ -210,9 +248,22 @@ else |
| 61 |
fi |
63 |
fi |
| 62 |
AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes") |
64 |
AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes") |
| 63 |
|
65 |
|
| 64 |
-# Check for gnome-bluetooth |
66 |
-# Check for gnome-bluetooth |
| 65 |
-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5, |
67 |
-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5, |
| 66 |
- [have_bluetooth=yes], have_bluetooth=no) |
68 |
- [have_bluetooth=yes], have_bluetooth=no) |
| 67 |
-if test "x$have_bluetooth" = xyes ; then |
69 |
+have_bluetooth=no |
| 68 |
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
|
|
| 69 |
-fi |
| 70 |
-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes]) |
| 71 |
-if test x${have_bluetooth} = xyes; then |
| 72 |
- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available]) |
| 73 |
+have_bluetooth=false |
| 74 |
+AC_ARG_ENABLE(bluetooth, |
70 |
+AC_ARG_ENABLE(bluetooth, |
| 75 |
+ AC_HELP_STRING([--disable-bluetooth], |
71 |
+ AC_HELP_STRING([--disable-bluetooth], |
| 76 |
+ [disable bluetooth management panel]), |
72 |
+ [disable bluetooth management panel]), |
|
Lines 80-98
Link Here
|
| 80 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; |
76 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; |
| 81 |
+ esac], |
77 |
+ esac], |
| 82 |
+ [WANT_BLUETOOTH=yes]) dnl Default value |
78 |
+ [WANT_BLUETOOTH=yes]) dnl Default value |
| 83 |
+ |
79 |
+ |
| 84 |
+if test x$WANT_BLUETOOTH = xyes; then |
80 |
+if test x$WANT_BLUETOOTH = xyes; then |
| 85 |
+ # Check for gnome-bluetooth |
81 |
+ # Check for gnome-bluetooth |
| 86 |
+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5) |
82 |
+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5) |
| 87 |
+ have_bluetooth=true |
83 |
+ have_bluetooth=yes |
|
|
84 |
+fi |
| 85 |
if test "x$have_bluetooth" = xyes ; then |
| 86 |
AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
| 88 |
fi |
87 |
fi |
| 89 |
|
88 |
@@ -289,12 +340,23 @@ case $host_os in |
| 90 |
+AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue]) |
|
|
| 91 |
+ |
| 92 |
# Check for smbclient |
| 93 |
PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no]) |
| 94 |
|
| 95 |
@@ -289,12 +335,23 @@ |
| 96 |
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
89 |
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
| 97 |
have_wacom=no |
90 |
have_wacom=no |
| 98 |
else |
91 |
else |
|
Lines 122-128
Link Here
|
| 122 |
fi |
115 |
fi |
| 123 |
;; |
116 |
;; |
| 124 |
*) |
117 |
*) |
| 125 |
@@ -555,6 +612,11 @@ |
118 |
@@ -555,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then |
| 126 |
else |
119 |
else |
| 127 |
AC_MSG_NOTICE([ Bluetooth panel disabled]) |
120 |
AC_MSG_NOTICE([ Bluetooth panel disabled]) |
| 128 |
fi |
121 |
fi |
|
Lines 134-140
Link Here
|
| 134 |
if test "x$enable_cups" = "xyes"; then |
127 |
if test "x$enable_cups" = "xyes"; then |
| 135 |
AC_MSG_NOTICE([** CUPS (Printers panel)]) |
128 |
AC_MSG_NOTICE([** CUPS (Printers panel)]) |
| 136 |
else |
129 |
else |
| 137 |
@@ -565,11 +627,21 @@ |
130 |
@@ -565,11 +632,21 @@ if test "x$have_cheese" = "xyes"; then |
| 138 |
else |
131 |
else |
| 139 |
AC_MSG_NOTICE([ Users panel webcam support disabled]) |
132 |
AC_MSG_NOTICE([ Users panel webcam support disabled]) |
| 140 |
fi |
133 |
fi |
|
Lines 156-164
Link Here
|
| 156 |
if test "x$have_wacom" = "xyes"; then |
149 |
if test "x$have_wacom" = "xyes"; then |
| 157 |
AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
150 |
AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
| 158 |
else |
151 |
else |
