From 1c088a8b6237ec67f63c23f97a0f2dc4e99af869 Mon Sep 17 00:00:00 2001 From: Rene Mayrhofer Date: Sun, 30 Mar 2008 08:31:24 +0000 Subject: [svn-upgrade] Integrating new upstream version, strongswan (4.1.11) --- configure | 129 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 55 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 17efdfc15..56ca4be5d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for strongSwan 4.1.10. +# Generated by GNU Autoconf 2.61 for strongSwan 4.1.11. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='strongSwan' PACKAGE_TARNAME='strongswan' -PACKAGE_VERSION='4.1.10' -PACKAGE_STRING='strongSwan 4.1.10' +PACKAGE_VERSION='4.1.11' +PACKAGE_STRING='strongSwan 4.1.11' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -845,11 +845,13 @@ CPP GREP EGREP confdir -ipsecdir piddir +ipsecdir +plugindir eapdir backenddir interfacedir +simreader linuxdir LINUX_HEADERS IPSEC_ROUTING_TABLE @@ -1473,7 +1475,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures strongSwan 4.1.10 to adapt to many kinds of systems. +\`configure' configures strongSwan 4.1.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1545,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of strongSwan 4.1.10:";; + short | recursive ) echo "Configuration of strongSwan 4.1.11:";; esac cat <<\_ACEOF @@ -1616,19 +1618,21 @@ Optional Packages: --with-urandom-device=dev set the device for pseudo random data other than "/dev/urandom" - --with-ipsecdir=dir installation path for ipsec tools other than - "libexecdir/ipsec" --with-piddir=dir path for PID and UNIX socket files other than "/var/run" + --with-ipsecdir=dir installation path for ipsec tools other than + "libexecdir/ipsec" + --with-plugindir=dir installation path for plugins other than + "ipsecdir/plugins" --with-eapdir=dir path for pluggable EAP modules other than - "ipsecdir/plugins/eap" + "plugindir/eap" --with-backenddir=dir path for pluggable configuration backend modules - other than "ipsecdir/plugins/backends" + other than "plugindir/backends" --with-interfacedir=dir path for pluggable control interface modules other - than "ipsecdir/plugins/interfaces" + than "plugindir/interfaces" --with-sim-reader=library.so - library containing the sim_run_alg() function for - EAP-SIM + library containing the + sim_run_alg()/sim_get_triplet() function for EAP-SIM --with-linux-headers=dir use the linux header files in dir instead of the supplied ones in "src/include" @@ -1733,7 +1737,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -strongSwan configure 4.1.10 +strongSwan configure 4.1.11 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1747,7 +1751,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by strongSwan $as_me 4.1.10, which was +It was created by strongSwan $as_me 4.1.11, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2437,7 +2441,7 @@ fi # Define the identity of the package. PACKAGE='strongswan' - VERSION='4.1.10' + VERSION='4.1.11' cat >>confdefs.h <<_ACEOF @@ -4705,6 +4709,18 @@ fi +# Check whether --with-piddir was given. +if test "${with_piddir+set}" = set; then + withval=$with_piddir; piddir="$withval" + +else + piddir="/var/run" + + +fi + + + # Check whether --with-ipsecdir was given. if test "${with_ipsecdir+set}" = set; then withval=$with_ipsecdir; ipsecdir="$withval" @@ -4717,12 +4733,12 @@ fi -# Check whether --with-piddir was given. -if test "${with_piddir+set}" = set; then - withval=$with_piddir; piddir="$withval" +# Check whether --with-plugindir was given. +if test "${with_plugindir+set}" = set; then + withval=$with_plugindir; plugindir="$withval" else - piddir="/var/run" + plugindir="${ipsecdir}/plugins" fi @@ -4734,7 +4750,7 @@ if test "${with_eapdir+set}" = set; then withval=$with_eapdir; eapdir="$withval" else - eapdir="${ipsecdir}/plugins/eap" + eapdir="${plugindir}/eap" fi @@ -4746,7 +4762,7 @@ if test "${with_backenddir+set}" = set; then withval=$with_backenddir; backenddir="$withval" else - backenddir="${ipsecdir}/plugins/backends" + backenddir="${plugindir}/backends" fi @@ -4758,7 +4774,7 @@ if test "${with_interfacedir+set}" = set; then withval=$with_interfacedir; interfacedir="$withval" else - interfacedir="${ipsecdir}/plugins/interfaces" + interfacedir="${plugindir}/interfaces" fi @@ -4767,9 +4783,10 @@ fi # Check whether --with-sim-reader was given. if test "${with_sim_reader+set}" = set; then - withval=$with_sim_reader; cat >>confdefs.h <<_ACEOF -#define SIM_READER_LIB "$withval" -_ACEOF + withval=$with_sim_reader; simreader="$withval" + +else + simreader="${plugindir}/libcharon-eapsim-file.so" fi @@ -6083,7 +6100,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6086 "configure"' > conftest.$ac_ext + echo '#line 6103 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8404,11 +8421,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8407: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8424: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8411: \$? = $ac_status" >&5 + echo "$as_me:8428: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8694,11 +8711,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8697: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8714: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8701: \$? = $ac_status" >&5 + echo "$as_me:8718: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8798,11 +8815,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8801: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8818: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8805: \$? = $ac_status" >&5 + echo "$as_me:8822: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11156,7 +11173,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13691: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13678: \$? = $ac_status" >&5 + echo "$as_me:13695: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13775,11 +13792,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13795: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:13799: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15349,11 +15366,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15352: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15369: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15356: \$? = $ac_status" >&5 + echo "$as_me:15373: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15453,11 +15470,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15456: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15473: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15460: \$? = $ac_status" >&5 + echo "$as_me:15477: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17648,11 +17665,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17651: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17668: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17655: \$? = $ac_status" >&5 + echo "$as_me:17672: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17938,11 +17955,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17941: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17958: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17945: \$? = $ac_status" >&5 + echo "$as_me:17962: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18042,11 +18059,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18045: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18062: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18049: \$? = $ac_status" >&5 + echo "$as_me:18066: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -23571,7 +23588,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by strongSwan $as_me 4.1.10, which was +This file was extended by strongSwan $as_me 4.1.11, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23618,7 +23635,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -strongSwan config.status 4.1.10 +strongSwan config.status 4.1.11 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -23884,11 +23901,13 @@ CPP!$CPP$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim confdir!$confdir$ac_delim -ipsecdir!$ipsecdir$ac_delim piddir!$piddir$ac_delim +ipsecdir!$ipsecdir$ac_delim +plugindir!$plugindir$ac_delim eapdir!$eapdir$ac_delim backenddir!$backenddir$ac_delim interfacedir!$interfacedir$ac_delim +simreader!$simreader$ac_delim linuxdir!$linuxdir$ac_delim LINUX_HEADERS!$LINUX_HEADERS$ac_delim IPSEC_ROUTING_TABLE!$IPSEC_ROUTING_TABLE$ac_delim @@ -23900,8 +23919,6 @@ USE_LIBCURL_FALSE!$USE_LIBCURL_FALSE$ac_delim USE_LIBLDAP_TRUE!$USE_LIBLDAP_TRUE$ac_delim USE_LIBLDAP_FALSE!$USE_LIBLDAP_FALSE$ac_delim USE_STROKE_TRUE!$USE_STROKE_TRUE$ac_delim -USE_STROKE_FALSE!$USE_STROKE_FALSE$ac_delim -USE_LIBDBUS_TRUE!$USE_LIBDBUS_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -23943,6 +23960,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +USE_STROKE_FALSE!$USE_STROKE_FALSE$ac_delim +USE_LIBDBUS_TRUE!$USE_LIBDBUS_TRUE$ac_delim USE_LIBDBUS_FALSE!$USE_LIBDBUS_FALSE$ac_delim USE_LIBXML_TRUE!$USE_LIBXML_TRUE$ac_delim USE_LIBXML_FALSE!$USE_LIBXML_FALSE$ac_delim @@ -24030,7 +24049,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -- cgit v1.2.3