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=4e9147c19130312b6ae4e93d7982393b78dbfc3b The branch, master has been updated via 4e9147c19130312b6ae4e93d7982393b78dbfc3b (commit) via 1117977cc5c466546f155bacb82e9dd9a2f5b049 (commit) via 1d887c9b5002d8e9a4e65c192c8a1b7355cc356a (commit) via bb0bc2920c90f7c7e32b697b52e4a84cfbabf1a9 (commit) via 8991a6cc3d4ad073c9fe479bbff0e6e217be0a38 (commit) via 0ea9ccbb6e77ade9956d951cd2d206ef67acd2c3 (commit) via 2590c2dcf1db82aa46e5f81a8de214c21fb9a8a9 (commit) via 4b572bfb5da0d48c5a57f83d20c0f1bee8866ee2 (commit) via 9b05f560559e00ec19064339ff2a4c6c54d954c0 (commit) via e98114fd72d4b2dfee68851efed5ede8021e8ab0 (commit) from aec80873100b4cb0fc7abc9585822b7041fcd1f1 (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 4e9147c19130312b6ae4e93d7982393b78dbfc3b Author: Gary V. Vaughan <[email protected]> Date: Thu Nov 20 22:09:03 2014 +0000 modules: support non-posix PATH_SEPARATOR. * configure.ac (PATH_SEPARATOR): Propagate to config.h. * m4/path.c (search_path_env_init): Respect PATH_SEPARATOR. Reported by KO Myung-Hun Signed-off-by: Gary V. Vaughan <[email protected]> commit 1117977cc5c466546f155bacb82e9dd9a2f5b049 Author: Gary V. Vaughan <[email protected]> Date: Thu Nov 20 21:50:48 2014 +0000 modules: support _ symbol prefix requirement for dlsym. * configure.ac (LT_FUNC_DLSYM_USCORE): Call it to set NEED_USCORE. * m4/module.c (uscore_sym): New function. Use this to prepend an underscore if NEED_USCORE was set at configure time. Reported by KO Myung-Hun Signed-off-by: Gary V. Vaughan <[email protected]> commit 1d887c9b5002d8e9a4e65c192c8a1b7355cc356a Author: KO Myung-Hun <[email protected]> Date: Thu Nov 20 22:15:11 2014 +0000 modules: fall-back to system dlopen search path. * m4/module.c (m4__module_open): If the module search function cannot find a matching module, fall-back to the system dlopen search path. Signed-off-by: Gary V. Vaughan <[email protected]> commit bb0bc2920c90f7c7e32b697b52e4a84cfbabf1a9 Author: KO Myung-Hun <[email protected]> Date: Thu Nov 20 22:11:02 2014 +0000 modules: support .dll suffix. * m4/module.c (m4__module_open): Support .dll suffix in module names. * m4/path.c (FILE_SUFFIXES): Likewise for include builtin. Signed-off-by: Gary V. Vaughan <[email protected]> commit 8991a6cc3d4ad073c9fe479bbff0e6e217be0a38 Author: KO Myung-Hun <[email protected]> Date: Wed Nov 19 15:13:58 2014 +0000 m4: fdopen() with a text mode explicitly on OS/2. On OS/2 kLIBC, fdopen() creates a stream in a mode of a file descriptor. So specify "t" to open a stream in a text mode explicitly on OS/2. * modules/gnu.c (m4_esyscmd): fdopen() in a text mode on OS/2. Signed-off-by: Gary V. Vaughan <[email protected]> commit 0ea9ccbb6e77ade9956d951cd2d206ef67acd2c3 Author: KO Myung-Hun <[email protected]> Date: Wed Nov 19 14:58:22 2014 +0000 configury: add -Zargs-resp to LDFLAGS on OS/2. -Zargs-resp enables a response file support on OS/2. * configure.ac (OS2_LDFLAGS): Add -Zargs-resp on *-*-os2*. * Makefile.am (AM_LDFLAGS): Add OS2_LDFLAGS. Signed-off-by: Gary V. Vaughan <[email protected]> commit 2590c2dcf1db82aa46e5f81a8de214c21fb9a8a9 Author: KO Myung-Hun <[email protected]> Date: Wed Nov 19 14:06:12 2014 +0000 configury: append $EXEEXT suffix to /bin/sh. Without $EXEEXT, /bin/sh cannot be located on OS/2. * build-aux/m4/m4-syscmd.m4 (M4_SYSCMD): append $EXEEXT suffix to /bin/sh. Signed-off-by: Gary V. Vaughan <[email protected]> commit 4b572bfb5da0d48c5a57f83d20c0f1bee8866ee2 Author: Gary V. Vaughan <[email protected]> Date: Thu Nov 20 18:44:15 2014 +0000 configury: loadable modules files do not require version numbers. Modules are loaded by libltdl. Arguably, loading from the .la pseudo-library should work irrespective of platform library object file-naming schemes; but in reality, M4 loads modules by basename anyway, so we shouldn't put a platform specific version number in the module filename anyway. * Makefile.am (module_ldflags): Add -avoid-version flag. Reported by KO Myung-Hun Signed-off-by: Gary V. Vaughan <[email protected]> commit 9b05f560559e00ec19064339ff2a4c6c54d954c0 Author: Gary V. Vaughan <[email protected]> Date: Thu Nov 20 18:37:04 2014 +0000 configury: loadable modules do not require undefined symbol support. For compatibility with OS/2 and cygwin, modules must be compiled with no undefined symbols. * Makefile.am (AM_LDFLAGS): Add -no-undefined flag. Reported by Ko Myung-Hun Signed-off-by: Gary V. Vaughan <[email protected]> commit e98114fd72d4b2dfee68851efed5ede8021e8ab0 Author: Gary V. Vaughan <[email protected]> Date: Thu Nov 20 19:28:24 2014 +0000 maint: autogenerate THANKS. More automation == less time wasted on menial tasks. * build-aux/thanks-gen: script inspired by coreutils. * Makefile.am (THANKS): Based on rule from coreutils/Makefile.am. * NO-THANKS: New file. Configure thanks-gen output. * THANKS: Remove. Signed-off-by: Gary V. Vaughan <[email protected]> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 41 +++++++++- NO-THANKS | 186 +++++++++++++++++++++++++++++++++++++++++++++ THANKS | 177 ------------------------------------------ build-aux/m4/m4-syscmd.m4 | 2 +- configure.ac | 14 +++- m4/module.c | 21 +++++- m4/path.c | 3 +- modules/gnu.c | 6 ++ 8 files changed, 263 insertions(+), 187 deletions(-) create mode 100644 NO-THANKS delete mode 100644 THANKS diff --git a/Makefile.am b/Makefile.am index e9ec90d..6cf5ea7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,8 +30,12 @@ AUTOMAKE_OPTIONS = nostdinc gitlog_to_changelog = $(srcdir)/$(config_aux_dir)/gitlog-to-changelog git_log_fix = $(srcdir)/$(config_aux_dir)/git-log-fix -changelog = $(srcdir)/ChangeLog +thanks_gen = $(srcdir)/$(config_aux_dir)/thanks-gen + +changelog = $(distdir)/ChangeLog changelog_old = $(srcdir)/ChangeLog.old +thanks = $(distdir)/THANKS +no_thanks = $(srcdir)/NO-THANKS # Prime the variables that will be augmented by libtool. # FIXME - the -export-symbols-regex ".*" is a hack to work around the @@ -41,7 +45,7 @@ changelog_old = $(srcdir)/ChangeLog.old # See http://lists.gnu.org/archive/html/libtool-patches/2007-02/msg00062.html AM_CPPFLAGS = -I$(srcdir) -I. AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) -AM_LDFLAGS = -export-dynamic -export-symbols-regex ".*" +AM_LDFLAGS = -no-undefined -export-dynamic -export-symbols-regex ".*" EXTRA_DIST = BUILT_SOURCES = CLEANFILES = @@ -59,6 +63,7 @@ EXTRA_LTLIBRARIES= # given in build-aux/git-version-gen. AM_CPPFLAGS += -Im4/gnu -I$(srcdir)/m4/gnu \ -Im4 -I$(srcdir)/m4 +AM_LDFLAGS += $(OS2_LDFLAGS) EXTRA_DIST += bootstrap cfg.mk maint.mk .version .prev-version \ $(config_macro_dir)/gnulib-cache.m4 $(gitlog_to_changelog) BUILT_SOURCES += .version @@ -68,7 +73,7 @@ dist-hook: dist-tarball-version dist-tarball-version: echo $(VERSION) > $(distdir)/.tarball-version -dist-hook: ChangeLog +dist-hook: $(changelog) changelog_start_date = 2011-01-01 $(changelog): FORCE $(AM_V_GEN)if test -d '$(srcdir)/.git'; then \ @@ -78,6 +83,34 @@ $(changelog): FORCE cat '$(changelog_old)' >> '$@'; \ fi +# Sort in traditional ASCII order, regardless of the current locale; +# otherwise we may get into trouble with distinct strings that the +# current locale considers to be equal. +ASSORT = LC_ALL=C sort + +# Extract all lines up to the first one starting with "##". +prologue = perl -ne '/^\#\#/ and exit; print' $(no_thanks) + +# Generate THANKS using git log entries as far as possible, fixing +# up ommisions and errors from NO-THANKS configuration. +$(thanks): FORCE + $(AM_V_GEN)if test -d '$(srcdir)/.git'; then \ + { \ + $(prologue); echo; \ + { perl -ne '/^$$/.../^$$/ and print' $(no_thanks) \ + | grep -v '^$$' | perl -pe 's/ +/\0/'; \ + { sed -e '1,/\#\# /d' -e '/^\#\# /d' \ + -e 's|[ ][ ]*| |' < $(no_thanks) \ + | tr '\t' '\0'; \ + git log --pretty=format:'%aN%x00%aE'; \ + } | $(ASSORT) -u; \ + } | $(thanks_gen) \ + | LC_ALL=en_US.UTF-8 sort -f; \ + echo; \ + printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \ + } > '$@'; \ + fi + MAINTAINERCLEANFILES += \ ABOUT-NLS INSTALL Makefile.in aclocal.m4 \ config-h.in configure stamp-h.in \ @@ -148,7 +181,7 @@ MOSTLYCLEANFILES += src/getopt.h src/getopt.h-t ## Modules. ## ## -------- ## -module_ldflags = -module $(AM_LDFLAGS) +module_ldflags = -avoid-version -module $(AM_LDFLAGS) module_libadd = m4/libm4.la noinst_HEADERS = modules/m4.h diff --git a/NO-THANKS b/NO-THANKS new file mode 100644 index 0000000..0c58ac1 --- /dev/null +++ b/NO-THANKS @@ -0,0 +1,186 @@ +These people have contributed to GNU M4. Some have reported problems, +others have contributed improvements to the documentation and actual code. +The particular contributions are described in the version control logs and +ChangeLog files. If your name has been left out, if you'd rather not be +listed, or if you'd prefer a different address be used, please send a +note to the bug-report mailing list (as seen at end of e.g., m4 --help). +## +## There is no need to list here any name that appears as an Author in +## "git log" output. Those are automatically added when this template +## is used to generate the THANKS file. You will still need to add +## contributors who are not a git log Author - e.g. bug reporters. +## +## Folks already promoted to AUTHORS: +## +!Akim Demaille +!Alexandre Duret-Lutz +!Andrew James Bettison +!David Warme +!Eric Benjamin Blake +!François Pinard +!Gary V. Vaughan +!James L. Avera +!Joel E. Denny +!John Brzustowski +!John Gatewood Ham +!John Gerard Makecki +!Markus Duft +!Michael Elizabeth Chastain +!Noah Jeffrey Misch +!Pete Chown +!Ralf Wildenhues +!Raphael Poss +!René Seindal +!Thomas Tanner +!Tim Rice +!William C. Cox +!Yuji Minejima +## +## Remove duplicates under alternate names, and add preferred email +## addresses from contributors that don't match git log output here: +## +!Andrew Bettison +!Eric Blake +!Francois Pinard +!Noah Misch +!Rene' Seindal +## +## Add bug reporters, patch Authors you forgot to attribute at commit +## time with 'git commit --author=...' and other non-patch contributers +## below: +## +Akiko Matsushita [email protected] +Alan Magnuson [email protected] +Albert Chin [email protected] +Alexander Lehmann [email protected] +Amos Shapira [email protected] +Andreas Büning [email protected] +Andreas Gustafsson [email protected] +Andreas Schultz [email protected] +Andreas Schwab [email protected] +Andrew Athan [email protected] +Assar Westerlund [email protected] +Ben A. Mesander [email protected] +Ben Elliston [email protected] +Bengt Mertensson [email protected] +Bernhard Daeubler [email protected] +Bill Bumgarner [email protected] +Bjorn R. Bjornsson [email protected] +Bob Badour [email protected] +Bob Proulx [email protected] +Brendan Kehoe [email protected] +Brian J. Fox [email protected] +Brian D. Carlstrom [email protected] +Cesar Strauss [email protected] +Charles Wilson [email protected] +Chris McGuire [email protected] +Chris Penev [email protected] +Damian Menscher [email protected] +Dan Jacobson [email protected] +Daniel Richard G. [email protected] +David J. MacKenzie [email protected] +David Perlin [email protected] +Elbert Pol [email protected] +Elias Benali [email protected] +Erez Zadok [email protected] +Eric Allman [email protected] +Eric Backus [email protected] +Eric Fischer [email protected] +Erick Branderhorst [email protected] +Fernando Carrijo [email protected] +Frank Schwidom [email protected] +Gary Affonso [email protected] +Geoff Russell [email protected] +Giovanni Toffetti [email protected] +Greg A. Woods [email protected] +Greg McGary [email protected] +Hal Peterson [email protected] +Hoang Uong [email protected] +Hongjiu Lu [email protected] +Ian Taylor [email protected] +Ilya N. Golubev [email protected] +Jan Djarv [email protected] +Jason Merrill [email protected] +Jay Krell [email protected] +Jean-Charles Longuet [email protected] +Jens Rehsack [email protected] +Jim Avera [email protected] +Jim Kingdom [email protected] +Jim Meyering [email protected] +Joel Sherrill [email protected] +John David Anglin [email protected] +Josef T. Burger [email protected] +Joseph E. Sacco [email protected] +Joseph S. Myers [email protected] +Joshua R. Poulson [email protected] +Karl Berry [email protected] +Karl Nelson [email protected] +Karl Vogel [email protected] +Kaveh R. Ghazi [email protected] +Keith Bostic [email protected] +Konrad Schwarz [email protected] +Kristine Lund [email protected] +Krste Asanovic [email protected] +Lawson Chan [email protected] +M. Levinson [email protected] +Marcus Daniels [email protected] +Marion Hakanson [email protected] +Mark Seiden [email protected] +Martin Koeppe [email protected] +Massimo Dal Zotto [email protected] +Matt Kraai [email protected] +Matthew Woehlke [email protected] +Matthias Rabe [email protected] +Mehul Sanghvi [email protected] +Michael Fetterman [email protected] +Michael L. Welcome [email protected] +Mike Andrews [email protected] +Mike Dupont [email protected] +Mike Frysinger [email protected] +Mike Howard [email protected] +Mike Lijewski [email protected] +Mike R. [email protected] +Mike Stump [email protected] +Mikhail Teterin [email protected] +Nelson H. F. Beebe [email protected] +Nick S. Kanakakorn [email protected] +Nicolas Lichtmaier [email protected] +Nicolas Pioch [email protected] +Noah Friedman [email protected] +Per Bothner [email protected] +Pierre Gaumond [email protected] +Pierre Mathieu [email protected] +Rafael Corvalan [email protected] +Rainer Tammer [email protected] +Richard A Nelson [email protected] +Richard Ling [email protected] +Richard Stallman [email protected] +Robert Bernstein [email protected] +Robert Bihlmeyer [email protected] +Roderick Koehle [email protected] +Roland H. Pesch [email protected] +Roland McGrath [email protected] +Ronny Peine [email protected] +Sami Liedes [email protected] +Santiago Vila [email protected] +Scott Bartram deneb!scottb +Sergey Poznyakoff [email protected] +Simon Leinen [email protected] +Skip Montanaro [email protected] +Stephen Perkins [email protected] +Steve Williamson [email protected] +Steven Augart [email protected] +Terry Jones [email protected] +Thomas Klausner [email protected] +Thorsten Ohl [email protected] +Todd Rinaldo [email protected] +Tom G. Christensen [email protected] +Tom McConnell [email protected] +Tom Quinn [email protected] +Tom Tromey [email protected] +Ulrich Drepper [email protected] +Vern Paxson [email protected] +Vic Abell [email protected] +Vincent Lonngren [email protected] +Vivek P. Singhal [email protected] +Walter Wong [email protected] diff --git a/THANKS b/THANKS deleted file mode 100644 index 70e0354..0000000 --- a/THANKS +++ /dev/null @@ -1,177 +0,0 @@ -GNU M4 THANKS file - -GNU M4 was originally written by René Seindal. Many people -further contributed to GNU M4 by reporting problems, suggesting -various improvements or submitting actual code. Here is a list of -these people. Help me keep it complete and exempt of errors. - -Akiko Matsushita [email protected] -Akim Demaille [email protected] -Alan Magnuson [email protected] -Albert Chin [email protected] -Alexander Lehmann [email protected] -Amos Shapira [email protected] -Andreas Büning [email protected] -Andreas Gustafsson [email protected] -Andreas Schultz [email protected] -Andreas Schwab [email protected] -Andrew Athan [email protected] -Andrew Bettison [email protected] -Assar Westerlund [email protected] -Ben A. Mesander [email protected] -Ben Elliston [email protected] -Bengt Mertensson [email protected] -Bernhard Daeubler [email protected] -Bill Bumgarner [email protected] -Bjorn R. Bjornsson [email protected] -Bob Badour [email protected] -Bob Proulx [email protected] -Brendan Kehoe [email protected] -Brian J. Fox [email protected] -Brian D. Carlstrom [email protected] -Bruno Haible [email protected] -Carlo Teubner [email protected] -Cesar Strauss [email protected] -Charles Wilson [email protected] -Chris McGuire [email protected] -Chris Penev [email protected] -Damian Menscher [email protected] -Dan Jacobson [email protected] -Daniel Richard G. [email protected] -David J. MacKenzie [email protected] -David Perlin [email protected] -Elbert Pol [email protected] -Elias Benali [email protected] -Erez Zadok [email protected] -Eric Allman [email protected] -Eric Backus [email protected] -Eric Blake [email protected] -Eric Fischer [email protected] -Erick Branderhorst [email protected] -Fernando Carrijo [email protected] -François Pinard [email protected] -Frank Schwidom [email protected] -Gary Affonso [email protected] -Gary V. Vaughan [email protected] -Geoff Russell [email protected] -Giovanni Toffetti [email protected] -Greg A. Woods [email protected] -Greg McGary [email protected] -Hal Peterson [email protected] -Hoang Uong [email protected] -Hongjiu Lu [email protected] -Ian Taylor [email protected] -Ilya N. Golubev [email protected] -Jan Djarv [email protected] -Jason Merrill [email protected] -Jay Krell [email protected] -Jean-Charles Longuet [email protected] -Jens Rehsack [email protected] -Jim Avera [email protected] -Jim Kingdom [email protected] -Jim Meyering [email protected] -Joel E. Denny [email protected] -Joel Sherrill [email protected] -John Brzustowski [email protected] -John David Anglin [email protected] -John Gatewood Ham [email protected] -John Gerard Malecki [email protected] -Josef T. Burger [email protected] -Joseph E. Sacco [email protected] -Joseph S. Myers [email protected] -Joshua R. Poulson [email protected] -Karl Berry [email protected] -Karl Nelson [email protected] -Karl Vogel [email protected] -Kaveh R. Ghazi [email protected] -Keith Bostic [email protected] -Konrad Schwarz [email protected] -Kristine Lund [email protected] -Krste Asanovic [email protected] -Lawson Chan [email protected] -M. Levinson [email protected] -Marcus Daniels [email protected] -Marion Hakanson [email protected] -Mark Seiden [email protected] -Martin Koeppe [email protected] -Massimo Dal Zotto [email protected] -Matt Kraai [email protected] -Matthew Woehlke [email protected] -Matthias Rabe [email protected] -Mehul Sanghvi [email protected] -Michael Fetterman [email protected] -Michael L. Welcome [email protected] -Mike Andrews [email protected] -Mike Dupont [email protected] -Mike Frysinger [email protected] -Mike Howard [email protected] -Mike Lijewski [email protected] -Mike R. [email protected] -Mike Stump [email protected] -Mikhail Teterin [email protected] -Nelson H. F. Beebe [email protected] -Nick S. Kanakakorn [email protected] -Nicolas Lichtmaier [email protected] -Nicolas Pioch [email protected] -Noah Friedman [email protected] -Noah Misch [email protected] -Paolo Bonzini [email protected] -Paul Eggert [email protected] -Per Bothner [email protected] -Pete Chown [email protected] -Pierre Gaumond [email protected] -Pierre Mathieu [email protected] -Rafael Corvalan [email protected] -Rainer Tammer [email protected] -Ralf Wildenhues [email protected] -René Seindal [email protected] -Richard A Nelson [email protected] -Richard Ling [email protected] -Richard Stallman [email protected] -Robert Bernstein [email protected] -Robert Bihlmeyer [email protected] -Roderick Koehle [email protected] -Roland H. Pesch [email protected] -Roland McGrath [email protected] -Ronny Peine [email protected] -Sami Liedes [email protected] -Santiago Vila [email protected] -Scott Bartram deneb!scottb -Sergey Poznyakoff [email protected] -Simon Leinen [email protected] -Skip Montanaro [email protected] -Stepan Kasal [email protected] -Stephen Perkins [email protected] -Steve Williamson [email protected] -Steven Augart [email protected] -Terry Jones [email protected] -Thomas Klausner [email protected] -Thomas Tanner [email protected] -Thorsten Ohl [email protected] -Todd Rinaldo [email protected] -Tom G. Christensen [email protected] -Tom McConnell [email protected] -Tom Quinn [email protected] -Tom Tromey [email protected] -Ulrich Drepper [email protected] -Vern Paxson [email protected] -Vic Abell [email protected] -Vincent Lonngren [email protected] -Vivek P. Singhal [email protected] -Walter Wong [email protected] -Yuji Minejima [email protected] - -======================================================================== - -Local Variables: -coding: utf-8 -End: - -Copyright (C) 2000, 2006-2010, 2013 Free Software Foundation, Inc. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.3 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the ``GNU Free -Documentation License'' file as part of this distribution. diff --git a/build-aux/m4/m4-syscmd.m4 b/build-aux/m4/m4-syscmd.m4 index 514201f..fc93424 100644 --- a/build-aux/m4/m4-syscmd.m4 +++ b/build-aux/m4/m4-syscmd.m4 @@ -35,7 +35,7 @@ if test "$with_syscmd_shell" = no ; then with_syscmd_shell=/bin/sh if test "$cross_compiling" != yes ; then dnl Give mingw a default that is more likely to be available. - AS_IF([AS_EXECUTABLE_P([/bin/sh])], [], + AS_IF([AS_EXECUTABLE_P([/bin/sh$EXEEXT])], [], [if (cmd /c) 2>/dev/null; then with_syscmd_shell=cmd; fi]) dnl Too bad _AS_PATH_WALK is not public. M4_save_IFS=$IFS; IFS=$PATH_SEPARATOR diff --git a/configure.ac b/configure.ac index 2fe6d9e..d4fffd6 100644 --- a/configure.ac +++ b/configure.ac @@ -164,6 +164,7 @@ case "$CFLAGS" in ;; esac + ## ------------------------------- ## ## Preloaded module configuration. ## ## ------------------------------- ## @@ -204,6 +205,15 @@ AC_SUBST([DLPREOPEN]) AC_SUBST([PREOPEN_DEPENDENCIES]) +## ------------------------------- ## +## Dynamic Loader Characteristics. ## +## ------------------------------- ## + +LT_FUNC_DLSYM_USCORE +AC_DEFINE_UNQUOTED([PATH_SEPARATOR], ['$PATH_SEPARATOR'], + [Define this to system search path delimiter]) + + ## ---------------- ## ## Gettext support. ## ## ---------------- ## @@ -213,7 +223,6 @@ AM_GNU_GETTEXT_VERSION([0.16]) M4_GNU_GETTEXT - ## --------------- ## ## Gnulib support. ## ## --------------- ## @@ -235,6 +244,8 @@ M4_RENAME AC_TYPE_SIZE_T AC_CHECK_SIZEOF([long long int]) +AS_CASE([$host], [*-*-os2*], [OS2_LDFLAGS=-Zargs-resp]) +AC_SUBST([OS2_LDFLAGS]) ## ------------------------- ## @@ -250,7 +261,6 @@ fi AC_SUBST([INCLUDE_STDBOOL_H]) - ## --------------------------------- ## ## Library functions required by M4. ## ## --------------------------------- ## diff --git a/m4/module.c b/m4/module.c index 6f2a2a9..8efb1a9 100644 --- a/m4/module.c +++ b/m4/module.c @@ -67,7 +67,20 @@ #define MODULE_SELF_NAME "!myself!" -static const char* module_dlerror (void); +#if NEED_USCORE +static void * +uscore_sym (void *handle, const char *symbol) +{ + char *symname = xasprintf ("_%s", symbol); + void *address = dlsym (handle, symname); + free (symname); + return address; +} + +#define dlsym uscore_sym +#endif + +static const char * module_dlerror (void); static void install_builtin_table (m4*, m4_module *); static void install_macro_table (m4*, m4_module *); @@ -265,7 +278,7 @@ compare_builtin_CB (const void *a, const void *b) m4_module * m4__module_open (m4 *context, const char *name, m4_obstack *obs) { - static const char * suffixes[] = { "", ".so", NULL }; + static const char * suffixes[] = { "", ".so", ".dll", NULL }; m4_module * module = NULL; assert (context); @@ -273,6 +286,10 @@ m4__module_open (m4 *context, const char *name, m4_obstack *obs) char *filepath = m4_path_search (context, name, suffixes); void *handle = NULL; + /* Use system module search path if m4_path_search fails. */ + if (!filepath) + filepath = xstrdup (name); + if (filepath) { handle = dlopen (filepath, RTLD_NOW|RTLD_GLOBAL); diff --git a/m4/path.c b/m4/path.c index 3a93289..6f47ff6 100644 --- a/m4/path.c +++ b/m4/path.c @@ -42,6 +42,7 @@ static const char *FILE_SUFFIXES[] = { ".m4f", ".m4", ".so", + ".dll", NULL }; @@ -100,7 +101,7 @@ search_path_env_init (m4__search_path_info *info, char *path, bool isabs) do { - path_end = strchr (path, ':'); + path_end = strchr (path, PATH_SEPARATOR); if (path_end) *path_end = '\0'; if (!isabs || *path == '/') diff --git a/modules/gnu.c b/modules/gnu.c index 874502e..f891ddc 100644 --- a/modules/gnu.c +++ b/modules/gnu.c @@ -684,7 +684,13 @@ M4BUILTIN_HANDLER (esyscmd) m4_set_sysval (127); return; } +#if OS2 + /* On OS/2 kLIBC, fdopen() creates a stream in a mode of a file + descriptor. So incldue "t" to open stream in a text mode explicitly. */ + pin = fdopen (fd, "rt"); +#else pin = fdopen (fd, "r"); +#endif if (!pin) { m4_error (context, 0, errno, me, _("cannot run command %s"), hooks/post-receive -- GNU M4 source repository
