1999-10-31 Akim Demaille <akim@epita.fr>

	* acgeneral.m4 (AC_PREFIX_PROGRAM): Don't use define/undefine, but
	pushdef/podef.  AC_UPCASE_NAME no longer exist.

diff --git a/ChangeLog b/ChangeLog
index 4d98d315d52b33b830e8acaf9023b3cbf3e14ac9..1c15898fb657a0173c308a8f22794f04fb574774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-31  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_PREFIX_PROGRAM): Don't use define/undefine, but
+       pushdef/podef.  AC_UPCASE_NAME no longer exist.
+
 1999-10-31  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4: Formatting changes.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 40248c6b0c30fa03e1de5ab16e684c77013dd00c..5936096301a31c7553a78e99dbf76408197419f5 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2343,21 +2343,22 @@ dnl set `prefix' to /usr/local/gnu.
 dnl This comes too late to find a site file based on the prefix,
 dnl and it might use a cached value for the path.
 dnl No big loss, I think, since most configures don't use this macro anyway.
-dnl AC_PREFIX_PROGRAM(PROGRAM)
 AC_DEFUN(AC_PREFIX_PROGRAM,
-[if test "x$prefix" = xNONE; then
-define([AC_VAR_NAME], AC_UPCASE_NAME([$1])dnl
+[dnl Get an upper case version of $[1].
+pushdef(AC_Prog, translit($1, a-z, A-Z))dnl
+if test "x$prefix" = xNONE; then
 dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle.
 echo $ac_n "checking for prefix by $ac_c" 1>&AC_FD_MSG
-AC_PATH_PROG(AC_VAR_NAME, $1)
+AC_PATH_PROG(AC_Prog, $1)
 changequote(<<, >>)dnl
-  if test -n "$ac_cv_path_<<>>AC_VAR_NAME"; then
-    prefix=`echo $ac_cv_path_<<>>AC_VAR_NAME|sed 's%/[^/][^/]*//*[^/][^/]*$%%'`
+  if test -n "$ac_cv_path_<<>>AC_Prog"; then
+    prefix=`echo $ac_cv_path_<<>>AC_Prog|sed 's%/[^/][^/]*//*[^/][^/]*$%%'`
 changequote([, ])dnl
   fi
 fi
-undefine([AC_VAR_NAME])dnl
-])
+popdef([AC_Prog])dnl
+])dnl AC_PREFIX_PROGRAM
+
 
 dnl AC_TRY_COMPILER(TEST-PROGRAM, WORKING-VAR, CROSS-VAR)
 dnl -----------------------------------------------------

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 40248c6b0c30fa03e1de5ab16e684c77013dd00c..5936096301a31c7553a78e99dbf76408197419f5 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2343,21 +2343,22 @@ dnl set `prefix' to /usr/local/gnu.
 dnl This comes too late to find a site file based on the prefix,
 dnl and it might use a cached value for the path.
 dnl No big loss, I think, since most configures don't use this macro anyway.
-dnl AC_PREFIX_PROGRAM(PROGRAM)
 AC_DEFUN(AC_PREFIX_PROGRAM,
-[if test "x$prefix" = xNONE; then
-define([AC_VAR_NAME], AC_UPCASE_NAME([$1])dnl
+[dnl Get an upper case version of $[1].
+pushdef(AC_Prog, translit($1, a-z, A-Z))dnl
+if test "x$prefix" = xNONE; then
 dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle.
 echo $ac_n "checking for prefix by $ac_c" 1>&AC_FD_MSG
-AC_PATH_PROG(AC_VAR_NAME, $1)
+AC_PATH_PROG(AC_Prog, $1)
 changequote(<<, >>)dnl
-  if test -n "$ac_cv_path_<<>>AC_VAR_NAME"; then
-    prefix=`echo $ac_cv_path_<<>>AC_VAR_NAME|sed 's%/[^/][^/]*//*[^/][^/]*$%%'`
+  if test -n "$ac_cv_path_<<>>AC_Prog"; then
+    prefix=`echo $ac_cv_path_<<>>AC_Prog|sed 's%/[^/][^/]*//*[^/][^/]*$%%'`
 changequote([, ])dnl
   fi
 fi
-undefine([AC_VAR_NAME])dnl
-])
+popdef([AC_Prog])dnl
+])dnl AC_PREFIX_PROGRAM
+
 
 dnl AC_TRY_COMPILER(TEST-PROGRAM, WORKING-VAR, CROSS-VAR)
 dnl -----------------------------------------------------