diff options
| author | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-10-04 15:06:23 +0100 |
|---|---|---|
| committer | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-10-04 15:06:23 +0100 |
| commit | cf751025646d3f2113f3f33ba2da394fb8639b34 (patch) | |
| tree | d1cca3b16bd26e291733edb34d7edf07b7dc5634 /configure.ac | |
| parent | a24389812e1c4e0aaf989636942ce1c768e37347 (diff) | |
| parent | 0117428c3ea163f42f4549ff4e7f255f29f6b4d4 (diff) | |
| download | ocaml-cf751025646d3f2113f3f33ba2da394fb8639b34.tar.gz | |
Merge commit '0117428c3ea163f42f4549ff4e7f255f29f6b4d4' into 5.00
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c120746494..b02b00f61c 100644 --- a/configure.ac +++ b/configure.ac @@ -970,7 +970,7 @@ AS_IF([test x"$enable_shared" != "xno"], [*-*-cygwin*], [mksharedlib='$(FLEXLINK)' mkmaindll='$(FLEXLINK) -maindll' - shared_libraries_supported=true], + shared_libraries_supported=$with_sharedlibs], [powerpc-ibm-aix*], [AS_CASE([$ocaml_cv_cc_vendor], [xlc*], @@ -1001,7 +1001,7 @@ AS_IF([test -z "$mkmaindll"], [mkmaindll=$mksharedlib]) natdynlink=false -AS_IF([test x"$enable_shared" != "xno"], +AS_IF([test x"$shared_libraries_supported" = 'xtrue'], [AS_CASE(["$host"], [*-*-cygwin*], [natdynlink=true], [*-*-mingw32], [natdynlink=true], @@ -1630,7 +1630,7 @@ AS_CASE([$host], ## shared library support AS_IF([$shared_libraries_supported], [AS_CASE([$host], - [*-*-mingw32|*-pc-windows], + [*-*-mingw32|*-pc-windows|*-*-cygwin*], [supports_shared_libraries=$shared_libraries_supported; DLLIBS=""], [AC_CHECK_FUNC([dlopen], [supports_shared_libraries=true DLLIBS=""], |