Merge branch 'release/debian/1.2-1'HEADdebian/1.2-1master

1 files changed, 8 insertions, 15 deletions

diff --git a/autogen.sh b/autogen.sh
index 3e89ebe4..5a8d43aa 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-2024 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
@@ -80,6 +80,7 @@ if test $skip_gnulib = false; then
     exit 1
   }
   GNULIB_MODULES='
+    gitlog-to-changelog
     unitypes
     unistr/base
     unistr/u8-check
@@ -96,6 +97,7 @@ if test $skip_gnulib = false; then
     unistr/u8-mbtouc-unsafe
     unistr/u8-move
     unistr/u8-next
+    unistr/u8-pcpy
     unistr/u8-prev
     unistr/u8-set
     unistr/u8-startswith
@@ -137,6 +139,7 @@ if test $skip_gnulib = false; then
     unistr/u16-mbtouc-unsafe
     unistr/u16-move
     unistr/u16-next
+    unistr/u16-pcpy
     unistr/u16-prev
     unistr/u16-set
     unistr/u16-startswith
@@ -178,6 +181,7 @@ if test $skip_gnulib = false; then
     unistr/u32-mbtouc-unsafe
     unistr/u32-move
     unistr/u32-next
+    unistr/u32-pcpy
     unistr/u32-prev
     unistr/u32-set
     unistr/u32-startswith
@@ -304,6 +308,7 @@ if test $skip_gnulib = false; then
     unictype/ctype-xdigit
     unictype/decimal-digit
     unictype/digit
+    unictype/incb-all
     unictype/joininggroup-all
     unictype/joiningtype-all
     unictype/mirror
@@ -351,6 +356,8 @@ if test $skip_gnulib = false; then
     unilbrk/u32-width-linebreaks
     unilbrk/ulc-possible-linebreaks
     unilbrk/ulc-width-linebreaks
+    unimetadata/base
+    unimetadata/u-version
     uninorm/base
     uninorm/canonical-decomposition
     uninorm/composition
@@ -448,20 +455,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