diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2006-06-14 15:28:43 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2006-06-14 15:28:43 +0000 |
| commit | fe8d0ce8e594a8d362f3b034aa8d5240db8f09f0 (patch) | |
| tree | f14cca2f6bd83cb6e074dac0949dba694fae19f2 /configure.in | |
| parent | 1b8c3c439aca2b3849328666a0d022c1685b7bdf (diff) | |
Relevant BUGIDs:
Purpose of commit: cleanup
Commit summary:
---------------
2006-06-14 Thorsten Kukuk <kukuk@thkukuk.de>
* configure.in: Remove --enable-memory-debug, add option
to disable prelude if installed.
* modules/pam_tally/pam_tally.c: Remove MEMORY_DEBUG
* modules/pam_filter/upperLOWER/upperLOWER.c: Likewise.
* modules/pam_unix/unix_chkpwd.c: Likewise.
* libpam/include/security/_pam_types.h: Likewise.
* libpam/libpam.map: Remove LIBPAM_MALLOC_DEBUG export.
* libpam/pam_malloc.c: Remove file.
* libpam/Makefile.am: Remove pam_malloc.c and pam_malloc.h.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/configure.in b/configure.in index 2478d41a..23faeab6 100644 --- a/configure.in +++ b/configure.in @@ -180,9 +180,14 @@ dnl dnl options and defaults dnl -AM_PATH_LIBPRELUDE([0.9.0]) -if test "$LIBPRELUDE_CONFIG" != "no" ; then - LIBPRELUDE_CFLAGS="$LIBPRELUDE_CFLAGS -DPRELUDE=1" +AC_ARG_ENABLE([prelude], + AC_HELP_STRING([--disable-prelude],[do not use prelude]), + WITH_PRELUDE=$enableval, WITH_PRELUDE=yes) +if test "$WITH_PRELUDE" == "yes" ; then + AM_PATH_LIBPRELUDE([0.9.0]) + if test "$LIBPRELUDE_CONFIG" != "no" ; then + LIBPRELUDE_CFLAGS="$LIBPRELUDE_CFLAGS -DPRELUDE=1" + fi fi dnl lots of debugging information goes to /var/run/pam-debug.log @@ -194,23 +199,6 @@ AC_ARG_ENABLE([debug], WITH_DEBUG=no) AC_SUBST(WITH_DEBUG) -AC_ARG_ENABLE([memory-debug], - AC_HELP_STRING([--enable-memory-debug],[specify you want every malloc etc. call tracked]), - WITH_MEMORY_DEBUG=$enableval, WITH_MEMORY_DEBUG=no) -if test "$WITH_MEMORY_DEBUG" != "no" ; then - AC_DEFINE([MEMORY_DEBUG], 1, [Every malloc etc. call will be tracked]) -fi -AH_VERBATIM([_MEMORY_DEBUG], -[#ifdef MEMORY_DEBUG -/* - * this is basically a hack - we need to include a semiarbitrary - * number of headers to ensure that we don't get silly prototype/macro - */ -# include <string.h> -# include <stdlib.h> -# include <security/pam_malloc.h> -#endif /* MEMORY_DEBUG */]) - AC_ARG_ENABLE(securedir, [ --enable-securedir=<path to location of PAMs> [default \$libdir/security]], SECUREDIR=$enableval, SECUREDIR=$libdir/security) |