diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-16 11:16:15 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-16 11:16:15 +0200 |
commit | 094b83a641e3b5b4aedf8820cb2af9d1c32cb476 (patch) | |
tree | b0f3e355941214e9a3325237690c6ba483e6008c /m4 | |
parent | 7eccbf44fcee432c20ccd95b384f1c3494e4712c (diff) | |
parent | 455437e864ee89f3e09b2d18a7215a79291925d1 (diff) | |
download | automake-094b83a641e3b5b4aedf8820cb2af9d1c32cb476.tar.gz |
Merge branch 'maint'
* maint:
fixup: delete "# serial" line in m4/amversion.in
news: update about recent ylwrap changes and fixes
m4: get rid of "# serial" lines
configure: ${#param} must be supported by the shell for the testsuite
yacc tests: fix a spurious failure with parallel make
ylwrap: use proper quoting inside a `...` substitution
ylwrap: don't uselessly reset the exit status in case of failure
ylwrap: fix C++ support for Bison
ylwrap: refactor: move loop invariant
ylwrap: refactoring: don't rely on the file order
tests: upgrade and fix Bison test case
tests: fix bison input file
ylwrap: comment changes
ylwrap: modernize idioms
ylwrap: rename header inclusion in generated parsers
ylwrap: simplify the list of renamings
ylwrap: refactor: less duplication
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'm4')
-rw-r--r-- | m4/amversion.in | 2 | ||||
-rw-r--r-- | m4/amversion.m4 | 2 | ||||
-rw-r--r-- | m4/ar-lib.m4 | 2 | ||||
-rw-r--r-- | m4/as.m4 | 2 | ||||
-rw-r--r-- | m4/auxdir.m4 | 2 | ||||
-rw-r--r-- | m4/cond-if.m4 | 3 | ||||
-rw-r--r-- | m4/cond.m4 | 2 | ||||
-rw-r--r-- | m4/depend.m4 | 1 | ||||
-rw-r--r-- | m4/depout.m4 | 1 | ||||
-rw-r--r-- | m4/dmalloc.m4 | 2 | ||||
-rw-r--r-- | m4/gcj.m4 | 2 | ||||
-rw-r--r-- | m4/init.m4 | 2 | ||||
-rw-r--r-- | m4/install-sh.m4 | 2 | ||||
-rw-r--r-- | m4/lead-dot.m4 | 2 | ||||
-rw-r--r-- | m4/lex.m4 | 2 | ||||
-rw-r--r-- | m4/lispdir.m4 | 2 | ||||
-rw-r--r-- | m4/maintainer.m4 | 2 | ||||
-rw-r--r-- | m4/make.m4 | 2 | ||||
-rw-r--r-- | m4/minuso.m4 | 2 | ||||
-rw-r--r-- | m4/missing.m4 | 3 | ||||
-rw-r--r-- | m4/options.m4 | 2 | ||||
-rw-r--r-- | m4/protos.m4 | 2 | ||||
-rw-r--r-- | m4/python.m4 | 1 | ||||
-rw-r--r-- | m4/runlog.m4 | 2 | ||||
-rw-r--r-- | m4/sanity.m4 | 2 | ||||
-rw-r--r-- | m4/silent.m4 | 2 | ||||
-rw-r--r-- | m4/strip.m4 | 2 | ||||
-rw-r--r-- | m4/substnot.m4 | 2 | ||||
-rw-r--r-- | m4/tar.m4 | 2 | ||||
-rw-r--r-- | m4/upc.m4 | 2 | ||||
-rw-r--r-- | m4/vala.m4 | 2 |
31 files changed, 0 insertions, 61 deletions
diff --git a/m4/amversion.in b/m4/amversion.in index e44ace137..3661259a3 100644 --- a/m4/amversion.in +++ b/m4/amversion.in @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 74e79726d..368cd6438 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4 index 470def48c..b6b6b0f76 100644 --- a/m4/ar-lib.m4 +++ b/m4/ar-lib.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_AR([ACT-IF-FAIL]) # ------------------------- # Try to determine the archiver interface, and trigger the ar-lib wrapper @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_PROG_AS # ---------- AC_DEFUN([AM_PROG_AS], diff --git a/m4/auxdir.m4 b/m4/auxdir.m4 index 3dda02b26..9cd72c3e8 100644 --- a/m4/auxdir.m4 +++ b/m4/auxdir.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to # '$srcdir', '$srcdir/..', or '$srcdir/../..'. diff --git a/m4/cond-if.m4 b/m4/cond-if.m4 index 80e687b17..38f5ec979 100644 --- a/m4/cond-if.m4 +++ b/m4/cond-if.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_COND_IF # _AM_COND_ELSE # _AM_COND_ENDIF @@ -17,7 +15,6 @@ m4_define([_AM_COND_IF]) m4_define([_AM_COND_ELSE]) m4_define([_AM_COND_ENDIF]) - # AM_COND_IF(COND, [IF-TRUE], [IF-FALSE]) # --------------------------------------- # If the shell condition COND is true, execute IF-TRUE, otherwise execute diff --git a/m4/cond.m4 b/m4/cond.m4 index 03644abe0..9ea857e55 100644 --- a/m4/cond.m4 +++ b/m4/cond.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. diff --git a/m4/depend.m4 b/m4/depend.m4 index cee31991b..cd9306173 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -5,7 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 17 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, diff --git a/m4/depout.m4 b/m4/depout.m4 index ecf62688d..835c32bdd 100644 --- a/m4/depout.m4 +++ b/m4/depout.m4 @@ -6,7 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4 index 536ea9130..3e7fdb7b8 100644 --- a/m4/dmalloc.m4 +++ b/m4/dmalloc.m4 @@ -9,8 +9,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 - AC_DEFUN([AM_WITH_DMALLOC], [AC_MSG_CHECKING([if malloc debugging is wanted]) AC_ARG_WITH([dmalloc], @@ -7,8 +7,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - AC_DEFUN([AM_PROG_GCJ], [AC_CHECK_TOOLS([GCJ], [gcj], [gcj]) test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH]) diff --git a/m4/init.m4 b/m4/init.m4 index d841320d2..1d5dffd95 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 22 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. diff --git a/m4/install-sh.m4 b/m4/install-sh.m4 index 8061e7e12..f51c02757 100644 --- a/m4/install-sh.m4 +++ b/m4/install-sh.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4 index 8a8680539..633694fdd 100644 --- a/m4/lead-dot.m4 +++ b/m4/lead-dot.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_PROG_LEX # ----------- # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index c4840f4e2..72dcd8440 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -9,8 +9,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 - # AM_PATH_LISPDIR # --------------- AC_DEFUN([AM_PATH_LISPDIR], diff --git a/m4/maintainer.m4 b/m4/maintainer.m4 index ffc1ddfe9..62eef9c72 100644 --- a/m4/maintainer.m4 +++ b/m4/maintainer.m4 @@ -7,8 +7,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. diff --git a/m4/make.m4 b/m4/make.m4 index c4ba1a6d0..245c2e676 100644 --- a/m4/make.m4 +++ b/m4/make.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. diff --git a/m4/minuso.m4 b/m4/minuso.m4 index 7787ddf4b..50af200cb 100644 --- a/m4/minuso.m4 +++ b/m4/minuso.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_PROG_CC_C_O # -------------- # Like AC_PROG_CC_C_O, but changed for automake. diff --git a/m4/missing.m4 b/m4/missing.m4 index 2de7fe455..a246a9c93 100644 --- a/m4/missing.m4 +++ b/m4/missing.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -15,7 +13,6 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ # Define MISSING if not defined so far and test if it is modern enough. diff --git a/m4/options.m4 b/m4/options.m4 index 76ad6428c..ebf3cf00d 100644 --- a/m4/options.m4 +++ b/m4/options.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], diff --git a/m4/protos.m4 b/m4/protos.m4 index 942154b58..c8c7adc2c 100644 --- a/m4/protos.m4 +++ b/m4/protos.m4 @@ -7,8 +7,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - AC_DEFUN([AM_C_PROTOTYPES], [AC_FATAL([automatic de-ANSI-fication support has been removed])]) diff --git a/m4/python.m4 b/m4/python.m4 index 35488868e..a2478181f 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -9,7 +9,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- diff --git a/m4/runlog.m4 b/m4/runlog.m4 index 6d127a830..d983b718e 100644 --- a/m4/runlog.m4 +++ b/m4/runlog.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. diff --git a/m4/sanity.m4 b/m4/sanity.m4 index c90bc9809..0415711b8 100644 --- a/m4/sanity.m4 +++ b/m4/sanity.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], diff --git a/m4/silent.m4 b/m4/silent.m4 index d499ecb65..6746c6fa6 100644 --- a/m4/silent.m4 +++ b/m4/silent.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT diff --git a/m4/strip.m4 b/m4/strip.m4 index 42833ca09..d66f3f2e4 100644 --- a/m4/strip.m4 +++ b/m4/strip.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor 'install' (even GNU) is that you can't diff --git a/m4/substnot.m4 b/m4/substnot.m4 index 64d91ff3e..1830e796d 100644 --- a/m4/substnot.m4 +++ b/m4/substnot.m4 @@ -5,8 +5,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - AC_DEFUN([AM_PROG_UPC], [dnl We need OBJEXT and EXEEXT, but Autoconf doesn't offer any public dnl macro to compute them. Use AC_PROG_CC instead. diff --git a/m4/vala.m4 b/m4/vala.m4 index cc6ba53cc..5dad452bf 100644 --- a/m4/vala.m4 +++ b/m4/vala.m4 @@ -6,8 +6,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # Check whether the Vala compiler exists in $PATH. If it is found, the # variable VALAC is set. Optionally a minimum release number of the # compiler can be requested. |