6688 lines
214 KiB
Plaintext
6688 lines
214 KiB
Plaintext
diff -u -r -N freeradius-server-2.2.0.orig/share/dictionary freeradius-server-2.2.0/share/dictionary
|
|
--- freeradius-server-2.2.0.orig/share/dictionary 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/share/dictionary 2012-12-04 19:39:42.261423097 +0100
|
|
@@ -196,6 +196,7 @@
|
|
$INCLUDE dictionary.starent
|
|
$INCLUDE dictionary.symbol
|
|
$INCLUDE dictionary.telebit
|
|
+$INCLUDE dictionary.tncfhh
|
|
$INCLUDE dictionary.terena
|
|
$INCLUDE dictionary.trapeze
|
|
$INCLUDE dictionary.tropos
|
|
diff -u -r -N freeradius-server-2.2.0.orig/share/dictionary.tncfhh freeradius-server-2.2.0/share/dictionary.tncfhh
|
|
--- freeradius-server-2.2.0.orig/share/dictionary.tncfhh 1970-01-01 01:00:00.000000000 +0100
|
|
+++ freeradius-server-2.2.0/share/dictionary.tncfhh 2012-12-04 19:39:49.645421869 +0100
|
|
@@ -0,0 +1,20 @@
|
|
+# -*- text -*-
|
|
+# Dictionary for the tnc@fhh Server.
|
|
+#
|
|
+# Website: http://trust.inform.fh-hannover.de
|
|
+#
|
|
+# Version: 0.8.4
|
|
+# Author: Bastian Hellmann
|
|
+# Email: [email protected]
|
|
+#
|
|
+
|
|
+VENDOR tncfhh 10000
|
|
+BEGIN-VENDOR tncfhh
|
|
+
|
|
+ATTRIBUTE TNC-Status 1 integer
|
|
+
|
|
+VALUE TNC-Status Access 0
|
|
+VALUE TNC-Status Isolate 1
|
|
+VALUE TNC-Status None 2
|
|
+
|
|
+END-VENDOR tncfhh
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/configure freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/configure
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/configure 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/configure 2012-12-04 19:38:00.237420970 +0100
|
|
@@ -1,61 +1,84 @@
|
|
#! /bin/sh
|
|
# From configure.in Revision.
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.61.
|
|
+# Generated by GNU Autoconf 2.67.
|
|
+#
|
|
#
|
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
|
|
+# Foundation, Inc.
|
|
+#
|
|
+#
|
|
# This configure script is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy, distribute and modify it.
|
|
-## --------------------- ##
|
|
-## M4sh Initialization. ##
|
|
-## --------------------- ##
|
|
+## -------------------- ##
|
|
+## M4sh Initialization. ##
|
|
+## -------------------- ##
|
|
|
|
# Be more Bourne compatible
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
|
emulate sh
|
|
NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
|
# is contrary to our usage. Disable this feature.
|
|
alias -g '${1+"$@"}'='"$@"'
|
|
setopt NO_GLOB_SUBST
|
|
else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
+ case `(set -o) 2>/dev/null` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
esac
|
|
-
|
|
fi
|
|
|
|
|
|
-
|
|
-
|
|
-# PATH needs CR
|
|
-# Avoid depending upon Character Ranges.
|
|
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
-as_cr_digits='0123456789'
|
|
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
-
|
|
-# The user is always right.
|
|
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
- echo "#! /bin/sh" >conf$$.sh
|
|
- echo "exit 0" >>conf$$.sh
|
|
- chmod +x conf$$.sh
|
|
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
- PATH_SEPARATOR=';'
|
|
+as_nl='
|
|
+'
|
|
+export as_nl
|
|
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
|
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
|
+# but without wasting forks for bash or zsh.
|
|
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
|
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='print -r --'
|
|
+ as_echo_n='print -rn --'
|
|
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='printf %s\n'
|
|
+ as_echo_n='printf %s'
|
|
+else
|
|
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
|
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
|
+ as_echo_n='/usr/ucb/echo -n'
|
|
else
|
|
- PATH_SEPARATOR=:
|
|
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
|
+ as_echo_n_body='eval
|
|
+ arg=$1;
|
|
+ case $arg in #(
|
|
+ *"$as_nl"*)
|
|
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
|
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
|
+ esac;
|
|
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
|
+ '
|
|
+ export as_echo_n_body
|
|
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
|
fi
|
|
- rm -f conf$$.sh
|
|
+ export as_echo_body
|
|
+ as_echo='sh -c $as_echo_body as_echo'
|
|
fi
|
|
|
|
-# Support unset when possible.
|
|
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
- as_unset=unset
|
|
-else
|
|
- as_unset=false
|
|
+# The user is always right.
|
|
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
+ PATH_SEPARATOR=:
|
|
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
|
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
|
+ PATH_SEPARATOR=';'
|
|
+ }
|
|
fi
|
|
|
|
|
|
@@ -64,20 +87,18 @@
|
|
# there to prevent editors from complaining about space-tab.
|
|
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
# splitting by setting IFS to empty value.)
|
|
-as_nl='
|
|
-'
|
|
IFS=" "" $as_nl"
|
|
|
|
# Find who we are. Look in the path if we contain no directory separator.
|
|
-case $0 in
|
|
+case $0 in #((
|
|
*[\\/]* ) as_myself=$0 ;;
|
|
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
-done
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -88,354 +109,321 @@
|
|
as_myself=$0
|
|
fi
|
|
if test ! -f "$as_myself"; then
|
|
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
- { (exit 1); exit 1; }
|
|
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
+ exit 1
|
|
fi
|
|
|
|
-# Work around bugs in pre-3.0 UWIN ksh.
|
|
-for as_var in ENV MAIL MAILPATH
|
|
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
+# Unset variables that we do not need and which cause bugs (e.g. in
|
|
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
|
+# suppresses any "Segmentation fault" message there. '((' could
|
|
+# trigger a bug in pdksh 5.2.14.
|
|
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
|
+do eval test x\${$as_var+set} = xset \
|
|
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
|
done
|
|
PS1='$ '
|
|
PS2='> '
|
|
PS4='+ '
|
|
|
|
# NLS nuisances.
|
|
-for as_var in \
|
|
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
|
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
|
- LC_TELEPHONE LC_TIME
|
|
-do
|
|
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
- eval $as_var=C; export $as_var
|
|
- else
|
|
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
- fi
|
|
-done
|
|
-
|
|
-# Required to use basename.
|
|
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
-
|
|
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
- as_basename=basename
|
|
-else
|
|
- as_basename=false
|
|
-fi
|
|
-
|
|
-
|
|
-# Name of the executable.
|
|
-as_me=`$as_basename -- "$0" ||
|
|
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
- X"$0" : 'X\(//\)$' \| \
|
|
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X/"$0" |
|
|
- sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\/\)$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\).*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- s/.*/./; q'`
|
|
+LC_ALL=C
|
|
+export LC_ALL
|
|
+LANGUAGE=C
|
|
+export LANGUAGE
|
|
|
|
# CDPATH.
|
|
-$as_unset CDPATH
|
|
-
|
|
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
|
if test "x$CONFIG_SHELL" = x; then
|
|
- if (eval ":") 2>/dev/null; then
|
|
- as_have_required=yes
|
|
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
|
|
+ emulate sh
|
|
+ NULLCMD=:
|
|
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
|
|
+ # is contrary to our usage. Disable this feature.
|
|
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
|
+ setopt NO_GLOB_SUBST
|
|
else
|
|
- as_have_required=no
|
|
+ case \`(set -o) 2>/dev/null\` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
+esac
|
|
fi
|
|
-
|
|
- if test $as_have_required = yes && (eval ":
|
|
-(as_func_return () {
|
|
- (exit \$1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
+"
|
|
+ as_required="as_fn_return () { (exit \$1); }
|
|
+as_fn_success () { as_fn_return 0; }
|
|
+as_fn_failure () { as_fn_return 1; }
|
|
+as_fn_ret_success () { return 0; }
|
|
+as_fn_ret_failure () { return 1; }
|
|
|
|
exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
-fi
|
|
-
|
|
-if as_func_ret_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
-fi
|
|
-
|
|
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
- :
|
|
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
|
|
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
|
|
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
|
|
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
|
|
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
|
|
+
|
|
+else
|
|
+ exitcode=1; echo positional parameters were not saved.
|
|
+fi
|
|
+test x\$exitcode = x0 || exit 1"
|
|
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
|
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
|
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
|
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
|
|
+test \$(( 1 + 1 )) = 2 || exit 1"
|
|
+ if (eval "$as_required") 2>/dev/null; then :
|
|
+ as_have_required=yes
|
|
else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
+ as_have_required=no
|
|
fi
|
|
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
|
|
|
|
-test \$exitcode = 0) || { (exit 1); exit 1; }
|
|
-
|
|
-(
|
|
- as_lineno_1=\$LINENO
|
|
- as_lineno_2=\$LINENO
|
|
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
|
|
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
|
|
-") 2> /dev/null; then
|
|
- :
|
|
else
|
|
- as_candidate_shells=
|
|
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+as_found=false
|
|
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- case $as_dir in
|
|
+ as_found=:
|
|
+ case $as_dir in #(
|
|
/*)
|
|
for as_base in sh bash ksh sh5; do
|
|
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
|
|
+ # Try only shells that exist, to save several forks.
|
|
+ as_shell=$as_dir/$as_base
|
|
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
|
+ CONFIG_SHELL=$as_shell as_have_required=yes
|
|
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
|
+ break 2
|
|
+fi
|
|
+fi
|
|
done;;
|
|
esac
|
|
+ as_found=false
|
|
done
|
|
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
|
|
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
|
|
+ CONFIG_SHELL=$SHELL as_have_required=yes
|
|
+fi; }
|
|
IFS=$as_save_IFS
|
|
|
|
|
|
- for as_shell in $as_candidate_shells $SHELL; do
|
|
- # Try only shells that exist, to save several forks.
|
|
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
- { ("$as_shell") 2> /dev/null <<\_ASEOF
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
- emulate sh
|
|
- NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
- # is contrary to our usage. Disable this feature.
|
|
- alias -g '${1+"$@"}'='"$@"'
|
|
- setopt NO_GLOB_SUBST
|
|
-else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
-esac
|
|
-
|
|
+ if test "x$CONFIG_SHELL" != x; then :
|
|
+ # We cannot yet assume a decent shell, so we have to provide a
|
|
+ # neutralization value for shells without unset; and this also
|
|
+ # works around shells that cannot unset nonexistent variables.
|
|
+ BASH_ENV=/dev/null
|
|
+ ENV=/dev/null
|
|
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
+ export CONFIG_SHELL
|
|
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
|
+fi
|
|
+
|
|
+ if test x$as_have_required = xno; then :
|
|
+ $as_echo "$0: This script requires a shell more modern than all"
|
|
+ $as_echo "$0: the shells that I found on your system."
|
|
+ if test x${ZSH_VERSION+set} = xset ; then
|
|
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
|
|
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
|
+ else
|
|
+ $as_echo "$0: Please tell [email protected] about your system,
|
|
+$0: including any error possibly output before this
|
|
+$0: message. Then install a modern shell, or manually run
|
|
+$0: the script under such a shell if you do have one."
|
|
+ fi
|
|
+ exit 1
|
|
fi
|
|
-
|
|
-
|
|
-:
|
|
-_ASEOF
|
|
-}; then
|
|
- CONFIG_SHELL=$as_shell
|
|
- as_have_required=yes
|
|
- if { "$as_shell" 2> /dev/null <<\_ASEOF
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
- emulate sh
|
|
- NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
- # is contrary to our usage. Disable this feature.
|
|
- alias -g '${1+"$@"}'='"$@"'
|
|
- setopt NO_GLOB_SUBST
|
|
-else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
-esac
|
|
-
|
|
fi
|
|
+fi
|
|
+SHELL=${CONFIG_SHELL-/bin/sh}
|
|
+export SHELL
|
|
+# Unset more variables known to interfere with behavior of common tools.
|
|
+CLICOLOR_FORCE= GREP_OPTIONS=
|
|
+unset CLICOLOR_FORCE GREP_OPTIONS
|
|
|
|
-
|
|
-:
|
|
-(as_func_return () {
|
|
- (exit $1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
+## --------------------- ##
|
|
+## M4sh Shell Functions. ##
|
|
+## --------------------- ##
|
|
+# as_fn_unset VAR
|
|
+# ---------------
|
|
+# Portably unset VAR.
|
|
+as_fn_unset ()
|
|
+{
|
|
+ { eval $1=; unset $1;}
|
|
}
|
|
+as_unset=as_fn_unset
|
|
|
|
-exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
+# as_fn_set_status STATUS
|
|
+# -----------------------
|
|
+# Set $? to STATUS, without forking.
|
|
+as_fn_set_status ()
|
|
+{
|
|
+ return $1
|
|
+} # as_fn_set_status
|
|
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
-fi
|
|
+# as_fn_exit STATUS
|
|
+# -----------------
|
|
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
|
+as_fn_exit ()
|
|
+{
|
|
+ set +e
|
|
+ as_fn_set_status $1
|
|
+ exit $1
|
|
+} # as_fn_exit
|
|
+
|
|
+# as_fn_mkdir_p
|
|
+# -------------
|
|
+# Create "$as_dir" as a directory, including parents if necessary.
|
|
+as_fn_mkdir_p ()
|
|
+{
|
|
|
|
-if as_func_ret_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
+ case $as_dir in #(
|
|
+ -*) as_dir=./$as_dir;;
|
|
+ esac
|
|
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
|
+ as_dirs=
|
|
+ while :; do
|
|
+ case $as_dir in #(
|
|
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
|
+ *) as_qdir=$as_dir;;
|
|
+ esac
|
|
+ as_dirs="'$as_qdir' $as_dirs"
|
|
+ as_dir=`$as_dirname -- "$as_dir" ||
|
|
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
+ X"$as_dir" : 'X\(//\)$' \| \
|
|
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X"$as_dir" |
|
|
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)[^/].*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
+ test -d "$as_dir" && break
|
|
+ done
|
|
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
|
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
-fi
|
|
|
|
-if ( set x; as_func_ret_success y && test x = "$1" ); then
|
|
- :
|
|
+} # as_fn_mkdir_p
|
|
+# as_fn_append VAR VALUE
|
|
+# ----------------------
|
|
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
|
+# advantage of any shell optimizations that allow amortized linear growth over
|
|
+# repeated appends, instead of the typical quadratic growth present in naive
|
|
+# implementations.
|
|
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
|
+ eval 'as_fn_append ()
|
|
+ {
|
|
+ eval $1+=\$2
|
|
+ }'
|
|
else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
-fi
|
|
-
|
|
-test $exitcode = 0) || { (exit 1); exit 1; }
|
|
-
|
|
-(
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
|
|
-
|
|
-_ASEOF
|
|
-}; then
|
|
- break
|
|
-fi
|
|
-
|
|
-fi
|
|
-
|
|
- done
|
|
-
|
|
- if test "x$CONFIG_SHELL" != x; then
|
|
- for as_var in BASH_ENV ENV
|
|
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
- done
|
|
- export CONFIG_SHELL
|
|
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
|
-fi
|
|
-
|
|
-
|
|
- if test $as_have_required = no; then
|
|
- echo This script requires a shell more modern than all the
|
|
- echo shells that I found on your system. Please install a
|
|
- echo modern shell, or manually run the script under such a
|
|
- echo shell if you do have one.
|
|
- { (exit 1); exit 1; }
|
|
-fi
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-fi
|
|
-
|
|
+ as_fn_append ()
|
|
+ {
|
|
+ eval $1=\$$1\$2
|
|
+ }
|
|
+fi # as_fn_append
|
|
+
|
|
+# as_fn_arith ARG...
|
|
+# ------------------
|
|
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
|
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
|
+# must be portable across $(()) and expr.
|
|
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
|
+ eval 'as_fn_arith ()
|
|
+ {
|
|
+ as_val=$(( $* ))
|
|
+ }'
|
|
+else
|
|
+ as_fn_arith ()
|
|
+ {
|
|
+ as_val=`expr "$@" || test $? -eq 1`
|
|
+ }
|
|
+fi # as_fn_arith
|
|
|
|
|
|
-(eval "as_func_return () {
|
|
- (exit \$1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
|
+# ----------------------------------------
|
|
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
|
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
|
+# script with STATUS, using 1 if that was 0.
|
|
+as_fn_error ()
|
|
+{
|
|
+ as_status=$1; test $as_status -eq 0 && as_status=1
|
|
+ if test "$4"; then
|
|
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
|
+ fi
|
|
+ $as_echo "$as_me: error: $2" >&2
|
|
+ as_fn_exit $as_status
|
|
+} # as_fn_error
|
|
|
|
-exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
+ as_expr=expr
|
|
else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
+ as_expr=false
|
|
fi
|
|
|
|
-if as_func_ret_success; then
|
|
- :
|
|
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
+ as_basename=basename
|
|
else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
+ as_basename=false
|
|
fi
|
|
|
|
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
- :
|
|
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
+ as_dirname=dirname
|
|
else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
+ as_dirname=false
|
|
fi
|
|
|
|
-test \$exitcode = 0") || {
|
|
- echo No shell found that supports shell functions.
|
|
- echo Please tell [email protected] about your system,
|
|
- echo including any error possibly output before this
|
|
- echo message
|
|
-}
|
|
+as_me=`$as_basename -- "$0" ||
|
|
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
+ X"$0" : 'X\(//\)$' \| \
|
|
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X/"$0" |
|
|
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
|
|
+# Avoid depending upon Character Ranges.
|
|
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
+as_cr_digits='0123456789'
|
|
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
|
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
-
|
|
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
- # uniformly replaced by the line number. The first 'sed' inserts a
|
|
- # line-number line after each line using $LINENO; the second 'sed'
|
|
- # does the real work. The second script uses 'N' to pair each
|
|
- # line-number line with the line containing $LINENO, and appends
|
|
- # trailing '-' during substitution so that $LINENO is not a special
|
|
- # case at line end.
|
|
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
|
|
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
|
|
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
|
|
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
|
|
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
|
|
sed -n '
|
|
p
|
|
/[$]LINENO/=
|
|
@@ -452,8 +440,7 @@
|
|
s/-\n.*//
|
|
' >$as_me.lineno &&
|
|
chmod +x "$as_me.lineno" ||
|
|
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
|
|
|
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
# (the dirname of $[0] is not the place where we might find the
|
|
@@ -463,49 +450,40 @@
|
|
exit
|
|
}
|
|
|
|
-
|
|
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
- as_dirname=dirname
|
|
-else
|
|
- as_dirname=false
|
|
-fi
|
|
-
|
|
ECHO_C= ECHO_N= ECHO_T=
|
|
-case `echo -n x` in
|
|
+case `echo -n x` in #(((((
|
|
-n*)
|
|
- case `echo 'x\c'` in
|
|
+ case `echo 'xy\c'` in
|
|
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
- *) ECHO_C='\c';;
|
|
+ xy) ECHO_C='\c';;
|
|
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
|
+ ECHO_T=' ';;
|
|
esac;;
|
|
*)
|
|
ECHO_N='-n';;
|
|
esac
|
|
|
|
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
-
|
|
rm -f conf$$ conf$$.exe conf$$.file
|
|
if test -d conf$$.dir; then
|
|
rm -f conf$$.dir/conf$$.file
|
|
else
|
|
rm -f conf$$.dir
|
|
- mkdir conf$$.dir
|
|
+ mkdir conf$$.dir 2>/dev/null
|
|
fi
|
|
-echo >conf$$.file
|
|
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s='ln -s'
|
|
- # ... but there are two gotchas:
|
|
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -p'.
|
|
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+if (echo >conf$$.file) 2>/dev/null; then
|
|
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s='ln -s'
|
|
+ # ... but there are two gotchas:
|
|
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+ as_ln_s='cp -p'
|
|
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s=ln
|
|
+ else
|
|
as_ln_s='cp -p'
|
|
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s=ln
|
|
+ fi
|
|
else
|
|
as_ln_s='cp -p'
|
|
fi
|
|
@@ -513,7 +491,7 @@
|
|
rmdir conf$$.dir 2>/dev/null
|
|
|
|
if mkdir -p . 2>/dev/null; then
|
|
- as_mkdir_p=:
|
|
+ as_mkdir_p='mkdir -p "$as_dir"'
|
|
else
|
|
test -d ./-p && rmdir ./-p
|
|
as_mkdir_p=false
|
|
@@ -530,12 +508,12 @@
|
|
as_test_x='
|
|
eval sh -c '\''
|
|
if test -d "$1"; then
|
|
- test -d "$1/.";
|
|
+ test -d "$1/.";
|
|
else
|
|
- case $1 in
|
|
- -*)set "./$1";;
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
esac;
|
|
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
???[sx]*):;;*)false;;esac;fi
|
|
'\'' sh
|
|
'
|
|
@@ -549,11 +527,11 @@
|
|
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
|
|
|
|
-
|
|
-exec 7<&0 </dev/null 6>&1
|
|
+test -n "$DJDIR" || exec 7<&0 </dev/null
|
|
+exec 6>&1
|
|
|
|
# Name of the host.
|
|
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
|
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
|
|
# so uname gets run too.
|
|
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
|
|
@@ -568,7 +546,6 @@
|
|
subdirs=
|
|
MFLAGS=
|
|
MAKEFLAGS=
|
|
-SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
|
# Identity of this package.
|
|
PACKAGE_NAME=
|
|
@@ -576,58 +553,102 @@
|
|
PACKAGE_VERSION=
|
|
PACKAGE_STRING=
|
|
PACKAGE_BUGREPORT=
|
|
+PACKAGE_URL=
|
|
|
|
ac_unique_file="rlm_eap_tnc.c"
|
|
-ac_subst_vars='SHELL
|
|
-PATH_SEPARATOR
|
|
-PACKAGE_NAME
|
|
-PACKAGE_TARNAME
|
|
-PACKAGE_VERSION
|
|
-PACKAGE_STRING
|
|
-PACKAGE_BUGREPORT
|
|
-exec_prefix
|
|
-prefix
|
|
-program_transform_name
|
|
-bindir
|
|
-sbindir
|
|
-libexecdir
|
|
-datarootdir
|
|
-datadir
|
|
-sysconfdir
|
|
-sharedstatedir
|
|
-localstatedir
|
|
-includedir
|
|
-oldincludedir
|
|
-docdir
|
|
-infodir
|
|
-htmldir
|
|
-dvidir
|
|
-pdfdir
|
|
-psdir
|
|
-libdir
|
|
-localedir
|
|
-mandir
|
|
-DEFS
|
|
-ECHO_C
|
|
-ECHO_N
|
|
-ECHO_T
|
|
-LIBS
|
|
-build_alias
|
|
-host_alias
|
|
-target_alias
|
|
-CC
|
|
-CFLAGS
|
|
-LDFLAGS
|
|
-CPPFLAGS
|
|
-ac_ct_CC
|
|
-EXEEXT
|
|
-OBJEXT
|
|
-eap_tnc_cflags
|
|
-eap_tnc_ldflags
|
|
-targetname
|
|
+# Factoring default headers for most tests.
|
|
+ac_includes_default="\
|
|
+#include <stdio.h>
|
|
+#ifdef HAVE_SYS_TYPES_H
|
|
+# include <sys/types.h>
|
|
+#endif
|
|
+#ifdef HAVE_SYS_STAT_H
|
|
+# include <sys/stat.h>
|
|
+#endif
|
|
+#ifdef STDC_HEADERS
|
|
+# include <stdlib.h>
|
|
+# include <stddef.h>
|
|
+#else
|
|
+# ifdef HAVE_STDLIB_H
|
|
+# include <stdlib.h>
|
|
+# endif
|
|
+#endif
|
|
+#ifdef HAVE_STRING_H
|
|
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
|
+# include <memory.h>
|
|
+# endif
|
|
+# include <string.h>
|
|
+#endif
|
|
+#ifdef HAVE_STRINGS_H
|
|
+# include <strings.h>
|
|
+#endif
|
|
+#ifdef HAVE_INTTYPES_H
|
|
+# include <inttypes.h>
|
|
+#endif
|
|
+#ifdef HAVE_STDINT_H
|
|
+# include <stdint.h>
|
|
+#endif
|
|
+#ifdef HAVE_UNISTD_H
|
|
+# include <unistd.h>
|
|
+#endif"
|
|
+
|
|
+ac_subst_vars='LTLIBOBJS
|
|
LIBOBJS
|
|
-LTLIBOBJS'
|
|
+targetname
|
|
+eap_tnc_ldflags
|
|
+eap_tnc_cflags
|
|
+EGREP
|
|
+GREP
|
|
+CPP
|
|
+OBJEXT
|
|
+EXEEXT
|
|
+ac_ct_CC
|
|
+CPPFLAGS
|
|
+LDFLAGS
|
|
+CFLAGS
|
|
+CC
|
|
+target_alias
|
|
+host_alias
|
|
+build_alias
|
|
+LIBS
|
|
+ECHO_T
|
|
+ECHO_N
|
|
+ECHO_C
|
|
+DEFS
|
|
+mandir
|
|
+localedir
|
|
+libdir
|
|
+psdir
|
|
+pdfdir
|
|
+dvidir
|
|
+htmldir
|
|
+infodir
|
|
+docdir
|
|
+oldincludedir
|
|
+includedir
|
|
+localstatedir
|
|
+sharedstatedir
|
|
+sysconfdir
|
|
+datadir
|
|
+datarootdir
|
|
+libexecdir
|
|
+sbindir
|
|
+bindir
|
|
+program_transform_name
|
|
+prefix
|
|
+exec_prefix
|
|
+PACKAGE_URL
|
|
+PACKAGE_BUGREPORT
|
|
+PACKAGE_STRING
|
|
+PACKAGE_VERSION
|
|
+PACKAGE_TARNAME
|
|
+PACKAGE_NAME
|
|
+PATH_SEPARATOR
|
|
+SHELL'
|
|
ac_subst_files=''
|
|
+ac_user_opts='
|
|
+enable_option_checking
|
|
+'
|
|
ac_precious_vars='build_alias
|
|
host_alias
|
|
target_alias
|
|
@@ -635,12 +656,15 @@
|
|
CFLAGS
|
|
LDFLAGS
|
|
LIBS
|
|
-CPPFLAGS'
|
|
+CPPFLAGS
|
|
+CPP'
|
|
|
|
|
|
# Initialize some variables set by options.
|
|
ac_init_help=
|
|
ac_init_version=false
|
|
+ac_unrecognized_opts=
|
|
+ac_unrecognized_sep=
|
|
# The variables have the same names as the options, with
|
|
# dashes changed to underlines.
|
|
cache_file=/dev/null
|
|
@@ -696,8 +720,9 @@
|
|
fi
|
|
|
|
case $ac_option in
|
|
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
|
- *) ac_optarg=yes ;;
|
|
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
|
+ *=) ac_optarg= ;;
|
|
+ *) ac_optarg=yes ;;
|
|
esac
|
|
|
|
# Accept the important Cygnus configure options, so we can diagnose typos.
|
|
@@ -739,13 +764,20 @@
|
|
datarootdir=$ac_optarg ;;
|
|
|
|
-disable-* | --disable-*)
|
|
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
- eval enable_$ac_feature=no ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error $? "invalid feature name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"enable_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval enable_$ac_useropt=no ;;
|
|
|
|
-docdir | --docdir | --docdi | --doc | --do)
|
|
ac_prev=docdir ;;
|
|
@@ -758,13 +790,20 @@
|
|
dvidir=$ac_optarg ;;
|
|
|
|
-enable-* | --enable-*)
|
|
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
- eval enable_$ac_feature=\$ac_optarg ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error $? "invalid feature name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"enable_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval enable_$ac_useropt=\$ac_optarg ;;
|
|
|
|
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
|
|
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
|
|
@@ -955,22 +994,36 @@
|
|
ac_init_version=: ;;
|
|
|
|
-with-* | --with-*)
|
|
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
- eval with_$ac_package=\$ac_optarg ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error $? "invalid package name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"with_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval with_$ac_useropt=\$ac_optarg ;;
|
|
|
|
-without-* | --without-*)
|
|
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
- eval with_$ac_package=no ;;
|
|
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
+ as_fn_error $? "invalid package name: $ac_useropt"
|
|
+ ac_useropt_orig=$ac_useropt
|
|
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
|
+ case $ac_user_opts in
|
|
+ *"
|
|
+"with_$ac_useropt"
|
|
+"*) ;;
|
|
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
|
|
+ ac_unrecognized_sep=', ';;
|
|
+ esac
|
|
+ eval with_$ac_useropt=no ;;
|
|
|
|
--x)
|
|
# Obsolete; use --with-x.
|
|
@@ -990,25 +1043,25 @@
|
|
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
|
x_libraries=$ac_optarg ;;
|
|
|
|
- -*) { echo "$as_me: error: unrecognized option: $ac_option
|
|
-Try \`$0 --help' for more information." >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
|
|
+Try \`$0 --help' for more information"
|
|
;;
|
|
|
|
*=*)
|
|
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
|
|
# Reject names that are not valid shell variable names.
|
|
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
|
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ case $ac_envvar in #(
|
|
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
|
|
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
|
|
+ esac
|
|
eval $ac_envvar=\$ac_optarg
|
|
export $ac_envvar ;;
|
|
|
|
*)
|
|
# FIXME: should be removed in autoconf 3.0.
|
|
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
|
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
|
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
|
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
|
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
|
;;
|
|
|
|
@@ -1017,23 +1070,36 @@
|
|
|
|
if test -n "$ac_prev"; then
|
|
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
|
- { echo "$as_me: error: missing argument to $ac_option" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error $? "missing argument to $ac_option"
|
|
+fi
|
|
+
|
|
+if test -n "$ac_unrecognized_opts"; then
|
|
+ case $enable_option_checking in
|
|
+ no) ;;
|
|
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
|
|
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
|
+ esac
|
|
fi
|
|
|
|
-# Be sure to have absolute directory names.
|
|
+# Check all directory arguments for consistency.
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
libdir localedir mandir
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
+ # Remove trailing slashes.
|
|
+ case $ac_val in
|
|
+ */ )
|
|
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
|
|
+ eval $ac_var=\$ac_val;;
|
|
+ esac
|
|
+ # Be sure to have absolute directory names.
|
|
case $ac_val in
|
|
[\\/$]* | ?:[\\/]* ) continue;;
|
|
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
|
esac
|
|
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
|
|
done
|
|
|
|
# There might be people who depend on the old broken behavior: `$host'
|
|
@@ -1047,8 +1113,8 @@
|
|
if test "x$host_alias" != x; then
|
|
if test "x$build_alias" = x; then
|
|
cross_compiling=maybe
|
|
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
|
- If a cross compiler is detected then cross compile mode will be used." >&2
|
|
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
|
+ If a cross compiler is detected then cross compile mode will be used" >&2
|
|
elif test "x$build_alias" != "x$host_alias"; then
|
|
cross_compiling=yes
|
|
fi
|
|
@@ -1063,23 +1129,21 @@
|
|
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
|
ac_ls_di=`ls -di .` &&
|
|
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
|
- { echo "$as_me: error: Working directory cannot be determined" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error $? "working directory cannot be determined"
|
|
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
|
- { echo "$as_me: error: pwd does not report name of working directory" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error $? "pwd does not report name of working directory"
|
|
|
|
|
|
# Find the source files, if location was not specified.
|
|
if test -z "$srcdir"; then
|
|
ac_srcdir_defaulted=yes
|
|
# Try the directory containing this script, then the parent directory.
|
|
- ac_confdir=`$as_dirname -- "$0" ||
|
|
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$0" : 'X\(//\)[^/]' \| \
|
|
- X"$0" : 'X\(//\)$' \| \
|
|
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$0" |
|
|
+ ac_confdir=`$as_dirname -- "$as_myself" ||
|
|
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$as_myself" : 'X\(//\)[^/]' \| \
|
|
+ X"$as_myself" : 'X\(//\)$' \| \
|
|
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X"$as_myself" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -1106,13 +1170,11 @@
|
|
fi
|
|
if test ! -r "$srcdir/$ac_unique_file"; then
|
|
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
|
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
|
|
fi
|
|
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
|
ac_abs_confdir=`(
|
|
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
|
|
pwd)`
|
|
# When building in place, set srcdir=.
|
|
if test "$ac_abs_confdir" = "$ac_pwd"; then
|
|
@@ -1152,7 +1214,7 @@
|
|
--help=short display options specific to this package
|
|
--help=recursive display the short help of all the included packages
|
|
-V, --version display version information and exit
|
|
- -q, --quiet, --silent do not print \`checking...' messages
|
|
+ -q, --quiet, --silent do not print \`checking ...' messages
|
|
--cache-file=FILE cache test results in FILE [disabled]
|
|
-C, --config-cache alias for \`--cache-file=config.cache'
|
|
-n, --no-create do not create output files
|
|
@@ -1160,9 +1222,9 @@
|
|
|
|
Installation directories:
|
|
--prefix=PREFIX install architecture-independent files in PREFIX
|
|
- [$ac_default_prefix]
|
|
+ [$ac_default_prefix]
|
|
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
|
|
- [PREFIX]
|
|
+ [PREFIX]
|
|
|
|
By default, \`make install' will install all the files in
|
|
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
|
|
@@ -1172,25 +1234,25 @@
|
|
For better control, use the options below.
|
|
|
|
Fine tuning of the installation directories:
|
|
- --bindir=DIR user executables [EPREFIX/bin]
|
|
- --sbindir=DIR system admin executables [EPREFIX/sbin]
|
|
- --libexecdir=DIR program executables [EPREFIX/libexec]
|
|
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
- --libdir=DIR object code libraries [EPREFIX/lib]
|
|
- --includedir=DIR C header files [PREFIX/include]
|
|
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
|
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
|
- --infodir=DIR info documentation [DATAROOTDIR/info]
|
|
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
|
- --mandir=DIR man documentation [DATAROOTDIR/man]
|
|
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
|
|
- --htmldir=DIR html documentation [DOCDIR]
|
|
- --dvidir=DIR dvi documentation [DOCDIR]
|
|
- --pdfdir=DIR pdf documentation [DOCDIR]
|
|
- --psdir=DIR ps documentation [DOCDIR]
|
|
+ --bindir=DIR user executables [EPREFIX/bin]
|
|
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
|
|
+ --libexecdir=DIR program executables [EPREFIX/libexec]
|
|
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
+ --libdir=DIR object code libraries [EPREFIX/lib]
|
|
+ --includedir=DIR C header files [PREFIX/include]
|
|
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
|
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
|
+ --infodir=DIR info documentation [DATAROOTDIR/info]
|
|
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
|
+ --mandir=DIR man documentation [DATAROOTDIR/man]
|
|
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
|
|
+ --htmldir=DIR html documentation [DOCDIR]
|
|
+ --dvidir=DIR dvi documentation [DOCDIR]
|
|
+ --pdfdir=DIR pdf documentation [DOCDIR]
|
|
+ --psdir=DIR ps documentation [DOCDIR]
|
|
_ACEOF
|
|
|
|
cat <<\_ACEOF
|
|
@@ -1207,12 +1269,14 @@
|
|
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
|
nonstandard directory <lib dir>
|
|
LIBS libraries to pass to the linker, e.g. -l<library>
|
|
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
|
|
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
|
you have headers in a nonstandard directory <include dir>
|
|
+ CPP C preprocessor
|
|
|
|
Use these variables to override the choices made by `configure' or to help
|
|
it to find libraries and programs with nonstandard names/locations.
|
|
|
|
+Report bugs to the package provider.
|
|
_ACEOF
|
|
ac_status=$?
|
|
fi
|
|
@@ -1220,15 +1284,17 @@
|
|
if test "$ac_init_help" = "recursive"; then
|
|
# If there are subdirs, report their specific --help.
|
|
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
|
|
- test -d "$ac_dir" || continue
|
|
+ test -d "$ac_dir" ||
|
|
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
|
|
+ continue
|
|
ac_builddir=.
|
|
|
|
case "$ac_dir" in
|
|
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*)
|
|
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
|
# A ".." for each directory in $ac_dir_suffix.
|
|
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
|
case $ac_top_builddir_sub in
|
|
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
@@ -1264,7 +1330,7 @@
|
|
echo &&
|
|
$SHELL "$ac_srcdir/configure" --help=recursive
|
|
else
|
|
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
fi || ac_status=$?
|
|
cd "$ac_pwd" || { ac_status=$?; break; }
|
|
done
|
|
@@ -1274,21 +1340,305 @@
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
configure
|
|
-generated by GNU Autoconf 2.61
|
|
+generated by GNU Autoconf 2.67
|
|
|
|
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
+Copyright (C) 2010 Free Software Foundation, Inc.
|
|
This configure script is free software; the Free Software Foundation
|
|
gives unlimited permission to copy, distribute and modify it.
|
|
_ACEOF
|
|
exit
|
|
fi
|
|
+
|
|
+## ------------------------ ##
|
|
+## Autoconf initialization. ##
|
|
+## ------------------------ ##
|
|
+
|
|
+# ac_fn_c_try_compile LINENO
|
|
+# --------------------------
|
|
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
|
|
+ac_fn_c_try_compile ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ rm -f conftest.$ac_objext
|
|
+ if { { ac_try="$ac_compile"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_compile") 2>conftest.err
|
|
+ ac_status=$?
|
|
+ if test -s conftest.err; then
|
|
+ grep -v '^ *+' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ mv -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest.$ac_objext; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_retval=1
|
|
+fi
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ as_fn_set_status $ac_retval
|
|
+
|
|
+} # ac_fn_c_try_compile
|
|
+
|
|
+# ac_fn_c_try_link LINENO
|
|
+# -----------------------
|
|
+# Try to link conftest.$ac_ext, and return whether this succeeded.
|
|
+ac_fn_c_try_link ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ rm -f conftest.$ac_objext conftest$ac_exeext
|
|
+ if { { ac_try="$ac_link"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_link") 2>conftest.err
|
|
+ ac_status=$?
|
|
+ if test -s conftest.err; then
|
|
+ grep -v '^ *+' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ mv -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest$ac_exeext && {
|
|
+ test "$cross_compiling" = yes ||
|
|
+ $as_test_x conftest$ac_exeext
|
|
+ }; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_retval=1
|
|
+fi
|
|
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
|
|
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
|
|
+ # interfere with the next link command; also delete a directory that is
|
|
+ # left behind by Apple's compiler. We do this before executing the actions.
|
|
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ as_fn_set_status $ac_retval
|
|
+
|
|
+} # ac_fn_c_try_link
|
|
+
|
|
+# ac_fn_c_try_cpp LINENO
|
|
+# ----------------------
|
|
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
|
|
+ac_fn_c_try_cpp ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
|
|
+ ac_status=$?
|
|
+ if test -s conftest.err; then
|
|
+ grep -v '^ *+' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ mv -f conftest.er1 conftest.err
|
|
+ fi
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } > conftest.i && {
|
|
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ }; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_retval=1
|
|
+fi
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ as_fn_set_status $ac_retval
|
|
+
|
|
+} # ac_fn_c_try_cpp
|
|
+
|
|
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
|
+# -------------------------------------------------------
|
|
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
|
+# the include files in INCLUDES and setting the cache variable VAR
|
|
+# accordingly.
|
|
+ac_fn_c_check_header_mongrel ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ if eval "test \"\${$3+set}\"" = set; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if eval "test \"\${$3+set}\"" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+else
|
|
+ # Is the header compilable?
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
|
|
+$as_echo_n "checking $2 usability... " >&6; }
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+#include <$2>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ ac_header_compiler=yes
|
|
+else
|
|
+ ac_header_compiler=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
|
|
+$as_echo "$ac_header_compiler" >&6; }
|
|
+
|
|
+# Is the header present?
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
|
|
+$as_echo_n "checking $2 presence... " >&6; }
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <$2>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
+ ac_header_preproc=yes
|
|
+else
|
|
+ ac_header_preproc=no
|
|
+fi
|
|
+rm -f conftest.err conftest.i conftest.$ac_ext
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
|
+$as_echo "$ac_header_preproc" >&6; }
|
|
+
|
|
+# So? What about this header?
|
|
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
|
|
+ yes:no: )
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
|
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
|
+ ;;
|
|
+ no:yes:* )
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
|
|
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
|
|
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
|
|
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
|
|
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
|
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
|
+ ;;
|
|
+esac
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if eval "test \"\${$3+set}\"" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ eval "$3=\$ac_header_compiler"
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+fi
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+
|
|
+} # ac_fn_c_check_header_mongrel
|
|
+
|
|
+# ac_fn_c_try_run LINENO
|
|
+# ----------------------
|
|
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
|
|
+# that executables *can* be run.
|
|
+ac_fn_c_try_run ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ if { { ac_try="$ac_link"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_link") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
|
|
+ { { case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_try") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; }; then :
|
|
+ ac_retval=0
|
|
+else
|
|
+ $as_echo "$as_me: program exited with status $ac_status" >&5
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_retval=$ac_status
|
|
+fi
|
|
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ as_fn_set_status $ac_retval
|
|
+
|
|
+} # ac_fn_c_try_run
|
|
+
|
|
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
|
+# -------------------------------------------------------
|
|
+# Tests whether HEADER exists and can be compiled using the include files in
|
|
+# INCLUDES, setting the cache variable VAR accordingly.
|
|
+ac_fn_c_check_header_compile ()
|
|
+{
|
|
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
+$as_echo_n "checking for $2... " >&6; }
|
|
+if eval "test \"\${$3+set}\"" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+#include <$2>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ eval "$3=yes"
|
|
+else
|
|
+ eval "$3=no"
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+eval ac_res=\$$3
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+$as_echo "$ac_res" >&6; }
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+
|
|
+} # ac_fn_c_check_header_compile
|
|
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 $as_me, which was
|
|
-generated by GNU Autoconf 2.61. Invocation command line was
|
|
+generated by GNU Autoconf 2.67. Invocation command line was
|
|
|
|
$ $0 $@
|
|
|
|
@@ -1324,8 +1674,8 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- echo "PATH: $as_dir"
|
|
-done
|
|
+ $as_echo "PATH: $as_dir"
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
} >&5
|
|
@@ -1359,12 +1709,12 @@
|
|
| -silent | --silent | --silen | --sile | --sil)
|
|
continue ;;
|
|
*\'*)
|
|
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
esac
|
|
case $ac_pass in
|
|
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
|
|
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
|
|
2)
|
|
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
|
|
+ as_fn_append ac_configure_args1 " '$ac_arg'"
|
|
if test $ac_must_keep_next = true; then
|
|
ac_must_keep_next=false # Got value, back to normal.
|
|
else
|
|
@@ -1380,13 +1730,13 @@
|
|
-* ) ac_must_keep_next=true ;;
|
|
esac
|
|
fi
|
|
- ac_configure_args="$ac_configure_args '$ac_arg'"
|
|
+ as_fn_append ac_configure_args " '$ac_arg'"
|
|
;;
|
|
esac
|
|
done
|
|
done
|
|
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
|
|
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
|
|
+{ ac_configure_args0=; unset ac_configure_args0;}
|
|
+{ ac_configure_args1=; unset ac_configure_args1;}
|
|
|
|
# When interrupted or exit'd, cleanup temporary files, and complete
|
|
# config.log. We remove comments because anyway the quotes in there
|
|
@@ -1398,11 +1748,9 @@
|
|
{
|
|
echo
|
|
|
|
- cat <<\_ASBOX
|
|
-## ---------------- ##
|
|
+ $as_echo "## ---------------- ##
|
|
## Cache variables. ##
|
|
-## ---------------- ##
|
|
-_ASBOX
|
|
+## ---------------- ##"
|
|
echo
|
|
# The following way of writing the cache mishandles newlines in values,
|
|
(
|
|
@@ -1411,12 +1759,13 @@
|
|
case $ac_val in #(
|
|
*${as_nl}*)
|
|
case $ac_var in #(
|
|
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
|
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
|
esac
|
|
case $ac_var in #(
|
|
_ | IFS | as_nl) ;; #(
|
|
- *) $as_unset $ac_var ;;
|
|
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
|
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
|
esac ;;
|
|
esac
|
|
done
|
|
@@ -1435,128 +1784,136 @@
|
|
)
|
|
echo
|
|
|
|
- cat <<\_ASBOX
|
|
-## ----------------- ##
|
|
+ $as_echo "## ----------------- ##
|
|
## Output variables. ##
|
|
-## ----------------- ##
|
|
-_ASBOX
|
|
+## ----------------- ##"
|
|
echo
|
|
for ac_var in $ac_subst_vars
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
case $ac_val in
|
|
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
esac
|
|
- echo "$ac_var='\''$ac_val'\''"
|
|
+ $as_echo "$ac_var='\''$ac_val'\''"
|
|
done | sort
|
|
echo
|
|
|
|
if test -n "$ac_subst_files"; then
|
|
- cat <<\_ASBOX
|
|
-## ------------------- ##
|
|
+ $as_echo "## ------------------- ##
|
|
## File substitutions. ##
|
|
-## ------------------- ##
|
|
-_ASBOX
|
|
+## ------------------- ##"
|
|
echo
|
|
for ac_var in $ac_subst_files
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
case $ac_val in
|
|
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
esac
|
|
- echo "$ac_var='\''$ac_val'\''"
|
|
+ $as_echo "$ac_var='\''$ac_val'\''"
|
|
done | sort
|
|
echo
|
|
fi
|
|
|
|
if test -s confdefs.h; then
|
|
- cat <<\_ASBOX
|
|
-## ----------- ##
|
|
+ $as_echo "## ----------- ##
|
|
## confdefs.h. ##
|
|
-## ----------- ##
|
|
-_ASBOX
|
|
+## ----------- ##"
|
|
echo
|
|
cat confdefs.h
|
|
echo
|
|
fi
|
|
test "$ac_signal" != 0 &&
|
|
- echo "$as_me: caught signal $ac_signal"
|
|
- echo "$as_me: exit $exit_status"
|
|
+ $as_echo "$as_me: caught signal $ac_signal"
|
|
+ $as_echo "$as_me: exit $exit_status"
|
|
} >&5
|
|
rm -f core *.core core.conftest.* &&
|
|
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
|
|
exit $exit_status
|
|
' 0
|
|
for ac_signal in 1 2 13 15; do
|
|
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
|
|
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
|
|
done
|
|
ac_signal=0
|
|
|
|
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
|
rm -f -r conftest* confdefs.h
|
|
|
|
+$as_echo "/* confdefs.h */" > confdefs.h
|
|
+
|
|
# Predefined preprocessor variables.
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_NAME "$PACKAGE_NAME"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_VERSION "$PACKAGE_VERSION"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_STRING "$PACKAGE_STRING"
|
|
_ACEOF
|
|
|
|
-
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
|
|
_ACEOF
|
|
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define PACKAGE_URL "$PACKAGE_URL"
|
|
+_ACEOF
|
|
+
|
|
|
|
# Let the site file select an alternate cache file if it wants to.
|
|
-# Prefer explicitly selected file to automatically selected ones.
|
|
+# Prefer an explicitly selected file to automatically selected ones.
|
|
+ac_site_file1=NONE
|
|
+ac_site_file2=NONE
|
|
if test -n "$CONFIG_SITE"; then
|
|
- set x "$CONFIG_SITE"
|
|
+ # We do not want a PATH search for config.site.
|
|
+ case $CONFIG_SITE in #((
|
|
+ -*) ac_site_file1=./$CONFIG_SITE;;
|
|
+ */*) ac_site_file1=$CONFIG_SITE;;
|
|
+ *) ac_site_file1=./$CONFIG_SITE;;
|
|
+ esac
|
|
elif test "x$prefix" != xNONE; then
|
|
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
|
|
+ ac_site_file1=$prefix/share/config.site
|
|
+ ac_site_file2=$prefix/etc/config.site
|
|
else
|
|
- set x "$ac_default_prefix/share/config.site" \
|
|
- "$ac_default_prefix/etc/config.site"
|
|
+ ac_site_file1=$ac_default_prefix/share/config.site
|
|
+ ac_site_file2=$ac_default_prefix/etc/config.site
|
|
fi
|
|
-shift
|
|
-for ac_site_file
|
|
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
|
|
do
|
|
- if test -r "$ac_site_file"; then
|
|
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
|
-echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
+ test "x$ac_site_file" = xNONE && continue
|
|
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
|
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
sed 's/^/| /' "$ac_site_file" >&5
|
|
- . "$ac_site_file"
|
|
+ . "$ac_site_file" \
|
|
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error $? "failed to load site script $ac_site_file
|
|
+See \`config.log' for more details" "$LINENO" 5 ; }
|
|
fi
|
|
done
|
|
|
|
if test -r "$cache_file"; then
|
|
- # Some versions of bash will fail to source /dev/null (special
|
|
- # files actually), so we avoid doing that.
|
|
- if test -f "$cache_file"; then
|
|
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
|
-echo "$as_me: loading cache $cache_file" >&6;}
|
|
+ # Some versions of bash will fail to source /dev/null (special files
|
|
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
|
|
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
|
|
+$as_echo "$as_me: loading cache $cache_file" >&6;}
|
|
case $cache_file in
|
|
[\\/]* | ?:[\\/]* ) . "$cache_file";;
|
|
*) . "./$cache_file";;
|
|
esac
|
|
fi
|
|
else
|
|
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
|
-echo "$as_me: creating cache $cache_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
|
|
+$as_echo "$as_me: creating cache $cache_file" >&6;}
|
|
>$cache_file
|
|
fi
|
|
|
|
@@ -1570,60 +1927,56 @@
|
|
eval ac_new_val=\$ac_env_${ac_var}_value
|
|
case $ac_old_set,$ac_new_set in
|
|
set,)
|
|
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
|
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
|
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
|
ac_cache_corrupted=: ;;
|
|
,set)
|
|
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
|
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
|
|
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
|
ac_cache_corrupted=: ;;
|
|
,);;
|
|
*)
|
|
if test "x$ac_old_val" != "x$ac_new_val"; then
|
|
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
|
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
|
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
|
|
-echo "$as_me: former value: $ac_old_val" >&2;}
|
|
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
|
|
-echo "$as_me: current value: $ac_new_val" >&2;}
|
|
- ac_cache_corrupted=:
|
|
+ # differences in whitespace do not lead to failure.
|
|
+ ac_old_val_w=`echo x $ac_old_val`
|
|
+ ac_new_val_w=`echo x $ac_new_val`
|
|
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
|
|
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
|
+ ac_cache_corrupted=:
|
|
+ else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
|
|
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
|
|
+ eval $ac_var=\$ac_old_val
|
|
+ fi
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
|
|
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
|
|
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
|
|
fi;;
|
|
esac
|
|
# Pass precious variables to config.status.
|
|
if test "$ac_new_set" = set; then
|
|
case $ac_new_val in
|
|
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
*) ac_arg=$ac_var=$ac_new_val ;;
|
|
esac
|
|
case " $ac_configure_args " in
|
|
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
|
|
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
|
|
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
|
|
esac
|
|
fi
|
|
done
|
|
if $ac_cache_corrupted; then
|
|
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
|
|
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
|
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
|
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
|
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
|
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
|
+fi
|
|
+## -------------------- ##
|
|
+## Main body of script. ##
|
|
+## -------------------- ##
|
|
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -1635,6 +1988,9 @@
|
|
|
|
|
|
|
|
+eap_tnc_cflags=
|
|
+eap_tnc_ldflags=-lnaaeap
|
|
+
|
|
if test x$with_rlm_eap_tnc != xno; then
|
|
|
|
ac_ext=c
|
|
@@ -1645,10 +2001,10 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
|
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -1658,25 +2014,25 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -1685,10 +2041,10 @@
|
|
ac_ct_CC=$CC
|
|
# Extract the first word of "gcc", so it can be a program name with args.
|
|
set dummy gcc; ac_word=$2
|
|
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
@@ -1698,25 +2054,25 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_ac_ct_CC="gcc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
if test -n "$ac_ct_CC"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
+$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
if test "x$ac_ct_CC" = x; then
|
|
@@ -1724,12 +2080,8 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to [email protected]." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to [email protected]." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
CC=$ac_ct_CC
|
|
@@ -1742,10 +2094,10 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
|
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -1755,25 +2107,25 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -1782,10 +2134,10 @@
|
|
if test -z "$CC"; then
|
|
# Extract the first word of "cc", so it can be a program name with args.
|
|
set dummy cc; ac_word=$2
|
|
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -1796,18 +2148,18 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
ac_prog_rejected=yes
|
|
continue
|
|
fi
|
|
ac_cv_prog_CC="cc"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
if test $ac_prog_rejected = yes; then
|
|
@@ -1826,11 +2178,11 @@
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -1841,10 +2193,10 @@
|
|
do
|
|
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
@@ -1854,25 +2206,25 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { echo "$as_me:$LINENO: result: $CC" >&5
|
|
-echo "${ECHO_T}$CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
+$as_echo "$CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -1885,10 +2237,10 @@
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
@@ -1898,25 +2250,25 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
fi
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
if test -n "$ac_ct_CC"; then
|
|
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
+$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
-echo "${ECHO_T}no" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
@@ -1928,12 +2280,8 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to [email protected]." >&5
|
|
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
-whose name does not start with the host triplet. If you think this
|
|
-configuration is useful to you, please write to [email protected]." >&2;}
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
CC=$ac_ct_CC
|
|
@@ -1943,51 +2291,37 @@
|
|
fi
|
|
|
|
|
|
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error $? "no acceptable C compiler found in \$PATH
|
|
+See \`config.log' for more details" "$LINENO" 5 ; }
|
|
|
|
# Provide some information about the compiler.
|
|
-echo "$as_me:$LINENO: checking for C compiler version" >&5
|
|
-ac_compiler=`set X $ac_compile; echo $2`
|
|
-{ (ac_try="$ac_compiler --version >&5"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compiler --version >&5") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -v >&5"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compiler -v >&5") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -V >&5"
|
|
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
|
+set X $ac_compile
|
|
+ac_compiler=$2
|
|
+for ac_option in --version -v -V -qversion; do
|
|
+ { { ac_try="$ac_compiler $ac_option >&5"
|
|
case "(($ac_try" in
|
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
*) ac_try_echo=$ac_try;;
|
|
esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compiler -V >&5") 2>&5
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
+ if test -s conftest.err; then
|
|
+ sed '10a\
|
|
+... rest of stderr output deleted ...
|
|
+ 10q' conftest.err >conftest.er1
|
|
+ cat conftest.er1 >&5
|
|
+ fi
|
|
+ rm -f conftest.er1 conftest.err
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }
|
|
+done
|
|
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -1999,42 +2333,38 @@
|
|
}
|
|
_ACEOF
|
|
ac_clean_files_save=$ac_clean_files
|
|
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
|
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
|
|
# Try to create an executable without -o first, disregard a.out.
|
|
# It will help us diagnose broken compilers, and finding out an intuition
|
|
# of exeext.
|
|
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
|
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
|
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
-#
|
|
-# List of possible output files, starting from the most likely.
|
|
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
|
-# only as a last resort. b.out is created by i960 compilers.
|
|
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
|
-#
|
|
-# The IRIX 6 linker writes into existing files which may not be
|
|
-# executable, retaining their permissions. Remove them first so a
|
|
-# subsequent execution test works.
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
|
+$as_echo_n "checking whether the C compiler works... " >&6; }
|
|
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
+
|
|
+# The possible output files:
|
|
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
|
|
+
|
|
ac_rmfiles=
|
|
for ac_file in $ac_files
|
|
do
|
|
case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
|
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
|
esac
|
|
done
|
|
rm -f $ac_rmfiles
|
|
|
|
-if { (ac_try="$ac_link_default"
|
|
+if { { ac_try="$ac_link_default"
|
|
case "(($ac_try" in
|
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
*) ac_try_echo=$ac_try;;
|
|
esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
(eval "$ac_link_default") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then :
|
|
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
|
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
|
# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
|
@@ -2044,14 +2374,14 @@
|
|
do
|
|
test -f "$ac_file" || continue
|
|
case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
|
|
;;
|
|
[ab].out )
|
|
# We found the default executable, but exeext='' is most
|
|
# certainly right.
|
|
break;;
|
|
*.* )
|
|
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
then :; else
|
|
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
fi
|
|
@@ -2070,116 +2400,132 @@
|
|
else
|
|
ac_file=''
|
|
fi
|
|
-
|
|
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
-echo "${ECHO_T}$ac_file" >&6; }
|
|
-if test -z "$ac_file"; then
|
|
- echo "$as_me: failed program was:" >&5
|
|
+if test -z "$ac_file"; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+$as_echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: C compiler cannot create executables
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 77); exit 77; }; }
|
|
-fi
|
|
-
|
|
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error 77 "C compiler cannot create executables
|
|
+See \`config.log' for more details" "$LINENO" 5 ; }
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
|
|
+$as_echo_n "checking for C compiler default output file name... " >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
|
+$as_echo "$ac_file" >&6; }
|
|
ac_exeext=$ac_cv_exeext
|
|
|
|
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
|
|
+ac_clean_files=$ac_clean_files_save
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
|
|
+$as_echo_n "checking for suffix of executables... " >&6; }
|
|
+if { { ac_try="$ac_link"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_link") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then :
|
|
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
|
|
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
|
|
+# work properly (i.e., refer to `conftest.exe'), while it won't with
|
|
+# `rm'.
|
|
+for ac_file in conftest.exe conftest conftest.*; do
|
|
+ test -f "$ac_file" || continue
|
|
+ case $ac_file in
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
|
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
+ break;;
|
|
+ * ) break;;
|
|
+ esac
|
|
+done
|
|
+else
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
|
|
+See \`config.log' for more details" "$LINENO" 5 ; }
|
|
+fi
|
|
+rm -f conftest conftest$ac_cv_exeext
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
|
+$as_echo "$ac_cv_exeext" >&6; }
|
|
+
|
|
+rm -f conftest.$ac_ext
|
|
+EXEEXT=$ac_cv_exeext
|
|
+ac_exeext=$EXEEXT
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <stdio.h>
|
|
+int
|
|
+main ()
|
|
+{
|
|
+FILE *f = fopen ("conftest.out", "w");
|
|
+ return ferror (f) || fclose (f) != 0;
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+ac_clean_files="$ac_clean_files conftest.out"
|
|
# Check that the compiler produces executables we can run. If not, either
|
|
# the compiler is broken, or we cross compile.
|
|
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
|
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
|
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
|
-# If not cross compiling, check that we can run a simple program.
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
|
+$as_echo_n "checking whether we are cross compiling... " >&6; }
|
|
if test "$cross_compiling" != yes; then
|
|
- if { ac_try='./$ac_file'
|
|
- { (case "(($ac_try" in
|
|
+ { { ac_try="$ac_link"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
+ (eval "$ac_link") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }
|
|
+ if { ac_try='./conftest$ac_cv_exeext'
|
|
+ { { case "(($ac_try" in
|
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
*) ac_try_echo=$ac_try;;
|
|
esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
(eval "$ac_try") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; }; then
|
|
cross_compiling=no
|
|
else
|
|
if test "$cross_compiling" = maybe; then
|
|
cross_compiling=yes
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
|
-If you meant to cross compile, use \`--host'.
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: cannot run C compiled programs.
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error $? "cannot run C compiled programs.
|
|
If you meant to cross compile, use \`--host'.
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+See \`config.log' for more details" "$LINENO" 5 ; }
|
|
fi
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: yes" >&5
|
|
-echo "${ECHO_T}yes" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
|
+$as_echo "$cross_compiling" >&6; }
|
|
|
|
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
|
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
|
|
ac_clean_files=$ac_clean_files_save
|
|
-# Check that the compiler produces executables we can run. If not, either
|
|
-# the compiler is broken, or we cross compile.
|
|
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
|
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
|
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
-echo "${ECHO_T}$cross_compiling" >&6; }
|
|
-
|
|
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
|
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_link") 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
|
|
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
|
|
-# work properly (i.e., refer to `conftest.exe'), while it won't with
|
|
-# `rm'.
|
|
-for ac_file in conftest.exe conftest conftest.*; do
|
|
- test -f "$ac_file" || continue
|
|
- case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
- break;;
|
|
- * ) break;;
|
|
- esac
|
|
-done
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
|
|
+$as_echo_n "checking for suffix of object files... " >&6; }
|
|
+if test "${ac_cv_objext+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-
|
|
-rm -f conftest$ac_cv_exeext
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
|
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
|
-
|
|
-rm -f conftest.$ac_ext
|
|
-EXEEXT=$ac_cv_exeext
|
|
-ac_exeext=$EXEEXT
|
|
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
|
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_objext+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -2191,51 +2537,46 @@
|
|
}
|
|
_ACEOF
|
|
rm -f conftest.o conftest.obj
|
|
-if { (ac_try="$ac_compile"
|
|
+if { { ac_try="$ac_compile"
|
|
case "(($ac_try" in
|
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
*) ac_try_echo=$ac_try;;
|
|
esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo"; } >&5
|
|
(eval "$ac_compile") 2>&5
|
|
ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then :
|
|
for ac_file in conftest.o conftest.obj conftest.*; do
|
|
test -f "$ac_file" || continue;
|
|
case $ac_file in
|
|
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
|
|
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
|
break;;
|
|
esac
|
|
done
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
|
-See \`config.log' for more details." >&5
|
|
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error $? "cannot compute suffix of object files: cannot compile
|
|
+See \`config.log' for more details" "$LINENO" 5 ; }
|
|
fi
|
|
-
|
|
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
-echo "${ECHO_T}$ac_cv_objext" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
|
|
+$as_echo "$ac_cv_objext" >&6; }
|
|
OBJEXT=$ac_cv_objext
|
|
ac_objext=$OBJEXT
|
|
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
|
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
|
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -2249,54 +2590,34 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_compiler_gnu=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_compiler_gnu=no
|
|
+ ac_compiler_gnu=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
|
-GCC=`test $ac_compiler_gnu = yes && echo yes`
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
|
|
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
|
|
+if test $ac_compiler_gnu = yes; then
|
|
+ GCC=yes
|
|
+else
|
|
+ GCC=
|
|
+fi
|
|
ac_test_CFLAGS=${CFLAGS+set}
|
|
ac_save_CFLAGS=$CFLAGS
|
|
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_cc_g+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
|
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
|
+if test "${ac_cv_prog_cc_g+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_save_c_werror_flag=$ac_c_werror_flag
|
|
ac_c_werror_flag=yes
|
|
ac_cv_prog_cc_g=no
|
|
CFLAGS="-g"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -2307,34 +2628,11 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- CFLAGS=""
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ CFLAGS=""
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -2345,35 +2643,12 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- :
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
|
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
+else
|
|
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
|
CFLAGS="-g"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -2384,42 +2659,18 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
ac_c_werror_flag=$ac_save_c_werror_flag
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
|
|
+$as_echo "$ac_cv_prog_cc_g" >&6; }
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
CFLAGS=$ac_save_CFLAGS
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
@@ -2435,18 +2686,14 @@
|
|
CFLAGS=
|
|
fi
|
|
fi
|
|
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
|
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_prog_cc_c89+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
|
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
|
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_cv_prog_cc_c89=no
|
|
ac_save_CC=$CC
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
@@ -2503,31 +2750,9 @@
|
|
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
do
|
|
CC="$ac_save_CC $ac_arg"
|
|
- rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+ if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_c89=$ac_arg
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext
|
|
test "x$ac_cv_prog_cc_c89" != "xno" && break
|
|
done
|
|
@@ -2538,17 +2763,19 @@
|
|
# AC_CACHE_VAL
|
|
case "x$ac_cv_prog_cc_c89" in
|
|
x)
|
|
- { echo "$as_me:$LINENO: result: none needed" >&5
|
|
-echo "${ECHO_T}none needed" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
|
+$as_echo "none needed" >&6; } ;;
|
|
xno)
|
|
- { echo "$as_me:$LINENO: result: unsupported" >&5
|
|
-echo "${ECHO_T}unsupported" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
|
+$as_echo "unsupported" >&6; } ;;
|
|
*)
|
|
CC="$CC $ac_cv_prog_cc_c89"
|
|
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
|
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
|
|
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
|
|
esac
|
|
+if test "x$ac_cv_prog_cc_c89" != xno; then :
|
|
|
|
+fi
|
|
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -2557,81 +2784,474 @@
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
-
|
|
-{ echo "$as_me:$LINENO: checking for exchangeTNCCSMessages in -lTNCS" >&5
|
|
-echo $ECHO_N "checking for exchangeTNCCSMessages in -lTNCS... $ECHO_C" >&6; }
|
|
-if test "${ac_cv_lib_TNCS_exchangeTNCCSMessages+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for processEAPTNCData in -lnaaeap" >&5
|
|
+$as_echo_n "checking for processEAPTNCData in -lnaaeap... " >&6; }
|
|
+if test "${ac_cv_lib_naaeap_processEAPTNCData+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lTNCS $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
+LIBS="-lnaaeap $LIBS"
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+/* Override any GCC internal prototype to avoid an error.
|
|
+ Use char because int might match the return type of a GCC
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+char processEAPTNCData ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return processEAPTNCData ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_lib_naaeap_processEAPTNCData=yes
|
|
+else
|
|
+ ac_cv_lib_naaeap_processEAPTNCData=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_naaeap_processEAPTNCData" >&5
|
|
+$as_echo "$ac_cv_lib_naaeap_processEAPTNCData" >&6; }
|
|
+if test "x$ac_cv_lib_naaeap_processEAPTNCData" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBNAAEAP 1
|
|
+_ACEOF
|
|
+
|
|
+ LIBS="-lnaaeap $LIBS"
|
|
+
|
|
+else
|
|
+ fail="$fail -lnaaeap"
|
|
+fi
|
|
+
|
|
+ if test -x"$ac_cv_lib_NAAEAP_processEAPTNCData" == -x"no"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the NAAEAP library was not found!" >&5
|
|
+$as_echo "$as_me: WARNING: the NAAEAP library was not found!" >&2;}
|
|
+ fail="$fail -lNAAEAP"
|
|
+ fi
|
|
+
|
|
+ ac_ext=c
|
|
+ac_cpp='$CPP $CPPFLAGS'
|
|
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
|
|
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
|
|
+# On Suns, sometimes $CPP names a directory.
|
|
+if test -n "$CPP" && test -d "$CPP"; then
|
|
+ CPP=
|
|
+fi
|
|
+if test -z "$CPP"; then
|
|
+ if test "${ac_cv_prog_CPP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ # Double quotes because CPP needs to be expanded
|
|
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
|
|
+ do
|
|
+ ac_preproc_ok=false
|
|
+for ac_c_preproc_warn_flag in '' yes
|
|
+do
|
|
+ # Use a header file that comes with gcc, so configuring glibc
|
|
+ # with a fresh cross-compiler works.
|
|
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
+ # <limits.h> exists even on freestanding compilers.
|
|
+ # On the NeXT, cc -E runs the code through the compiler's parser,
|
|
+ # not just through cpp. "Syntax error" is here to catch this case.
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#ifdef __STDC__
|
|
+# include <limits.h>
|
|
+#else
|
|
+# include <assert.h>
|
|
+#endif
|
|
+ Syntax error
|
|
+_ACEOF
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
+
|
|
+else
|
|
+ # Broken: fails on valid input.
|
|
+continue
|
|
+fi
|
|
+rm -f conftest.err conftest.i conftest.$ac_ext
|
|
+
|
|
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
+ # can be detected and how.
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <ac_nonexistent.h>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
+ # Broken: success on invalid input.
|
|
+continue
|
|
+else
|
|
+ # Passes both tests.
|
|
+ac_preproc_ok=:
|
|
+break
|
|
+fi
|
|
+rm -f conftest.err conftest.i conftest.$ac_ext
|
|
+
|
|
+done
|
|
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
+rm -f conftest.i conftest.err conftest.$ac_ext
|
|
+if $ac_preproc_ok; then :
|
|
+ break
|
|
+fi
|
|
+
|
|
+ done
|
|
+ ac_cv_prog_CPP=$CPP
|
|
+
|
|
+fi
|
|
+ CPP=$ac_cv_prog_CPP
|
|
+else
|
|
+ ac_cv_prog_CPP=$CPP
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
|
|
+$as_echo "$CPP" >&6; }
|
|
+ac_preproc_ok=false
|
|
+for ac_c_preproc_warn_flag in '' yes
|
|
+do
|
|
+ # Use a header file that comes with gcc, so configuring glibc
|
|
+ # with a fresh cross-compiler works.
|
|
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
+ # <limits.h> exists even on freestanding compilers.
|
|
+ # On the NeXT, cc -E runs the code through the compiler's parser,
|
|
+ # not just through cpp. "Syntax error" is here to catch this case.
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#ifdef __STDC__
|
|
+# include <limits.h>
|
|
+#else
|
|
+# include <assert.h>
|
|
+#endif
|
|
+ Syntax error
|
|
+_ACEOF
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
+
|
|
+else
|
|
+ # Broken: fails on valid input.
|
|
+continue
|
|
+fi
|
|
+rm -f conftest.err conftest.i conftest.$ac_ext
|
|
+
|
|
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
+ # can be detected and how.
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <ac_nonexistent.h>
|
|
+_ACEOF
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
+ # Broken: success on invalid input.
|
|
+continue
|
|
+else
|
|
+ # Passes both tests.
|
|
+ac_preproc_ok=:
|
|
+break
|
|
+fi
|
|
+rm -f conftest.err conftest.i conftest.$ac_ext
|
|
+
|
|
+done
|
|
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
+rm -f conftest.i conftest.err conftest.$ac_ext
|
|
+if $ac_preproc_ok; then :
|
|
+
|
|
+else
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
|
+See \`config.log' for more details" "$LINENO" 5 ; }
|
|
+fi
|
|
+
|
|
+ac_ext=c
|
|
+ac_cpp='$CPP $CPPFLAGS'
|
|
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
+
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
|
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
|
+if test "${ac_cv_path_GREP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ if test -z "$GREP"; then
|
|
+ ac_path_GREP_found=false
|
|
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_prog in grep ggrep; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
+# Check for GNU ac_path_GREP and select it if it is found.
|
|
+ # Check for GNU $ac_path_GREP
|
|
+case `"$ac_path_GREP" --version 2>&1` in
|
|
+*GNU*)
|
|
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
|
+*)
|
|
+ ac_count=0
|
|
+ $as_echo_n 0123456789 >"conftest.in"
|
|
+ while :
|
|
+ do
|
|
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
+ mv "conftest.tmp" "conftest.in"
|
|
+ cp "conftest.in" "conftest.nl"
|
|
+ $as_echo 'GREP' >> "conftest.nl"
|
|
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
|
+ # Best one so far, save it but keep looking for a better one
|
|
+ ac_cv_path_GREP="$ac_path_GREP"
|
|
+ ac_path_GREP_max=$ac_count
|
|
+ fi
|
|
+ # 10*(2^10) chars as input seems more than enough
|
|
+ test $ac_count -gt 10 && break
|
|
+ done
|
|
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
+esac
|
|
+
|
|
+ $ac_path_GREP_found && break 3
|
|
+ done
|
|
+ done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+ if test -z "$ac_cv_path_GREP"; then
|
|
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
+ fi
|
|
+else
|
|
+ ac_cv_path_GREP=$GREP
|
|
+fi
|
|
+
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
|
|
+$as_echo "$ac_cv_path_GREP" >&6; }
|
|
+ GREP="$ac_cv_path_GREP"
|
|
+
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
|
+$as_echo_n "checking for egrep... " >&6; }
|
|
+if test "${ac_cv_path_EGREP+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
|
+ then ac_cv_path_EGREP="$GREP -E"
|
|
+ else
|
|
+ if test -z "$EGREP"; then
|
|
+ ac_path_EGREP_found=false
|
|
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_prog in egrep; do
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
+# Check for GNU ac_path_EGREP and select it if it is found.
|
|
+ # Check for GNU $ac_path_EGREP
|
|
+case `"$ac_path_EGREP" --version 2>&1` in
|
|
+*GNU*)
|
|
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
|
+*)
|
|
+ ac_count=0
|
|
+ $as_echo_n 0123456789 >"conftest.in"
|
|
+ while :
|
|
+ do
|
|
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
+ mv "conftest.tmp" "conftest.in"
|
|
+ cp "conftest.in" "conftest.nl"
|
|
+ $as_echo 'EGREP' >> "conftest.nl"
|
|
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
|
+ # Best one so far, save it but keep looking for a better one
|
|
+ ac_cv_path_EGREP="$ac_path_EGREP"
|
|
+ ac_path_EGREP_max=$ac_count
|
|
+ fi
|
|
+ # 10*(2^10) chars as input seems more than enough
|
|
+ test $ac_count -gt 10 && break
|
|
+ done
|
|
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
+esac
|
|
+
|
|
+ $ac_path_EGREP_found && break 3
|
|
+ done
|
|
+ done
|
|
+ done
|
|
+IFS=$as_save_IFS
|
|
+ if test -z "$ac_cv_path_EGREP"; then
|
|
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
+ fi
|
|
+else
|
|
+ ac_cv_path_EGREP=$EGREP
|
|
+fi
|
|
+
|
|
+ fi
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
|
|
+$as_echo "$ac_cv_path_EGREP" >&6; }
|
|
+ EGREP="$ac_cv_path_EGREP"
|
|
+
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
|
+$as_echo_n "checking for ANSI C header files... " >&6; }
|
|
+if test "${ac_cv_header_stdc+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <stdlib.h>
|
|
+#include <stdarg.h>
|
|
+#include <string.h>
|
|
+#include <float.h>
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ ac_cv_header_stdc=yes
|
|
+else
|
|
+ ac_cv_header_stdc=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+
|
|
+if test $ac_cv_header_stdc = yes; then
|
|
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <string.h>
|
|
+
|
|
_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
+ $EGREP "memchr" >/dev/null 2>&1; then :
|
|
+
|
|
+else
|
|
+ ac_cv_header_stdc=no
|
|
+fi
|
|
+rm -f conftest*
|
|
+
|
|
+fi
|
|
+
|
|
+if test $ac_cv_header_stdc = yes; then
|
|
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <stdlib.h>
|
|
+
|
|
+_ACEOF
|
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
+ $EGREP "free" >/dev/null 2>&1; then :
|
|
+
|
|
+else
|
|
+ ac_cv_header_stdc=no
|
|
+fi
|
|
+rm -f conftest*
|
|
+
|
|
+fi
|
|
+
|
|
+if test $ac_cv_header_stdc = yes; then
|
|
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
|
|
+ if test "$cross_compiling" = yes; then :
|
|
+ :
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
+#include <ctype.h>
|
|
+#include <stdlib.h>
|
|
+#if ((' ' & 0x0FF) == 0x020)
|
|
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
+#else
|
|
+# define ISLOWER(c) \
|
|
+ (('a' <= (c) && (c) <= 'i') \
|
|
+ || ('j' <= (c) && (c) <= 'r') \
|
|
+ || ('s' <= (c) && (c) <= 'z'))
|
|
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
|
|
#endif
|
|
-char exchangeTNCCSMessages ();
|
|
+
|
|
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
|
|
int
|
|
main ()
|
|
{
|
|
-return exchangeTNCCSMessages ();
|
|
- ;
|
|
+ int i;
|
|
+ for (i = 0; i < 256; i++)
|
|
+ if (XOR (islower (i), ISLOWER (i))
|
|
+ || toupper (i) != TOUPPER (i))
|
|
+ return 2;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext &&
|
|
- $as_test_x conftest$ac_exeext; then
|
|
- ac_cv_lib_TNCS_exchangeTNCCSMessages=yes
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
+
|
|
else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_header_stdc=no
|
|
+fi
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
+fi
|
|
|
|
- ac_cv_lib_TNCS_exchangeTNCCSMessages=no
|
|
fi
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
|
|
+$as_echo "$ac_cv_header_stdc" >&6; }
|
|
+if test $ac_cv_header_stdc = yes; then
|
|
+
|
|
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_TNCS_exchangeTNCCSMessages" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_TNCS_exchangeTNCCSMessages" >&6; }
|
|
-if test $ac_cv_lib_TNCS_exchangeTNCCSMessages = yes; then
|
|
+
|
|
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
|
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
|
+ inttypes.h stdint.h unistd.h
|
|
+do :
|
|
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
|
+"
|
|
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LIBTNCS 1
|
|
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lTNCS $LIBS"
|
|
+fi
|
|
+
|
|
+done
|
|
+
|
|
+
|
|
+for ac_header in naaeap/naaeap.h
|
|
+do :
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "naaeap/naaeap.h" "ac_cv_header_naaeap_naaeap_h" "$ac_includes_default"
|
|
+if test "x$ac_cv_header_naaeap_naaeap_h" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_NAAEAP_NAAEAP_H 1
|
|
+_ACEOF
|
|
|
|
+else
|
|
+ fail="$fail -Inaaeap.h"
|
|
fi
|
|
|
|
- if test "x$ac_cv_lib_tncs_exchangetnccsmessages" != xyes; then
|
|
- { echo "$as_me:$LINENO: WARNING: the TNCS library isn't found!" >&5
|
|
-echo "$as_me: WARNING: the TNCS library isn't found!" >&2;}
|
|
- fail="$fail -lTNCS"
|
|
+done
|
|
+
|
|
+ if test -x"$ac_cv_header_naaeap_h" == -x"no"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the naaeap header was not found!" >&5
|
|
+$as_echo "$as_me: WARNING: the naaeap header was not found!" >&2;}
|
|
+ fail="$fail -Inaaeap.h"
|
|
fi
|
|
|
|
targetname=rlm_eap_tnc
|
|
@@ -2642,14 +3262,12 @@
|
|
|
|
if test x"$fail" != x""; then
|
|
if test x"${enable_strict_dependencies}" = x"yes"; then
|
|
- { { echo "$as_me:$LINENO: error: set --without-rlm_eap_tnc to disable it explicitly." >&5
|
|
-echo "$as_me: error: set --without-rlm_eap_tnc to disable it explicitly." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error $? "set --without-rlm_eap_tnc to disable it explicitly." "$LINENO" 5
|
|
else
|
|
- { echo "$as_me:$LINENO: WARNING: silently not building rlm_eap_tnc." >&5
|
|
-echo "$as_me: WARNING: silently not building rlm_eap_tnc." >&2;}
|
|
- { echo "$as_me:$LINENO: WARNING: FAILURE: rlm_eap_tnc requires: $fail." >&5
|
|
-echo "$as_me: WARNING: FAILURE: rlm_eap_tnc requires: $fail." >&2;};
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently not building rlm_eap_tnc." >&5
|
|
+$as_echo "$as_me: WARNING: silently not building rlm_eap_tnc." >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FAILURE: rlm_eap_tnc requires: $fail." >&5
|
|
+$as_echo "$as_me: WARNING: FAILURE: rlm_eap_tnc requires: $fail." >&2;};
|
|
targetname=""
|
|
fi
|
|
fi
|
|
@@ -2658,11 +3276,7 @@
|
|
|
|
|
|
|
|
-
|
|
- unset ac_cv_env_LIBS_set
|
|
- unset ac_cv_env_LIBS_value
|
|
-
|
|
- ac_config_files="$ac_config_files Makefile"
|
|
+ac_config_files="$ac_config_files Makefile"
|
|
|
|
cat >confcache <<\_ACEOF
|
|
# This file is a shell script that caches the results of configure
|
|
@@ -2691,12 +3305,13 @@
|
|
case $ac_val in #(
|
|
*${as_nl}*)
|
|
case $ac_var in #(
|
|
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
|
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
|
esac
|
|
case $ac_var in #(
|
|
_ | IFS | as_nl) ;; #(
|
|
- *) $as_unset $ac_var ;;
|
|
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
|
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
|
esac ;;
|
|
esac
|
|
done
|
|
@@ -2704,8 +3319,8 @@
|
|
(set) 2>&1 |
|
|
case $as_nl`(ac_space=' '; set) 2>&1` in #(
|
|
*${as_nl}ac_space=\ *)
|
|
- # `set' does not quote correctly, so add quotes (double-quote
|
|
- # substitution turns \\\\ into \\, and sed turns \\ into \).
|
|
+ # `set' does not quote correctly, so add quotes: double-quote
|
|
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
|
|
sed -n \
|
|
"s/'/'\\\\''/g;
|
|
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
|
|
@@ -2728,12 +3343,12 @@
|
|
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
|
if test -w "$cache_file"; then
|
|
test "x$cache_file" != "x/dev/null" &&
|
|
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
|
-echo "$as_me: updating cache $cache_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
|
|
+$as_echo "$as_me: updating cache $cache_file" >&6;}
|
|
cat confcache >$cache_file
|
|
else
|
|
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
|
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
|
|
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
|
fi
|
|
fi
|
|
rm -f confcache
|
|
@@ -2750,6 +3365,12 @@
|
|
# take arguments), then branch to the quote section. Otherwise,
|
|
# look for a macro that doesn't take arguments.
|
|
ac_script='
|
|
+:mline
|
|
+/\\$/{
|
|
+ N
|
|
+ s,\\\n,,
|
|
+ b mline
|
|
+}
|
|
t clear
|
|
:clear
|
|
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
|
|
@@ -2776,14 +3397,15 @@
|
|
|
|
ac_libobjs=
|
|
ac_ltlibobjs=
|
|
+U=
|
|
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
|
# 1. Remove the extension, and $U if already installed.
|
|
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
|
- ac_i=`echo "$ac_i" | sed "$ac_script"`
|
|
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
|
|
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
|
# will be set to the directory where LIBOBJS objects are built.
|
|
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
|
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
|
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
done
|
|
LIBOBJS=$ac_libobjs
|
|
|
|
@@ -2792,11 +3414,13 @@
|
|
|
|
|
|
: ${CONFIG_STATUS=./config.status}
|
|
+ac_write_fail=0
|
|
ac_clean_files_save=$ac_clean_files
|
|
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
|
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
|
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
|
-cat >$CONFIG_STATUS <<_ACEOF
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
|
|
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
|
+as_write_fail=0
|
|
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
|
|
#! $SHELL
|
|
# Generated by $as_me.
|
|
# Run this file to recreate the current configuration.
|
|
@@ -2806,59 +3430,79 @@
|
|
debug=false
|
|
ac_cs_recheck=false
|
|
ac_cs_silent=false
|
|
-SHELL=\${CONFIG_SHELL-$SHELL}
|
|
-_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
-## --------------------- ##
|
|
-## M4sh Initialization. ##
|
|
-## --------------------- ##
|
|
+SHELL=\${CONFIG_SHELL-$SHELL}
|
|
+export SHELL
|
|
+_ASEOF
|
|
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
|
|
+## -------------------- ##
|
|
+## M4sh Initialization. ##
|
|
+## -------------------- ##
|
|
|
|
# Be more Bourne compatible
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
|
emulate sh
|
|
NULLCMD=:
|
|
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
|
# is contrary to our usage. Disable this feature.
|
|
alias -g '${1+"$@"}'='"$@"'
|
|
setopt NO_GLOB_SUBST
|
|
else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
+ case `(set -o) 2>/dev/null` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
esac
|
|
-
|
|
fi
|
|
|
|
|
|
-
|
|
-
|
|
-# PATH needs CR
|
|
-# Avoid depending upon Character Ranges.
|
|
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
-as_cr_digits='0123456789'
|
|
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
-
|
|
-# The user is always right.
|
|
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
- echo "#! /bin/sh" >conf$$.sh
|
|
- echo "exit 0" >>conf$$.sh
|
|
- chmod +x conf$$.sh
|
|
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
- PATH_SEPARATOR=';'
|
|
+as_nl='
|
|
+'
|
|
+export as_nl
|
|
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
|
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
|
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
|
+# but without wasting forks for bash or zsh.
|
|
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
|
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='print -r --'
|
|
+ as_echo_n='print -rn --'
|
|
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+ as_echo='printf %s\n'
|
|
+ as_echo_n='printf %s'
|
|
+else
|
|
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
|
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
|
+ as_echo_n='/usr/ucb/echo -n'
|
|
else
|
|
- PATH_SEPARATOR=:
|
|
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
|
+ as_echo_n_body='eval
|
|
+ arg=$1;
|
|
+ case $arg in #(
|
|
+ *"$as_nl"*)
|
|
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
|
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
|
+ esac;
|
|
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
|
+ '
|
|
+ export as_echo_n_body
|
|
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
|
fi
|
|
- rm -f conf$$.sh
|
|
+ export as_echo_body
|
|
+ as_echo='sh -c $as_echo_body as_echo'
|
|
fi
|
|
|
|
-# Support unset when possible.
|
|
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
- as_unset=unset
|
|
-else
|
|
- as_unset=false
|
|
+# The user is always right.
|
|
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
+ PATH_SEPARATOR=:
|
|
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
|
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
|
+ PATH_SEPARATOR=';'
|
|
+ }
|
|
fi
|
|
|
|
|
|
@@ -2867,20 +3511,18 @@
|
|
# there to prevent editors from complaining about space-tab.
|
|
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
# splitting by setting IFS to empty value.)
|
|
-as_nl='
|
|
-'
|
|
IFS=" "" $as_nl"
|
|
|
|
# Find who we are. Look in the path if we contain no directory separator.
|
|
-case $0 in
|
|
+case $0 in #((
|
|
*[\\/]* ) as_myself=$0 ;;
|
|
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
-done
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -2891,32 +3533,111 @@
|
|
as_myself=$0
|
|
fi
|
|
if test ! -f "$as_myself"; then
|
|
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
- { (exit 1); exit 1; }
|
|
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
+ exit 1
|
|
fi
|
|
|
|
-# Work around bugs in pre-3.0 UWIN ksh.
|
|
-for as_var in ENV MAIL MAILPATH
|
|
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
+# Unset variables that we do not need and which cause bugs (e.g. in
|
|
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
|
+# suppresses any "Segmentation fault" message there. '((' could
|
|
+# trigger a bug in pdksh 5.2.14.
|
|
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
|
+do eval test x\${$as_var+set} = xset \
|
|
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
|
done
|
|
PS1='$ '
|
|
PS2='> '
|
|
PS4='+ '
|
|
|
|
# NLS nuisances.
|
|
-for as_var in \
|
|
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
|
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
|
- LC_TELEPHONE LC_TIME
|
|
-do
|
|
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
- eval $as_var=C; export $as_var
|
|
- else
|
|
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
+LC_ALL=C
|
|
+export LC_ALL
|
|
+LANGUAGE=C
|
|
+export LANGUAGE
|
|
+
|
|
+# CDPATH.
|
|
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
+
|
|
+
|
|
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
|
+# ----------------------------------------
|
|
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
|
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
|
+# script with STATUS, using 1 if that was 0.
|
|
+as_fn_error ()
|
|
+{
|
|
+ as_status=$1; test $as_status -eq 0 && as_status=1
|
|
+ if test "$4"; then
|
|
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
|
fi
|
|
-done
|
|
+ $as_echo "$as_me: error: $2" >&2
|
|
+ as_fn_exit $as_status
|
|
+} # as_fn_error
|
|
+
|
|
+
|
|
+# as_fn_set_status STATUS
|
|
+# -----------------------
|
|
+# Set $? to STATUS, without forking.
|
|
+as_fn_set_status ()
|
|
+{
|
|
+ return $1
|
|
+} # as_fn_set_status
|
|
+
|
|
+# as_fn_exit STATUS
|
|
+# -----------------
|
|
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
|
+as_fn_exit ()
|
|
+{
|
|
+ set +e
|
|
+ as_fn_set_status $1
|
|
+ exit $1
|
|
+} # as_fn_exit
|
|
+
|
|
+# as_fn_unset VAR
|
|
+# ---------------
|
|
+# Portably unset VAR.
|
|
+as_fn_unset ()
|
|
+{
|
|
+ { eval $1=; unset $1;}
|
|
+}
|
|
+as_unset=as_fn_unset
|
|
+# as_fn_append VAR VALUE
|
|
+# ----------------------
|
|
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
|
+# advantage of any shell optimizations that allow amortized linear growth over
|
|
+# repeated appends, instead of the typical quadratic growth present in naive
|
|
+# implementations.
|
|
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
|
+ eval 'as_fn_append ()
|
|
+ {
|
|
+ eval $1+=\$2
|
|
+ }'
|
|
+else
|
|
+ as_fn_append ()
|
|
+ {
|
|
+ eval $1=\$$1\$2
|
|
+ }
|
|
+fi # as_fn_append
|
|
+
|
|
+# as_fn_arith ARG...
|
|
+# ------------------
|
|
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
|
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
|
+# must be portable across $(()) and expr.
|
|
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
|
+ eval 'as_fn_arith ()
|
|
+ {
|
|
+ as_val=$(( $* ))
|
|
+ }'
|
|
+else
|
|
+ as_fn_arith ()
|
|
+ {
|
|
+ as_val=`expr "$@" || test $? -eq 1`
|
|
+ }
|
|
+fi # as_fn_arith
|
|
+
|
|
|
|
-# Required to use basename.
|
|
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
as_expr=expr
|
|
@@ -2930,13 +3651,17 @@
|
|
as_basename=false
|
|
fi
|
|
|
|
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
+ as_dirname=dirname
|
|
+else
|
|
+ as_dirname=false
|
|
+fi
|
|
|
|
-# Name of the executable.
|
|
as_me=`$as_basename -- "$0" ||
|
|
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
X"$0" : 'X\(//\)$' \| \
|
|
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X/"$0" |
|
|
+$as_echo X/"$0" |
|
|
sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -2951,104 +3676,103 @@
|
|
}
|
|
s/.*/./; q'`
|
|
|
|
-# CDPATH.
|
|
-$as_unset CDPATH
|
|
-
|
|
-
|
|
-
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
-
|
|
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
- # uniformly replaced by the line number. The first 'sed' inserts a
|
|
- # line-number line after each line using $LINENO; the second 'sed'
|
|
- # does the real work. The second script uses 'N' to pair each
|
|
- # line-number line with the line containing $LINENO, and appends
|
|
- # trailing '-' during substitution so that $LINENO is not a special
|
|
- # case at line end.
|
|
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
- sed -n '
|
|
- p
|
|
- /[$]LINENO/=
|
|
- ' <$as_myself |
|
|
- sed '
|
|
- s/[$]LINENO.*/&-/
|
|
- t lineno
|
|
- b
|
|
- :lineno
|
|
- N
|
|
- :loop
|
|
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
|
- t loop
|
|
- s/-\n.*//
|
|
- ' >$as_me.lineno &&
|
|
- chmod +x "$as_me.lineno" ||
|
|
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
-
|
|
- # Don't try to exec as it changes $[0], causing all sort of problems
|
|
- # (the dirname of $[0] is not the place where we might find the
|
|
- # original and so on. Autoconf is especially sensitive to this).
|
|
- . "./$as_me.lineno"
|
|
- # Exit status is that of the last command.
|
|
- exit
|
|
-}
|
|
-
|
|
-
|
|
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
- as_dirname=dirname
|
|
-else
|
|
- as_dirname=false
|
|
-fi
|
|
+# Avoid depending upon Character Ranges.
|
|
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
+as_cr_digits='0123456789'
|
|
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
|
ECHO_C= ECHO_N= ECHO_T=
|
|
-case `echo -n x` in
|
|
+case `echo -n x` in #(((((
|
|
-n*)
|
|
- case `echo 'x\c'` in
|
|
+ case `echo 'xy\c'` in
|
|
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
- *) ECHO_C='\c';;
|
|
+ xy) ECHO_C='\c';;
|
|
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
|
+ ECHO_T=' ';;
|
|
esac;;
|
|
*)
|
|
ECHO_N='-n';;
|
|
esac
|
|
|
|
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
-
|
|
rm -f conf$$ conf$$.exe conf$$.file
|
|
if test -d conf$$.dir; then
|
|
rm -f conf$$.dir/conf$$.file
|
|
else
|
|
rm -f conf$$.dir
|
|
- mkdir conf$$.dir
|
|
+ mkdir conf$$.dir 2>/dev/null
|
|
fi
|
|
-echo >conf$$.file
|
|
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s='ln -s'
|
|
- # ... but there are two gotchas:
|
|
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -p'.
|
|
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+if (echo >conf$$.file) 2>/dev/null; then
|
|
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s='ln -s'
|
|
+ # ... but there are two gotchas:
|
|
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
+ as_ln_s='cp -p'
|
|
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
+ as_ln_s=ln
|
|
+ else
|
|
as_ln_s='cp -p'
|
|
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
- as_ln_s=ln
|
|
+ fi
|
|
else
|
|
as_ln_s='cp -p'
|
|
fi
|
|
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
rmdir conf$$.dir 2>/dev/null
|
|
|
|
+
|
|
+# as_fn_mkdir_p
|
|
+# -------------
|
|
+# Create "$as_dir" as a directory, including parents if necessary.
|
|
+as_fn_mkdir_p ()
|
|
+{
|
|
+
|
|
+ case $as_dir in #(
|
|
+ -*) as_dir=./$as_dir;;
|
|
+ esac
|
|
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
|
+ as_dirs=
|
|
+ while :; do
|
|
+ case $as_dir in #(
|
|
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
|
+ *) as_qdir=$as_dir;;
|
|
+ esac
|
|
+ as_dirs="'$as_qdir' $as_dirs"
|
|
+ as_dir=`$as_dirname -- "$as_dir" ||
|
|
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
+ X"$as_dir" : 'X\(//\)$' \| \
|
|
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X"$as_dir" |
|
|
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)[^/].*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
+ test -d "$as_dir" && break
|
|
+ done
|
|
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
|
+
|
|
+
|
|
+} # as_fn_mkdir_p
|
|
if mkdir -p . 2>/dev/null; then
|
|
- as_mkdir_p=:
|
|
+ as_mkdir_p='mkdir -p "$as_dir"'
|
|
else
|
|
test -d ./-p && rmdir ./-p
|
|
as_mkdir_p=false
|
|
@@ -3065,12 +3789,12 @@
|
|
as_test_x='
|
|
eval sh -c '\''
|
|
if test -d "$1"; then
|
|
- test -d "$1/.";
|
|
+ test -d "$1/.";
|
|
else
|
|
- case $1 in
|
|
- -*)set "./$1";;
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
esac;
|
|
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
???[sx]*):;;*)false;;esac;fi
|
|
'\'' sh
|
|
'
|
|
@@ -3085,13 +3809,19 @@
|
|
|
|
|
|
exec 6>&1
|
|
+## ----------------------------------- ##
|
|
+## Main body of $CONFIG_STATUS script. ##
|
|
+## ----------------------------------- ##
|
|
+_ASEOF
|
|
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
|
|
|
|
-# Save the log message, to keep $[0] and so on meaningful, and to
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
+# Save the log message, to keep $0 and so on meaningful, and to
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
This file was extended by $as_me, which was
|
|
-generated by GNU Autoconf 2.61. Invocation command line was
|
|
+generated by GNU Autoconf 2.67. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
CONFIG_HEADERS = $CONFIG_HEADERS
|
|
@@ -3104,59 +3834,74 @@
|
|
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+case $ac_config_files in *"
|
|
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
|
|
+esac
|
|
+
|
|
+
|
|
+
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
# Files that config.status was made for.
|
|
config_files="$ac_config_files"
|
|
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
ac_cs_usage="\
|
|
-\`$as_me' instantiates files from templates according to the
|
|
-current configuration.
|
|
+\`$as_me' instantiates files and other configuration actions
|
|
+from templates according to the current configuration. Unless the files
|
|
+and actions are specified as TAGs, all are instantiated by default.
|
|
|
|
-Usage: $0 [OPTIONS] [FILE]...
|
|
+Usage: $0 [OPTION]... [TAG]...
|
|
|
|
-h, --help print this help, then exit
|
|
-V, --version print version number and configuration settings, then exit
|
|
- -q, --quiet do not print progress messages
|
|
+ --config print configuration, then exit
|
|
+ -q, --quiet, --silent
|
|
+ do not print progress messages
|
|
-d, --debug don't remove temporary files
|
|
--recheck update $as_me by reconfiguring in the same conditions
|
|
- --file=FILE[:TEMPLATE]
|
|
- instantiate the configuration file FILE
|
|
+ --file=FILE[:TEMPLATE]
|
|
+ instantiate the configuration file FILE
|
|
|
|
Configuration files:
|
|
$config_files
|
|
|
|
-Report bugs to <[email protected]>."
|
|
+Report bugs to the package provider."
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
config.status
|
|
-configured by $0, generated by GNU Autoconf 2.61,
|
|
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
+configured by $0, generated by GNU Autoconf 2.67,
|
|
+ with options \\"\$ac_cs_config\\"
|
|
|
|
-Copyright (C) 2006 Free Software Foundation, Inc.
|
|
+Copyright (C) 2010 Free Software Foundation, Inc.
|
|
This config.status script is free software; the Free Software Foundation
|
|
gives unlimited permission to copy, distribute and modify it."
|
|
|
|
ac_pwd='$ac_pwd'
|
|
srcdir='$srcdir'
|
|
+test -n "\$AWK" || AWK=awk
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
-# If no file are specified by the user, then we need to provide default
|
|
-# value. By we need to know if files were specified by the user.
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
+# The default lists apply if the user does not specify any file.
|
|
ac_need_defaults=:
|
|
while test $# != 0
|
|
do
|
|
case $1 in
|
|
- --*=*)
|
|
+ --*=?*)
|
|
ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
|
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
|
ac_shift=:
|
|
;;
|
|
+ --*=)
|
|
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
|
+ ac_optarg=
|
|
+ ac_shift=:
|
|
+ ;;
|
|
*)
|
|
ac_option=$1
|
|
ac_optarg=$2
|
|
@@ -3169,25 +3914,30 @@
|
|
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
|
ac_cs_recheck=: ;;
|
|
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
|
- echo "$ac_cs_version"; exit ;;
|
|
+ $as_echo "$ac_cs_version"; exit ;;
|
|
+ --config | --confi | --conf | --con | --co | --c )
|
|
+ $as_echo "$ac_cs_config"; exit ;;
|
|
--debug | --debu | --deb | --de | --d | -d )
|
|
debug=: ;;
|
|
--file | --fil | --fi | --f )
|
|
$ac_shift
|
|
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
|
|
+ case $ac_optarg in
|
|
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ '') as_fn_error $? "missing file argument" ;;
|
|
+ esac
|
|
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
|
|
ac_need_defaults=false;;
|
|
--he | --h | --help | --hel | -h )
|
|
- echo "$ac_cs_usage"; exit ;;
|
|
+ $as_echo "$ac_cs_usage"; exit ;;
|
|
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
| -silent | --silent | --silen | --sile | --sil | --si | --s)
|
|
ac_cs_silent=: ;;
|
|
|
|
# This is an error.
|
|
- -*) { echo "$as_me: error: unrecognized option: $1
|
|
-Try \`$0 --help' for more information." >&2
|
|
- { (exit 1); exit 1; }; } ;;
|
|
+ -*) as_fn_error $? "unrecognized option: \`$1'
|
|
+Try \`$0 --help' for more information." ;;
|
|
|
|
- *) ac_config_targets="$ac_config_targets $1"
|
|
+ *) as_fn_append ac_config_targets " $1"
|
|
ac_need_defaults=false ;;
|
|
|
|
esac
|
|
@@ -3202,30 +3952,32 @@
|
|
fi
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
if \$ac_cs_recheck; then
|
|
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
|
- CONFIG_SHELL=$SHELL
|
|
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
+ shift
|
|
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
|
|
+ CONFIG_SHELL='$SHELL'
|
|
export CONFIG_SHELL
|
|
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
+ exec "\$@"
|
|
fi
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
exec 5>>config.log
|
|
{
|
|
echo
|
|
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
## Running $as_me. ##
|
|
_ASBOX
|
|
- echo "$ac_log"
|
|
+ $as_echo "$ac_log"
|
|
} >&5
|
|
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
|
|
# Handling of arguments.
|
|
for ac_config_target in $ac_config_targets
|
|
@@ -3233,9 +3985,7 @@
|
|
case $ac_config_target in
|
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
|
|
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
|
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
|
|
esac
|
|
done
|
|
|
|
@@ -3260,7 +4010,7 @@
|
|
trap 'exit_status=$?
|
|
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
|
' 0
|
|
- trap '{ (exit 1); exit 1; }' 1 2 13 15
|
|
+ trap 'as_fn_exit 1' 1 2 13 15
|
|
}
|
|
# Create a (secure) tmp directory for tmp files.
|
|
|
|
@@ -3271,145 +4021,177 @@
|
|
{
|
|
tmp=./conf$$-$RANDOM
|
|
(umask 077 && mkdir "$tmp")
|
|
-} ||
|
|
-{
|
|
- echo "$me: cannot create a temporary directory in ." >&2
|
|
- { (exit 1); exit 1; }
|
|
-}
|
|
-
|
|
-#
|
|
-# Set up the sed scripts for CONFIG_FILES section.
|
|
-#
|
|
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
|
|
|
|
-# No need to generate the scripts if there are no CONFIG_FILES.
|
|
-# This happens for instance when ./config.status config.h
|
|
+# Set up the scripts for CONFIG_FILES section.
|
|
+# No need to generate them if there are no CONFIG_FILES.
|
|
+# This happens for instance with `./config.status config.h'.
|
|
if test -n "$CONFIG_FILES"; then
|
|
|
|
-_ACEOF
|
|
|
|
+ac_cr=`echo X | tr X '\015'`
|
|
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
|
|
+# But we know of no other shell where ac_cr would be empty at this
|
|
+# point, so we can use a bashism as a fallback.
|
|
+if test "x$ac_cr" = x; then
|
|
+ eval ac_cr=\$\'\\r\'
|
|
+fi
|
|
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
|
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
|
+ ac_cs_awk_cr='\\r'
|
|
+else
|
|
+ ac_cs_awk_cr=$ac_cr
|
|
+fi
|
|
+
|
|
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
|
+_ACEOF
|
|
|
|
|
|
+{
|
|
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
|
|
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
|
+ echo "_ACEOF"
|
|
+} >conf$$subs.sh ||
|
|
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
|
|
ac_delim='%!_!# '
|
|
for ac_last_try in false false false false false :; do
|
|
- cat >conf$$subs.sed <<_ACEOF
|
|
-SHELL!$SHELL$ac_delim
|
|
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
|
|
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
|
|
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
|
|
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
|
|
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
|
|
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
|
|
-exec_prefix!$exec_prefix$ac_delim
|
|
-prefix!$prefix$ac_delim
|
|
-program_transform_name!$program_transform_name$ac_delim
|
|
-bindir!$bindir$ac_delim
|
|
-sbindir!$sbindir$ac_delim
|
|
-libexecdir!$libexecdir$ac_delim
|
|
-datarootdir!$datarootdir$ac_delim
|
|
-datadir!$datadir$ac_delim
|
|
-sysconfdir!$sysconfdir$ac_delim
|
|
-sharedstatedir!$sharedstatedir$ac_delim
|
|
-localstatedir!$localstatedir$ac_delim
|
|
-includedir!$includedir$ac_delim
|
|
-oldincludedir!$oldincludedir$ac_delim
|
|
-docdir!$docdir$ac_delim
|
|
-infodir!$infodir$ac_delim
|
|
-htmldir!$htmldir$ac_delim
|
|
-dvidir!$dvidir$ac_delim
|
|
-pdfdir!$pdfdir$ac_delim
|
|
-psdir!$psdir$ac_delim
|
|
-libdir!$libdir$ac_delim
|
|
-localedir!$localedir$ac_delim
|
|
-mandir!$mandir$ac_delim
|
|
-DEFS!$DEFS$ac_delim
|
|
-ECHO_C!$ECHO_C$ac_delim
|
|
-ECHO_N!$ECHO_N$ac_delim
|
|
-ECHO_T!$ECHO_T$ac_delim
|
|
-LIBS!$LIBS$ac_delim
|
|
-build_alias!$build_alias$ac_delim
|
|
-host_alias!$host_alias$ac_delim
|
|
-target_alias!$target_alias$ac_delim
|
|
-CC!$CC$ac_delim
|
|
-CFLAGS!$CFLAGS$ac_delim
|
|
-LDFLAGS!$LDFLAGS$ac_delim
|
|
-CPPFLAGS!$CPPFLAGS$ac_delim
|
|
-ac_ct_CC!$ac_ct_CC$ac_delim
|
|
-EXEEXT!$EXEEXT$ac_delim
|
|
-OBJEXT!$OBJEXT$ac_delim
|
|
-eap_tnc_cflags!$eap_tnc_cflags$ac_delim
|
|
-eap_tnc_ldflags!$eap_tnc_ldflags$ac_delim
|
|
-targetname!$targetname$ac_delim
|
|
-LIBOBJS!$LIBOBJS$ac_delim
|
|
-LTLIBOBJS!$LTLIBOBJS$ac_delim
|
|
-_ACEOF
|
|
+ . ./conf$$subs.sh ||
|
|
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
|
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
|
|
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
|
+ if test $ac_delim_n = $ac_delim_num; then
|
|
break
|
|
elif $ac_last_try; then
|
|
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
else
|
|
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
fi
|
|
done
|
|
+rm -f conf$$subs.sh
|
|
|
|
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
-if test -n "$ac_eof"; then
|
|
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
- ac_eof=`expr $ac_eof + 1`
|
|
-fi
|
|
-
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
|
|
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
|
-_ACEOF
|
|
-sed '
|
|
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
-s/^/s,@/; s/!/@,|#_!!_#|/
|
|
-:n
|
|
-t n
|
|
-s/'"$ac_delim"'$/,g/; t
|
|
-s/$/\\/; p
|
|
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
-' >>$CONFIG_STATUS <conf$$subs.sed
|
|
-rm -f conf$$subs.sed
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
-:end
|
|
-s/|#_!!_#|//g
|
|
-CEOF$ac_eof
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
|
|
_ACEOF
|
|
+sed -n '
|
|
+h
|
|
+s/^/S["/; s/!.*/"]=/
|
|
+p
|
|
+g
|
|
+s/^[^!]*!//
|
|
+:repl
|
|
+t repl
|
|
+s/'"$ac_delim"'$//
|
|
+t delim
|
|
+:nl
|
|
+h
|
|
+s/\(.\{148\}\)..*/\1/
|
|
+t more1
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
|
|
+p
|
|
+n
|
|
+b repl
|
|
+:more1
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
|
+p
|
|
+g
|
|
+s/.\{148\}//
|
|
+t nl
|
|
+:delim
|
|
+h
|
|
+s/\(.\{148\}\)..*/\1/
|
|
+t more2
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/"/
|
|
+p
|
|
+b
|
|
+:more2
|
|
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
|
+p
|
|
+g
|
|
+s/.\{148\}//
|
|
+t delim
|
|
+' <conf$$subs.awk | sed '
|
|
+/^[^""]/{
|
|
+ N
|
|
+ s/\n//
|
|
+}
|
|
+' >>$CONFIG_STATUS || ac_write_fail=1
|
|
+rm -f conf$$subs.awk
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+_ACAWK
|
|
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
|
+ for (key in S) S_is_set[key] = 1
|
|
+ FS = ""
|
|
+
|
|
+}
|
|
+{
|
|
+ line = $ 0
|
|
+ nfields = split(line, field, "@")
|
|
+ substed = 0
|
|
+ len = length(field[1])
|
|
+ for (i = 2; i < nfields; i++) {
|
|
+ key = field[i]
|
|
+ keylen = length(key)
|
|
+ if (S_is_set[key]) {
|
|
+ value = S[key]
|
|
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
|
|
+ len += length(value) + length(field[++i])
|
|
+ substed = 1
|
|
+ } else
|
|
+ len += 1 + keylen
|
|
+ }
|
|
+
|
|
+ print line
|
|
+}
|
|
|
|
+_ACAWK
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
|
|
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
|
|
+else
|
|
+ cat
|
|
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
|
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
|
|
+_ACEOF
|
|
|
|
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
|
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
|
|
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
|
|
# trailing colons and then remove the whole line if VPATH becomes empty
|
|
# (actually we leave an empty line to preserve line numbers).
|
|
if test "x$srcdir" = x.; then
|
|
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
|
-s/:*\$(srcdir):*/:/
|
|
-s/:*\${srcdir}:*/:/
|
|
-s/:*@srcdir@:*/:/
|
|
-s/^\([^=]*=[ ]*\):*/\1/
|
|
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
|
|
+h
|
|
+s///
|
|
+s/^/:/
|
|
+s/[ ]*$/:/
|
|
+s/:\$(srcdir):/:/g
|
|
+s/:\${srcdir}:/:/g
|
|
+s/:@srcdir@:/:/g
|
|
+s/^:*//
|
|
s/:*$//
|
|
+x
|
|
+s/\(=[ ]*\).*/\1/
|
|
+G
|
|
+s/\n//
|
|
s/^[^=]*=[ ]*$//
|
|
}'
|
|
fi
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
fi # test -n "$CONFIG_FILES"
|
|
|
|
|
|
-for ac_tag in :F $CONFIG_FILES
|
|
+eval set X " :F $CONFIG_FILES "
|
|
+shift
|
|
+for ac_tag
|
|
do
|
|
case $ac_tag in
|
|
:[FHLC]) ac_mode=$ac_tag; continue;;
|
|
esac
|
|
case $ac_mode$ac_tag in
|
|
:[FHL]*:*);;
|
|
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
|
|
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
|
|
:[FH]-) ac_tag=-:-;;
|
|
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
|
esac
|
|
@@ -3437,26 +4219,34 @@
|
|
[\\/$]*) false;;
|
|
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
|
esac ||
|
|
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
|
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
|
|
esac
|
|
- ac_file_inputs="$ac_file_inputs $ac_f"
|
|
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
|
+ as_fn_append ac_file_inputs " '$ac_f'"
|
|
done
|
|
|
|
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
# use $as_me), people would be surprised to read:
|
|
# /* config.h. Generated by config.status. */
|
|
- configure_input="Generated from "`IFS=:
|
|
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
|
|
+ configure_input='Generated from '`
|
|
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
|
|
+ `' by configure.'
|
|
if test x"$ac_file" != x-; then
|
|
configure_input="$ac_file. $configure_input"
|
|
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
-echo "$as_me: creating $ac_file" >&6;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
|
|
+$as_echo "$as_me: creating $ac_file" >&6;}
|
|
fi
|
|
+ # Neutralize special characters interpreted by sed in replacement strings.
|
|
+ case $configure_input in #(
|
|
+ *\&* | *\|* | *\\* )
|
|
+ ac_sed_conf_input=`$as_echo "$configure_input" |
|
|
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
|
|
+ *) ac_sed_conf_input=$configure_input;;
|
|
+ esac
|
|
|
|
case $ac_tag in
|
|
- *:-:* | *:-) cat >"$tmp/stdin";;
|
|
+ *:-:* | *:-) cat >"$tmp/stdin" \
|
|
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
|
|
esac
|
|
;;
|
|
esac
|
|
@@ -3466,42 +4256,7 @@
|
|
X"$ac_file" : 'X\(//\)[^/]' \| \
|
|
X"$ac_file" : 'X\(//\)$' \| \
|
|
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$ac_file" |
|
|
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\/\)[^/].*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\/\)$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\).*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- s/.*/./; q'`
|
|
- { as_dir="$ac_dir"
|
|
- case $as_dir in #(
|
|
- -*) as_dir=./$as_dir;;
|
|
- esac
|
|
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
- as_dirs=
|
|
- while :; do
|
|
- case $as_dir in #(
|
|
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
|
- *) as_qdir=$as_dir;;
|
|
- esac
|
|
- as_dirs="'$as_qdir' $as_dirs"
|
|
- as_dir=`$as_dirname -- "$as_dir" ||
|
|
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
- X"$as_dir" : 'X\(//\)$' \| \
|
|
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$as_dir" |
|
|
+$as_echo X"$ac_file" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -3519,20 +4274,15 @@
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- test -d "$as_dir" && break
|
|
- done
|
|
- test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
+ as_dir="$ac_dir"; as_fn_mkdir_p
|
|
ac_builddir=.
|
|
|
|
case "$ac_dir" in
|
|
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*)
|
|
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
|
# A ".." for each directory in $ac_dir_suffix.
|
|
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
|
case $ac_top_builddir_sub in
|
|
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
@@ -3568,12 +4318,12 @@
|
|
|
|
_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
# If the template does not know about datarootdir, expand it.
|
|
# FIXME: This hack should be removed a few years after 2.60.
|
|
ac_datarootdir_hack=; ac_datarootdir_seen=
|
|
-
|
|
-case `sed -n '/datarootdir/ {
|
|
+ac_sed_dataroot='
|
|
+/datarootdir/ {
|
|
p
|
|
q
|
|
}
|
|
@@ -3581,36 +4331,37 @@
|
|
/@docdir@/p
|
|
/@infodir@/p
|
|
/@localedir@/p
|
|
-/@mandir@/p
|
|
-' $ac_file_inputs` in
|
|
+/@mandir@/p'
|
|
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
|
|
*datarootdir*) ac_datarootdir_seen=yes;;
|
|
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_datarootdir_hack='
|
|
s&@datadir@&$datadir&g
|
|
s&@docdir@&$docdir&g
|
|
s&@infodir@&$infodir&g
|
|
s&@localedir@&$localedir&g
|
|
s&@mandir@&$mandir&g
|
|
- s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
+ s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
esac
|
|
_ACEOF
|
|
|
|
# Neutralize VPATH when `$srcdir' = `.'.
|
|
# Shell code in configure.ac might set extrasub.
|
|
# FIXME: do we really want to maintain this feature?
|
|
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
- sed "$ac_vpsub
|
|
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+ac_sed_extra="$ac_vpsub
|
|
$extrasub
|
|
_ACEOF
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
:t
|
|
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
-s&@configure_input@&$configure_input&;t t
|
|
+s|@configure_input@|$ac_sed_conf_input|;t t
|
|
s&@top_builddir@&$ac_top_builddir_sub&;t t
|
|
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
|
|
s&@srcdir@&$ac_srcdir&;t t
|
|
s&@abs_srcdir@&$ac_abs_srcdir&;t t
|
|
s&@top_srcdir@&$ac_top_srcdir&;t t
|
|
@@ -3619,21 +4370,24 @@
|
|
s&@abs_builddir@&$ac_abs_builddir&;t t
|
|
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
|
$ac_datarootdir_hack
|
|
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
|
|
+"
|
|
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
|
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
|
|
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
|
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
|
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
|
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
-which seems to be undefined. Please make sure it is defined." >&5
|
|
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
-which seems to be undefined. Please make sure it is defined." >&2;}
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
+which seems to be undefined. Please make sure it is defined" >&5
|
|
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
+which seems to be undefined. Please make sure it is defined" >&2;}
|
|
|
|
rm -f "$tmp/stdin"
|
|
case $ac_file in
|
|
- -) cat "$tmp/out"; rm -f "$tmp/out";;
|
|
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
|
|
- esac
|
|
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
|
|
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
|
+ esac \
|
|
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
;;
|
|
|
|
|
|
@@ -3643,11 +4397,13 @@
|
|
done # for ac_tag
|
|
|
|
|
|
-{ (exit 0); exit 0; }
|
|
+as_fn_exit 0
|
|
_ACEOF
|
|
-chmod +x $CONFIG_STATUS
|
|
ac_clean_files=$ac_clean_files_save
|
|
|
|
+test $ac_write_fail = 0 ||
|
|
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
|
+
|
|
|
|
# configure is writing to config.log, and then calls config.status.
|
|
# config.status does its own redirection, appending to config.log.
|
|
@@ -3667,7 +4423,10 @@
|
|
exec 5>>config.log
|
|
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
|
# would make configure fail if this is the last instruction.
|
|
- $ac_cs_success || { (exit 1); exit 1; }
|
|
+ $ac_cs_success || as_fn_exit 1
|
|
+fi
|
|
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
|
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
|
fi
|
|
-
|
|
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/configure.in freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/configure.in
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/configure.in 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/configure.in 2012-12-04 19:38:00.241420966 +0100
|
|
@@ -2,12 +2,21 @@
|
|
AC_REVISION($Revision$)
|
|
AC_DEFUN(modname,[rlm_eap_tnc])
|
|
|
|
+eap_tnc_cflags=
|
|
+eap_tnc_ldflags=-lnaaeap
|
|
+
|
|
if test x$with_[]modname != xno; then
|
|
|
|
- AC_CHECK_LIB(TNCS, exchangeTNCCSMessages)
|
|
- if test "x$ac_cv_lib_tncs_exchangetnccsmessages" != xyes; then
|
|
- AC_MSG_WARN([the TNCS library isn't found!])
|
|
- fail="$fail -lTNCS"
|
|
+ AC_CHECK_LIB(naaeap,processEAPTNCData,,fail="$fail -lnaaeap",)
|
|
+ if test -x"$ac_cv_lib_NAAEAP_processEAPTNCData" == -x"no"; then
|
|
+ AC_MSG_WARN([the NAAEAP library was not found!])
|
|
+ fail="$fail -lNAAEAP"
|
|
+ fi
|
|
+
|
|
+ AC_CHECK_HEADERS(naaeap/naaeap.h,,fail="$fail -Inaaeap.h",)
|
|
+ if test -x"$ac_cv_header_naaeap_h" == -x"no"; then
|
|
+ AC_MSG_WARN([the naaeap header was not found!])
|
|
+ fail="$fail -Inaaeap.h"
|
|
fi
|
|
|
|
targetname=modname
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.c freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.c
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.c 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.c 2012-12-04 19:38:00.241420966 +0100
|
|
@@ -1,12 +1,12 @@
|
|
/*
|
|
* eap_tnc.c EAP TNC functionality.
|
|
*
|
|
- * This software is Copyright (C) 2006,2007 FH Hannover
|
|
+ * This software is Copyright (C) 2006-2009 FH Hannover
|
|
*
|
|
* Portions of this code unrelated to FreeRADIUS are available
|
|
* separately under a commercial license. If you require an
|
|
* implementation of EAP-TNC that is not under the GPLv2, please
|
|
- * contact [email protected] for details.
|
|
+ * contact [email protected] for details.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
@@ -23,230 +23,41 @@
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
*
|
|
*/
|
|
-#include <freeradius-devel/ident.h>
|
|
-RCSID("$Id$")
|
|
-
|
|
-
|
|
-/*
|
|
- *
|
|
- * MD5 Packet Format in EAP Type-Data
|
|
- * --- ------ ------ -- --- ---------
|
|
- * 0 1 2 3
|
|
- * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * | Value-Size | Value ...
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * | Name ...
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- *
|
|
- * EAP-TNC Packet Format in EAP Type-Data
|
|
- *
|
|
- * 0 1 2 3
|
|
- * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * | Flags |Ver | Data Length ...
|
|
- * |L M S R R|=1 |
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * |... | Data ...
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
-
|
|
- *
|
|
- */
|
|
-
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "eap.h"
|
|
|
|
#include "eap_tnc.h"
|
|
|
|
- /*
|
|
- * WTF is wrong with htonl ?
|
|
- */
|
|
-static uint32_t ByteSwap2 (uint32_t nLongNumber)
|
|
-{
|
|
- return (((nLongNumber&0x000000FF)<<24)+((nLongNumber&0x0000FF00)<<8)+
|
|
- ((nLongNumber&0x00FF0000)>>8)+((nLongNumber&0xFF000000)>>24));
|
|
-}
|
|
-
|
|
/*
|
|
- * Allocate a new TNC_PACKET
|
|
+ * Forms an EAP_REQUEST packet from the EAP_TNC specific data.
|
|
*/
|
|
-TNC_PACKET *eaptnc_alloc(void)
|
|
+int eaptnc_compose(EAP_HANDLER *handler, TNC_BufferReference request, TNC_UInt32 length, uint8_t code)
|
|
{
|
|
- TNC_PACKET *rp;
|
|
-
|
|
- if ((rp = malloc(sizeof(TNC_PACKET))) == NULL) {
|
|
- radlog(L_ERR, "rlm_eap_tnc: out of memory");
|
|
- return NULL;
|
|
+ // check parameters
|
|
+ if(handler == NULL || (request == NULL && length != 0) || (request != NULL && length < 1) || code > PW_EAP_MAX_CODES){
|
|
+ radlog(L_ERR, "rlm_eap_tnc: eaptnc_compose invalid parameters: handler == %p, request == %p, length == %lu, code == %u", handler, request, length, code);
|
|
+ return 0;
|
|
}
|
|
- memset(rp, 0, sizeof(TNC_PACKET));
|
|
- return rp;
|
|
-}
|
|
-
|
|
-/*
|
|
- * Free TNC_PACKET
|
|
- */
|
|
-void eaptnc_free(TNC_PACKET **tnc_packet_ptr)
|
|
-{
|
|
- TNC_PACKET *tnc_packet;
|
|
-
|
|
- if (!tnc_packet_ptr) return;
|
|
- tnc_packet = *tnc_packet_ptr;
|
|
- if (tnc_packet == NULL) return;
|
|
-
|
|
- if (tnc_packet->data) free(tnc_packet->data);
|
|
|
|
- free(tnc_packet);
|
|
-
|
|
- *tnc_packet_ptr = NULL;
|
|
-}
|
|
-
|
|
-/*
|
|
- * We expect only RESPONSE for which REQUEST, SUCCESS or FAILURE is sent back
|
|
- */
|
|
-TNC_PACKET *eaptnc_extract(EAP_DS *eap_ds)
|
|
-{
|
|
- tnc_packet_t *data;
|
|
- TNC_PACKET *packet;
|
|
- /*
|
|
- * We need a response, of type EAP-TNC
|
|
- */
|
|
- if (!eap_ds ||
|
|
- !eap_ds->response ||
|
|
- (eap_ds->response->code != PW_TNC_RESPONSE) ||
|
|
- eap_ds->response->type.type != PW_EAP_TNC ||
|
|
- !eap_ds->response->type.data ||
|
|
- (eap_ds->response->length <= TNC_HEADER_LEN) ||
|
|
- (eap_ds->response->type.data[0] <= 0)) {
|
|
- radlog(L_ERR, "rlm_eap_tnc: corrupted data");
|
|
- return NULL;
|
|
+ // further check parameters
|
|
+ if(handler->opaque == NULL || handler->eap_ds == NULL){
|
|
+ radlog(L_ERR, "rlm_eap_tnc: eaptnc_compose invalid parameters: handler->opaque == %p, handler->eap_ds == %p", handler->opaque, handler->eap_ds);
|
|
+ return 0;
|
|
}
|
|
- packet = eaptnc_alloc();
|
|
- if (!packet) return NULL;
|
|
-
|
|
|
|
- packet->code = eap_ds->response->code;
|
|
- packet->id = eap_ds->response->id;
|
|
- packet->length = eap_ds->response->length;
|
|
-
|
|
- data = (tnc_packet_t *)eap_ds->response->type.data;
|
|
- /*
|
|
- * Already checked the size above.
|
|
- */
|
|
- packet->flags_ver = data->flags_ver;
|
|
- unsigned char *ptr = (unsigned char*)data;
|
|
-
|
|
-
|
|
- DEBUG2("Flags/Ver: %x\n", packet->flags_ver);
|
|
- int thisDataLength;
|
|
- int dataStart;
|
|
- if(TNC_LENGTH_INCLUDED(packet->flags_ver)){
|
|
- DEBUG2("data_length included\n");
|
|
-// memcpy(&packet->flags_ver[1], &data->flags_ver[1], 4);
|
|
- //packet->data_length = data->data_length;
|
|
- memcpy(&packet->data_length, &ptr[1], TNC_DATA_LENGTH_LENGTH);
|
|
- DEBUG2("data_length: %x\n", packet->data_length);
|
|
- DEBUG2("data_length: %d\n", packet->data_length);
|
|
- DEBUG2("data_length: %x\n", ByteSwap2(packet->data_length));
|
|
- DEBUG2("data_length: %d\n", ByteSwap2(packet->data_length));
|
|
- packet->data_length = ByteSwap2(packet->data_length);
|
|
- thisDataLength = packet->length-TNC_PACKET_LENGTH; //1: we need space for flags_ver
|
|
- dataStart = TNC_DATA_LENGTH_LENGTH+TNC_FLAGS_VERSION_LENGTH;
|
|
- }else{
|
|
- DEBUG2("no data_length included\n");
|
|
- thisDataLength = packet->length-TNC_PACKET_LENGTH_WITHOUT_DATA_LENGTH;
|
|
- packet->data_length = 0;
|
|
- dataStart = TNC_FLAGS_VERSION_LENGTH;
|
|
-
|
|
- }
|
|
- /*
|
|
- * Allocate room for the data, and copy over the data.
|
|
- */
|
|
- packet->data = malloc(thisDataLength);
|
|
- if (packet->data == NULL) {
|
|
- radlog(L_ERR, "rlm_eap_tnc: out of memory");
|
|
- eaptnc_free(&packet);
|
|
- return NULL;
|
|
+ if(handler->eap_ds->request == NULL){
|
|
+ radlog(L_ERR, "rlm_eap_tnc: eaptnc_compose invalid parameters: handler->eap_ds->request == %p", handler->eap_ds->request);
|
|
+ return 0;
|
|
}
|
|
-
|
|
- memcpy(packet->data, &(eap_ds->response->type.data[dataStart]), thisDataLength);
|
|
-
|
|
- return packet;
|
|
-}
|
|
|
|
-
|
|
-/*
|
|
- * Compose the portions of the reply packet specific to the
|
|
- * EAP-TNC protocol, in the EAP reply typedata
|
|
- */
|
|
-int eaptnc_compose(EAP_DS *eap_ds, TNC_PACKET *reply)
|
|
-{
|
|
- uint8_t *ptr;
|
|
-
|
|
-
|
|
- if (reply->code < 3) {
|
|
- //fill: EAP-Type (0x888e)
|
|
- eap_ds->request->type.type = PW_EAP_TNC;
|
|
- DEBUG2("TYPE: EAP-TNC set\n");
|
|
- rad_assert(reply->length > 0);
|
|
-
|
|
- //alloc enough space for whole TNC-Packet (from Code on)
|
|
- eap_ds->request->type.data = calloc(reply->length, sizeof(unsigned char*));
|
|
- DEBUG2("Malloc %d bytes for packet\n", reply->length);
|
|
- if (eap_ds->request->type.data == NULL) {
|
|
- radlog(L_ERR, "rlm_eap_tnc: out of memory");
|
|
- return 0;
|
|
- }
|
|
- //put pointer at position where data starts (behind Type)
|
|
- ptr = eap_ds->request->type.data;
|
|
- //*ptr = (uint8_t)(reply->data_length & 0xFF);
|
|
-
|
|
- //ptr++;
|
|
- *ptr = reply->flags_ver;
|
|
- DEBUG2("Set Flags/Version: %d\n", *ptr);
|
|
- if(reply->data_length!=0){
|
|
- DEBUG2("Set data-length: %d\n", reply->data_length);
|
|
- ptr++; //move to start-position of "data_length"
|
|
- DEBUG2("Set data-length: %x\n", reply->data_length);
|
|
- DEBUG2("Set data-length (swapped): %x\n", ByteSwap2(reply->data_length));
|
|
- unsigned long swappedDataLength = ByteSwap2(reply->data_length);
|
|
- //DEBUG2("DATA-length: %d", reply->data_
|
|
- memcpy(ptr, &swappedDataLength, 4);
|
|
- //*ptr = swappedDataLength;
|
|
- }
|
|
- uint16_t thisDataLength=0;
|
|
- if(reply->data!=NULL){
|
|
- DEBUG2("Adding TNCCS-Data ");
|
|
- int offset;
|
|
- //if data_length-Field present
|
|
- if(reply->data_length !=0){
|
|
- DEBUG2("with Fragmentation\n");
|
|
- offset = TNC_DATA_LENGTH_LENGTH; //length of data_length-field: 4
|
|
- thisDataLength = reply->length-TNC_PACKET_LENGTH;
|
|
- }else{ //data_length-Field not present
|
|
- DEBUG2("without Fragmentation\n");
|
|
- offset = 1;
|
|
- thisDataLength = reply->length-TNC_PACKET_LENGTH_WITHOUT_DATA_LENGTH;
|
|
- }
|
|
- DEBUG2("TNCCS-Datalength: %d\n", thisDataLength);
|
|
- ptr=ptr+offset; //move to start-position of "data"
|
|
- memcpy(ptr,reply->data, thisDataLength);
|
|
- }else{
|
|
- DEBUG2("No TNCCS-Data present");
|
|
- }
|
|
-
|
|
- //the length of the TNC-packet (behind Type)
|
|
- if(reply->data_length!=0){
|
|
- eap_ds->request->type.length = TNC_DATA_LENGTH_LENGTH+TNC_FLAGS_VERSION_LENGTH+thisDataLength; //4:data_length, 1: flags_ver
|
|
- }else{
|
|
- eap_ds->request->type.length = TNC_FLAGS_VERSION_LENGTH+thisDataLength; //1: flags_ver
|
|
- }
|
|
- DEBUG2("Packet built\n");
|
|
-
|
|
- } else {
|
|
- eap_ds->request->type.length = 0;
|
|
- }
|
|
- eap_ds->request->code = reply->code;
|
|
+ // fill EAP data to handler
|
|
+ handler->eap_ds->request->code = code;
|
|
+ handler->eap_ds->request->type.type = PW_EAP_TNC;
|
|
+ // fill EAP TYPE specific data to handler
|
|
+ handler->eap_ds->request->type.length = length;
|
|
+ free(handler->eap_ds->request->type.data);
|
|
+ handler->eap_ds->request->type.data = request;
|
|
|
|
return 1;
|
|
}
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.h freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.h
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.h 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/eap_tnc.h 2012-12-04 19:38:00.241420966 +0100
|
|
@@ -1,10 +1,10 @@
|
|
/*
|
|
- * This software is Copyright (C) 2006,2007 FH Hannover
|
|
+ * This software is Copyright (C) 2006-2009 FH Hannover
|
|
*
|
|
* Portions of this code unrelated to FreeRADIUS are available
|
|
* separately under a commercial license. If you require an
|
|
* implementation of EAP-TNC that is not under the GPLv2, please
|
|
- * contact [email protected] for details.
|
|
+ * contact [email protected] for details.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
@@ -26,105 +26,20 @@
|
|
#define _EAP_TNC_H
|
|
|
|
#include "eap.h"
|
|
+#include <naaeap/naaeap.h>
|
|
|
|
-#define PW_TNC_REQUEST 1
|
|
-#define PW_TNC_RESPONSE 2
|
|
-#define PW_TNC_SUCCESS 3
|
|
-#define PW_TNC_FAILURE 4
|
|
-#define PW_TNC_MAX_CODES 4
|
|
-
|
|
-#define TNC_HEADER_LEN 4
|
|
-#define TNC_CHALLENGE_LEN 16
|
|
-#define TNC_START_LEN 8
|
|
-
|
|
-#define TNC_PACKET_LENGTH_WITHOUT_DATA_LENGTH 6
|
|
-#define TNC_PACKET_LENGTH 10
|
|
-#define TNC_DATA_LENGTH_LENGTH 4
|
|
-#define TNC_FLAGS_VERSION_LENGTH 1
|
|
-
|
|
-typedef unsigned int VlanAccessMode;
|
|
-
|
|
-#define VLAN_ISOLATE 97
|
|
-#define VLAN_ACCESS 2
|
|
-/*
|
|
- ****
|
|
- * EAP - MD5 doesnot specify code, id & length but chap specifies them,
|
|
- * for generalization purpose, complete header should be sent
|
|
- * and not just value_size, value and name.
|
|
- * future implementation.
|
|
- *
|
|
- * Huh? What does that mean?
|
|
- */
|
|
+#define SET_START(x) ((x) | (0x20))
|
|
|
|
-/*
|
|
+/**
|
|
+ * Composes the EAP packet.
|
|
*
|
|
- * MD5 Packet Format in EAP Type-Data
|
|
- * --- ------ ------ -- --- ---------
|
|
- * 0 1 2 3
|
|
- * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * | Value-Size | Value ...
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * | Name ...
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- *
|
|
- * EAP-TNC Packet Format in EAP Type-Data
|
|
- *
|
|
- * 0 1 2 3
|
|
- * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * | Flags |Ver | Data Length ...
|
|
- * |L M S R R|=1 |
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
- * |... | Data ...
|
|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
-
|
|
+ * @param handler The EAP_HANDLER from tnc_initiate() or tnc_authenticate
|
|
+ * @param request The EAP_TNC packet received from NAA-TNCS
|
|
+ * @param length The length of the EAP_TNC packet received from NAA-TNCS
|
|
+ * @param code EAP_CODE for the request
|
|
*
|
|
+ * @return True if operation was successful, otherwise false.
|
|
*/
|
|
-
|
|
-/* eap packet structure */
|
|
-typedef struct tnc_packet_t {
|
|
-/*
|
|
- uint8_t code;
|
|
- uint8_t id;
|
|
- uint16_t length;
|
|
-*/
|
|
- uint8_t flags_ver;
|
|
- uint32_t data_length;
|
|
- uint8_t *data;
|
|
-} tnc_packet_t;
|
|
-
|
|
-typedef struct tnc_packet {
|
|
- uint8_t code;
|
|
- uint8_t id;
|
|
- uint16_t length;
|
|
- uint8_t flags_ver;
|
|
- uint32_t data_length;
|
|
- uint8_t *data;
|
|
-} TNC_PACKET;
|
|
-
|
|
-#define TNC_START(x) (((x) & 0x20) != 0)
|
|
-#define TNC_MORE_FRAGMENTS(x) (((x) & 0x40) != 0)
|
|
-#define TNC_LENGTH_INCLUDED(x) (((x) & 0x80) != 0)
|
|
-#define TNC_RESERVED_EQ_NULL(x) (((x) & 0x10) == 0 && ((x) & 0x8) == 0)
|
|
-#define TNC_VERSION_EQ_ONE(x) (((x) & 0x07) == 1)
|
|
-
|
|
-#define SET_START(x) ((x) | (0x20))
|
|
-#define SET_MORE_FRAGMENTS(x) ((x) | (0x40))
|
|
-#define SET_LENGTH_INCLUDED(x) ((x) | (0x80))
|
|
-
|
|
-
|
|
-/* function declarations here */
|
|
-
|
|
-TNC_PACKET *eaptnc_alloc(void);
|
|
-void eaptnc_free(TNC_PACKET **tnc_packet_ptr);
|
|
-
|
|
-int eaptnc_compose(EAP_DS *auth, TNC_PACKET *reply);
|
|
-TNC_PACKET *eaptnc_extract(EAP_DS *auth);
|
|
-int eaptnc_verify(TNC_PACKET *pkt, VALUE_PAIR* pwd, uint8_t *ch);
|
|
-
|
|
-
|
|
-
|
|
-
|
|
+int eaptnc_compose(EAP_HANDLER *handler, TNC_BufferReference request, TNC_UInt32 length, uint8_t code);
|
|
|
|
#endif /*_EAP_TNC_H*/
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in 2012-12-04 19:38:49.277421870 +0100
|
|
@@ -3,8 +3,8 @@
|
|
#
|
|
|
|
TARGET = @targetname@
|
|
-SRCS = rlm_eap_tnc.c eap_tnc.c tncs_connect.c
|
|
-HEADERS = eap_tnc.h tncs.h tncs_connect.h ../../eap.h ../../rlm_eap.h
|
|
+SRCS = rlm_eap_tnc.c eap_tnc.c
|
|
+HEADERS = eap_tnc.h ../../eap.h ../../rlm_eap.h
|
|
RLM_CFLAGS = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_tnc_cflags@
|
|
RLM_LIBS = @eap_tnc_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
|
|
RLM_INSTALL =
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/rlm_eap_tnc.c freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/rlm_eap_tnc.c
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/rlm_eap_tnc.c 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/rlm_eap_tnc.c 2012-12-04 19:38:00.241420966 +0100
|
|
@@ -1,12 +1,12 @@
|
|
/*
|
|
* rlm_eap_tnc.c Handles that are called from eap
|
|
*
|
|
- * This software is Copyright (C) 2006,2007 FH Hannover
|
|
+ * This software is Copyright (C) 2006-2009 FH Hannover
|
|
*
|
|
* Portions of this code unrelated to FreeRADIUS are available
|
|
* separately under a commercial license. If you require an
|
|
* implementation of EAP-TNC that is not under the GPLv2, please
|
|
- * contact [email protected] for details.
|
|
+ * contact [email protected] for details.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
@@ -26,96 +26,262 @@
|
|
* Copyright (C) 2007 Alan DeKok <[email protected]>
|
|
*/
|
|
|
|
-#include <freeradius-devel/ident.h>
|
|
-RCSID("$Id$")
|
|
+/*
|
|
+ * EAP-TNC Packet with EAP Header, general structure
|
|
+ *
|
|
+ * 0 1 2 3
|
|
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
+ * | Code | Identifier | Length |
|
|
+ * | | | |
|
|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
+ * | Type | Flags | Ver | Data Length |
|
|
+ * | |L M S R R| =1 | |
|
|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
+ * | Data Length | Data ...
|
|
+ * | |
|
|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
+ */
|
|
|
|
#include <freeradius-devel/autoconf.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
-#include "tncs_connect.h"
|
|
#include "eap_tnc.h"
|
|
-#include "tncs.h"
|
|
+#include <naaeap/naaeap.h>
|
|
#include <freeradius-devel/rad_assert.h>
|
|
+//#include <freeradius-devel/libradius.h>
|
|
|
|
-typedef struct rlm_eap_tnc_t {
|
|
- char *vlan_access;
|
|
- char *vlan_isolate;
|
|
- char *tnc_path;
|
|
-} rlm_eap_tnc_t;
|
|
+#include <netinet/in.h>
|
|
|
|
-static int sessionCounter=0;
|
|
+/**
|
|
+ * Calculates an identifying string based upon nas_port, nas_ip and nas_port_type.
|
|
+ * The maximum length of the calculated string is 70 (not including the trailing '\0').
|
|
+ *
|
|
+ * @return the number of bytes written to out (not including the trailing '\0')
|
|
+ */
|
|
+static uint32_t calculateConnectionString(RADIUS_PACKET* radius_packet, char *out, size_t outMaxLength)
|
|
+{
|
|
+ VALUE_PAIR *vp = NULL;
|
|
+ uint32_t nas_port = 0;
|
|
+ uint32_t nas_ip = 0;
|
|
+ uint32_t nas_port_type = 0;
|
|
+
|
|
+ char out_nas_port[11];
|
|
+ char out_nas_ip_byte_0[4];
|
|
+ char out_nas_ip_byte_1[4];
|
|
+ char out_nas_ip_byte_2[4];
|
|
+ char out_nas_ip_byte_3[4];
|
|
+ char out_nas_port_type[11];
|
|
+
|
|
+ // check for NULL
|
|
+ if (radius_packet == NULL) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: calculateConnectionString failed. radius_packet == NULL!");
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ // read NAS port, ip and port type
|
|
+ for (vp = radius_packet->vps; vp; vp=vp->next) {
|
|
+ switch (vp->attribute) {
|
|
+ case PW_NAS_PORT:
|
|
+ nas_port = vp->vp_integer;
|
|
+ DEBUG("NAS scr port = %u\n", nas_port);
|
|
+ break;
|
|
+ case PW_NAS_IP_ADDRESS:
|
|
+ nas_ip = vp->vp_ipaddr;
|
|
+ DEBUG("NAS scr ip = %X\n", ntohl(nas_ip));
|
|
+ break;
|
|
+ case PW_NAS_PORT_TYPE:
|
|
+ nas_port_type = vp->vp_integer;
|
|
+ DEBUG("NAS scr port type = %u\n", nas_port_type);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ snprintf(out_nas_port, 11, "%u", nas_port);
|
|
+ snprintf(out_nas_ip_byte_0, 4, "%u", nas_ip & 0xFF);
|
|
+ snprintf(out_nas_ip_byte_1, 4, "%u", (nas_ip >> 8) & 0xFF);
|
|
+ snprintf(out_nas_ip_byte_2, 4, "%u", (nas_ip >> 16) & 0xFF);
|
|
+ snprintf(out_nas_ip_byte_3, 4, "%u", (nas_ip >> 24) & 0xFF);
|
|
+ snprintf(out_nas_port_type, 11, "%u", nas_port_type);
|
|
+
|
|
+ return snprintf(out, outMaxLength, "NAS Port: %s NAS IP: %s.%s.%s.%s NAS_PORT_TYPE: %s", out_nas_port, out_nas_ip_byte_3, out_nas_ip_byte_2, out_nas_ip_byte_1, out_nas_ip_byte_0, out_nas_port_type);
|
|
+}
|
|
+
|
|
+/*
|
|
+ * This function is called when the FreeRADIUS attach this module.
|
|
+ */
|
|
+static int tnc_attach(CONF_SECTION *conf, void **type_data)
|
|
+{
|
|
+ // initialize NAA-EAP
|
|
+ DEBUG2("TNC-ATTACH initializing NAA-EAP");
|
|
+ TNC_Result result = initializeDefault();
|
|
+ if (result != TNC_RESULT_SUCCESS) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_attach error while calling NAA-EAP initializeDefault()");
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * This function is called when the FreeRADIUS detach this module.
|
|
+ */
|
|
+static int tnc_detach(void *args)
|
|
+{
|
|
+ // terminate NAA-EAP
|
|
+ DEBUG2("TNC-TERMINATE terminating NAA-EAP");
|
|
+ TNC_Result result = terminate();
|
|
+ if (result != TNC_RESULT_SUCCESS) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_attach error while calling NAA-EAP terminate()");
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
|
|
/*
|
|
- * Initiate the EAP-MD5 session by sending a challenge to the peer.
|
|
- * Initiate the EAP-TNC session by sending a EAP Request witch Start Bit set
|
|
- * and with no data
|
|
+ * This function is called when the first EAP_IDENTITY_RESPONSE message
|
|
+ * was received.
|
|
+ *
|
|
+ * Initiates the EPA_TNC session by sending the first EAP_TNC_RESPONSE
|
|
+ * to the peer. The packet has the Start-Bit set and contains no data.
|
|
+ *
|
|
+ * 0 1 2 3
|
|
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
+ * | Code | Identifier | Length |
|
|
+ * | | | |
|
|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
+ * | Type | Flags | Ver |
|
|
+ * | |0 0 1 0 0|0 0 1|
|
|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
+ *
|
|
+ * For this package, only 'Identifier' has to be set dynamically. Any
|
|
+ * other information is static.
|
|
*/
|
|
static int tnc_initiate(void *type_data, EAP_HANDLER *handler)
|
|
{
|
|
- uint8_t flags_ver = 1; //set version to 1
|
|
- rlm_eap_tnc_t *inst = type_data;
|
|
- TNC_PACKET *reply;
|
|
+ size_t buflen = 71;
|
|
+ size_t ret = 0;
|
|
+ char buf[buflen];
|
|
+ REQUEST * request = NULL;
|
|
+ TNC_Result result;
|
|
+ TNC_ConnectionID conID;
|
|
+ TNC_BufferReference username;
|
|
|
|
+ // check if we run inside a secure EAP method.
|
|
+ // FIXME check concrete outer EAP method
|
|
if (!handler->request || !handler->request->parent) {
|
|
- DEBUG("rlm_eap_tnc: EAP-TNC can only be run inside of a TLS-based method.");
|
|
+ DEBUG2("rlm_eap_tnc: EAP_TNC must only be used as an inner method within a protected tunneled EAP created by an outer EAP method.");
|
|
+ request = handler->request;
|
|
return 0;
|
|
+ } else {
|
|
+ request = handler->request->parent;
|
|
}
|
|
|
|
- /*
|
|
- * FIXME: Update this when the TTLS and PEAP methods can
|
|
- * run EAP-TLC *after* the user has been authenticated.
|
|
- * This likely means moving the phase2 handlers to a
|
|
- * common code base.
|
|
- */
|
|
- if (1) {
|
|
- DEBUG("rlm-eap_tnc: EAP-TNC can only be run after the user has been authenticated.");
|
|
+ if (request->packet == NULL) {
|
|
+ DEBUG2("rlm_eap_tnc: ERROR request->packet is NULL.");
|
|
return 0;
|
|
}
|
|
|
|
DEBUG("tnc_initiate: %ld", handler->timestamp);
|
|
|
|
- if(connectToTncs(inst->tnc_path)==-1){
|
|
- DEBUG("Could not connect to TNCS");
|
|
+ //calculate connectionString
|
|
+ ret = calculateConnectionString(request->packet, buf, buflen);
|
|
+ if(ret == 0){
|
|
+ radlog(L_ERR, "rlm_eap_tnc:tnc_attach: calculating connection String failed.");
|
|
+ return 0;
|
|
}
|
|
|
|
+ DEBUG2("TNC-INITIATE getting connection from NAA-EAP");
|
|
+
|
|
/*
|
|
- * Allocate an EAP-MD5 packet.
|
|
+ * get connection
|
|
+ * (uses a function from the NAA-EAP-library)
|
|
+ * the presence of the library is checked via the configure-script
|
|
*/
|
|
- reply = eaptnc_alloc();
|
|
- if (reply == NULL) {
|
|
- radlog(L_ERR, "rlm_eap_tnc: out of memory");
|
|
+ result = getConnection(buf, &conID);
|
|
+
|
|
+ // check for errors
|
|
+ if (result != TNC_RESULT_SUCCESS) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_initiate error while calling NAA-EAP getConnection");
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
- * Fill it with data.
|
|
+ * tries to get the username from FreeRADIUS;
|
|
+ * copied from modules/rlm_eap/types/rlm_eap_ttls/ttls.c
|
|
*/
|
|
- reply->code = PW_TNC_REQUEST;
|
|
- flags_ver = SET_START(flags_ver); //set start-flag
|
|
- DEBUG("$$$$$$$$$$$$$$$$Flags: %d", flags_ver);
|
|
- reply->flags_ver = flags_ver;
|
|
- reply->length = 1+1; /* one byte of flags_ver */
|
|
+ VALUE_PAIR *usernameValuePair;
|
|
+ usernameValuePair = pairfind(request->packet->vps, PW_USER_NAME);
|
|
|
|
+ VALUE_PAIR *eapMessageValuePair;
|
|
+ if (!usernameValuePair) {
|
|
+ eapMessageValuePair = pairfind(request->packet->vps, PW_EAP_MESSAGE);
|
|
+
|
|
+ if (eapMessageValuePair &&
|
|
+ (eapMessageValuePair->length >= EAP_HEADER_LEN + 2) &&
|
|
+ (eapMessageValuePair->vp_strvalue[0] == PW_EAP_RESPONSE) &&
|
|
+ (eapMessageValuePair->vp_strvalue[EAP_HEADER_LEN] == PW_EAP_IDENTITY) &&
|
|
+ (eapMessageValuePair->vp_strvalue[EAP_HEADER_LEN + 1] != 0)) {
|
|
+
|
|
+ /*
|
|
+ * Create & remember a User-Name
|
|
+ */
|
|
+ usernameValuePair = pairmake("User-Name", "", T_OP_EQ);
|
|
+ rad_assert(usernameValuePair != NULL);
|
|
+
|
|
+ memcpy(usernameValuePair->vp_strvalue, eapMessageValuePair->vp_strvalue + 5,
|
|
+ eapMessageValuePair->length - 5);
|
|
+ usernameValuePair->length = eapMessageValuePair->length - 5;
|
|
+ usernameValuePair->vp_strvalue[usernameValuePair->length] = 0;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ username = malloc(usernameValuePair->length + 1);
|
|
+ memcpy(username, usernameValuePair->vp_strvalue, usernameValuePair->length);
|
|
+ username[usernameValuePair->length] = '\0';
|
|
+
|
|
+ RDEBUG("Username for current TNC connection: %s", username);
|
|
+
|
|
+ /*
|
|
+ * stores the username of this connection
|
|
+ * (uses a function from the NAA-EAP-library)
|
|
+ * the presence of the library is checked via the configure-script
|
|
+ */
|
|
+ result = storeUsername(conID, username, usernameValuePair->length);
|
|
+
|
|
+ // check for errors
|
|
+ if (result != TNC_RESULT_SUCCESS) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_initiate error while calling NAA-EAP storeUsername");
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ // set connection ID in FreeRADIUS
|
|
+ handler->opaque = malloc(sizeof(TNC_ConnectionID));
|
|
+ memcpy(handler->opaque, &conID, sizeof(TNC_ConnectionID));
|
|
+
|
|
+ // build first EAP TNC request
|
|
+ TNC_BufferReference eap_tnc_request = malloc(sizeof(unsigned char));
|
|
+ if (eap_tnc_request == NULL) {
|
|
+ radlog(L_ERR, "rlm_eap_tnc:tnc_initiate: malloc failed.");
|
|
+ return 0;
|
|
+ }
|
|
+ *eap_tnc_request = SET_START(1);
|
|
+ TNC_UInt32 eap_tnc_length = 1;
|
|
+ type_data = type_data; /* suppress -Wunused */
|
|
|
|
/*
|
|
* Compose the EAP-TNC packet out of the data structure,
|
|
* and free it.
|
|
*/
|
|
- eaptnc_compose(handler->eap_ds, reply);
|
|
- eaptnc_free(&reply);
|
|
+ eaptnc_compose(handler, eap_tnc_request, eap_tnc_length, PW_EAP_REQUEST);
|
|
|
|
- //put sessionAttribute to Handler and increase sessionCounter
|
|
- handler->opaque = calloc(sizeof(TNC_ConnectionID), 1);
|
|
- if (handler->opaque == NULL) {
|
|
- radlog(L_ERR, "rlm_eap_tnc: out of memory");
|
|
- return 0;
|
|
- }
|
|
- handler->free_opaque = free;
|
|
- memcpy(handler->opaque, &sessionCounter, sizeof(int));
|
|
- sessionCounter++;
|
|
-
|
|
/*
|
|
* We don't need to authorize the user at this point.
|
|
*
|
|
@@ -124,246 +290,114 @@
|
|
* to us...
|
|
*/
|
|
handler->stage = AUTHENTICATE;
|
|
-
|
|
- return 1;
|
|
-}
|
|
|
|
-static void setVlanAttribute(rlm_eap_tnc_t *inst, EAP_HANDLER *handler,
|
|
- VlanAccessMode mode){
|
|
- VALUE_PAIR *vp;
|
|
- char *vlanNumber = NULL;
|
|
- switch(mode){
|
|
- case VLAN_ISOLATE:
|
|
- vlanNumber = inst->vlan_isolate;
|
|
- vp = pairfind(handler->request->config_items,
|
|
- PW_TNC_VLAN_ISOLATE);
|
|
- if (vp) vlanNumber = vp->vp_strvalue;
|
|
- break;
|
|
- case VLAN_ACCESS:
|
|
- vlanNumber = inst->vlan_access;
|
|
- vp = pairfind(handler->request->config_items,
|
|
- PW_TNC_VLAN_ACCESS);
|
|
- if (vp) vlanNumber = vp->vp_strvalue;
|
|
- break;
|
|
-
|
|
- default:
|
|
- DEBUG2(" rlm_eap_tnc: Internal error. Not setting vlan number");
|
|
- return;
|
|
- }
|
|
- pairadd(&handler->request->reply->vps,
|
|
- pairmake("Tunnel-Type", "VLAN", T_OP_SET));
|
|
-
|
|
- pairadd(&handler->request->reply->vps,
|
|
- pairmake("Tunnel-Medium-Type", "IEEE-802", T_OP_SET));
|
|
-
|
|
- pairadd(&handler->request->reply->vps,
|
|
- pairmake("Tunnel-Private-Group-ID", vlanNumber, T_OP_SET));
|
|
-
|
|
+ return 1;
|
|
}
|
|
|
|
-/*
|
|
- * Authenticate a previously sent challenge.
|
|
+/**
|
|
+ * This function is called when a EAP_TNC_RESPONSE was received.
|
|
+ * It basically forwards the EAP_TNC data to NAA-TNCS and forms
|
|
+ * and appropriate EAP_RESPONSE. Furthermore, it sets the VlanID
|
|
+ * based on the TNC_ConnectionState determined by NAA-TNCS.
|
|
+ *
|
|
+ * @param type_arg The configuration data
|
|
+ * @param handler The EAP_HANDLER
|
|
+ * @return True, if successfully, else false.
|
|
*/
|
|
-static int tnc_authenticate(void *type_arg, EAP_HANDLER *handler)
|
|
-{
|
|
- TNC_PACKET *packet;
|
|
- TNC_PACKET *reply;
|
|
- TNC_ConnectionID connId = *((TNC_ConnectionID *) (handler->opaque));
|
|
- TNC_ConnectionState state;
|
|
- rlm_eap_tnc_t *inst = type_arg;
|
|
- int isAcknowledgement = 0;
|
|
- TNC_UInt32 tnccsMsgLength = 0;
|
|
- int isLengthIncluded;
|
|
- int moreFragments;
|
|
- TNC_UInt32 overallLength;
|
|
- TNC_BufferReference outMessage;
|
|
- TNC_UInt32 outMessageLength = 2;
|
|
- int outIsLengthIncluded=0;
|
|
- int outMoreFragments=0;
|
|
- TNC_UInt32 outOverallLength=0;
|
|
+static int tnc_authenticate(void *type_arg, EAP_HANDLER *handler) {
|
|
|
|
- DEBUG2("HANDLER_OPAQUE: %d", (int) *((TNC_ConnectionID *) (handler->opaque)));
|
|
- DEBUG2("TNC-AUTHENTICATE is starting now for %d..........", (int) connId);
|
|
+ rad_assert(handler->request != NULL); // check that request has been sent previously
|
|
+ rad_assert(handler->stage == AUTHENTICATE); // check if initiate has been called
|
|
|
|
- /*
|
|
- * Get the User-Password for this user.
|
|
- */
|
|
- rad_assert(handler->request != NULL);
|
|
- rad_assert(handler->stage == AUTHENTICATE);
|
|
-
|
|
- /*
|
|
- * Extract the EAP-TNC packet.
|
|
- */
|
|
- if (!(packet = eaptnc_extract(handler->eap_ds)))
|
|
+ if (handler == NULL) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_authenticate invalid parameters: handler == NULL");
|
|
return 0;
|
|
+ }
|
|
+ if (handler->eap_ds == NULL) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_authenticate invalid parameters: handler->eap_ds == NULL");
|
|
+ return 0;
|
|
+ }
|
|
+ if (handler->eap_ds->response == NULL) {
|
|
+ radlog(
|
|
+ L_ERR,
|
|
+ "rlm_eap_tnc: tnc_authenticate invalid parameters: handler->eap_ds->resonse == NULL");
|
|
+ return 0;
|
|
+ }
|
|
+ if (handler->eap_ds->response->type.type != PW_EAP_TNC
|
|
+ || handler->eap_ds->response->type.length < 1
|
|
+ || handler->eap_ds->response->type.data == NULL) {
|
|
+ radlog(
|
|
+ L_ERR,
|
|
+ "rlm_eap_tnc: tnc_authenticate invalid parameters: handler->eap_ds->response->type.type == %X, ->type.length == %u, ->type.data == %p",
|
|
+ handler->eap_ds->response->type.type,
|
|
+ handler->eap_ds->response->type.length,
|
|
+ handler->eap_ds->response->type.data);
|
|
+ return 0;
|
|
+ }
|
|
|
|
- /*
|
|
- * Create a reply, and initialize it.
|
|
- */
|
|
- reply = eaptnc_alloc();
|
|
- if (!reply) {
|
|
- eaptnc_free(&packet);
|
|
- return 0;
|
|
- }
|
|
-
|
|
- reply->id = handler->eap_ds->request->id;
|
|
- reply->length = 0;
|
|
- if(packet->data_length==0){
|
|
- tnccsMsgLength = packet->length-TNC_PACKET_LENGTH_WITHOUT_DATA_LENGTH;
|
|
- }else{
|
|
- tnccsMsgLength = packet->length-TNC_PACKET_LENGTH;
|
|
- }
|
|
- isLengthIncluded = TNC_LENGTH_INCLUDED(packet->flags_ver);
|
|
- moreFragments = TNC_MORE_FRAGMENTS(packet->flags_ver);
|
|
- overallLength = packet->data_length;
|
|
- if(isLengthIncluded == 0
|
|
- && moreFragments == 0
|
|
- && overallLength == 0
|
|
- && tnccsMsgLength == 0
|
|
- && TNC_START(packet->flags_ver)==0){
|
|
-
|
|
- isAcknowledgement = 1;
|
|
- }
|
|
-
|
|
- DEBUG("Data received: (%d)", (int) tnccsMsgLength);
|
|
-/* int i;
|
|
- for(i=0;i<tnccsMsgLength;i++){
|
|
- DEBUG2("%c", (packet->data)[i]);
|
|
- }
|
|
- DEBUG2("\n");
|
|
- */
|
|
- state = exchangeTNCCSMessages(inst->tnc_path,
|
|
- connId,
|
|
- isAcknowledgement,
|
|
- packet->data,
|
|
- tnccsMsgLength,
|
|
- isLengthIncluded,
|
|
- moreFragments,
|
|
- overallLength,
|
|
- &outMessage,
|
|
- &outMessageLength,
|
|
- &outIsLengthIncluded,
|
|
- &outMoreFragments,
|
|
- &outOverallLength);
|
|
- DEBUG("GOT State %08x from TNCS", (unsigned int) state);
|
|
- if(state == TNC_CONNECTION_EAP_ACKNOWLEDGEMENT){ //send back acknoledgement
|
|
- reply->code = PW_TNC_REQUEST;
|
|
- reply->data = NULL;
|
|
- reply->data_length = 0;
|
|
- reply->flags_ver = 1;
|
|
- reply->length =TNC_PACKET_LENGTH_WITHOUT_DATA_LENGTH;
|
|
- }else{ //send back normal message
|
|
- DEBUG("GOT Message from TNCS (length: %d)", (int) outMessageLength);
|
|
-
|
|
- /* for(i=0;i<outMessageLength;i++){
|
|
- DEBUG2("%c", outMessage[i]);
|
|
- }
|
|
- DEBUG2("\n");
|
|
- */
|
|
- DEBUG("outIsLengthIncluded: %d, outMoreFragments: %d, outOverallLength: %d",
|
|
- outIsLengthIncluded, outMoreFragments, (int) outOverallLength);
|
|
- DEBUG("NEW STATE: %08x", (unsigned int) state);
|
|
- switch(state){
|
|
- case TNC_CONNECTION_STATE_HANDSHAKE:
|
|
- reply->code = PW_TNC_REQUEST;
|
|
- DEBUG2("Set Reply->Code to EAP-REQUEST\n");
|
|
- break;
|
|
- case TNC_CONNECTION_STATE_ACCESS_ALLOWED:
|
|
- reply->code = PW_TNC_SUCCESS;
|
|
- setVlanAttribute(inst, handler,VLAN_ACCESS);
|
|
- break;
|
|
- case TNC_CONNECTION_STATE_ACCESS_NONE:
|
|
- reply->code = PW_TNC_FAILURE;
|
|
- //setVlanAttribute(inst, handler, VLAN_ISOLATE);
|
|
- break;
|
|
- case TNC_CONNECTION_STATE_ACCESS_ISOLATED:
|
|
- reply->code = PW_TNC_SUCCESS;
|
|
- setVlanAttribute(inst, handler, VLAN_ISOLATE);
|
|
- break;
|
|
- default:
|
|
- reply->code= PW_TNC_FAILURE;
|
|
-
|
|
- }
|
|
- if(outMessage!=NULL && outMessageLength!=0){
|
|
- reply->data = outMessage;
|
|
- }
|
|
- reply->flags_ver = 1;
|
|
- if(outIsLengthIncluded){
|
|
- reply->flags_ver = SET_LENGTH_INCLUDED(reply->flags_ver);
|
|
- reply->data_length = outOverallLength;
|
|
- reply->length = TNC_PACKET_LENGTH + outMessageLength;
|
|
- DEBUG("SET LENGTH: %d", reply->length);
|
|
- DEBUG("SET DATALENGTH: %d", (int) outOverallLength);
|
|
- }else{
|
|
- reply->data_length = 0;
|
|
- reply->length = TNC_PACKET_LENGTH_WITHOUT_DATA_LENGTH + outMessageLength;
|
|
- DEBUG("SET LENGTH: %d", reply->length);
|
|
- }
|
|
- if(outMoreFragments){
|
|
- reply->flags_ver = SET_MORE_FRAGMENTS(reply->flags_ver);
|
|
- }
|
|
- }
|
|
-
|
|
- /*
|
|
- * Compose the EAP-MD5 packet out of the data structure,
|
|
- * and free it.
|
|
- */
|
|
- eaptnc_compose(handler->eap_ds, reply);
|
|
- eaptnc_free(&reply);
|
|
-
|
|
- handler->stage = AUTHENTICATE;
|
|
-
|
|
- eaptnc_free(&packet);
|
|
- return 1;
|
|
-}
|
|
-
|
|
-/*
|
|
- * Detach the EAP-TNC module.
|
|
- */
|
|
-static int tnc_detach(void *arg)
|
|
-{
|
|
- free(arg);
|
|
- return 0;
|
|
-}
|
|
-
|
|
-
|
|
-static CONF_PARSER module_config[] = {
|
|
- { "vlan_access", PW_TYPE_STRING_PTR,
|
|
- offsetof(rlm_eap_tnc_t, vlan_access), NULL, NULL },
|
|
- { "vlan_isolate", PW_TYPE_STRING_PTR,
|
|
- offsetof(rlm_eap_tnc_t, vlan_isolate), NULL, NULL },
|
|
- { "tnc_path", PW_TYPE_STRING_PTR,
|
|
- offsetof(rlm_eap_tnc_t, tnc_path), NULL,
|
|
- "/usr/local/lib/libTNCS.so"},
|
|
+ // get connection ID
|
|
+ TNC_ConnectionID conID = *((TNC_ConnectionID *) (handler->opaque));
|
|
|
|
- { NULL, -1, 0, NULL, NULL } /* end the list */
|
|
-};
|
|
+ DEBUG2("TNC-AUTHENTICATE is starting now for connection ID %lX !", conID);
|
|
|
|
-/*
|
|
- * Attach the EAP-TNC module.
|
|
- */
|
|
-static int tnc_attach(CONF_SECTION *cs, void **instance)
|
|
-{
|
|
- rlm_eap_tnc_t *inst;
|
|
+ // pass EAP_TNC data to NAA-EAP and get answer data
|
|
+ TNC_BufferReference output = NULL;
|
|
+ TNC_UInt32 outputLength = 0;
|
|
+ TNC_ConnectionState connectionState = TNC_CONNECTION_STATE_CREATE;
|
|
|
|
- inst = malloc(sizeof(*inst));
|
|
- if (!inst) return -1;
|
|
- memset(inst, 0, sizeof(*inst));
|
|
+ /*
|
|
+ * forwards the eap_tnc data to NAA-EAP and gets the response
|
|
+ * (uses a function from the NAA-EAP-library)
|
|
+ * the presence of the library is checked via the configure-script
|
|
+ */
|
|
+ TNC_Result result = processEAPTNCData(conID, handler->eap_ds->response->type.data,
|
|
+ handler->eap_ds->response->type.length, &output, &outputLength,
|
|
+ &connectionState);
|
|
+
|
|
+ // check for errors
|
|
+ if (result != TNC_RESULT_SUCCESS) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_authenticate error while calling NAA-EAP processEAPTNCData");
|
|
+ return 0;
|
|
+ }
|
|
|
|
- if (cf_section_parse(cs, inst, module_config) < 0) {
|
|
- tnc_detach(inst);
|
|
- return -1;
|
|
+ // output contains now the answer from NAA-EAP
|
|
+ uint8_t eapCode = 0;
|
|
+ // determine eapCode for request
|
|
+ switch (connectionState) {
|
|
+ case TNC_CONNECTION_STATE_HANDSHAKE:
|
|
+ eapCode = PW_EAP_REQUEST;
|
|
+ break;
|
|
+ case TNC_CONNECTION_STATE_ACCESS_NONE:
|
|
+ eapCode = PW_EAP_FAILURE;
|
|
+ break;
|
|
+ case TNC_CONNECTION_STATE_ACCESS_ALLOWED:
|
|
+ eapCode = PW_EAP_SUCCESS;
|
|
+ pairadd(&handler->request->config_items, pairmake("TNC-Status", "Access", T_OP_SET));
|
|
+ break;
|
|
+ case TNC_CONNECTION_STATE_ACCESS_ISOLATED:
|
|
+ eapCode = PW_EAP_SUCCESS;
|
|
+ pairadd(&handler->request->config_items, pairmake("TNC-Status", "Isolate", T_OP_SET));
|
|
+ break;
|
|
+ default:
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_authenticate invalid TNC_CONNECTION_STATE.");
|
|
+ return 0;
|
|
}
|
|
|
|
-
|
|
- if (!inst->vlan_access || !inst->vlan_isolate) {
|
|
- radlog(L_ERR, "rlm_eap_tnc: Must set both vlan_access and vlan_isolate");
|
|
- tnc_detach(inst);
|
|
- return -1;
|
|
+ // form EAP_REQUEST
|
|
+ if (!eaptnc_compose(handler, output, outputLength, eapCode)) {
|
|
+ radlog(L_ERR,
|
|
+ "rlm_eap_tnc: tnc_authenticate error while forming EAP_REQUEST.");
|
|
+ return 0;
|
|
}
|
|
|
|
- *instance = inst;
|
|
- return 0;
|
|
+ // FIXME: Why is that needed?
|
|
+ handler->stage = AUTHENTICATE;
|
|
+
|
|
+ return 1;
|
|
}
|
|
|
|
/*
|
|
@@ -371,10 +405,10 @@
|
|
* That is, everything else should be 'static'.
|
|
*/
|
|
EAP_TYPE rlm_eap_tnc = {
|
|
- "eap_tnc",
|
|
- tnc_attach, /* attach */
|
|
- tnc_initiate, /* Start the initial request */
|
|
- NULL, /* authorization */
|
|
- tnc_authenticate, /* authentication */
|
|
- tnc_detach /* detach */
|
|
+ "eap_tnc",
|
|
+ tnc_attach, /* attach */
|
|
+ tnc_initiate, /* Start the initial request */
|
|
+ NULL, /* authorization */
|
|
+ tnc_authenticate, /* authentication */
|
|
+ tnc_detach /* detach */
|
|
};
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.c freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.c
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.c 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.c 1970-01-01 01:00:00.000000000 +0100
|
|
@@ -1,146 +0,0 @@
|
|
-/*
|
|
- * This software is Copyright (C) 2006,2007 FH Hannover
|
|
- *
|
|
- * Portions of this code unrelated to FreeRADIUS are available
|
|
- * separately under a commercial license. If you require an
|
|
- * implementation of EAP-TNC that is not under the GPLv2, please
|
|
- * contact [email protected] for details.
|
|
- *
|
|
- * This program is free software; you can redistribute it and/or modify
|
|
- * it under the terms of the GNU General Public License as published by
|
|
- * the Free Software Foundation; either version 2 of the License, or
|
|
- * (at your option) any later version.
|
|
- *
|
|
- * This program is distributed in the hope that it will be useful,
|
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
- * GNU General Public License for more details.
|
|
- *
|
|
- * You should have received a copy of the GNU General Public License
|
|
- * along with this program; if not, write to the Free Software
|
|
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
- *
|
|
- */
|
|
-#include <freeradius-devel/ident.h>
|
|
-RCSID("$Id$")
|
|
-
|
|
-#include "tncs_connect.h"
|
|
-#include <ltdl.h>
|
|
-#include <stdlib.h>
|
|
-#include <stdio.h>
|
|
-#include <eap.h>
|
|
-
|
|
- /*
|
|
- * FIXME: This linking should really be done at compile time.
|
|
- */
|
|
-static lt_dlhandle handle = NULL;
|
|
-
|
|
-static ExchangeTNCCSMessagePointer callTNCS = NULL;
|
|
-
|
|
-/*
|
|
- * returns the function-pointer to a function of a shared-object
|
|
- *
|
|
- * soHandle: handle to a shared-object
|
|
- * name: name of the requested function
|
|
- *
|
|
- * return: the procAddress if found, else NULL
|
|
- */
|
|
-static void *getProcAddress(lt_dlhandle soHandle, const char *name){
|
|
- void *proc = lt_dlsym(soHandle, name);
|
|
- DEBUG("Searching for function %s", name);
|
|
- if(proc == NULL){
|
|
- DEBUG("rlm_eap_tnc: Failed to resolve symbol %s: %s",
|
|
- name, lt_dlerror());
|
|
- }
|
|
- return proc;
|
|
-}
|
|
-
|
|
-
|
|
-/*
|
|
- * establishs the connection to the TNCCS without calling functionality.
|
|
- * That means that the TNCS-shared-object is loaded and the function-pointer
|
|
- * to "exchangeTNCCSMessages" is explored.
|
|
- *
|
|
- * return: -1 if connect failed, 0 if connect was successful
|
|
- */
|
|
-int connectToTncs(char *pathToSO){
|
|
- int state = -1;
|
|
- if(handle==NULL){
|
|
- handle = lt_dlopen(pathToSO);
|
|
- DEBUG("OPENED HANDLE!");
|
|
- }
|
|
-
|
|
- if(handle==NULL){
|
|
- DEBUG("HANDLE IS NULL");
|
|
- DEBUG("rlm_eap_tnc: Failed to link to library %s: %s",
|
|
- pathToSO, lt_dlerror());
|
|
- }else{
|
|
- DEBUG("SO %s found!", pathToSO);
|
|
- if(callTNCS==NULL){
|
|
- callTNCS = (ExchangeTNCCSMessagePointer) getProcAddress(handle, "exchangeTNCCSMessages");
|
|
- }
|
|
- if(callTNCS!=NULL){
|
|
- DEBUG("TNCS is connected");
|
|
- state = 0;
|
|
-// int ret = callTNCS2(2, "Bla", NULL);
|
|
- // DEBUG("GOT %d from exchangeTNCCSMessages", ret);
|
|
- }else{
|
|
- DEBUG("Could not find exchangeTNCCSMessages");
|
|
- }
|
|
-
|
|
- }
|
|
- return state;
|
|
-}
|
|
-
|
|
-/*
|
|
- * Accesspoint to the TNCS for sending and receiving TNCCS-Messages.
|
|
- * -pathToSO: Path to TNCCS-Shared Object
|
|
- * -connId: identifies the client which the passed message belongs to.
|
|
- * -isAcknoledgement: 1 if acknoledgement received (then all following in-parameters unimportant
|
|
- * -input: input-TNCCS-message received from the client with connId
|
|
- * -inputLength: length of input-TNCCS-message
|
|
- * -isFirst: 1 if first message in fragmentation else 0
|
|
- * -moreFragments: are there more Fragments to come (yes: 1, no: 0)?
|
|
- * -overallLength: length of all fragments together (only set if fragmentation)
|
|
- * -output: answer-TNCCS-message from the TNCS to the client
|
|
- * -outputLength: length of answer-TNCCS-message
|
|
- * -answerIsFirst: returned answer is first in row
|
|
- * -moreFragmentsFollow: more fragments after this answer
|
|
- * -overallLengthOut: length of all fragments together (only set if fragmentation) as answer
|
|
- *
|
|
- * return: state of connection as result of the exchange
|
|
- */
|
|
-TNC_ConnectionState exchangeTNCCSMessages(/*in*/ char *pathToSO,
|
|
- /*in*/ TNC_ConnectionID connId,
|
|
- /*in*/ int isAcknoledgement,
|
|
- /*in*/ TNC_BufferReference input,
|
|
- /*in*/ TNC_UInt32 inputLength,
|
|
- /*in*/ int isFirst,
|
|
- /*in*/ int moreFragments,
|
|
- /*in*/ TNC_UInt32 overallLength,
|
|
- /*out*/ TNC_BufferReference *output,
|
|
- /*out*/ TNC_UInt32 *outputLength,
|
|
- /*out*/ int *answerIsFirst,
|
|
- /*out*/ int *moreFragmentsFollow,
|
|
- /*out*/ TNC_UInt32 *overallLengthOut){
|
|
- TNC_ConnectionState state = TNC_CONNECTION_STATE_ACCESS_NONE;
|
|
- int connectStatus = connectToTncs(pathToSO);
|
|
- if(connectStatus!=-1){
|
|
- state = callTNCS(connId,
|
|
- isAcknoledgement,
|
|
- input,
|
|
- inputLength,
|
|
- isFirst,
|
|
- moreFragments,
|
|
- overallLength,
|
|
- output,
|
|
- outputLength,
|
|
- answerIsFirst,
|
|
- moreFragmentsFollow,
|
|
- overallLengthOut);
|
|
- DEBUG("GOT TNC_ConnectionState (juhuuu): %u", (unsigned int) state);
|
|
- }else{
|
|
- DEBUG("CAN NOT CONNECT TO TNCS");
|
|
- }
|
|
- return state;
|
|
-}
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.h freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.h
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.h 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/tncs_connect.h 1970-01-01 01:00:00.000000000 +0100
|
|
@@ -1,70 +0,0 @@
|
|
-/*
|
|
- * This software is Copyright (C) 2006,2007 FH Hannover
|
|
- *
|
|
- * Portions of this code unrelated to FreeRADIUS are available
|
|
- * separately under a commercial license. If you require an
|
|
- * implementation of EAP-TNC that is not under the GPLv2, please
|
|
- * contact [email protected] for details.
|
|
- *
|
|
- * This program is free software; you can redistribute it and/or modify
|
|
- * it under the terms of the GNU General Public License as published by
|
|
- * the Free Software Foundation; either version 2 of the License, or
|
|
- * (at your option) any later version.
|
|
- *
|
|
- * This program is distributed in the hope that it will be useful,
|
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
- * GNU General Public License for more details.
|
|
- *
|
|
- * You should have received a copy of the GNU General Public License
|
|
- * along with this program; if not, write to the Free Software
|
|
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
- *
|
|
- */
|
|
-
|
|
-#ifndef _TNCS_CONNECT_H_
|
|
-#define _TNCS_CONNECT_H_
|
|
-
|
|
-#include "tncs.h"
|
|
-
|
|
-/*
|
|
- * establishs the connection to the TNCCS without calling functionality.
|
|
- * That means that the TNCS-shared-object is loaded and the function-pointer
|
|
- * to "exchangeTNCCSMessages" is explored.
|
|
- *
|
|
- * return: -1 if connect failed, 0 if connect was successful
|
|
- */
|
|
-int connectToTncs(char *pathToSO);
|
|
-/*
|
|
- * Accesspoint to the TNCS for sending and receiving TNCCS-Messages.
|
|
- * -pathToSO: Path to TNCCS-Shared Object
|
|
- * -connId: identifies the client which the passed message belongs to.
|
|
- * -isAcknoledgement: 1 if acknoledgement received (then all following in-parameters unimportant
|
|
- * -input: input-TNCCS-message received from the client with connId
|
|
- * -inputLength: length of input-TNCCS-message
|
|
- * -isFirst: 1 if first message in fragmentation else 0
|
|
- * -moreFragments: are there more Fragments to come (yes: 1, no: 0)?
|
|
- * -overallLength: length of all fragments together (only set if fragmentation)
|
|
- * -output: answer-TNCCS-message from the TNCS to the client
|
|
- * -outputLength: length of answer-TNCCS-message
|
|
- * -answerIsFirst: returned answer is first in row
|
|
- * -moreFragmentsFollow: more fragments after this answer
|
|
- * -overallLengthOut: length of all fragments together (only set if fragmentation) as answer
|
|
- *
|
|
- * return: state of connection as result of the exchange
|
|
- */
|
|
-TNC_ConnectionState exchangeTNCCSMessages(/*in*/ char *pathToSO,
|
|
- /*in*/ TNC_ConnectionID connId,
|
|
- /*in*/ int isAcknoledgement,
|
|
- /*in*/ TNC_BufferReference input,
|
|
- /*in*/ TNC_UInt32 inputLength,
|
|
- /*in*/ int isFirst,
|
|
- /*in*/ int moreFragments,
|
|
- /*in*/ TNC_UInt32 overallLength,
|
|
- /*out*/ TNC_BufferReference *output,
|
|
- /*out*/ TNC_UInt32 *outputLength,
|
|
- /*out*/ int *answerIsFirst,
|
|
- /*out*/ int *moreFragmentsFollow,
|
|
- /*out*/ TNC_UInt32 *overallLengthOut);
|
|
-
|
|
-#endif //_TNCS_CONNECT_H_
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/tncs.h freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/tncs.h
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc/tncs.h 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_tnc/tncs.h 1970-01-01 01:00:00.000000000 +0100
|
|
@@ -1,86 +0,0 @@
|
|
-/*
|
|
- * This software is Copyright (C) 2006,2007 FH Hannover
|
|
- *
|
|
- * Portions of this code unrelated to FreeRADIUS are available
|
|
- * separately under a commercial license. If you require an
|
|
- * implementation of EAP-TNC that is not under the GPLv2, please
|
|
- * contact [email protected] for details.
|
|
- *
|
|
- * This program is free software; you can redistribute it and/or modify
|
|
- * it under the terms of the GNU General Public License as published by
|
|
- * the Free Software Foundation; either version 2 of the License, or
|
|
- * (at your option) any later version.
|
|
- *
|
|
- * This program is distributed in the hope that it will be useful,
|
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
- * GNU General Public License for more details.
|
|
- *
|
|
- * You should have received a copy of the GNU General Public License
|
|
- * along with this program; if not, write to the Free Software
|
|
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
- *
|
|
- */
|
|
-
|
|
-#ifndef _TNCS_H_
|
|
-#define _TNCS_H_
|
|
-
|
|
-
|
|
-
|
|
-#ifdef __cplusplus
|
|
-extern "C" {
|
|
-#endif
|
|
-
|
|
-/*
|
|
- * copied from tncimv.h:
|
|
- */
|
|
-typedef unsigned long TNC_UInt32;
|
|
-typedef TNC_UInt32 TNC_ConnectionState;
|
|
-typedef unsigned char *TNC_BufferReference;
|
|
-typedef TNC_UInt32 TNC_ConnectionID;
|
|
-
|
|
-#define TNC_CONNECTION_STATE_CREATE 0
|
|
-#define TNC_CONNECTION_STATE_HANDSHAKE 1
|
|
-#define TNC_CONNECTION_STATE_ACCESS_ALLOWED 2
|
|
-#define TNC_CONNECTION_STATE_ACCESS_ISOLATED 3
|
|
-#define TNC_CONNECTION_STATE_ACCESS_NONE 4
|
|
-#define TNC_CONNECTION_STATE_DELETE 5
|
|
-#define TNC_CONNECTION_EAP_ACKNOWLEDGEMENT 6
|
|
-
|
|
-/*
|
|
- * Accesspoint (as function-pointer) to the TNCS for sending and receiving
|
|
- * TNCCS-Messages.
|
|
- *
|
|
- * -connId: identifies the client which the passed message belongs to.
|
|
- * -isAcknoledgement: 1 if acknoledgement received (then all following in-parameters unimportant
|
|
- * -input: input-TNCCS-message received from the client with connId
|
|
- * -inputLength: length of input-TNCCS-message
|
|
- * -isFirst: 1 if first message in fragmentation else 0
|
|
- * -moreFragments: are there more Fragments to come (yes: 1, no: 0)?
|
|
- * -overallLength: length of all fragments together (only set if fragmentation)
|
|
- * -output: answer-TNCCS-message from the TNCS to the client
|
|
- * -outputLength: length of answer-TNCCS-message
|
|
- * -answerIsFirst: returned answer is first in row
|
|
- * -moreFragmentsFollow: more fragments after this answer
|
|
- * -overallLengthOut: length of all fragments together (only set if fragmentation) as answer
|
|
- *
|
|
- * return: state of connection as result of the exchange
|
|
- */
|
|
-typedef TNC_ConnectionState (*ExchangeTNCCSMessagePointer)(/*in*/ TNC_ConnectionID connId,
|
|
- /*in*/ int isAcknoledgement,
|
|
- /*in*/ TNC_BufferReference input,
|
|
- /*in*/ TNC_UInt32 inputLength,
|
|
- /*in*/ int isFirst,
|
|
- /*in*/ int moreFragments,
|
|
- /*in*/ TNC_UInt32 overallLength,
|
|
- /*out*/ TNC_BufferReference *output,
|
|
- /*out*/ TNC_UInt32 *outputLength,
|
|
- /*out*/ int *answerIsFirst,
|
|
- /*out*/ int *moreFragmentsFollow,
|
|
- /*out*/ TNC_UInt32 *overallLengthOut
|
|
-);
|
|
-
|
|
-#ifdef __cplusplus
|
|
-}
|
|
-#endif
|
|
-#endif //_TNCS_H_
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h 2012-12-04 19:39:54.749423138 +0100
|
|
@@ -37,6 +37,10 @@
|
|
int copy_request_to_tunnel;
|
|
int use_tunneled_reply;
|
|
const char *virtual_server;
|
|
+ const char *tnc_virtual_server; // virtual server for EAP-TNC as the second inner method
|
|
+ VALUE_PAIR *auth_reply; // cache storage of the last reply of the first inner method
|
|
+ int auth_code; // cache storage of the reply-code of the first inner method
|
|
+ int doing_tnc; // status if we're doing EAP-TNC
|
|
} ttls_tunnel_t;
|
|
|
|
/*
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c 2012-12-04 19:39:54.749423138 +0100
|
|
@@ -62,6 +62,11 @@
|
|
* Virtual server for inner tunnel session.
|
|
*/
|
|
char *virtual_server;
|
|
+
|
|
+ /*
|
|
+ * Virtual server for the second inner tunnel method, which is EAP-TNC.
|
|
+ */
|
|
+ char *tnc_virtual_server;
|
|
} rlm_eap_ttls_t;
|
|
|
|
|
|
@@ -78,6 +83,9 @@
|
|
{ "virtual_server", PW_TYPE_STRING_PTR,
|
|
offsetof(rlm_eap_ttls_t, virtual_server), NULL, NULL },
|
|
|
|
+ { "tnc_virtual_server", PW_TYPE_STRING_PTR,
|
|
+ offsetof(rlm_eap_ttls_t, tnc_virtual_server), NULL, NULL },
|
|
+
|
|
{ "include_length", PW_TYPE_BOOLEAN,
|
|
offsetof(rlm_eap_ttls_t, include_length), NULL, "yes" },
|
|
|
|
@@ -171,6 +179,10 @@
|
|
t->copy_request_to_tunnel = inst->copy_request_to_tunnel;
|
|
t->use_tunneled_reply = inst->use_tunneled_reply;
|
|
t->virtual_server = inst->virtual_server;
|
|
+ t->tnc_virtual_server = inst->tnc_virtual_server; // virtual server for EAP-TNC as the second inner method
|
|
+ t->auth_reply = NULL; // cache storage of the last reply of the first inner method
|
|
+ t->auth_code = -1; // cache storage of the reply-code of the first inner method
|
|
+ t->doing_tnc = 0; // status if we're doing EAP-TNC (on start we're doing NOT)
|
|
return t;
|
|
}
|
|
|
|
diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
|
|
--- freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c 2012-09-10 13:51:34.000000000 +0200
|
|
+++ freeradius-server-2.2.0/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c 2012-12-04 19:39:54.749423138 +0100
|
|
@@ -585,6 +585,94 @@
|
|
}
|
|
|
|
/*
|
|
+ * Start EAP-TNC as a second inner method.
|
|
+ * Creates a new fake-request out of the original incoming request (via EAP_HANDLER).
|
|
+ * If it's the first time, we create a EAP-START-packet and send
|
|
+ * EAP-START := code = PW_EAP_REQUEST
|
|
+ *
|
|
+ */
|
|
+static REQUEST* start_tnc(EAP_HANDLER *handler, ttls_tunnel_t *t) {
|
|
+ REQUEST* request = handler->request;
|
|
+ RDEBUG2("EAP-TNC as second inner authentication method starts now");
|
|
+
|
|
+ /*
|
|
+ * Allocate a fake REQUEST struct,
|
|
+ * to make a new request, based on the original request.
|
|
+ */
|
|
+ REQUEST* fake = request_alloc_fake(request);
|
|
+
|
|
+ /*
|
|
+ * Set the virtual server to that of EAP-TNC.
|
|
+ */
|
|
+ fake->server = t->tnc_virtual_server;
|
|
+
|
|
+ /*
|
|
+ * Build a new EAP-Message.
|
|
+ */
|
|
+ VALUE_PAIR *eap_msg;
|
|
+ eap_msg = paircreate(PW_EAP_MESSAGE, PW_TYPE_OCTETS);
|
|
+
|
|
+ /*
|
|
+ * Set the EAP-Message to look like EAP-Start
|
|
+ */
|
|
+ eap_msg->vp_octets[0] = PW_EAP_RESPONSE;
|
|
+ eap_msg->vp_octets[1] = 0x00;
|
|
+
|
|
+ /*
|
|
+ * Only setting EAP-TNC here,
|
|
+ * because it is intended to do user-authentication in the first inner method,
|
|
+ * and then a hardware-authentication (like EAP-TNC) as the second method.
|
|
+ */
|
|
+ eap_msg->vp_octets[4] = PW_EAP_TNC;
|
|
+
|
|
+ eap_msg->length = 0;
|
|
+
|
|
+ /*
|
|
+ * Add the EAP-Message to the request.
|
|
+ */
|
|
+ pairadd(&(fake->packet->vps), eap_msg);
|
|
+
|
|
+ /*
|
|
+ * Process the new request by the virtual server configured for
|
|
+ * EAP-TNC.
|
|
+ */
|
|
+ rad_authenticate(fake);
|
|
+
|
|
+ /*
|
|
+ * From now on we're doing EAP-TNC as the second inner authentication method.
|
|
+ */
|
|
+ t->doing_tnc = TRUE;
|
|
+
|
|
+ return fake;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * Stop EAP-TNC as a second inner method.
|
|
+ * Copy the value pairs from the cached Access-Accept of the first inner method
|
|
+ * to the Access-Accept/Reject package of EAP-TNC.
|
|
+ */
|
|
+static REQUEST* stop_tnc(REQUEST *request, ttls_tunnel_t *t) {
|
|
+ RDEBUG2("EAP-TNC as second inner authentication method stops now");
|
|
+
|
|
+ /*
|
|
+ * Copy the value-pairs of the origina Access-Accept of the first
|
|
+ * inner authentication method to the Access-Accept/Reject of the
|
|
+ * second inner authentication method (EAP-TNC).
|
|
+ */
|
|
+ if (request->reply->code == PW_AUTHENTICATION_ACK) {
|
|
+ pairadd(&(request->reply->vps), t->auth_reply);
|
|
+ } else if (request->reply->code == PW_AUTHENTICATION_REJECT) {
|
|
+ pairadd(&(request->reply->vps), t->auth_reply);
|
|
+ }
|
|
+
|
|
+ pairdelete(&(request->reply->vps), PW_MESSAGE_AUTHENTICATOR);
|
|
+ pairdelete(&(request->reply->vps), PW_PROXY_STATE);
|
|
+ pairdelete(&(request->reply->vps), PW_USER_NAME);
|
|
+
|
|
+ return request;
|
|
+}
|
|
+
|
|
+/*
|
|
* Use a reply packet to determine what to do.
|
|
*/
|
|
static int process_reply(EAP_HANDLER *handler, tls_session_t *tls_session,
|
|
@@ -1135,6 +1223,16 @@
|
|
|
|
} /* else fake->server == request->server */
|
|
|
|
+ /*
|
|
+ * If we're doing EAP-TNC as a second method,
|
|
+ * then set the server to that one.
|
|
+ * Then, rad_authenticate will run EAP-TNC,
|
|
+ * so that afterwards we have to look for the state of
|
|
+ * EAP-TNC.
|
|
+ */
|
|
+ if (t->doing_tnc) {
|
|
+ fake->server = t->tnc_virtual_server;
|
|
+ }
|
|
|
|
if ((debug_flag > 0) && fr_log_fp) {
|
|
RDEBUG("Sending tunneled request");
|
|
@@ -1248,6 +1346,53 @@
|
|
|
|
default:
|
|
/*
|
|
+ * If the result of the first method was an acknowledgment OR
|
|
+ * if were already running EAP-TNC,
|
|
+ * we're doing additional things before processing the reply.
|
|
+ * Also the configuration for EAP-TTLS has to contain a virtual server
|
|
+ * for EAP-TNC as the second method.
|
|
+ */
|
|
+ if (t->tnc_virtual_server) {
|
|
+ /*
|
|
+ * If the reply code of the first inner method is PW_AUTHENTICATION_ACK
|
|
+ * which means that the method was successful,
|
|
+ * and we're not doing EAP-TNC as the second method,
|
|
+ * then we want to intercept the Access-Accept and start EAP-TNC as the second inner method.
|
|
+ */
|
|
+ if (fake->reply->code == PW_AUTHENTICATION_ACK
|
|
+ && t->doing_tnc == FALSE) {
|
|
+ RDEBUG2("Reply-Code of the first inner method was: %d (PW_AUTHENTICATION_ACK)", fake->reply->code);
|
|
+
|
|
+ /*
|
|
+ * Save reply-value pairs and reply-code of the first method.
|
|
+ */
|
|
+ t->auth_reply = fake->reply->vps;
|
|
+ fake->reply->vps = NULL;
|
|
+ t->auth_code = fake->reply->code;
|
|
+
|
|
+ /*
|
|
+ * Create the start package for EAP-TNC.
|
|
+ */
|
|
+ fake = start_tnc(handler, t);
|
|
+
|
|
+ /*
|
|
+ * If we're doing EAP-TNC as the second inner method,
|
|
+ * and the reply->code was PW_AUTHENTICATION_ACK or PW_AUTHENTICATION_REJECT,
|
|
+ * then we stop EAP-TNC and create an combined Access-Accept or Access-Reject.
|
|
+ */
|
|
+ } else if (t->doing_tnc == TRUE
|
|
+ && (fake->reply->code == PW_AUTHENTICATION_ACK || fake->reply->code == PW_AUTHENTICATION_REJECT)) {
|
|
+
|
|
+ /*
|
|
+ * Create the combined Access-Accept or -Reject.
|
|
+ */
|
|
+ RDEBUG2("Reply-Code of EAP-TNC as the second inner method was: %d (%s)", fake->reply->code,
|
|
+ fake->reply->code == PW_AUTHENTICATION_ACK ? "PW_AUTHENTICATION_ACK" : "PW_AUTHENTICATION_REJECT");
|
|
+ fake = stop_tnc(fake, t);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /*
|
|
* Returns RLM_MODULE_FOO, and we want to return
|
|
* PW_FOO
|
|
*/
|