[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-341-gf5a6f25

[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=f5a6f25daf08a02ff0da13b64de999778f98189f

The branch, master has been updated
       via  f5a6f25daf08a02ff0da13b64de999778f98189f (commit)
       via  0e0b031066a7974c19a48f87ff51fcb5c7502fce (commit)
      from  3834539812ee0415494f2bfd1aa1d67745b1b293 (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 f5a6f25daf08a02ff0da13b64de999778f98189f
Author: Gary V. Vaughan <address@hidden>
Date:   Wed Nov 26 19:46:02 2014 +0000

    configury: use modern LIBADD_DLOPEN over undocumented LIBADD_DL.
    
    * Makefile.am (m4_libm4_la_LIBADD): Use modern LIBADD_DLOPEN
    instead of obsolete and undocumented LIBADD_DL.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 0e0b031066a7974c19a48f87ff51fcb5c7502fce
Author: Gary V. Vaughan <address@hidden>
Date:   Wed Nov 26 16:04:45 2014 +0000

    modules: use only host system module file extension in searches.
    
    * configure.ac (SYS_SHREXT): Define to host system module file
    extension.
    * m4/module.c (suffixes), m4/path.c (FILE_SUFFIXES): Use it
    instead of listing suffixes for all supported host systems.
    Reported by Pavel Raiskup
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 Makefile.am  |    2 +-
 configure.ac |   10 ++++++----
 m4/module.c  |    2 +-
 m4/path.c    |    3 +--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 601d8eb..10a5eab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,7 +246,7 @@ m4_libm4_la_SOURCES = \
                  m4/syntax.c \
                  m4/utility.c
 m4_libm4_la_LIBADD = m4/gnu/libgnu.la \
-                 $(LTLIBINTL) $(LIBADD_DL)
+                 $(LTLIBINTL) $(LIBADD_DLOPEN)
 m4_libm4_la_DEPENDENCIES = m4/gnu/libgnu.la
 
 # This file needs to be regenerated at configure time.
diff --git a/configure.ac b/configure.ac
index 8981e10..04da7e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,6 +182,12 @@ esac
 LT_LIB_DLLOAD
 LT_SYS_SYMBOL_USCORE
 
+save_module=$module; module=yes
+mfour_shrext=`eval printf '%s' \"$shrext_cmds\"`
+module=$save_module
+AC_DEFINE_UNQUOTED([SYS_SHREXT], ["$mfour_shrext"],
+       [Define this to the system shared module file extension])
+
 if test yes = "$sys_symbol_underscore"; then
   AC_MSG_CHECKING([whether dlsym requires underscore prefixed symbols])
   AC_CACHE_VAL([mfour_cv_sys_dlsym_uscore], [dnl
@@ -196,10 +202,6 @@ int fnord () __attribute__((visibility("default")));
 #endif
 int fnord () { return 42; }]
 _M4_EOF
-    save_module=$module; module=yes
-    mfour_shrext=`eval printf '%s' \"$shrext_cmds\"`
-    module=$save_module
-
     libobjs=conftest_loadme.$ac_objext; lib=conftest_loadme$mfour_shrext
     save_module_cmds=$module_cmds; module_cmds=`eval echo $module_cmds`
     test -n "$module_cmds" || module_cmds=`eval echo $archive_cmds`
diff --git a/m4/module.c b/m4/module.c
index 022ff2e..82c87ed 100644
--- a/m4/module.c
+++ b/m4/module.c
@@ -278,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", ".dll", NULL };
+  static const char *  suffixes[]      = { "", SYS_SHREXT, NULL };
   m4_module *          module          = NULL;
 
   assert (context);
diff --git a/m4/path.c b/m4/path.c
index 44ed620..112cf68 100644
--- a/m4/path.c
+++ b/m4/path.c
@@ -45,8 +45,7 @@ static const char *FILE_SUFFIXES[] = {
   "",
   ".m4f",
   ".m4",
-  ".so",
-  ".dll",
+  SYS_SHREXT,
   NULL
 };
 


hooks/post-receive
-- 
GNU M4 source repository