diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | _pam_aconf.h.in | 294 | ||||
| -rwxr-xr-x | configure | 115 | ||||
| -rw-r--r-- | configure.in | 80 |
4 files changed, 367 insertions, 123 deletions
@@ -66,6 +66,7 @@ BerliOS Bugs are marked with (BerliOS #XXXX). or /etc/default/login (kukuk) * configure/pam_strerror: Remove old ugly-hack option for pam_strerror interface change (kukuk) +* configure.in: Fix AC_DEFINE usage for autoheader (kukuk) 0.80: Wed Jul 13 13:23:20 CEST 2005 * pam_tally: test for NULL data before dereferencing them (t8m) diff --git a/_pam_aconf.h.in b/_pam_aconf.h.in index 08a9ac8f..9a26de62 100644 --- a/_pam_aconf.h.in +++ b/_pam_aconf.h.in @@ -1,97 +1,259 @@ -/* - * $Id$ - * - * - */ - -#ifndef PAM_ACONF_H -#define PAM_ACONF_H +/* _pam_aconf.h.in. Generated from configure.in by autoheader. */ /* lots of stuff gets written to /tmp/pam-debug.log */ #undef DEBUG -/* build libraries with different names (suffixed with 'd') */ -#undef WITH_LIBDEBUG +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#undef GETGROUPS_T -/* provide a global locking facility within libpam */ -#undef PAM_LOCKING +/* Define to 1 if you have the <crypt.h> header file. */ +#undef HAVE_CRYPT_H -/* GNU systems as a class, all have the feature.h file */ +/* Define to 1 if you have the <db.h> header file. */ +#undef HAVE_DB_H + +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. + */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the <fcntl.h> header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the <features.h> header file. */ #undef HAVE_FEATURES_H -#ifdef HAVE_FEATURES_H -# define _SVID_SOURCE -# define _BSD_SOURCE -# define _GNU_SOURCE -# include <features.h> -#endif /* HAVE_FEATURES_H */ -/* we have libcrack available */ +/* Define to 1 if you have the `getgrgid_r' function. */ +#undef HAVE_GETGRGID_R + +/* Define to 1 if you have the `getgrnam_r' function. */ +#undef HAVE_GETGRNAM_R + +/* Define to 1 if you have the `getgrouplist' function. */ +#undef HAVE_GETGROUPLIST + +/* Define to 1 if you have the `gethostname' function. */ +#undef HAVE_GETHOSTNAME + +/* Define to 1 if you have the `getpwnam_r' function. */ +#undef HAVE_GETPWNAM_R + +/* Define to 1 if you have the `getpwuid_r' function. */ +#undef HAVE_GETPWUID_R + +/* Define to 1 if you have the `getspnam_r' function. */ +#undef HAVE_GETSPNAM_R + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* Define to 1 if you have the <inittypes.h> header file. */ +#undef HAVE_INITTYPES_H + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <lastlog.h> header file. */ +#undef HAVE_LASTLOG_H + +/* Define to 1 if you have the `crack' library (-lcrack). */ #undef HAVE_LIBCRACK -/* we have libcrypt - its not part of libc (do we need both definitions?) */ +/* Define to 1 if you have the `crypt' library (-lcrypt). */ #undef HAVE_LIBCRYPT -#undef HAVE_CRYPT_H -/* we have libndbm and/or libdb */ -#undef HAVE_DB_H -#undef HAVE_NDBM_H +/* Define to 1 if you have the `db' library (-ldb). */ +#undef HAVE_LIBDB -/* have libfl (Flex) */ +/* Define to 1 if you have the `fl' library (-lfl). */ #undef HAVE_LIBFL -/* have libnsl - instead of libc support */ +/* Define to 1 if you have the `fl' library (-lfl). */ +#undef HAVE_LIBFLEX + +/* Define to 1 if you have the `l' library (-ll). */ +#undef HAVE_LIBLEX + +/* Define to 1 if you have the `ndbm' library (-lndbm). */ +#undef HAVE_LIBNDBM + +/* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL -/* have libpwdb - don't expect this to be important for much longer */ +/* Define to 1 if you have the `pwdb' library (-lpwdb). */ #undef HAVE_LIBPWDB -/* have libselinux - SELinux is Linux special */ +/* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBSELINUX -/* have gethostname() declared */ -#undef HAVE_GETHOSTNAME +/* Define to 1 if you have the `util' library (-lutil). */ +#undef HAVE_LIBUTIL -#undef HAVE_GETTIMEOFDAY +/* Define to 1 if you have the <limits.h> header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the <malloc.h> header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mkdir' function. */ #undef HAVE_MKDIR + +/* Define to 1 if you have the <ndbm.h> header file. */ +#undef HAVE_NDBM_H + +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the <paths.h> header file. */ +#undef HAVE_PATHS_H + +/* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcspn' function. */ #undef HAVE_STRCSPN + +/* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP + +/* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strspn' function. */ #undef HAVE_STRSPN + +/* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR + +/* Define to 1 if you have the `strtol' function. */ #undef HAVE_STRTOL + +/* Define to 1 if you have the <syslog.h> header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. + */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the <sys/file.h> header file. */ +#undef HAVE_SYS_FILE_H + +/* Define to 1 if you have the <sys/fsuid.h> header file. */ +#undef HAVE_SYS_FSUID_H + +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +#undef HAVE_SYS_IOCTL_H + +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. + */ +#undef HAVE_SYS_NDIR_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/time.h> header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the <termio.h> header file. */ +#undef HAVE_TERMIO_H + +/* Define to 1 if you have the `uname' function. */ #undef HAVE_UNAME -/* Define if reentrant declarations of standard nss functions are available */ -#undef HAVE_GETPWNAM_R -#undef HAVE_GETPWUID_R -#undef HAVE_GETSPNAM_R -#undef HAVE_GETGRNAM_R -#undef HAVE_GETGRGID_R -#undef HAVE_GETGROUPLIST +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H -/* ugly hack to partially support old pam_strerror syntax */ -#undef UGLY_HACK_FOR_PRIOR_BEHAVIOR_SUPPORT +/* Define to 1 if you have the <utmpx.h> header file. */ +#undef HAVE_UTMPX_H -/* read both confs - read /etc/pam.d and /etc/pam.conf in serial */ -#undef PAM_READ_BOTH_CONFS +/* Define to 1 if you have the <utmp.h> header file. */ +#undef HAVE_UTMP_H -#undef HAVE_PATHS_H -#ifdef HAVE_PATHS_H -#include <paths.h> -#endif -/* location of the mail spool directory */ +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Every malloc etc. call will be tracked */ +#undef MEMORY_DEBUG + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* libpam should observe a global authentication lock */ +#undef PAM_LOCKING + +/* Path where mails are stored */ #undef PAM_PATH_MAILDIR -/* where should we include setfsuid's prototype from? If this is not - defined, we get it from unistd.h */ -#undef HAVE_SYS_FSUID_H +/* read both /etc/pam.d and /etc/pam.conf files */ +#undef PAM_READ_BOTH_CONFS -/* Do we have inttypes.h for uint32_t */ -#undef HAVE_INTTYPES_H +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#undef TIME_WITH_SYS_TIME + +/* Define to 1 if your <sys/time.h> declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* build libraries with different names (suffixed with 'd') */ +#undef WITH_LIBDEBUG + +/* Build with prelude ids support */ +#undef WITH_PRELUDE + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#undef YYTEXT_POINTER + +/* GNU systems as a class, all have the feature.h file */ +#ifdef HAVE_FEATURES_H +# define _SVID_SOURCE +# define _BSD_SOURCE +# define _GNU_SOURCE +# include <features.h> +#endif /* HAVE_FEATURES_H */ -/* track all memory allocations and liberations */ -#undef MEMORY_DEBUG #ifdef MEMORY_DEBUG /* * this is basically a hack - we need to include a semiarbitrary @@ -103,8 +265,24 @@ # include <security/pam_malloc.h> #endif /* MEMORY_DEBUG */ -/* the path, relative to SECUREDIR, where PAMs specific to this architecture - * can be found */ +/* Define to the path, relative to SECUREDIR, where PAMs specific to this + architecture can be found. */ #undef _PAM_ISA -#endif /* PAM_ACONF_H */ +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `int' if <sys/types.h> doesn't define. */ +#undef gid_t + +/* Define to `long' if <sys/types.h> does not define. */ +#undef off_t + +/* Define to `int' if <sys/types.h> does not define. */ +#undef pid_t + +/* Define to `unsigned' if <sys/types.h> does not define. */ +#undef size_t + +/* Define to `int' if <sys/types.h> doesn't define. */ +#undef uid_t @@ -1323,14 +1323,6 @@ LIBPAM_VERSION_MINOR=81 -cat >>confdefs.h <<\_ACEOF -#define LIBPAM_VERSION_MAJOR 1 -_ACEOF - -cat >>confdefs.h <<\_ACEOF -#define LIBPAM_VERSION_MINOR 1 -_ACEOF - @@ -2747,8 +2739,9 @@ fi # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" - WITH_DEBUG=yes ; cat >>confdefs.h <<\_ACEOF -#define DEBUG 1 + WITH_DEBUG=yes ; +cat >>confdefs.h <<\_ACEOF +#define DEBUG _ACEOF else @@ -2759,8 +2752,9 @@ fi; # Check whether --enable-memory-debug or --disable-memory-debug was given. if test "${enable_memory_debug+set}" = set; then enableval="$enable_memory_debug" - WITH_MEMORY_DEBUG=yes ; cat >>confdefs.h <<\_ACEOF -#define MEMORY_DEBUG 1 + WITH_MEMORY_DEBUG=yes ; +cat >>confdefs.h <<\_ACEOF +#define MEMORY_DEBUG _ACEOF else @@ -2768,11 +2762,14 @@ else fi; + + # Check whether --enable-libdebug or --disable-libdebug was given. if test "${enable_libdebug+set}" = set; then enableval="$enable_libdebug" - WITH_LIBDEBUG=yes ; cat >>confdefs.h <<\_ACEOF -#define WITH_LIBDEBUG 1 + WITH_LIBDEBUG=yes ; +cat >>confdefs.h <<\_ACEOF +#define WITH_LIBDEBUG _ACEOF else @@ -2783,8 +2780,9 @@ fi; # Check whether --enable-prelude or --disable-prelude was given. if test "${enable_prelude+set}" = set; then enableval="$enable_prelude" - WITH_PRELUDE=yes ; cat >>confdefs.h <<\_ACEOF -#define WITH_PRELUDE 1 + WITH_PRELUDE=yes ; +cat >>confdefs.h <<\_ACEOF +#define WITH_PRELUDE _ACEOF else @@ -2872,8 +2870,9 @@ fi; # Check whether --enable-pamlocking or --disable-pamlocking was given. if test "${enable_pamlocking+set}" = set; then enableval="$enable_pamlocking" - WITH_PAMLOCKING=yes ; cat >>confdefs.h <<\_ACEOF -#define PAM_LOCKING 1 + WITH_PAMLOCKING=yes ; +cat >>confdefs.h <<\_ACEOF +#define PAM_LOCKING _ACEOF else @@ -2884,8 +2883,9 @@ fi; # Check whether --enable-read-both-confs or --disable-read-both-confs was given. if test "${enable_read_both_confs+set}" = set; then enableval="$enable_read_both_confs" - cat >>confdefs.h <<\_ACEOF -#define PAM_READ_BOTH_CONFS 1 + +cat >>confdefs.h <<\_ACEOF +#define PAM_READ_BOTH_CONFS _ACEOF fi; @@ -3617,6 +3617,7 @@ fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi + cat >>confdefs.h <<_ACEOF #define PAM_PATH_MAILDIR $pam_mail_spool _ACEOF @@ -3901,8 +3902,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_crack_FascistCheck" >&5 echo "${ECHO_T}$ac_cv_lib_crack_FascistCheck" >&6 if test $ac_cv_lib_crack_FascistCheck = yes; then - HAVE_LIBCRACK=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBCRACK 1 + HAVE_LIBCRACK=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBCRACK _ACEOF else @@ -3976,8 +3979,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 if test $ac_cv_lib_crypt_crypt = yes; then - HAVE_LIBCRYPT=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBCRYPT 1 + HAVE_LIBCRYPT=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBCRYPT _ACEOF else @@ -4050,8 +4055,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5 echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6 if test $ac_cv_lib_util_logwtmp = yes; then - HAVE_LIBUTIL=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUTIL 1 + HAVE_LIBUTIL=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUTIL _ACEOF else @@ -4124,8 +4131,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_ndbm_dbm_store" >&5 echo "${ECHO_T}$ac_cv_lib_ndbm_dbm_store" >&6 if test $ac_cv_lib_ndbm_dbm_store = yes; then - HAVE_LIBNDBM=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBNDBM 1 + HAVE_LIBNDBM=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBNDBM _ACEOF else @@ -4198,8 +4207,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_db_dbm_store" >&5 echo "${ECHO_T}$ac_cv_lib_db_dbm_store" >&6 if test $ac_cv_lib_db_dbm_store = yes; then - HAVE_LIBDB=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDB 1 + HAVE_LIBDB=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBDB _ACEOF else @@ -4272,8 +4283,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_create" >&5 echo "${ECHO_T}$ac_cv_lib_db_db_create" >&6 if test $ac_cv_lib_db_db_create = yes; then - HAVE_LIBDB=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBDB 1 + HAVE_LIBDB=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBDB _ACEOF else @@ -4349,8 +4362,10 @@ echo "${ECHO_T}$ac_cv_lib_fl_yylex" >&6 if test $ac_cv_lib_fl_yylex = yes; then yyterminate else - HAVE_LIBFL=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBFL 1 + HAVE_LIBFL=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBFL _ACEOF fi @@ -4421,8 +4436,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_maplist" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_yp_maplist" >&6 if test $ac_cv_lib_nsl_yp_maplist = yes; then - HAVE_LIBNSL=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBNSL 1 + HAVE_LIBNSL=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBNSL _ACEOF else @@ -4496,8 +4513,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getfilecon" >&5 echo "${ECHO_T}$ac_cv_lib_selinux_getfilecon" >&6 if test $ac_cv_lib_selinux_getfilecon = yes; then - HAVE_LIBSELINUX=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBSELINUX 1 + HAVE_LIBSELINUX=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBSELINUX _ACEOF else @@ -4577,8 +4596,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_pwdb_pwdb_db_name" >&5 echo "${ECHO_T}$ac_cv_lib_pwdb_pwdb_db_name" >&6 if test $ac_cv_lib_pwdb_pwdb_db_name = yes; then - HAVE_LIBPWDB=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBPWDB 1 + HAVE_LIBPWDB=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBPWDB _ACEOF else @@ -4653,8 +4674,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5 echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6 if test $ac_cv_lib_fl_yywrap = yes; then - HAVE_LIBFLEX=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBFLEX 1 + HAVE_LIBFLEX=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBFLEX _ACEOF else @@ -4727,8 +4750,10 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5 echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6 if test $ac_cv_lib_l_yywrap = yes; then - HAVE_LIBLEX=yes ; cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBLEX 1 + HAVE_LIBLEX=yes ; + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBLEX _ACEOF else @@ -5617,6 +5642,8 @@ done + + for ac_header in crypt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.in b/configure.in index 9012b30a..36822017 100644 --- a/configure.in +++ b/configure.in @@ -13,8 +13,6 @@ LIBPAM_VERSION_MINOR=81 AC_SUBST(LIBPAM_VERSION_MAJOR) AC_SUBST(LIBPAM_VERSION_MINOR) -AC_DEFINE(LIBPAM_VERSION_MAJOR) -AC_DEFINE(LIBPAM_VERSION_MINOR) dnl dnl By default, everything under PAM is installed under the root fs. @@ -63,24 +61,40 @@ dnl dnl lots of debugging information goes to /tmp/pam-debug.log AC_ARG_ENABLE(debug, [ --enable-debug specify you are building with debugging on], - WITH_DEBUG=yes ; AC_DEFINE(DEBUG) , WITH_DEBUG=no) + WITH_DEBUG=yes ; AC_DEFINE([DEBUG],, + [lots of stuff gets written to /tmp/pam-debug.log]), + WITH_DEBUG=no) AC_SUBST(WITH_DEBUG) AC_ARG_ENABLE(memory-debug, [ --enable-memory-debug specify you want every malloc etc. call tracked], - WITH_MEMORY_DEBUG=yes ; AC_DEFINE(MEMORY_DEBUG) , WITH_MEMORY_DEBUG=no) + WITH_MEMORY_DEBUG=yes ; AC_DEFINE([MEMORY_DEBUG],, + [Every malloc etc. call will be tracked]) , WITH_MEMORY_DEBUG=no) AC_SUBST(WITH_MEMORY_DEBUG) +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 + * confusion. + */ +# include <string.h> +# include <stdlib.h> +# include <security/pam_malloc.h> +#endif /* MEMORY_DEBUG */]) dnl build specially named libraries (for debugging purposes) AC_ARG_ENABLE(libdebug, [ --enable-libdebug specify you are building debugging libraries], - WITH_LIBDEBUG=yes ; AC_DEFINE(WITH_LIBDEBUG) , WITH_LIBDEBUG=no) + WITH_LIBDEBUG=yes ; AC_DEFINE([WITH_LIBDEBUG],, + [build libraries with different names (suffixed with 'd')]) , WITH_LIBDEBUG=no) AC_SUBST(WITH_LIBDEBUG) dnl have prelude support AC_ARG_ENABLE(prelude, [ --enable-prelude build prelude ids support], - WITH_PRELUDE=yes ; AC_DEFINE(WITH_PRELUDE), WITH_PRELUDE=no) + WITH_PRELUDE=yes ; AC_DEFINE([WITH_PRELUDE],, + [Build with prelude ids support]), WITH_PRELUDE=no) AC_SUBST(WITH_PRELUDE) dnl packaging convenience @@ -128,12 +142,15 @@ AC_SUBST(MANDIR) AC_ARG_ENABLE(pamlocking, [ --enable-pamlocking configure libpam to observe a global authentication lock], - WITH_PAMLOCKING=yes ; AC_DEFINE(PAM_LOCKING) , WITH_PAMLOCKING=no) + WITH_PAMLOCKING=yes ; AC_DEFINE([PAM_LOCKING],, + [libpam should observe a global authentication lock]), + WITH_PAMLOCKING=no) AC_SUBST(WITH_PAMLOCKING) AC_ARG_ENABLE(read-both-confs, [ --enable-read-both-confs read both /etc/pam.d and /etc/pam.conf files], - AC_DEFINE(PAM_READ_BOTH_CONFS)) + AC_DEFINE([PAM_READ_BOTH_CONFS],, + [read both /etc/pam.d and /etc/pam.conf files])) AC_SUBST(PAM_READ_BOTH_CONFS) AC_ARG_ENABLE(static-libpam, [ --enable-static-libpam build a libpam.a library], @@ -178,7 +195,8 @@ exit(1); pam_mail_spool="\"/var/spool/mail\"", pam_mail_spool="\"/var/spool/mail\"") fi -AC_DEFINE_UNQUOTED(PAM_PATH_MAILDIR, $pam_mail_spool) +AC_DEFINE_UNQUOTED(PAM_PATH_MAILDIR, $pam_mail_spool, + [Path where mails are stored]) dnl Checks for libraries. AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc) @@ -196,34 +214,43 @@ dnl dnl At least on Solaris, the existing libcrack must be dynamic. dnl Ought to introduce a check for this. dnl -AC_CHECK_LIB(crack, FascistCheck, HAVE_LIBCRACK=yes ; AC_DEFINE(HAVE_LIBCRACK), +AC_CHECK_LIB(crack, FascistCheck, HAVE_LIBCRACK=yes ; + AC_DEFINE([HAVE_LIBCRACK],,[Define to 1 if you have the `crack' library (-lcrack).]), HAVE_LIBCRACK=no) AC_SUBST(HAVE_LIBCRACK) -AC_CHECK_LIB(crypt, crypt, HAVE_LIBCRYPT=yes ; AC_DEFINE(HAVE_LIBCRYPT), +AC_CHECK_LIB(crypt, crypt, HAVE_LIBCRYPT=yes ; + AC_DEFINE([HAVE_LIBCRYPT],,[Define to 1 if you have the `crypt' library (-lcrypt).]), HAVE_LIBCRYPT=no) AC_SUBST(HAVE_LIBCRYPT) -AC_CHECK_LIB(util, logwtmp, HAVE_LIBUTIL=yes ; AC_DEFINE(HAVE_LIBUTIL), +AC_CHECK_LIB(util, logwtmp, HAVE_LIBUTIL=yes ; + AC_DEFINE([HAVE_LIBUTIL],,[Define to 1 if you have the `util' library (-lutil).]), HAVE_LIBUTIL=no) AC_SUBST(HAVE_LIBUTIL) -AC_CHECK_LIB(ndbm, dbm_store, HAVE_LIBNDBM=yes ; AC_DEFINE(HAVE_LIBNDBM), +AC_CHECK_LIB(ndbm, dbm_store, HAVE_LIBNDBM=yes ; + AC_DEFINE([HAVE_LIBNDBM],,[Define to 1 if you have the `ndbm' library (-lndbm).]), HAVE_LIBNDBM=no) AC_SUBST(HAVE_LIBNDBM) -AC_CHECK_LIB(db, dbm_store, HAVE_LIBDB=yes ; AC_DEFINE(HAVE_LIBDB), +AC_CHECK_LIB(db, dbm_store, HAVE_LIBDB=yes ; + AC_DEFINE([HAVE_LIBDB],,[Define to 1 if you have the `db' library (-ldb).]), HAVE_LIBDB=no) if test x$HAVE_LIBDB != xyes ; then - AC_CHECK_LIB(db, db_create, HAVE_LIBDB=yes ; AC_DEFINE(HAVE_LIBDB), + AC_CHECK_LIB(db, db_create, HAVE_LIBDB=yes ; + AC_DEFINE([HAVE_LIBDB],,[Define to 1 if you have the `db' library (-ldb).]), HAVE_LIBDB=no) fi AC_SUBST(HAVE_LIBDB) -AC_CHECK_LIB(fl, yylex, yyterminate, HAVE_LIBFL=yes ; AC_DEFINE(HAVE_LIBFL), +AC_CHECK_LIB(fl, yylex, yyterminate, HAVE_LIBFL=yes ; + AC_DEFINE([HAVE_LIBFL],,[Define to 1 if you have the `fl' library (-lfl).]), HAVE_LIBFL=no) AC_SUBST(HAVE_LIBFL) -AC_CHECK_LIB(nsl, yp_maplist, HAVE_LIBNSL=yes ; AC_DEFINE(HAVE_LIBNSL), +AC_CHECK_LIB(nsl, yp_maplist, HAVE_LIBNSL=yes ; + AC_DEFINE([HAVE_LIBNSL],,[Define to 1 if you have the `nsl' library (-lnsl).]), HAVE_LIBNSL=no) AC_SUBST(HAVE_LIBNSL) -AC_CHECK_LIB(selinux, getfilecon, HAVE_LIBSELINUX=yes ; AC_DEFINE(HAVE_LIBSELINUX), +AC_CHECK_LIB(selinux, getfilecon, HAVE_LIBSELINUX=yes ; + AC_DEFINE([HAVE_LIBSELINUX],,[Define to 1 if you have the `nsl' library (-lnsl).]), HAVE_LIBSELINUX=no) AC_SUBST(HAVE_LIBSELINUX) @@ -233,15 +260,18 @@ fi if test $HAVE_LIBNSL = yes ; then pwdblibs="$pwdblibs -lnsl" fi -AC_CHECK_LIB(pwdb, pwdb_db_name, HAVE_LIBPWDB=yes ; AC_DEFINE(HAVE_LIBPWDB), +AC_CHECK_LIB(pwdb, pwdb_db_name, HAVE_LIBPWDB=yes ; + AC_DEFINE([HAVE_LIBPWDB],,[Define to 1 if you have the `pwdb' library (-lpwdb).]), HAVE_LIBPWDB=no,$pwdblibs) AC_SUBST(HAVE_LIBPWDB) unset pwdblibs -AC_CHECK_LIB(fl, yywrap, HAVE_LIBFLEX=yes ; AC_DEFINE(HAVE_LIBFLEX), +AC_CHECK_LIB(fl, yywrap, HAVE_LIBFLEX=yes ; + AC_DEFINE([HAVE_LIBFLEX],,[Define to 1 if you have the `fl' library (-lfl).]), HAVE_LIBFLEX=no) AC_SUBST(HAVE_LIBFLEX) -AC_CHECK_LIB(l, yywrap, HAVE_LIBLEX=yes ; AC_DEFINE(HAVE_LIBLEX), +AC_CHECK_LIB(l, yywrap, HAVE_LIBLEX=yes ; + AC_DEFINE([HAVE_LIBLEX],,[Define to 1 if you have the `l' library (-ll).]), HAVE_LIBLEX=no) AC_SUBST(HAVE_LIBLEX) @@ -253,6 +283,14 @@ AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h sys dnl Linux wants features.h in some of the source files. AC_CHECK_HEADERS(features.h) +AH_VERBATIM([_HAVE_FEATURES_H], +[/* GNU systems as a class, all have the feature.h file */ +#ifdef HAVE_FEATURES_H +# define _SVID_SOURCE +# define _BSD_SOURCE +# define _GNU_SOURCE +# include <features.h> +#endif /* HAVE_FEATURES_H */]) dnl For module/pam_cracklib AC_CHECK_HEADERS(crypt.h) |