diff options
Diffstat (limited to 'Linux-PAM/configure.in')
| -rw-r--r-- | Linux-PAM/configure.in | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Linux-PAM/configure.in b/Linux-PAM/configure.in index 0c4c8cb0..4c6a4c81 100644 --- a/Linux-PAM/configure.in +++ b/Linux-PAM/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(conf/pam_conv1/pam_conv_y.y) -AM_INIT_AUTOMAKE("Linux-PAM", 0.99.7.1) +AM_INIT_AUTOMAKE("Linux-PAM", 0.99.8.1) AC_PREREQ([2.60]) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -24,7 +24,12 @@ dnl If we use /usr as prefix, use /etc for config files fi if test ${libdir} = '${exec_prefix}/lib' then - libdir="/lib" + case "`uname -m`" in + x86_64|ppc64|s390x|sparc64) + libdir="/lib64" ;; + *) + libdir="/lib" ;; + esac fi if test ${sbindir} = '${exec_prefix}/sbin' then @@ -326,7 +331,7 @@ AC_ARG_ENABLE([audit], WITH_LIBAUDIT=$enableval, WITH_LIBAUDIT=yes) if test x"$WITH_LIBAUDIT" != xno ; then AC_CHECK_HEADER([libaudit.h], - [AC_CHECK_LIB(audit, audit_log_user_message, LIBAUDIT=-laudit, LIBAUDIT="")] + [AC_CHECK_LIB(audit, audit_log_acct_message, LIBAUDIT=-laudit, LIBAUDIT="")] ) if test ! -z "$LIBAUDIT" -a "ac_cv_header_libaudit_h" != "no" ; then AC_DEFINE([HAVE_LIBAUDIT], 1, [Defined if audit support should be compiled in]) @@ -346,11 +351,13 @@ dnl libraries are unuseable, so try libdb first. AC_ARG_ENABLE([db], AC_HELP_STRING([--enable-db=(db|ndbm|yes|no)],[Default behavior 'yes', which is to check for libdb first, followed by ndbm. Use 'no' to disable db support.]), WITH_DB=$enableval, WITH_DB=yes) +AC_ARG_WITH([db-uniquename], + AC_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.])) if test x"$WITH_DB" != xno ; then if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then - AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="") + AC_CHECK_LIB([db$with_db_uniquename], [db_create$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="") if test -z "$LIBDB" ; then - AC_CHECK_LIB([db], [dbm_store], LIBDB="-ldb", LIBDB="") + AC_CHECK_LIB([db$with_db_uniquename], [dbm_store$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="") fi fi if test -z "$LIBDB" ; then @@ -415,7 +422,7 @@ AC_CHECK_FUNCS(fseeko gethostname gettimeofday lckpwdf mkdir select) AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname) AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) AC_CHECK_FUNCS(getgrouplist getline getdelim) -AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af) +AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af setkeycreatecon) AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) |