Changeset 0c26a1 in git for m4

Timestamp:

Oct 15, 2021, 4:09:30 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3551885a5d35f5d806aa9a27ec225b51933cd05c

Parents:

69185ceb2807ebeacfe2824621e4b70e2ed19642

Message:

Revert "update configure stuff": requires autoconf 2.7.1

This reverts commit 69185ceb2807ebeacfe2824621e4b70e2ed19642.

Location:

m4

Files:

• ax_append_flag.m4 (modified) (1 diff)
• ax_check_compile_flag.m4 (modified) (1 diff)
• ax_cxx_gcc_abi_demangle.m4 (modified) (3 diffs)
• ax_prog_cc_for_build.m4 (modified) (2 diffs)
• ax_prog_cxx_for_build.m4 (modified) (2 diffs)
• flint-check.m4 (modified) (1 diff)
• gmp-check.m4 (modified) (1 diff)
• google-perftools.m4 (modified) (1 diff)
• pipe-check.m4 (modified) (1 diff)
• readline-check.m4 (modified) (6 diffs)

m4/ax_append_flag.m4

@@ -53 +53 @@
 
 AC_DEFUN([AX_APPEND_FLAG],
-[AC_PREREQ([2.71])dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
 AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
 AS_VAR_SET_IF(FLAGS,

m4/ax_check_compile_flag.m4

@@ -57 +57 @@
 
 AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ([2.71])dnl for _AC_LANG_PREFIX
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
 AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [

m4/ax_cxx_gcc_abi_demangle.m4

@@ -30 +30 @@
 ax_cv_cxx_gcc_abi_demangle,
 [AC_LANG_SAVE
- AC_LANG([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <typeinfo>
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <typeinfo>
 #include <cxxabi.h>
 #include <string>
@@ -37 +37 @@
 template<typename TYPE>
 class A {};
-]], [[A<int> instance;
+],[A<int> instance;
 int status = 0;
 char* c_name = 0;
@@ -47 +47 @@
 
 return name == "A<int>";
-]])],[ax_cv_cxx_gcc_abi_demangle=yes],[ax_cv_cxx_gcc_abi_demangle=no])
+],
+ ax_cv_cxx_gcc_abi_demangle=yes, ax_cv_cxx_gcc_abi_demangle=no)
  AC_LANG_RESTORE
 ])

m4/ax_prog_cc_for_build.m4

@@ -45 +45 @@
 pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
 pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
-pushdef([ac_cv_c_compiler_gnu], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
 pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
 pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
@@ -122 +122 @@
 popdef([ac_cv_prog_cc_works])dnl
 popdef([ac_cv_prog_cc_c89])dnl
-popdef([ac_cv_c_compiler_gnu])dnl
+popdef([ac_cv_prog_gcc])dnl
 popdef([ac_cv_prog_CPP])dnl
 

m4/ax_prog_cxx_for_build.m4

@@ -44 +44 @@
 dnl
 pushdef([ac_cv_prog_CXXCPP], ac_cv_build_prog_CXXCPP)dnl
-pushdef([ac_cv_cxx_compiler_gnu], ac_cv_build_prog_gxx)dnl
+pushdef([ac_cv_prog_gxx], ac_cv_build_prog_gxx)dnl
 pushdef([ac_cv_prog_cxx_works], ac_cv_build_prog_cxx_works)dnl
 pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl
@@ -101 +101 @@
 popdef([ac_cv_prog_cxx_cross])dnl
 popdef([ac_cv_prog_cxx_works])dnl
-popdef([ac_cv_cxx_compiler_gnu])dnl
+popdef([ac_cv_prog_gxx])dnl
 popdef([ac_cv_prog_CXXCPP])dnl
 

m4/flint-check.m4

@@ -53 +53 @@
                 LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
 
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <flint/fmpz.h>
-                            ]], [[fmpz_t x; fmpz_init(x);]])],[
+                AC_TRY_LINK([#include <flint/fmpz.h>
+                            ],
+                            [fmpz_t x; fmpz_init(x);], [
                         flint_found="yes"
                         break
-                ],[])
+                ])
 done
 

m4/gmp-check.m4

@@ -32 +32 @@
     CFLAGS="${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
     LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gmp.h>
-                ]], [[mpz_t a; mpz_init (a);]])],[
+    AC_TRY_LINK([#include <gmp.h>
+                ],
+                [mpz_t a; mpz_init (a);], [
       gmp_found=yes
       break
-    ],[])
+    ])
 done
 if test "$gmp_found" != yes; then

m4/google-perftools.m4

@@ -23 +23 @@
     ac_google_perfdir='no'
     AC_ARG_WITH(google-perftools,
-        AS_HELP_STRING([--with-google-perftools=DIR],[location of a google perftools installation (default none)]),
+        AC_HELP_STRING([--with-google-perftools=DIR],
+            [location of a google perftools installation (default none)]),
         ac_google_perfdir=$withval)
 
     AC_ARG_ENABLE(google-profiling,
-                  AS_HELP_STRING([--enable-google-profiling],[compile with google profiling]),
+                  AC_HELP_STRING([--enable-google-profiling],
+                  [compile with google profiling]),
                   [google_profile=$enableval],
                   [google_profile=no])

m4/pipe-check.m4

@@ -14 +14 @@
   CFLAGS="${CFLAGS} -pipe"
   AC_CACHE_VAL(ac_cv_cxx_have_pipe,
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_pipe=yes],[ac_cv_cxx_have_pipe=no]))
+  AC_TRY_COMPILE(,,ac_cv_cxx_have_pipe=yes,ac_cv_cxx_have_pipe=no))
   AC_MSG_RESULT(${ac_cv_cxx_have_pipe})
   CFLAGS=${temp_cflags}

m4/readline-check.m4

@@ -35 +35 @@
 if test "$with_readline" != dynamic && test "$with_readline" != no; then
 AC_LANG_SAVE
-AC_LANG([C++])
+AC_LANG_CPLUSPLUS
    AC_CHECK_LIB(readline, readline)
    AC_CHECK_HEADERS(readline/readline.h readline/history.h)
@@ -42 +42 @@
      AC_MSG_CHECKING(whether readline.h is ok)
      AC_CACHE_VAL(ac_cv_header_readline_readline_h_ok,
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include<unistd.h>
+     AC_TRY_LINK(
+#include<unistd.h>
 #include<stdio.h>
 #include<readline/readline.h>
@@ -48 +49 @@
 #include<readline/history.h>
 #endif
-]], [[]])],[ac_cv_header_readline_readline_h_ok="yes"],[ac_cv_header_readline_readline_h_ok="no"]))
+,
+,
+ac_cv_header_readline_readline_h_ok="yes",
+ac_cv_header_readline_readline_h_ok="no",
+))
     AC_MSG_RESULT($ac_cv_header_readline_readline_h_ok)
     if test "$ac_cv_header_readline_readline_h_ok" != yes; then
@@ -54 +59 @@
       AC_MSG_CHECKING(whether or not we nevertheless can use readline)
       AC_CACHE_VAL(ac_cv_have_readline,
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+      AC_TRY_LINK(
+#include <stdio.h>
 extern "C"
 {
@@ -72 +78 @@
 #define NULL 0
 #endif
-]], [[rl_readline_name=NULL;
+,
+rl_readline_name=NULL;
 *rl_line_buffer=1;
 completion_matches(NULL, filename_completion_function);
@@ -81 +88 @@
 read_history(NULL);
 write_history(NULL);
-]])],[ac_cv_have_readline="yes"
-],[ac_cv_have_readline="no"
-]))
+,
+ac_cv_have_readline="yes"
+,
+ac_cv_have_readline="no"
+))
       AC_MSG_RESULT($ac_cv_have_readline)
     else