Attachment #343824 for bug #463856




                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
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 >= $COLORD_REQUIRED_VERSION
		colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
		gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
	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)

fi
AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")

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 smbclient
PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])


    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 2-12 Link Here

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

Return to bug 463856

Lines 143-155 Link Here

(-)configure.ac.old (-20 / +92 lines)
143	gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)	143	gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
144	PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)	144	PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
145	PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)	145	PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
146	PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)	146
		147	build_online_accounts=false
		148	AC_ARG_ENABLE(goa,
		149	AC_HELP_STRING([--disable-goa],
		150	[disable online accounts management panel]),
		151	[case "${enableval}" in
		152	yes) WANT_ONLINE_ACCOUNTS=yes ;;
		153	no) WANT_ONLINE_ACCOUNTS=no ;;
		154	*) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
		155	esac],
		156	[WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
		157
		158	if test x$WANT_ONLINE_ACCOUNTS = xyes; then
		159	PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
		160	build_online_accounts=true
		161	fi
		162	AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
		163	AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
		164	AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
		165
147	PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1	166	PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
148	gnome-settings-daemon >= $GSD_REQUIRED_VERSION)	167	gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
149	PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES	168
150	colord >= $COLORD_REQUIRED_VERSION	169	build_color=false
151	colord-gtk >= $COLORD_GTK_REQUIRED_VERSION	170	AC_ARG_ENABLE(color,
152	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)	171	AC_HELP_STRING([--disable-color],
		172	[disable color management panel]),
		173	[case "${enableval}" in
		174	yes) WANT_COLOR=yes ;;
		175	no) WANT_COLOR=no ;;
		176	*) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
		177	esac],
		178	[WANT_COLOR=yes]) dnl Default value
		179
		180	if test x$WANT_COLOR = xyes; then
		181	PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
		182	colord >= $COLORD_REQUIRED_VERSION
		183	colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
		184	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
		185	build_color=true
		186	fi
		187	AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
		188	AC_SUBST(COLOR_PANEL_CFLAGS)
		189	AC_SUBST(COLOR_PANEL_LIBS)
		190
153	PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES	191	PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
154	polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)	192	polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
155	PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)	193	PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
Lines 210-226 Link Here
210	fi	248	fi
211	AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")	249	AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
212		250
213	# Check for gnome-bluetooth	251	have_bluetooth=false
214	PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,	252	AC_ARG_ENABLE(bluetooth,
215	[have_bluetooth=yes], have_bluetooth=no)	253	AC_HELP_STRING([--disable-bluetooth],
216	if test "x$have_bluetooth" = xyes ; then	254	[disable bluetooth management panel]),
217	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])	255	[case "${enableval}" in
218	fi	256	yes) WANT_BLUETOOTH=yes ;;
219	AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])	257	no) WANT_BLUETOOTH=no ;;
220	if test x${have_bluetooth} = xyes; then	258	*) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
221	AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])	259	esac],
		260	[WANT_BLUETOOTH=yes]) dnl Default value
		261
		262	if test x$WANT_BLUETOOTH = xyes; then
		263	# Check for gnome-bluetooth
		264	PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
		265	have_bluetooth=true
222	fi	266	fi
223		267
		268	AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
		269
224	# Check for smbclient	270	# Check for smbclient
225	PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])	271	PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])
226		272
Lines 289-300 Link Here
289	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then	335	if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
290	have_wacom=no	336	have_wacom=no
291	else	337	else
292	PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES	338	AC_ARG_ENABLE(wacom,
293	gnome-settings-daemon >= $GSD_REQUIRED_VERSION	339	AC_HELP_STRING([--disable-wacom],
294	xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION	340	[disable wacom management panel]),
295	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)	341	[case "${enableval}" in
296	AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])	342	yes) WANT_WACOM=yes ;;
297	have_wacom=yes	343	no) WANT_WACOM=no ;;
		344	*) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
		345	esac],
		346	[WANT_WACOM=yes]) dnl Default value
		347
		348	if test x$WANT_WACOM = xyes; then
		349	PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
		350	gnome-settings-daemon >= $GSD_REQUIRED_VERSION
		351	xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
		352	gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
		353	have_wacom=yes
		354	fi
298	fi	355	fi
299	;;	356	;;
300	*)	357	*)
Lines 555-560 Link Here
555	else	612	else
556	AC_MSG_NOTICE([ Bluetooth panel disabled])	613	AC_MSG_NOTICE([ Bluetooth panel disabled])
557	fi	614	fi
		615	if test "x$build_color" = "xtrue"; then
		616	AC_MSG_NOTICE([** colord (Color panel)])
		617	else
		618	AC_MSG_NOTICE([ Color panel disabled])
		619	fi
558	if test "x$enable_cups" = "xyes"; then	620	if test "x$enable_cups" = "xyes"; then
559	AC_MSG_NOTICE([** CUPS (Printers panel)])	621	AC_MSG_NOTICE([** CUPS (Printers panel)])
560	else	622	else
Lines 565-575 Link Here
565	else	627	else
566	AC_MSG_NOTICE([ Users panel webcam support disabled])	628	AC_MSG_NOTICE([ Users panel webcam support disabled])
567	fi	629	fi
		630	if test "x$build_online_accounts" = "xtrue"; then
		631	AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
		632	else
		633	AC_MSG_NOTICE([ Online Accounts panel disabled])
		634	fi
568	if test "x$with_libsocialweb" = "xyes"; then	635	if test "x$with_libsocialweb" = "xyes"; then
569	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])	636	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
570	else	637	else
571	AC_MSG_NOTICE([ Background panel Flickr support disabled])	638	AC_MSG_NOTICE([ Background panel Flickr support disabled])
572	fi	639	fi
		640	if test "x$build_wacom" = "xtrue"; then
		641	AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
		642	else
		643	AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
		644	fi
573	if test "x$have_wacom" = "xyes"; then	645	if test "x$have_wacom" = "xyes"; then
574	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])	646	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
575	else	647	else