From df55991806c16571f80543a1565edb65e49ea550 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 26 Nov 2016 13:17:23 -0800 Subject: [PATCH] Teach ./configure to rerun autoreconf --no-recursive Currently, the ./configure script generated by autotools will test if the configure.ac script is newer than its output configure script, and if so, run autoconf to rebuild it. However autoconf is no longer sufficient because we have some m4 macros. So now run autoreconf --no-recursive (per #3572) --- configure.ac | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 484485252..70dd92d9e 100644 --- a/configure.ac +++ b/configure.ac @@ -34,23 +34,23 @@ AC_SUBST(EXTRA_PCRE2) # running autoconf to handle an updates configure.ac. # -AC_MSG_CHECKING([if autoconf needs to be run]) +AC_MSG_CHECKING([if autoreconf needs to be run]) if test configure -ot configure.ac; then AC_MSG_RESULT([yes]) - if which autoconf >/dev/null; then - # No need to provide any error messages if autoconf fails, the + if which autoreconf >/dev/null; then + # No need to provide any error messages if autoreconf fails, the # shell and autconf should take care of that themselves - AC_MSG_NOTICE([running autoconf]) - if autoconf; then + AC_MSG_NOTICE([running autoreconf --no-recursive]) + if autoreconf --no-recursive; then ./configure "$@" exit fi exit 1 else AC_MSG_ERROR( - [cannot find the autoconf program in your path. + [cannot find the autoreconf program in your path. This program needs to be run whenever the configure.ac file is modified. -Please install autoconf and try again.] +Please install autoreconf and try again.] ) fi else