[gnome-control-center] build: Disable printers panel is libsmbclient.pc isn't found
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] build: Disable printers panel is libsmbclient.pc isn't found
- Date: Mon, 18 Feb 2013 08:46:13 +0000 (UTC)
commit 05e60169eafda37c363929e9298d62422f037816
Author: Jeremy Bicha <jbicha ubuntu com>
Date: Fri Feb 15 16:40:07 2013 -0500
build: Disable printers panel is libsmbclient.pc isn't found
https://bugzilla.gnome.org/show_bug.cgi?id=693923
configure.ac | 11 +++++++++--
panels/printers/Makefile.am | 3 ++-
2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dfe82d2..dcf6832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,8 +152,7 @@ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- smbclient)
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -213,6 +212,14 @@ if test x${have_bluetooth} = xyes; then
AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
fi
+# Check for smbclient
+PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])
+
+if test x"$have_smbclient" = x"no"; then
+ AC_MSG_WARN(*** Printer panel will not be built (smbclient.pc not found) ***)
+ enable_cups=no
+fi
+
# Check for CUPS 1.4 or newer
AC_ARG_ENABLE([cups],
AS_HELP_STRING([--disable-cups], [disable CUPS support (default: enabled)]),,
diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
index 6b05acc..bc7772c 100644
--- a/panels/printers/Makefile.am
+++ b/panels/printers/Makefile.am
@@ -3,6 +3,7 @@ cappletname = printers
INCLUDES = \
$(PANEL_CFLAGS) \
$(PRINTERS_PANEL_CFLAGS) \
+ $(SMBCLIENT_CFLAGS) \
-I$(top_srcdir)/shell/ \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
$(NULL)
@@ -44,7 +45,7 @@ libprinters_la_SOURCES = \
cc-printers-panel.c \
cc-printers-panel.h
-libprinters_la_LIBADD = $(PRINTERS_PANEL_LIBS) $(PANEL_LIBS) $(CUPS_LIBS)
+libprinters_la_LIBADD = $(PRINTERS_PANEL_LIBS) $(PANEL_LIBS) $(CUPS_LIBS) $(SMBCLIENT_LIBS)
resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies
$(srcdir)/printers.gresource.xml)
cc-printers-resources.c: printers.gresource.xml $(resource_files)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]