remove pam/ldap/sia specific code from configure.in
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2417 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aj
parent
7de8272675
commit
3449847d74
167
configure.in
167
configure.in
|
|
@ -31,17 +31,14 @@ dnl Check for some target-specific stuff
|
|||
case "$host" in
|
||||
*-*-hpux*)
|
||||
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED"
|
||||
AC_DEFINE(PAM_SUN_CODEBASE, 1, [PAM based on SUN codebase])
|
||||
;;
|
||||
*-*-solaris*)
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
|
||||
need_dash_r=1
|
||||
AC_DEFINE(PAM_SUN_CODEBASE, 1, [PAM based on SUN codebase])
|
||||
;;
|
||||
*-*-sunos4*)
|
||||
CPPFLAGS="$CPPFLAGS -DSUNOS4"
|
||||
AC_DEFINE(PAM_SUN_CODEBASE, 1, [PAM based on SUN codebase])
|
||||
;;
|
||||
*-*-aix*)
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
|
|
@ -458,101 +455,6 @@ fi
|
|||
LDFLAGS="$saved_LDFLAGS"
|
||||
AC_SUBST(OPENSSL_LDFLAGS)
|
||||
|
||||
AC_ARG_WITH(pam-dir,
|
||||
AC_HELP_STRING([--with-pam-dir=PATH], [Specify path for PAM installation libraries]),
|
||||
[
|
||||
if test "x$withval" != "xno" ; then
|
||||
trypamdir=$withval
|
||||
fi
|
||||
]
|
||||
)
|
||||
|
||||
saved_LDFLAGS="$LDFLAGS"
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
AC_CACHE_CHECK([for pam directory], ac_cv_pamdir, [
|
||||
for pamdir in $trypamdir "" /usr/local /usr/pkg /opt ; do
|
||||
# Skip directories if they don't exist
|
||||
if test ! -z "$pamdir" -a ! -d "$pamdir/" ; then
|
||||
continue;
|
||||
fi
|
||||
|
||||
CPPFLAGS="$saved_CPPFLAGS"
|
||||
LDFLAGS="$saved_LDFLAGS"
|
||||
if test ! -z "$pamdir" -a "x$pamdir" != "x/usr"; then
|
||||
LDFLAGS="-L$pamdir/lib $saved_LDFLAGS"
|
||||
if test ! -z "$need_dash_r" ; then
|
||||
LDFLAGS="-R$pamdir/lib $LDFLAGS"
|
||||
fi
|
||||
CPPFLAGS="-I$pamdir/include $saved_CPPFLAGS"
|
||||
fi
|
||||
break;
|
||||
done
|
||||
|
||||
if test -z "$pamdir" ; then
|
||||
pamdir="(system)"
|
||||
fi
|
||||
ac_cv_pamdir=$pamdir
|
||||
])
|
||||
|
||||
dnl Check for PAM libs
|
||||
PAM_MSG="no"
|
||||
no_pam=""
|
||||
AC_SUBST(LIBPAM)
|
||||
saved_LIBS="$LIBS"
|
||||
AC_MSG_CHECKING([PAM support])
|
||||
AC_ARG_WITH(pam,
|
||||
AC_HELP_STRING([--with-pam], [Enable PAM support]),
|
||||
[
|
||||
if test "x$withval" = "xno" ; then
|
||||
AC_MSG_RESULT(disabled)
|
||||
no_pam=1
|
||||
fi
|
||||
],
|
||||
)
|
||||
if test -z "$no_pam" ; then
|
||||
if test "x$ac_cv_header_security_pam_appl_h" = "xyes" -o "x$ac_cv_header_pam_pam_appl_h" = "xyes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
PAM_MSG="yes"
|
||||
AC_CHECK_LIB(pam, pam_set_item, [LIBPAM="$LIBPAM -lpam"], AC_MSG_ERROR([*** libpam missing]))
|
||||
LIBS="$LIBS $LIBPAM"
|
||||
AC_CHECK_FUNCS(pam_getenvlist)
|
||||
AC_CHECK_FUNCS(pam_putenv)
|
||||
disable_shadow=yes
|
||||
AC_DEFINE(HAVE_PAM, 1, [Have Pluggable Authentication Modules])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
fi
|
||||
LIBS="$saved_LIBS"
|
||||
AM_CONDITIONAL(HAVE_PAM, test "x$PAM_MSG" = "xyes")
|
||||
|
||||
dnl Check for SIA libs
|
||||
AC_SUBST(LIBSIA)
|
||||
SIA_MSG="no"
|
||||
no_osfsia=""
|
||||
AC_MSG_CHECKING([SIA support])
|
||||
AC_ARG_WITH(osfsia,
|
||||
AC_HELP_STRING([--with-osfsia], [Enable Digital Unix SIA]),
|
||||
[
|
||||
if test "x$withval" = "xno" ; then
|
||||
AC_MSG_RESULT(disabled)
|
||||
no_osfsia=1
|
||||
fi
|
||||
],
|
||||
)
|
||||
if test -z "$no_osfsia" ; then
|
||||
if test -f /etc/sia/matrix.conf; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_OSF_SIA, 1, [Have Digital Unix SIA])
|
||||
LIBSIA="$LIBSIA -lsecurity -ldb -lm -laud"
|
||||
SIA_MSG="yes"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(HAVE_SIA, test "x$SIA_MSG" = "xyes")
|
||||
|
||||
PCSC_MSG=no
|
||||
pcsc_path=/usr
|
||||
AC_SUBST(PCSC_CFLAGS)
|
||||
|
|
@ -781,74 +683,6 @@ AC_ARG_ENABLE(sensitive-logging,
|
|||
AC_HELP_STRING([--disable-sensitive-logging], [disable logging of sensitive APDU data [default=no]]),
|
||||
AC_DEFINE(OPENSC_DONT_LOG_SENSITIVE,1,[Disable logging of sensitive APDU data]))
|
||||
|
||||
### BEGIN LDAP SPECIFIC OPTIONS
|
||||
dnl ldap autoconf magic partly taken from pam_ldap
|
||||
|
||||
dnl --enable-ldap option.
|
||||
AC_ARG_ENABLE(ldap,
|
||||
AC_HELP_STRING([--enable-ldap], [enable use of LDAP for authentication. [default=yes]]),
|
||||
, enable_ldap=yes)
|
||||
AC_ARG_ENABLE(ldap-ssl, AC_HELP_STRING([--disable-ldap-ssl], [disable SSL/TSL support for ldap]))
|
||||
AC_ARG_WITH(ldap-lib, AC_HELP_STRING([--with-ldap-lib=type], [select ldap library [auto|netscape5|netscape4|netscape3|umich|openldap]]))
|
||||
AC_ARG_WITH(ldap-dir, AC_HELP_STRING([--with-ldap-dir=DIR], [base directory of ldap SDK]))
|
||||
|
||||
AC_SUBST(LIBLDAP)
|
||||
LDAP_MSG="no"
|
||||
if (test x$enable_ldap = xyes); then
|
||||
if test -n "$with_ldap_dir"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$with_ldap_dir/include"
|
||||
LDFLAGS="$LDFLAGS -L$with_ldap_dir/lib"
|
||||
case "$target_os" in
|
||||
solaris*) LDFLAGS="$LDFLAGS -Wl,-R$with_ldap_dir/lib" ;;
|
||||
*) LDFLAGS="$LDFLAGS -Wl,-rpath,$with_ldap_dir/lib" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
AC_CHECK_HEADERS(lber.h ldap.h ldap_ssl.h)
|
||||
|
||||
dnl check which ldap library we have
|
||||
if test -z "$with_ldap_lib"; then
|
||||
with_ldap_lib=auto
|
||||
fi
|
||||
|
||||
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = umich -o $with_ldap_lib = openldap \); then
|
||||
AC_CHECK_LIB(lber, ber_init, LIBLDAP="-llber $LIBLDAP" found_lber_lib=yes)
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $LIBLDAP"
|
||||
AC_CHECK_LIB(ldap, ldap_search, LIBLDAP="-lldap $LIBLDAP" found_ldap_lib=yes)
|
||||
AC_CHECK_LIB(ldap, ldap_start_tls_s, LIBLDAP="-lssl $LIBLDAP" need_ssl_lib=yes)
|
||||
LIBS="$saved_LIBS"
|
||||
fi
|
||||
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape5 \); then
|
||||
AC_CHECK_LIB(ldap50, ldap_search, LIBLDAP="-lldap50 -lssldap50 -lssl3 -lnss3 -lnspr4 -lprldap50 -lplc4 -lplds4 $LIBLDAP" found_ldap_lib=yes need_pthread=true,, -lpthread)
|
||||
fi
|
||||
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape4 \); then
|
||||
AC_CHECK_LIB(ldapssl41, ldap_search, LIBLDAP="-lldapssl41 -lplc3 -lplds3 -lnspr3 $LIBLDAP" found_ldap_lib=yes need_pthread=true,, -lpthread)
|
||||
if test -z "$found_ldap_lib"; then
|
||||
AC_CHECK_LIB(ldapssl40, ldap_search, LIBLDAP="-lldapssl40 $LIBLDAP" found_ldap_lib=yes need_pthread=true,, -lpthread)
|
||||
fi
|
||||
fi
|
||||
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape3 \); then
|
||||
AC_CHECK_LIB(ldapssl30, ldap_search, LIBLDAP="-lldapssl30 $LIBLDAP" found_ldap_lib=yes need_pthread=true,, -lpthread)
|
||||
fi
|
||||
|
||||
if test -n "$found_ldap_lib" -a "x$ac_cv_header_ldap_h" = "xyes"; then
|
||||
AC_DEFINE(LDAP_REFERRALS,1,[This is needed for the native Solaris LDAP SDK])
|
||||
AC_DEFINE(HAVE_LDAP, 1, [Use LDAP for authentication etc.])
|
||||
LDAP_MSG="yes"
|
||||
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $LIBLDAP"
|
||||
AC_CHECK_FUNCS(ldap_init)
|
||||
if test "$enable_ldap_ssl" \!= "no"; then
|
||||
AC_CHECK_FUNCS(ldapssl_init ldap_start_tls_s ldap_pvt_tls_set_option)
|
||||
fi
|
||||
LIBS="$saved_LIBS"
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_LDAP, test "x$LDAP_MSG" = "xyes")
|
||||
### END LDAP SPECIFIC OPTIONS
|
||||
|
||||
### BEGIN ASSUAN SPECIFIC OPTIONS
|
||||
ASSUAN_MSG="no"
|
||||
AC_SUBST(CFLAGS_ASSUAN)
|
||||
|
|
@ -1045,7 +879,6 @@ echo "PC/SC support: ${PCSC_MSG}"
|
|||
echo "OpenCT support: ${OPENCT_MSG}"
|
||||
echo "Assuan support: ${ASSUAN_MSG}"
|
||||
echo "LDAP support: ${LDAP_MSG}"
|
||||
echo "PAM support: ${PAM_MSG}"
|
||||
case "$host" in
|
||||
*-*-osf*)
|
||||
echo "SIA support: ${SIA_MSG}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue