Changeset 47c5e6 in git for m4

Timestamp:

Nov 16, 2022, 4:41:28 PM (17 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6a1cdff5edb80f26943821d2616ea6cd684a0a5a

Parents:

fb69c502f926f253f3cdde3646c5e7e142f1a9da

Message:

update some m4/*

Location:

m4

Files:

• ax_normalize_path.m4 (modified) (5 diffs)
• ax_prog_cc_for_build.m4 (modified) (4 diffs)
• flint-check.m4 (modified) (3 diffs)
• gmp-check.m4 (modified) (1 diff)
• google-perftools.m4 (modified) (1 diff)

m4/ax_normalize_path.m4

@@ -1 +1 @@
 # ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_normalize_path.html
+#    https://www.gnu.org/software/autoconf-archive/ax_normalize_path.html
 # ===========================================================================
 #
@@ -81 +81 @@
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
@@ -96 +96 @@
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 5
+#serial 8
 
 AU_ALIAS([ADL_NORMALIZE_PATH], [AX_NORMALIZE_PATH])
@@ -107 +107 @@
   :*:) ;;
 esac
-# squeze repeated slashes
+# squeeze repeated slashes
 case ifelse($2,,"[$]$1",$2) in
 # if the path contains any backslashes, turn slashes into backslashes
@@ -114 +114 @@
  *) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1/,g'` ;;
 esac])
+

m4/ax_prog_cc_for_build.m4

@@ -33 +33 @@
 #   warranty.
 
-#serial 18
+#serial 21
 
 AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
@@ -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_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl
+pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)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
@@ -84 +86 @@
 
 AC_LANG_PUSH([C])
+
+dnl The pushdef([ac_cv_c_compiler_gnu], ...) currently does not cover
+dnl the use of this variable in _AC_LANG_COMPILER_GNU called by
+dnl AC_PROG_CC. Unset this cache variable temporarily as a workaround.
+was_set_c_compiler_gnu=${[ac_cv_c_compiler_gnu]+y}
+AS_IF([test ${was_set_c_compiler_gnu}],
+    [saved_c_compiler_gnu=$[ac_cv_c_compiler_gnu]
+    AS_UNSET([[ac_cv_c_compiler_gnu]])])
+
 AC_PROG_CC
+
+dnl Restore ac_cv_c_compiler_gnu
+AS_IF([test ${was_set_c_compiler_gnu}],
+  [[ac_cv_c_compiler_gnu]=$[saved_c_compiler_gnu]])
+
 _AC_COMPILER_EXEEXT
 _AC_COMPILER_OBJEXT
@@ -138 +154 @@
 AC_SUBST([LDFLAGS_FOR_BUILD])dnl
 ])
+

m4/flint-check.m4

@@ -23 +23 @@
                             Otherwise you can give the <path> to the directory
                             which contains the library.
-             ],
-             [if test "x$withval" = xyes ; then
-                        FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
-              elif test "x$withval" != xno ; then
-                        FLINT_HOME_PATH="$withval"
-             fi],
-             [FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"])
+             ],
+             [if test "x$withval" = xyes ; then
+                        FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
+              elif test "x$withval" != xno ; then
+                        FLINT_HOME_PATH="$withval"
+             fi],
+             [FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"])
 
 dnl Check for existence
@@ -45 +45 @@
                 FLINT_LIBS="-lflint -lmpfr -lgmp"
         else
-                FLINT_CFLAGS="-I${FLINT_HOME}/include/"
-                FLINT_LIBS="-L${FLINT_HOME}/lib -Wl,-rpath,${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
+                FLINT_CFLAGS="-I${FLINT_HOME}/include/"
+                FLINT_LIBS="-L${FLINT_HOME}/lib -Wl,-rpath,${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
         fi
 
-        # we suppose that mpfr and mpir to be in the same place or available by default
-                CFLAGS="${FLINT_CFLAGS} ${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
-                LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
+        # we suppose that mpfr and mpir to be in the same place or available by default
+                CFLAGS="${FLINT_CFLAGS} ${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
+                LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
 
-                AC_TRY_LINK([#include <flint/fmpz.h>
-                            ],
-                            [fmpz_t x; fmpz_init(x);], [
-                        flint_found="yes"
-                        break
-                ])
+                AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM([[#include <flint/fmpz.h>]],
+                            [[fmpz_t x; fmpz_init(x);]])],
+                        [flint_found="yes"],
+                        [break])
 done
 
@@ -70 +69 @@
 
 if test "x$flint_found" = "xyes" ; then
-        AC_DEFINE(HAVE_FLINT,1,[Define if FLINT is installed])
-        HAVE_FLINT=yes
-        AC_MSG_RESULT(found)
+        AC_DEFINE(HAVE_FLINT,1,[Define if FLINT is installed])
+        HAVE_FLINT=yes
+        AC_MSG_RESULT(found)
 else
-        AC_MSG_RESULT(not found)
-        FLINT_CFLAGS=""
-        FLINT_LIBS=""
-        FLINT_HOME=""
+        AC_MSG_RESULT(not found)
+        FLINT_CFLAGS=""
+        FLINT_LIBS=""
+        FLINT_HOME=""
 fi
 AC_SUBST(FLINT_CFLAGS)

m4/gmp-check.m4

@@ -32 +32 @@
     CFLAGS="${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
     LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
-    AC_TRY_LINK([#include <gmp.h>
-                ],
-                [mpz_t a; mpz_init (a);], [
-      gmp_found=yes
-      break
-    ])
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[#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,
-        AC_HELP_STRING([--with-google-perftools=DIR],
+        AS_HELP_STRING([--with-google-perftools=DIR],
             [location of a google perftools installation (default none)]),
         ac_google_perfdir=$withval)
 
     AC_ARG_ENABLE(google-profiling,
-                  AC_HELP_STRING([--enable-google-profiling],
+                  AS_HELP_STRING([--enable-google-profiling],
                   [compile with google profiling]),
                   [google_profile=$enableval],