mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-06 05:55:35 +00:00
ICU-653 rename and relocate icudata
X-SVN-Rev: 2997
This commit is contained in:
Steven R. Loomis
parent
9e6269e9c8
commit
0d99688f83
6 changed files with 111 additions and 78 deletions
130
icu4c/source/configure
vendored
130
icu4c/source/configure
vendored
|
|
@ -2634,24 +2634,26 @@ fi
|
|||
|
||||
if test $ac_cv_c_bigendian = no; then
|
||||
U_IS_BIG_ENDIAN=0
|
||||
U_ENDIAN_CHAR="l"
|
||||
else
|
||||
U_IS_BIG_ENDIAN=1
|
||||
U_ENDIAN_CHAR="b"
|
||||
fi
|
||||
|
||||
|
||||
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
|
||||
echo "configure:2645: checking for wchar.h" >&5
|
||||
echo "configure:2647: checking for wchar.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2650 "configure"
|
||||
#line 2652 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <wchar.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2684,14 +2686,14 @@ EOF
|
|||
U_HAVE_WCHAR_H=1
|
||||
|
||||
echo $ac_n "checking for library containing wcscpy""... $ac_c" 1>&6
|
||||
echo "configure:2688: checking for library containing wcscpy" >&5
|
||||
echo "configure:2690: checking for library containing wcscpy" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_search_wcscpy'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_func_search_save_LIBS="$LIBS"
|
||||
ac_cv_search_wcscpy="no"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2695 "configure"
|
||||
#line 2697 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2702,7 +2704,7 @@ int main() {
|
|||
wcscpy()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_wcscpy="none required"
|
||||
else
|
||||
|
|
@ -2713,7 +2715,7 @@ rm -f conftest*
|
|||
test "$ac_cv_search_wcscpy" = "no" && for i in wcs; do
|
||||
LIBS="-l$i $ac_func_search_save_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2717 "configure"
|
||||
#line 2719 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2724,7 +2726,7 @@ int main() {
|
|||
wcscpy()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_wcscpy="-l$i"
|
||||
break
|
||||
|
|
@ -2756,12 +2758,12 @@ fi
|
|||
U_HAVE_NL_LANGINFO_CODESET=0
|
||||
U_NL_LANGINFO_CODESET=-1
|
||||
echo $ac_n "checking for nl_langinfo""... $ac_c" 1>&6
|
||||
echo "configure:2760: checking for nl_langinfo" >&5
|
||||
echo "configure:2762: checking for nl_langinfo" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_nl_langinfo'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2765 "configure"
|
||||
#line 2767 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char nl_langinfo(); below. */
|
||||
|
|
@ -2784,7 +2786,7 @@ nl_langinfo();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_nl_langinfo=yes"
|
||||
else
|
||||
|
|
@ -2807,21 +2809,21 @@ fi
|
|||
|
||||
if test $U_HAVE_NL_LANGINFO -eq 1; then
|
||||
echo $ac_n "checking for nl_langinfo's argument to obtain the codeset""... $ac_c" 1>&6
|
||||
echo "configure:2811: checking for nl_langinfo's argument to obtain the codeset" >&5
|
||||
echo "configure:2813: checking for nl_langinfo's argument to obtain the codeset" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_nl_langinfo_codeset'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_cv_nl_langinfo_codeset="unknown"
|
||||
for a in CODESET _NL_CTYPE_CODESET_NAME; do
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2818 "configure"
|
||||
#line 2820 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <langinfo.h>
|
||||
int main() {
|
||||
nl_langinfo($a);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_nl_langinfo_codeset="$a"; break
|
||||
else
|
||||
|
|
@ -2842,12 +2844,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for tzset""... $ac_c" 1>&6
|
||||
echo "configure:2846: checking for tzset" >&5
|
||||
echo "configure:2848: checking for tzset" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_tzset'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2851 "configure"
|
||||
#line 2853 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char tzset(); below. */
|
||||
|
|
@ -2870,7 +2872,7 @@ tzset();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_tzset=yes"
|
||||
else
|
||||
|
|
@ -2894,12 +2896,12 @@ then
|
|||
U_TZSET=tzset
|
||||
else
|
||||
echo $ac_n "checking for _tzset""... $ac_c" 1>&6
|
||||
echo "configure:2898: checking for _tzset" >&5
|
||||
echo "configure:2900: checking for _tzset" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func__tzset'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2903 "configure"
|
||||
#line 2905 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char _tzset(); below. */
|
||||
|
|
@ -2922,7 +2924,7 @@ _tzset();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func__tzset=yes"
|
||||
else
|
||||
|
|
@ -2948,12 +2950,12 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for tzname""... $ac_c" 1>&6
|
||||
echo "configure:2952: checking for tzname" >&5
|
||||
echo "configure:2954: checking for tzname" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2957 "configure"
|
||||
#line 2959 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifndef __USE_POSIX
|
||||
#define __USE_POSIX
|
||||
|
|
@ -2966,7 +2968,7 @@ int main() {
|
|||
atoi(*tzname);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_var_tzname=yes
|
||||
else
|
||||
|
|
@ -2983,12 +2985,12 @@ if test $ac_cv_var_tzname = yes; then
|
|||
U_TZNAME=tzname
|
||||
else
|
||||
echo $ac_n "checking for _tzname""... $ac_c" 1>&6
|
||||
echo "configure:2987: checking for _tzname" >&5
|
||||
echo "configure:2989: checking for _tzname" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_var__tzname'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2992 "configure"
|
||||
#line 2994 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <time.h>
|
||||
extern char *_tzname[];
|
||||
|
|
@ -2997,7 +2999,7 @@ int main() {
|
|||
atoi(*_tzname);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_var__tzname=yes
|
||||
else
|
||||
|
|
@ -3016,12 +3018,12 @@ echo "$ac_t""$ac_cv_var__tzname" 1>&6
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for timezone""... $ac_c" 1>&6
|
||||
echo "configure:3020: checking for timezone" >&5
|
||||
echo "configure:3022: checking for timezone" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_var_timezone'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3025 "configure"
|
||||
#line 3027 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifndef __USE_POSIX
|
||||
#define __USE_POSIX
|
||||
|
|
@ -3035,7 +3037,7 @@ int main() {
|
|||
timezone = 1;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_var_timezone=yes
|
||||
else
|
||||
|
|
@ -3052,12 +3054,12 @@ if test $ac_cv_var_timezone = yes; then
|
|||
U_TIMEZONE=timezone
|
||||
else
|
||||
echo $ac_n "checking for __timezone""... $ac_c" 1>&6
|
||||
echo "configure:3056: checking for __timezone" >&5
|
||||
echo "configure:3058: checking for __timezone" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_var___timezone'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3061 "configure"
|
||||
#line 3063 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <time.h>
|
||||
|
||||
|
|
@ -3065,7 +3067,7 @@ int main() {
|
|||
__timezone = 1;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_var___timezone=yes
|
||||
else
|
||||
|
|
@ -3082,12 +3084,12 @@ echo "$ac_t""$ac_cv_var___timezone" 1>&6
|
|||
U_TIMEZONE=__timezone
|
||||
else
|
||||
echo $ac_n "checking for _timezone""... $ac_c" 1>&6
|
||||
echo "configure:3086: checking for _timezone" >&5
|
||||
echo "configure:3088: checking for _timezone" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_var__timezone'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3091 "configure"
|
||||
#line 3093 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <time.h>
|
||||
|
||||
|
|
@ -3095,7 +3097,7 @@ int main() {
|
|||
_timezone = 1;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_var__timezone=yes
|
||||
else
|
||||
|
|
@ -3117,7 +3119,7 @@ fi
|
|||
|
||||
ac_default_sizeof_wchar_t=4
|
||||
echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
|
||||
echo "configure:3121: checking size of wchar_t" >&5
|
||||
echo "configure:3123: checking size of wchar_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3125,7 +3127,7 @@ else
|
|||
ac_cv_sizeof_wchar_t=$ac_default_sizeof_wchar_t
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3129 "configure"
|
||||
#line 3131 "configure"
|
||||
#include "confdefs.h"
|
||||
#if STDC_HEADERS
|
||||
#include <stddef.h>
|
||||
|
|
@ -3142,7 +3144,7 @@ main()
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_sizeof_wchar_t=`cat conftestval`
|
||||
else
|
||||
|
|
@ -3165,12 +3167,12 @@ U_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t
|
|||
|
||||
|
||||
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
||||
echo "configure:3169: checking for ANSI C header files" >&5
|
||||
echo "configure:3171: checking for ANSI C header files" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3174 "configure"
|
||||
#line 3176 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
|
@ -3178,7 +3180,7 @@ else
|
|||
#include <float.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -3195,7 +3197,7 @@ rm -f conftest*
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3199 "configure"
|
||||
#line 3201 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <string.h>
|
||||
EOF
|
||||
|
|
@ -3213,7 +3215,7 @@ fi
|
|||
if test $ac_cv_header_stdc = yes; then
|
||||
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3217 "configure"
|
||||
#line 3219 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
EOF
|
||||
|
|
@ -3234,7 +3236,7 @@ if test "$cross_compiling" = yes; then
|
|||
:
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3238 "configure"
|
||||
#line 3240 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <ctype.h>
|
||||
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
||||
|
|
@ -3245,7 +3247,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
|
|||
exit (0); }
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -3269,12 +3271,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for int8_t""... $ac_c" 1>&6
|
||||
echo "configure:3273: checking for int8_t" >&5
|
||||
echo "configure:3275: checking for int8_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_int8_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3278 "configure"
|
||||
#line 3280 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3302,12 +3304,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for uint8_t""... $ac_c" 1>&6
|
||||
echo "configure:3306: checking for uint8_t" >&5
|
||||
echo "configure:3308: checking for uint8_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3311 "configure"
|
||||
#line 3313 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3335,12 +3337,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for int16_t""... $ac_c" 1>&6
|
||||
echo "configure:3339: checking for int16_t" >&5
|
||||
echo "configure:3341: checking for int16_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3344 "configure"
|
||||
#line 3346 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3368,12 +3370,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
|
||||
echo "configure:3372: checking for uint16_t" >&5
|
||||
echo "configure:3374: checking for uint16_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3377 "configure"
|
||||
#line 3379 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3401,12 +3403,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
|
||||
echo "configure:3405: checking for int32_t" >&5
|
||||
echo "configure:3407: checking for int32_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3410 "configure"
|
||||
#line 3412 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3434,12 +3436,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
|
||||
echo "configure:3438: checking for uint32_t" >&5
|
||||
echo "configure:3440: checking for uint32_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3443 "configure"
|
||||
#line 3445 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3467,12 +3469,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for bool_t""... $ac_c" 1>&6
|
||||
echo "configure:3471: checking for bool_t" >&5
|
||||
echo "configure:3473: checking for bool_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_bool_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3476 "configure"
|
||||
#line 3478 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
|
|
@ -3686,6 +3688,8 @@ else
|
|||
SAMPLES_FALSE=
|
||||
fi
|
||||
|
||||
ICUDATA_CHAR=$U_ENDIAN_CHAR
|
||||
|
||||
case "${host}" in
|
||||
*-*-solaris*) platform=U_SOLARIS ;;
|
||||
*-*-linux*) platform=U_LINUX ;;
|
||||
|
|
@ -3694,12 +3698,15 @@ case "${host}" in
|
|||
*-sequent-*) platform=PTX ;;
|
||||
*-*-hpux*) platform=HPUX ;;
|
||||
*-*-irix*) platform=IRIX ;;
|
||||
*-*-os390*) platform=OS390 ;;
|
||||
*-*-os400*) platform=OS400 ;;
|
||||
*-*-os390*) platform=OS390
|
||||
ICUDATA_CHAR="e" ;;
|
||||
*-*-os400*) platform=OS400
|
||||
ICUDATA_CHAR="e" ;;
|
||||
*-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;;
|
||||
*) platform=U_UNKNOWN_PLATFORM ;;
|
||||
esac
|
||||
|
||||
|
||||
platform_make_fragment_name="$icu_cv_host_frag"
|
||||
platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name"
|
||||
|
||||
|
|
@ -3975,6 +3982,7 @@ s%@TESTS_TRUE@%$TESTS_TRUE%g
|
|||
s%@TESTS_FALSE@%$TESTS_FALSE%g
|
||||
s%@SAMPLES_TRUE@%$SAMPLES_TRUE%g
|
||||
s%@SAMPLES_FALSE@%$SAMPLES_FALSE%g
|
||||
s%@ICUDATA_CHAR@%$ICUDATA_CHAR%g
|
||||
s%@platform@%$platform%g
|
||||
s%@platform_make_fragment_name@%$platform_make_fragment_name%g
|
||||
s%@platform_make_fragment@%$platform_make_fragment%g
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and
|
|||
dnl others. All Rights Reserved.
|
||||
dnl Stephen F. Booth, heavily modified by Yves and others
|
||||
|
||||
dnl $Id: configure.in,v 1.93 2000/11/14 21:45:26 emader Exp $
|
||||
dnl $Id: configure.in,v 1.94 2000/11/22 05:08:51 srl Exp $
|
||||
|
||||
dnl Process this file with autoconf to produce a configure script
|
||||
AC_INIT(common/unicode/utypes.h)
|
||||
|
|
@ -324,8 +324,10 @@ dnl Check for endianness
|
|||
AC_C_BIGENDIAN(unknown)
|
||||
if test $ac_cv_c_bigendian = no; then
|
||||
U_IS_BIG_ENDIAN=0
|
||||
U_ENDIAN_CHAR="l"
|
||||
else
|
||||
U_IS_BIG_ENDIAN=1
|
||||
U_ENDIAN_CHAR="b"
|
||||
fi
|
||||
AC_SUBST(U_IS_BIG_ENDIAN)
|
||||
|
||||
|
|
@ -619,7 +621,10 @@ Additionally, the variable FORCE_LIBS may be set before calling configure. If se
|
|||
samples=true)
|
||||
ICU_CONDITIONAL(SAMPLES, test "$samples" = true)
|
||||
|
||||
ICUDATA_CHAR=$U_ENDIAN_CHAR
|
||||
|
||||
dnl Platform-specific Makefile setup
|
||||
dnl set ICUDATA_CHAR to 'e' for any EBCDIC (which should be big endian) platform.
|
||||
case "${host}" in
|
||||
*-*-solaris*) platform=U_SOLARIS ;;
|
||||
*-*-linux*) platform=U_LINUX ;;
|
||||
|
|
@ -628,11 +633,14 @@ case "${host}" in
|
|||
*-sequent-*) platform=PTX ;;
|
||||
*-*-hpux*) platform=HPUX ;;
|
||||
*-*-irix*) platform=IRIX ;;
|
||||
*-*-os390*) platform=OS390 ;;
|
||||
*-*-os400*) platform=OS400 ;;
|
||||
*-*-os390*) platform=OS390
|
||||
ICUDATA_CHAR="e" ;;
|
||||
*-*-os400*) platform=OS400
|
||||
ICUDATA_CHAR="e" ;;
|
||||
*-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;;
|
||||
*) platform=U_UNKNOWN_PLATFORM ;;
|
||||
esac
|
||||
AC_SUBST(ICUDATA_CHAR)
|
||||
AC_SUBST(platform)
|
||||
platform_make_fragment_name="$icu_cv_host_frag"
|
||||
platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name"
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@ PACKAGE = @PACKAGE@
|
|||
VERSION = @VERSION@
|
||||
UNICODE_VERSION = @UNICODE_VERSION@
|
||||
|
||||
# should be the same as U_ICUDATA_NAME
|
||||
ICUDATA_NAME=icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@
|
||||
|
||||
# ICU specific directories
|
||||
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ DEFS = @DEFS@
|
|||
|
||||
# we define ICU_UNICODE_VERSION so we can test it
|
||||
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw \
|
||||
-DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\"
|
||||
-DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" -DICUDATA_NAME=\"$(ICUDATA_NAME)\"
|
||||
CFLAGS = @CFLAGS@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
ENABLE_RPATH = @ENABLE_RPATH@
|
||||
|
|
|
|||
|
|
@ -715,4 +715,18 @@ void TestICUDataName()
|
|||
log_err("U_ICUDATA_NAME should be %s but is %s\n",
|
||||
expectDataName, U_ICUDATA_NAME);
|
||||
}
|
||||
|
||||
/* ICUDATA_NAME comes from the build system on *nix */
|
||||
#ifdef ICUDATA_NAME
|
||||
if(uprv_strcmp(U_ICUDATA_NAME, ICUDATA_NAME))
|
||||
{
|
||||
log_err("ICUDATA_NAME and U_ICUDATA_NAME don't match: "
|
||||
"ICUDATA_NAME=%s, U_ICUDATA_NAME=%s. Check configure.in, icudefs.mk.in, utypes.h...\n", ICUDATA_NAME, U_ICUDATA_NAME);
|
||||
}
|
||||
else
|
||||
{
|
||||
log_verbose("ICUDATA_NAME=%s (from icudefs.mk), U_ICUDATA_NAME=%s (from utypes.h)\n", ICUDATA_NAME, U_ICUDATA_NAME);
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -160,11 +160,11 @@ clean-local: clean-pkgdata
|
|||
$(RMV) $(SRCDATAFILES)
|
||||
$(RMV) $(DATAFILES)
|
||||
$(RMV) icupkg.inc
|
||||
-@if [ -f $(TMPDATADIR)/icudata_dll.mak ]; then \
|
||||
(cd pkgdata ; $(INVOKE) ./pkgdata -T $(TMPDATADIR) -m dll -p icudata -O $(DATABUILDDIR)/icupkg.inc $(TMPDATADIR)/icudata.lst -d $(DATABUILDDIR) --clean ) \
|
||||
-@if [ -f $(TMPDATADIR)/$(ICUDATA_NAME)_dll.mak ]; then \
|
||||
(cd pkgdata ; $(INVOKE) ./pkgdata -T $(TMPDATADIR) -m dll -p $(ICUDATA_NAME) -O $(DATABUILDDIR)/icupkg.inc $(TMPDATADIR)/$(ICUDATA_NAME).lst -d $(DATABUILDDIR) --clean ) \
|
||||
fi
|
||||
-@if [ -f $(TMPDATADIR)/icudata_common.mak ]; then \
|
||||
(cd pkgdata; $(INVOKE) ./pkgdata -T $(TMPDATADIR) -m common -p icudata -O $(DATABUILDDIR)/icupkg.inc $(TMPDATADIR)/icudata.lst -d $(DATABUILDDIR) --clean ) \
|
||||
-@if [ -f $(TMPDATADIR)/$(ICUDATA_NAME)_common.mak ]; then \
|
||||
(cd pkgdata; $(INVOKE) ./pkgdata -T $(TMPDATADIR) -m common -p $(ICUDATA_NAME) -O $(DATABUILDDIR)/icupkg.inc $(TMPDATADIR)/$(ICUDATA_NAME).lst -d $(DATABUILDDIR) --clean ) \
|
||||
fi
|
||||
-@$(RMV) $(TMPDATADIR) $(TMPDATADIR)2
|
||||
|
||||
|
|
@ -172,12 +172,12 @@ clean-local: clean-pkgdata
|
|||
distclean-local: clean-local
|
||||
$(RMV) Makefile
|
||||
|
||||
$(TMPDATADIR)/icudata.lst: Makefile $(srcdir)/Makefile.in $(srcdir)/genrb/genrbfiles.mk $(srcdir)/makeconv/ucmfiles.mk
|
||||
$(TMPDATADIR)/$(ICUDATA_NAME).lst: Makefile $(srcdir)/Makefile.in $(srcdir)/genrb/genrbfiles.mk $(srcdir)/makeconv/ucmfiles.mk
|
||||
@echo Generating $@ list of data files
|
||||
@$(MKINSTALLDIRS) $(TMPDATADIR)
|
||||
@-$(RMV) $(TMPDATADIR)/icudata.lst
|
||||
@-$(RMV) $(TMPDATADIR)/$(ICUDATA_NAME).lst
|
||||
@for file in $(DATAFILESL); do \
|
||||
echo $(OBJDATADIR)/$$file >> $(TMPDATADIR)/icudata.lst; \
|
||||
echo $(OBJDATADIR)/$$file >> $(TMPDATADIR)/$(ICUDATA_NAME).lst; \
|
||||
done;
|
||||
|
||||
$(TMPDATADIR)/testdata.lst: Makefile
|
||||
|
|
@ -199,22 +199,22 @@ $(TMPDATADIR)2/icupkg.inc: pkgdata/icupkg.inc
|
|||
|
||||
# build the ICU and test data
|
||||
|
||||
build-local build-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/testdata.lst $(TMPDATADIR)/icupkg.inc $(TMPDATADIR)2/icupkg.inc $(TMPDATADIR)2/testdata.lst $(DATAFILES) $(top_builddir)/test/testdata/root.res
|
||||
build-local build-pkgdata: $(TMPDATADIR)/$(ICUDATA_NAME).lst $(TMPDATADIR)/testdata.lst $(TMPDATADIR)/icupkg.inc $(TMPDATADIR)2/icupkg.inc $(TMPDATADIR)2/testdata.lst $(DATAFILES) $(top_builddir)/test/testdata/root.res
|
||||
@$(MKINSTALLDIRS) $(TMPDATADIR)
|
||||
@$(MKINSTALLDIRS) $(TMPDATADIR)2
|
||||
(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst )
|
||||
(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p $(ICUDATA_NAME) ./$(ICUDATA_NAME).lst )
|
||||
(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat1 ./testdata.lst )
|
||||
(cd $(TMPDATADIR)2; $(INVOKE) $(PKGDATA) -p testdat2 ./testdata.lst )
|
||||
|
||||
install-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/icupkg.inc
|
||||
install-pkgdata: $(TMPDATADIR)/$(ICUDATA_NAME).lst $(TMPDATADIR)/icupkg.inc
|
||||
$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(pkglibdir)/$(VERSION)
|
||||
(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst -I $(DESTDIR)$(pkglibdir)/$(VERSION))
|
||||
(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p $(ICUDATA_NAME) ./$(ICUDATA_NAME).lst -I $(DESTDIR)$(pkglibdir)/$(VERSION))
|
||||
|
||||
clean-pkgdata:
|
||||
-(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' )
|
||||
-(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p $(ICUDATA_NAME) ./$(ICUDATA_NAME).lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' )
|
||||
-(cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat1 ./testdata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' )
|
||||
-(cd $(TMPDATADIR)2; $(INVOKE) $(PKGDATA) -p testdat2 ./testdata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' )
|
||||
-$(RMV) $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/testdata.lst $(TMPDATADIR)/icupkg.inc $(TMPDATADIR)2/testdata.lst
|
||||
-$(RMV) $(TMPDATADIR)/$(ICUDATA_NAME).lst $(TMPDATADIR)/testdata.lst $(TMPDATADIR)/icupkg.inc $(TMPDATADIR)2/testdata.lst
|
||||
|
||||
check-local:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue