aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2019-12-22 21:53:33 +0200
committerArnold D. Robbins <arnold@skeeve.com>2019-12-22 21:53:33 +0200
commit6b7b05f011d15d8b12ee497a26d6dc69cbf445ed (patch)
tree41773b2909ef42bfe049b0b37ab5c6a95598e019
parent0c31cf60d2777573de6b34f239a2c4c21bbb8bfc (diff)
downloadegawk-6b7b05f011d15d8b12ee497a26d6dc69cbf445ed.tar.gz
egawk-6b7b05f011d15d8b12ee497a26d6dc69cbf445ed.tar.bz2
egawk-6b7b05f011d15d8b12ee497a26d6dc69cbf445ed.zip
Fix for building on Windows with msys2.
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac2
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ecb56e2f..94ec9813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-22 Jannick <thirdedition@gmx.net>
+
+ * configure.ac: Hardcode the shared object extension to dll
+ on Windows platforms, i.e.whenever EXEEXT is '.exe'.
+
2019-12-22 Arnold D. Robbins <arnold@skeeve.com>
* gettext.h: Update from gettext 0.20.1.
diff --git a/configure b/configure
index 8d5d2d21..b771eff4 100755
--- a/configure
+++ b/configure
@@ -11057,11 +11057,17 @@ ac_config_headers="$ac_config_headers config.h:configh.in"
+if test "x$EXEEXT" = x.exe; then :
+ GAWKLIBEXT=dll
+else
+
case $acl_shlibext in
dylib) GAWKLIBEXT=so ;; # MacOS uses .dylib for shared libraries, but libtool uses .so for modules
*) GAWKLIBEXT=$acl_shlibext ;;
esac
+fi
+
ac_config_files="$ac_config_files Makefile support/Makefile awklib/Makefile doc/Makefile extras/Makefile po/Makefile.in test/Makefile"
diff --git a/configure.ac b/configure.ac
index f353cea3..af3432cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -458,10 +458,12 @@ 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.
+AS_VAR_IF([EXEEXT],[.exe],[GAWKLIBEXT=dll],[
case $acl_shlibext in
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