diff options
| author | Tatsuo Ishii <ishii@postgresql.org> | 2001-10-11 14:20:35 +0000 |
|---|---|---|
| committer | Tatsuo Ishii <ishii@postgresql.org> | 2001-10-11 14:20:35 +0000 |
| commit | 51053d32160b452a1fcb71ad57fb394706af58d8 (patch) | |
| tree | e316eb89e4f620a930ef7702ec8ea981908965f8 | |
| parent | 371f49bf9f13d8762e6894e0534432aa86c56c92 (diff) | |
| download | postgresql-51053d32160b452a1fcb71ad57fb394706af58d8.tar.gz postgresql-51053d32160b452a1fcb71ad57fb394706af58d8.zip | |
Add support for ISO-8859-6 to 16
25 files changed, 2819 insertions, 465 deletions
diff --git a/configure b/configure index 3814217ea6a..223e65a5596 100755 --- a/configure +++ b/configure @@ -897,14 +897,16 @@ if test x"${enable_multibyte+set}" = xset; then enable_multibyte=yes case $enableval in - SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT) + SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT|ISO_8859_5|ISO_8859_6|ISO_8859_7|ISO_8859_8|ISO_8859_10|ISO_8859_13|ISO_8859_14|ISO_8859_15|ISO_8859_16) MULTIBYTE=$enableval;; *) { echo "configure: error: argument to --enable-multibyte must be one of: SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL, LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, - KOI8, WIN, ALT + KOI8, WIN, ALT, + ISO_8859_6, ISO_8859_7, ISO_8859_8, + ISO_8859_10, ISO_8859_13, ISO_8859_14, ISO_8859_15, ISO_8859_16 Or do not specify an argument to the option to use the default." 1>&2; exit 1; };; esac @@ -933,7 +935,7 @@ fi # NLS # echo $ac_n "checking whether NLS is wanted""... $ac_c" 1>&6 -echo "configure:937: checking whether NLS is wanted" >&5 +echo "configure:939: checking whether NLS is wanted" >&5 # Check whether --enable-nls was given if test x"${enable_nls+set}" = xset; then case $enable_nls in @@ -968,7 +970,7 @@ echo "$ac_t""$enable_nls" 1>&6 # Default port number (--with-pgport), default 5432 # echo $ac_n "checking for default port number""... $ac_c" 1>&6 -echo "configure:972: checking for default port number" >&5 +echo "configure:974: checking for default port number" >&5 # Check whether --with-pgport was given if test x"${with_pgport+set}" = xset; then case $with_pgport in @@ -1002,7 +1004,7 @@ EOF # Maximum number of allowed connections (--with-maxbackends), default 32 # echo $ac_n "checking for default soft limit on number of connections""... $ac_c" 1>&6 -echo "configure:1006: checking for default soft limit on number of connections" >&5 +echo "configure:1008: checking for default soft limit on number of connections" >&5 # Check whether --with-maxbackends was given if test x"${with_maxbackends+set}" = xset; then case $with_maxbackends in @@ -1126,7 +1128,7 @@ save_CFLAGS=$CFLAGS # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1130: checking for $ac_word" >&5 +echo "configure:1132: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1156,7 +1158,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1160: checking for $ac_word" >&5 +echo "configure:1162: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1207,7 +1209,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1211: checking for $ac_word" >&5 +echo "configure:1213: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1239,7 +1241,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1243: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1245: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1250,12 +1252,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1254 "configure" +#line 1256 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1281,12 +1283,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1285: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1287: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1290: checking whether we are using GNU C" >&5 +echo "configure:1292: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1295,7 +1297,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1314,7 +1316,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1318: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1320: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1357,7 +1359,7 @@ fi echo "using CFLAGS=$CFLAGS" # Check if the compiler still works with the template settings echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1361: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1363: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1368,12 +1370,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1372 "configure" +#line 1374 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1399,17 +1401,17 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1403: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1405: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1408: checking for Cygwin environment" >&5 +echo "configure:1410: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1413 "configure" +#line 1415 "configure" #include "confdefs.h" int main() { @@ -1420,7 +1422,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1437,19 +1439,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1441: checking for mingw32 environment" >&5 +echo "configure:1443: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1446 "configure" +#line 1448 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:1453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1468,7 +1470,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1472: checking for executable suffix" >&5 +echo "configure:1474: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1478,7 +1480,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1499,7 +1501,7 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1503: checking how to run the C preprocessor" >&5 +echo "configure:1505: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1514,13 +1516,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1518 "configure" +#line 1520 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1526: \"$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 : @@ -1531,13 +1533,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1535 "configure" +#line 1537 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1543: \"$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 : @@ -1548,13 +1550,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1552 "configure" +#line 1554 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1560: \"$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 : @@ -1580,13 +1582,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1584: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1586: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 1590 "configure" +#line 1592 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -1604,7 +1606,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 1608 "configure" +#line 1610 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -1726,7 +1728,7 @@ IFS=$ac_save_IFS # Tcl/Tk # echo $ac_n "checking whether to build with Tcl""... $ac_c" 1>&6 -echo "configure:1730: checking whether to build with Tcl" >&5 +echo "configure:1732: checking whether to build with Tcl" >&5 # Check whether --with-tcl was given if test x"${with_tcl+set}" = xset; then case $with_tcl in @@ -1750,7 +1752,7 @@ echo "$ac_t""$with_tcl" 1>&6 # If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk echo $ac_n "checking whether to build with Tk""... $ac_c" 1>&6 -echo "configure:1754: checking whether to build with Tk" >&5 +echo "configure:1756: checking whether to build with Tk" >&5 if test "$with_tcl" = yes; then # Check whether --with-tk was given if test x"${with_tk+set}" = xset; then @@ -1812,7 +1814,7 @@ fi # If Tcl is enabled (above) then check for pltcl_unknown_support # echo $ac_n "checking whether to build with PL/Tcl unknown support""... $ac_c" 1>&6 -echo "configure:1816: checking whether to build with PL/Tcl unknown support" >&5 +echo "configure:1818: checking whether to build with PL/Tcl unknown support" >&5 if test "$with_tcl" = yes; then # Check whether --enable-pltcl-unknown was given if test x"${enable_pltcl_unknown+set}" = xset; then @@ -1846,7 +1848,7 @@ echo "$ac_t""$enable_pltcl_unknown" 1>&6 # Optionally build Perl modules (Pg.pm and PL/Perl) # echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6 -echo "configure:1850: checking whether to build Perl modules" >&5 +echo "configure:1852: checking whether to build Perl modules" >&5 # Check whether --with-perl was given if test x"${with_perl+set}" = xset; then case $with_perl in @@ -1872,7 +1874,7 @@ echo "$ac_t""$with_perl" 1>&6 # Optionally build Python interface module # echo $ac_n "checking whether to build Python modules""... $ac_c" 1>&6 -echo "configure:1876: checking whether to build Python modules" >&5 +echo "configure:1878: checking whether to build Python modules" >&5 # Check whether --with-python was given if test x"${with_python+set}" = xset; then case $with_python in @@ -1898,7 +1900,7 @@ echo "$ac_t""$with_python" 1>&6 # Optionally build the Java/JDBC tools # echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6 -echo "configure:1902: checking whether to build Java/JDBC tools" >&5 +echo "configure:1904: checking whether to build Java/JDBC tools" >&5 # Check whether --with-java was given if test x"${with_java+set}" = xset; then case $with_java in @@ -1910,7 +1912,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1914: checking for $ac_word" >&5 +echo "configure:1916: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ANT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1947,7 +1949,7 @@ done echo $ac_n "checking whether $ANT works""... $ac_c" 1>&6 -echo "configure:1951: checking whether $ANT works" >&5 +echo "configure:1953: checking whether $ANT works" >&5 if eval "test \"`echo '$''{'pgac_cv_prog_ant_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1970,7 +1972,7 @@ EOF EOF pgac_cmd='$ANT -buildfile conftest.xml 1>&2' - { (eval echo configure:1974: \"$pgac_cmd\") 1>&5; (eval $pgac_cmd) 2>&5; } + { (eval echo configure:1976: \"$pgac_cmd\") 1>&5; (eval $pgac_cmd) 2>&5; } pgac_save_status=$? if test $? = 0 && test -f ./conftest.class ; then pgac_cv_prog_ant_works=yes @@ -2136,7 +2138,7 @@ EOF # PAM # echo $ac_n "checking whether to build with PAM support""... $ac_c" 1>&6 -echo "configure:2140: checking whether to build with PAM support" >&5 +echo "configure:2142: checking whether to build with PAM support" >&5 # Check whether --with-pam was given if test x"${with_pam+set}" = xset; then case $with_pam in @@ -2227,7 +2229,7 @@ if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then fi echo $ac_n "checking whether to build the ODBC driver""... $ac_c" 1>&6 -echo "configure:2231: checking whether to build the ODBC driver" >&5 +echo "configure:2233: checking whether to build the ODBC driver" >&5 # Check whether --enable-odbc was given if test x"${enable_odbc+set}" = xset; then case $enable_odbc in @@ -2336,7 +2338,7 @@ case $host_os in esac cat > conftest.$ac_ext <<EOF -#line 2340 "configure" +#line 2342 "configure" #include "confdefs.h" #if __ELF__ yes @@ -2365,7 +2367,7 @@ rm -f conftest* # Optionally build C++ code (i.e., libpq++) # echo $ac_n "checking whether to build C++ modules""... $ac_c" 1>&6 -echo "configure:2369: checking whether to build C++ modules" >&5 +echo "configure:2371: checking whether to build C++ modules" >&5 # Check whether --with-CXX was given if test x"${with_CXX+set}" = xset; then case $with_CXX in @@ -2398,7 +2400,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2402: checking for $ac_word" >&5 +echo "configure:2404: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2430,7 +2432,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2434: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2436: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2441,12 +2443,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2445 "configure" +#line 2447 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2472,12 +2474,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2476: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2478: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2481: checking whether we are using GNU C++" >&5 +echo "configure:2483: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2486,7 +2488,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2505,7 +2507,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2509: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2511: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2553,7 +2555,7 @@ fi echo "using CXXFLAGS=$CXXFLAGS" echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2557: checking how to run the C++ preprocessor" >&5 +echo "configure:2559: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2566,12 +2568,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <<EOF -#line 2570 "configure" +#line 2572 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2577: \"$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 : @@ -2606,17 +2608,17 @@ cross_compiling=$ac_cv_prog_cxx_cross ac_safe=`echo "string" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string""... $ac_c" 1>&6 -echo "configure:2610: checking for string" >&5 +echo "configure:2612: checking for string" >&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 2615 "configure" +#line 2617 "configure" #include "confdefs.h" #include <string> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2622: \"$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* @@ -2643,12 +2645,12 @@ fi if test x"$ac_cv_header_string" != xyes ; then echo $ac_n "checking for class string in <string.h>""... $ac_c" 1>&6 -echo "configure:2647: checking for class string in <string.h>" >&5 +echo "configure:2649: checking for class string in <string.h>" >&5 if eval "test \"`echo '$''{'pgac_cv_class_string_in_string_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2652 "configure" +#line 2654 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2658,7 +2660,7 @@ int main() { string foo = "test" ; return 0; } EOF -if { (eval echo configure:2662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_class_string_in_string_h=yes else @@ -2685,7 +2687,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6 -echo "configure:2689: checking for namespace std in C++" >&5 +echo "configure:2691: checking for namespace std in C++" >&5 if eval "test \"`echo '$''{'pgac_cv_cxx_namespace_std'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2701,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 2703 "configure" +#line 2705 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2712,7 +2714,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_cxx_namespace_std=yes else @@ -2753,12 +2755,12 @@ echo "using CPPFLAGS=$CPPFLAGS" echo "using LDFLAGS=$LDFLAGS" -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2762: checking for $ac_word" >&5 +echo "configure:2764: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2788,7 +2790,7 @@ test -n "$AWK" && break done echo $ac_n "checking for flex""... $ac_c" 1>&6 -echo "configure:2792: checking for flex" >&5 +echo "configure:2794: checking for flex" >&5 if eval "test \"`echo '$''{'pgac_cv_path_flex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2853,7 +2855,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2857: checking whether ln -s works" >&5 +echo "configure:2859: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2885,7 +2887,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2889: checking for ld used by GCC" >&5 +echo "configure:2891: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2915,10 +2917,10 @@ echo "configure:2889: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2919: checking for GNU ld" >&5 +echo "configure:2921: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2922: checking for non-GNU ld" >&5 +echo "configure:2924: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2953,7 +2955,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2957: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2959: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2973,21 +2975,21 @@ with_gnu_ld=$ac_cv_prog_gnu_ld case $host_os in sysv5*) echo $ac_n "checking whether ld -R works""... $ac_c" 1>&6 -echo "configure:2977: checking whether ld -R works" >&5 +echo "configure:2979: checking whether ld -R works" >&5 if eval "test \"`echo '$''{'pgac_cv_prog_ld_R'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib" cat > conftest.$ac_ext <<EOF -#line 2984 "configure" +#line 2986 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_prog_ld_R=yes else @@ -3008,7 +3010,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3012: checking for $ac_word" >&5 +echo "configure:3014: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3040,7 +3042,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3044: checking for $ac_word" >&5 +echo "configure:3046: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LORDER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3072,7 +3074,7 @@ done # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3076: checking for $ac_word" >&5 +echo "configure:3078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3110,7 +3112,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3114: checking for $ac_word" >&5 +echo "configure:3116: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3155,7 +3157,7 @@ if test "$with_tk" = yes; then # Extract the first word of "wish", so it can be a program name with args. set dummy wish; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3159: checking for $ac_word" >&5 +echo "configure:3161: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3193,7 +3195,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3197: checking for $ac_word" >&5 +echo "configure:3199: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3229,7 +3231,7 @@ if test "$with_perl" = yes; then echo $ac_n "checking Perl installation directories""... $ac_c" 1>&6 -echo "configure:3233: checking Perl installation directories" >&5 +echo "configure:3235: checking Perl installation directories" >&5 # These are the ones we currently need. Others can be added easily. perl_installsitearch=`$PERL -MConfig -e 'print $Config{installsitearch}'` @@ -3245,7 +3247,7 @@ if test "$with_python" = yes; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3249: checking for $ac_word" >&5 +echo "configure:3251: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3283,7 +3285,7 @@ fi echo $ac_n "checking Python installation directories""... $ac_c" 1>&6 -echo "configure:3287: checking Python installation directories" >&5 +echo "configure:3289: checking Python installation directories" >&5 python_version=`${PYTHON} -c "import sys; print sys.version[:3]"` python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` @@ -3307,7 +3309,7 @@ fi echo $ac_n "checking how to link an embedded Python application""... $ac_c" 1>&6 -echo "configure:3311: checking how to link an embedded Python application" >&5 +echo "configure:3313: checking how to link an embedded Python application" >&5 _python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'` _python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'` @@ -3330,7 +3332,7 @@ fi echo $ac_n "checking for readline""... $ac_c" 1>&6 -echo "configure:3334: checking for readline" >&5 +echo "configure:3336: checking for readline" >&5 if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3341,7 +3343,7 @@ for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do pgac_save_LIBS=$LIBS LIBS="${pgac_rllib}${pgac_lib} $LIBS" cat > conftest.$ac_ext <<EOF -#line 3345 "configure" +#line 3347 "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 @@ -3352,7 +3354,7 @@ int main() { readline() ; return 0; } EOF -if { (eval echo configure:3356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* # NetBSD and OpenBSD have a broken linker that does not @@ -3391,14 +3393,14 @@ else fi echo $ac_n "checking for library containing using_history""... $ac_c" 1>&6 -echo "configure:3395: checking for library containing using_history" >&5 +echo "configure:3397: checking for library containing using_history" >&5 if eval "test \"`echo '$''{'ac_cv_search_using_history'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_using_history="no" cat > conftest.$ac_ext <<EOF -#line 3402 "configure" +#line 3404 "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 @@ -3409,7 +3411,7 @@ int main() { using_history() ; return 0; } EOF -if { (eval echo configure:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_using_history="none required" else @@ -3420,7 +3422,7 @@ rm -f conftest* test "$ac_cv_search_using_history" = "no" && for i in history; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 3424 "configure" +#line 3426 "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 @@ -3431,7 +3433,7 @@ int main() { using_history() ; return 0; } EOF -if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_using_history="-l$i" break @@ -3458,7 +3460,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:3462: checking for main in -lbsd" >&5 +echo "configure:3464: checking for main in -lbsd" >&5 ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3466,14 +3468,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 3470 "configure" +#line 3472 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3502,7 +3504,7 @@ fi fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:3506: checking for setproctitle in -lutil" >&5 +echo "configure:3508: checking for setproctitle in -lutil" >&5 ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3510,7 +3512,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 3514 "configure" +#line 3516 "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 @@ -3521,7 +3523,7 @@ int main() { setproctitle() ; return 0; } EOF -if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3549,7 +3551,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3553: checking for main in -lm" >&5 +echo "configure:3555: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3557,14 +3559,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3561 "configure" +#line 3563 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3592,7 +3594,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3596: checking for main in -ldl" >&5 +echo "configure:3598: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3600,14 +3602,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3604 "configure" +#line 3606 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3635,7 +3637,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3639: checking for main in -lsocket" >&5 +echo "configure:3641: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3643,14 +3645,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 3647 "configure" +#line 3649 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3678,7 +3680,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3682: checking for main in -lnsl" >&5 +echo "configure:3684: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3686,14 +3688,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3690 "configure" +#line 3692 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3721,7 +3723,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3725: checking for main in -lipc" >&5 +echo "configure:3727: checking for main in -lipc" >&5 ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3729,14 +3731,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3733 "configure" +#line 3735 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3764,7 +3766,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3768: checking for main in -lIPC" >&5 +echo "configure:3770: checking for main in -lIPC" >&5 ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3772,14 +3774,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lIPC $LIBS" cat > conftest.$ac_ext <<EOF -#line 3776 "configure" +#line 3778 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3807,7 +3809,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3811: checking for main in -llc" >&5 +echo "configure:3813: checking for main in -llc" >&5 ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3815,14 +3817,14 @@ else ac_save_LIBS="$LIBS" LIBS="-llc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3819 "configure" +#line 3821 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3850,7 +3852,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3854: checking for main in -ldld" >&5 +echo "configure:3856: checking for main in -ldld" >&5 ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3858,14 +3860,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3862 "configure" +#line 3864 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3893,7 +3895,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3897: checking for main in -lld" >&5 +echo "configure:3899: checking for main in -lld" >&5 ac_lib_var=`echo ld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3901,14 +3903,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3905 "configure" +#line 3907 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3936,7 +3938,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3940: checking for main in -lcompat" >&5 +echo "configure:3942: checking for main in -lcompat" >&5 ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3944,14 +3946,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <<EOF -#line 3948 "configure" +#line 3950 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3979,7 +3981,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3983: checking for main in -lBSD" >&5 +echo "configure:3985: checking for main in -lBSD" >&5 ac_lib_var=`echo BSD'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3987,14 +3989,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lBSD $LIBS" cat > conftest.$ac_ext <<EOF -#line 3991 "configure" +#line 3993 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4022,7 +4024,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:4026: checking for main in -lgen" >&5 +echo "configure:4028: checking for main in -lgen" >&5 ac_lib_var=`echo gen'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4030,14 +4032,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <<EOF -#line 4034 "configure" +#line 4036 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4065,7 +4067,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:4069: checking for main in -lPW" >&5 +echo "configure:4071: checking for main in -lPW" >&5 ac_lib_var=`echo PW'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4073,14 +4075,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lPW $LIBS" cat > conftest.$ac_ext <<EOF -#line 4077 "configure" +#line 4079 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4108,7 +4110,7 @@ else fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:4112: checking for main in -lresolv" >&5 +echo "configure:4114: checking for main in -lresolv" >&5 ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4116,14 +4118,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 4120 "configure" +#line 4122 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4152,7 +4154,7 @@ fi # QNX: echo $ac_n "checking for main in -lunix""... $ac_c" 1>&6 -echo "configure:4156: checking for main in -lunix" >&5 +echo "configure:4158: checking for main in -lunix" >&5 ac_lib_var=`echo unix'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4160,14 +4162,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lunix $LIBS" cat > conftest.$ac_ext <<EOF -#line 4164 "configure" +#line 4166 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4196,14 +4198,14 @@ fi echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6 -echo "configure:4200: checking for library containing crypt" >&5 +echo "configure:4202: checking for library containing crypt" >&5 if eval "test \"`echo '$''{'ac_cv_search_crypt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_crypt="no" cat > conftest.$ac_ext <<EOF -#line 4207 "configure" +#line 4209 "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 @@ -4214,7 +4216,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_crypt="none required" else @@ -4225,7 +4227,7 @@ rm -f conftest* test "$ac_cv_search_crypt" = "no" && for i in crypt; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4229 "configure" +#line 4231 "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 @@ -4236,7 +4238,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:4240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_crypt="-l$i" break @@ -4258,7 +4260,7 @@ else : fi # BeOS: echo $ac_n "checking for __inet_ntoa in -lbind""... $ac_c" 1>&6 -echo "configure:4262: checking for __inet_ntoa in -lbind" >&5 +echo "configure:4264: checking for __inet_ntoa in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4266,7 +4268,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 4270 "configure" +#line 4272 "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 @@ -4277,7 +4279,7 @@ int main() { __inet_ntoa() ; return 0; } EOF -if { (eval echo configure:4281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4309,7 +4311,7 @@ fi # about 1.0.4 did not). While we could work around the lack of z_streamp, # it seems unwise to encourage people to use such old zlib versions... cat > conftest.$ac_ext <<EOF -#line 4313 "configure" +#line 4315 "configure" #include "confdefs.h" #include <zlib.h> EOF @@ -4318,7 +4320,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | rm -rf conftest* echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:4322: checking for inflate in -lz" >&5 +echo "configure:4324: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4326,7 +4328,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4330 "configure" +#line 4332 "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 @@ -4337,7 +4339,7 @@ int main() { inflate() ; return 0; } EOF -if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4371,14 +4373,14 @@ rm -f conftest* # Solaris: echo $ac_n "checking for library containing fdatasync""... $ac_c" 1>&6 -echo "configure:4375: checking for library containing fdatasync" >&5 +echo "configure:4377: checking for library containing fdatasync" >&5 if eval "test \"`echo '$''{'ac_cv_search_fdatasync'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_fdatasync="no" cat > conftest.$ac_ext <<EOF -#line 4382 "configure" +#line 4384 "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 @@ -4389,7 +4391,7 @@ int main() { fdatasync() ; return 0; } EOF -if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_fdatasync="none required" else @@ -4400,7 +4402,7 @@ rm -f conftest* test "$ac_cv_search_fdatasync" = "no" && for i in rt posix4; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4404 "configure" +#line 4406 "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 @@ -4411,7 +4413,7 @@ int main() { fdatasync() ; return 0; } EOF -if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_fdatasync="-l$i" break @@ -4434,7 +4436,7 @@ fi if test "$with_krb4" = yes ; then echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6 -echo "configure:4438: checking for des_encrypt in -ldes" >&5 +echo "configure:4440: checking for des_encrypt in -ldes" >&5 ac_lib_var=`echo des'_'des_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4442,7 +4444,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldes $LIBS" cat > conftest.$ac_ext <<EOF -#line 4446 "configure" +#line 4448 "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 @@ -4453,7 +4455,7 @@ int main() { des_encrypt() ; return 0; } EOF -if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4482,7 +4484,7 @@ else fi echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6 -echo "configure:4486: checking for krb_sendauth in -lkrb" >&5 +echo "configure:4488: checking for krb_sendauth in -lkrb" >&5 ac_lib_var=`echo krb'_'krb_sendauth | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4490,7 +4492,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb $LIBS" cat > conftest.$ac_ext <<EOF -#line 4494 "configure" +#line 4496 "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 @@ -4501,7 +4503,7 @@ int main() { krb_sendauth() ; return 0; } EOF -if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4533,7 +4535,7 @@ fi if test "$with_krb5" = yes ; then echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6 -echo "configure:4537: checking for com_err in -lcom_err" >&5 +echo "configure:4539: checking for com_err in -lcom_err" >&5 ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4541,7 +4543,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcom_err $LIBS" cat > conftest.$ac_ext <<EOF -#line 4545 "configure" +#line 4547 "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 @@ -4552,7 +4554,7 @@ int main() { com_err() ; return 0; } EOF -if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4581,7 +4583,7 @@ else fi echo $ac_n "checking for krb5_encrypt in -lcrypto""... $ac_c" 1>&6 -echo "configure:4585: checking for krb5_encrypt in -lcrypto" >&5 +echo "configure:4587: checking for krb5_encrypt in -lcrypto" >&5 ac_lib_var=`echo crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4589,7 +4591,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4593 "configure" +#line 4595 "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 @@ -4600,7 +4602,7 @@ int main() { krb5_encrypt() ; return 0; } EOF -if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4626,7 +4628,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb5_encrypt in -lk5crypto""... $ac_c" 1>&6 -echo "configure:4630: checking for krb5_encrypt in -lk5crypto" >&5 +echo "configure:4632: checking for krb5_encrypt in -lk5crypto" >&5 ac_lib_var=`echo k5crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4634,7 +4636,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lk5crypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4638 "configure" +#line 4640 "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 @@ -4645,7 +4647,7 @@ int main() { krb5_encrypt() ; return 0; } EOF -if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4676,7 +4678,7 @@ fi fi echo $ac_n "checking for krb5_sendauth in -lkrb5""... $ac_c" 1>&6 -echo "configure:4680: checking for krb5_sendauth in -lkrb5" >&5 +echo "configure:4682: checking for krb5_sendauth in -lkrb5" >&5 ac_lib_var=`echo krb5'_'krb5_sendauth | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4684,7 +4686,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 $LIBS" cat > conftest.$ac_ext <<EOF -#line 4688 "configure" +#line 4690 "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 @@ -4695,7 +4697,7 @@ int main() { krb5_sendauth() ; return 0; } EOF -if { (eval echo configure:4699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4727,7 +4729,7 @@ fi if test "$with_openssl" = yes ; then echo $ac_n "checking for CRYPTO_new_ex_data in -lcrypto""... $ac_c" 1>&6 -echo "configure:4731: checking for CRYPTO_new_ex_data in -lcrypto" >&5 +echo "configure:4733: checking for CRYPTO_new_ex_data in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_new_ex_data | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4735,7 +4737,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4739 "configure" +#line 4741 "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 @@ -4746,7 +4748,7 @@ int main() { CRYPTO_new_ex_data() ; return 0; } EOF -if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4775,7 +4777,7 @@ else fi echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:4779: checking for SSL_library_init in -lssl" >&5 +echo "configure:4781: checking for SSL_library_init in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4783,7 +4785,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4787 "configure" +#line 4789 "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 @@ -4794,7 +4796,7 @@ int main() { SSL_library_init() ; return 0; } EOF -if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4826,7 +4828,7 @@ fi if test "$with_pam" = yes ; then echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:4830: checking for pam_start in -lpam" >&5 +echo "configure:4832: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4834,7 +4836,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpam $LIBS" cat > conftest.$ac_ext <<EOF -#line 4838 "configure" +#line 4840 "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 @@ -4845,7 +4847,7 @@ int main() { pam_start() ; return 0; } EOF -if { (eval echo configure:4849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4879,14 +4881,14 @@ if test "$enable_nls" = yes ; then echo $ac_n "checking for library containing gettext""... $ac_c" 1>&6 -echo "configure:4883: checking for library containing gettext" >&5 +echo "configure:4885: checking for library containing gettext" >&5 if eval "test \"`echo '$''{'ac_cv_search_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_gettext="no" cat > conftest.$ac_ext <<EOF -#line 4890 "configure" +#line 4892 "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 @@ -4897,7 +4899,7 @@ int main() { gettext() ; return 0; } EOF -if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_gettext="none required" else @@ -4908,7 +4910,7 @@ rm -f conftest* test "$ac_cv_search_gettext" = "no" && for i in intl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4912 "configure" +#line 4914 "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 @@ -4919,7 +4921,7 @@ int main() { gettext() ; return 0; } EOF -if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_gettext="-l$i" break @@ -4941,17 +4943,17 @@ else : fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:4945: checking for libintl.h" >&5 +echo "configure:4947: checking for libintl.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 4950 "configure" +#line 4952 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4957: \"$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* @@ -4978,7 +4980,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4982: checking for $ac_word" >&5 +echo "configure:4984: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5015,7 +5017,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5019: checking for $ac_word" >&5 +echo "configure:5021: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGMERGE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5049,7 +5051,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5053: checking for $ac_word" >&5 +echo "configure:5055: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5102,17 +5104,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5106: checking for $ac_hdr" >&5 +echo "configure:5108: checking for $ac_hdr" >&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 5111 "configure" +#line 5113 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5118: \"$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* @@ -5143,17 +5145,17 @@ for ac_hdr in netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5147: checking for $ac_hdr" >&5 +echo "configure:5149: checking for $ac_hdr" >&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 5152 "configure" +#line 5154 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5159: \"$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* @@ -5180,9 +5182,9 @@ fi done echo $ac_n "checking for netinet/tcp.h""... $ac_c" 1>&6 -echo "configure:5184: checking for netinet/tcp.h" >&5 +echo "configure:5186: checking for netinet/tcp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 5186 "configure" +#line 5188 "configure" #include "confdefs.h" #ifdef HAVE_NETINET_IN_H @@ -5192,7 +5194,7 @@ cat > conftest.$ac_ext <<EOF EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5198: \"$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* @@ -5210,24 +5212,24 @@ fi rm -f conftest* echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6 -echo "configure:5214: checking whether string.h and strings.h may both be included" >&5 +echo "configure:5216: checking whether string.h and strings.h may both be included" >&5 if eval "test \"`echo '$''{'pgac_cv_header_strings_both'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5219 "configure" +#line 5221 "configure" #include "confdefs.h" #include <string.h> #include <strings.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5228: \"$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* cat > conftest.$ac_ext <<EOF -#line 5231 "configure" +#line 5233 "configure" #include "confdefs.h" #include <string.h> #include <strings.h> @@ -5236,7 +5238,7 @@ int main() { int n = strcasecmp("a", "b"); ; return 0; } EOF -if { (eval echo configure:5240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_header_strings_both=yes else @@ -5268,17 +5270,17 @@ for ac_hdr in readline/readline.h readline.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5272: checking for $ac_hdr" >&5 +echo "configure:5274: checking for $ac_hdr" >&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 5277 "configure" +#line 5279 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5284: \"$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* @@ -5308,17 +5310,17 @@ for ac_hdr in readline/history.h history.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5312: checking for $ac_hdr" >&5 +echo "configure:5314: checking for $ac_hdr" >&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 5317 "configure" +#line 5319 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5324: \"$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* @@ -5348,17 +5350,17 @@ done if test "$with_krb4" = yes ; then ac_safe=`echo "krb.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for krb.h""... $ac_c" 1>&6 -echo "configure:5352: checking for krb.h" >&5 +echo "configure:5354: checking for krb.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 5357 "configure" +#line 5359 "configure" #include "confdefs.h" #include <krb.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5364: \"$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* @@ -5385,17 +5387,17 @@ fi if test "$with_krb5" = yes ; then ac_safe=`echo "krb5.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for krb5.h""... $ac_c" 1>&6 -echo "configure:5389: checking for krb5.h" >&5 +echo "configure:5391: checking for krb5.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 5394 "configure" +#line 5396 "configure" #include "confdefs.h" #include <krb5.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5401: \"$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* @@ -5419,17 +5421,17 @@ fi ac_safe=`echo "com_err.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for com_err.h""... $ac_c" 1>&6 -echo "configure:5423: checking for com_err.h" >&5 +echo "configure:5425: checking for com_err.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 5428 "configure" +#line 5430 "configure" #include "confdefs.h" #include <com_err.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5435: \"$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* @@ -5456,17 +5458,17 @@ fi if test "$with_openssl" = yes ; then ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6 -echo "configure:5460: checking for openssl/ssl.h" >&5 +echo "configure:5462: checking for openssl/ssl.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 5465 "configure" +#line 5467 "configure" #include "confdefs.h" #include <openssl/ssl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5472: \"$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* @@ -5490,17 +5492,17 @@ fi ac_safe=`echo "openssl/err.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for openssl/err.h""... $ac_c" 1>&6 -echo "configure:5494: checking for openssl/err.h" >&5 +echo "configure:5496: checking for openssl/err.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 5499 "configure" +#line 5501 "configure" #include "confdefs.h" #include <openssl/err.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5506: \"$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* @@ -5527,17 +5529,17 @@ fi if test "$with_pam" = yes ; then ac_safe=`echo "security/pam_appl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for security/pam_appl.h""... $ac_c" 1>&6 -echo "configure:5531: checking for security/pam_appl.h" >&5 +echo "configure:5533: checking for security/pam_appl.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 5536 "configure" +#line 5538 "configure" #include "confdefs.h" #include <security/pam_appl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5543: \"$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* @@ -5566,18 +5568,18 @@ fi ## Types, structures, compiler characteristics ## echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5570: checking for working const" >&5 +echo "configure:5572: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5575 "configure" +#line 5577 "configure" #include "confdefs.h" int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; +typedef int charset[2]; const charset x={0,0}; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -5620,7 +5622,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5641,21 +5643,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5645: checking for inline" >&5 +echo "configure:5647: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 5652 "configure" +#line 5654 "configure" #include "confdefs.h" int main() { -} $ac_kw foo() { +} $ac_kw int foo() { ; return 0; } EOF -if { (eval echo configure:5659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5683,12 +5685,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:5687: checking for preprocessor stringizing operator" >&5 +echo "configure:5689: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5692 "configure" +#line 5694 "configure" #include "confdefs.h" #define x(y) #y @@ -5718,19 +5720,19 @@ fi echo "$ac_t""${ac_cv_c_stringize}" 1>&6 echo $ac_n "checking for signed types""... $ac_c" 1>&6 -echo "configure:5722: checking for signed types" >&5 +echo "configure:5724: checking for signed types" >&5 if eval "test \"`echo '$''{'pgac_cv_c_signed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5727 "configure" +#line 5729 "configure" #include "confdefs.h" int main() { signed char c; signed short s; signed int i; ; return 0; } EOF -if { (eval echo configure:5734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_signed=yes else @@ -5750,19 +5752,19 @@ EOF fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:5754: checking for volatile" >&5 +echo "configure:5756: checking for volatile" >&5 if eval "test \"`echo '$''{'pgac_cv_c_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5759 "configure" +#line 5761 "configure" #include "confdefs.h" int main() { extern volatile int i; ; return 0; } EOF -if { (eval echo configure:5766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_volatile=yes else @@ -5782,12 +5784,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5786: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5788: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5791 "configure" +#line 5793 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -5795,7 +5797,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5816,12 +5818,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5820: checking for tm_zone in struct tm" >&5 +echo "configure:5822: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5825 "configure" +#line 5827 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -5829,7 +5831,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5849,12 +5851,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5853: checking for tzname" >&5 +echo "configure:5855: 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 5858 "configure" +#line 5860 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -5864,7 +5866,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5886,12 +5888,12 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:5890: checking for union semun" >&5 +echo "configure:5892: checking for union semun" >&5 if eval "test \"`echo '$''{'pgac_cv_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5895 "configure" +#line 5897 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/ipc.h> @@ -5900,7 +5902,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:5904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_union_semun=yes else @@ -5920,12 +5922,12 @@ EOF fi echo $ac_n "checking for struct cmsgcred""... $ac_c" 1>&6 -echo "configure:5924: checking for struct cmsgcred" >&5 +echo "configure:5926: checking for struct cmsgcred" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_cmsgcred'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5929 "configure" +#line 5931 "configure" #include "confdefs.h" #include <sys/param.h> #include <sys/socket.h> @@ -5934,7 +5936,7 @@ int main() { struct cmsgcred sockcred; ; return 0; } EOF -if { (eval echo configure:5938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_cmsgcred=yes else @@ -5954,12 +5956,12 @@ EOF fi echo $ac_n "checking for struct fcred""... $ac_c" 1>&6 -echo "configure:5958: checking for struct fcred" >&5 +echo "configure:5960: checking for struct fcred" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_fcred'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5963 "configure" +#line 5965 "configure" #include "confdefs.h" #include <sys/param.h> #include <sys/socket.h> @@ -5968,7 +5970,7 @@ int main() { struct fcred sockcred; ; return 0; } EOF -if { (eval echo configure:5972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_fcred=yes else @@ -5988,12 +5990,12 @@ EOF fi echo $ac_n "checking for struct sockcred""... $ac_c" 1>&6 -echo "configure:5992: checking for struct sockcred" >&5 +echo "configure:5994: checking for struct sockcred" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_sockcred'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5997 "configure" +#line 5999 "configure" #include "confdefs.h" #include <sys/param.h> #include <sys/socket.h> @@ -6002,7 +6004,7 @@ int main() { struct sockcred sockcred; ; return 0; } EOF -if { (eval echo configure:6006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_sockcred=yes else @@ -6022,12 +6024,12 @@ EOF fi echo $ac_n "checking for struct sockaddr_un""... $ac_c" 1>&6 -echo "configure:6026: checking for struct sockaddr_un" >&5 +echo "configure:6028: checking for struct sockaddr_un" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_sockaddr_un'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6031 "configure" +#line 6033 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_UN_H @@ -6037,7 +6039,7 @@ int main() { struct sockaddr_un un; ; return 0; } EOF -if { (eval echo configure:6041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_sockaddr_un=yes else @@ -6061,12 +6063,12 @@ fi ## Functions, global variables ## echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:6065: checking for int timezone" >&5 +echo "configure:6067: checking for int timezone" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6070 "configure" +#line 6072 "configure" #include "confdefs.h" #include <time.h> int res; @@ -6074,7 +6076,7 @@ int main() { res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:6078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_int_timezone=yes else @@ -6094,7 +6096,7 @@ EOF fi echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6 -echo "configure:6098: checking types of arguments for accept()" >&5 +echo "configure:6100: checking types of arguments for accept()" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept_arg1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6108,7 +6110,7 @@ else for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do cat > conftest.$ac_ext <<EOF -#line 6112 "configure" +#line 6114 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -6121,7 +6123,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no; break 3 else @@ -6161,12 +6163,12 @@ EOF echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6 -echo "configure:6165: checking whether gettimeofday takes only one argument" >&5 +echo "configure:6167: checking whether gettimeofday takes only one argument" >&5 if eval "test \"`echo '$''{'pgac_cv_func_gettimeofday_1arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6170 "configure" +#line 6172 "configure" #include "confdefs.h" #include <sys/time.h> int main() { @@ -6175,7 +6177,7 @@ struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:6179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_func_gettimeofday_1arg=no else @@ -6198,12 +6200,12 @@ fi for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6202: checking for $ac_func" >&5 +echo "configure:6204: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6207 "configure" +#line 6209 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6226,7 +6228,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6252,7 +6254,7 @@ done cat > conftest.$ac_ext <<EOF -#line 6256 "configure" +#line 6258 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -6268,12 +6270,12 @@ rm -f conftest* echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:6272: checking for PS_STRINGS" >&5 +echo "configure:6274: checking for PS_STRINGS" >&5 if eval "test \"`echo '$''{'pgac_cv_var_PS_STRINGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6277 "configure" +#line 6279 "configure" #include "confdefs.h" #include <machine/vmparam.h> #include <sys/exec.h> @@ -6283,7 +6285,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:6287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_PS_STRINGS=yes else @@ -6305,12 +6307,12 @@ fi SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:6309: checking for snprintf" >&5 +echo "configure:6311: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6314 "configure" +#line 6316 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf(); below. */ @@ -6333,7 +6335,7 @@ snprintf(); ; return 0; } EOF -if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -6357,12 +6359,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:6361: checking for vsnprintf" >&5 +echo "configure:6363: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6366 "configure" +#line 6368 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -6385,7 +6387,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:6389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -6410,7 +6412,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 6414 "configure" +#line 6416 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -6425,7 +6427,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 6429 "configure" +#line 6431 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -6442,12 +6444,12 @@ rm -f conftest* # do this one the hard way in case isinf() is a macro echo $ac_n "checking for isinf""... $ac_c" 1>&6 -echo "configure:6446: checking for isinf" >&5 +echo "configure:6448: checking for isinf" >&5 if eval "test \"`echo '$''{'ac_cv_func_isinf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6451 "configure" +#line 6453 "configure" #include "confdefs.h" #include <math.h> @@ -6455,7 +6457,7 @@ int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:6459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_isinf=yes else @@ -6481,12 +6483,12 @@ else for ac_func in fpclass fp_class fp_class_d class do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6485: checking for $ac_func" >&5 +echo "configure:6487: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6490 "configure" +#line 6492 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6509,7 +6511,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6537,12 +6539,12 @@ fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:6541: checking for getrusage" >&5 +echo "configure:6543: checking for getrusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6546 "configure" +#line 6548 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getrusage(); below. */ @@ -6565,7 +6567,7 @@ getrusage(); ; return 0; } EOF -if { (eval echo configure:6569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getrusage=yes" else @@ -6590,12 +6592,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:6594: checking for srandom" >&5 +echo "configure:6596: checking for srandom" >&5 if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6599 "configure" +#line 6601 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char srandom(); below. */ @@ -6618,7 +6620,7 @@ srandom(); ; return 0; } EOF -if { (eval echo configure:6622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_srandom=yes" else @@ -6643,12 +6645,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:6647: checking for gethostname" >&5 +echo "configure:6649: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6652 "configure" +#line 6654 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ @@ -6671,7 +6673,7 @@ gethostname(); ; return 0; } EOF -if { (eval echo configure:6675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else @@ -6696,12 +6698,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:6700: checking for random" >&5 +echo "configure:6702: checking for random" >&5 if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6705 "configure" +#line 6707 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char random(); below. */ @@ -6724,7 +6726,7 @@ random(); ; return 0; } EOF -if { (eval echo configure:6728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_random=yes" else @@ -6749,12 +6751,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:6753: checking for inet_aton" >&5 +echo "configure:6755: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6758 "configure" +#line 6760 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char inet_aton(); below. */ @@ -6777,7 +6779,7 @@ inet_aton(); ; return 0; } EOF -if { (eval echo configure:6781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -6802,12 +6804,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:6806: checking for strerror" >&5 +echo "configure:6808: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6811 "configure" +#line 6813 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strerror(); below. */ @@ -6830,7 +6832,7 @@ strerror(); ; return 0; } EOF -if { (eval echo configure:6834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else @@ -6855,12 +6857,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:6859: checking for strdup" >&5 +echo "configure:6861: checking for strdup" >&5 if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6864 "configure" +#line 6866 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strdup(); below. */ @@ -6883,7 +6885,7 @@ strdup(); ; return 0; } EOF -if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strdup=yes" else @@ -6908,12 +6910,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:6912: checking for strtol" >&5 +echo "configure:6914: checking for strtol" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6917 "configure" +#line 6919 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtol(); below. */ @@ -6936,7 +6938,7 @@ strtol(); ; return 0; } EOF -if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtol=yes" else @@ -6961,12 +6963,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:6965: checking for strtoul" >&5 +echo "configure:6967: checking for strtoul" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6970 "configure" +#line 6972 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtoul(); below. */ @@ -6989,7 +6991,7 @@ strtoul(); ; return 0; } EOF -if { (eval echo configure:6993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtoul=yes" else @@ -7014,12 +7016,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:7018: checking for strcasecmp" >&5 +echo "configure:7020: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7023 "configure" +#line 7025 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp(); below. */ @@ -7042,7 +7044,7 @@ strcasecmp(); ; return 0; } EOF -if { (eval echo configure:7046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -7067,12 +7069,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:7071: checking for cbrt" >&5 +echo "configure:7073: checking for cbrt" >&5 if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7076 "configure" +#line 7078 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char cbrt(); below. */ @@ -7095,7 +7097,7 @@ cbrt(); ; return 0; } EOF -if { (eval echo configure:7099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cbrt=yes" else @@ -7116,7 +7118,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:7120: checking for cbrt in -lm" >&5 +echo "configure:7122: checking for cbrt in -lm" >&5 ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7124,7 +7126,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7128 "configure" +#line 7130 "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 @@ -7135,7 +7137,7 @@ int main() { cbrt() ; return 0; } EOF -if { (eval echo configure:7139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7173,12 +7175,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:7177: checking for rint" >&5 +echo "configure:7179: checking for rint" >&5 if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7182 "configure" +#line 7184 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char rint(); below. */ @@ -7201,7 +7203,7 @@ rint(); ; return 0; } EOF -if { (eval echo configure:7205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_rint=yes" else @@ -7222,7 +7224,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:7226: checking for rint in -lm" >&5 +echo "configure:7228: checking for rint in -lm" >&5 ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7230,7 +7232,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $HPUXMATHLIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 7234 "configure" +#line 7236 "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 @@ -7241,7 +7243,7 @@ int main() { rint() ; return 0; } EOF -if { (eval echo configure:7245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7270,9 +7272,9 @@ fi # Readline versions < 2.1 don't have rl_completion_append_character echo $ac_n "checking for rl_completion_append_character""... $ac_c" 1>&6 -echo "configure:7274: checking for rl_completion_append_character" >&5 +echo "configure:7276: checking for rl_completion_append_character" >&5 cat > conftest.$ac_ext <<EOF -#line 7276 "configure" +#line 7278 "configure" #include "confdefs.h" #include <stdio.h> #ifdef HAVE_READLINE_READLINE_H @@ -7285,7 +7287,7 @@ int main() { rl_completion_append_character = 'x'; ; return 0; } EOF -if { (eval echo configure:7289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -7303,12 +7305,12 @@ rm -f conftest* for ac_func in rl_completion_matches rl_filename_completion_function do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7307: checking for $ac_func" >&5 +echo "configure:7309: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7312 "configure" +#line 7314 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7331,7 +7333,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7358,16 +7360,16 @@ done echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:7362: checking for finite" >&5 +echo "configure:7364: checking for finite" >&5 cat > conftest.$ac_ext <<EOF -#line 7364 "configure" +#line 7366 "configure" #include "confdefs.h" #include <math.h> int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FINITE 1 @@ -7382,16 +7384,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7386: checking for sigsetjmp" >&5 +echo "configure:7388: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 7388 "configure" +#line 7390 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:7395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SIGSETJMP 1 @@ -7411,12 +7413,12 @@ if test x"${enable_syslog+set}" = xset; then case $enable_syslog in yes) echo $ac_n "checking for syslog""... $ac_c" 1>&6 -echo "configure:7415: checking for syslog" >&5 +echo "configure:7417: checking for syslog" >&5 if eval "test \"`echo '$''{'ac_cv_func_syslog'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7420 "configure" +#line 7422 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char syslog(); below. */ @@ -7439,7 +7441,7 @@ syslog(); ; return 0; } EOF -if { (eval echo configure:7443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_syslog=yes" else @@ -7478,19 +7480,19 @@ fi echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:7482: checking for optreset" >&5 +echo "configure:7484: checking for optreset" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_optreset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7487 "configure" +#line 7489 "configure" #include "confdefs.h" #include <unistd.h> int main() { extern int optreset; optreset = 1; ; return 0; } EOF -if { (eval echo configure:7494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_int_optreset=yes else @@ -7516,16 +7518,16 @@ fi # This check should come after all modifications of compiler or linker # variables, and before any other run tests. echo $ac_n "checking test program""... $ac_c" 1>&6 -echo "configure:7520: checking test program" >&5 +echo "configure:7522: checking test program" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""cross-compiling" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7525 "configure" +#line 7527 "configure" #include "confdefs.h" int main() { return 0; } EOF -if { (eval echo configure:7529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""ok" 1>&6 else @@ -7545,7 +7547,7 @@ fi echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 -echo "configure:7549: checking whether long int is 64 bits" >&5 +echo "configure:7551: checking whether long int is 64 bits" >&5 if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7554,7 +7556,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 7558 "configure" +#line 7560 "configure" #include "confdefs.h" typedef long int int64; @@ -7583,7 +7585,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:7587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_type_long_int_64=yes else @@ -7610,7 +7612,7 @@ fi if test x"$HAVE_LONG_INT_64" = x"no" ; then echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6 -echo "configure:7614: checking whether long long int is 64 bits" >&5 +echo "configure:7616: checking whether long long int is 64 bits" >&5 if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7619,7 +7621,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 7623 "configure" +#line 7625 "configure" #include "confdefs.h" typedef long long int int64; @@ -7648,7 +7650,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:7652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_type_long_long_int_64=yes else @@ -7678,7 +7680,7 @@ fi if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then cat > conftest.$ac_ext <<EOF -#line 7682 "configure" +#line 7684 "configure" #include "confdefs.h" #define INT64CONST(x) x##LL @@ -7688,7 +7690,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_LL_CONSTANTS 1 @@ -7706,7 +7708,7 @@ fi if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x$SNPRINTF = x ] ; then echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6 -echo "configure:7710: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:7712: checking whether snprintf handles 'long long int' as %lld" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 # Force usage of our own snprintf, since we cannot test foreign snprintf @@ -7715,7 +7717,7 @@ echo "configure:7710: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext <<EOF -#line 7719 "configure" +#line 7721 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -7742,7 +7744,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 INT64_FORMAT='"%lld"' @@ -7753,7 +7755,7 @@ else rm -fr conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6 -echo "configure:7757: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:7759: checking whether snprintf handles 'long long int' as %qd" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 # Force usage of our own snprintf, since we cannot test foreign snprintf @@ -7762,7 +7764,7 @@ echo "configure:7757: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext <<EOF -#line 7766 "configure" +#line 7768 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -7789,7 +7791,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 INT64_FORMAT='"%qd"' @@ -7829,12 +7831,12 @@ EOF for ac_func in strtoll strtoq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7833: checking for $ac_func" >&5 +echo "configure:7835: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7838 "configure" +#line 7840 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7857,7 +7859,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7884,12 +7886,12 @@ done for ac_func in strtoull strtouq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7888: checking for $ac_func" >&5 +echo "configure:7890: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7893 "configure" +#line 7895 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7912,7 +7914,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7938,12 +7940,12 @@ done echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:7942: checking for atexit" >&5 +echo "configure:7944: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7947 "configure" +#line 7949 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char atexit(); below. */ @@ -7966,7 +7968,7 @@ atexit(); ; return 0; } EOF -if { (eval echo configure:7970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -7989,12 +7991,12 @@ else for ac_func in on_exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7993: checking for $ac_func" >&5 +echo "configure:7995: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7998 "configure" +#line 8000 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8017,7 +8019,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8050,7 +8052,7 @@ fi echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:8054: checking size of unsigned long" >&5 +echo "configure:8056: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8058,7 +8060,7 @@ else ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext <<EOF -#line 8062 "configure" +#line 8064 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -8069,7 +8071,7 @@ main() exit(0); } EOF -if { (eval echo configure:8073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -8095,7 +8097,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:8099: checking alignment of short" >&5 +echo "configure:8101: checking alignment of short" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8103,7 +8105,7 @@ else pgac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext <<EOF -#line 8107 "configure" +#line 8109 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; short field; } mystruct; @@ -8115,7 +8117,7 @@ main() exit(0); } EOF -if { (eval echo configure:8119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_short=`cat conftestval` else @@ -8135,7 +8137,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:8139: checking alignment of int" >&5 +echo "configure:8141: checking alignment of int" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8143,7 +8145,7 @@ else pgac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext <<EOF -#line 8147 "configure" +#line 8149 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; int field; } mystruct; @@ -8155,7 +8157,7 @@ main() exit(0); } EOF -if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_int=`cat conftestval` else @@ -8175,7 +8177,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:8179: checking alignment of long" >&5 +echo "configure:8181: checking alignment of long" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8183,7 +8185,7 @@ else pgac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext <<EOF -#line 8187 "configure" +#line 8189 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long field; } mystruct; @@ -8195,7 +8197,7 @@ main() exit(0); } EOF -if { (eval echo configure:8199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_long=`cat conftestval` else @@ -8216,7 +8218,7 @@ EOF if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6 -echo "configure:8220: checking alignment of long long int" >&5 +echo "configure:8222: checking alignment of long long int" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8224,7 +8226,7 @@ else pgac_cv_alignof_long_long_int='sizeof(long long int)' else cat > conftest.$ac_ext <<EOF -#line 8228 "configure" +#line 8230 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long long int field; } mystruct; @@ -8236,7 +8238,7 @@ main() exit(0); } EOF -if { (eval echo configure:8240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_long_long_int=`cat conftestval` else @@ -8257,7 +8259,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:8261: checking alignment of double" >&5 +echo "configure:8263: checking alignment of double" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8265,7 +8267,7 @@ else pgac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext <<EOF -#line 8269 "configure" +#line 8271 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; double field; } mystruct; @@ -8277,7 +8279,7 @@ main() exit(0); } EOF -if { (eval echo configure:8281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_double=`cat conftestval` else @@ -8315,12 +8317,12 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:8319: checking for POSIX signal interface" >&5 +echo "configure:8321: checking for POSIX signal interface" >&5 if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8324 "configure" +#line 8326 "configure" #include "confdefs.h" #include <signal.h> @@ -8331,7 +8333,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:8335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_func_posix_signals=yes else @@ -8361,7 +8363,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8365: checking for $ac_word" >&5 +echo "configure:8367: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8397,7 +8399,7 @@ test -n "$TCLSH" && break done echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:8401: checking for tclConfig.sh" >&5 +echo "configure:8403: checking for tclConfig.sh" >&5 # Let user override test if test -z "$TCL_CONFIG_SH"; then pgac_test_dirs="$with_tclconfig" @@ -8430,7 +8432,7 @@ fi # Check for Tk configuration script tkConfig.sh if test "$with_tk" = yes; then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:8434: checking for tkConfig.sh" >&5 +echo "configure:8436: checking for tkConfig.sh" >&5 # Let user override test if test -z "$TK_CONFIG_SH"; then pgac_test_dirs="$with_tkconfig $with_tclconfig" @@ -8469,7 +8471,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8473: checking for $ac_word" >&5 +echo "configure:8475: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8505,7 +8507,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8509: checking for $ac_word" >&5 +echo "configure:8511: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8536,7 +8538,7 @@ done echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6 -echo "configure:8540: checking for DocBook V3.1" >&5 +echo "configure:8542: checking for DocBook V3.1" >&5 if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8569,7 +8571,7 @@ have_docbook=$pgac_cv_check_docbook echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6 -echo "configure:8573: checking for DocBook stylesheets" >&5 +echo "configure:8575: checking for DocBook stylesheets" >&5 if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8608,7 +8610,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8612: checking for $ac_word" >&5 +echo "configure:8614: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/configure.in b/configure.in index 9ecee9ba171..3a25d33ad64 100644 --- a/configure.in +++ b/configure.in @@ -179,7 +179,7 @@ PGAC_ARG_OPTARG(enable, multibyte, [ --enable-multibyte enable multibyte c [MULTIBYTE=SQL_ASCII], [ case $enableval in - SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT) + SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT|ISO_8859_5|ISO_8859_6|ISO_8859_7|ISO_8859_8|ISO_8859_10|ISO_8859_13|ISO_8859_14|ISO_8859_15|ISO_8859_16) MULTIBYTE=$enableval;; *) AC_MSG_ERROR( @@ -187,7 +187,9 @@ PGAC_ARG_OPTARG(enable, multibyte, [ --enable-multibyte enable multibyte c SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL, LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, - KOI8, WIN, ALT + KOI8, WIN, ALT, + ISO_8859_6, ISO_8859_7, ISO_8859_8, + ISO_8859_10, ISO_8859_13, ISO_8859_14, ISO_8859_15, ISO_8859_16 Or do not specify an argument to the option to use the default.]);; esac ], diff --git a/src/backend/utils/mb/Unicode/UCS_to_8859.pl b/src/backend/utils/mb/Unicode/UCS_to_8859.pl index 3d546a58e76..a0ed7b88766 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_8859.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_8859.pl @@ -2,13 +2,13 @@ # # Copyright 2001 by PostgreSQL Global Development Group # -# $Id: UCS_to_8859.pl,v 1.2 2000/11/26 10:40:43 ishii Exp $ +# $Id: UCS_to_8859.pl,v 1.3 2001/10/11 14:20:35 ishii Exp $ # # Generate UTF-8 <--> ISO8859 code conversion tables from # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain "8859-[2-5].TXT" from the organization's ftp site. +# you have to obtain "8859-[2-16].TXT" from the organization's ftp site. # We assume the file include three tab-separated columns: # ISO/IEC 8859 code in hex # UCS-2 code in hex @@ -16,7 +16,7 @@ require "ucs2utf.pl"; -@charsets = (2,3,4,5); +@charsets = (2,3,4,5,6,7,8,9,10,13,14,15,16); foreach $charset (@charsets) { # diff --git a/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map new file mode 100644 index 00000000000..fd0a0a36769 --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map @@ -0,0 +1,130 @@ +static pg_local_to_utf LUmapISO8859_10[ 128 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xc484}, + {0x00a2, 0xc492}, + {0x00a3, 0xc4a2}, + {0x00a4, 0xc4aa}, + {0x00a5, 0xc4a8}, + {0x00a6, 0xc4b6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc4bb}, + {0x00a9, 0xc490}, + {0x00aa, 0xc5a0}, + {0x00ab, 0xc5a6}, + {0x00ac, 0xc5bd}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc5aa}, + {0x00af, 0xc58a}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc485}, + {0x00b2, 0xc493}, + {0x00b3, 0xc4a3}, + {0x00b4, 0xc4ab}, + {0x00b5, 0xc4a9}, + {0x00b6, 0xc4b7}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc4bc}, + {0x00b9, 0xc491}, + {0x00ba, 0xc5a1}, + {0x00bb, 0xc5a7}, + {0x00bc, 0xc5be}, + {0x00bd, 0xe28095}, + {0x00be, 0xc5ab}, + {0x00bf, 0xc58b}, + {0x00c0, 0xc480}, + {0x00c1, 0xc381}, + {0x00c2, 0xc382}, + {0x00c3, 0xc383}, + {0x00c4, 0xc384}, + {0x00c5, 0xc385}, + {0x00c6, 0xc386}, + {0x00c7, 0xc4ae}, + {0x00c8, 0xc48c}, + {0x00c9, 0xc389}, + {0x00ca, 0xc498}, + {0x00cb, 0xc38b}, + {0x00cc, 0xc496}, + {0x00cd, 0xc38d}, + {0x00ce, 0xc38e}, + {0x00cf, 0xc38f}, + {0x00d0, 0xc390}, + {0x00d1, 0xc585}, + {0x00d2, 0xc58c}, + {0x00d3, 0xc393}, + {0x00d4, 0xc394}, + {0x00d5, 0xc395}, + {0x00d6, 0xc396}, + {0x00d7, 0xc5a8}, + {0x00d8, 0xc398}, + {0x00d9, 0xc5b2}, + {0x00da, 0xc39a}, + {0x00db, 0xc39b}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc39d}, + {0x00de, 0xc39e}, + {0x00df, 0xc39f}, + {0x00e0, 0xc481}, + {0x00e1, 0xc3a1}, + {0x00e2, 0xc3a2}, + {0x00e3, 0xc3a3}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc3a5}, + {0x00e6, 0xc3a6}, + {0x00e7, 0xc4af}, + {0x00e8, 0xc48d}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc499}, + {0x00eb, 0xc3ab}, + {0x00ec, 0xc497}, + {0x00ed, 0xc3ad}, + {0x00ee, 0xc3ae}, + {0x00ef, 0xc3af}, + {0x00f0, 0xc3b0}, + {0x00f1, 0xc586}, + {0x00f2, 0xc58d}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc3b4}, + {0x00f5, 0xc3b5}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xc5a9}, + {0x00f8, 0xc3b8}, + {0x00f9, 0xc5b3}, + {0x00fa, 0xc3ba}, + {0x00fb, 0xc3bb}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc3bd}, + {0x00fe, 0xc3be}, + {0x00ff, 0xc4b8} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map new file mode 100644 index 00000000000..77bc5aeac5d --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map @@ -0,0 +1,130 @@ +static pg_local_to_utf LUmapISO8859_13[ 128 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xe2809d}, + {0x00a2, 0xc2a2}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xc2a4}, + {0x00a5, 0xe2809e}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc398}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc596}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc386}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xe2809c}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc3b8}, + {0x00b9, 0xc2b9}, + {0x00ba, 0xc597}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc2bc}, + {0x00bd, 0xc2bd}, + {0x00be, 0xc2be}, + {0x00bf, 0xc3a6}, + {0x00c0, 0xc484}, + {0x00c1, 0xc4ae}, + {0x00c2, 0xc480}, + {0x00c3, 0xc486}, + {0x00c4, 0xc384}, + {0x00c5, 0xc385}, + {0x00c6, 0xc498}, + {0x00c7, 0xc492}, + {0x00c8, 0xc48c}, + {0x00c9, 0xc389}, + {0x00ca, 0xc5b9}, + {0x00cb, 0xc496}, + {0x00cc, 0xc4a2}, + {0x00cd, 0xc4b6}, + {0x00ce, 0xc4aa}, + {0x00cf, 0xc4bb}, + {0x00d0, 0xc5a0}, + {0x00d1, 0xc583}, + {0x00d2, 0xc585}, + {0x00d3, 0xc393}, + {0x00d4, 0xc58c}, + {0x00d5, 0xc395}, + {0x00d6, 0xc396}, + {0x00d7, 0xc397}, + {0x00d8, 0xc5b2}, + {0x00d9, 0xc581}, + {0x00da, 0xc59a}, + {0x00db, 0xc5aa}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc5bb}, + {0x00de, 0xc5bd}, + {0x00df, 0xc39f}, + {0x00e0, 0xc485}, + {0x00e1, 0xc4af}, + {0x00e2, 0xc481}, + {0x00e3, 0xc487}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc3a5}, + {0x00e6, 0xc499}, + {0x00e7, 0xc493}, + {0x00e8, 0xc48d}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc5ba}, + {0x00eb, 0xc497}, + {0x00ec, 0xc4a3}, + {0x00ed, 0xc4b7}, + {0x00ee, 0xc4ab}, + {0x00ef, 0xc4bc}, + {0x00f0, 0xc5a1}, + {0x00f1, 0xc584}, + {0x00f2, 0xc586}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc58d}, + {0x00f5, 0xc3b5}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xc3b7}, + {0x00f8, 0xc5b3}, + {0x00f9, 0xc582}, + {0x00fa, 0xc59b}, + {0x00fb, 0xc5ab}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc5bc}, + {0x00fe, 0xc5be}, + {0x00ff, 0xe28099} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map new file mode 100644 index 00000000000..d3f2054bbb7 --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map @@ -0,0 +1,130 @@ +static pg_local_to_utf LUmapISO8859_14[ 128 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xe1b882}, + {0x00a2, 0xe1b883}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xc48a}, + {0x00a5, 0xc48b}, + {0x00a6, 0xe1b88a}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xe1ba80}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xe1ba82}, + {0x00ab, 0xe1b88b}, + {0x00ac, 0xe1bbb2}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc5b8}, + {0x00b0, 0xe1b89e}, + {0x00b1, 0xe1b89f}, + {0x00b2, 0xc4a0}, + {0x00b3, 0xc4a1}, + {0x00b4, 0xe1b980}, + {0x00b5, 0xe1b981}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xe1b996}, + {0x00b8, 0xe1ba81}, + {0x00b9, 0xe1b997}, + {0x00ba, 0xe1ba83}, + {0x00bb, 0xe1b9a0}, + {0x00bc, 0xe1bbb3}, + {0x00bd, 0xe1ba84}, + {0x00be, 0xe1ba85}, + {0x00bf, 0xe1b9a1}, + {0x00c0, 0xc380}, + {0x00c1, 0xc381}, + {0x00c2, 0xc382}, + {0x00c3, 0xc383}, + {0x00c4, 0xc384}, + {0x00c5, 0xc385}, + {0x00c6, 0xc386}, + {0x00c7, 0xc387}, + {0x00c8, 0xc388}, + {0x00c9, 0xc389}, + {0x00ca, 0xc38a}, + {0x00cb, 0xc38b}, + {0x00cc, 0xc38c}, + {0x00cd, 0xc38d}, + {0x00ce, 0xc38e}, + {0x00cf, 0xc38f}, + {0x00d0, 0xc5b4}, + {0x00d1, 0xc391}, + {0x00d2, 0xc392}, + {0x00d3, 0xc393}, + {0x00d4, 0xc394}, + {0x00d5, 0xc395}, + {0x00d6, 0xc396}, + {0x00d7, 0xe1b9aa}, + {0x00d8, 0xc398}, + {0x00d9, 0xc399}, + {0x00da, 0xc39a}, + {0x00db, 0xc39b}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc39d}, + {0x00de, 0xc5b6}, + {0x00df, 0xc39f}, + {0x00e0, 0xc3a0}, + {0x00e1, 0xc3a1}, + {0x00e2, 0xc3a2}, + {0x00e3, 0xc3a3}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc3a5}, + {0x00e6, 0xc3a6}, + {0x00e7, 0xc3a7}, + {0x00e8, 0xc3a8}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc3aa}, + {0x00eb, 0xc3ab}, + {0x00ec, 0xc3ac}, + {0x00ed, 0xc3ad}, + {0x00ee, 0xc3ae}, + {0x00ef, 0xc3af}, + {0x00f0, 0xc5b5}, + {0x00f1, 0xc3b1}, + {0x00f2, 0xc3b2}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc3b4}, + {0x00f5, 0xc3b5}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xe1b9ab}, + {0x00f8, 0xc3b8}, + {0x00f9, 0xc3b9}, + {0x00fa, 0xc3ba}, + {0x00fb, 0xc3bb}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc3bd}, + {0x00fe, 0xc5b7}, + {0x00ff, 0xc3bf} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map new file mode 100644 index 00000000000..594e22338f6 --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map @@ -0,0 +1,130 @@ +static pg_local_to_utf LUmapISO8859_15[ 128 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xc2a1}, + {0x00a2, 0xc2a2}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xe282ac}, + {0x00a5, 0xc2a5}, + {0x00a6, 0xc5a0}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc5a1}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc2aa}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc2af}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xc5bd}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc5be}, + {0x00b9, 0xc2b9}, + {0x00ba, 0xc2ba}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc592}, + {0x00bd, 0xc593}, + {0x00be, 0xc5b8}, + {0x00bf, 0xc2bf}, + {0x00c0, 0xc380}, + {0x00c1, 0xc381}, + {0x00c2, 0xc382}, + {0x00c3, 0xc383}, + {0x00c4, 0xc384}, + {0x00c5, 0xc385}, + {0x00c6, 0xc386}, + {0x00c7, 0xc387}, + {0x00c8, 0xc388}, + {0x00c9, 0xc389}, + {0x00ca, 0xc38a}, + {0x00cb, 0xc38b}, + {0x00cc, 0xc38c}, + {0x00cd, 0xc38d}, + {0x00ce, 0xc38e}, + {0x00cf, 0xc38f}, + {0x00d0, 0xc390}, + {0x00d1, 0xc391}, + {0x00d2, 0xc392}, + {0x00d3, 0xc393}, + {0x00d4, 0xc394}, + {0x00d5, 0xc395}, + {0x00d6, 0xc396}, + {0x00d7, 0xc397}, + {0x00d8, 0xc398}, + {0x00d9, 0xc399}, + {0x00da, 0xc39a}, + {0x00db, 0xc39b}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc39d}, + {0x00de, 0xc39e}, + {0x00df, 0xc39f}, + {0x00e0, 0xc3a0}, + {0x00e1, 0xc3a1}, + {0x00e2, 0xc3a2}, + {0x00e3, 0xc3a3}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc3a5}, + {0x00e6, 0xc3a6}, + {0x00e7, 0xc3a7}, + {0x00e8, 0xc3a8}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc3aa}, + {0x00eb, 0xc3ab}, + {0x00ec, 0xc3ac}, + {0x00ed, 0xc3ad}, + {0x00ee, 0xc3ae}, + {0x00ef, 0xc3af}, + {0x00f0, 0xc3b0}, + {0x00f1, 0xc3b1}, + {0x00f2, 0xc3b2}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc3b4}, + {0x00f5, 0xc3b5}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xc3b7}, + {0x00f8, 0xc3b8}, + {0x00f9, 0xc3b9}, + {0x00fa, 0xc3ba}, + {0x00fb, 0xc3bb}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc3bd}, + {0x00fe, 0xc3be}, + {0x00ff, 0xc3bf} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map new file mode 100644 index 00000000000..ac3d8d1b8a6 --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map @@ -0,0 +1,130 @@ +static pg_local_to_utf LUmapISO8859_16[ 128 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xc484}, + {0x00a2, 0xc485}, + {0x00a3, 0xc581}, + {0x00a4, 0xe282ac}, + {0x00a5, 0xe2809e}, + {0x00a6, 0xc5a0}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc5a1}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc898}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc5b9}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc5ba}, + {0x00af, 0xc5bb}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc48c}, + {0x00b3, 0xc582}, + {0x00b4, 0xc5bd}, + {0x00b5, 0xe2809d}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc5be}, + {0x00b9, 0xc48d}, + {0x00ba, 0xc899}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc592}, + {0x00bd, 0xc593}, + {0x00be, 0xc5b8}, + {0x00bf, 0xc5bc}, + {0x00c0, 0xc380}, + {0x00c1, 0xc381}, + {0x00c2, 0xc382}, + {0x00c3, 0xc482}, + {0x00c4, 0xc384}, + {0x00c5, 0xc486}, + {0x00c6, 0xc386}, + {0x00c7, 0xc387}, + {0x00c8, 0xc388}, + {0x00c9, 0xc389}, + {0x00ca, 0xc38a}, + {0x00cb, 0xc38b}, + {0x00cc, 0xc38c}, + {0x00cd, 0xc38d}, + {0x00ce, 0xc38e}, + {0x00cf, 0xc38f}, + {0x00d0, 0xc490}, + {0x00d1, 0xc583}, + {0x00d2, 0xc392}, + {0x00d3, 0xc393}, + {0x00d4, 0xc394}, + {0x00d5, 0xc590}, + {0x00d6, 0xc396}, + {0x00d7, 0xc59a}, + {0x00d8, 0xc5b0}, + {0x00d9, 0xc399}, + {0x00da, 0xc39a}, + {0x00db, 0xc39b}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc498}, + {0x00de, 0xc89a}, + {0x00df, 0xc39f}, + {0x00e0, 0xc3a0}, + {0x00e1, 0xc3a1}, + {0x00e2, 0xc3a2}, + {0x00e3, 0xc483}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc487}, + {0x00e6, 0xc3a6}, + {0x00e7, 0xc3a7}, + {0x00e8, 0xc3a8}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc3aa}, + {0x00eb, 0xc3ab}, + {0x00ec, 0xc3ac}, + {0x00ed, 0xc3ad}, + {0x00ee, 0xc3ae}, + {0x00ef, 0xc3af}, + {0x00f0, 0xc491}, + {0x00f1, 0xc584}, + {0x00f2, 0xc3b2}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc3b4}, + {0x00f5, 0xc591}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xc59b}, + {0x00f8, 0xc5b1}, + {0x00f9, 0xc3b9}, + {0x00fa, 0xc3ba}, + {0x00fb, 0xc3bb}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc499}, + {0x00fe, 0xc89b}, + {0x00ff, 0xc3bf} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map new file mode 100644 index 00000000000..f847f7f2088 --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map @@ -0,0 +1,85 @@ +static pg_local_to_utf LUmapISO8859_6[ 83 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a4, 0xc2a4}, + {0x00ac, 0xd88c}, + {0x00ad, 0xc2ad}, + {0x00bb, 0xd89b}, + {0x00bf, 0xd89f}, + {0x00c1, 0xd8a1}, + {0x00c2, 0xd8a2}, + {0x00c3, 0xd8a3}, + {0x00c4, 0xd8a4}, + {0x00c5, 0xd8a5}, + {0x00c6, 0xd8a6}, + {0x00c7, 0xd8a7}, + {0x00c8, 0xd8a8}, + {0x00c9, 0xd8a9}, + {0x00ca, 0xd8aa}, + {0x00cb, 0xd8ab}, + {0x00cc, 0xd8ac}, + {0x00cd, 0xd8ad}, + {0x00ce, 0xd8ae}, + {0x00cf, 0xd8af}, + {0x00d0, 0xd8b0}, + {0x00d1, 0xd8b1}, + {0x00d2, 0xd8b2}, + {0x00d3, 0xd8b3}, + {0x00d4, 0xd8b4}, + {0x00d5, 0xd8b5}, + {0x00d6, 0xd8b6}, + {0x00d7, 0xd8b7}, + {0x00d8, 0xd8b8}, + {0x00d9, 0xd8b9}, + {0x00da, 0xd8ba}, + {0x00e0, 0xd980}, + {0x00e1, 0xd981}, + {0x00e2, 0xd982}, + {0x00e3, 0xd983}, + {0x00e4, 0xd984}, + {0x00e5, 0xd985}, + {0x00e6, 0xd986}, + {0x00e7, 0xd987}, + {0x00e8, 0xd988}, + {0x00e9, 0xd989}, + {0x00ea, 0xd98a}, + {0x00eb, 0xd98b}, + {0x00ec, 0xd98c}, + {0x00ed, 0xd98d}, + {0x00ee, 0xd98e}, + {0x00ef, 0xd98f}, + {0x00f0, 0xd990}, + {0x00f1, 0xd991}, + {0x00f2, 0xd992} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map new file mode 100644 index 00000000000..36b966dca4b --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map @@ -0,0 +1,124 @@ +static pg_local_to_utf LUmapISO8859_7[ 122 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xe28098}, + {0x00a2, 0xe28099}, + {0x00a3, 0xc2a3}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc2a8}, + {0x00a9, 0xc2a9}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00af, 0xe28095}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xce84}, + {0x00b5, 0xce85}, + {0x00b6, 0xce86}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xce88}, + {0x00b9, 0xce89}, + {0x00ba, 0xce8a}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xce8c}, + {0x00bd, 0xc2bd}, + {0x00be, 0xce8e}, + {0x00bf, 0xce8f}, + {0x00c0, 0xce90}, + {0x00c1, 0xce91}, + {0x00c2, 0xce92}, + {0x00c3, 0xce93}, + {0x00c4, 0xce94}, + {0x00c5, 0xce95}, + {0x00c6, 0xce96}, + {0x00c7, 0xce97}, + {0x00c8, 0xce98}, + {0x00c9, 0xce99}, + {0x00ca, 0xce9a}, + {0x00cb, 0xce9b}, + {0x00cc, 0xce9c}, + {0x00cd, 0xce9d}, + {0x00ce, 0xce9e}, + {0x00cf, 0xce9f}, + {0x00d0, 0xcea0}, + {0x00d1, 0xcea1}, + {0x00d3, 0xcea3}, + {0x00d4, 0xcea4}, + {0x00d5, 0xcea5}, + {0x00d6, 0xcea6}, + {0x00d7, 0xcea7}, + {0x00d8, 0xcea8}, + {0x00d9, 0xcea9}, + {0x00da, 0xceaa}, + {0x00db, 0xceab}, + {0x00dc, 0xceac}, + {0x00dd, 0xcead}, + {0x00de, 0xceae}, + {0x00df, 0xceaf}, + {0x00e0, 0xceb0}, + {0x00e1, 0xceb1}, + {0x00e2, 0xceb2}, + {0x00e3, 0xceb3}, + {0x00e4, 0xceb4}, + {0x00e5, 0xceb5}, + {0x00e6, 0xceb6}, + {0x00e7, 0xceb7}, + {0x00e8, 0xceb8}, + {0x00e9, 0xceb9}, + {0x00ea, 0xceba}, + {0x00eb, 0xcebb}, + {0x00ec, 0xcebc}, + {0x00ed, 0xcebd}, + {0x00ee, 0xcebe}, + {0x00ef, 0xcebf}, + {0x00f0, 0xcf80}, + {0x00f1, 0xcf81}, + {0x00f2, 0xcf82}, + {0x00f3, 0xcf83}, + {0x00f4, 0xcf84}, + {0x00f5, 0xcf85}, + {0x00f6, 0xcf86}, + {0x00f7, 0xcf87}, + {0x00f8, 0xcf88}, + {0x00f9, 0xcf89}, + {0x00fa, 0xcf8a}, + {0x00fb, 0xcf8b}, + {0x00fc, 0xcf8c}, + {0x00fd, 0xcf8d}, + {0x00fe, 0xcf8e} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map new file mode 100644 index 00000000000..a47af895140 --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map @@ -0,0 +1,94 @@ +static pg_local_to_utf LUmapISO8859_8[ 92 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a2, 0xc2a2}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xc2a4}, + {0x00a5, 0xc2a5}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc2a8}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc397}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc2af}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xc2b4}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc2b8}, + {0x00b9, 0xc2b9}, + {0x00ba, 0xc3b7}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc2bc}, + {0x00bd, 0xc2bd}, + {0x00be, 0xc2be}, + {0x00df, 0xe28097}, + {0x00e0, 0xd790}, + {0x00e1, 0xd791}, + {0x00e2, 0xd792}, + {0x00e3, 0xd793}, + {0x00e4, 0xd794}, + {0x00e5, 0xd795}, + {0x00e6, 0xd796}, + {0x00e7, 0xd797}, + {0x00e8, 0xd798}, + {0x00e9, 0xd799}, + {0x00ea, 0xd79a}, + {0x00eb, 0xd79b}, + {0x00ec, 0xd79c}, + {0x00ed, 0xd79d}, + {0x00ee, 0xd79e}, + {0x00ef, 0xd79f}, + {0x00f0, 0xd7a0}, + {0x00f1, 0xd7a1}, + {0x00f2, 0xd7a2}, + {0x00f3, 0xd7a3}, + {0x00f4, 0xd7a4}, + {0x00f5, 0xd7a5}, + {0x00f6, 0xd7a6}, + {0x00f7, 0xd7a7}, + {0x00f8, 0xd7a8}, + {0x00f9, 0xd7a9}, + {0x00fa, 0xd7aa}, + {0x00fd, 0xe2808e}, + {0x00fe, 0xe2808f} +}; diff --git a/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map new file mode 100644 index 00000000000..9e002adb845 --- /dev/null +++ b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map @@ -0,0 +1,130 @@ +static pg_local_to_utf LUmapISO8859_9[ 128 ] = { + {0x0080, 0xc280}, + {0x0081, 0xc281}, + {0x0082, 0xc282}, + {0x0083, 0xc283}, + {0x0084, 0xc284}, + {0x0085, 0xc285}, + {0x0086, 0xc286}, + {0x0087, 0xc287}, + {0x0088, 0xc288}, + {0x0089, 0xc289}, + {0x008a, 0xc28a}, + {0x008b, 0xc28b}, + {0x008c, 0xc28c}, + {0x008d, 0xc28d}, + {0x008e, 0xc28e}, + {0x008f, 0xc28f}, + {0x0090, 0xc290}, + {0x0091, 0xc291}, + {0x0092, 0xc292}, + {0x0093, 0xc293}, + {0x0094, 0xc294}, + {0x0095, 0xc295}, + {0x0096, 0xc296}, + {0x0097, 0xc297}, + {0x0098, 0xc298}, + {0x0099, 0xc299}, + {0x009a, 0xc29a}, + {0x009b, 0xc29b}, + {0x009c, 0xc29c}, + {0x009d, 0xc29d}, + {0x009e, 0xc29e}, + {0x009f, 0xc29f}, + {0x00a0, 0xc2a0}, + {0x00a1, 0xc2a1}, + {0x00a2, 0xc2a2}, + {0x00a3, 0xc2a3}, + {0x00a4, 0xc2a4}, + {0x00a5, 0xc2a5}, + {0x00a6, 0xc2a6}, + {0x00a7, 0xc2a7}, + {0x00a8, 0xc2a8}, + {0x00a9, 0xc2a9}, + {0x00aa, 0xc2aa}, + {0x00ab, 0xc2ab}, + {0x00ac, 0xc2ac}, + {0x00ad, 0xc2ad}, + {0x00ae, 0xc2ae}, + {0x00af, 0xc2af}, + {0x00b0, 0xc2b0}, + {0x00b1, 0xc2b1}, + {0x00b2, 0xc2b2}, + {0x00b3, 0xc2b3}, + {0x00b4, 0xc2b4}, + {0x00b5, 0xc2b5}, + {0x00b6, 0xc2b6}, + {0x00b7, 0xc2b7}, + {0x00b8, 0xc2b8}, + {0x00b9, 0xc2b9}, + {0x00ba, 0xc2ba}, + {0x00bb, 0xc2bb}, + {0x00bc, 0xc2bc}, + {0x00bd, 0xc2bd}, + {0x00be, 0xc2be}, + {0x00bf, 0xc2bf}, + {0x00c0, 0xc380}, + {0x00c1, 0xc381}, + {0x00c2, 0xc382}, + {0x00c3, 0xc383}, + {0x00c4, 0xc384}, + {0x00c5, 0xc385}, + {0x00c6, 0xc386}, + {0x00c7, 0xc387}, + {0x00c8, 0xc388}, + {0x00c9, 0xc389}, + {0x00ca, 0xc38a}, + {0x00cb, 0xc38b}, + {0x00cc, 0xc38c}, + {0x00cd, 0xc38d}, + {0x00ce, 0xc38e}, + {0x00cf, 0xc38f}, + {0x00d0, 0xc49e}, + {0x00d1, 0xc391}, + {0x00d2, 0xc392}, + {0x00d3, 0xc393}, + {0x00d4, 0xc394}, + {0x00d5, 0xc395}, + {0x00d6, 0xc396}, + {0x00d7, 0xc397}, + {0x00d8, 0xc398}, + {0x00d9, 0xc399}, + {0x00da, 0xc39a}, + {0x00db, 0xc39b}, + {0x00dc, 0xc39c}, + {0x00dd, 0xc4b0}, + {0x00de, 0xc59e}, + {0x00df, 0xc39f}, + {0x00e0, 0xc3a0}, + {0x00e1, 0xc3a1}, + {0x00e2, 0xc3a2}, + {0x00e3, 0xc3a3}, + {0x00e4, 0xc3a4}, + {0x00e5, 0xc3a5}, + {0x00e6, 0xc3a6}, + {0x00e7, 0xc3a7}, + {0x00e8, 0xc3a8}, + {0x00e9, 0xc3a9}, + {0x00ea, 0xc3aa}, + {0x00eb, 0xc3ab}, + {0x00ec, 0xc3ac}, + {0x00ed, 0xc3ad}, + {0x00ee, 0xc3ae}, + {0x00ef, 0xc3af}, + {0x00f0, 0xc49f}, + {0x00f1, 0xc3b1}, + {0x00f2, 0xc3b2}, + {0x00f3, 0xc3b3}, + {0x00f4, 0xc3b4}, + {0x00f5, 0xc3b5}, + {0x00f6, 0xc3b6}, + {0x00f7, 0xc3b7}, + {0x00f8, 0xc3b8}, + {0x00f9, 0xc3b9}, + {0x00fa, 0xc3ba}, + {0x00fb, 0xc3bb}, + {0x00fc, 0xc3bc}, + {0x00fd, 0xc4b1}, + {0x00fe, 0xc59f}, + {0x00ff, 0xc3bf} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map new file mode 100644 index 00000000000..b4aeafee2ba --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map @@ -0,0 +1,130 @@ +static pg_utf_to_local ULmapISO8859_10[ 128 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a7, 0x00a7}, + {0xc2ad, 0x00ad}, + {0xc2b0, 0x00b0}, + {0xc2b7, 0x00b7}, + {0xc381, 0x00c1}, + {0xc382, 0x00c2}, + {0xc383, 0x00c3}, + {0xc384, 0x00c4}, + {0xc385, 0x00c5}, + {0xc386, 0x00c6}, + {0xc389, 0x00c9}, + {0xc38b, 0x00cb}, + {0xc38d, 0x00cd}, + {0xc38e, 0x00ce}, + {0xc38f, 0x00cf}, + {0xc390, 0x00d0}, + {0xc393, 0x00d3}, + {0xc394, 0x00d4}, + {0xc395, 0x00d5}, + {0xc396, 0x00d6}, + {0xc398, 0x00d8}, + {0xc39a, 0x00da}, + {0xc39b, 0x00db}, + {0xc39c, 0x00dc}, + {0xc39d, 0x00dd}, + {0xc39e, 0x00de}, + {0xc39f, 0x00df}, + {0xc3a1, 0x00e1}, + {0xc3a2, 0x00e2}, + {0xc3a3, 0x00e3}, + {0xc3a4, 0x00e4}, + {0xc3a5, 0x00e5}, + {0xc3a6, 0x00e6}, + {0xc3a9, 0x00e9}, + {0xc3ab, 0x00eb}, + {0xc3ad, 0x00ed}, + {0xc3ae, 0x00ee}, + {0xc3af, 0x00ef}, + {0xc3b0, 0x00f0}, + {0xc3b3, 0x00f3}, + {0xc3b4, 0x00f4}, + {0xc3b5, 0x00f5}, + {0xc3b6, 0x00f6}, + {0xc3b8, 0x00f8}, + {0xc3ba, 0x00fa}, + {0xc3bb, 0x00fb}, + {0xc3bc, 0x00fc}, + {0xc3bd, 0x00fd}, + {0xc3be, 0x00fe}, + {0xc480, 0x00c0}, + {0xc481, 0x00e0}, + {0xc484, 0x00a1}, + {0xc485, 0x00b1}, + {0xc48c, 0x00c8}, + {0xc48d, 0x00e8}, + {0xc490, 0x00a9}, + {0xc491, 0x00b9}, + {0xc492, 0x00a2}, + {0xc493, 0x00b2}, + {0xc496, 0x00cc}, + {0xc497, 0x00ec}, + {0xc498, 0x00ca}, + {0xc499, 0x00ea}, + {0xc4a2, 0x00a3}, + {0xc4a3, 0x00b3}, + {0xc4a8, 0x00a5}, + {0xc4a9, 0x00b5}, + {0xc4aa, 0x00a4}, + {0xc4ab, 0x00b4}, + {0xc4ae, 0x00c7}, + {0xc4af, 0x00e7}, + {0xc4b6, 0x00a6}, + {0xc4b7, 0x00b6}, + {0xc4b8, 0x00ff}, + {0xc4bb, 0x00a8}, + {0xc4bc, 0x00b8}, + {0xc585, 0x00d1}, + {0xc586, 0x00f1}, + {0xc58a, 0x00af}, + {0xc58b, 0x00bf}, + {0xc58c, 0x00d2}, + {0xc58d, 0x00f2}, + {0xc5a0, 0x00aa}, + {0xc5a1, 0x00ba}, + {0xc5a6, 0x00ab}, + {0xc5a7, 0x00bb}, + {0xc5a8, 0x00d7}, + {0xc5a9, 0x00f7}, + {0xc5aa, 0x00ae}, + {0xc5ab, 0x00be}, + {0xc5b2, 0x00d9}, + {0xc5b3, 0x00f9}, + {0xc5bd, 0x00ac}, + {0xc5be, 0x00bc}, + {0xe28095, 0x00bd} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map new file mode 100644 index 00000000000..eca37849248 --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map @@ -0,0 +1,130 @@ +static pg_utf_to_local ULmapISO8859_13[ 128 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a2, 0x00a2}, + {0xc2a3, 0x00a3}, + {0xc2a4, 0x00a4}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a9, 0x00a9}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2b9, 0x00b9}, + {0xc2bb, 0x00bb}, + {0xc2bc, 0x00bc}, + {0xc2bd, 0x00bd}, + {0xc2be, 0x00be}, + {0xc384, 0x00c4}, + {0xc385, 0x00c5}, + {0xc386, 0x00af}, + {0xc389, 0x00c9}, + {0xc393, 0x00d3}, + {0xc395, 0x00d5}, + {0xc396, 0x00d6}, + {0xc397, 0x00d7}, + {0xc398, 0x00a8}, + {0xc39c, 0x00dc}, + {0xc39f, 0x00df}, + {0xc3a4, 0x00e4}, + {0xc3a5, 0x00e5}, + {0xc3a6, 0x00bf}, + {0xc3a9, 0x00e9}, + {0xc3b3, 0x00f3}, + {0xc3b5, 0x00f5}, + {0xc3b6, 0x00f6}, + {0xc3b7, 0x00f7}, + {0xc3b8, 0x00b8}, + {0xc3bc, 0x00fc}, + {0xc480, 0x00c2}, + {0xc481, 0x00e2}, + {0xc484, 0x00c0}, + {0xc485, 0x00e0}, + {0xc486, 0x00c3}, + {0xc487, 0x00e3}, + {0xc48c, 0x00c8}, + {0xc48d, 0x00e8}, + {0xc492, 0x00c7}, + {0xc493, 0x00e7}, + {0xc496, 0x00cb}, + {0xc497, 0x00eb}, + {0xc498, 0x00c6}, + {0xc499, 0x00e6}, + {0xc4a2, 0x00cc}, + {0xc4a3, 0x00ec}, + {0xc4aa, 0x00ce}, + {0xc4ab, 0x00ee}, + {0xc4ae, 0x00c1}, + {0xc4af, 0x00e1}, + {0xc4b6, 0x00cd}, + {0xc4b7, 0x00ed}, + {0xc4bb, 0x00cf}, + {0xc4bc, 0x00ef}, + {0xc581, 0x00d9}, + {0xc582, 0x00f9}, + {0xc583, 0x00d1}, + {0xc584, 0x00f1}, + {0xc585, 0x00d2}, + {0xc586, 0x00f2}, + {0xc58c, 0x00d4}, + {0xc58d, 0x00f4}, + {0xc596, 0x00aa}, + {0xc597, 0x00ba}, + {0xc59a, 0x00da}, + {0xc59b, 0x00fa}, + {0xc5a0, 0x00d0}, + {0xc5a1, 0x00f0}, + {0xc5aa, 0x00db}, + {0xc5ab, 0x00fb}, + {0xc5b2, 0x00d8}, + {0xc5b3, 0x00f8}, + {0xc5b9, 0x00ca}, + {0xc5ba, 0x00ea}, + {0xc5bb, 0x00dd}, + {0xc5bc, 0x00fd}, + {0xc5bd, 0x00de}, + {0xc5be, 0x00fe}, + {0xe28099, 0x00ff}, + {0xe2809c, 0x00b4}, + {0xe2809d, 0x00a1}, + {0xe2809e, 0x00a5} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map new file mode 100644 index 00000000000..bef24578eaa --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map @@ -0,0 +1,130 @@ +static pg_utf_to_local ULmapISO8859_14[ 128 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a3, 0x00a3}, + {0xc2a7, 0x00a7}, + {0xc2a9, 0x00a9}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2b6, 0x00b6}, + {0xc380, 0x00c0}, + {0xc381, 0x00c1}, + {0xc382, 0x00c2}, + {0xc383, 0x00c3}, + {0xc384, 0x00c4}, + {0xc385, 0x00c5}, + {0xc386, 0x00c6}, + {0xc387, 0x00c7}, + {0xc388, 0x00c8}, + {0xc389, 0x00c9}, + {0xc38a, 0x00ca}, + {0xc38b, 0x00cb}, + {0xc38c, 0x00cc}, + {0xc38d, 0x00cd}, + {0xc38e, 0x00ce}, + {0xc38f, 0x00cf}, + {0xc391, 0x00d1}, + {0xc392, 0x00d2}, + {0xc393, 0x00d3}, + {0xc394, 0x00d4}, + {0xc395, 0x00d5}, + {0xc396, 0x00d6}, + {0xc398, 0x00d8}, + {0xc399, 0x00d9}, + {0xc39a, 0x00da}, + {0xc39b, 0x00db}, + {0xc39c, 0x00dc}, + {0xc39d, 0x00dd}, + {0xc39f, 0x00df}, + {0xc3a0, 0x00e0}, + {0xc3a1, 0x00e1}, + {0xc3a2, 0x00e2}, + {0xc3a3, 0x00e3}, + {0xc3a4, 0x00e4}, + {0xc3a5, 0x00e5}, + {0xc3a6, 0x00e6}, + {0xc3a7, 0x00e7}, + {0xc3a8, 0x00e8}, + {0xc3a9, 0x00e9}, + {0xc3aa, 0x00ea}, + {0xc3ab, 0x00eb}, + {0xc3ac, 0x00ec}, + {0xc3ad, 0x00ed}, + {0xc3ae, 0x00ee}, + {0xc3af, 0x00ef}, + {0xc3b1, 0x00f1}, + {0xc3b2, 0x00f2}, + {0xc3b3, 0x00f3}, + {0xc3b4, 0x00f4}, + {0xc3b5, 0x00f5}, + {0xc3b6, 0x00f6}, + {0xc3b8, 0x00f8}, + {0xc3b9, 0x00f9}, + {0xc3ba, 0x00fa}, + {0xc3bb, 0x00fb}, + {0xc3bc, 0x00fc}, + {0xc3bd, 0x00fd}, + {0xc3bf, 0x00ff}, + {0xc48a, 0x00a4}, + {0xc48b, 0x00a5}, + {0xc4a0, 0x00b2}, + {0xc4a1, 0x00b3}, + {0xc5b4, 0x00d0}, + {0xc5b5, 0x00f0}, + {0xc5b6, 0x00de}, + {0xc5b7, 0x00fe}, + {0xc5b8, 0x00af}, + {0xe1b882, 0x00a1}, + {0xe1b883, 0x00a2}, + {0xe1b88a, 0x00a6}, + {0xe1b88b, 0x00ab}, + {0xe1b89e, 0x00b0}, + {0xe1b89f, 0x00b1}, + {0xe1b980, 0x00b4}, + {0xe1b981, 0x00b5}, + {0xe1b996, 0x00b7}, + {0xe1b997, 0x00b9}, + {0xe1b9a0, 0x00bb}, + {0xe1b9a1, 0x00bf}, + {0xe1b9aa, 0x00d7}, + {0xe1b9ab, 0x00f7}, + {0xe1ba80, 0x00a8}, + {0xe1ba81, 0x00b8}, + {0xe1ba82, 0x00aa}, + {0xe1ba83, 0x00ba}, + {0xe1ba84, 0x00bd}, + {0xe1ba85, 0x00be}, + {0xe1bbb2, 0x00ac}, + {0xe1bbb3, 0x00bc} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map new file mode 100644 index 00000000000..e1e098865c6 --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map @@ -0,0 +1,130 @@ +static pg_utf_to_local ULmapISO8859_15[ 128 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a1, 0x00a1}, + {0xc2a2, 0x00a2}, + {0xc2a3, 0x00a3}, + {0xc2a5, 0x00a5}, + {0xc2a7, 0x00a7}, + {0xc2a9, 0x00a9}, + {0xc2aa, 0x00aa}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2af, 0x00af}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2b9, 0x00b9}, + {0xc2ba, 0x00ba}, + {0xc2bb, 0x00bb}, + {0xc2bf, 0x00bf}, + {0xc380, 0x00c0}, + {0xc381, 0x00c1}, + {0xc382, 0x00c2}, + {0xc383, 0x00c3}, + {0xc384, 0x00c4}, + {0xc385, 0x00c5}, + {0xc386, 0x00c6}, + {0xc387, 0x00c7}, + {0xc388, 0x00c8}, + {0xc389, 0x00c9}, + {0xc38a, 0x00ca}, + {0xc38b, 0x00cb}, + {0xc38c, 0x00cc}, + {0xc38d, 0x00cd}, + {0xc38e, 0x00ce}, + {0xc38f, 0x00cf}, + {0xc390, 0x00d0}, + {0xc391, 0x00d1}, + {0xc392, 0x00d2}, + {0xc393, 0x00d3}, + {0xc394, 0x00d4}, + {0xc395, 0x00d5}, + {0xc396, 0x00d6}, + {0xc397, 0x00d7}, + {0xc398, 0x00d8}, + {0xc399, 0x00d9}, + {0xc39a, 0x00da}, + {0xc39b, 0x00db}, + {0xc39c, 0x00dc}, + {0xc39d, 0x00dd}, + {0xc39e, 0x00de}, + {0xc39f, 0x00df}, + {0xc3a0, 0x00e0}, + {0xc3a1, 0x00e1}, + {0xc3a2, 0x00e2}, + {0xc3a3, 0x00e3}, + {0xc3a4, 0x00e4}, + {0xc3a5, 0x00e5}, + {0xc3a6, 0x00e6}, + {0xc3a7, 0x00e7}, + {0xc3a8, 0x00e8}, + {0xc3a9, 0x00e9}, + {0xc3aa, 0x00ea}, + {0xc3ab, 0x00eb}, + {0xc3ac, 0x00ec}, + {0xc3ad, 0x00ed}, + {0xc3ae, 0x00ee}, + {0xc3af, 0x00ef}, + {0xc3b0, 0x00f0}, + {0xc3b1, 0x00f1}, + {0xc3b2, 0x00f2}, + {0xc3b3, 0x00f3}, + {0xc3b4, 0x00f4}, + {0xc3b5, 0x00f5}, + {0xc3b6, 0x00f6}, + {0xc3b7, 0x00f7}, + {0xc3b8, 0x00f8}, + {0xc3b9, 0x00f9}, + {0xc3ba, 0x00fa}, + {0xc3bb, 0x00fb}, + {0xc3bc, 0x00fc}, + {0xc3bd, 0x00fd}, + {0xc3be, 0x00fe}, + {0xc3bf, 0x00ff}, + {0xc592, 0x00bc}, + {0xc593, 0x00bd}, + {0xc5a0, 0x00a6}, + {0xc5a1, 0x00a8}, + {0xc5b8, 0x00be}, + {0xc5bd, 0x00b4}, + {0xc5be, 0x00b8}, + {0xe282ac, 0x00a4} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map new file mode 100644 index 00000000000..63ba6bdafaf --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map @@ -0,0 +1,130 @@ +static pg_utf_to_local ULmapISO8859_16[ 128 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a7, 0x00a7}, + {0xc2a9, 0x00a9}, + {0xc2ab, 0x00ab}, + {0xc2ad, 0x00ad}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2bb, 0x00bb}, + {0xc380, 0x00c0}, + {0xc381, 0x00c1}, + {0xc382, 0x00c2}, + {0xc384, 0x00c4}, + {0xc386, 0x00c6}, + {0xc387, 0x00c7}, + {0xc388, 0x00c8}, + {0xc389, 0x00c9}, + {0xc38a, 0x00ca}, + {0xc38b, 0x00cb}, + {0xc38c, 0x00cc}, + {0xc38d, 0x00cd}, + {0xc38e, 0x00ce}, + {0xc38f, 0x00cf}, + {0xc392, 0x00d2}, + {0xc393, 0x00d3}, + {0xc394, 0x00d4}, + {0xc396, 0x00d6}, + {0xc399, 0x00d9}, + {0xc39a, 0x00da}, + {0xc39b, 0x00db}, + {0xc39c, 0x00dc}, + {0xc39f, 0x00df}, + {0xc3a0, 0x00e0}, + {0xc3a1, 0x00e1}, + {0xc3a2, 0x00e2}, + {0xc3a4, 0x00e4}, + {0xc3a6, 0x00e6}, + {0xc3a7, 0x00e7}, + {0xc3a8, 0x00e8}, + {0xc3a9, 0x00e9}, + {0xc3aa, 0x00ea}, + {0xc3ab, 0x00eb}, + {0xc3ac, 0x00ec}, + {0xc3ad, 0x00ed}, + {0xc3ae, 0x00ee}, + {0xc3af, 0x00ef}, + {0xc3b2, 0x00f2}, + {0xc3b3, 0x00f3}, + {0xc3b4, 0x00f4}, + {0xc3b6, 0x00f6}, + {0xc3b9, 0x00f9}, + {0xc3ba, 0x00fa}, + {0xc3bb, 0x00fb}, + {0xc3bc, 0x00fc}, + {0xc3bf, 0x00ff}, + {0xc482, 0x00c3}, + {0xc483, 0x00e3}, + {0xc484, 0x00a1}, + {0xc485, 0x00a2}, + {0xc486, 0x00c5}, + {0xc487, 0x00e5}, + {0xc48c, 0x00b2}, + {0xc48d, 0x00b9}, + {0xc490, 0x00d0}, + {0xc491, 0x00f0}, + {0xc498, 0x00dd}, + {0xc499, 0x00fd}, + {0xc581, 0x00a3}, + {0xc582, 0x00b3}, + {0xc583, 0x00d1}, + {0xc584, 0x00f1}, + {0xc590, 0x00d5}, + {0xc591, 0x00f5}, + {0xc592, 0x00bc}, + {0xc593, 0x00bd}, + {0xc59a, 0x00d7}, + {0xc59b, 0x00f7}, + {0xc5a0, 0x00a6}, + {0xc5a1, 0x00a8}, + {0xc5b0, 0x00d8}, + {0xc5b1, 0x00f8}, + {0xc5b8, 0x00be}, + {0xc5b9, 0x00ac}, + {0xc5ba, 0x00ae}, + {0xc5bb, 0x00af}, + {0xc5bc, 0x00bf}, + {0xc5bd, 0x00b4}, + {0xc5be, 0x00b8}, + {0xc898, 0x00aa}, + {0xc899, 0x00ba}, + {0xc89a, 0x00de}, + {0xc89b, 0x00fe}, + {0xe2809d, 0x00b5}, + {0xe2809e, 0x00a5}, + {0xe282ac, 0x00a4} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map new file mode 100644 index 00000000000..291f7cf5da1 --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map @@ -0,0 +1,85 @@ +static pg_utf_to_local ULmapISO8859_6[ 83 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a4, 0x00a4}, + {0xc2ad, 0x00ad}, + {0xd88c, 0x00ac}, + {0xd89b, 0x00bb}, + {0xd89f, 0x00bf}, + {0xd8a1, 0x00c1}, + {0xd8a2, 0x00c2}, + {0xd8a3, 0x00c3}, + {0xd8a4, 0x00c4}, + {0xd8a5, 0x00c5}, + {0xd8a6, 0x00c6}, + {0xd8a7, 0x00c7}, + {0xd8a8, 0x00c8}, + {0xd8a9, 0x00c9}, + {0xd8aa, 0x00ca}, + {0xd8ab, 0x00cb}, + {0xd8ac, 0x00cc}, + {0xd8ad, 0x00cd}, + {0xd8ae, 0x00ce}, + {0xd8af, 0x00cf}, + {0xd8b0, 0x00d0}, + {0xd8b1, 0x00d1}, + {0xd8b2, 0x00d2}, + {0xd8b3, 0x00d3}, + {0xd8b4, 0x00d4}, + {0xd8b5, 0x00d5}, + {0xd8b6, 0x00d6}, + {0xd8b7, 0x00d7}, + {0xd8b8, 0x00d8}, + {0xd8b9, 0x00d9}, + {0xd8ba, 0x00da}, + {0xd980, 0x00e0}, + {0xd981, 0x00e1}, + {0xd982, 0x00e2}, + {0xd983, 0x00e3}, + {0xd984, 0x00e4}, + {0xd985, 0x00e5}, + {0xd986, 0x00e6}, + {0xd987, 0x00e7}, + {0xd988, 0x00e8}, + {0xd989, 0x00e9}, + {0xd98a, 0x00ea}, + {0xd98b, 0x00eb}, + {0xd98c, 0x00ec}, + {0xd98d, 0x00ed}, + {0xd98e, 0x00ee}, + {0xd98f, 0x00ef}, + {0xd990, 0x00f0}, + {0xd991, 0x00f1}, + {0xd992, 0x00f2} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map new file mode 100644 index 00000000000..e46ebe18b03 --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map @@ -0,0 +1,124 @@ +static pg_utf_to_local ULmapISO8859_7[ 122 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a3, 0x00a3}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a8, 0x00a8}, + {0xc2a9, 0x00a9}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b7, 0x00b7}, + {0xc2bb, 0x00bb}, + {0xc2bd, 0x00bd}, + {0xce84, 0x00b4}, + {0xce85, 0x00b5}, + {0xce86, 0x00b6}, + {0xce88, 0x00b8}, + {0xce89, 0x00b9}, + {0xce8a, 0x00ba}, + {0xce8c, 0x00bc}, + {0xce8e, 0x00be}, + {0xce8f, 0x00bf}, + {0xce90, 0x00c0}, + {0xce91, 0x00c1}, + {0xce92, 0x00c2}, + {0xce93, 0x00c3}, + {0xce94, 0x00c4}, + {0xce95, 0x00c5}, + {0xce96, 0x00c6}, + {0xce97, 0x00c7}, + {0xce98, 0x00c8}, + {0xce99, 0x00c9}, + {0xce9a, 0x00ca}, + {0xce9b, 0x00cb}, + {0xce9c, 0x00cc}, + {0xce9d, 0x00cd}, + {0xce9e, 0x00ce}, + {0xce9f, 0x00cf}, + {0xcea0, 0x00d0}, + {0xcea1, 0x00d1}, + {0xcea3, 0x00d3}, + {0xcea4, 0x00d4}, + {0xcea5, 0x00d5}, + {0xcea6, 0x00d6}, + {0xcea7, 0x00d7}, + {0xcea8, 0x00d8}, + {0xcea9, 0x00d9}, + {0xceaa, 0x00da}, + {0xceab, 0x00db}, + {0xceac, 0x00dc}, + {0xcead, 0x00dd}, + {0xceae, 0x00de}, + {0xceaf, 0x00df}, + {0xceb0, 0x00e0}, + {0xceb1, 0x00e1}, + {0xceb2, 0x00e2}, + {0xceb3, 0x00e3}, + {0xceb4, 0x00e4}, + {0xceb5, 0x00e5}, + {0xceb6, 0x00e6}, + {0xceb7, 0x00e7}, + {0xceb8, 0x00e8}, + {0xceb9, 0x00e9}, + {0xceba, 0x00ea}, + {0xcebb, 0x00eb}, + {0xcebc, 0x00ec}, + {0xcebd, 0x00ed}, + {0xcebe, 0x00ee}, + {0xcebf, 0x00ef}, + {0xcf80, 0x00f0}, + {0xcf81, 0x00f1}, + {0xcf82, 0x00f2}, + {0xcf83, 0x00f3}, + {0xcf84, 0x00f4}, + {0xcf85, 0x00f5}, + {0xcf86, 0x00f6}, + {0xcf87, 0x00f7}, + {0xcf88, 0x00f8}, + {0xcf89, 0x00f9}, + {0xcf8a, 0x00fa}, + {0xcf8b, 0x00fb}, + {0xcf8c, 0x00fc}, + {0xcf8d, 0x00fd}, + {0xcf8e, 0x00fe}, + {0xe28095, 0x00af}, + {0xe28098, 0x00a1}, + {0xe28099, 0x00a2} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map new file mode 100644 index 00000000000..62095e54f48 --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map @@ -0,0 +1,94 @@ +static pg_utf_to_local ULmapISO8859_8[ 92 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a2, 0x00a2}, + {0xc2a3, 0x00a3}, + {0xc2a4, 0x00a4}, + {0xc2a5, 0x00a5}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a8, 0x00a8}, + {0xc2a9, 0x00a9}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2af, 0x00af}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b4, 0x00b4}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2b8, 0x00b8}, + {0xc2b9, 0x00b9}, + {0xc2bb, 0x00bb}, + {0xc2bc, 0x00bc}, + {0xc2bd, 0x00bd}, + {0xc2be, 0x00be}, + {0xc397, 0x00aa}, + {0xc3b7, 0x00ba}, + {0xd790, 0x00e0}, + {0xd791, 0x00e1}, + {0xd792, 0x00e2}, + {0xd793, 0x00e3}, + {0xd794, 0x00e4}, + {0xd795, 0x00e5}, + {0xd796, 0x00e6}, + {0xd797, 0x00e7}, + {0xd798, 0x00e8}, + {0xd799, 0x00e9}, + {0xd79a, 0x00ea}, + {0xd79b, 0x00eb}, + {0xd79c, 0x00ec}, + {0xd79d, 0x00ed}, + {0xd79e, 0x00ee}, + {0xd79f, 0x00ef}, + {0xd7a0, 0x00f0}, + {0xd7a1, 0x00f1}, + {0xd7a2, 0x00f2}, + {0xd7a3, 0x00f3}, + {0xd7a4, 0x00f4}, + {0xd7a5, 0x00f5}, + {0xd7a6, 0x00f6}, + {0xd7a7, 0x00f7}, + {0xd7a8, 0x00f8}, + {0xd7a9, 0x00f9}, + {0xd7aa, 0x00fa}, + {0xe2808e, 0x00fd}, + {0xe2808f, 0x00fe}, + {0xe28097, 0x00df} +}; diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map new file mode 100644 index 00000000000..baff0f0319f --- /dev/null +++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map @@ -0,0 +1,130 @@ +static pg_utf_to_local ULmapISO8859_9[ 128 ] = { + {0xc280, 0x0080}, + {0xc281, 0x0081}, + {0xc282, 0x0082}, + {0xc283, 0x0083}, + {0xc284, 0x0084}, + {0xc285, 0x0085}, + {0xc286, 0x0086}, + {0xc287, 0x0087}, + {0xc288, 0x0088}, + {0xc289, 0x0089}, + {0xc28a, 0x008a}, + {0xc28b, 0x008b}, + {0xc28c, 0x008c}, + {0xc28d, 0x008d}, + {0xc28e, 0x008e}, + {0xc28f, 0x008f}, + {0xc290, 0x0090}, + {0xc291, 0x0091}, + {0xc292, 0x0092}, + {0xc293, 0x0093}, + {0xc294, 0x0094}, + {0xc295, 0x0095}, + {0xc296, 0x0096}, + {0xc297, 0x0097}, + {0xc298, 0x0098}, + {0xc299, 0x0099}, + {0xc29a, 0x009a}, + {0xc29b, 0x009b}, + {0xc29c, 0x009c}, + {0xc29d, 0x009d}, + {0xc29e, 0x009e}, + {0xc29f, 0x009f}, + {0xc2a0, 0x00a0}, + {0xc2a1, 0x00a1}, + {0xc2a2, 0x00a2}, + {0xc2a3, 0x00a3}, + {0xc2a4, 0x00a4}, + {0xc2a5, 0x00a5}, + {0xc2a6, 0x00a6}, + {0xc2a7, 0x00a7}, + {0xc2a8, 0x00a8}, + {0xc2a9, 0x00a9}, + {0xc2aa, 0x00aa}, + {0xc2ab, 0x00ab}, + {0xc2ac, 0x00ac}, + {0xc2ad, 0x00ad}, + {0xc2ae, 0x00ae}, + {0xc2af, 0x00af}, + {0xc2b0, 0x00b0}, + {0xc2b1, 0x00b1}, + {0xc2b2, 0x00b2}, + {0xc2b3, 0x00b3}, + {0xc2b4, 0x00b4}, + {0xc2b5, 0x00b5}, + {0xc2b6, 0x00b6}, + {0xc2b7, 0x00b7}, + {0xc2b8, 0x00b8}, + {0xc2b9, 0x00b9}, + {0xc2ba, 0x00ba}, + {0xc2bb, 0x00bb}, + {0xc2bc, 0x00bc}, + {0xc2bd, 0x00bd}, + {0xc2be, 0x00be}, + {0xc2bf, 0x00bf}, + {0xc380, 0x00c0}, + {0xc381, 0x00c1}, + {0xc382, 0x00c2}, + {0xc383, 0x00c3}, + {0xc384, 0x00c4}, + {0xc385, 0x00c5}, + {0xc386, 0x00c6}, + {0xc387, 0x00c7}, + {0xc388, 0x00c8}, + {0xc389, 0x00c9}, + {0xc38a, 0x00ca}, + {0xc38b, 0x00cb}, + {0xc38c, 0x00cc}, + {0xc38d, 0x00cd}, + {0xc38e, 0x00ce}, + {0xc38f, 0x00cf}, + {0xc391, 0x00d1}, + {0xc392, 0x00d2}, + {0xc393, 0x00d3}, + {0xc394, 0x00d4}, + {0xc395, 0x00d5}, + {0xc396, 0x00d6}, + {0xc397, 0x00d7}, + {0xc398, 0x00d8}, + {0xc399, 0x00d9}, + {0xc39a, 0x00da}, + {0xc39b, 0x00db}, + {0xc39c, 0x00dc}, + {0xc39f, 0x00df}, + {0xc3a0, 0x00e0}, + {0xc3a1, 0x00e1}, + {0xc3a2, 0x00e2}, + {0xc3a3, 0x00e3}, + {0xc3a4, 0x00e4}, + {0xc3a5, 0x00e5}, + {0xc3a6, 0x00e6}, + {0xc3a7, 0x00e7}, + {0xc3a8, 0x00e8}, + {0xc3a9, 0x00e9}, + {0xc3aa, 0x00ea}, + {0xc3ab, 0x00eb}, + {0xc3ac, 0x00ec}, + {0xc3ad, 0x00ed}, + {0xc3ae, 0x00ee}, + {0xc3af, 0x00ef}, + {0xc3b1, 0x00f1}, + {0xc3b2, 0x00f2}, + {0xc3b3, 0x00f3}, + {0xc3b4, 0x00f4}, + {0xc3b5, 0x00f5}, + {0xc3b6, 0x00f6}, + {0xc3b7, 0x00f7}, + {0xc3b8, 0x00f8}, + {0xc3b9, 0x00f9}, + {0xc3ba, 0x00fa}, + {0xc3bb, 0x00fb}, + {0xc3bc, 0x00fc}, + {0xc3bf, 0x00ff}, + {0xc49e, 0x00d0}, + {0xc49f, 0x00f0}, + {0xc4b0, 0x00dd}, + {0xc4b1, 0x00fd}, + {0xc59e, 0x00de}, + {0xc59f, 0x00fe} +}; diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index 959d5fc5de5..f6c0ac090a6 100644 --- a/src/backend/utils/mb/conv.c +++ b/src/backend/utils/mb/conv.c @@ -6,7 +6,7 @@ * WIN1250 client encoding support contributed by Pavel Behal * SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya * - * $Id: conv.c,v 1.30 2001/09/25 01:27:03 ishii Exp $ + * $Id: conv.c,v 1.31 2001/10/11 14:20:35 ishii Exp $ * * */ @@ -22,10 +22,28 @@ #include "Unicode/utf8_to_iso8859_3.map" #include "Unicode/utf8_to_iso8859_4.map" #include "Unicode/utf8_to_iso8859_5.map" +#include "Unicode/utf8_to_iso8859_6.map" +#include "Unicode/utf8_to_iso8859_7.map" +#include "Unicode/utf8_to_iso8859_8.map" +#include "Unicode/utf8_to_iso8859_9.map" +#include "Unicode/utf8_to_iso8859_10.map" +#include "Unicode/utf8_to_iso8859_13.map" +#include "Unicode/utf8_to_iso8859_14.map" +#include "Unicode/utf8_to_iso8859_15.map" +#include "Unicode/utf8_to_iso8859_16.map" #include "Unicode/iso8859_2_to_utf8.map" #include "Unicode/iso8859_3_to_utf8.map" #include "Unicode/iso8859_4_to_utf8.map" #include "Unicode/iso8859_5_to_utf8.map" +#include "Unicode/iso8859_6_to_utf8.map" +#include "Unicode/iso8859_7_to_utf8.map" +#include "Unicode/iso8859_8_to_utf8.map" +#include "Unicode/iso8859_9_to_utf8.map" +#include "Unicode/iso8859_10_to_utf8.map" +#include "Unicode/iso8859_13_to_utf8.map" +#include "Unicode/iso8859_14_to_utf8.map" +#include "Unicode/iso8859_15_to_utf8.map" +#include "Unicode/iso8859_16_to_utf8.map" #include "Unicode/utf8_to_euc_jp.map" #include "Unicode/euc_jp_to_utf8.map" #include "Unicode/utf8_to_euc_cn.map" @@ -1168,7 +1186,7 @@ utf2ascii(unsigned char *utf, unsigned char *ascii, int len) * ISO8859-1 ---> UTF-8 */ static void -latin1_to_utf(unsigned char *iso, unsigned char *utf, int len) +iso8859_1_to_utf(unsigned char *iso, unsigned char *utf, int len) { unsigned short c; @@ -1189,7 +1207,7 @@ latin1_to_utf(unsigned char *iso, unsigned char *utf, int len) * UTF-8 ---> ISO8859-1 */ static void -utf_to_latin1(unsigned char *utf, unsigned char *iso, int len) +utf_to_iso8859_1(unsigned char *utf, unsigned char *iso, int len) { unsigned short c, c1, @@ -1301,6 +1319,7 @@ utf_to_local(unsigned char *utf, unsigned char *iso, *iso = '\0'; } +#ifdef NOT_USED /* * UTF-8 ---> ISO8859-2 */ @@ -1333,10 +1352,11 @@ utf_to_latin4(unsigned char *utf, unsigned char *iso, int len) */ static void utf_to_latin5(unsigned char *utf, unsigned char *iso, int len) - { utf_to_local(utf, iso, ULmapISO8859_5, sizeof(ULmapISO8859_5) / sizeof(pg_utf_to_local), len); } +#endif /* NOT_USED */ + /* * Cyrillic charsets */ @@ -1436,6 +1456,7 @@ local_to_utf(unsigned char *iso, unsigned char *utf, *utf = '\0'; } +#ifdef NOT_USED /* * ISO-8859-2 ---> UTF-8 */ @@ -1471,6 +1492,33 @@ latin5_to_utf(unsigned char *iso, unsigned char *utf, int len) { local_to_utf(iso, utf, LUmapISO8859_5, sizeof(LUmapISO8859_5) / sizeof(pg_local_to_utf), PG_LATIN5, len); } +#endif /* NOT_USED */ + +#define UTF_ISO8859(_id_) \ +static void \ +utf_to_iso8859_##_id_(unsigned char *utf, unsigned char *iso, int len) \ +{ \ + utf_to_local(utf, iso, ULmapISO8859_##_id_, sizeof(ULmapISO8859_##_id_) / sizeof(pg_utf_to_local), len); \ +} \ +static void \ +iso8859_##_id_##_to_utf(unsigned char *iso, unsigned char *utf, int len) \ +{ \ + local_to_utf(iso, utf, LUmapISO8859_##_id_, sizeof(LUmapISO8859_##_id_) / sizeof(pg_local_to_utf), PG_LATIN1, len); \ +} + +UTF_ISO8859(2); +UTF_ISO8859(3); +UTF_ISO8859(4); +UTF_ISO8859(5); +UTF_ISO8859(6); +UTF_ISO8859(7); +UTF_ISO8859(8); +UTF_ISO8859(9); +UTF_ISO8859(10); +UTF_ISO8859(13); +UTF_ISO8859(14); +UTF_ISO8859(15); +UTF_ISO8859(16); /* * KOI8-R ---> UTF-8 @@ -1639,14 +1687,23 @@ pg_enconv pg_enconv_tbl[] = { PG_EUC_TW, euc_tw2mic, mic2euc_tw, euc_tw_to_utf, utf_to_euc_tw}, { PG_UTF8, 0, 0, 0, 0}, { PG_MULE_INTERNAL, 0, 0, 0, 0}, - { PG_LATIN1, latin12mic, mic2latin1, latin1_to_utf, utf_to_latin1}, - { PG_LATIN2, latin22mic, mic2latin2, latin2_to_utf, utf_to_latin2}, - { PG_LATIN3, latin32mic, mic2latin3, latin3_to_utf, utf_to_latin3}, - { PG_LATIN4, latin42mic, mic2latin4, latin4_to_utf, utf_to_latin4}, - { PG_LATIN5, iso2mic, mic2iso, latin5_to_utf, utf_to_latin5}, + { PG_LATIN1, latin12mic, mic2latin1, iso8859_1_to_utf, utf_to_iso8859_1}, + { PG_LATIN2, latin22mic, mic2latin2, iso8859_2_to_utf, utf_to_iso8859_2}, + { PG_LATIN3, latin32mic, mic2latin3, iso8859_3_to_utf, utf_to_iso8859_3}, + { PG_LATIN4, latin42mic, mic2latin4, iso8859_4_to_utf, utf_to_iso8859_4}, + { PG_LATIN5, iso2mic, mic2iso, iso8859_9_to_utf, utf_to_iso8859_9}, { PG_KOI8R, koi8r2mic, mic2koi8r, KOI8R_to_utf, utf_to_KOI8R}, { PG_WIN1251, win12512mic, mic2win1251, WIN1251_to_utf, utf_to_WIN1251}, { PG_ALT, alt2mic, mic2alt, ALT_to_utf, utf_to_ALT}, + { PG_ISO_8859_5, 0, 0, iso8859_5_to_utf, utf_to_iso8859_5}, + { PG_ISO_8859_6, 0, 0, iso8859_6_to_utf, utf_to_iso8859_6}, + { PG_ISO_8859_7, 0, 0, iso8859_7_to_utf, utf_to_iso8859_7}, + { PG_ISO_8859_8, 0, 0, iso8859_8_to_utf, utf_to_iso8859_8}, + { PG_ISO_8859_10, 0, 0, iso8859_10_to_utf, utf_to_iso8859_10}, + { PG_ISO_8859_13, 0, 0, iso8859_13_to_utf, utf_to_iso8859_13}, + { PG_ISO_8859_14, 0, 0, iso8859_14_to_utf, utf_to_iso8859_14}, + { PG_ISO_8859_15, 0, 0, iso8859_15_to_utf, utf_to_iso8859_15}, + { PG_ISO_8859_16, 0, 0, iso8859_16_to_utf, utf_to_iso8859_16}, { PG_SJIS, sjis2mic, mic2sjis, sjis_to_utf, utf_to_sjis}, { PG_BIG5, big52mic, mic2big5, big5_to_utf, utf_to_big5}, { PG_WIN1250, win12502mic, mic2win1250, 0, 0}, @@ -1671,6 +1728,15 @@ pg_enconv pg_enconv_tbl[] = { PG_KOI8R, koi8r2mic, mic2koi8r, 0, 0}, { PG_WIN1251, win12512mic, mic2win1251, 0, 0}, { PG_ALT, alt2mic, mic2alt, 0, 0}, + { PG_ISO_8859_5, 0, 0, 0, 0}, + { PG_ISO_8859_6, 0, 0, 0, 0}, + { PG_ISO_8859_7, 0, 0, 0, 0}, + { PG_ISO_8859_8, 0, 0, 0, 0}, + { PG_ISO_8859_10, 0, 0, 0, 0}, + { PG_ISO_8859_13, 0, 0, 0, 0}, + { PG_ISO_8859_14, 0, 0, 0, 0}, + { PG_ISO_8859_15, 0, 0, 0, 0}, + { PG_ISO_8859_16, 0, 0, 0, 0}, { PG_SJIS, sjis2mic, mic2sjis, 0, 0}, { PG_BIG5, big52mic, mic2big5, 0, 0}, { PG_WIN1250, win12502mic, mic2win1250, 0, 0}, diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c index cb31379a501..51fc8bd61cb 100644 --- a/src/backend/utils/mb/encnames.c +++ b/src/backend/utils/mb/encnames.c @@ -2,7 +2,7 @@ * Encoding names and routines for work with it. All * in this file is shared bedween FE and BE. * - * $Id: encnames.c,v 1.2 2001/09/07 15:01:45 momjian Exp $ + * $Id: encnames.c,v 1.3 2001/10/11 14:20:35 ishii Exp $ */ #ifdef FRONTEND #include "postgres_fe.h" @@ -43,17 +43,30 @@ pg_encname pg_encname_tbl[] = { "euckr", PG_EUC_KR }, /* EUC-KR; RFC1557,Choi */ { "euctw", PG_EUC_TW }, /* EUC-TW; ??? */ { "iso88591", PG_LATIN1 }, /* ISO-8859-1; RFC1345,KXS2 */ + { "iso885910", PG_ISO_8859_10 }, /* ISO-8859-10; RFC1345,KXS2 */ + { "iso885913", PG_ISO_8859_13 }, /* ISO-8859-13; RFC1345,KXS2 */ + { "iso885914", PG_ISO_8859_14 }, /* ISO-8859-14; RFC1345,KXS2 */ + { "iso885915", PG_ISO_8859_15 }, /* ISO-8859-15; RFC1345,KXS2 */ + { "iso885916", PG_ISO_8859_16 }, /* ISO-8859-15; RFC1345,KXS2 */ { "iso88592", PG_LATIN2 }, /* ISO-8859-2; RFC1345,KXS2 */ { "iso88593", PG_LATIN3 }, /* ISO-8859-3; RFC1345,KXS2 */ { "iso88594", PG_LATIN4 }, /* ISO-8859-4; RFC1345,KXS2 */ - { "iso88595", PG_LATIN5 }, /* ISO-8859-5; RFC1345,KXS2 */ - { "koi8", PG_KOI8R }, /* _dirty_ alias for KOI8-R (back compatibility) */ + { "iso88595", PG_ISO_8859_5 }, /* ISO-8859-5; RFC1345,KXS2 */ + { "iso88596", PG_ISO_8859_6 }, /* ISO-8859-6; RFC1345,KXS2 */ + { "iso88597", PG_ISO_8859_7 }, /* ISO-8859-7; RFC1345,KXS2 */ + { "iso88598", PG_ISO_8859_8 }, /* ISO-8859-8; RFC1345,KXS2 */ + { "iso88599", PG_LATIN5 }, /* ISO-8859-9; RFC1345,KXS2 */ + { "koi8", PG_KOI8R }, /* _dirty_ alias for KOI8-R (backward compatibility) */ { "koi8r", PG_KOI8R }, /* KOI8-R; RFC1489 */ { "latin1", PG_LATIN1 }, /* alias for ISO-8859-1 */ { "latin2", PG_LATIN2 }, /* alias for ISO-8859-2 */ { "latin3", PG_LATIN3 }, /* alias for ISO-8859-3 */ { "latin4", PG_LATIN4 }, /* alias for ISO-8859-4 */ - { "latin5", PG_LATIN5 }, /* alias for ISO-8859-5 */ + { "latin5", PG_LATIN5 }, /* alias for ISO-8859-9 */ + { "latin6", PG_ISO_8859_10}, /* alias for ISO-8859-10 */ + { "latin7", PG_ISO_8859_13}, /* alias for ISO-8859-13 */ + { "latin8", PG_ISO_8859_14}, /* alias for ISO-8859-14 */ + { "latin9", PG_ISO_8859_15}, /* alias for ISO-8859-15 */ { "mskanji", PG_SJIS }, /* alias for Shift_JIS */ { "muleinternal",PG_MULE_INTERNAL }, { "shiftjis", PG_SJIS }, /* Shift_JIS; JIS X 0202-1991 */ @@ -61,7 +74,7 @@ pg_encname pg_encname_tbl[] = { "sqlascii", PG_SQL_ASCII }, { "unicode", PG_UTF8 }, /* alias for UTF-8 */ { "utf8", PG_UTF8 }, /* UTF-8; RFC2279 */ - { "win", PG_WIN1251 }, /* _dirty_ alias for windows-1251 (back compatibility) */ + { "win", PG_WIN1251 }, /* _dirty_ alias for windows-1251 (backward compatibility) */ { "win1250", PG_WIN1250 }, /* alias for Windows-1250 */ { "win1251", PG_WIN1251 }, /* alias for Windows-1251 */ { "windows1250",PG_WIN1250 }, /* Windows-1251; Microsoft */ @@ -94,6 +107,15 @@ pg_enc2name pg_enc2name_tbl[] = { "KOI8", PG_KOI8R }, { "WIN", PG_WIN1251 }, { "ALT", PG_ALT }, + { "ISO_8859_5", PG_ISO_8859_5 }, + { "ISO_8859_6", PG_ISO_8859_6 }, + { "ISO_8859_7", PG_ISO_8859_7 }, + { "ISO_8859_8", PG_ISO_8859_8 }, + { "ISO_8859_10", PG_ISO_8859_10 }, + { "ISO_8859_13", PG_ISO_8859_13 }, + { "ISO_8859_14", PG_ISO_8859_14 }, + { "ISO_8859_15", PG_ISO_8859_15 }, + { "ISO_8859_16", PG_ISO_8859_16 }, { "SJIS", PG_SJIS }, { "BIG5", PG_BIG5 }, { "WIN1250", PG_WIN1250 } diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index 445e0e503aa..e819d5ffeae 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -1,7 +1,7 @@ /* * conversion functions between pg_wchar and multi-byte streams. * Tatsuo Ishii - * $Id: wchar.c,v 1.22 2001/09/23 10:59:45 ishii Exp $ + * $Id: wchar.c,v 1.23 2001/10/11 14:20:35 ishii Exp $ * * WIN1250 client encoding updated by Pavel Behal * @@ -473,9 +473,18 @@ pg_wchar_tbl pg_wchar_table[] = { {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 12; PG_KOI8 */ {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 13; PG_WIN1251 */ {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 14; PG_ALT */ - {0, pg_sjis_mblen, 2}, /* 15; PG_SJIS */ - {0, pg_big5_mblen, 2}, /* 17; PG_BIG5 */ - {pg_latin12wchar_with_len, pg_latin1_mblen, 1} /* 18; PG_WIN1250 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 15; ISO-8859-5 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 16; ISO-8859-6 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 17; ISO-8859-7 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 18; ISO-8859-8 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 19; ISO-8859-10 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 20; ISO-8859-13 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 21; ISO-8859-14 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 22; ISO-8859-15 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1}, /* 23; ISO-8859-16 */ + {0, pg_sjis_mblen, 2}, /* 24; PG_SJIS */ + {0, pg_big5_mblen, 2}, /* 25; PG_BIG5 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, 1} /* 26; PG_WIN1250 */ }; /* returns the byte length of a word for mule internal code */ diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index eb8bf54e646..38d06661d5e 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $Id: pg_wchar.h,v 1.32 2001/09/23 10:59:45 ishii Exp $ */ +/* $Id: pg_wchar.h,v 1.33 2001/10/11 14:20:35 ishii Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -28,36 +28,114 @@ typedef unsigned int pg_wchar; #define SS3 0x8f /* single shift 3 (JIS0212) */ /* - * various definitions for mule internal code + * Leading byte types or leading prefix byte for MULE internal code. + * See http://www.xemacs.org for more details. (there is a doc titled + * "XEmacs Internals Manual", "MULE Character Sets and Encodings" + * section. + */ +/* + * Is a leading byte for "official" single byte encodings? + */ +#define IS_LC1(c) ((unsigned char)(c) >= 0x81 && (unsigned char)(c) <= 0x8d) +/* + * Is a prefix byte for "private" single byte encodings? */ -#define IS_LC1(c) ((unsigned char)(c) >= 0x81 && (unsigned char)(c) <= 0x8f) #define IS_LCPRV1(c) ((unsigned char)(c) == 0x9a || (unsigned char)(c) == 0x9b) +/* + * Is a leading byte for "official" multi byte encodings? + */ #define IS_LC2(c) ((unsigned char)(c) >= 0x90 && (unsigned char)(c) <= 0x99) +/* + * Is a prefix byte for "private" multi byte encodings? + */ #define IS_LCPRV2(c) ((unsigned char)(c) == 0x9c || (unsigned char)(c) == 0x9d) -/* +/*---------------------------------------------------- * leading characters + *---------------------------------------------------- + */ + +/* + * Official single byte encodings (0x81-0x8e) */ #define LC_ISO8859_1 0x81 /* ISO8859 Latin 1 */ #define LC_ISO8859_2 0x82 /* ISO8859 Latin 2 */ #define LC_ISO8859_3 0x83 /* ISO8859 Latin 3 */ #define LC_ISO8859_4 0x84 /* ISO8859 Latin 4 */ -#define LC_ISO8859_5 0x8d /* ISO8859 Latin 5 */ +#define LC_TIS620 0x85 /* Thai (not supported yet) */ +#define LC_ISO8859_7 0x86 /* Greek (not supported yet) */ +#define LC_ISO8859_6 0x87 /* Arabic (not supported yet) */ +#define LC_ISO8859_8 0x88 /* Hebrew (not supported yet) */ #define LC_JISX0201K 0x89 /* Japanese 1 byte kana */ #define LC_JISX0201R 0x8a /* Japanese 1 byte Roman */ -#define LC_KOI8_R 0x8c /* Cyrillic KOI8-R */ -#define LC_KOI8_U 0x8c /* Cyrillic KOI8-U */ +/* Note that 0x8b seems to be unused in as of Emacs 20.7. + * However, there might be a chance that 0x8b could be used + * in later version of Emacs. + */ +#define LC_KOI8_R 0x8b /* Cyrillic KOI8-R */ +#define LC_KOI8_U 0x8b /* Cyrillic KOI8-U */ +#define LC_ISO8859_5 0x8c /* ISO8859 Cyrillic */ +#define LC_ISO8859_9 0x8d /* ISO8859 Latin 5 (not supported yet) */ +/* #define FREE 0x8e free (unused) */ + +/* + * Unused + */ +#define CONTROL_1 0x8f /* control characters (unused) */ + +/* + * Official multibyte byte encodings (0x90-0x99) + * 0x9a-0x9d are free. 0x9e and 0x9f are reserved. + */ +#define LC_JISX0208_1978 0x90 /* Japanese Kanji, old JIS (not supported) */ +/* #define FREE 0x90 free (unused) */ #define LC_GB2312_80 0x91 /* Chinese */ -#define LC_JISX0208 0x92 /* Japanese Kanji */ +#define LC_JISX0208 0x92 /* Japanese Kanji (JIS X 0208) */ #define LC_KS5601 0x93 /* Korean */ -#define LC_JISX0212 0x94 /* Japanese Kanji (JISX0212) */ +#define LC_JISX0212 0x94 /* Japanese Kanji (JIS X 0212) */ #define LC_CNS11643_1 0x95 /* CNS 11643-1992 Plane 1 */ #define LC_CNS11643_2 0x96 /* CNS 11643-1992 Plane 2 */ +/* #define FREE 0x97 free (unused) */ +#define LC_BIG5_1 0x98 /* Plane 1 Chinese traditional (not supported) */ +#define LC_BIG5_2 0x99 /* Plane 1 Chinese traditional (not supported) */ + +/* + * Private single byte encodings (0xa0-0xef) + */ +#define LC_SISHENG 0xa0 /* Chinese SiSheng characters for PinYin/ZhuYin + (not supported) */ +#define LC_IPA 0xa1 /* IPA (International Phonetic Association) + (not supported) */ +#define LC_VISCII_LOWER 0xa2 /* Vietnamese VISCII1.1 lower-case (not supported) */ +#define LC_VISCII_UPPER 0xa3 /* Vietnamese VISCII1.1 upper-case (not supported) */ +#define LC_ARABIC_DIGIT 0xa4 /* Arabic digit (not supported) */ +#define LC_ARABIC_1_COLUMN 0xa5 /* Arabic 1-column (not supported) */ +#define LC_ASCII_RIGHT_TO_LEFT 0xa6 /* ASCII (left half of ISO8859-1) + with right-to-left direction + (not supported) */ +#define LC_LAO 0xa7 /* Lao characters (ISO10646 0E80..0EDF) + (not supported) */ +#define LC_ARABIC_2_COLUMN 0xa8 /* Arabic 1-column (not supported) */ + +/* + * Private multi byte encodings (0xf0-0xff) + */ +#define LC_INDIAN_1_COLUMN 0xf0 /* Indian charset for 1-column + width glypps (not supported) */ +#define LC_TIBETAN_1_COLUMN 0xf1 /* Tibetan 1 column glyph + (not supported) */ +#define LC_ETHIOPIC 0xf5 /* Ethiopic characters (not supported) */ #define LC_CNS11643_3 0xf6 /* CNS 11643-1992 Plane 3 */ #define LC_CNS11643_4 0xf7 /* CNS 11643-1992 Plane 4 */ #define LC_CNS11643_5 0xf8 /* CNS 11643-1992 Plane 5 */ #define LC_CNS11643_6 0xf9 /* CNS 11643-1992 Plane 6 */ #define LC_CNS11643_7 0xfa /* CNS 11643-1992 Plane 7 */ +#define LC_INDIAN_2_COLUMN 0xfb /* Indian charset for 2-column + width glypps (not supported) */ +#define LC_TIBETAN 0xfc /* Tibetan (not supported) */ +/* #define FREE 0xfd free (unused) */ +/* #define FREE 0xfe free (unused) */ +/* #define FREE 0xff free (unused) */ /* * Encoding numeral identificators @@ -83,10 +161,19 @@ typedef enum pg_enc PG_LATIN2, /* ISO-8859 Latin 2 */ PG_LATIN3, /* ISO-8859 Latin 3 */ PG_LATIN4, /* ISO-8859 Latin 4 */ - PG_LATIN5, /* ISO-8859 Latin 5 */ + PG_LATIN5, /* ISO-8859-9 Latin 5 */ PG_KOI8R, /* KOI8-R */ PG_WIN1251, /* windows-1251 (was: WIN) */ PG_ALT, /* (MS-DOS CP866) */ + PG_ISO_8859_5, /* ISO-8859-5 */ + PG_ISO_8859_6, /* ISO-8859-6 */ + PG_ISO_8859_7, /* ISO-8859-7 */ + PG_ISO_8859_8, /* ISO-8859-8 */ + PG_ISO_8859_10, /* ISO-8859-10 Latin6 */ + PG_ISO_8859_13, /* ISO-8859-13 Latin7 */ + PG_ISO_8859_14, /* ISO-8859-14 Latin8 */ + PG_ISO_8859_15, /* ISO-8859-15 Latin9 */ + PG_ISO_8859_16, /* ISO-8859-16 */ /* followings are for client encoding only */ PG_SJIS, /* Shift JIS */ @@ -97,7 +184,7 @@ typedef enum pg_enc } pg_enc; -#define PG_ENCODING_BE_LAST PG_ALT +#define PG_ENCODING_BE_LAST PG_ISO_8859_16 #define PG_ENCODING_FE_LAST PG_WIN1250 |