[gawk-diffs] [SCM] gawk branch, extgawk, updated. 0fff60287fb9cc41288b3373f47031ab3dd597ac

[Andrew J. Schorr]

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 "gawk".

The branch, extgawk has been updated
       via  0fff60287fb9cc41288b3373f47031ab3dd597ac (commit)
      from  502050948a347ef5c618886cec1b83357ad7ac3f (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=0fff60287fb9cc41288b3373f47031ab3dd597ac

commit 0fff60287fb9cc41288b3373f47031ab3dd597ac
Author: Andrew J. Schorr <address@hidden>
Date:   Wed Jul 25 12:48:37 2012 -0400

    Minor configure.ac/Makefile.am change for more elegant shared library 
support.

diff --git a/ChangeLog b/ChangeLog
index 4932033..5ad8cef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-25         Andrew J. Schorr     <address@hidden>
+
+       * configure.ac: Instead of using acl_shlibext for the shared library
+       extension, define our own variable GAWKLIBEXT with a hack to work
+       correctly on Mac OS X.
+       * Makefile.am (SHLIBEXT): Use the value of GAWKLIBEXT instead of
+       acl_shlibext.
+
 2012-07-24         Arnold D. Robbins     <address@hidden>
 
        * configure.ac: Add crude but small hack to make plug-ins work
diff --git a/Makefile.am b/Makefile.am
index 2568803..b73f532 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,7 +141,7 @@ pkgdatadir = $(datadir)/awk
 DEFPATH='".$(PATH_SEPARATOR)$(pkgdatadir)"'
 
 # shared library support:
-SHLIBEXT = "\"$(acl_shlibext)"\"
+SHLIBEXT = "\"$(GAWKLIBEXT)"\"
 DEFLIBPATH="\"$(pkgextensiondir)\""
 
 DEFS= -DDEFPATH=$(DEFPATH) -DDEFLIBPATH=$(DEFLIBPATH) -DSHLIBEXT=$(SHLIBEXT) 
-DHAVE_CONFIG_H -DGAWK -DLOCALEDIR='"$(datadir)/locale"'
diff --git a/Makefile.in b/Makefile.in
index 1ebc3d7..348d455 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -245,6 +245,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GAWKLIBEXT = @GAWKLIBEXT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -466,7 +467,7 @@ LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) 
@LIBREADLINE@ @LIBMPFR@
 DEFPATH = '".$(PATH_SEPARATOR)$(pkgdatadir)"'
 
 # shared library support:
-SHLIBEXT = "\"$(acl_shlibext)"\"
+SHLIBEXT = "\"$(GAWKLIBEXT)"\"
 DEFLIBPATH = "\"$(pkgextensiondir)\""
 
 # Get rid of core files when cleaning
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index 04c9d7b..3347d0b 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -170,6 +170,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GAWKLIBEXT = @GAWKLIBEXT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
diff --git a/configure b/configure
index d862f94..c45d0cd 100755
--- a/configure
+++ b/configure
@@ -629,6 +629,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 subdirs
+GAWKLIBEXT
 LIBMPFR
 LIBREADLINE
 SOCKET_LIBS
@@ -10854,9 +10855,11 @@ ac_config_headers="$ac_config_headers 
config.h:configh.in"
 
 
 case $acl_shlibext in
-dylib) acl_shlibext=so ;;      # force it
+dylib) GAWKLIBEXT=so ;;        # MacOS uses .dylib for shared libraries, but 
libtool uses .so for modules
+*) GAWKLIBEXT=$acl_shlibext ;;
 esac
 
+
 ac_config_files="$ac_config_files Makefile awklib/Makefile doc/Makefile 
po/Makefile.in test/Makefile"
 
 
diff --git a/configure.ac b/configure.ac
index a45e5c4..f3cf677 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,9 +357,13 @@ AC_CONFIG_HEADERS([config.h:configh.in])
 AH_BOTTOM([#include "custom.h"])
 
 dnl Crude but small hack to make plug-ins work on Mac OS X
+dnl We should really use the libtool value for shrext_cmds, but that
+dnl is not available here, since we do not use libtool at the top level.
 case $acl_shlibext in
-dylib) acl_shlibext=so ;;      # force it
+dylib) GAWKLIBEXT=so ;;        # MacOS uses .dylib for shared libraries, but 
libtool uses .so for modules
+*) GAWKLIBEXT=$acl_shlibext ;;
 esac
+AC_SUBST(GAWKLIBEXT)
 
 AC_CONFIG_FILES(Makefile
        awklib/Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5f8d4c6..ceee811 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -165,6 +165,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GAWKLIBEXT = @GAWKLIBEXT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
diff --git a/test/Makefile.in b/test/Makefile.in
index d12139c..4868bdc 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -130,6 +130,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GAWKLIBEXT = @GAWKLIBEXT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@

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

Summary of changes:
 ChangeLog          |    8 ++++++++
 Makefile.am        |    2 +-
 Makefile.in        |    3 ++-
 awklib/Makefile.in |    1 +
 configure          |    5 ++++-
 configure.ac       |    6 +++++-
 doc/Makefile.in    |    1 +
 test/Makefile.in   |    1 +
 8 files changed, 23 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
gawk