|
Line
Link Here
|
| 0 |
-- /a/configure.ac |
0 |
++ /b/configure.ac |
|
Lines 124-130
Link Here
|
| 124 |
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) |
124 |
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) |
| 125 |
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 |
125 |
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 |
| 126 |
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION) |
126 |
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION) |
| 127 |
PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) |
|
|
| 128 |
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 |
127 |
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 |
| 129 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
128 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
| 130 |
libxklavier >= 5.1 libgnomekbdui >= 2.91.91) |
129 |
libxklavier >= 5.1 libgnomekbdui >= 2.91.91) |
|
Lines 201-215
Link Here
|
| 201 |
AC_SUBST(CUPS_LIBS) |
200 |
AC_SUBST(CUPS_LIBS) |
| 202 |
fi |
201 |
fi |
| 203 |
|
202 |
|
|
|
203 |
build_color=false |
| 204 |
AC_ARG_ENABLE(color, |
| 205 |
AC_HELP_STRING([--disable-color], |
| 206 |
[disable color management panel]), |
| 207 |
[case "${enableval}" in |
| 208 |
yes) WANT_COLOR=yes ;; |
| 209 |
no) WANT_COLOR=no ;; |
| 210 |
*) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; |
| 211 |
esac], |
| 212 |
[WANT_COLOR=yes]) dnl Default value |
| 213 |
|
| 214 |
if test x$WANT_COLOR = xyes; then |
| 215 |
PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) |
| 216 |
build_color=true |
| 217 |
fi |
| 218 |
if test "x$build_color" = xtrue ; then |
| 219 |
AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) |
| 220 |
fi |
| 221 |
AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") |
| 222 |
AC_SUBST(COLOR_PANEL_CFLAGS) |
| 223 |
AC_SUBST(COLOR_PANEL_LIBS) |
| 224 |
|
| 204 |
build_wacom=false |
225 |
build_wacom=false |
| 205 |
PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES |
226 |
AC_ARG_ENABLE(wacom, |
|
|
227 |
AC_HELP_STRING([--disable-wacom], |
| 228 |
[disable wacom management panel]), |
| 229 |
[case "${enableval}" in |
| 230 |
yes) WANT_WACOM=yes ;; |
| 231 |
no) WANT_WACOM=no ;; |
| 232 |
*) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; |
| 233 |
esac], |
| 234 |
[WANT_WACOM=yes]) dnl Default value |
| 235 |
|
| 236 |
if test x$WANT_WACOM = xyes; then |
| 237 |
PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES |
| 206 |
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION |
238 |
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION |
| 207 |
xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
239 |
xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
| 208 |
cinnamon-desktop |
240 |
cinnamon-desktop |
| 209 |
gtk+-3.0 >= 3.8.0], |
241 |
gtk+-3.0 >= 3.8.0]) |
| 210 |
[build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) |
242 |
build_wacom="true" |
| 211 |
|
243 |
AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])] |
|
|
244 |
fi |
| 212 |
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") |
245 |
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") |
|
|
246 |
AC_SUBST(WACOM_PANEL_CFLAGS) |
| 247 |
AC_SUBST(WACOM_PANEL_LIBS) |
| 213 |
|
248 |
|
| 214 |
# This is a hard-dependency for the region and user-accounts panels |
249 |
# This is a hard-dependency for the region and user-accounts panels |
| 215 |
PKG_CHECK_MODULES(ISOCODES, iso-codes) |
250 |
PKG_CHECK_MODULES(ISOCODES, iso-codes) |
| 216 |
-- /a/panels/Makefile.am |
251 |
++ /b/panels/Makefile.am |
|
Lines 3-9
Link Here
|
| 3 |
enabled_panels = \ |
3 |
enabled_panels = \ |
| 4 |
common \ |
4 |
common \ |
| 5 |
screen \ |
5 |
screen \ |
| 6 |
color \ |
|
|
| 7 |
display \ |
6 |
display \ |
| 8 |
region \ |
7 |
region \ |
| 9 |
universal-access \ |
8 |
universal-access \ |
|
Lines 14-19
Link Here
|
| 14 |
|
13 |
|
| 15 |
disabled_panels = $(NULL) |
14 |
disabled_panels = $(NULL) |
| 16 |
|
15 |
|
|
|
16 |
if BUILD_COLOR |
| 17 |
enabled_panels += color |
| 18 |
else |
| 19 |
disabled_panels += color |
| 20 |
endif |
| 21 |
|
| 17 |
if BUILD_NETWORK |
22 |
if BUILD_NETWORK |
| 18 |
enabled_panels += network |
23 |
enabled_panels += network |
| 19 |
else |
24 |
else |
