Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ICU-22952 Make configure --help show --enable-* / --disable-* consistently #3254

Merged
merged 2 commits into from
Oct 24, 2024
Merged

ICU-22952 Make configure --help show --enable-* / --disable-* consistently #3254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f8dc7
ICU-22952 Make configure --help show --enable-* / --disable-* consist…
roubert Oct 24, 2024
f971e8c
ICU-22952 Update configure files from configure.ac using autoreconf.
roubert Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion icu4c/source/acinclude.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
AC_DEFUN([AC_CHECK_STRICT_COMPILE],
[
AC_MSG_CHECKING([whether strict compiling is on])
AC_ARG_ENABLE(strict,[ --enable-strict compile with strict compiler options [default=yes]], [
AC_ARG_ENABLE(strict,[ --disable-strict do not compile with strict compiler options], [
if test "$enableval" = no
then
ac_use_strict_options=no
Expand Down
40 changes: 20 additions & 20 deletions icu4c/source/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,30 +1461,30 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-icu-config install icu-config
--enable-debug build debug libraries and enable the U_DEBUG define default=no
--enable-release build release libraries default=yes
--enable-strict compile with strict compiler options default=yes
--disable-icu-config do not install icu-config
--enable-debug build debug libraries and enable the U_DEBUG define
--disable-release do not build release libraries
--disable-strict do not compile with strict compiler options
--enable-64bit-libs (deprecated, use --with-library-bits) build 64-bit libraries default= platform default
--enable-shared build shared libraries default=yes
--enable-static build static libraries default=no
--enable-auto-cleanup enable auto cleanup of libraries default=no
--enable-draft enable draft APIs (and internal APIs) default=yes
--enable-renaming add a version suffix to symbols default=yes
--enable-tracing enable function and data tracing default=no
--enable-plugins enable plugins default=no
--disable-dyload disable dynamic loading default=no
--disable-shared do not build shared libraries
--enable-static build static libraries
--enable-auto-cleanup enable auto cleanup of libraries
--disable-draft do not enable draft APIs (and internal APIs)
--disable-renaming do not add a version suffix to symbols
--enable-tracing enable function and data tracing
--enable-plugins enable plugins
--disable-dyload disable dynamic loading
--enable-rpath use rpath when linking default is only if necessary
--enable-weak-threads weakly reference the threading library default=no
--enable-extras build ICU extras default=yes
--enable-icuio build ICU's icuio library default=yes
--enable-layoutex build ICU's Paragraph Layout library default=no.
--enable-weak-threads weakly reference the threading library
--disable-extras do not build ICU extras
--disable-icuio do not build ICU's icuio library
--enable-layoutex build ICU's Paragraph Layout library.
icu-le-hb must be installed via pkg-config. See http://harfbuzz.org

--enable-tools build ICU's tools default=yes
--enable-fuzzer build ICU's fuzzer test targets default=no
--enable-tests build ICU tests default=yes
--enable-samples build ICU samples default=yes
--disable-tools do not build ICU's tools
--enable-fuzzer build ICU's fuzzer test targets
--disable-tests do not build ICU tests
--disable-samples do not build ICU samples

Additionally, the variable FORCE_LIBS may be set before calling configure.
If set, it will REPLACE any automatic list of libraries.
Expand Down
38 changes: 19 additions & 19 deletions icu4c/source/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ UCONFIG_CFLAGS=""

# Check whether to install icu-config
AC_ARG_ENABLE([icu-config],
AS_HELP_STRING([--enable-icu-config], [install icu-config]),
AS_HELP_STRING([--disable-icu-config], [do not install icu-config]),
[case "${enableval}" in
yes) enable_icu_config=true ;;
no) enable_icu_config=false ;;
Expand All @@ -102,7 +102,7 @@ AC_MSG_CHECKING([whether to build debug libraries])
enabled=no
ENABLE_DEBUG=0
AC_ARG_ENABLE(debug,
[ --enable-debug build debug libraries and enable the U_DEBUG define [default=no]],
[ --enable-debug build debug libraries and enable the U_DEBUG define],
[ case "${enableval}" in
yes|"") enabled=yes; ENABLE_DEBUG=1; CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_DEBUG=1" ;;
*) ;;
Expand All @@ -116,7 +116,7 @@ AC_MSG_CHECKING([whether to build release libraries])
enabled=yes
ENABLE_RELEASE=1
AC_ARG_ENABLE(release,
[ --enable-release build release libraries [default=yes]],
[ --disable-release do not build release libraries],
[ case "${enableval}" in
no) enabled=no; ENABLE_RELEASE=0 ;;
*) ;;
Expand Down Expand Up @@ -270,7 +270,7 @@ AC_SUBST(LIB_M)
AC_MSG_CHECKING([whether to build shared libraries])
enabled=no
AC_ARG_ENABLE(shared,
[ --enable-shared build shared libraries [default=yes]],
[ --disable-shared do not build shared libraries],
[ case "${enableval}" in
yes|"") enabled=yes; ENABLE_SHARED=YES ;;
no);;
Expand All @@ -285,7 +285,7 @@ AC_SUBST(ENABLE_SHARED)
AC_MSG_CHECKING([whether to build static libraries])
enabled=no
AC_ARG_ENABLE(static,
[ --enable-static build static libraries [default=no]],
[ --enable-static build static libraries],
[ case "${enableval}" in
yes|"") enabled=yes; ENABLE_STATIC=YES ;;
no) ;;
Expand Down Expand Up @@ -332,7 +332,7 @@ AC_MSG_CHECKING([whether to enable auto cleanup of libraries])
enabled=no
UCLN_NO_AUTO_CLEANUP=1
AC_ARG_ENABLE(auto-cleanup,
[ --enable-auto-cleanup enable auto cleanup of libraries [default=no]],
[ --enable-auto-cleanup enable auto cleanup of libraries],
[ case "${enableval}" in
yes) enabled=yes;
CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DUCLN_NO_AUTO_CLEANUP=0";
Expand All @@ -349,7 +349,7 @@ AC_MSG_CHECKING([whether to enable draft APIs])
enabled=yes
U_DEFAULT_SHOW_DRAFT=1
AC_ARG_ENABLE(draft,
[ --enable-draft enable draft APIs (and internal APIs) [default=yes]],
[ --disable-draft do not enable draft APIs (and internal APIs)],
[ case "${enableval}" in
no) enabled=no; U_DEFAULT_SHOW_DRAFT=0;
CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_DEFAULT_SHOW_DRAFT=0"
Expand All @@ -376,7 +376,7 @@ AC_MSG_CHECKING([whether to enable renaming of symbols])
enabled=yes
U_DISABLE_RENAMING=0
AC_ARG_ENABLE(renaming,
[ --enable-renaming add a version suffix to symbols [default=yes]],
[ --disable-renaming do not add a version suffix to symbols],
[ case "${enableval}" in
yes|"") enabled=yes ;;
no) enabled=no; U_DISABLE_RENAMING=1;
Expand All @@ -392,7 +392,7 @@ AC_MSG_CHECKING([whether to enable function and data tracing])
enabled=no
U_ENABLE_TRACING=0
AC_ARG_ENABLE(tracing,
[ --enable-tracing enable function and data tracing [default=no]],
[ --enable-tracing enable function and data tracing],
[ case "${enableval}" in
yes|"") enabled=yes;
CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_ENABLE_TRACING=1";
Expand All @@ -412,7 +412,7 @@ fi

# Enable/disable plugins
AC_ARG_ENABLE(plugins,
[ --enable-plugins enable plugins [default=no]],
[ --enable-plugins enable plugins],
[case "${enableval}" in
yes) plugins=true ;;
no) plugins=false ;;
Expand All @@ -430,7 +430,7 @@ U_ENABLE_DYLOAD=1
enable=yes
AC_MSG_CHECKING([whether to enable dynamic loading of plugins. Ignored if plugins disabled.])
AC_ARG_ENABLE(dyload,
[ --disable-dyload disable dynamic loading [default=no]],
[ --disable-dyload disable dynamic loading],
[ case "${enableval}" in
yes|"")
U_ENABLE_DYLOAD=1
Expand Down Expand Up @@ -577,7 +577,7 @@ case "${host}" in
esac

AC_ARG_ENABLE(weak-threads,
[ --enable-weak-threads weakly reference the threading library [default=no]],
[ --enable-weak-threads weakly reference the threading library],
[case "${enableval}" in
yes)
LIB_THREAD="${LIBS%${OLD_LIBS}}"
Expand Down Expand Up @@ -974,7 +974,7 @@ AC_MSG_RESULT($CHECK_UTF16_STRING_RESULT)

# Enable/disable extras
AC_ARG_ENABLE(extras,
[ --enable-extras build ICU extras [default=yes]],
[ --disable-extras do not build ICU extras],
[case "${enableval}" in
yes) extras=true ;;
no) extras=false ;;
Expand All @@ -983,7 +983,7 @@ AC_ARG_ENABLE(extras,
extras=true)
ICU_CONDITIONAL(EXTRAS, test "$extras" = true)
AC_ARG_ENABLE(icuio,
[ --enable-icuio build ICU's icuio library [default=yes]],
[ --disable-icuio do not build ICU's icuio library],
[case "${enableval}" in
yes) icuio=true ;;
no) icuio=false ;;
Expand All @@ -994,7 +994,7 @@ ICU_CONDITIONAL(ICUIO, test "$icuio" = true)

# Enable/disable layoutex
AC_ARG_ENABLE(layoutex,
[ --enable-layoutex build ICU's Paragraph Layout library [default=no].
[ --enable-layoutex build ICU's Paragraph Layout library.
icu-le-hb must be installed via pkg-config. See http://harfbuzz.org],
[case "${enableval}" in
yes) layoutex=$have_icu_le_hb ;;
Expand All @@ -1016,7 +1016,7 @@ AC_ARG_ENABLE(layout,

# Enable/disable tools
AC_ARG_ENABLE(tools,
[ --enable-tools build ICU's tools [default=yes]],
[ --disable-tools do not build ICU's tools],
[case "${enableval}" in
yes) tools=true ;;
no) tools=false ;;
Expand All @@ -1027,7 +1027,7 @@ ICU_CONDITIONAL(TOOLS, test "$tools" = true)

# Enable/disable fuzzer target tests.
AC_ARG_ENABLE(fuzzer,
[ --enable-fuzzer build ICU's fuzzer test targets [default=no]],
[ --enable-fuzzer build ICU's fuzzer test targets],
[case "${enableval}" in
yes) fuzzer=true ;;
no) fuzzer=false ;;
Expand Down Expand Up @@ -1144,7 +1144,7 @@ AC_SUBST(ICULIBSUFFIXCNAME)

# Enable/disable tests
AC_ARG_ENABLE(tests,
[ --enable-tests build ICU tests [default=yes]],
[ --disable-tests do not build ICU tests],
[case "${enableval}" in
yes) tests=true ;;
no) tests=false ;;
Expand All @@ -1155,7 +1155,7 @@ ICU_CONDITIONAL(TESTS, test "$tests" = true)

# Enable/disable samples
AC_ARG_ENABLE(samples,
[ --enable-samples build ICU samples [default=yes]
[ --disable-samples do not build ICU samples

Additionally, the variable FORCE_LIBS may be set before calling configure.
If set, it will REPLACE any automatic list of libraries.],
Expand Down
Loading