[Gmp-commit] /var/hg/gmp: Start autoconf update
mercurial at gmplib.org
mercurial at gmplib.org
Sun Jul 30 19:38:29 CEST 2023
details: /var/hg/gmp/rev/947878b40ced
changeset: 18416:947878b40ced
user: Marc Glisse <marc.glisse at inria.fr>
date: Sun Jul 30 19:38:25 2023 +0200
description:
Start autoconf update
diffstat:
ChangeLog | 8 ++
acinclude.m4 | 182 +++++++++++++++++++++++++++++-----------------------------
configure.ac | 32 +++++-----
3 files changed, 115 insertions(+), 107 deletions(-)
diffs (truncated from 730 to 300 lines):
diff -r bc0ec1699e58 -r 947878b40ced ChangeLog
--- a/ChangeLog Sat Jul 29 15:38:41 2023 +0200
+++ b/ChangeLog Sun Jul 30 19:38:25 2023 +0200
@@ -1,3 +1,11 @@
+2023-07-30 Marc Glisse <marc.glisse at inria.fr>
+
+ Thanks to FX Coudert.
+ * configure.ac: AC_FD_CC -> AS_MESSAGE_LOG_FD
+ AC_HELP_STRING -> AS_HELP_STRING
+ Update minimum autoconf version to 2.69.
+ * acinclude.m4: AC_FD_CC -> AS_MESSAGE_LOG_FD
+
2023-07-29 Torbjörn Granlund <tg at gmplib.org>
* Version 6.3.0 released.
diff -r bc0ec1699e58 -r 947878b40ced acinclude.m4
--- a/acinclude.m4 Sat Jul 29 15:38:41 2023 +0200
+++ b/acinclude.m4 Sun Jul 30 19:38:25 2023 +0200
@@ -326,9 +326,9 @@
')]
EOF
dnl ' <- balance the quotes for emacs sh-mode
- echo "trying m4" >&AC_FD_CC
- gmp_tmp_val=`(m4 conftest.m4) 2>&AC_FD_CC`
- echo "$gmp_tmp_val" >&AC_FD_CC
+ echo "trying m4" >&AS_MESSAGE_LOG_FD
+ gmp_tmp_val=`(m4 conftest.m4) 2>&AS_MESSAGE_LOG_FD`
+ echo "$gmp_tmp_val" >&AS_MESSAGE_LOG_FD
if test "$gmp_tmp_val" = good; then
gmp_cv_prog_m4="m4"
else
@@ -339,9 +339,9 @@
ac_dummy="$PATH:/usr/5bin"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
- echo "trying $ac_dir/m4" >&AC_FD_CC
- gmp_tmp_val=`($ac_dir/m4 conftest.m4) 2>&AC_FD_CC`
- echo "$gmp_tmp_val" >&AC_FD_CC
+ echo "trying $ac_dir/m4" >&AS_MESSAGE_LOG_FD
+ gmp_tmp_val=`($ac_dir/m4 conftest.m4) 2>&AS_MESSAGE_LOG_FD`
+ echo "$gmp_tmp_val" >&AS_MESSAGE_LOG_FD
if test "$gmp_tmp_val" = good; then
gmp_cv_prog_m4="$ac_dir/m4"
break
@@ -384,10 +384,10 @@
cat >conftest.m4 <<EOF
[changequote({,})define(x,)m4wrap({x})$tmp_d_n_l]
EOF
-echo test input is >&AC_FD_CC
-cat conftest.m4 >&AC_FD_CC
+echo test input is >&AS_MESSAGE_LOG_FD
+cat conftest.m4 >&AS_MESSAGE_LOG_FD
tmp_chars=`$M4 conftest.m4 | wc -c`
-echo produces $tmp_chars chars output >&AC_FD_CC
+echo produces $tmp_chars chars output >&AS_MESSAGE_LOG_FD
rm -f conftest.m4
if test $tmp_chars = 0; then
gmp_cv_m4_m4wrap_spurious=no
@@ -825,8 +825,8 @@
cat >conftest.c <<EOF
[$3]
EOF
- echo "Test compile: [$2]" >&AC_FD_CC
- gmp_compile="$1 conftest.c >&AC_FD_CC"
+ echo "Test compile: [$2]" >&AS_MESSAGE_LOG_FD
+ gmp_compile="$1 conftest.c >&AS_MESSAGE_LOG_FD"
if AC_TRY_EVAL(gmp_compile); then
cc_works_part=yes
if test "$cross_compiling" = no; then
@@ -839,8 +839,8 @@
cc_works_part=no
fi
if test "$cc_works_part" != yes; then
- echo "failed program was:" >&AC_FD_CC
- cat conftest.c >&AC_FD_CC
+ echo "failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.c >&AS_MESSAGE_LOG_FD
fi
rm -f conftest* a.out b.out a.exe a_out.exe
case $cc_works_part in
@@ -873,12 +873,12 @@
int main () { return 0; }
EOF
gmp_prog_cc_works=no
-gmp_compile="$1 -c conftest.c >&AC_FD_CC"
+gmp_compile="$1 -c conftest.c >&AS_MESSAGE_LOG_FD"
if AC_TRY_EVAL(gmp_compile); then
gmp_prog_cc_works=yes
else
- echo "failed program was:" >&AC_FD_CC
- cat conftest.c >&AC_FD_CC
+ echo "failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.c >&AS_MESSAGE_LOG_FD
fi
rm -f conftest* a.out b.out a.exe a_out.exe
AC_MSG_RESULT($gmp_prog_cc_works)
@@ -906,7 +906,7 @@
dnl a workaround for a HP compiler bug.
AC_DEFUN([GMP_C_TEST_SIZEOF],
-[echo "configure: testlist $2" >&AC_FD_CC
+[echo "configure: testlist $2" >&AS_MESSAGE_LOG_FD
[gmp_sizeof_type=`echo "$2" | sed 's/sizeof-\([a-z\*]*\).*/\1/'`]
[gmp_sizeof_want=`echo "$2" | sed 's/sizeof-[a-z\*]*-\([0-9]*\).*/\1/'`]
AC_MSG_CHECKING([compiler $1 has sizeof($gmp_sizeof_type)==$gmp_sizeof_want])
@@ -920,7 +920,7 @@
}]
EOF
gmp_c_testlist_sizeof=no
-gmp_compile="$1 -c conftest.c >&AC_FD_CC"
+gmp_compile="$1 -c conftest.c >&AS_MESSAGE_LOG_FD"
if AC_TRY_EVAL(gmp_compile); then
gmp_c_testlist_sizeof=yes
fi
@@ -948,7 +948,7 @@
choke me
#endif
EOF
-gmp_compile="$1 -c conftest.c >&AC_FD_CC"
+gmp_compile="$1 -c conftest.c >&AS_MESSAGE_LOG_FD"
if AC_TRY_EVAL(gmp_compile); then
rm -f conftest*
AC_MSG_CHECKING([whether $1 is gcc])
@@ -1010,20 +1010,20 @@
dnl other compilers.
AC_DEFUN([GMP_PROG_CC_X86_GOT_EAX_EMITTED],
-[echo "Testing gcc GOT with eax emitted" >&AC_FD_CC
+[echo "Testing gcc GOT with eax emitted" >&AS_MESSAGE_LOG_FD
cat >conftest.c <<\EOF
[int foo;
int bar () { return foo; }
]EOF
tmp_got_emitted=no
-gmp_compile="$1 -fPIC -S conftest.c >&AC_FD_CC 2>&1"
+gmp_compile="$1 -fPIC -S conftest.c >&AS_MESSAGE_LOG_FD 2>&1"
if AC_TRY_EVAL(gmp_compile); then
if grep "addl.*_GLOBAL_OFFSET_TABLE_.*eax" conftest.s >/dev/null; then
tmp_got_emitted=yes
fi
fi
rm -f conftest.*
-echo "Result: $tmp_got_emitted" >&AC_FD_CC
+echo "Result: $tmp_got_emitted" >&AS_MESSAGE_LOG_FD
if test "$tmp_got_emitted" = yes; then
ifelse([$2],,:,[$2])
else
@@ -1048,12 +1048,12 @@
# Let A.10.32.30 or higher be ok.
echo >conftest.c
gmp_tmp_vs=`$1 $2 -V -c -o conftest.$OBJEXT conftest.c 2>&1 | grep "^ccom:"`
-echo "Version string: $gmp_tmp_vs" >&AC_FD_CC
+echo "Version string: $gmp_tmp_vs" >&AS_MESSAGE_LOG_FD
rm conftest*
gmp_tmp_v1=`echo $gmp_tmp_vs | sed 's/.* .\.\([[0-9]]*\).*/\1/'`
gmp_tmp_v2=`echo $gmp_tmp_vs | sed 's/.* .\..*\.\(.*\)\..* HP C.*/\1/'`
gmp_tmp_v3=`echo $gmp_tmp_vs | sed 's/.* .\..*\..*\.\(.*\) HP C.*/\1/'`
-echo "Version number: $gmp_tmp_v1.$gmp_tmp_v2.$gmp_tmp_v3" >&AC_FD_CC
+echo "Version number: $gmp_tmp_v1.$gmp_tmp_v2.$gmp_tmp_v3" >&AS_MESSAGE_LOG_FD
if test -z "$gmp_tmp_v1"; then
gmp_hpc_64bit=not-applicable
else
@@ -1083,7 +1083,7 @@
AC_DEFUN([GMP_GCC_ARM_UMODSI],
[AC_MSG_CHECKING([whether ARM gcc unsigned division works])
tmp_version=`$1 --version`
-echo "$tmp_version" >&AC_FD_CC
+echo "$tmp_version" >&AS_MESSAGE_LOG_FD
case $tmp_version in
[2.95 | 2.95.[123]])
ifelse([$3],,:,[$3])
@@ -1108,11 +1108,11 @@
AC_DEFUN([GMP_GCC_MIPS_O32],
[AC_MSG_CHECKING([whether gcc supports o32])
echo 'int x;' >conftest.c
-echo "$1 -mabi=32 -c conftest.c" >&AC_FD_CC
+echo "$1 -mabi=32 -c conftest.c" >&AS_MESSAGE_LOG_FD
if $1 -mabi=32 -c conftest.c >conftest.out 2>&1; then
result=yes
else
- cat conftest.out >&AC_FD_CC
+ cat conftest.out >&AS_MESSAGE_LOG_FD
if grep "cc1: Invalid option \`abi=32'" conftest.out >/dev/null; then
result=yes
else
@@ -1154,7 +1154,7 @@
result=yes
fi
fi
- cat conftest.out >&AC_FD_CC
+ cat conftest.out >&AS_MESSAGE_LOG_FD
rm -f conftest* a.out b.out a.exe a_out.exe
AC_MSG_RESULT($result)
if test "$result" = yes; then
@@ -1213,7 +1213,7 @@
result=yes
fi
fi
-cat conftest.out >&AC_FD_CC
+cat conftest.out >&AS_MESSAGE_LOG_FD
rm -f conftest*
AC_MSG_RESULT($result)
if test "$result" = yes; then
@@ -1257,12 +1257,12 @@
result=no
cat >conftest.c <<EOF
EOF
-echo "with empty conftest.c" >&AC_FD_CC
-gmp_compile="$1 -c conftest.c >&AC_FD_CC 2>&1"
+echo "with empty conftest.c" >&AS_MESSAGE_LOG_FD
+gmp_compile="$1 -c conftest.c >&AS_MESSAGE_LOG_FD 2>&1"
if AC_TRY_EVAL(gmp_compile); then : ;
else
# empty fails
- gmp_compile="$1 -Wa,-oldas -c conftest.c >&AC_FD_CC 2>&1"
+ gmp_compile="$1 -Wa,-oldas -c conftest.c >&AS_MESSAGE_LOG_FD 2>&1"
if AC_TRY_EVAL(gmp_compile); then
# but with -Wa,-oldas it works
result=yes
@@ -1328,7 +1328,7 @@
xorl %eax, %eax
ret
EOF
- gmp_compile="$1 conftest.s -o conftest >&AC_FD_CC"
+ gmp_compile="$1 conftest.s -o conftest >&AS_MESSAGE_LOG_FD"
if AC_TRY_EVAL(gmp_compile); then
if AC_TRY_COMMAND([./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest]); then
gmp_cv_os_x86_xmm=yes
@@ -1416,12 +1416,12 @@
cat >conftest.s <<EOF
.level 2.0
EOF
-gmp_compile="$1 -c conftest.s >&AC_FD_CC 2>&1"
+gmp_compile="$1 -c conftest.s >&AS_MESSAGE_LOG_FD 2>&1"
if AC_TRY_EVAL(gmp_compile); then
result=yes
else
- echo "failed program was" >&AC_FD_CC
- cat conftest.s >&AC_FD_CC
+ echo "failed program was" >&AS_MESSAGE_LOG_FD
+ cat conftest.s >&AS_MESSAGE_LOG_FD
fi
rm -f conftest*
AC_MSG_RESULT($result)
@@ -1494,8 +1494,8 @@
[$3]
int main (void) { return 0; }
EOF
- echo "Test compile: [$2]" >&AC_FD_CC
- gmp_cxxcompile="$1 conftest.cc >&AC_FD_CC"
+ echo "Test compile: [$2]" >&AS_MESSAGE_LOG_FD
+ gmp_cxxcompile="$1 conftest.cc >&AS_MESSAGE_LOG_FD"
if AC_TRY_EVAL(gmp_cxxcompile); then
if test "$cross_compiling" = no; then
if AC_TRY_COMMAND([./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest]); then :;
@@ -1508,8 +1508,8 @@
fi
case $gmp_prog_cxx_works in
no*)
- echo "failed program was:" >&AC_FD_CC
- cat conftest.cc >&AC_FD_CC
+ echo "failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.cc >&AS_MESSAGE_LOG_FD
;;
esac
rm -f conftest* a.out b.out a.exe a_out.exe
@@ -1651,12 +1651,12 @@
EOF
gmp_assemble="$CCAS $CFLAGS $CPPFLAGS conftest.s >conftest.out 2>&1"
if AC_TRY_EVAL(gmp_assemble); then
- cat conftest.out >&AC_FD_CC
+ cat conftest.out >&AS_MESSAGE_LOG_FD
ifelse([$2],,:,[$2])
else
- cat conftest.out >&AC_FD_CC
- echo "configure: failed program was:" >&AC_FD_CC
- cat conftest.s >&AC_FD_CC
+ cat conftest.out >&AS_MESSAGE_LOG_FD
+ echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.s >&AS_MESSAGE_LOG_FD
ifelse([$3],,:,[$3])
fi
rm -f conftest*
@@ -1709,14 +1709,14 @@
gmp_cv_asm_label_suffix,
[gmp_cv_asm_label_suffix=unknown
for i in "" ":"; do
- echo "trying $i" >&AC_FD_CC
+ echo "trying $i" >&AS_MESSAGE_LOG_FD
GMP_TRY_ASSEMBLE(
[ $gmp_cv_asm_text
somelabel$i],
[gmp_cv_asm_label_suffix=$i
rm -f conftest*
break],
- [cat conftest.out >&AC_FD_CC])
+ [cat conftest.out >&AS_MESSAGE_LOG_FD])
done
if test "$gmp_cv_asm_label_suffix" = "unknown"; then
AC_MSG_ERROR([Cannot determine label suffix])
More information about the gmp-commit
mailing list