Skip to content

Commit

Permalink
ICU-22220 BRS73RC Regenerate configure files and fix broken links in …
Browse files Browse the repository at this point in the history
…comments
  • Loading branch information
rp9-next committed Mar 22, 2023
1 parent 49e8b99 commit 68f5ef8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions icu4c/source/aclocal.m4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-

# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -67,7 +67,7 @@ AS_VAR_POPDEF([CACHEVAR])dnl
])dnl AX_CHECK_COMPILE_FLAGS

dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
dnl serial 11 (pkg-config-0.29)
dnl serial 11 (pkg-config-0.29.1)
dnl
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
Expand Down Expand Up @@ -109,7 +109,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
[m4_define([PKG_MACROS_VERSION], [0.29])
[m4_define([PKG_MACROS_VERSION], [0.29.1])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
Expand Down Expand Up @@ -154,7 +154,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
dnl
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
dnl only at the first occurrence in configure.ac, so if the first place
dnl only at the first occurence in configure.ac, so if the first place
dnl it's called might be skipped (such as if it is within an "if", you
dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/common/unicode/udata.h
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ udata_getInfo(UDataMemory *pData, UDataInfo *pInfo);
* area in memory.
*
* ICU data must be at least 8-aligned, and should be 16-aligned.
* See https://unicode-org.github.io/icu/userguide/icudata
* See https://unicode-org.github.io/icu/userguide/icu_data
*
* The format of this data is that of the icu common data file, as is
* generated by the pkgdata tool with mode=common or mode=dll.
Expand Down Expand Up @@ -353,7 +353,7 @@ udata_setCommonData(const void *data, UErrorCode *err);
* pointer.
*
* ICU data must be at least 8-aligned, and should be 16-aligned.
* See https://unicode-org.github.io/icu/userguide/icudata
* See https://unicode-org.github.io/icu/userguide/icu_data
*
* The format of this data is that of the icu common data file, like 'icudt26l.dat'
* or the corresponding shared library (DLL) file.
Expand Down
3 changes: 2 additions & 1 deletion icu4c/source/configure
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,7 @@ Optional Packages:
library shared library (.dll/.so/etc.)
static static library (.a/.lib/etc.)
auto build shared if possible (default)
See https://unicode-org.github.io/icu/userguide/icudata for more info.
See https://unicode-org.github.io/icu/userguide/icu_data for more info.
--with-library-suffix=suffix tag a suffix to the library names default=
Some influential environment variables:
Expand Down Expand Up @@ -5334,6 +5334,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
*-*ibm-openedition*|*-*-os390*) icu_cv_host_frag=mh-os390 ;;
*-*-os400*) icu_cv_host_frag=mh-os400 ;;
*-apple-rhapsody*) icu_cv_host_frag=mh-darwin ;;
powerpc*-apple-darwin*) icu_cv_host_frag=mh-darwin-ppc ;;
*-apple-darwin*) icu_cv_host_frag=mh-darwin ;;
*-*-beos) icu_cv_host_frag=mh-beos ;;
*-*-haiku) icu_cv_host_frag=mh-haiku ;;
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ AC_ARG_WITH(data-packaging,
library shared library (.dll/.so/etc.)
static static library (.a/.lib/etc.)
auto build shared if possible (default)
See https://unicode-org.github.io/icu/userguide/icudata for more info.],
See https://unicode-org.github.io/icu/userguide/icu_data for more info.],
[case "${withval}" in
files|archive|library) datapackaging=$withval ;;
auto) datapackaging=$withval ;;
Expand Down

0 comments on commit 68f5ef8

Please sign in to comment.