|
Line
Link Here
|
| 0 |
-- |
0 |
++ /b/configure.ac |
| 1 |
-- /a/configure.ac |
|
|
|
Lines 113-118
Link Here
|
| 113 |
PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0) |
113 |
PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0) |
| 114 |
|
114 |
|
| 115 |
AC_MSG_CHECKING([for bluetooth support]) |
115 |
AC_MSG_CHECKING([for bluetooth support]) |
|
|
116 |
AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) |
| 117 |
AS_IF([test "x$with_bluetooth" != "xno"], [ |
| 116 |
PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], |
118 |
PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], |
| 117 |
[BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` |
119 |
[BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` |
| 118 |
BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` |
120 |
BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` |
|
Lines 125-130
Link Here
|
| 125 |
[AC_DEFINE([HAVE_BLUETOOTH],[0]) |
127 |
[AC_DEFINE([HAVE_BLUETOOTH],[0]) |
| 126 |
AC_SUBST([HAVE_BLUETOOTH],[0]) |
128 |
AC_SUBST([HAVE_BLUETOOTH],[0]) |
| 127 |
AC_MSG_RESULT([no])]) |
129 |
AC_MSG_RESULT([no])]) |
|
|
130 |
], [AC_DEFINE([HAVE_BLUETOOTH],[0]) |
| 131 |
AC_SUBST([HAVE_BLUETOOTH],[0]) |
| 132 |
AC_MSG_RESULT([no])]) |
| 128 |
|
133 |
|
| 129 |
MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin` |
134 |
MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin` |
| 130 |
MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin` |
135 |
MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin` |
