X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fminmax.m4;h=bbd1ba0b84a8d42d2e7b4373f7ff9a715d1b156e;hb=f27d815b351a4f960aad64b96b5331bcbf8799a0;hp=6c6b72b773b3c6a00300c21efd209c5d8986524d;hpb=6c6148fa5d696b5d49473e15359c9d5bf9c8eda1;p=gnulib.git

diff --git a/m4/minmax.m4 b/m4/minmax.m4
index 6c6b72b77..bbd1ba0b8 100644
--- a/m4/minmax.m4
+++ b/m4/minmax.m4
@@ -1,9 +1,11 @@
-# minmax.m4 serial 1
+# minmax.m4 serial 2
 dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
+AC_PREREQ(2.52)
+
 AC_DEFUN([gl_MINMAX],
 [
   AC_REQUIRE([gl_PREREQ_MINMAX])
@@ -17,12 +19,13 @@ AC_DEFUN([gl_PREREQ_MINMAX],
 ])
 
 dnl gl_MINMAX_IN_HEADER(HEADER)
+dnl The parameter has to be a literal header name; it cannot be macro,
+dnl nor a shell variable. (Because autoheader collects only AC_DEFINE
+dnl invocations with a literal macro name.)
 AC_DEFUN([gl_MINMAX_IN_HEADER],
 [
-  define([header],[translit([$1],[./-],
-                                 [___])])
-  define([HEADER],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  m4_pushdef([header], AS_TR_SH([$1]))
+  m4_pushdef([HEADER], AS_TR_CPP([$1]))
   AC_CACHE_CHECK([whether <$1> defines MIN and MAX],
     [gl_cv_minmax_in_]header,
     [AC_TRY_COMPILE([#include <$1>
@@ -33,6 +36,6 @@ int x = MIN (42, 17);], [],
     AC_DEFINE([HAVE_MINMAX_IN_]HEADER, 1,
       [Define to 1 if <$1> defines the MIN and MAX macros.])
   fi
-  undefine([HEADER])
-  undefine([header])
+  m4_popdef([HEADER])
+  m4_popdef([header])
 ])