organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions3

ICU-6167 Improve on echo newline option detection by using ECHO_N and ECHO_C to accommodate different behaviours from various shells.

Browse source 
X-SVN-Rev: 24470
This commit is contained in:
Michael Ow 2008-08-08 18:01:18 +00:00
parent 95ccfc636d
commit 34f8b062b4
2 changed files with 29 additions and 25 deletions

4
icu4c/source/config/Makefile.inc.in
View file

@ -119,6 +119,10 @@ ICULIBS_COMMON_LIB_NAME = ${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO
# with usually. Many applications will want to add $(ICULIBS_I18N) as well.
ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)
# Proper echo newline handling is needed in icu-config
ECHO_N=@ECHO_N@
ECHO_C=@ECHO_C@
##################################################################
##################################################################
#

50
icu4c/source/config/icu-config-bottom
View file

@ -179,73 +179,73 @@ do
;;
--cflags)
echo -n $CFLAGS" "
echo $ECHO_N "${CFLAGS}${ECHO_C} "
;;
--cc)
echo -n $CC" "
echo $ECHO_N "${CC}${ECHO_C} "
;;
--cxx)
echo -n $CXX" "
echo $ECHO_N "${CXX}${ECHO_C} "
;;
--cxxflags)
echo -n $CXXFLAGS" "
echo $ECHO_N "${CXXFLAGS}${ECHO_C} "
;;
--cppflags)
# Don't echo the -I. - it's unneeded.
echo -n $CPPFLAGS" " | sed -e 's/-I. //'
echo $ECHO_N "${CPPFLAGS}${ECHO_C} " | sed -e 's/-I. //'
;;
--cppflags-searchpath)
echo -n -I${prefix}/include" "
echo $ECHO_N "-I${prefix}/include${ECHO_C} "
;;
--cppflags-dynamic)
echo -n $SHAREDLIBCPPFLAGS" "
echo $ECHO_N "${SHAREDLIBCPPFLAGS}${ECHO_C} "
;;
--cxxflags-dynamic)
echo -n $SHAREDLIBCXXFLAGS" "
echo $ECHO_N "${SHAREDLIBCXXFLAGS}${ECHO_C} "
;;
--cflags-dynamic)
echo -n $SHAREDLIBCFLAGS" "
echo $ECHO_N "${SHAREDLIBCFLAGS}${ECHO_C} "
;;
--ldflags-system)
echo -n $LIBS" "
echo $ECHO_N "${LIBS}${ECHO_C} "
;;
--ldflags)
echo -n $LDFLAGS $ICULIBS $LIBS" "
echo $ECHO_N "${LDFLAGS $ICULIBS $LIBS}${ECHO_C} "
# $RPATH_LDFLAGS
;;
--ldflags-libsonly)
echo -n $ICULIBS_I18N $ICULIBS_COMMON $ICULIBS_DATA" "
echo $ECHO_N "${ICULIBS_I18N $ICULIBS_COMMON $ICULIBS_DATA}${ECHO_C} "
;;
--ldflags-icuio)
echo -n $ICULIBS_ICUIO" "
echo $ECHO_N "${ICULIBS_ICUIO}${ECHO_C} "
;;
--ldflags-obsolete)
echo -n $ICULIBS_OBSOLETE" "
echo $ECHO_N "${ICULIBS_OBSOLETE}${ECHO_C} "
;;
--ldflags-toolutil)
echo -n $ICULIBS_TOOLUTIL" "
echo $ECHO_N "${ICULIBS_TOOLUTIL}${ECHO_C} "
;;
--ldflags-layout)
echo -n $ICULIBS_LAYOUT $ICULIBS_LAYOUTEX" "
echo $ECHO_N "${ICULIBS_LAYOUT $ICULIBS_LAYOUTEX}${ECHO_C} "
;;
--ldflags-searchpath)
echo -n -L${libdir}" "
echo $ECHO_N "-L${libdir}${ECHO_C} "
;;
--detect-prefix)
@ -283,35 +283,35 @@ do
;;
--shared-datadir)
echo -n $datadir" "
echo $ECHO_N "${datadir}${ECHO_C} "
;;
--incfile)
echo -n $pkglibdir/Makefile.inc" "
echo $ECHO_N "${pkglibdir}/Makefile.inc${ECHO_C} "
;;
--icudata)
echo -n $ICUDATA_NAME" "
echo $ECHO_N "${ICUDATA_NAME}${ECHO_C} "
;;
--icudata-mode)
echo -n $PKGDATA_MODE" "
echo $ECHO_N "${PKGDATA_MODE}${ECHO_C} "
;;
--icudata-install-dir)
echo -n $ICUPKGDATA_DIR" "
echo $ECHO_N "${ICUPKGDATA_DIR}${ECHO_C} "
;;
--icudatadir)
echo -n $ICUDATA_DIR" "
echo $ECHO_N "${ICUDATA_DIR}${ECHO_C} "
;;
--shlib-c)
echo -n $SHLIB_c" "
echo $ECHO_N "${SHLIB_c}${ECHO_C} "
;;
--shlib-cc)
echo -n $SHLIB_cc" "
echo $ECHO_N "${SHLIB_cc}${ECHO_C} "
;;
--version)