1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.92.new//configure.ac
--- gnome-settings-daemon-3.3.92//configure.ac 2012-03-19 14:23:38.000000000 +0530
+++ gnome-settings-daemon-3.3.92.new//configure.ac 2012-03-25 11:36:35.833356226 +0530
@@ -194,30 +194,39 @@
dnl - color
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+AC_ARG_ENABLE([color],
+ AS_HELP_STRING([--disable-color],
+ [turn off color plugin]),
+ [with_color=$enableval],
+ [with_color=yes]) dnl Default value
+
+if test x$with_color = xyes; then
+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+ AC_DEFINE(HAVE_COLOR, 1, [Define if wacom plugin is enabled])
+fi
+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
+
+AC_SUBST(COLOR_CFLAGS)
+AC_SUBST(COLOR_LIBS)
dnl ---------------------------------------------------------------------------
dnl - wacom (disabled for s390/s390x and non Linux platforms)
dnl ---------------------------------------------------------------------------
-case $host_os in
- linux*)
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
- have_wacom=no
- else
- if test x$enable_gudev != xno; then
- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
- else
- AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
- fi
- have_wacom=yes
- fi
- ;;
- *)
- have_wacom=no
- ;;
-esac
-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
+AC_ARG_ENABLE([wacom],
+ AS_HELP_STRING([--disable-wacom],
+ [turn off wacom plugin]),
+ [have_wacom=$enableval],
+ [have_wacom=no]) dnl Default value
+
+if test x$with_wacom = xyes; then
+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
+fi
+AM_CONDITIONAL(HAVE_WACOM, test "x$with_wacom" = "xyes")
+
+AC_SUBST(WACOM_CFLAGS)
+AC_SUBST(WACOM_LIBS)
dnl ==============================================
dnl PackageKit section
diff -Naur gnome-settings-daemon-3.3.92//data/Makefile.am gnome-settings-daemon-3.3.92.new//data/Makefile.am
--- gnome-settings-daemon-3.3.92//data/Makefile.am 2012-03-16 22:59:35.000000000 +0530
+++ gnome-settings-daemon-3.3.92.new//data/Makefile.am 2012-03-25 11:39:24.548364338 +0530
@@ -11,7 +11,6 @@
org.gnome.settings-daemon.plugins.gschema.xml \
org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
org.gnome.settings-daemon.plugins.power.gschema.xml \
- org.gnome.settings-daemon.plugins.color.gschema.xml \
org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
@@ -30,6 +29,12 @@
gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.orientation.gschema.xml
else
all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
+endif
+
+if WITH_COLOR
+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
+else
+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
endif
if HAVE_WACOM
diff -Naur gnome-settings-daemon-3.3.92//plugins/Makefile.am gnome-settings-daemon-3.3.92.new//plugins/Makefile.am
--- gnome-settings-daemon-3.3.92//plugins/Makefile.am 2012-03-16 22:59:35.000000000 +0530
+++ gnome-settings-daemon-3.3.92.new//plugins/Makefile.am 2012-03-25 11:37:47.296359651 +0530
@@ -6,7 +6,6 @@
automount \
background \
clipboard \
- color \
cursor \
dummy \
power \
@@ -39,6 +38,12 @@
disabled_plugins += orientation
endif
+if WITH_COLOR
+enabled_plugins += color
+else
+disabled_plugins += color
+endif
+
if HAVE_WACOM
enabled_plugins += wacom
else
|
GitWeb