[gnome-initial-setup] Require libpwquality



commit 4eca323d0856575404cd31d9f8ff4a81ace6f44d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sun Nov 25 21:32:29 2012 -0500

    Require libpwquality

 configure.ac                                  |   11 +----------
 gnome-initial-setup/pages/account/Makefile.am |    4 ----
 2 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5bc90a2..29ba2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ PKG_CHECK_MODULES(INITIAL_SETUP,
                   gtk+-3.0 >= $GTK_REQUIRED_VERSION
                   gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
                   gdm
+                  pwquality
                   egg-list-box-uninstalled)
 
 PKG_CHECK_MODULES(COPY_WORKER, gio-2.0)
@@ -59,16 +60,6 @@ if test x$have_clutter = xyes; then
   AC_DEFINE(HAVE_CLUTTER, 1, [Build with Clutter support?])
 fi
 
-PKG_CHECK_MODULES(PWQUALITY,
-                  pwquality,
-                  have_pwquality=yes, have_pwquality=no)
-AM_CONDITIONAL(HAVE_PWQUALITY, [test x$have_pwquality = xyes])
-if test x$have_pwquality = xyes; then
-  INITIAL_SETUP_CFLAGS="$INITIAL_SETUP_CFLAGS $PWQUALITY_CFLAGS"
-  INITIAL_SETUP_LIBS="$INITIAL_SETUP_LIBS $PWQUALITY_LIBS"
-  AC_DEFINE(HAVE_PWQUALITY, 1, [Build with libpwquality support?])
-fi
-
 # Kerberos kerberos support
 AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
 if test "$KRB5_CONFIG" = "no"; then
diff --git a/gnome-initial-setup/pages/account/Makefile.am b/gnome-initial-setup/pages/account/Makefile.am
index 6902734..05d034b 100644
--- a/gnome-initial-setup/pages/account/Makefile.am
+++ b/gnome-initial-setup/pages/account/Makefile.am
@@ -1,11 +1,7 @@
 
 NULL =
 
-if HAVE_PWQUALITY
 pw_utils_sources = pw-utils-pwquality.c pw-utils.h
-else
-pw_utils_sources = pw-utils.c pw-utils.h
-endif
 
 noinst_LTLIBRARIES = libgisaccount.la
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]