diff options
Diffstat (limited to 'autoconf')
| -rwxr-xr-x | autoconf/AutoRegen.sh | 25 | ||||
| -rw-r--r-- | autoconf/configure.ac | 3 |
2 files changed, 21 insertions, 7 deletions
diff --git a/autoconf/AutoRegen.sh b/autoconf/AutoRegen.sh index f0880cb950..3dca386737 100755 --- a/autoconf/AutoRegen.sh +++ b/autoconf/AutoRegen.sh @@ -3,16 +3,29 @@ die () { echo "$@" 1>&2 exit 1 } + +### NOTE: ############################################################" +### The below two variables specify the auto* versions +### periods should be escaped with backslash, for use by grep +want_autoconf_version='2\.60' +want_autoheader_version=$want_autoconf_version +### END NOTE #########################################################" + + outfile=configure configfile=configure.ac + +want_autoconf_version_clean=`echo $want_autoconf_version | sed -e 's/\\\\//g'` +want_autoheader_version_clean=`echo $want_autoheader_version | sed -e 's/\\\\//g'` + test -d autoconf && test -f autoconf/$configfile && cd autoconf test -f $configfile || die "Can't find 'autoconf' dir; please cd into it first" -autoconf --version | grep '2\.60' > /dev/null -test $? -eq 0 || die "Your autoconf was not detected as being 2.60" +autoconf --version | grep $want_autoconf_version > /dev/null +test $? -eq 0 || die "Your autoconf was not detected as being $want_autoconf_version_clean" aclocal --version | grep '^aclocal.*1\.9\.6' > /dev/null test $? -eq 0 || die "Your aclocal was not detected as being 1.9.6" -autoheader --version | grep '^autoheader.*2\.60' > /dev/null -test $? -eq 0 || die "Your autoheader was not detected as being 2.60" +autoheader --version | grep '^autoheader.*'$want_autoheader_version > /dev/null +test $? -eq 0 || die "Your autoheader was not detected as being $want_autoheader_version_clean" libtool --version | grep '1\.5\.22' > /dev/null test $? -eq 0 || die "Your libtool was not detected as being 1.5.22" echo "" @@ -27,9 +40,9 @@ echo "" echo "Regenerating aclocal.m4 with aclocal 1.9.6" cwd=`pwd` aclocal --force -I $cwd/m4 || die "aclocal failed" -echo "Regenerating configure with autoconf 2.60" +echo "Regenerating configure with autoconf $want_autoconf_version_clean" autoconf --force --warnings=all -o ../$outfile $configfile || die "autoconf failed" cd .. -echo "Regenerating config.h.in with autoheader 2.60" +echo "Regenerating config.h.in with autoheader $want_autoheader_version_clean" autoheader --warnings=all -I autoconf -I autoconf/m4 autoconf/$configfile || die "autoheader failed" exit 0 diff --git a/autoconf/configure.ac b/autoconf/configure.ac index c07822bf9a..45ad6a5726 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -721,7 +721,8 @@ dnl=== dnl===-----------------------------------------------------------------------=== AC_CHECK_FUNCS([backtrace ceilf floorf roundf rintf nearbyintf getcwd ]) -AC_CHECK_FUNCS([getpagesize getrusage getrlimit setrlimit gettimeofday]) +AC_CHECK_FUNCS([powf fmodf strtof round ]) +AC_CHECK_FUNCS([getpagesize getrusage getrlimit setrlimit gettimeofday ]) AC_CHECK_FUNCS([isatty mkdtemp mkstemp ]) AC_CHECK_FUNCS([mktemp realpath sbrk setrlimit strdup strerror strerror_r ]) AC_CHECK_FUNCS([strtoll strtoq sysconf malloc_zone_statistics ]) |