Re: 2bis-gary-AC_CONFIG_MACRO_DIR.patch

[Gary V. Vaughan]

Akim Demaille wrote:
>  > It would be nice to get this into the next release so that the other
>  > autotools can start using it...
>
> Please, don't include the code below the signature...

It's a mime attachment so that the lines don't get wrapped by your MUA (or 
mine for that matter), so I have no control of where gnus expands it :-(  ISTR 
that if you make a region that contains the parts of the buffer you want to 
reply to, gnus will quote them in the compose window, but it is probably 7 or 
8 years since I lost my gnus config and changed to an MUA that is easier to 
set up.

I've taken the sig separator out in this mail incase that helps...

> Please, install, document and NEWS :) But I would like to departure
> from the "m4" presence (if I could change history, these guys would be
> .ac too).  I would prefer AC_CONFIG_MACRO_DIR, or
> AC_CONFIG_AUTOCONF_DIR etc.

I chose AC_CONFIG_MACRO_DIR, but my autoconf write access isn't working (odd 
because my other savannah projects are fine), so I can't commit.  Revised 
patch attached.

  ] clcommit ChangeLog NEWS doc/autoconf.texi lib/autoconf/general.m4
  clcommit: checking for conflicts...
  M ChangeLog
  M NEWS
  M doc/autoconf.texi
  M lib/autoconf/general.m4
  clcommit: checking commit message...
  Checking in ChangeLog;
  /cvsroot/autoconf/autoconf/ChangeLog,v  <--  ChangeLog
  new revision: 1.2277; previous revision: 1.2276
  cvs [server aborted]: could not open lock file 
`/cvsroot/autoconf/autoconf/,ChangeLog,': Permission denied

I also got this during cvs update:

  RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/fortran.m4,v
  retrieving revision 1.176
  retrieving revision 1.177
  Merging differences between 1.176 and 1.177 into fortran.m4
  lib/autoconf/fortran.m4 already contains the differences between 1.176 and 
1.177
  cvs server: warning: cannot write to history file 
/cvsroot/autoconf/CVSROOT/history: Permission denied
  M lib/autoconf/general.m4

> And the variable name needs to be documented too.

Wasn't sure where to put it.  ac_aux_dir is not mentioned in autoconf.texi 
either.

Cheers,
        Gary.

  ())_.  Gary V. Vaughan    gary@(lilith.warpmail.net|gnu.org)
  ( '/   Research Scientist http://www.oranda.demon.co.uk       ,_())____
  / )=   GNU Hacker         http://www.gnu.org/software/libtool  \'      `&
`(_~)_   Tech' Author       http://sources.redhat.com/autobook   =`---d__/

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Stub out a macro
        that future autopoint/aclocal/automake/autoreconf will be able
        to trace to find where to install local m4 macros.
        * doc/autoconf.texi (Input): Document it.
        * NEWS: Updated.

Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.312
diff -u -p -u -r1.312 NEWS
--- NEWS 3 Oct 2003 07:30:02 -0000 1.312
+++ NEWS 8 Oct 2003 10:53:26 -0000
@@ -4,6 +4,9 @@
   Autoreconf creates the auxiliary directory if needed.  This is
   especially useful for initial "bootstrapping" of fresh CVS checkouts.
 
+** AC_CONFIG_MACRO_DIR
+  Use this macro to declare the directory for local m4 macros for aclocal.
+
 * Major changes in Autoconf 2.57f
 
   Released 2003-10-01, by Akim Demaille.
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.762
diff -u -p -u -r1.762 autoconf.texi
--- doc/autoconf.texi 2 Oct 2003 04:38:02 -0000 1.762
+++ doc/autoconf.texi 8 Oct 2003 10:53:26 -0000
@@ -1758,6 +1758,19 @@ name is obsolete because some @code{make
 @file{install} from it if there is no @file{Makefile}.
 @end defmac
 
+Similarly, packages that use @command{aclocal} should declare where
+local macros can be found using @code{AC_CONFIG_MACRO_DIR}.
+
address@hidden AC_CONFIG_MACRO_DIR (@var{dir})
address@hidden
+Future versions of @command{autopoint}, @command{libtoolize},
address@hidden and @command{autoreconf} will use directory
address@hidden as the location of additional local Autoconf macros.  Be
+sure to call this macro directly from @file{configure.ac} so that
+tools that install macros for @command{aclocal} can find the
+declaration before @option{--trace} can be called safely.
address@hidden defmac
+
 
 @node Output
 @section Outputting Files
Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.818
diff -u -p -u -r1.818 general.m4
--- lib/autoconf/general.m4 26 Sep 2003 09:11:23 -0000 1.818
+++ lib/autoconf/general.m4 8 Oct 2003 10:53:27 -0000
@@ -1538,6 +1538,29 @@ AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])d
 
 
 
+## ------------------------ ##
+## Finding aclocal macros.  ##
+## ------------------------ ##
+
+
+# AC_CONFIG_MACRO_DIR(DIR)
+# ------------------------
+# Declare directory containing additional macros for aclocal.
+# DIR can be either absolute or relative to $srcdir.
+AC_DEFUN([AC_CONFIG_MACRO_DIR],
+[case $1 in
+  [[\\/]]* | ?:[[\\/]]* ) ac_macro_dir=$1         ;;
+  *)                      ac_macro_dir=$srcdir/$1 ;;
+esac
+if test -d "$ac_macro_dir"; then :
+else
+  AC_MSG_ERROR([cannot find macro directory `$1'])
+fi
+])# AC_CONFIG_MACRO_DIR
+
+
+
+
 ## ----------------------------------- ##
 ## Getting the canonical system type.  ##
 ## ----------------------------------- ##