Attachment #489390 for bug #628106

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




		  gtk+-x11-3.0
		  x11)

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
                         libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
                         lcms2 >= $LCMS_REQUIRED_VERSION
                         libnotify)
       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
      ])
AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")

PKG_CHECK_MODULES(DATETIME,
		  libnotify >= $LIBNOTIFY_REQUIRED_VERSION

    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 "$enable_wacom" = "yes"],
               [
                 PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
                 PKG_CHECK_MODULES(WACOM, [gtk+-3.0 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 - common




	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




	-I$(top_builddir)/gnome-settings-daemon	\
	-I$(top_srcdir)/data/

libcommon_la_CFLAGS = \
	$(COMMON_CFLAGS) \
	$(LIBWACOM_CFLAGS)

libcommon_la_LDFLAGS = \
	$(GSD_PLUGIN_LDFLAGS)

libcommon_la_LIBADD  = \
	$(top_builddir)/gnome-settings-daemon/libgsd.la \
	$(COMMON_LIBS) \
	$(LIBWACOM_LIBS)

libexec_PROGRAMS = gsd-test-input-helper


Lines 25-31 desktop_DATA = Link Here

(-)a/plugins/dummy/Makefile.am (-2 / +4 lines)
25	if !SMARTCARD_SUPPORT	25	if !SMARTCARD_SUPPORT
26	desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop	26	desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
27	endif	27	endif
28	if !HAVE_WACOM	28	if !BUILD_COLOR
		29	desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
		30	endif
		31	if !BUILD_WACOM
29	desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop	32	desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
30	endif	33	endif
31	if !BUILD_PRINT_NOTIFICATIONS	34	if !BUILD_PRINT_NOTIFICATIONS
32	-

Return to bug 628106

Lines 158-170 PKG_CHECK_MODULES(CLIPBOARD, Link Here

(-)a/configure.ac (-18 / +36 lines)
158	gtk+-x11-3.0	158	gtk+-x11-3.0
159	x11)	159	x11)
160		160
161	PKG_CHECK_MODULES(COLOR,	161	AC_ARG_ENABLE([color],
162	colord >= 1.0.2	162	AS_HELP_STRING([--disable-color],
163	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION	163	[turn off color plugin]),
164	libcanberra-gtk3	164	[],
165	libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION	165	[enable_color=yes])
166	lcms2 >= $LCMS_REQUIRED_VERSION	166
167	libnotify)	167	AS_IF([test "$enable_color" = "yes"],
		168	[PKG_CHECK_MODULES(COLOR,
		169	colord >= 1.0.2
		170	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
		171	libcanberra-gtk3
		172	libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
		173	lcms2 >= $LCMS_REQUIRED_VERSION
		174	libnotify)
		175	AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
		176	])
		177	AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
168		178
169	PKG_CHECK_MODULES(DATETIME,	179	PKG_CHECK_MODULES(DATETIME,
170	libnotify >= $LIBNOTIFY_REQUIRED_VERSION	180	libnotify >= $LIBNOTIFY_REQUIRED_VERSION
Lines 268-290 case $host_os in Link Here
268	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then	278	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
269	have_wacom=no	279	have_wacom=no
270	else	280	else
271	if test x$enable_gudev != xno; then	281	have_wacom=no
272	LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"	282	AS_IF([test "$enable_gudev" != "no"],
273	PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])	283	[AC_ARG_ENABLE([wacom],
274	PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])	284	AS_HELP_STRING([--disable-wacom],
275	PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])	285	[turn off wacom plugin]),
276	else	286	[],
277	AC_MSG_ERROR([GUdev is necessary to compile Wacom support])	287	[enable_wacom=no]) dnl Default value
278	fi	288	AS_IF([test "$enable_wacom" = "yes"],
279	AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])	289	[
280	have_wacom=yes	290	PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
		291	PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
		292	PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
		293	have_wacom=yes
		294	AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
		295	])
		296	], [
		297	AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
		298	])
281	fi	299	fi
282	;;	300	;;
283	*)	301	*)
284	have_wacom=no	302	have_wacom=no
285	;;	303	;;
286	esac	304	esac
287	AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)	305	AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
288		306
289	dnl ---------------------------------------------------------------------------	307	dnl ---------------------------------------------------------------------------
290	dnl - common	308	dnl - common

Lines 49-62 libcommon_la_CPPFLAGS = \ Link Here

(-)a/plugins/common/Makefile.am (-2 / +5 lines)
49	-I$(top_builddir)/gnome-settings-daemon \	49	-I$(top_builddir)/gnome-settings-daemon \
50	-I$(top_srcdir)/data/	50	-I$(top_srcdir)/data/
51		51
52	libcommon_la_CFLAGS = $(COMMON_CFLAGS)	52	libcommon_la_CFLAGS = \
		53	$(COMMON_CFLAGS) \
		54	$(LIBWACOM_CFLAGS)
53		55
54	libcommon_la_LDFLAGS = \	56	libcommon_la_LDFLAGS = \
55	$(GSD_PLUGIN_LDFLAGS)	57	$(GSD_PLUGIN_LDFLAGS)
56		58
57	libcommon_la_LIBADD = \	59	libcommon_la_LIBADD = \
58	$(top_builddir)/gnome-settings-daemon/libgsd.la \	60	$(top_builddir)/gnome-settings-daemon/libgsd.la \
59	$(COMMON_LIBS)	61	$(COMMON_LIBS) \
		62	$(LIBWACOM_LIBS)
60		63
61	libexec_PROGRAMS = gsd-test-input-helper	64	libexec_PROGRAMS = gsd-test-input-helper
62		65

Lines 4-10 enabled_plugins = \ Link Here

(-)a/plugins/Makefile.am (-2 / +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