* lib/autoscan/autoscan.pre (st_blksize, st_blocks, st_rdev)

(tm_zone): Move their rules to...
* lib/autoconf/types.m4: here, using AN_ macros.
* lib/autoscan/autoscan.pre (AWK, BISON, INSTALL, LEX, LN, MAKE)
(RANLIB, YACC, awk, bison, byacc, flex, gawk, install, lex, ln)
(make, mawk, nawk, ranlib, yacc): Similarly, move to...
* lib/autoconf/programs.m4: here.
* lib/freeze.mk (ETAGS_FOR_M4, ETAGS_FOR_M4SUGAR)
(ETAGS_FOR_AUTOCONF): New.
Use it.

diff --git a/ChangeLog b/ChangeLog
index 50a8fd485daac5d03960832b49c5f19a860e3e25..0180c904ed8fe35bdc3f31897983a20ae577a470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-28  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoscan/autoscan.pre (st_blksize, st_blocks, st_rdev)
+       (tm_zone): Move their rules to...
+       * lib/autoconf/types.m4: here, using AN_ macros.
+       * lib/autoscan/autoscan.pre (AWK, BISON, INSTALL, LEX, LN, MAKE)
+       (RANLIB, YACC, awk, bison, byacc, flex, gawk, install, lex, ln)
+       (make, mawk, nawk, ranlib, yacc): Similarly, move to...
+       * lib/autoconf/programs.m4: here.
+       * lib/freeze.mk (ETAGS_FOR_M4, ETAGS_FOR_M4SUGAR)
+       (ETAGS_FOR_AUTOCONF): New.
+       Use it.
+
 2002-09-28  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/autoscan.m4: New file.

diff --git a/lib/autoconf/Makefile.am b/lib/autoconf/Makefile.am
index ab379763a79cc67fd06cb9c73082951ec5857024..9d2c36da48d425b336c150a1c482fa34f1bf296e 100644 (file)
--- a/lib/autoconf/Makefile.am
+++ b/lib/autoconf/Makefile.am
@@ -35,11 +35,7 @@ CLEANFILES = $(nodist_autoconflib_DATA)
 
 TAGS_FILES = $(dist_autoconflib_DATA)
 
-ETAGS_ARGS = --lang=none \
-  --regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
-
-
-
+ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 
 
 ## -------- ##

diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index d952be59a1ede4480d4900de40cdce0920d521b2..e639ac1fa4491cc93692a259343c7cb16f8746d7 100644 (file)
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -105,9 +105,7 @@ CLEANFILES = $(nodist_autoconflib_DATA)
 
 TAGS_FILES = $(dist_autoconflib_DATA)
 
-ETAGS_ARGS = --lang=none \
-  --regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
-
+ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 
 SUFFIXES = .m4 .m4f
 
@@ -164,6 +162,22 @@ autoconf_m4f_dependencies = \
        $(src_libdir)/autoconf/programs.m4      \
        $(src_libdir)/autoconf/autoconf.m4
 
+
+ETAGS_FOR_M4 = \
+  --lang=none \
+  --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
+
+
+ETAGS_FOR_M4SUGAR = \
+  $(ETAGS_FOR_M4) \
+  --regex='/m4_defun(\[\([^]]*\)\]/\1/'
+
+
+ETAGS_FOR_AUTOCONF = \
+  $(ETAGS_FOR_M4SUGAR) \
+  --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
+  --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
+
 subdir = lib/autoconf
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =

diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 4284ce60811fe85c8e830adb29363ab0f8de5149..95364c9d10d830400aa9b2453ba266f19de38e74 100644 (file)
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -255,6 +255,11 @@ fi
 # (But of course when keeping related things together).
 
 # Check for gawk first since it's generally better.
+AN_MAKEVAR([AWK],  [AC_PROG_AWK])
+AN_PROGRAM([awk],  [AC_PROG_AWK])
+AN_PROGRAM([gawk], [AC_PROG_AWK])
+AN_PROGRAM([mawk], [AC_PROG_AWK])
+AN_PROGRAM([nawk], [AC_PROG_AWK])
 AC_DEFUN([AC_PROG_AWK],
 [AC_CHECK_PROGS(AWK, gawk mawk nawk awk, )])
 
@@ -271,6 +276,7 @@ AC_DEFUN([AC_PROG_EGREP],
  AC_SUBST([EGREP])
 ])# AC_PROG_EGREP
 
+
 # AC_PROG_FGREP
 # -------------
 AC_DEFUN([AC_PROG_FGREP],
@@ -286,6 +292,8 @@ AC_DEFUN([AC_PROG_FGREP],
 
 # AC_PROG_INSTALL
 # ---------------
+AN_MAKEVAR([INSTALL], [AC_PROG_INSTALL])
+AN_PROGRAM([install], [AC_PROG_INSTALL])
 AC_DEFUN([AC_PROG_INSTALL],
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 # Find a good install program.  We prefer a C program (faster),
@@ -365,6 +373,9 @@ AC_SUBST(INSTALL_DATA)dnl
 # -----------
 # Look for flex or lex.  Set its associated library to LEXLIB.
 # Check if lex declares yytext as a char * by default, not a char[].
+AN_MAKEVAR([LEX],  [AC_PROG_LEX])
+AN_PROGRAM([lex],  [AC_PROG_LEX])
+AN_PROGRAM([flex], [AC_PROG_LEX])
 AC_DEFUN_ONCE([AC_PROG_LEX],
 [AC_CHECK_PROGS(LEX, flex lex, :)
 if test -z "$LEXLIB"
@@ -427,6 +438,8 @@ AU_DEFUN([AC_DECL_YYTEXT],  [AC_PROG_LEX])
 
 # AC_PROG_LN_S
 # ------------
+AN_MAKEVAR([LN], [AC_PROG_LN_S])
+AN_PROGRAM([ln], [AC_PROG_LN_S])
 AC_DEFUN([AC_PROG_LN_S],
 [AC_MSG_CHECKING([whether ln -s works])
 AC_SUBST([LN_S], [$as_ln_s])dnl
@@ -441,6 +454,8 @@ fi
 # AC_PROG_MAKE_SET
 # ----------------
 # Define SET_MAKE to set ${MAKE} if make doesn't.
+AN_MAKEVAR([MAKE], [AC_PROG_MAKE_SET])
+AN_PROGRAM([make], [AC_PROG_MAKE_SET])
 AC_DEFUN([AC_PROG_MAKE_SET],
 [AC_MSG_CHECKING([whether ${MAKE-make} sets \${MAKE}])
 set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,./+-,__p_,'`
@@ -470,6 +485,8 @@ AC_SUBST([SET_MAKE])dnl
 
 # AC_PROG_RANLIB
 # --------------
+AN_MAKEVAR([RANLIB], [AC_PROG_RANLIB])
+AN_PROGRAM([ranlib], [AC_PROG_RANLIB])
 AC_DEFUN([AC_PROG_RANLIB],
 [AC_CHECK_TOOL(RANLIB, ranlib, :)])
 
@@ -484,5 +501,10 @@ Remove this warning when you adjust the code.])])
 
 # AC_PROG_YACC
 # ------------
+AN_MAKEVAR([BISON],  [AC_PROG_YACC])
+AN_MAKEVAR([YACC],  [AC_PROG_YACC])
+AN_PROGRAM([yacc],  [AC_PROG_YACC])
+AN_PROGRAM([byacc], [AC_PROG_YACC])
+AN_PROGRAM([bison], [AC_PROG_YACC])
 AC_DEFUN([AC_PROG_YACC],
 [AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)])

diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 12dd0be92630993303abccc1fe3028e753673a42..d3b00831600dfc685c31511535ba9a9daea079e2 100644 (file)
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -483,9 +483,14 @@ $2],
                  [$4])])])
 
 
-# ----------------- #
-# Specific checks.  #
-# ----------------- #
+
+# ------------------------------------------------------- #
+# Members that ought to be tested with AC_CHECK_MEMBERS.  #
+# ------------------------------------------------------- #
+
+AN_IDENTIFIER([st_blksize], [AC_CHECK_MEMBERS([struct stat.st_blksize])])
+AN_IDENTIFIER([st_rdev],    [AC_CHECK_MEMBERS([struct stat.st_rdev])])
+
 
 # Alphabetic order, please.
 
@@ -518,6 +523,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize],
 # Please note that it will define `HAVE_STRUCT_STAT_ST_BLOCKS',
 # and not `HAVE_ST_BLOCKS'.])dnl
 #
+AN_IDENTIFIER([st_blocks],  [AC_STRUCT_ST_BLOCKS])
 AC_DEFUN([AC_STRUCT_ST_BLOCKS],
 [AC_CHECK_MEMBERS([struct stat.st_blocks],
                   [AC_DEFINE(HAVE_ST_BLOCKS, 1,
@@ -568,6 +574,7 @@ fi
 # Figure out how to get the current timezone.  If `struct tm' has a
 # `tm_zone' member, define `HAVE_TM_ZONE'.  Otherwise, if the
 # external array `tzname' is found, define `HAVE_TZNAME'.
+AN_IDENTIFIER([tm_zone], [AC_STRUCT_TIMEZONE])
 AC_DEFUN([AC_STRUCT_TIMEZONE],
 [AC_REQUIRE([AC_STRUCT_TM])dnl
 AC_CHECK_MEMBERS([struct tm.tm_zone],,,[#include <sys/types.h>

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index 5efa65c7aa968d054b63621b8f179e120f109e12..6b73fe6d56a93c275201104a36400b918ea4a6ea 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -150,6 +150,22 @@ autoconf_m4f_dependencies = \
        $(src_libdir)/autoconf/programs.m4      \
        $(src_libdir)/autoconf/autoconf.m4
 
+
+ETAGS_FOR_M4 = \
+  --lang=none \
+  --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
+
+
+ETAGS_FOR_M4SUGAR = \
+  $(ETAGS_FOR_M4) \
+  --regex='/m4_defun(\[\([^]]*\)\]/\1/'
+
+
+ETAGS_FOR_AUTOCONF = \
+  $(ETAGS_FOR_M4SUGAR) \
+  --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
+  --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
+
 subdir = lib/autoscan
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =

diff --git a/lib/autoscan/autoscan.list b/lib/autoscan/autoscan.list
index 5b446094cbdd6a3c232669c7e8d6e79ca2e61261..ce3a42582f1cc8959ff737fa7faf7089ba282c7f 100644 (file)
--- a/lib/autoscan/autoscan.list
+++ b/lib/autoscan/autoscan.list
@@ -257,41 +257,41 @@ identifier: off_t           AC_TYPE_OFF_T
 identifier: pid_t           AC_TYPE_PID_T
 identifier: ptrdiff_t       AC_CHECK_TYPES
 identifier: size_t          AC_TYPE_SIZE_T
-identifier: st_blksize      AC_CHECK_MEMBERS([struct stat.st_blksize])
-identifier: st_blocks       AC_STRUCT_ST_BLOCKS
-identifier: st_rdev         AC_CHECK_MEMBERS([struct stat.st_rdev])
+identifier: st_blksize         AC_CHECK_MEMBERS([struct stat.st_blksize])
+identifier: st_blocks          AC_STRUCT_ST_BLOCKS
+identifier: st_rdev            AC_CHECK_MEMBERS([struct stat.st_rdev])
 identifier: sys_siglist     AC_DECL_SYS_SIGLIST
 identifier: timeval         AC_HEADER_TIME
 identifier: tm              AC_STRUCT_TM
-identifier: tm_zone         AC_STRUCT_TIMEZONE
+identifier: tm_zone            AC_STRUCT_TIMEZONE
 identifier: uid_t           AC_TYPE_UID_T
-makevar: AWK             AC_PROG_AWK
-makevar: BISON           AC_PROG_YACC
+makevar: AWK           AC_PROG_AWK
+makevar: BISON         AC_PROG_YACC
 makevar: CC              AC_PROG_CC
 makevar: CPP             AC_PROG_CPP
 makevar: CXX             AC_PROG_CXX
-makevar: INSTALL         AC_PROG_INSTALL
-makevar: LEX             AC_PROG_LEX
-makevar: LN              AC_PROG_LN_S
-makevar: MAKE            AC_PROG_MAKE_SET
-makevar: RANLIB          AC_PROG_RANLIB
-makevar: YACC            AC_PROG_YACC
+makevar: INSTALL               AC_PROG_INSTALL
+makevar: LEX           AC_PROG_LEX
+makevar: LN            AC_PROG_LN_S
+makevar: MAKE          AC_PROG_MAKE_SET
+makevar: RANLIB                AC_PROG_RANLIB
+makevar: YACC          AC_PROG_YACC
 program: CC              AC_PROG_CXX
-program: awk             AC_PROG_AWK
-program: bison           AC_PROG_YACC
-program: byacc           AC_PROG_YACC
+program: awk           AC_PROG_AWK
+program: bison         AC_PROG_YACC
+program: byacc         AC_PROG_YACC
 program: c++             AC_PROG_CXX
 program: cc              AC_PROG_CC
 program: cpp             AC_PROG_CPP
-program: flex            AC_PROG_LEX
+program: flex          AC_PROG_LEX
 program: g++             AC_PROG_CXX
-program: gawk            AC_PROG_AWK
+program: gawk          AC_PROG_AWK
 program: gcc             AC_PROG_CC
-program: install         AC_PROG_INSTALL
-program: lex             AC_PROG_LEX
-program: ln              AC_PROG_LN_S
-program: make            AC_PROG_MAKE_SET
-program: mawk            AC_PROG_AWK
-program: nawk            AC_PROG_AWK
-program: ranlib          AC_PROG_RANLIB
-program: yacc            AC_PROG_YACC
+program: install               AC_PROG_INSTALL
+program: lex           AC_PROG_LEX
+program: ln            AC_PROG_LN_S
+program: make          AC_PROG_MAKE_SET
+program: mawk          AC_PROG_AWK
+program: nawk          AC_PROG_AWK
+program: ranlib                AC_PROG_RANLIB
+program: yacc          AC_PROG_YACC

diff --git a/lib/autoscan/autoscan.pre b/lib/autoscan/autoscan.pre
index 2878eac560196576d64aedaeebb2186568c52452..758aeed304a9216a97d2d317ed789d80f38b6de2 100644 (file)
--- a/lib/autoscan/autoscan.pre
+++ b/lib/autoscan/autoscan.pre
@@ -86,40 +86,13 @@ identifier: tm              AC_STRUCT_TM
 identifier: uid_t           AC_TYPE_UID_T
 
 
-# Members of structures.
-identifier: st_blksize      AC_CHECK_MEMBERS([struct stat.st_blksize])
-identifier: st_blocks       AC_STRUCT_ST_BLOCKS
-identifier: st_rdev         AC_CHECK_MEMBERS([struct stat.st_rdev])
-identifier: tm_zone         AC_STRUCT_TIMEZONE
-
-makevar: AWK             AC_PROG_AWK
-makevar: BISON           AC_PROG_YACC
 makevar: CC              AC_PROG_CC
 makevar: CPP             AC_PROG_CPP
 makevar: CXX             AC_PROG_CXX
-makevar: INSTALL         AC_PROG_INSTALL
-makevar: LEX             AC_PROG_LEX
-makevar: LN              AC_PROG_LN_S
-makevar: MAKE            AC_PROG_MAKE_SET
-makevar: RANLIB          AC_PROG_RANLIB
-makevar: YACC            AC_PROG_YACC
 
 program: CC              AC_PROG_CXX
-program: awk             AC_PROG_AWK
-program: bison           AC_PROG_YACC
-program: byacc           AC_PROG_YACC
 program: c++             AC_PROG_CXX
 program: cc              AC_PROG_CC
 program: cpp             AC_PROG_CPP
-program: flex            AC_PROG_LEX
 program: g++             AC_PROG_CXX
-program: gawk            AC_PROG_AWK
 program: gcc             AC_PROG_CC
-program: install         AC_PROG_INSTALL
-program: lex             AC_PROG_LEX
-program: ln              AC_PROG_LN_S
-program: make            AC_PROG_MAKE_SET
-program: mawk            AC_PROG_AWK
-program: nawk            AC_PROG_AWK
-program: ranlib          AC_PROG_RANLIB
-program: yacc            AC_PROG_YACC

diff --git a/lib/autotest/Makefile.am b/lib/autotest/Makefile.am
index 942be77780a7bd5decb9f95e73cb013ee626a6d2..369c4456a5d1236dd9c56c4a23f419d70deedf26 100644 (file)
--- a/lib/autotest/Makefile.am
+++ b/lib/autotest/Makefile.am
@@ -28,8 +28,7 @@ CLEANFILES = $(nodist_autotestlib_DATA)
 
 TAGS_FILES = $(dist_autotestlib_DATA)
 
-ETAGS_ARGS = --lang=none \
-  --regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
+ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 
 
 ## -------- ##

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index 2bc6c61029cc1eb1f96e137d55d5aef44b458bff..de87bd90735fc7da291756ab16346c38183d269b 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -98,9 +98,7 @@ CLEANFILES = $(nodist_autotestlib_DATA)
 
 TAGS_FILES = $(dist_autotestlib_DATA)
 
-ETAGS_ARGS = --lang=none \
-  --regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
-
+ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 
 SUFFIXES = .m4 .m4f
 
@@ -157,6 +155,22 @@ autoconf_m4f_dependencies = \
        $(src_libdir)/autoconf/programs.m4      \
        $(src_libdir)/autoconf/autoconf.m4
 
+
+ETAGS_FOR_M4 = \
+  --lang=none \
+  --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
+
+
+ETAGS_FOR_M4SUGAR = \
+  $(ETAGS_FOR_M4) \
+  --regex='/m4_defun(\[\([^]]*\)\]/\1/'
+
+
+ETAGS_FOR_AUTOCONF = \
+  $(ETAGS_FOR_M4SUGAR) \
+  --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
+  --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
+
 subdir = lib/autotest
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =

diff --git a/lib/freeze.mk b/lib/freeze.mk
index 4a4a4c661ab864d621bbf0c656fddd0fc02963a9..8b66e21253563c812afb2bf24d54911eab386387 100644 (file)
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -17,6 +17,11 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+
+## ----------------- ##
+## Freeze M4 files.  ##
+## ----------------- ##
+
 SUFFIXES = .m4 .m4f
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
@@ -88,3 +93,21 @@ autoconf_m4f_dependencies =                  \
        $(src_libdir)/autoconf/libs.m4          \
        $(src_libdir)/autoconf/programs.m4      \
        $(src_libdir)/autoconf/autoconf.m4
+
+
+## --------------------------- ##
+## Run ETAGS on some M4 code.  ##
+## --------------------------- ##
+
+ETAGS_FOR_M4 = \
+  --lang=none \
+  --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
+
+ETAGS_FOR_M4SUGAR = \
+  $(ETAGS_FOR_M4) \
+  --regex='/m4_defun(\[\([^]]*\)\]/\1/'
+
+ETAGS_FOR_AUTOCONF = \
+  $(ETAGS_FOR_M4SUGAR) \
+  --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
+  --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'

diff --git a/lib/m4sugar/Makefile.am b/lib/m4sugar/Makefile.am
index dd0f2f92daf5f4ec3601d0509aeeab2b6cf2dddd..50481e7c157fa64508a4002dffaff7974e86407b 100644 (file)
--- a/lib/m4sugar/Makefile.am
+++ b/lib/m4sugar/Makefile.am
@@ -47,8 +47,7 @@ version.m4: $(top_srcdir)/configure.ac
 
 TAGS_FILES = $(dist_m4sugarlib_DATA)
 
-ETAGS_ARGS = --lang=none \
-  --regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
+ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 
 
 ## -------- ##

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index edc0e066edccb205c21776a4ce36b9af635b2322..a5ef655e4cad3e52df4ea84653942e3aa8ee7b9a 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -98,9 +98,7 @@ CLEANFILES = $(nodist_m4sugarlib_DATA)
 
 TAGS_FILES = $(dist_m4sugarlib_DATA)
 
-ETAGS_ARGS = --lang=none \
-  --regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
-
+ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 
 SUFFIXES = .m4 .m4f
 
@@ -157,6 +155,22 @@ autoconf_m4f_dependencies = \
        $(src_libdir)/autoconf/programs.m4      \
        $(src_libdir)/autoconf/autoconf.m4
 
+
+ETAGS_FOR_M4 = \
+  --lang=none \
+  --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
+
+
+ETAGS_FOR_M4SUGAR = \
+  $(ETAGS_FOR_M4) \
+  --regex='/m4_defun(\[\([^]]*\)\]/\1/'
+
+
+ETAGS_FOR_AUTOCONF = \
+  $(ETAGS_FOR_M4SUGAR) \
+  --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
+  --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
+
 subdir = lib/m4sugar
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 63853b3996a729ff8c03829ad7032f8ab1542aab..e2713303fcc12c6aedda7885eadaae2a3f83c967 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -158,6 +158,22 @@ autoconf_m4f_dependencies = \
        $(src_libdir)/autoconf/autoconf.m4
 
 
+ETAGS_FOR_M4 = \
+  --lang=none \
+  --regex='/\(m4_define\|define\)(\[\([^]]*\)\]/\2/'
+
+
+ETAGS_FOR_M4SUGAR = \
+  $(ETAGS_FOR_M4) \
+  --regex='/m4_defun(\[\([^]]*\)\]/\1/'
+
+
+ETAGS_FOR_AUTOCONF = \
+  $(ETAGS_FOR_M4SUGAR) \
+  --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
+  --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
+
+
 TESTSUITE_GENERATED_AT = \
        aclang.at acc.at acfortran.at \
        acgeneral.at acstatus.at \