Mercurial > mxe-octave

comparison configure.ac @ 5961:7c0066684448

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for building with UCRT on Windows. * configure.ac: Add new configure switch "--with-windows-msvcrt". It can be set to "msvcrt" (default) or "ucrt". * Makefile.in: Make configure result of new switch available in makefile rules. * src/mingw-w64.mk, src/build-gcc.mk: Select CRT when installing system headers and when compiling system runtime. See also: https://octave.discourse.group/t/1821
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 18 Nov 2021 14:49:26 +0100
parents 78a98ff1efd8
children 92633c7288cd
comparison
equal deleted inserted replaced
5960:49b3f6c6d255 5961:7c0066684448
97 yes) USE_MSYS2=yes ;; 97 yes) USE_MSYS2=yes ;;
98 *) AC_MSG_ERROR([bad value "$enableval" for --with-msys2]) ;; 98 *) AC_MSG_ERROR([bad value "$enableval" for --with-msys2]) ;;
99 esac], [USE_MSYS2=yes]) 99 esac], [USE_MSYS2=yes])
100 AC_SUBST(USE_MSYS2) 100 AC_SUBST(USE_MSYS2)
101 101
102 # Use "msvcrt" or "ucrt" on Windows
103 AC_ARG_WITH([windows-msvcrt],
104 [AS_HELP_STRING([--with-windows-msvcrt=msvcrt], [select C runtime for windows distribution (default: msvcrt)])],
105 [case $withval in
106 no) AC_MSG_ERROR([A runtime for Windows is required for --with-windows-msvcrt]) ;;
107 yes | "") HOST_MSVCRT=msvcrt ;;
108 *) HOST_MSVCRT="$withval" ;;
109 esac], [HOST_MSVCRT=msvcrt])
110 AC_SUBST(HOST_MSVCRT)
111
102 # try find pkg-config build paths 112 # try find pkg-config build paths
103 BUILD_PKG_CONFIG_PATH=auto 113 BUILD_PKG_CONFIG_PATH=auto
104 AC_ARG_WITH([build-pkg-config-path], 114 AC_ARG_WITH([build-pkg-config-path],
105 [AS_HELP_STRING([--with-build-pkg-config-path=PATH], 115 [AS_HELP_STRING([--with-build-pkg-config-path=PATH],
106 [use PATH as the build pkg-config path (default: auto)])], 116 [use PATH as the build pkg-config path (default: auto)])],
128 no) ENABLE_WINDOWS_64=no ;; 138 no) ENABLE_WINDOWS_64=no ;;
129 yes) ENABLE_WINDOWS_64=yes ;; 139 yes) ENABLE_WINDOWS_64=yes ;;
130 *) AC_MSG_ERROR([bad value "$enableval" for --enable-windows-64]) ;; 140 *) AC_MSG_ERROR([bad value "$enableval" for --enable-windows-64]) ;;
131 esac], [ENABLE_WINDOWS_64=yes]) 141 esac], [ENABLE_WINDOWS_64=yes])
132 142
143 if test "$ENABLE_WINDOWS_64" = "no" && test "$HOST_MSVCRT" = "ucrt"; then
144 AC_MSG_NOTICE([UCRT is only supported with --enable-windows-64])
145 fi
146
133 AC_ARG_ENABLE([64], 147 AC_ARG_ENABLE([64],
134 [AS_HELP_STRING([--enable-64], 148 [AS_HELP_STRING([--enable-64],
135 [use 64-bit integers for array dimensions and indexing])], 149 [use 64-bit integers for array dimensions and indexing])],
136 [case $enableval in 150 [case $enableval in
137 no) ENABLE_64=no ;; 151 no) ENABLE_64=no ;;