From: Bruno Haible Date: Wed, 30 Aug 2023 12:21:46 +0000 (+0200) Subject: Recognize the *-*-windows* config triplets introduced on 2023-06-26. X-Git-Tag: v0.23~416 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=739356f1a8114b70bdbea3f4103356a096edf389;p=thirdparty%2Fgettext.git Recognize the *-*-windows* config triplets introduced on 2023-06-26. * gettext-runtime/configure.ac: Treat windows* as equivalent to mingw*. * gettext-runtime/intl/configure.ac: Likewise. * gettext-runtime/libasprintf/configure.ac: Likewise. * gettext-tools/configure.ac: Likewise. * gettext-tools/m4/locale-de.m4 (gt_LOCALE_DE_UTF8): Likewise. * libtextstyle/configure.ac: Likewise. * m4/woe32-dll.m4 (gl_WOE32_DLL): Likewise. --- diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 126d0690f..e88a231f2 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -85,10 +85,10 @@ dnl Prepares the libtool configuration for handling of Windows resources, and dnl sets the RC variable to a program that compiles Windows resource files. LT_LANG([Windows Resource]) -dnl On mingw and Cygwin, we can activate special Makefile rules which add -dnl version information to the shared libraries and executables. +dnl On native Windows and Cygwin, we can activate special Makefile rules which +dnl add version information to the shared libraries and executables. case "$host_os" in - mingw* | cygwin*) is_woe32=yes ;; + mingw* | windows* | cygwin*) is_woe32=yes ;; *) is_woe32=no ;; esac AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) @@ -99,7 +99,7 @@ fi dnl Some code is only meant to be compiled on native Windows. case "$host_os" in - mingw*) is_windows_native=yes ;; + mingw* | windows*) is_windows_native=yes ;; *) is_windows_native=no ;; esac AM_CONDITIONAL([WINDOWS_NATIVE], [test $is_windows_native = yes]) @@ -115,7 +115,8 @@ gl_INIT AC_TYPE_SIZE_T AC_CHECK_FUNCS([setlocale]) -dnl Compilation on mingw and Cygwin needs special Makefile rules, because +dnl Compilation on native Windows and Cygwin needs special Makefile rules, +dnl because dnl 1. when we install a shared library, we must arrange to export dnl auxiliary pointer variables for every exported variable, dnl 2. when we install a shared library and a static library simultaneously, @@ -124,7 +125,7 @@ dnl must arrange to define the auxiliary pointer variables for the dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then case "$host_os" in - mingw* | cygwin*) is_woe32dll=yes ;; + mingw* | windows* | cygwin*) is_woe32dll=yes ;; *) is_woe32dll=no ;; esac else @@ -133,7 +134,7 @@ fi AM_CONDITIONAL([WOE32DLL], [test $is_woe32dll = yes]) if test $is_woe32dll = yes; then AC_DEFINE([WOE32DLL], [1], - [Define when --enable-shared is used on mingw or Cygwin.]) + [Define when --enable-shared is used on Windows.]) fi dnl Put some default definitions into config.h. diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac index 9c3c515a4..2a31e3475 100644 --- a/gettext-runtime/intl/configure.ac +++ b/gettext-runtime/intl/configure.ac @@ -61,10 +61,10 @@ dnl Prepares the libtool configuration for handling of Windows resources, and dnl sets the RC variable to a program that compiles Windows resource files. LT_LANG([Windows Resource]) -dnl On mingw and Cygwin, we can activate special Makefile rules which add -dnl version information to the shared libraries and executables. +dnl On native Windows and Cygwin, we can activate special Makefile rules which +dnl add version information to the shared libraries and executables. case "$host_os" in - mingw* | cygwin*) is_woe32=yes ;; + mingw* | windows* | cygwin*) is_woe32=yes ;; *) is_woe32=no ;; esac AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) @@ -75,7 +75,7 @@ fi dnl Some code is only meant to be compiled on native Windows. case "$host_os" in - mingw*) is_windows_native=yes ;; + mingw* | windows*) is_windows_native=yes ;; *) is_windows_native=no ;; esac AM_CONDITIONAL([WINDOWS_NATIVE], [test $is_windows_native = yes]) @@ -213,7 +213,8 @@ else fi AC_SUBST([ENHANCE_LOCALE_FUNCS]) -dnl Compilation on mingw and Cygwin needs special Makefile rules, because +dnl Compilation on native Windows and Cygwin needs special Makefile rules, +dnl because dnl 1. when we install a shared library, we must arrange to export dnl auxiliary pointer variables for every exported variable, dnl 2. when we install a shared library and a static library simultaneously, @@ -222,7 +223,7 @@ dnl must arrange to define the auxiliary pointer variables for the dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then case "$host_os" in - mingw* | cygwin*) is_woe32dll=yes ;; + mingw* | windows* | cygwin*) is_woe32dll=yes ;; *) is_woe32dll=no ;; esac else @@ -233,7 +234,7 @@ AC_SUBST([WOE32DLL]) AM_CONDITIONAL([WOE32DLL], [test $is_woe32dll = yes]) if test $is_woe32dll = yes; then AC_DEFINE([WOE32DLL], [1], - [Define when --enable-shared is used on mingw or Cygwin.]) + [Define when --enable-shared is used on Windows.]) fi dnl Put some default definitions into config.h. diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac index af02d7eaf..b250ae5dd 100644 --- a/gettext-runtime/libasprintf/configure.ac +++ b/gettext-runtime/libasprintf/configure.ac @@ -53,10 +53,10 @@ dnl Prepares the libtool configuration for handling of Windows resources, and dnl sets the RC variable to a program that compiles Windows resource files. LT_LANG([Windows Resource]) -dnl On mingw and Cygwin, we can activate special Makefile rules which add -dnl version information to the shared libraries and executables. +dnl On native Windows and Cygwin, we can activate special Makefile rules which +dnl add version information to the shared libraries and executables. case "$host_os" in - mingw* | cygwin*) is_woe32=yes ;; + mingw* | windows* | cygwin*) is_woe32=yes ;; *) is_woe32=no ;; esac AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) @@ -64,7 +64,7 @@ AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) case "$host_os" in # On Cygwin, without -no-undefined, a warning is emitted and only a static # library is built. - beos* | mingw* | cygwin* | os2*) LTNOUNDEF='-no-undefined' ;; + beos* | mingw* | windows* | cygwin* | os2*) LTNOUNDEF='-no-undefined' ;; *) LTNOUNDEF='' ;; esac AC_SUBST([LTNOUNDEF]) diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index a6b618443..e4c9783eb 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -103,10 +103,10 @@ dnl Prepares the libtool configuration for handling of Windows resources, and dnl sets the RC variable to a program that compiles Windows resource files. LT_LANG([Windows Resource]) -dnl On mingw and Cygwin, we can activate special Makefile rules which add -dnl version information to the shared libraries and executables. +dnl On native Windows and Cygwin, we can activate special Makefile rules which +dnl add version information to the shared libraries and executables. case "$host_os" in - mingw* | cygwin*) is_woe32=yes ;; + mingw* | windows* | cygwin*) is_woe32=yes ;; *) is_woe32=no ;; esac AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) @@ -124,7 +124,7 @@ AM_CONDITIONAL([OS2], [test $special_makefile_rules = os2]) dnl Some code is only meant to be compiled on native Windows. case "$host_os" in - mingw*) is_windows_native=yes ;; + mingw* | windows*) is_windows_native=yes ;; *) is_windows_native=no ;; esac AM_CONDITIONAL([WINDOWS_NATIVE], [test $is_windows_native = yes]) @@ -257,13 +257,14 @@ gt_PREREQ_HOSTNAME dnl Parameterization of the 'libxml' module: dnl When INCLUDED_LIBXML is true and building static libraries, tell -dnl libxml's xmlexports.h to omit '__declspec(dllimport)' on mingw and Cygwin. +dnl libxml's xmlexports.h to omit '__declspec(dllimport)' on Windows. if test "$gl_cv_libxml_use_included" = yes && test "$enable_shared" != yes; then AC_DEFINE([LIBXML_STATIC], [1], [Define if libxml is being used as a static library.]) fi -dnl Compilation on mingw and Cygwin needs special Makefile rules, because +dnl Compilation on native Windows and Cygwin needs special Makefile rules, +dnl because dnl 1. when we install a shared library, we must arrange to export dnl auxiliary pointer variables for every exported variable, dnl 2. when we install a shared library and a static library simultaneously, @@ -272,7 +273,7 @@ dnl must arrange to define the auxiliary pointer variables for the dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then case "$host_os" in - mingw* | cygwin*) is_woe32dll=yes ;; + mingw* | windows* | cygwin*) is_woe32dll=yes ;; *) is_woe32dll=no ;; esac else @@ -281,7 +282,7 @@ fi AM_CONDITIONAL([WOE32DLL], [test $is_woe32dll = yes]) if test $is_woe32dll = yes; then AC_DEFINE([WOE32DLL], [1], - [Define when --enable-shared is used on mingw or Cygwin.]) + [Define when --enable-shared is used on Windows.]) fi GETTEXTLIB_EXPORTS_FLAGS= diff --git a/gettext-tools/m4/locale-de.m4 b/gettext-tools/m4/locale-de.m4 index b5ab877cf..86e4e15d6 100644 --- a/gettext-tools/m4/locale-de.m4 +++ b/gettext-tools/m4/locale-de.m4 @@ -1,4 +1,4 @@ -# locale-de.m4 serial 3 +# locale-de.m4 serial 4 dnl Copyright (C) 2003-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -92,7 +92,7 @@ int main () { # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. - mingw*) + mingw* | windows*) # Test for the hypothetical native Windows locale name. if (LC_ALL=German_Germany.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_de_utf8=German_Germany.65001 diff --git a/libtextstyle/configure.ac b/libtextstyle/configure.ac index 55b9ef8f7..651357bb3 100644 --- a/libtextstyle/configure.ac +++ b/libtextstyle/configure.ac @@ -61,10 +61,10 @@ dnl Prepares the libtool configuration for handling of Windows resources, and dnl sets the RC variable to a program that compiles Windows resource files. LT_LANG([Windows Resource]) -dnl On mingw and Cygwin, we can activate special Makefile rules which add -dnl version information to the shared libraries and executables. +dnl On native Windows and Cygwin, we can activate special Makefile rules which +dnl add version information to the shared libraries and executables. case "$host_os" in - mingw* | cygwin*) is_woe32=yes ;; + mingw* | windows* | cygwin*) is_woe32=yes ;; *) is_woe32=no ;; esac AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) @@ -78,7 +78,8 @@ dnl adhoc-tests want to get this declaration from , not . GL_LTS_GNULIB_ISATTY=0 GL_LTS_GNULIB_MDA_ISATTY=0 -dnl Compilation on mingw and Cygwin needs special Makefile rules, because +dnl Compilation on native Windows and Cygwin needs special Makefile rules, +dnl because dnl 1. when we install a shared library, we must arrange to export dnl auxiliary pointer variables for every exported variable, dnl 2. when we install a shared library and a static library simultaneously, @@ -87,7 +88,7 @@ dnl must arrange to define the auxiliary pointer variables for the dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then case "$host_os" in - mingw* | cygwin*) is_woe32dll=yes ;; + mingw* | windows* | cygwin*) is_woe32dll=yes ;; *) is_woe32dll=no ;; esac else diff --git a/m4/woe32-dll.m4 b/m4/woe32-dll.m4 index 8a14c2cd7..aab03d1b7 100644 --- a/m4/woe32-dll.m4 +++ b/m4/woe32-dll.m4 @@ -1,5 +1,5 @@ -# woe32-dll.m4 serial 6 -dnl Copyright (C) 2005-2006, 2011, 2018, 2020 Free Software Foundation, Inc. +# woe32-dll.m4 serial 7 +dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL], [ AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw* | cygwin*) + mingw* | windows* | cygwin*) AC_CACHE_CHECK([for auto-import of symbols], [gl_cv_ld_autoimport], [dnl --disable-auto-import is unsupported in MSVC and in MSVC/clang.