From 7e777e1793057d35f5e66d40bd89ba521593c250 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 1 Feb 2013 14:49:24 +0100 Subject: Cleanup configure.in. --- configure.in | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/configure.in b/configure.in index 51cea98..64e7a27 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([libpwquality], [1.2.1]) -AM_INIT_AUTOMAKE([-Wall]) -AC_PREREQ(2.61) AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip no-define -Wall]) +AC_PREREQ(2.61) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST @@ -50,7 +50,6 @@ fi dnl Localization support AM_GNU_GETTEXT_VERSION([0.15]) AM_GNU_GETTEXT([external]) -AC_CHECK_FUNCS(dngettext) AH_BOTTOM([#ifdef ENABLE_NLS #include #define _(msgid) dgettext(PACKAGE, msgid) @@ -141,6 +140,12 @@ AC_ARG_WITH(pythonsitedir, ]) AC_SUBST(PYTHONSITEDIR) +AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes)],[use specified random device instead of /dev/urandom]), opt_randomdev=$withval) +if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then + opt_randomdev="/dev/urandom" +fi +AC_DEFINE_UNQUOTED(CONF_PATH_RANDOMDEV, "$opt_randomdev", [Random device path.]) + dnl Check for cracklib AC_CHECK_HEADERS([crack.h], AC_CHECK_LIB([crack], [FascistCheck], LIBCRACK="-lcrack", LIBCRACK="")) @@ -149,18 +154,8 @@ if test x$LIBCRACK = x ; then fi AC_SUBST([LIBCRACK]) -AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes)],[use specified random device instead of /dev/urandom]), opt_randomdev=$withval) -if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then - opt_randomdev="/dev/urandom" -fi -AC_DEFINE_UNQUOTED(CONF_PATH_RANDOMDEV, "$opt_randomdev", [Random device path.]) - dnl Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN -AC_C_CONST - -dnl Checks for library functions. -AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol) dnl Files to be created from when we run configure AC_CONFIG_FILES([Makefile libpwquality.spec src/Makefile src/pwquality.pc po/Makefile.in python/Makefile -- cgit v1.2.1