AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10464 Make installation of icu-config optional (#13)

Browse Source 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Originally ICU-20030
This commit is contained in:
Hugh McMaster 2018-07-25 08:53:46 +10:00 committed by Steven R. Loomis
parent 38463f7b16
commit e21982ce40
No known key found for this signature in database
GPG Key ID: FCED3B24AAB18B5C
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/Makefile.in
View File

@ -48,6 +48,8 @@ ALL_PKGCONFIG_SUFFIX=uc i18n
DOXYGEN = @DOXYGEN@ DOXYGEN = @DOXYGEN@
DOCZIP = icu-docs.zip DOCZIP = icu-docs.zip
INSTALL_ICU_CONFIG = @INSTALL_ICU_CONFIG@
## Files to remove for 'make clean' ## Files to remove for 'make clean'
CLEANFILES = *~ CLEANFILES = *~
@ -64,7 +66,9 @@ SUBDIRS = stubdata common i18n $(LAYOUTEX) $(ICUIO) $(TOOLS) $(DATASUBDIR) $(EX
SECTION = 1 SECTION = 1
ifeq ($(INSTALL_ICU_CONFIG),true)
MANX_FILES = config/icu-config.$(SECTION) MANX_FILES = config/icu-config.$(SECTION)
endif
ALL_MAN_FILES = $(MANX_FILES) ALL_MAN_FILES = $(MANX_FILES)
@ -187,7 +191,9 @@ install-icu: $(INSTALLED_BUILT_FILES)
@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
$(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/ $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
$(INSTALL_DATA) $(top_srcdir)/../LICENSE $(DESTDIR)$(pkgdatadir)/LICENSE $(INSTALL_DATA) $(top_srcdir)/../LICENSE $(DESTDIR)$(pkgdatadir)/LICENSE
ifeq ($(INSTALL_ICU_CONFIG),true)
$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config $(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
endif
$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc $(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc
$(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata.inc $(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata.inc
# @echo icuinfo.xml is built after make check. # @echo icuinfo.xml is built after make check.
@ -350,7 +356,9 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
install-manx: $(MANX_FILES) install-manx: $(MANX_FILES)
$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
ifneq ($(MANX_FILES),)
$(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
endif
config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in
cd $(top_builddir) \ cd $(top_builddir) \

18
icu4c/source/configure vendored
View File

@ -716,6 +716,7 @@ CFLAGS
CC CC
ENABLE_RELEASE ENABLE_RELEASE
ENABLE_DEBUG ENABLE_DEBUG
INSTALL_ICU_CONFIG
CPPFLAGS CPPFLAGS
host_os host_os
host_vendor host_vendor
@ -775,6 +776,7 @@ SHELL'
ac_subst_files='' ac_subst_files=''
ac_user_opts=' ac_user_opts='
enable_option_checking enable_option_checking
enable_icu_config
enable_debug enable_debug
enable_release enable_release
with_cross_build with_cross_build
@ -1443,6 +1445,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --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-debug build debug libraries and enable the U_DEBUG define default=no
--enable-release build release libraries default=yes --enable-release build release libraries default=yes
--enable-strict compile with strict compiler options default=yes --enable-strict compile with strict compiler options default=yes
@ -2797,6 +2800,21 @@ UCONFIG_CPPFLAGS=""
# such as -std # such as -std
UCONFIG_CFLAGS="" UCONFIG_CFLAGS=""
# Check whether to install icu-config
# Check whether --enable-icu-config was given.
if test "${enable_icu_config+set}" = set; then :
enableval=$enable_icu_config; case "${enableval}" in
yes) enable_icu_config=true ;;
no) enable_icu_config=false ;;
*) as_fn_error $? "bad value '${enableval}' for --enable-icu-config" "$LINENO" 5 ;;
esac
else
enable_icu_config=true
fi
INSTALL_ICU_CONFIG=$enable_icu_config
# Check whether to build debug libraries # Check whether to build debug libraries
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build debug libraries" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build debug libraries" >&5
$as_echo_n "checking whether to build debug libraries... " >&6; } $as_echo_n "checking whether to build debug libraries... " >&6; }

10
icu4c/source/configure.ac
View File

@ -100,6 +100,16 @@ UCONFIG_CPPFLAGS=""
# such as -std # such as -std
UCONFIG_CFLAGS="" UCONFIG_CFLAGS=""
# Check whether to install icu-config
AC_ARG_ENABLE([icu-config],
AS_HELP_STRING([--enable-icu-config], [install icu-config]),
[case "${enableval}" in
yes) enable_icu_config=true ;;
no) enable_icu_config=false ;;
*) AC_MSG_ERROR([bad value '${enableval}' for --enable-icu-config]) ;;
esac], [enable_icu_config=true])
AC_SUBST(INSTALL_ICU_CONFIG, [$enable_icu_config])
# Check whether to build debug libraries # Check whether to build debug libraries
AC_MSG_CHECKING([whether to build debug libraries]) AC_MSG_CHECKING([whether to build debug libraries])
enabled=no enabled=no