diff options
| -rwxr-xr-x | configure | 38 | ||||
| -rw-r--r-- | configure.in | 30 |
2 files changed, 36 insertions, 32 deletions
diff --git a/configure b/configure index 0176878bfe..3d0a5e9583 100755 --- a/configure +++ b/configure @@ -2503,7 +2503,8 @@ if test $ac_verc_fail = yes; then fi -for ac_prog in autoconf +if test "x$with_cvs" != xyes; then + for ac_prog in autoconf do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2544,26 +2545,27 @@ fi done test -n "$AUTOCONF" || AUTOCONF="no" -case "x$AUTOCONF" in -xno|x|x:) AUTOCONF=no ;; -*) - echo "$as_me:$LINENO: checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works" >&5 + case "x$AUTOCONF" in + xno|x|x:) AUTOCONF=no ;; + *) + echo "$as_me:$LINENO: checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works" >&5 echo $ECHO_N "checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works... $ECHO_C" >&6 if test "${libc_cv_autoconf_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then - libc_cv_autoconf_works=yes - else - libc_cv_autoconf_works=no - fi + if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then + libc_cv_autoconf_works=yes + else + libc_cv_autoconf_works=no + fi fi echo "$as_me:$LINENO: result: $libc_cv_autoconf_works" >&5 echo "${ECHO_T}$libc_cv_autoconf_works" >&6 - test $libc_cv_autoconf_works = yes || AUTOCONF=no - ;; -esac -test "x$AUTOCONF" != xno || aux_missing="$aux_missing autoconf" + test $libc_cv_autoconf_works = yes || AUTOCONF=no + ;; + esac + test "x$AUTOCONF" != xno || aux_missing="$aux_missing autoconf" +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5003,7 +5005,7 @@ if test "${libc_cv_asm_underscores+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.$ac_ext <<EOF -#line 5006 "configure" +#line 5008 "configure" #include "confdefs.h" void underscore_test(void) { return; } @@ -5263,7 +5265,7 @@ if test "${libc_cv_gcc_dwarf2_unwind_info+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.c <<EOF -#line 5266 "configure" +#line 5268 "configure" static char *__EH_FRAME_BEGIN__; _start () { @@ -5363,7 +5365,7 @@ if test "${libc_cv_gcc_builtin_expect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.c <<EOF -#line 5366 "configure" +#line 5368 "configure" int foo (int a) { a = __builtin_expect (a, 10); @@ -5431,7 +5433,7 @@ if test "${libc_cv_gcc_subtract_local_labels+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.c <<EOF -#line 5434 "configure" +#line 5436 "configure" int foo (int a) { static const int ar[] = { &&l1 - &&l1, &&l2 - &&l1 }; diff --git a/configure.in b/configure.in index 2804c3f8b1..e8a3dc06a4 100644 --- a/configure.in +++ b/configure.in @@ -673,21 +673,23 @@ AC_CHECK_PROG_VER(SED, sed, --version, [3.0[2-9]*|3.[1-9]*|[4-9]*], SED=: aux_missing="$aux_missing sed") -AC_CHECK_PROGS(AUTOCONF, autoconf, no) -case "x$AUTOCONF" in -xno|x|x:) AUTOCONF=no ;; -*) - AC_CACHE_CHECK(dnl +if test "x$with_cvs" != xyes; then + AC_CHECK_PROGS(AUTOCONF, autoconf, no) + case "x$AUTOCONF" in + xno|x|x:) AUTOCONF=no ;; + *) + AC_CACHE_CHECK(dnl whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works, libc_cv_autoconf_works, [dnl - if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then - libc_cv_autoconf_works=yes - else - libc_cv_autoconf_works=no - fi]) - test $libc_cv_autoconf_works = yes || AUTOCONF=no - ;; -esac -test "x$AUTOCONF" != xno || aux_missing="$aux_missing autoconf" + if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then + libc_cv_autoconf_works=yes + else + libc_cv_autoconf_works=no + fi]) + test $libc_cv_autoconf_works = yes || AUTOCONF=no + ;; + esac + test "x$AUTOCONF" != xno || aux_missing="$aux_missing autoconf" +fi AC_PROG_CC if test $host != $build; then |