Attachment #343354 for bug #463418




                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)

build_online_accounts=false
AC_ARG_ENABLE(goa,
  AC_HELP_STRING([--disable-goa],
                 [disable online accounts management panel]),
      [case "${enableval}" in
              yes) WANT_ONLINE_ACCOUNTS=yes ;;
              no) WANT_ONLINE_ACCOUNTS=no ;;
              *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
      esac],
      [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value

if test x$WANT_ONLINE_ACCOUNTS = xyes; then
      PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
      build_online_accounts=true
fi
AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)

PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION)

build_color=false
AC_ARG_ENABLE(color,
  AC_HELP_STRING([--disable-color],
                 [disable color management panel]),
      [case "${enableval}" in
              yes) WANT_COLOR=yes ;;
              no) WANT_COLOR=no ;;
              *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
      esac],
      [WANT_COLOR=yes]) dnl Default value

if test x$WANT_COLOR = xyes; then
      PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
      build_color=true
fi
AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
AC_SUBST(COLOR_PANEL_CFLAGS)
AC_SUBST(COLOR_PANEL_LIBS)

PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)

  AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
fi

have_bluetooth=false
AC_ARG_ENABLE(bluetooth,
  AC_HELP_STRING([--disable-bluetooth],
                 [disable bluetooth management panel]),
      [case "${enableval}" in
              yes) WANT_BLUETOOTH=yes ;;
              no) WANT_BLUETOOTH=no ;;
              *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
      esac],
      [WANT_BLUETOOTH=yes]) dnl Default value

if test x$WANT_BLUETOOTH = xyes; then
     # Check for gnome-bluetooth
     PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
     have_bluetooth=true
fi

AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])


# Check for CUPS 1.4 or newer
AC_ARG_ENABLE([cups],
              AS_HELP_STRING([--disable-cups], [disable CUPS support (default: enabled)]),,

    if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
      have_wacom=no
    else
      AC_ARG_ENABLE(wacom,
        AC_HELP_STRING([--disable-wacom],
                       [disable wacom management panel]),
            [case "${enableval}" in
                    yes) WANT_WACOM=yes ;;
                    no) WANT_WACOM=no ;;
                    *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
            esac],
            [WANT_WACOM=yes]) dnl Default value
      
      if test x$WANT_WACOM = xyes; then
            PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
                              gnome-settings-daemon >= $GSD_REQUIRED_VERSION
                              xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
                              gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
            have_wacom=yes
      fi
    fi
    ;;
  *)

else
	AC_MSG_NOTICE([   Bluetooth panel disabled])
fi
if test "x$build_color" = "xtrue"; then
	AC_MSG_NOTICE([** colord (Color panel)])
else
	AC_MSG_NOTICE([   Color panel disabled])
fi
if test "x$enable_cups" = "xyes"; then
	AC_MSG_NOTICE([** CUPS (Printers panel)])
else

else
	AC_MSG_NOTICE([   Users panel webcam support disabled])
fi
if test "x$build_online_accounts" = "xtrue"; then
	AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
else
	AC_MSG_NOTICE([   Online Accounts panel disabled])
fi
if test "x$with_libsocialweb" = "xyes"; then
	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
else
	AC_MSG_NOTICE([   Background panel Flickr support disabled])
fi
if test "x$build_wacom" = "xtrue"; then
	AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
else
	AC_MSG_NOTICE([   Wacom Graphics Tablet panel disabled])
fi
if test "x$have_wacom" = "xyes"; then
	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
else

Lines 3-13 SUBDIRS= \ Link Here

(-)a/panels/Makefile.am (-3 / +8 lines)
3	background \	3	background \
4	screen \	4	screen \
5	power \	5	power \
6	color \
7	display \	6	display \
8	mouse \	7	mouse \
9	notifications \	8	notifications \
10	online-accounts \
11	region \	9	region \
12	info \	10	info \
13	sound \	11	sound \
Lines 19-24 SUBDIRS= \ Link Here
19	privacy \	17	privacy \
20	sharing	18	sharing
21		19
		20	if BUILD_COLOR
		21	SUBDIRS += color
		22	endif
		23
22	if BUILD_WACOM	24	if BUILD_WACOM
23	SUBDIRS += wacom	25	SUBDIRS += wacom
24	endif	26	endif
Lines 35-38 if BUILD_BLUETOOTH Link Here
35	SUBDIRS += bluetooth	37	SUBDIRS += bluetooth
36	endif	38	endif
37		39
		40	if BUILD_ONLINE_ACCOUNTS
		41	SUBDIRS += online-accounts
		42	endif
		43
38	-include $(top_srcdir)/git.mk	44	-include $(top_srcdir)/git.mk
39	-

Return to bug 463418

Lines 141-150 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 Link Here

(-)a/configure.ac (-17 / +90 lines)
141	gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)	141	gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
142	PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)	142	PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
143	PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)	143	PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
144	PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)	144
		145	build_online_accounts=false
		146	AC_ARG_ENABLE(goa,
		147	AC_HELP_STRING([--disable-goa],
		148	[disable online accounts management panel]),
		149	[case "${enableval}" in
		150	yes) WANT_ONLINE_ACCOUNTS=yes ;;
		151	no) WANT_ONLINE_ACCOUNTS=no ;;
		152	*) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
		153	esac],
		154	[WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
		155
		156	if test x$WANT_ONLINE_ACCOUNTS = xyes; then
		157	PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
		158	build_online_accounts=true
		159	fi
		160	AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
		161	AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
		162	AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
		163
145	PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1	164	PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
146	gnome-settings-daemon >= $GSD_REQUIRED_VERSION)	165	gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
147	PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)	166
		167	build_color=false
		168	AC_ARG_ENABLE(color,
		169	AC_HELP_STRING([--disable-color],
		170	[disable color management panel]),
		171	[case "${enableval}" in
		172	yes) WANT_COLOR=yes ;;
		173	no) WANT_COLOR=no ;;
		174	*) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
		175	esac],
		176	[WANT_COLOR=yes]) dnl Default value
		177
		178	if test x$WANT_COLOR = xyes; then
		179	PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
		180	build_color=true
		181	fi
		182	AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
		183	AC_SUBST(COLOR_PANEL_CFLAGS)
		184	AC_SUBST(COLOR_PANEL_LIBS)
		185
148	PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES	186	PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
149	polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)	187	polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
150	PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)	188	PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
Lines 189-205 if test x${have_networkmanager} = xyes; then Link Here
189	AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])	227	AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
190	fi	228	fi
191		229
192	# Check for gnome-bluetooth	230	have_bluetooth=false
193	PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,	231	AC_ARG_ENABLE(bluetooth,
194	[have_bluetooth=yes], have_bluetooth=no)	232	AC_HELP_STRING([--disable-bluetooth],
195	if test "x$have_bluetooth" = xyes ; then	233	[disable bluetooth management panel]),
196	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Network panel])	234	[case "${enableval}" in
197	fi	235	yes) WANT_BLUETOOTH=yes ;;
198	AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])	236	no) WANT_BLUETOOTH=no ;;
199	if test x${have_bluetooth} = xyes; then	237	*) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
200	AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])	238	esac],
		239	[WANT_BLUETOOTH=yes]) dnl Default value
		240
		241	if test x$WANT_BLUETOOTH = xyes; then
		242	# Check for gnome-bluetooth
		243	PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
		244	have_bluetooth=true
201	fi	245	fi
202		246
		247	AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
		248
		249
203	# Check for CUPS 1.4 or newer	250	# Check for CUPS 1.4 or newer
204	AC_ARG_ENABLE([cups],	251	AC_ARG_ENABLE([cups],
205	AS_HELP_STRING([--disable-cups], [disable CUPS support (default: enabled)]),,	252	AS_HELP_STRING([--disable-cups], [disable CUPS support (default: enabled)]),,
Lines 260-271 case $host_os in Link Here
260	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then	307	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
261	have_wacom=no	308	have_wacom=no
262	else	309	else
263	PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES	310	AC_ARG_ENABLE(wacom,
264	gnome-settings-daemon >= $GSD_REQUIRED_VERSION	311	AC_HELP_STRING([--disable-wacom],
265	xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION	312	[disable wacom management panel]),
266	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)	313	[case "${enableval}" in
267	AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])	314	yes) WANT_WACOM=yes ;;
268	have_wacom=yes	315	no) WANT_WACOM=no ;;
		316	*) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
		317	esac],
		318	[WANT_WACOM=yes]) dnl Default value
		319
		320	if test x$WANT_WACOM = xyes; then
		321	PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
		322	gnome-settings-daemon >= $GSD_REQUIRED_VERSION
		323	xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
		324	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
		325	have_wacom=yes
		326	fi
269	fi	327	fi
270	;;	328	;;
271	*)	329	*)
Lines 524-529 if test "x$have_bluetooth" = "xyes"; then Link Here
524	else	582	else
525	AC_MSG_NOTICE([ Bluetooth panel disabled])	583	AC_MSG_NOTICE([ Bluetooth panel disabled])
526	fi	584	fi
		585	if test "x$build_color" = "xtrue"; then
		586	AC_MSG_NOTICE([** colord (Color panel)])
		587	else
		588	AC_MSG_NOTICE([ Color panel disabled])
		589	fi
527	if test "x$enable_cups" = "xyes"; then	590	if test "x$enable_cups" = "xyes"; then
528	AC_MSG_NOTICE([** CUPS (Printers panel)])	591	AC_MSG_NOTICE([** CUPS (Printers panel)])
529	else	592	else
Lines 534-544 if test "x$have_cheese" = "xyes"; then Link Here
534	else	597	else
535	AC_MSG_NOTICE([ Users panel webcam support disabled])	598	AC_MSG_NOTICE([ Users panel webcam support disabled])
536	fi	599	fi
		600	if test "x$build_online_accounts" = "xtrue"; then
		601	AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
		602	else
		603	AC_MSG_NOTICE([ Online Accounts panel disabled])
		604	fi
537	if test "x$with_libsocialweb" = "xyes"; then	605	if test "x$with_libsocialweb" = "xyes"; then
538	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])	606	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
539	else	607	else
540	AC_MSG_NOTICE([ Background panel Flickr support disabled])	608	AC_MSG_NOTICE([ Background panel Flickr support disabled])
541	fi	609	fi
		610	if test "x$build_wacom" = "xtrue"; then
		611	AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
		612	else
		613	AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
		614	fi
542	if test "x$have_wacom" = "xyes"; then	615	if test "x$have_wacom" = "xyes"; then
543	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])	616	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
544	else	617	else