From 9e8ac24ba3cfeb782c5b24dde6224a3d2b4c4919 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 16 Dec 2013 21:45:27 +1000 Subject: [PATCH] Set AUTOCONF variable when maintainer-mode is not used Fixes build issue introduced in 8894bad3 when configure.ac is altered and maintainer-mode is not enabled. --- ChangeLog | 3 +++ configure | 2 ++ configure.ac | 2 ++ 3 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9ae2df34f4..7543682814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2013-12-16 Allan McRae + * configure.ac: Set AUTOCONF when maintainer-mode is not used. + * configure: Regenerated. + * sysdeps/x86_64/multiarch/ifunc-impl-list.c: Update file name. [BZ #14120] diff --git a/configure b/configure index 4f0cf571e4..fc023d0c70 100755 --- a/configure +++ b/configure @@ -5198,6 +5198,8 @@ $as_echo "$libc_cv_autoconf_works" >&6; } if test "x$AUTOCONF" = xno; then aux_missing="$aux_missing autoconf" fi +else + AUTOCONF=no fi test -n "$critic_missing" && as_fn_error $? " diff --git a/configure.ac b/configure.ac index 662aaa51ef..f3dd87d912 100644 --- a/configure.ac +++ b/configure.ac @@ -1028,6 +1028,8 @@ if test "x$maintainer" = "xyes"; then if test "x$AUTOCONF" = xno; then aux_missing="$aux_missing autoconf" fi +else + AUTOCONF=no fi test -n "$critic_missing" && AC_MSG_ERROR([