[gnome-control-center] build: libsmbclient is not optional



commit 8a7d987ab05ec9a9f414d608e443d99c0c00aa43
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Feb 8 19:36:57 2017 +0100

    build: libsmbclient is not optional
    
    As the printers panel is not optional either.

 configure.ac                |   11 ++---------
 panels/printers/Makefile.am |    3 +--
 2 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2069193..073a707 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,8 @@ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
                   libsoup-2.4
                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
 PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                  smbclient)
 PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -230,14 +231,6 @@ 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 fad9d09..3009a17 100644
--- a/panels/printers/Makefile.am
+++ b/panels/printers/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS =                                           \
        $(PANEL_CFLAGS)                                 \
        $(PRINTERS_PANEL_CFLAGS)                        \
        $(CUPS_CFLAGS)                                  \
-       $(SMBCLIENT_CFLAGS)                             \
        -I$(top_srcdir)/shell/                          \
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""        \
        -DTEST_SRCDIR=\""$(srcdir)/"\"                  \
@@ -54,7 +53,7 @@ libprinters_la_SOURCES =              \
        cc-printers-panel.h
 
 libprinters_la_CPPFLAGS = $(AM_CPPFLAGS)
-libprinters_la_LIBADD = $(PRINTERS_PANEL_LIBS) $(PANEL_LIBS) $(CUPS_LIBS) $(SMBCLIENT_LIBS) $(LIBM)
+libprinters_la_LIBADD = $(PRINTERS_PANEL_LIBS) $(PANEL_LIBS) $(CUPS_LIBS) $(LIBM)
 
 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]