From ac220324b28a5197daf8a9db2dc9b4072da141fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Tue, 9 Mar 2010 17:52:12 +0000 Subject: [PATCH] modernize further git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@430 185d5e19-27fe-0310-9dcf-9bff6b9f3609 --- configure.ac | 115 ++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 61 deletions(-) diff --git a/configure.ac b/configure.ac index bc5aff8..aac0d41 100644 --- a/configure.ac +++ b/configure.ac @@ -1,114 +1,107 @@ dnl $Id$ -AC_PREREQ(2.59) +AC_PREREQ([2.62]) AC_REVISION([$Id$]) -AC_INIT([OpenPAM],[trunk],[des@des.no]) +AC_INIT([OpenPAM], [trunk], [des@des.no]) AC_CONFIG_SRCDIR([lib/pam_start.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER([config.h]) -LT_PREREQ([2.2.6]) -LT_INIT([disable-static dlopen]) - +# C compiler and features AC_LANG(C) -AC_C_VOLATILE - AC_PROG_CC AC_PROG_CC_STDC AC_PROG_CPP +AC_GNU_SOURCE +AC_C_CONST +AC_C_RESTRICT +AC_C_VOLATILE + +# libtool +LT_PREREQ([2.2.6]) +LT_INIT([disable-static dlopen]) + +# other programs AC_PROG_INSTALL LIB_MAJ=2 AC_SUBST(LIB_MAJ) AC_DEFINE_UNQUOTED(LIB_MAJ, $LIB_MAJ, [OpenPAM library major number]) -AC_ARG_ENABLE(debug, +AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [turn debugging on by default]), AC_DEFINE(OPENPAM_DEBUG, 1, [Turn debugging on by default])) -AC_MSG_CHECKING([whether loading unversioned modules support is enabled]) -AC_ARG_ENABLE(unversioned-modules, +AC_ARG_ENABLE([unversioned-modules], AC_HELP_STRING([--disable-unversioned-modules], [support loading of unversioned modules]), - [if test "$enableval" = "no"; then + [AS_IF([test x"$enableval" = x"no"], [ AC_DEFINE(DISABLE_UNVERSIONED_MODULES, 1, [Whether loading unversioned modules support is disabled]) - fi - AC_MSG_RESULT(no)], - AC_MSG_RESULT(yes)) + ])]) -AC_MSG_CHECKING([for modules directory support]) -AC_ARG_WITH(modules-dir, +AC_ARG_WITH([modules-dir], AC_HELP_STRING([--with-modules-dir=DIR], [OpenPAM modules directory]), - [if test "$withval" != "no"; then + [AS_IF([test x"$withval" != x"no"], [ OPENPAM_MODULES_DIR="$withval" AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR, "$OPENPAM_MODULES_DIR", [OpenPAM modules directory]) - AC_MSG_RESULT($OPENPAM_MODULES_DIR) - else + ], [ OPENPAM_MODULES_DIR="$libdir" - AC_MSG_RESULT(no) - fi], - [OPENPAM_MODULES_DIR="$libdir" - AC_MSG_RESULT(no)]) + ])], + [OPENPAM_MODULES_DIR="$libdir"]) AC_SUBST(OPENPAM_MODULES_DIR) -AC_MSG_CHECKING([whether to build the documentation]) -AC_ARG_WITH(doc, - AC_HELP_STRING([--with-doc], - [build documentation]), - , +AC_ARG_WITH([doc], + AC_HELP_STRING([--with-doc], [build documentation]), + [], [with_doc=yes]) -AC_MSG_RESULT($with_doc) +AM_CONDITIONAL([WITH_DOC], [test x"$with_doc" = x"yes"]) -AC_MSG_CHECKING([whether to build example version of pam_unix.so]) -AC_ARG_WITH(pam-unix, - AC_HELP_STRING([--with-pam-unix], - [compile example version of pam_unix.so]), - , +AC_ARG_WITH([pam-unix], + AC_HELP_STRING([--with-pam-unix], [compile example version of pam_unix.so]), + [], [with_pam_unix=no]) -AC_MSG_RESULT($with_pam_unix) +AM_CONDITIONAL([WITH_PAM_UNIX], [test x"$with_pam_unix" = x"yes"]) -AC_MSG_CHECKING([whether to build example version of su(1)]) AC_ARG_WITH(su, - AC_HELP_STRING([--with-su], - [compile example version of su(1)]), - , + AC_HELP_STRING([--with-su], [compile example version of su(1)]), + [], [with_su=no]) -AC_MSG_RESULT($with_su) +AM_CONDITIONAL([WITH_SU], [test x"$with_su" = x"yes"]) -AM_CONDITIONAL(WITH_DOC, test "x$with_doc" = "xyes") -AM_CONDITIONAL(WITH_PAM_UNIX, test "x$with_pam_unix" = "xyes") -AM_CONDITIONAL(WITH_SU, test "x$with_su" = "xyes") +AC_CHECK_HEADERS([crypt.h]) -AC_CHECK_HEADERS(crypt.h) +AC_CHECK_FUNCS([fpurge]) -AC_CHECK_FUNCS(fpurge) - -DL_LIBS= -AC_CHECK_LIB(dl, dlopen, DL_LIBS=-ldl) +saved_LIBS="${LIBS}" +LIBS="" +AC_CHECK_LIB([dl], [dlopen]) +DL_LIBS="${LIBS}" +LIBS="${saved_LIBS}" AC_SUBST(DL_LIBS) -CRYPT_LIBS= -AC_CHECK_LIB(crypt, crypt, CRYPT_LIBS=-lcrypt) +saved_LIBS="${LIBS}" +LIBS="" +AC_CHECK_LIB([crypt], [crypt]) +CRYPT_LIBS="${LIBS}" +LIBS="${saved_LIBS}" AC_SUBST(CRYPT_LIBS) -CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - -AC_ARG_ENABLE(developer-warnings, - AS_HELP_STRING([--enable-developer-warnings],[enable strict warnings (default is NO)]), - CFLAGS="${CFLAGS} -Wall -Wextra") -AC_ARG_ENABLE(debugging-symbols, - AS_HELP_STRING([--enable-debugging-symbols],[enable debugging symbols (default is NO)]), - CFLAGS="${CFLAGS} -O0 -g -fno-inline") -AC_ARG_ENABLE(werror, - AS_HELP_STRING([--enable-werror],[use -Werror (default is NO)]), - CFLAGS="${CFLAGS} -Werror") +AC_ARG_ENABLE([developer-warnings], + AS_HELP_STRING([--enable-developer-warnings], [enable strict warnings (default is NO)]), + [CFLAGS="${CFLAGS} -Wall -Wextra"]) +AC_ARG_ENABLE([debugging-symbols], + AS_HELP_STRING([--enable-debugging-symbols], [enable debugging symbols (default is NO)]), + [CFLAGS="${CFLAGS} -O0 -g -fno-inline"]) +AC_ARG_ENABLE([werror], + AS_HELP_STRING([--enable-werror], [use -Werror (default is NO)]), + [CFLAGS="${CFLAGS} -Werror"]) AC_CONFIG_FILES([ bin/Makefile