summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/configure6
-rwxr-xr-xBuild/source/libs/configure6
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-setup.m46
-rwxr-xr-xBuild/source/texk/configure6
-rwxr-xr-xBuild/source/utils/configure6
6 files changed, 20 insertions, 15 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 8933e26408b..c805f8f194c 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -4048,10 +4048,10 @@ case $enable_libtool_hack in #(
esac
ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;;
esac
-case $enable_shared in #(
- no) :
+case $enable_shared:$host_os in #(
+ no:* | yes:mingw* | yes:cygwin*) :
: ;; #(
- yes ) :
+ yes:* ) :
if test "x$enable_native_texlive_build" = xyes; then :
as_fn_error $? "you can not use a shared Kpathsea library for a native TeX Live build" "$LINENO" 5
fi ;; #(
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index ea34b136a47..b1272113389 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -3246,10 +3246,10 @@ case $enable_libtool_hack in #(
esac
ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;;
esac
-case $enable_shared in #(
- no) :
+case $enable_shared:$host_os in #(
+ no:* | yes:mingw* | yes:cygwin*) :
: ;; #(
- yes ) :
+ yes:* ) :
if test "x$enable_native_texlive_build" = xyes; then :
as_fn_error $? "you can not use a shared Kpathsea library for a native TeX Live build" "$LINENO" 5
fi ;; #(
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 0dea449af99..028e4931ce2 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-setup.m4: Allow shared libraries (DLLs) in native TeXLive
+ builds for Cygwin and MinGW.
+
2015-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-warnings.m4: Warning flags for gcc 5.x.
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 145ca0f4aca..a47abb34bca 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -53,9 +53,9 @@ AS_CASE([$enable_libtool_hack],
[enable_libtool_hack=no],
[enable_libtool_hack=yes])
ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'"])
-AS_CASE([$enable_shared],
- [no], [:],
- [yes ], [AS_IF([test "x$enable_native_texlive_build" = xyes],
+AS_CASE([$enable_shared:$host_os],
+ [no:* | yes:mingw* | yes:cygwin*], [:],
+ [yes:* ], [AS_IF([test "x$enable_native_texlive_build" = xyes],
[AC_MSG_ERROR([you can not use a shared Kpathsea library for a native TeX Live build])])],
[enable_shared=no
ac_configure_args="$ac_configure_args '--disable-shared'"])
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 1091dddd254..1bc08b4c435 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3256,10 +3256,10 @@ case $enable_libtool_hack in #(
esac
ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;;
esac
-case $enable_shared in #(
- no) :
+case $enable_shared:$host_os in #(
+ no:* | yes:mingw* | yes:cygwin*) :
: ;; #(
- yes ) :
+ yes:* ) :
if test "x$enable_native_texlive_build" = xyes; then :
as_fn_error $? "you can not use a shared Kpathsea library for a native TeX Live build" "$LINENO" 5
fi ;; #(
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 8f10a917474..f7297afc9df 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -3238,10 +3238,10 @@ case $enable_libtool_hack in #(
esac
ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;;
esac
-case $enable_shared in #(
- no) :
+case $enable_shared:$host_os in #(
+ no:* | yes:mingw* | yes:cygwin*) :
: ;; #(
- yes ) :
+ yes:* ) :
if test "x$enable_native_texlive_build" = xyes; then :
as_fn_error $? "you can not use a shared Kpathsea library for a native TeX Live build" "$LINENO" 5
fi ;; #(