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

ICU-22310 Revert now obsolete autoconf bug workaround for echo #3029

Merged
merged 2 commits into from
Jun 13, 2024
Merged

ICU-22310 Revert now obsolete autoconf bug workaround for echo #3029

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
6c642bb
ICU-22310 Revert now obsolete autoconf bug workaround for echo.
roubert Jun 6, 2024
642b440
ICU-22310 Update configure files from configure.ac using autoreconf.
roubert Jun 6, 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
6 changes: 3 additions & 3 deletions icu4c/source/config/Makefile.inc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)

# Proper echo newline handling is needed in icu-config
ECHO_N=@ICU_ECHO_N@
ECHO_C=@ICU_ECHO_C@
ECHO_N=@ECHO_N@
ECHO_C=@ECHO_C@
# Not currently being used but good to have for proper tab handling
ECHO_T=@ICU_ECHO_T@
ECHO_T=@ECHO_T@

##################################################################
##################################################################
Expand Down
21 changes: 0 additions & 21 deletions icu4c/source/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,9 +733,6 @@ UNICODE_VERSION
LIB_VERSION_MAJOR
LIB_VERSION
VERSION
ICU_ECHO_T
ICU_ECHO_C
ICU_ECHO_N
PACKAGE
target_alias
host_alias
Expand Down Expand Up @@ -2576,24 +2573,6 @@ export PYTHONDONTWRITEBYTECODE
PACKAGE="icu"


# Use custom echo test for newline option
# Current autoconf (2.65) gives incorrect echo newline option
# for icu-config
# This may be removed later - mow (June 17, 2010)
ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
case `/bin/sh -c "echo -n x"` in
-n*)
case `/bin/sh -c "echo 'x\c'"` in
*c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character.
*) ICU_ECHO_C='\c';;
esac;;
*)
ICU_ECHO_N='-n';;
esac




{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU version numbers" >&5
$as_echo_n "checking for ICU version numbers... " >&6; }

Expand Down
18 changes: 0 additions & 18 deletions icu4c/source/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,6 @@ AC_CONFIG_SRCDIR([common/unicode/utypes.h])
PACKAGE="icu"
AC_SUBST(PACKAGE)

# Use custom echo test for newline option
# Current autoconf (2.65) gives incorrect echo newline option
# for icu-config
# This may be removed later - mow (June 17, 2010)
ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
case `/bin/sh -c "echo -n x"` in
-n*)
case `/bin/sh -c "echo 'x\c'"` in
*c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character.
*) ICU_ECHO_C='\c';;
esac;;
*)
ICU_ECHO_N='-n';;
esac
AC_SUBST(ICU_ECHO_N)
AC_SUBST(ICU_ECHO_C)
AC_SUBST(ICU_ECHO_T)

AC_MSG_CHECKING(for ICU version numbers)

# Get the ICU version from uversion.h or other headers
Expand Down
5 changes: 0 additions & 5 deletions icu4c/source/icudefs.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,6 @@ LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
ENABLE_STATIC = @ENABLE_STATIC@
ENABLE_SHARED = @ENABLE_SHARED@

# Echo w/o newline

#ECHO_N = @ICU_ECHO_N@
#ECHO_C = @ICU_ECHO_C@

# Commands to compile
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
Expand Down
Loading