Attachment #475094 for bug #620486

View | Details | Raw Unified | Return to bug 620486
Collapse All | Expand All




dnl - color
dnl ---------------------------------------------------------------------------

AC_ARG_ENABLE([color],
  AS_HELP_STRING([--disable-color],
                 [turn off color plugin]),
       [],
       [enable_color=yes])

AS_IF([test "$enable_color" = "yes"],
      [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
      ])
AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")

dnl ---------------------------------------------------------------------------
dnl - datetime

    if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
      have_wacom=no
    else
      have_wacom=no
      AS_IF([test "$enable_gudev" != "no"],
        [AC_ARG_ENABLE([wacom],
           AS_HELP_STRING([--disable-wacom],
                          [turn off wacom plugin]),
                          [],
                          [enable_wacom=no]) dnl Default value
         AS_IF([test "x$enable_wacom" = "xyes"],
               [
                 PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
                 PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
                 PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
                 have_wacom=yes
                 AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
               ])
        ], [
          AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
        ])
    fi
    ;;
  *)
    have_wacom=no
    ;;
esac
AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)

dnl ==============================================
dnl smartcard section




	a11y-keyboard	\
	a11y-settings	\
	clipboard	\
	color		\
	datetime	\
	dummy		\
	power		\


disabled_plugins = $(NULL)

if BUILD_COLOR
enabled_plugins += color
else
disabled_plugins += color
endif

if SMARTCARD_SUPPORT
enabled_plugins += smartcard
else
disabled_plugins += smartcard
endif

if BUILD_WACOM
enabled_plugins += wacom
else
disabled_plugins += wacom
- 

Return to bug 620486

Lines 245-251 dnl --------------------------------------------------------------------------- Link Here

(-)a/configure.ac (-11 / +30 lines)
245	dnl - color	245	dnl - color
246	dnl ---------------------------------------------------------------------------	246	dnl ---------------------------------------------------------------------------
247		247
248	PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])	248	AC_ARG_ENABLE([color],
		249	AS_HELP_STRING([--disable-color],
		250	[turn off color plugin]),
		251	[],
		252	[enable_color=yes])
		253
		254	AS_IF([test "$enable_color" = "yes"],
		255	[PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
		256	AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
		257	])
		258	AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
249		259
250	dnl ---------------------------------------------------------------------------	260	dnl ---------------------------------------------------------------------------
251	dnl - datetime	261	dnl - datetime
Lines 270-291 case $host_os in Link Here
270	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then	280	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
271	have_wacom=no	281	have_wacom=no
272	else	282	else
273	if test x$enable_gudev != xno; then	283	have_wacom=no
274	PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])	284	AS_IF([test "$enable_gudev" != "no"],
275	PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])	285	[AC_ARG_ENABLE([wacom],
276	PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])	286	AS_HELP_STRING([--disable-wacom],
277	else	287	[turn off wacom plugin]),
278	AC_MSG_ERROR([GUdev is necessary to compile Wacom support])	288	[],
279	fi	289	[enable_wacom=no]) dnl Default value
280	AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])	290	AS_IF([test "x$enable_wacom" = "xyes"],
281	have_wacom=yes	291	[
		292	PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
		293	PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
		294	PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
		295	have_wacom=yes
		296	AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
		297	])
		298	], [
		299	AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
		300	])
282	fi	301	fi
283	;;	302	;;
284	*)	303	*)
285	have_wacom=no	304	have_wacom=no
286	;;	305	;;
287	esac	306	esac
288	AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)	307	AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
289		308
290	dnl ==============================================	309	dnl ==============================================
291	dnl smartcard section	310	dnl smartcard section

Lines 4-10 enabled_plugins = \ Link Here

(-)a/plugins/Makefile.am (-3 / +7 lines)
4	a11y-keyboard \	4	a11y-keyboard \
5	a11y-settings \	5	a11y-settings \
6	clipboard \	6	clipboard \
7	color \
8	datetime \	7	datetime \
9	dummy \	8	dummy \
10	power \	9	power \
Lines 22-34 enabled_plugins = \ Link Here
22		21
23	disabled_plugins = $(NULL)	22	disabled_plugins = $(NULL)
24		23
		24	if BUILD_COLOR
		25	enabled_plugins += color
		26	else
		27	disabled_plugins += color
		28	endif
		29
25	if SMARTCARD_SUPPORT	30	if SMARTCARD_SUPPORT
26	enabled_plugins += smartcard	31	enabled_plugins += smartcard
27	else	32	else
28	disabled_plugins += smartcard	33	disabled_plugins += smartcard
29	endif	34	endif
30		35
31	if HAVE_WACOM	36	if BUILD_WACOM
32	enabled_plugins += wacom	37	enabled_plugins += wacom
33	else	38	else
34	disabled_plugins += wacom	39	disabled_plugins += wacom
35	-