diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2012-07-25 12:48:37 -0400 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2012-07-25 12:48:37 -0400 |
| commit | 0fff60287fb9cc41288b3373f47031ab3dd597ac (patch) | |
| tree | 91357fd5a4312af8ba6de29c4f60d7063f3ae0ca | |
| parent | 502050948a347ef5c618886cec1b83357ad7ac3f (diff) | |
| download | egawk-0fff60287fb9cc41288b3373f47031ab3dd597ac.tar.gz egawk-0fff60287fb9cc41288b3373f47031ab3dd597ac.tar.bz2 egawk-0fff60287fb9cc41288b3373f47031ab3dd597ac.zip | |
Minor configure.ac/Makefile.am change for more elegant shared library support.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | awklib/Makefile.in | 1 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/Makefile.in | 1 | ||||
| -rw-r--r-- | test/Makefile.in | 1 |
8 files changed, 23 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2012-07-25 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * 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 <arnold@skeeve.com> * configure.ac: Add crude but small hack to make plug-ins work diff --git a/Makefile.am b/Makefile.am index 25688033..b73f532f 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 1ebc3d7e..348d455b 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 04c9d7b2..3347d0b7 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@ @@ -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 a45e5c4e..f3cf6777 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 5f8d4c68..ceee811c 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 d12139cf..4868bdc6 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@ |