Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Commit 4afb5d7

Browse files
committed
[Build] Always assume net_4_6 is available at build time on Windows.
1 parent addd03d commit 4afb5d7

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

configure.in.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,16 @@ PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true
111111
if test "x$has_mono" = "xfalse" ; then
112112
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono-2 >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
113113
if "x$has_mono" = "xtrue" ; then
114-
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono < $MONO_NET_4_6, missing_net_4_6=true, missing_net_4_6=false)
114+
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono-2 < $MONO_NET_4_6, missing_net_4_6=true, missing_net_4_6=false)
115115
fi
116116
else
117117
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono < $MONO_NET_4_6, missing_net_4_6=true, missing_net_4_6=false)
118118
fi
119119

120+
if text "x$platform_win32" = "xyes"; then
121+
missing_net_4_6=false
122+
fi
123+
120124
AC_PATH_PROG(GACUTIL, gacutil, no)
121125
if test "x$GACUTIL" = "xno" ; then
122126
AC_MSG_ERROR([No gacutil tool found. You need to install either the mono or .Net SDK.])
@@ -230,7 +234,7 @@ AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue")
230234

231235
CSFLAGS="$DEBUG_FLAGS $CSDEFINES $WIN64DEFINES -unsafe"
232236

233-
if text "x$missing_net_4_6" = "xno" ; then
237+
if text "x$missing_net_4_6" = "xfalse" ; then
234238
CSFLAGS="$CSFLAGS -define:HAVE_NET_4_6"
235239
fi
236240
PKG_CHECK_MODULES(GLIB_2_31,

0 commit comments

Comments
 (0)