summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-01-01 02:43:30 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-01-01 16:05:47 -0600
commit49319b288f40ba13b24799136caa97863d523e39 (patch)
treed138dc7fc5cf43ccaaa6844e9c28aacdcd9df006 /configure.in
parent8bfd2b6af998d1949edcb7573bdf93cfcbbcff31 (diff)
migrate non-conditional straight from configure.in var out of set_soenv.in
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index ab10538d92ef..71b5eb091197 100644
--- a/configure.in
+++ b/configure.in
@@ -6598,6 +6598,8 @@ dnl ===================================================================
SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
+# x_ICU us used to comment-out ICU_MAJOR/MINOR/MICRO in config_host.mk
+x_ICU=
ICU_MAJOR=
ICU_MINOR=
ICU_MICRO=
@@ -6652,10 +6654,13 @@ if test "$with_system_icu" = "yes"; then
MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS icui18n$ICU_MAJOR$ICU_MINOR.dll icuuc$ICU_MAJOR$ICU_MINOR.dll icudata$ICU_MAJOR$ICU_MINOR.dll"
else
AC_MSG_RESULT([internal])
+ x_ICU=[\#]
SYSTEM_ICU="NO"
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
BUILD_TYPE="$BUILD_TYPE ICU"
fi
+
+AC_SUBST(x_ICU)
AC_SUBST(SYSTEM_ICU)
AC_SUBST(SYSTEM_GENBRK)
AC_SUBST(SYSTEM_GENCCODE)