about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ae2df34f4..7543682814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-12-16  Allan McRae  <allan@archlinux.org>
 
+	* 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([