[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-299-g8cb4718

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=8cb4718e3308c3bc0d917403132601fae3d428b7

The branch, master has been updated
       via  8cb4718e3308c3bc0d917403132601fae3d428b7 (commit)
       via  0f5ffbe4092b0fdfe88954daf2c99ba0bb84472d (commit)
      from  425b0ac01f3bbe0a8cfe6ed53018972edd2117a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8cb4718e3308c3bc0d917403132601fae3d428b7
Author: Gary V. Vaughan <address@hidden>
Date:   Wed Sep 18 21:53:39 2013 +0700

    modules: remove ancient broken perl module.
    
    * modules/perl.c, modules/perl.m4: Remove.
    * po/POTFILES.in: Remove reference to perl.c.
    * Makefile.am: Remove commented out rules for building perl.so.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 0f5ffbe4092b0fdfe88954daf2c99ba0bb84472d
Author: Gary V. Vaughan <address@hidden>
Date:   Wed Sep 18 21:31:45 2013 +0700

    docs: update modules/README.
    
    * modules/README: Update to reflect current state.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am     |   15 -------
 modules/README  |   31 ++++----------
 modules/perl.c  |  125 -------------------------------------------------------
 modules/perl.m4 |    7 ---
 po/POTFILES.in  |    1 -
 5 files changed, 9 insertions(+), 170 deletions(-)
 delete mode 100644 modules/perl.c
 delete mode 100644 modules/perl.m4

diff --git a/Makefile.am b/Makefile.am
index 5a0ed3c..7920b9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,21 +187,6 @@ modules_mpeval_la_LDFLAGS  = $(module_ldflags)
 modules_mpeval_la_LIBADD       = $(module_libadd) $(LIBADD_GMP)
 endif
 
-## Disabled for now.  It is too fragile to be useful.
-## pkglib_LTLIBRARIES         += modules/perl.la
-## modules_perl_la_CPPFLAGS    = `$(PERL) -MExtUtils::Embed -e ccopts`
-## modules_perl_la_LDFLAGS             = \
-##               $(module_ldflags) `$(PERL) -MExtUtils::Embed -e ldopts`
-## modules_perl_la_LIBADD              = $(module_libadd)
-## BUILT_SOURCES                       = perlxsi.c
-## DISTCLEANFILES                     += $(BUILT_SOURCES)
-##
-## perlxsi.c:
-##     $(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c
-
-## but we should still distribute it, because it is listed in POTFILES.in:
-EXTRA_DIST += modules/perl.c
-
 module_check   = -rpath /dev/null
 check_LTLIBRARIES = \
                  tests/import.la \
diff --git a/modules/README b/modules/README
index 14d642e..d8fc412 100644
--- a/modules/README
+++ b/modules/README
@@ -1,13 +1,5 @@
 This directory contains all bundled modules for GNU m4.
 
-Note that as of this writing, an unreleased version of libtool from the
-CVS trunk is required to be able to compile the example modules, since they
-in turn depend on the uninstalled libm4.la library.  I think that third
-party modules will not have this requirement since they will be linking
-against the installed library.  In any case, once libtool-2.0 is
-released this will become a non-issue.  The bottom line is that you
-shouldn't libtoolize this distribution unless you know what you are doing!
-
 Dynamic modules are only available if the host operating system provides
 one (or more!) of libltdl's required APIs.
 
@@ -15,15 +7,14 @@ Implementation details are in ../m4/module.c
 
 A module is a compiled shared object, i.e., modules are written in C and
 then compiled.  The compiled file can then be loaded into a running m4
-process by calling m4 with the `-m' or `--load-module' options on the
-command line, or by calling the builtin "load" (itself implemented by the
-module `load').  This will give GNU m4 potential access to any system
-feature with a C interface.
+process by calling m4 with the module name listed on the command line,
+or by calling the builtin "include". This gives GNU m4 potential access
+to any system feature with a C interface.
 
-Modules are searched for in M4MODPATH, if set, else in a module directory
-defined at configure time, default $prefix/libexec/m4.  Extra directories
+Modules are searched for in M4PATH, if set, else in a module directory
+defined at configure time, $prefix/lib/m4/ by default.  Extra directories
 can also be added to the search patch by specifying them on the command
-line with the `-M' or `--module-directory' options.
+line with the `-I' or `-B' options.
 
 A module extends GNU m4 by defining new builtins, It can define builtins
 with the same names as existing builtins, which will shadow the existing
@@ -59,7 +50,7 @@ If a module defines the symbol "m4_init_module", it is 
supposed to be a
 function with a prototype of "void m4_init_module (struct obstack *obs)",
 and it will be called as soon as the module is loaded.  Any non-finished
 object left on the obstack will be the expansion of the call of the
-builtin "load".  The obstack pointer might be NULL (in the future).
+builtin "include".  The obstack pointer might be NULL (in the future).
 
 If a module defines the symbol "m4_finish_module", it is supposed to be
 a function with a prototype of "void m4_finish_module (void)", and it
@@ -80,15 +71,11 @@ strategies are illustrated by shadow.c and shadow.m4.
 
 To try the demos, compile with `make' and run them with the commands as:
 
-   M4MODPATH=`pwd` ../src/m4 time.m4
-
-or
-
-  ../src/m4 -M `pwd` shadow.m4
+    tests/m4 examples/time.m4
 
 or in the case of time2.m4
 
-  ../src/m4 -M `pwd` -m time time2.m4
+    tests/m4 -I tests time -I examples time2.m4
 
 ========================================================================
 
diff --git a/modules/perl.c b/modules/perl.c
deleted file mode 100644
index edccecf..0000000
--- a/modules/perl.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* GNU m4 -- A simple macro processor
-   Copyright (C) 1999-2000, 2006-2008, 2010, 2013 Free Software
-   Foundation, Inc.
-
-   This file is part of GNU M4.
-
-   GNU M4 is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   GNU M4 is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <config.h>
-
-/* Build using only the exported interfaces, unless NDEBUG is set, in
-   which case use private symbols to speed things up as much as possible.  */
-#ifndef NDEBUG
-#  include <m4/m4module.h>
-#else
-#  include "m4private.h"
-#endif
-
-#undef PACKAGE
-#include "perlxsi.c"                    /* Perl stuff */
-#undef try
-#undef _
-
-/* Rename exported symbols for dlpreload()ing.  */
-#define m4_builtin_table        perl_LTX_m4_builtin_table
-#define m4_macro_table          perl_LTX_m4_macro_table
-
-/*         function     macros  blind   side    minargs maxargs */
-#define builtin_functions                                       \
-  BUILTIN (perleval,    false,  false,  false,  0,      -1  )   \
-
-
-#define BUILTIN(handler, macros, blind, side, min, max)  M4BUILTIN (handler)
-  builtin_functions
-#undef BUILTIN
-
-const m4_builtin m4_builtin_table[] =
-{
-#define BUILTIN(handler, macros, blind, side, min, max)                 \
-  M4BUILTIN_ENTRY (handler, #handler, macros, blind, side, min, max)
-
-  builtin_functions
-#undef BUILTIN
-
-  { NULL, NULL, 0, 0, 0 },
-};
-
-/* A table for mapping m4 symbol names to simple expansion text. */
-const m4_macro m4_macro_table[] =
-{
-  /* name               text    min     max */
-  { "__perleval__",     "",     0,      0 },
-  { NULL,               NULL,   0,      0 },
-};
-
-
-
-static PerlInterpreter *my_perl;
-
-M4INIT_HANDLER (perl)
-{
-  const lt_dlinfo *info = 0;
-  char *embedding[] = { "", "-e", "0" };
-
-  if (module)
-    info = lt_dlgetinfo (module);
-
-  /* Start up a perl parser, when loaded for the first time.  */
-  if (info && (info->ref_count == 1))
-    {
-      my_perl = perl_alloc ();
-      perl_construct (my_perl);
-
-      perl_parse (my_perl, xs_init, 3, embedding, NULL);
-      perl_run (my_perl);
-    }
-}
-
-M4FINISH_HANDLER (perl)
-{
-  const lt_dlinfo *info = 0;
-
-  if (module)
-    info = lt_dlgetinfo (module);
-
-  /* Recycle the perl parser, when unloaded for the last time.  */
-  if (info && (info->ref_count == 1))
-    {
-      perl_destruct (my_perl);
-      perl_free (my_perl);
-    }
-}
-
-
-
-/**
- * perleval([PERLCODE], [...])
- **/
-M4BUILTIN_HANDLER (perleval)
-{
-  SV *val;
-  size_t i;
-
-  for (i = 1; i < argc; i++)
-    {
-      if (i > 1)
-        obstack_1grow (obs, ',');
-
-      val = perl_eval_pv (M4ARG (i), true);
-
-      m4_shipout_string (context, obs, SvPV (val, PL_na), SIZE_MAX, false);
-    }
-}
diff --git a/modules/perl.m4 b/modules/perl.m4
deleted file mode 100644
index d3308a0..0000000
--- a/modules/perl.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-dnl Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it
-dnl with or without modifications, as long as this notice is preserved.
-load(`perl')
-
-perleval(`"reverse 'rekcaH lreP rehtonA tsuJ'"')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 94415f9..0109259 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,6 @@ modules/gnu.c
 modules/load.c
 modules/m4.c
 modules/mpeval.c
-modules/perl.c
 modules/traditional.c
 src/freeze.c
 src/getopt.c


hooks/post-receive
-- 
GNU M4 source repository