picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2003-04-29 Roland McGrath <roland@redhat.com>

Browse source 
* configure.in: Search for AUTOCONF unconditionally.
	Just don't complain about missing it under --without-cvs.
	* configure: Regenerated.
This commit is contained in:
Roland McGrath 2003-04-30 04:17:59 +00:00
parent 153da5995c
commit 476e7d78f4
2 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
configure vendored
View file

@ -4157,8 +4157,7 @@ if test $ac_verc_fail = yes; then
fi
if test "x$with_cvs" != xyes; then
for ac_prog in autoconf
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
@ -4199,26 +4198,28 @@ 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
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" && { { echo "$as_me:$LINENO: error:

31
configure.in
View file

@ -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([