From 7dfce86b3a06e5e5aa78e269df4d6c53b140024b Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 13 Jul 2009 18:46:06 +0200 Subject: Imported Upstream version 0.12 --- configure | 71 +++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 25 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 357d44f..f143a8e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for krb5-auth-dialog 0.11. +# Generated by GNU Autoconf 2.63 for krb5-auth-dialog 0.12. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='krb5-auth-dialog' PACKAGE_TARNAME='krb5-auth-dialog' -PACKAGE_VERSION='0.11' -PACKAGE_STRING='krb5-auth-dialog 0.11' +PACKAGE_VERSION='0.12' +PACKAGE_STRING='krb5-auth-dialog 0.12' PACKAGE_BUGREPORT='' ac_unique_file="src/krb5-auth-dialog.c" @@ -803,6 +803,7 @@ ENABLE_PKINIT_TRUE KRB5_LIBS KRB5_CFLAGS KRB5_CONFIG +SC_PKCS11 GCONFTOOL GCONF_SCHEMAS_INSTALL_FALSE GCONF_SCHEMAS_INSTALL_TRUE @@ -1006,6 +1007,7 @@ with_gconf_source with_gconf_schema_file_dir enable_schemas_install enable_debug +with_pkcs11 enable_pkinit enable_network_manager with_libnotify @@ -1589,7 +1591,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures krb5-auth-dialog 0.11 to adapt to many kinds of systems. +\`configure' configures krb5-auth-dialog 0.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1660,7 +1662,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of krb5-auth-dialog 0.11:";; + short | recursive ) echo "Configuration of krb5-auth-dialog 0.12:";; esac cat <<\_ACEOF @@ -1682,7 +1684,8 @@ Optional Features: Turn on compiler warnings --enable-iso-c Try to warn if code is not ISO C --disable-scrollkeeper do not make updates to the scrollkeeper database - --disable-schemas-install Disable the schemas installation + --disable-schemas-install + Disable the schemas installation --enable-debug=no/yes enable debugging output --enable-pkinit whether to enable preauth via pkinit support --enable-network-manager @@ -1703,6 +1706,8 @@ Optional Packages: Config database for installing schema files. --with-gconf-schema-file-dir=dir Directory for installing schema files. + --with-pkcs11 set path of PKCS11 smartcard helper + [default=/usr/lib/opensc/opensc-pkcs11.so] --with-libnotify use libnotify for status messages --without-libcap Disable support for capabilities library @@ -1808,7 +1813,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -krb5-auth-dialog configure 0.11 +krb5-auth-dialog configure 0.12 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1822,7 +1827,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by krb5-auth-dialog $as_me 0.11, which was +It was created by krb5-auth-dialog $as_me 0.12, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2539,7 +2544,7 @@ fi # Define the identity of the package. PACKAGE='krb5-auth-dialog' - VERSION='0.11' + VERSION='0.12' cat >>confdefs.h <<_ACEOF @@ -8339,13 +8344,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:8342: $ac_compile\"" >&5) + (eval echo "\"\$as_me:8347: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:8345: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:8350: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:8348: output\"" >&5) + (eval echo "\"\$as_me:8353: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -9550,7 +9555,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 9553 "configure"' > conftest.$ac_ext + echo '#line 9558 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10915,11 +10920,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10918: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10923: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10922: \$? = $ac_status" >&5 + echo "$as_me:10927: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11254,11 +11259,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11257: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11262: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11261: \$? = $ac_status" >&5 + echo "$as_me:11266: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11359,11 +11364,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11362: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11367: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11366: \$? = $ac_status" >&5 + echo "$as_me:11371: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11414,11 +11419,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11417: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11422: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11421: \$? = $ac_status" >&5 + echo "$as_me:11426: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14230,7 +14235,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14233 "configure" +#line 14238 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14326,7 +14331,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14329 "configure" +#line 14334 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16049,6 +16054,22 @@ _ACEOF fi +# Check whether --with-pkcs11 was given. +if test "${with_pkcs11+set}" = set; then + withval=$with_pkcs11; +else + with_pkcs11=/usr/lib/opensc/opensc-pkcs11.so +fi + +SC_PKCS11="$with_pkcs11" + + +cat >>confdefs.h <<_ACEOF +#define SC_PKCS11 "$SC_PKCS11" +_ACEOF + + + # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -18926,7 +18947,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by krb5-auth-dialog $as_me 0.11, which was +This file was extended by krb5-auth-dialog $as_me 0.12, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18989,7 +19010,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -krb5-auth-dialog config.status 0.11 +krb5-auth-dialog config.status 0.12 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -- cgit