diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/configure.in b/configure.in index 1a21191940..f0511ac5f9 100644 --- a/configure.in +++ b/configure.in @@ -721,22 +721,23 @@ AC_CHECK_PROG_VER(SED, sed, --version, [3.0[2-9]*|3.[1-9]*|[4-9]*], SED=: aux_missing="$aux_missing sed") -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 +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 +if test "x$with_cvs" = xyes && test "x$AUTOCONF" = xno; then + # If --without-cvs they probably won't change configure.in, so no complaints. + aux_missing="$aux_missing autoconf" fi test -n "$critic_missing" && AC_MSG_ERROR([ |