Re: removing of AS_DIRNAME

[Paul Eggert]

Ralf Wildenhues <address@hidden> writes:

> Removing AS_DIRNAME is not acceptable; it will break Automake-1.9.6
> and CVS heavily.

Ah, sorry, I didn't know they were using these macros.  I installed
this further change to allow them to continue to work.

2006-04-23  Paul Eggert  <address@hidden>

        * NEWS: Update wording to say merely "should" for AS_DIRNAME
        and AS_BASENAME.
        * lib/m4sugar/m4sh.m4 (AS_BASENAME, AS_DIRNAME): Bring these
        back, albeit undocumented.  Programs now have a grace period
        to switch to AS_VAR_SET_DIRNAME and AS_VAR_SET_BASENAME.

Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.364
diff -p -u -r1.364 NEWS
--- NEWS        23 Apr 2006 06:49:53 -0000      1.364
+++ NEWS        23 Apr 2006 08:10:55 -0000
@@ -1,8 +1,8 @@
 * Major changes in Autoconf 2.59d
 
-** New macros AS_VAR_SET_BASENAME and AS_VAR_SET_DIRNAME, replacing the
-  AS_BASENAME and AS_DIRNAME macros that were introduced in alpha
-  versions but not mentioned in the NEWS file.
+** New macros AS_VAR_SET_BASENAME and AS_VAR_SET_DIRNAME.
+  Programs that use the (never-stable, and now undocumented) AS_BASENAME
+  and AS_DIRNAME macros should use these new macros instead.
 
 * Major changes in Autoconf 2.59c
 
Index: lib/m4sugar/m4sh.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sh.m4,v
retrieving revision 1.181
diff -p -u -r1.181 m4sh.m4
--- lib/m4sugar/m4sh.m4 23 Apr 2006 06:49:53 -0000      1.181
+++ lib/m4sugar/m4sh.m4 23 Apr 2006 08:10:55 -0000
@@ -692,6 +692,11 @@ $as_basename -- $1 ||
 _AS_BASENAME_EXPR([$1]) 2>/dev/null ||
 _AS_BASENAME_SED([$1])])
 
+# Some programs rely on _AS_BASENAME being called AS_BASENAME.
+# They should be rewritten to use AS_VAR_SET_BASENAME, but in
+# the meantime we'll leave AS_BASENAME in as an undocumented macro.
+m4_defun([AS_BASENAME], [_AS_BASENAME([$1])])
+
 
 # _AS_BASENAME_PREPARE
 # --------------------
@@ -750,6 +755,11 @@ $as_dirname -- $1 ||
 _AS_DIRNAME_EXPR([$1]) 2>/dev/null ||
 _AS_DIRNAME_SED([$1])])
 
+# Some programs rely on _AS_DIRNAME being called AS_DIRNAME.
+# They should be rewritten to use AS_VAR_SET_DIRNAME, but in
+# the meantime we'll leave AS_DIRNAME in as an undocumented macro.
+m4_defun([AS_DIRNAME], [_AS_DIRNAME([$1])])
+
 
 # _AS_DIRNAME_PREPARE
 # --------------------