X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=configure.ac;h=6a862273b93c48d94e8437b42f9d8fe2df28c8af;hp=43a5f592a7edae394d2069f1599f249f0676f5ca;hb=f6b4fd086473f179295386fb47fd422f47015d16;hpb=3bbb37e0ef1e77e9a93b7be7fb506bbbdd6a0400

diff --git a/configure.ac b/configure.ac
index 43a5f59..6a86227 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([pam_pcsc_cr], 0.0.1)
+AC_INIT([pam_pcsc_cr], 0.9.2)
 AC_CONFIG_SRCDIR([pam_pcsc_cr.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
@@ -22,41 +22,29 @@ PKG_PROG_PKG_CONFIG
 AC_CHECK_HEADERS([security/pam_appl.h], [], [
   AC_MSG_ERROR([[PAM headers not found]])
 ])
-AC_CHECK_HEADERS([security/pam_modules.h security/_pam_macros.h \
-		  security/pam_modutil.h], [], [], [
+AC_CHECK_HEADERS([security/pam_modules.h security/pam_ext.h], [], [], [
 #include <sys/types.h>
 #include <security/pam_appl.h>
 ])
 AC_CHECK_LIB([pam], [pam_start])
-AC_CHECK_FUNCS([pam_modutil_drop_priv])
-AC_SUBST(PAMDIR, "\$(exec_prefix)/lib/security")
+AC_CHECK_FUNCS([pam_get_authtok])
 AC_ARG_WITH(pam-dir,
-	[  --with-pam-dir=DIR                path to install PAM module],
+	[  --with-pam-dir=DIR      path to install the PAM module (/lib/security)],
 	[PAMDIR="$withval"],
-	[])
+	[
+case $prefix in
+*/_inst) PAMDIR='${exec_prefix}/lib/security' ;;
+*)       PAMDIR=/lib/security ;;
+esac
+])
+AC_SUBST(PAMDIR)
+AC_MSG_NOTICE([Installation target PAMDIR=${PAMDIR}])
 
 PKG_CHECK_MODULES([PCSC], [libpcsclite])
-AC_ARG_WITH(pcsclite-include-path,
-	[  --with-pcsclite-include-path=PATH path to pcsclite includes],
-	[PCSC_CFLAGS="-I $withval"],
-	[])
-AC_ARG_WITH(pcsclite-lib-path,
-	[  --with-pcsclite-lib-path=PATH path to pcsclite libs],
-	[PCSC_LIBS="-L $withval -lpcsclite"],
-	[])
-
 CPPFLAGS="$PCSC_CFLAGS $CPPFLAGS"
 LIBS="$PCSC_LIBS $LIBS"
 
 PKG_CHECK_MODULES([OPENSSL], [libcrypto], [], [:])
-AC_ARG_WITH(openssl-include-path,
-	[  --with-openssl-include-path=PATH path to openssl includes],
-	[OPENSSL_CFLAGS="-I $withval"],
-	[])
-AC_ARG_WITH(openssl-lib-path,
-	[  --with-openssl-lib-path=PATH path to openssl libs],
-	[OPENSSL_LIBS="-L $withval -lcrypto"],
-	[])
 AS_IF([test "x$OPENSSL_CFLAGS" != "x" -o "x$OPENSSL_LIBS" != "x" ], [
   use_openssl=yes
 ])
@@ -64,19 +52,11 @@ CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS"
 LIBS="$OPENSSL_LIBS $LIBS"
 
 AC_ARG_ENABLE(tomcrypt,
-	[  --enable-tomcrypt       use libtomcrypt even when openssl present])
+	[  --enable-tomcrypt       use libtomcrypt even when openssl is present])
 
 AS_IF([test "x$use_openssl" != "xyes" -o "x$enable_tomcrypt" = "xyes"], [
   PKG_CHECK_MODULES([TOMCRYPT], [libtomcrypt], [], [:])
 ])
-AC_ARG_WITH(libtomcrypt-include-path,
-	[  --with-libtomcrypt-include-path=PATH path to libtomcrypt includes],
-	[TOMCRYPT_CFLAGS="-I $withval"],
-	[])
-AC_ARG_WITH(libtomcrypt-lib-path,
-	[  --with-libtomcrypt-lib-path=PATH path to libtomcrypt libs],
-	[TOMCRYPT_LIBS="-L $withval -ltomcrypt"],
-	[])
 AS_IF([test "x$TOMCRYPT_CFLAGS" != "x" -o "x$TOMCRYPT_LIBS" != "x" ], [
   use_tomcrypt=yes
 ])
@@ -84,20 +64,13 @@ CPPFLAGS="$TOMCRYPT_CFLAGS $CPPFLAGS"
 LIBS="$TOMCRYPT_LIBS $LIBS"
 
 AC_ARG_ENABLE(gcrypt,
-	[  --enable-gcrypt         use libgcrypt even when openssl present])
+	[  --enable-gcrypt         use libgcrypt even when openssl or libtomcrypt
+                          is present])
 
 AS_IF([test "x$use_openssl" != "xyes" && test "x$use_tomcrypt" != "xyes" || \
 	test "x$enable_tomcrypt" = "xyes"], [
   AM_PATH_LIBGCRYPT()
 ])
-AC_ARG_WITH(libgcrypt-include-path,
-	[  --with-libgcrypt-include-path=PATH path to libgcrypt includes],
-	[LIBGCRYPT_CFLAGS="-I $withval"],
-	[])
-AC_ARG_WITH(libgcrypt-lib-path,
-	[  --with-libgcrypt-lib-path=PATH path to libgcrypt libs],
-	[LIBGCRYPT_LIBS="-L $withval -lgcrypt"],
-	[])
 AS_IF([test "x$LIBGCRYPT_CFLAGS" != "x" -o "x$LIBGCRYPT_LIBS" != "x" ], [
   use_gcrypt=yes
 ])