[gnome-initial-setup] configure: Use the .pc file for pwquality
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] configure: Use the .pc file for pwquality
- Date: Thu, 8 Nov 2012 22:44:08 +0000 (UTC)
commit 2ec7be459b42e0e36dd98311d798d55765daf037
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Nov 8 17:38:29 2012 -0500
configure: Use the .pc file for pwquality
configure.ac | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b841d39..2746624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,16 @@ 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
@@ -65,12 +75,6 @@ AC_SUBST(KRB5_LIBS)
INITIAL_SETUP_CFLAGS="$INITIAL_SETUP_CFLAGS $KRB5_CFLAGS"
INITIAL_SETUP_LIBS="$INITIAL_SETUP_LIBS $KRB5_LIBS"
-AC_CHECK_HEADER([pwquality.h], [have_pwquality=yes], [have_pwquality=no])
-AM_CONDITIONAL(HAVE_PWQUALITY, [test x$have_pwquality = xyes])
-if test x$have_pwquality = xyes ; then
- INITIAL_SETUP_LIBS="$INITIAL_SETUP_LIBS -lpwquality"
-fi
-
# This is a hard-dependency for the region and user-accounts panels
PKG_CHECK_MODULES(ISOCODES, iso-codes)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]