From cb3f069d8ff95b0100c8618d7098ba6525ed0a38 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 23 Apr 2023 13:50:48 +0200 Subject: Update after gnulib changed. * autogen.sh: Don't add LIBUNISTRING_DLL_VARIABLE to lib/unictype.h, lib/uninorm.h, lib/unicase.h. This is now already done in Gnulib. * gnulib-local/lib/unicase.in.h.diff: Remove include of , now already done by gnulib. * gnulib-local/lib/unictype.in.h.diff: Likewise. * gnulib-local/lib/uninorm.in.h.diff: Likewise. * configure.ac (gl_IN_LIBUNISTRING): New macro. --- .gitignore | 18 +++++++++++++++++- autogen.sh | 16 +--------------- configure.ac | 5 ++++- gnulib-local/lib/unicase.in.h.diff | 13 ++----------- gnulib-local/lib/unictype.in.h.diff | 9 ++------- gnulib-local/lib/uninorm.in.h.diff | 5 +---- gnulib-m4/gnulib-cache.m4 | 2 +- 7 files changed, 28 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 2e34926..f809d38 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ /gnulib-m4/environ.m4 /gnulib-m4/errno_h.m4 /gnulib-m4/error.m4 +/gnulib-m4/error_h.m4 /gnulib-m4/exponentd.m4 /gnulib-m4/exponentf.m4 /gnulib-m4/exponentl.m4 @@ -184,7 +185,11 @@ /gnulib-m4/sys_uio_h.m4 /gnulib-m4/thread.m4 /gnulib-m4/threadlib.m4 +/gnulib-m4/time.m4 /gnulib-m4/time_h.m4 +/gnulib-m4/unicase_h.m4 +/gnulib-m4/unictype_h.m4 +/gnulib-m4/uninorm_h.m4 /gnulib-m4/unistd_h.m4 /gnulib-m4/usleep.m4 /gnulib-m4/vasnprintf.m4 @@ -347,6 +352,8 @@ /lib/verify.h /lib/warn-on-use.h /lib/wchar.in.h +/lib/wcs-two-way.h +/lib/wcsstr-impl.h /lib/wctype-h.c /lib/wctype.in.h /lib/wcwidth.c @@ -1167,7 +1174,7 @@ /tests/dirname.h /tests/dup2.c /tests/error.c -/tests/error.h +/tests/error.in.h /tests/exitfail.c /tests/exitfail.h /tests/fcntl.c @@ -1269,6 +1276,7 @@ /tests/sys_time.in.h /tests/sys_uio.in.h /tests/test-accept.c +/tests/test-alignasof.c /tests/test-alloca-opt.c /tests/test-arpa_inet.c /tests/test-array-mergesort.c @@ -1278,6 +1286,7 @@ /tests/test-btowc.c /tests/test-btowc1.sh /tests/test-btowc2.sh +/tests/test-btowc3.sh /tests/test-c-ctype.c /tests/test-c-strcase.sh /tests/test-c-strcasecmp.c @@ -1290,6 +1299,8 @@ /tests/test-dup2.c /tests/test-environ.c /tests/test-errno.c +/tests/test-error.c +/tests/test-error.sh /tests/test-fcntl-h.c /tests/test-fcntl.c /tests/test-fdopen.c @@ -1332,6 +1343,7 @@ /tests/test-iswxdigit.c /tests/test-iswxdigit.sh /tests/test-langinfo.c +/tests/test-largefile.c /tests/test-limits-h.c /tests/test-listen.c /tests/test-localcharset.c @@ -1431,6 +1443,7 @@ /tests/test-sys_wait.h /tests/test-thread_create.c /tests/test-thread_self.c +/tests/test-time-h.c /tests/test-time.c /tests/test-unistd.c /tests/test-unsetenv.c @@ -1453,6 +1466,7 @@ /tests/test-wcwidth.c /tests/test-xalloc-die.c /tests/test-xalloc-die.sh +/tests/time.c /tests/time.in.h /tests/unsetenv.c /tests/unused-parameter.h @@ -3352,6 +3366,8 @@ core /lib/unistring/iconveh.h-t /tests/ctype.h /tests/ctype.h-t +/tests/error.h +/tests/error.h-t /tests/fcntl.h /tests/fcntl.h-t /tests/pthread.h diff --git a/autogen.sh b/autogen.sh index 3e89ebe..5cce072 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,7 +8,7 @@ # It also requires # - the gperf program. -# Copyright (C) 2003-2022 Free Software Foundation, Inc. +# Copyright (C) 2003-2023 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -448,20 +448,6 @@ if test $skip_gnulib = false; then < lib/unistr.in.h \ > lib/unistr.in.h.tmp \ && mv lib/unistr.in.h.tmp lib/unistr.in.h - # Change lib/unictype.h, lib/uninorm.h, lib/unicase.h for shared libraries on Woe32 systems. - sed -e 's/extern const uc_general_category_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_/' \ - -e 's/extern const uc_property_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_/' \ - < lib/unictype.in.h \ - > lib/unictype.in.h.tmp \ - && mv lib/unictype.in.h.tmp lib/unictype.in.h - sed -e 's/extern const struct unicode_normalization_form /extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form /' \ - < lib/uninorm.in.h \ - > lib/uninorm.in.h.tmp \ - && mv lib/uninorm.in.h.tmp lib/uninorm.in.h - sed -e 's/extern const casing_/extern LIBUNISTRING_DLL_VARIABLE const casing_/' \ - < lib/unicase.in.h \ - > lib/unicase.in.h.tmp \ - && mv lib/unicase.in.h.tmp lib/unicase.in.h $GNULIB_TOOL --copy-file build-aux/ar-lib; chmod a+x build-aux/ar-lib $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess $GNULIB_TOOL --copy-file build-aux/config.sub; chmod a+x build-aux/config.sub diff --git a/configure.ac b/configure.ac index 7a5a1ca..1fa3934 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 diff --git a/gnulib-local/lib/unicase.in.h.diff b/gnulib-local/lib/unicase.in.h.diff index 7a5eeeb..f96a1df 100644 --- a/gnulib-local/lib/unicase.in.h.diff +++ b/gnulib-local/lib/unicase.in.h.diff @@ -1,10 +1,7 @@ *** unicase.in.h.orig 2023-04-21 12:07:22.606233082 +0200 --- unicase.in.h 2023-04-21 12:09:26.709004578 +0200 *************** -*** 25,34 **** - #ifndef _UNICASE_H - #define _UNICASE_H - +*** 28,34 **** #include "unitypes.h" /* Get bool. */ @@ -12,13 +9,7 @@ /* Get size_t. */ #include ---- 25,37 ---- - #ifndef _UNICASE_H - #define _UNICASE_H - -+ /* Get LIBUNISTRING_DLL_VARIABLE. */ -+ #include -+ +--- 28,34 ---- #include "unitypes.h" /* Get bool. */ diff --git a/gnulib-local/lib/unictype.in.h.diff b/gnulib-local/lib/unictype.in.h.diff index cb68885..9a64591 100644 --- a/gnulib-local/lib/unictype.in.h.diff +++ b/gnulib-local/lib/unictype.in.h.diff @@ -1,8 +1,7 @@ *** unictype.in.h.orig 2009-04-05 12:15:57.000000000 +0200 --- unictype.in.h 2009-04-12 04:31:36.000000000 +0200 *************** -*** 19,26 **** - +*** 20,26 **** #include "unitypes.h" /* Get bool. */ @@ -10,13 +9,9 @@ /* Get size_t. */ #include ---- 19,29 ---- - +--- 20,26 ---- #include "unitypes.h" -+ /* Get LIBUNISTRING_DLL_VARIABLE. */ -+ #include -+ /* Get bool. */ ! #include diff --git a/gnulib-local/lib/uninorm.in.h.diff b/gnulib-local/lib/uninorm.in.h.diff index f7e4ebb..0ae1eb0 100644 --- a/gnulib-local/lib/uninorm.in.h.diff +++ b/gnulib-local/lib/uninorm.in.h.diff @@ -2,15 +2,12 @@ --- uninorm.in.h 2021-08-08 02:17:17.145608518 +0200 *************** *** 18,23 **** ---- 18,29 ---- +--- 18,26 ---- #ifndef _UNINORM_H #define _UNINORM_H + /* Get common macros for C. */ + #include -+ -+ /* Get LIBUNISTRING_DLL_VARIABLE. */ -+ #include + /* Get size_t. */ #include diff --git a/gnulib-m4/gnulib-cache.m4 b/gnulib-m4/gnulib-cache.m4 index a28477a..8b68e8a 100644 --- a/gnulib-m4/gnulib-cache.m4 +++ b/gnulib-m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2022 Free Software Foundation, Inc. +# Copyright (C) 2002-2023 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.1