From 00893e79fc62966067af1a106567db96bd170338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 3 Mar 2024 19:11:32 +0100 Subject: New upstream version 1.2 --- configure.ac | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7a5a1cac..4fa740b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the toplevel directory of GNU libunistring -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -28,6 +28,9 @@ AC_CONFIG_HEADERS([config.h]) dnl Override automake's tar command used for creating distributions. am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"' +dnl An indicator macro that declares that we're in libunistring. +AC_DEFUN([gl_IN_LIBUNISTRING], []) + dnl Checks for basic programs. AC_PROG_CC @@ -58,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]) @@ -70,7 +73,8 @@ dnl Checks for types, header files, functions and declarations. gl_INIT -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, @@ -79,7 +83,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 @@ -99,7 +103,7 @@ dnl global or static variable. dnl gcc would say: "error: initializer element is not constant". 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 Namespacing is the default: it builds a namespace clean library. -- cgit v1.2.3