From 0b128316a0c92efb6b5171370a33c06c3b338bdf Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Sat, 23 May 2009 15:40:44 +0200 Subject: [PATCH] ecl interface: update auto/configure Vim has changed from autoconf 2.62 to 2.63. --- src/auto/configure | 65 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index d62306fb..d0491373 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4979,8 +4979,9 @@ fi + { $as_echo "$as_me:$LINENO: checking --enable-eclinterp argument" >&5 -$as_echo_n "checking --enable-eclinterp argument..." >&6; } +$as_echo_n "checking --enable-eclinterp argument... " >&6; } # Check whether --enable-eclinterp was given. if test "${enable_eclinterp+set}" = set; then enableval=$enable_eclinterp; @@ -4989,14 +4990,14 @@ else fi { $as_echo "$as_me:$LINENO: result: $enable_eclinterp" >&5 -$as_echo "${ECHO_T}$enable_eclinterp" >&6; } +$as_echo "$enable_eclinterp" >&6; } if test "$enable_eclinterp" = "yes"; then # Extract the first word of "ecl-config", so it can be a program name with args. set dummy ecl-config; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word..." >&6; } +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_vi_cv_path_ecl_config+set}" = set; then - $as_echo_n "(cached)" >&6 + $as_echo_n "(cached) " >&6 else case $vi_cv_path_ecl_config in [\\/]* | ?:[\\/]*) @@ -5009,7 +5010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_ecl_config="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5024,17 +5025,17 @@ fi vi_cv_path_ecl_config=$ac_cv_path_vi_cv_path_ecl_config if test -n "$vi_cv_path_ecl_config"; then { $as_echo "$as_me:$LINENO: result: $vi_cv_path_ecl_config" >&5 -$as_echo "${ECHO_T}$vi_cv_path_ecl_config" >&6; } +$as_echo "$vi_cv_path_ecl_config" >&6; } else { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "${ECHO_T}no" >&6; } +$as_echo "no" >&6; } fi if test "X$vi_cv_path_ecl_config" != "X"; then if test "${vi_cv_path_ecl_plibs+set}" = set; then - $as_echo_n "(cached)" >&6 + $as_echo_n "(cached) " >&6 else vi_cv_path_ecl_plibs=`ecl-config --libs` @@ -5044,7 +5045,7 @@ fi ECL_LIBS="${vi_cv_path_ecl_plibs}" if test "${vi_cv_path_ecl_cflags+set}" = set; then - $as_echo_n "(cached)" >&6 + $as_echo_n "(cached) " >&6 else vi_cv_path_ecl_cflags=`ecl-config --cflags` @@ -5056,8 +5057,8 @@ fi ECL_SRC="if_ecl.c" ECL_OBJ="objects/if_ecl.o" - { echo "$as_me:$LINENO: checking if compile and link flags for ECL are sane" >&5 -$as_echo_n "checking if compile and link flags for ECL are sane..." >&6; } + { $as_echo "$as_me:$LINENO: checking if compile and link flags for ECL are sane" >&5 +$as_echo_n "checking if compile and link flags for ECL are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $ECL_CFLAGS" @@ -5078,37 +5079,38 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval $as_echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +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:$LINENO: $ac_try_echo\"" +$as_echo "$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 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval $as_echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval $as_echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + 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 { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "${ECHO_T}yes" >&6; }; ecl_ok=yes +$as_echo "yes" >&6; }; ecl_ok=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no: ECL DISABLED" >&5 -$as_echo "${ECHO_T}no: ECL DISABLED" >&6; }; ecl_ok=no +$as_echo "no: ECL DISABLED" >&6; }; ecl_ok=no fi -rm -f conftest.err conftest.$ac_objext \ +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -5125,6 +5127,11 @@ _ACEOF fi fi fi + + + + + { $as_echo "$as_me:$LINENO: checking --enable-pythoninterp argument" >&5 $as_echo_n "checking --enable-pythoninterp argument... " >&6; } # Check whether --enable-pythoninterp was given. -- 2.11.4.GIT