Changeset 23508 for main/branches
- Timestamp:
- 2010-12-17T14:04:10+13:00 (13 years ago)
- Location:
- main/branches/64_bit_Greenstone/greenstone2
- Files:
-
- 230 edited
Legend:
- Unmodified
- Added
- Removed
-
main/branches/64_bit_Greenstone/greenstone2/build-src/configure
r23356 r23508 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 7.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 5 # 6 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010 Free Software8 # Foundation,Inc.7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 9 # 10 10 # … … 317 317 done 318 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 320 321 321 … … 357 357 358 358 359 # as_fn_error STATUSERROR [LINENO LOG_FD]360 # --------------------------------- -------359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with STATUS, using 1 if that was 0.363 # script with status $?, using 1 if that was 0. 364 364 as_fn_error () 365 365 { 366 as_status=$ 1; test $as_status -eq 0 && as_status=1367 if test "$ 4"; then368 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 370 fi 371 $as_echo "$as_me: error: $ 2" >&2371 $as_echo "$as_me: error: $1" >&2 372 372 as_fn_exit $as_status 373 373 } # as_fn_error … … 531 531 532 532 # Name of the host. 533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 534 534 # so uname gets run too. 535 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 605 605 CPP 606 606 MICO_VER 607 COMPAT32BITFLAGS608 607 RANLIB 609 608 SET_MAKE … … 783 782 784 783 case $ac_option in 785 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 786 *=) ac_optarg= ;; 787 *) ac_optarg=yes ;; 784 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 785 *) ac_optarg=yes ;; 788 786 esac 789 787 … … 830 828 # Reject names that are not valid shell variable names. 831 829 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 832 as_fn_error $?"invalid feature name: $ac_useropt"830 as_fn_error "invalid feature name: $ac_useropt" 833 831 ac_useropt_orig=$ac_useropt 834 832 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 856 854 # Reject names that are not valid shell variable names. 857 855 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 858 as_fn_error $?"invalid feature name: $ac_useropt"856 as_fn_error "invalid feature name: $ac_useropt" 859 857 ac_useropt_orig=$ac_useropt 860 858 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1060 1058 # Reject names that are not valid shell variable names. 1061 1059 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1062 as_fn_error $?"invalid package name: $ac_useropt"1060 as_fn_error "invalid package name: $ac_useropt" 1063 1061 ac_useropt_orig=$ac_useropt 1064 1062 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1076 1074 # Reject names that are not valid shell variable names. 1077 1075 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1078 as_fn_error $?"invalid package name: $ac_useropt"1076 as_fn_error "invalid package name: $ac_useropt" 1079 1077 ac_useropt_orig=$ac_useropt 1080 1078 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1106 1104 x_libraries=$ac_optarg ;; 1107 1105 1108 -*) as_fn_error $?"unrecognized option: \`$ac_option'1109 Try \`$0 --help' for more information "1106 -*) as_fn_error "unrecognized option: \`$ac_option' 1107 Try \`$0 --help' for more information." 1110 1108 ;; 1111 1109 … … 1115 1113 case $ac_envvar in #( 1116 1114 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1117 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1115 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1118 1116 esac 1119 1117 eval $ac_envvar=\$ac_optarg … … 1133 1131 if test -n "$ac_prev"; then 1134 1132 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1135 as_fn_error $?"missing argument to $ac_option"1133 as_fn_error "missing argument to $ac_option" 1136 1134 fi 1137 1135 … … 1139 1137 case $enable_option_checking in 1140 1138 no) ;; 1141 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1139 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1142 1140 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1143 1141 esac … … 1162 1160 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1163 1161 esac 1164 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1162 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1165 1163 done 1166 1164 … … 1176 1174 if test "x$build_alias" = x; then 1177 1175 cross_compiling=maybe 1178 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1179 If a cross compiler is detected then cross compile mode will be used " >&21176 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1177 If a cross compiler is detected then cross compile mode will be used." >&2 1180 1178 elif test "x$build_alias" != "x$host_alias"; then 1181 1179 cross_compiling=yes … … 1192 1190 ac_ls_di=`ls -di .` && 1193 1191 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1194 as_fn_error $?"working directory cannot be determined"1192 as_fn_error "working directory cannot be determined" 1195 1193 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1196 as_fn_error $?"pwd does not report name of working directory"1194 as_fn_error "pwd does not report name of working directory" 1197 1195 1198 1196 … … 1233 1231 if test ! -r "$srcdir/$ac_unique_file"; then 1234 1232 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1235 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1233 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1236 1234 fi 1237 1235 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1238 1236 ac_abs_confdir=`( 1239 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1237 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1240 1238 pwd)` 1241 1239 # When building in place, set srcdir=. … … 1277 1275 --help=recursive display the short help of all the included packages 1278 1276 -V, --version display version information and exit 1279 -q, --quiet, --silent do not print \`checking 1277 -q, --quiet, --silent do not print \`checking...' messages 1280 1278 --cache-file=FILE cache test results in FILE [disabled] 1281 1279 -C, --config-cache alias for \`--cache-file=config.cache' … … 1436 1434 cat <<\_ACEOF 1437 1435 configure 1438 generated by GNU Autoconf 2.6 71439 1440 Copyright (C) 20 10Free Software Foundation, Inc.1436 generated by GNU Autoconf 2.65 1437 1438 Copyright (C) 2009 Free Software Foundation, Inc. 1441 1439 This configure script is free software; the Free Software Foundation 1442 1440 gives unlimited permission to copy, distribute and modify it. … … 1546 1544 fi 1547 1545 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1548 test $ac_status = 0; } > conftest.i&& {1546 test $ac_status = 0; } >/dev/null && { 1549 1547 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1550 1548 test ! -s conftest.err … … 1570 1568 { 1571 1569 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1572 if eval "test \"\${$3+set}\"" = set; then :1570 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1573 1571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1574 1572 $as_echo_n "checking for $2... " >&6; } 1575 if eval "test \"\${$3+set}\"" = set; then :1573 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1576 1574 $as_echo_n "(cached) " >&6 1577 1575 fi … … 1609 1607 ac_header_preproc=no 1610 1608 fi 1611 rm -f conftest.err conftest. i conftest.$ac_ext1609 rm -f conftest.err conftest.$ac_ext 1612 1610 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1613 1611 $as_echo "$ac_header_preproc" >&6; } … … 1636 1634 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1637 1635 $as_echo_n "checking for $2... " >&6; } 1638 if eval "test \"\${$3+set}\"" = set; then :1636 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1639 1637 $as_echo_n "(cached) " >&6 1640 1638 else … … 1700 1698 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1701 1699 $as_echo_n "checking for $2... " >&6; } 1702 if eval "test \"\${$3+set}\"" = set; then :1700 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1703 1701 $as_echo_n "(cached) " >&6 1704 1702 else … … 1777 1775 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1778 1776 $as_echo_n "checking for $2... " >&6; } 1779 if eval "test \"\${$3+set}\"" = set; then :1777 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1780 1778 $as_echo_n "(cached) " >&6 1781 1779 else … … 1830 1828 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1831 1829 $as_echo_n "checking for $2... " >&6; } 1832 if eval "test \"\${$3+set}\"" = set; then :1830 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1833 1831 $as_echo_n "(cached) " >&6 1834 1832 else … … 1935 1933 1936 1934 It was created by $as_me, which was 1937 generated by GNU Autoconf 2.6 7. Invocation command line was1935 generated by GNU Autoconf 2.65. Invocation command line was 1938 1936 1939 1937 $ $0 $@ … … 2045 2043 echo 2046 2044 2047 $as_echo "## ---------------- ## 2045 cat <<\_ASBOX 2046 ## ---------------- ## 2048 2047 ## Cache variables. ## 2049 ## ---------------- ##" 2048 ## ---------------- ## 2049 _ASBOX 2050 2050 echo 2051 2051 # The following way of writing the cache mishandles newlines in values, … … 2081 2081 echo 2082 2082 2083 $as_echo "## ----------------- ## 2083 cat <<\_ASBOX 2084 ## ----------------- ## 2084 2085 ## Output variables. ## 2085 ## ----------------- ##" 2086 ## ----------------- ## 2087 _ASBOX 2086 2088 echo 2087 2089 for ac_var in $ac_subst_vars … … 2096 2098 2097 2099 if test -n "$ac_subst_files"; then 2098 $as_echo "## ------------------- ## 2100 cat <<\_ASBOX 2101 ## ------------------- ## 2099 2102 ## File substitutions. ## 2100 ## ------------------- ##" 2103 ## ------------------- ## 2104 _ASBOX 2101 2105 echo 2102 2106 for ac_var in $ac_subst_files … … 2112 2116 2113 2117 if test -s confdefs.h; then 2114 $as_echo "## ----------- ## 2118 cat <<\_ASBOX 2119 ## ----------- ## 2115 2120 ## confdefs.h. ## 2116 ## ----------- ##" 2121 ## ----------- ## 2122 _ASBOX 2117 2123 echo 2118 2124 cat confdefs.h … … 2169 2175 ac_site_file2=NONE 2170 2176 if test -n "$CONFIG_SITE"; then 2171 # We do not want a PATH search for config.site. 2172 case $CONFIG_SITE in #(( 2173 -*) ac_site_file1=./$CONFIG_SITE;; 2174 */*) ac_site_file1=$CONFIG_SITE;; 2175 *) ac_site_file1=./$CONFIG_SITE;; 2176 esac 2177 ac_site_file1=$CONFIG_SITE 2177 2178 elif test "x$prefix" != xNONE; then 2178 2179 ac_site_file1=$prefix/share/config.site … … 2189 2190 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2190 2191 sed 's/^/| /' "$ac_site_file" >&5 2191 . "$ac_site_file" \ 2192 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2193 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2194 as_fn_error $? "failed to load site script $ac_site_file 2195 See \`config.log' for more details" "$LINENO" 5 ; } 2192 . "$ac_site_file" 2196 2193 fi 2197 2194 done … … 2269 2266 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2270 2267 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2271 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52268 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2272 2269 fi 2273 2270 ## -------------------- ## … … 2766 2763 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2767 2764 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2768 as_fn_error $?"no acceptable C compiler found in \$PATH2769 See \`config.log' for more details " "$LINENO" 5; }2765 as_fn_error "no acceptable C compiler found in \$PATH 2766 See \`config.log' for more details." "$LINENO" 5; } 2770 2767 2771 2768 # Provide some information about the compiler. … … 2881 2878 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2882 2879 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2883 as_fn_error 77 "C compiler cannot create executables 2884 See \`config.log' for more details" "$LINENO" 5 ; } 2880 { as_fn_set_status 77 2881 as_fn_error "C compiler cannot create executables 2882 See \`config.log' for more details." "$LINENO" 5; }; } 2885 2883 else 2886 2884 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 … … 2924 2922 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2925 2923 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2926 as_fn_error $?"cannot compute suffix of executables: cannot compile and link2927 See \`config.log' for more details " "$LINENO" 5; }2924 as_fn_error "cannot compute suffix of executables: cannot compile and link 2925 See \`config.log' for more details." "$LINENO" 5; } 2928 2926 fi 2929 2927 rm -f conftest conftest$ac_cv_exeext … … 2982 2980 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2983 2981 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2984 as_fn_error $?"cannot run C compiled programs.2982 as_fn_error "cannot run C compiled programs. 2985 2983 If you meant to cross compile, use \`--host'. 2986 See \`config.log' for more details " "$LINENO" 5; }2984 See \`config.log' for more details." "$LINENO" 5; } 2987 2985 fi 2988 2986 fi … … 3035 3033 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3036 3034 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3037 as_fn_error $?"cannot compute suffix of object files: cannot compile3038 See \`config.log' for more details " "$LINENO" 5; }3035 as_fn_error "cannot compute suffix of object files: cannot compile 3036 See \`config.log' for more details." "$LINENO" 5; } 3039 3037 fi 3040 3038 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3605 3603 3606 3604 fi 3607 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 53605 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 3608 3606 else 3609 3607 echo "Checking for javac... $JAVAC" … … 3621 3619 CLASS_TEST=Test.class 3622 3620 cat << \EOF > $JAVA_TEST 3623 /* #line 362 3"configure" */3621 /* #line 3621 "configure" */ 3624 3622 public class Test { 3625 3623 } … … 3633 3631 ac_cv_prog_javac_works=yes 3634 3632 else 3635 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 53633 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3636 3634 echo "configure: failed program was:" >&5 3637 3635 cat $JAVA_TEST >&5 … … 3738 3736 3739 3737 fi 3740 test x$JAVA = x && as_fn_error $?"no acceptable Java virtual machine found in \$PATH" "$LINENO" 53738 test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 3741 3739 fi 3742 3740 … … 3800 3798 ac_cv_prog_uudecode_base64=yes 3801 3799 else 3802 echo "configure: 380 2: uudecode had trouble decoding base 64 file 'Test.uue'" >&53800 echo "configure: 3800: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 3803 3801 echo "configure: failed file was:" >&5 3804 3802 cat Test.uue >&5 … … 3815 3813 $as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} 3816 3814 if test x$ac_cv_prog_javac_works = xno; then 3817 as_fn_error $?"Cannot compile java source. $JAVAC does not work properly" "$LINENO" 53815 as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 3818 3816 fi 3819 3817 if test x$ac_cv_prog_javac_works = x; then … … 3908 3906 3909 3907 fi 3910 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 53908 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 3911 3909 else 3912 3910 echo "Checking for javac... $JAVAC" … … 3924 3922 CLASS_TEST=Test.class 3925 3923 cat << \EOF > $JAVA_TEST 3926 /* #line 392 6"configure" */3924 /* #line 3924 "configure" */ 3927 3925 public class Test { 3928 3926 } … … 3936 3934 ac_cv_prog_javac_works=yes 3937 3935 else 3938 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 53936 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3939 3937 echo "configure: failed program was:" >&5 3940 3938 cat $JAVA_TEST >&5 … … 3963 3961 TEST=Test 3964 3962 cat << \EOF > $JAVA_TEST 3965 /* [#]line 396 5"configure" */3963 /* [#]line 3963 "configure" */ 3966 3964 public class Test { 3967 3965 public static void main (String args[]) { … … 3980 3978 echo "configure: failed program was:" >&5 3981 3979 cat $JAVA_TEST >&5 3982 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 53980 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3983 3981 fi 3984 3982 fi … … 3993 3991 echo "configure: failed program was:" >&5 3994 3992 cat $JAVA_TEST >&5 3995 as_fn_error $?"The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 53993 as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3996 3994 fi 3997 3995 rm -fr $JAVA_TEST $CLASS_TEST Test.uue … … 4091 4089 ac_aux_dir= 4092 4090 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 4093 if test -f "$ac_dir/install-sh"; then 4094 ac_aux_dir=$ac_dir 4095 ac_install_sh="$ac_aux_dir/install-sh -c" 4096 break 4097 elif test -f "$ac_dir/install.sh"; then 4098 ac_aux_dir=$ac_dir 4099 ac_install_sh="$ac_aux_dir/install.sh -c" 4100 break 4101 elif test -f "$ac_dir/shtool"; then 4102 ac_aux_dir=$ac_dir 4103 ac_install_sh="$ac_aux_dir/shtool install -c" 4104 break 4105 fi 4091 for ac_t in install-sh install.sh shtool; do 4092 if test -f "$ac_dir/$ac_t"; then 4093 ac_aux_dir=$ac_dir 4094 ac_install_sh="$ac_aux_dir/$ac_t -c" 4095 break 2 4096 fi 4097 done 4106 4098 done 4107 4099 if test -z "$ac_aux_dir"; then 4108 as_fn_error $?"cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 54100 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 4109 4101 fi 4110 4102 … … 4120 4112 # Make sure we can run config.sub. 4121 4113 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 4122 as_fn_error $?"cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 54114 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 4123 4115 4124 4116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 … … 4131 4123 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 4132 4124 test "x$ac_build_alias" = x && 4133 as_fn_error $?"cannot guess build type; you must specify one" "$LINENO" 54125 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 4134 4126 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 4135 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 54127 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 4136 4128 4137 4129 fi … … 4140 4132 case $ac_cv_build in 4141 4133 *-*-*) ;; 4142 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;4134 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 4143 4135 esac 4144 4136 build=$ac_cv_build … … 4165 4157 else 4166 4158 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 4167 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 54159 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 4168 4160 fi 4169 4161 … … 4173 4165 case $ac_cv_host in 4174 4166 *-*-*) ;; 4175 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;4167 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 4176 4168 esac 4177 4169 host=$ac_cv_host … … 4198 4190 else 4199 4191 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 4200 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 54192 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 4201 4193 fi 4202 4194 … … 4206 4198 case $ac_cv_target in 4207 4199 *-*-*) ;; 4208 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;4200 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 4209 4201 esac 4210 4202 target=$ac_cv_target … … 4337 4329 set x ${MAKE-make} 4338 4330 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 4339 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :4331 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 4340 4332 $as_echo_n "(cached) " >&6 4341 4333 else … … 4345 4337 @echo '@@@%%%=$(MAKE)=@@@%%%' 4346 4338 _ACEOF 4347 # GNU make sometimes prints "make[1]: Entering 4339 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 4348 4340 case `${MAKE-make} -f conftest.make 2>/dev/null` in 4349 4341 *@@@%%%=?*=@@@%%%*) … … 4455 4447 RANLIB="$ac_cv_prog_RANLIB" 4456 4448 fi 4457 4458 4459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&54460 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }4461 arch_64bit=no4462 case "$host_cpu" in4463 x86_64) arch_64bit=yes ;;4464 esac4465 4466 if test "$arch_64bit" = yes; then4467 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&54468 $as_echo "yes" >&6; }4469 if test -z "$COMPAT32BITFLAGS" ; then4470 COMPAT32BITFLAGS="-m32"4471 fi4472 else4473 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&54474 $as_echo "no" >&6; }4475 if test -z "$COMPAT32BITFLAGS" ; then4476 COMPAT32BITFLAGS=4477 fi4478 fi4479 4480 # Only need compat32bitflag if using MG or MGPP4481 if test "$ENABLE_MG" = "0" -a "$ENABLE_MGPP" = "0" ; then4482 COMPAT32BITFLAGS=4483 fi4484 4485 export COMPAT32BITFLAGS4486 4449 4487 4450 … … 4560 4523 continue 4561 4524 fi 4562 rm -f conftest.err conftest. i conftest.$ac_ext4525 rm -f conftest.err conftest.$ac_ext 4563 4526 4564 4527 # OK, works on sane cases. Now check whether nonexistent headers … … 4576 4539 break 4577 4540 fi 4578 rm -f conftest.err conftest. i conftest.$ac_ext4541 rm -f conftest.err conftest.$ac_ext 4579 4542 4580 4543 done 4581 4544 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4582 rm -f conftest. i conftest.err conftest.$ac_ext4545 rm -f conftest.err conftest.$ac_ext 4583 4546 if $ac_preproc_ok; then : 4584 4547 break … … 4619 4582 continue 4620 4583 fi 4621 rm -f conftest.err conftest. i conftest.$ac_ext4584 rm -f conftest.err conftest.$ac_ext 4622 4585 4623 4586 # OK, works on sane cases. Now check whether nonexistent headers … … 4635 4598 break 4636 4599 fi 4637 rm -f conftest.err conftest. i conftest.$ac_ext4600 rm -f conftest.err conftest.$ac_ext 4638 4601 4639 4602 done 4640 4603 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4641 rm -f conftest. i conftest.err conftest.$ac_ext4604 rm -f conftest.err conftest.$ac_ext 4642 4605 if $ac_preproc_ok; then : 4643 4606 … … 4645 4608 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4646 4609 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4647 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4648 See \`config.log' for more details " "$LINENO" 5; }4610 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4611 See \`config.log' for more details." "$LINENO" 5; } 4649 4612 fi 4650 4613 … … 4707 4670 IFS=$as_save_IFS 4708 4671 if test -z "$ac_cv_path_GREP"; then 4709 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54672 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4710 4673 fi 4711 4674 else … … 4773 4736 IFS=$as_save_IFS 4774 4737 if test -z "$ac_cv_path_EGREP"; then 4775 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54738 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4776 4739 fi 4777 4740 else … … 4905 4868 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4906 4869 " 4907 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4870 eval as_val=\$$as_ac_Header 4871 if test "x$as_val" = x""yes; then : 4908 4872 cat >>confdefs.h <<_ACEOF 4909 4873 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5460 5424 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 5461 5425 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 5462 if eval "test \"\${$as_ac_Header+set}\"" = set; then :5426 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 5463 5427 $as_echo_n "(cached) " >&6 5464 5428 else … … 5487 5451 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 5488 5452 $as_echo "$ac_res" >&6; } 5489 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5453 eval as_val=\$$as_ac_Header 5454 if test "x$as_val" = x""yes; then : 5490 5455 cat >>confdefs.h <<_ACEOF 5491 5456 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 … … 5729 5694 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5730 5695 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5731 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5696 eval as_val=\$$as_ac_Header 5697 if test "x$as_val" = x""yes; then : 5732 5698 cat >>confdefs.h <<_ACEOF 5733 5699 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5902 5868 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5903 5869 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5904 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5870 eval as_val=\$$as_ac_var 5871 if test "x$as_val" = x""yes; then : 5905 5872 5906 5873 cat >>confdefs.h <<_ACEOF … … 6062 6029 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6063 6030 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6064 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 6031 eval as_val=\$$as_ac_var 6032 if test "x$as_val" = x""yes; then : 6065 6033 cat >>confdefs.h <<_ACEOF 6066 6034 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 … … 6070 6038 done 6071 6039 6072 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 6073 if test "x$ac_cv_func_ftruncate" = x""yes; then : 6074 $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 6040 for ac_func in ftruncate strstr strcasecmp 6041 do : 6042 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6043 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6044 eval as_val=\$$as_ac_var 6045 if test "x$as_val" = x""yes; then : 6046 cat >>confdefs.h <<_ACEOF 6047 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 6048 _ACEOF 6075 6049 6076 6050 else 6077 6051 case " $LIBOBJS " in 6078 *" ftruncate.$ac_objext "* ) ;;6079 *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"6052 *" $ac_func.$ac_objext "* ) ;; 6053 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 6080 6054 ;; 6081 6055 esac 6082 6056 6083 6057 fi 6084 6085 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 6086 if test "x$ac_cv_func_strstr" = x""yes; then : 6087 $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 6088 6089 else 6090 case " $LIBOBJS " in 6091 *" strstr.$ac_objext "* ) ;; 6092 *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 6093 ;; 6094 esac 6095 6096 fi 6097 6098 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 6099 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 6100 $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 6101 6102 else 6103 case " $LIBOBJS " in 6104 *" strcasecmp.$ac_objext "* ) ;; 6105 *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 6106 ;; 6107 esac 6108 6109 fi 6058 done 6110 6059 6111 6060 … … 6277 6226 { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5 6278 6227 $as_echo "\"no\"" >&6; } 6279 as_fn_error $?"\"Perl 5 not available - cannot install\"" "$LINENO" 56228 as_fn_error "\"Perl 5 not available - cannot install\"" "$LINENO" 5 6280 6229 fi 6281 6230 … … 6346 6295 { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5 6347 6296 $as_echo "\"yes\"" >&6; } 6348 as_fn_error $?"\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 56297 as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5 6349 6298 fi 6350 6299 … … 6578 6527 ;; #( 6579 6528 *) 6580 as_fn_error $?"unknown endianness6581 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 6529 as_fn_error "unknown endianness 6530 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 6582 6531 esac 6583 6532 … … 6626 6575 srclist="src/hashfile/Makefile \ 6627 6576 src/phind/generate/Makefile \ 6628 6577 src/java/org/nzdl/gsdl/Makefile" 6629 6578 6630 6579 ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs" … … 6713 6662 ac_libobjs= 6714 6663 ac_ltlibobjs= 6715 U=6716 6664 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 6717 6665 # 1. Remove the extension, and $U if already installed. … … 6876 6824 6877 6825 6878 # as_fn_error STATUSERROR [LINENO LOG_FD]6879 # --------------------------------- -------6826 # as_fn_error ERROR [LINENO LOG_FD] 6827 # --------------------------------- 6880 6828 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 6881 6829 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 6882 # script with STATUS, using 1 if that was 0.6830 # script with status $?, using 1 if that was 0. 6883 6831 as_fn_error () 6884 6832 { 6885 as_status=$ 1; test $as_status -eq 0 && as_status=16886 if test "$ 4"; then6887 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack6888 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$46833 as_status=$?; test $as_status -eq 0 && as_status=1 6834 if test "$3"; then 6835 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6836 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 6889 6837 fi 6890 $as_echo "$as_me: error: $ 2" >&26838 $as_echo "$as_me: error: $1" >&2 6891 6839 as_fn_exit $as_status 6892 6840 } # as_fn_error … … 7084 7032 done 7085 7033 test -z "$as_dirs" || eval "mkdir $as_dirs" 7086 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"7034 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 7087 7035 7088 7036 … … 7138 7086 ac_log=" 7139 7087 This file was extended by $as_me, which was 7140 generated by GNU Autoconf 2.6 7. Invocation command line was7088 generated by GNU Autoconf 2.65. Invocation command line was 7141 7089 7142 7090 CONFIG_FILES = $CONFIG_FILES … … 7200 7148 ac_cs_version="\\ 7201 7149 config.status 7202 configured by $0, generated by GNU Autoconf 2.6 7,7150 configured by $0, generated by GNU Autoconf 2.65, 7203 7151 with options \\"\$ac_cs_config\\" 7204 7152 7205 Copyright (C) 20 10Free Software Foundation, Inc.7153 Copyright (C) 2009 Free Software Foundation, Inc. 7206 7154 This config.status script is free software; the Free Software Foundation 7207 7155 gives unlimited permission to copy, distribute and modify it." … … 7220 7168 do 7221 7169 case $1 in 7222 --*= ?*)7170 --*=*) 7223 7171 ac_option=`expr "X$1" : 'X\([^=]*\)='` 7224 7172 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 7225 ac_shift=:7226 ;;7227 --*=)7228 ac_option=`expr "X$1" : 'X\([^=]*\)='`7229 ac_optarg=7230 7173 ac_shift=: 7231 7174 ;; … … 7251 7194 case $ac_optarg in 7252 7195 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 7253 '') as_fn_error $? "missing file argument" ;;7254 7196 esac 7255 7197 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 7264 7206 --he | --h) 7265 7207 # Conflict between --help and --header 7266 as_fn_error $?"ambiguous option: \`$1'7208 as_fn_error "ambiguous option: \`$1' 7267 7209 Try \`$0 --help' for more information.";; 7268 7210 --help | --hel | -h ) … … 7273 7215 7274 7216 # This is an error. 7275 -*) as_fn_error $?"unrecognized option: \`$1'7217 -*) as_fn_error "unrecognized option: \`$1' 7276 7218 Try \`$0 --help' for more information." ;; 7277 7219 … … 7328 7270 "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;; 7329 7271 7330 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;7272 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 7331 7273 esac 7332 7274 done … … 7365 7307 tmp=./conf$$-$RANDOM 7366 7308 (umask 077 && mkdir "$tmp") 7367 } || as_fn_error $?"cannot create a temporary directory in ." "$LINENO" 57309 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 7368 7310 7369 7311 # Set up the scripts for CONFIG_FILES section. … … 7382 7324 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 7383 7325 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 7384 ac_cs_awk_cr='\ \r'7326 ac_cs_awk_cr='\r' 7385 7327 else 7386 7328 ac_cs_awk_cr=$ac_cr … … 7396 7338 echo "_ACEOF" 7397 7339 } >conf$$subs.sh || 7398 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57399 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`7340 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7341 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 7400 7342 ac_delim='%!_!# ' 7401 7343 for ac_last_try in false false false false false :; do 7402 7344 . ./conf$$subs.sh || 7403 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57345 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7404 7346 7405 7347 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 7407 7349 break 7408 7350 elif $ac_last_try; then 7409 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57351 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7410 7352 else 7411 7353 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7496 7438 cat 7497 7439 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 7498 || as_fn_error $?"could not setup config files machinery" "$LINENO" 57499 _ACEOF 7500 7501 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),7502 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and7440 || as_fn_error "could not setup config files machinery" "$LINENO" 5 7441 _ACEOF 7442 7443 # VPATH may cause trouble with some makes, so we remove $(srcdir), 7444 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 7503 7445 # trailing colons and then remove the whole line if VPATH becomes empty 7504 7446 # (actually we leave an empty line to preserve line numbers). 7505 7447 if test "x$srcdir" = x.; then 7506 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 7507 h 7508 s/// 7509 s/^/:/ 7510 s/[ ]*$/:/ 7511 s/:\$(srcdir):/:/g 7512 s/:\${srcdir}:/:/g 7513 s/:@srcdir@:/:/g 7514 s/^:*// 7448 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 7449 s/:*\$(srcdir):*/:/ 7450 s/:*\${srcdir}:*/:/ 7451 s/:*@srcdir@:*/:/ 7452 s/^\([^=]*=[ ]*\):*/\1/ 7515 7453 s/:*$// 7516 x7517 s/\(=[ ]*\).*/\1/7518 G7519 s/\n//7520 7454 s/^[^=]*=[ ]*$// 7521 7455 }' … … 7545 7479 break 7546 7480 elif $ac_last_try; then 7547 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 57481 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 7548 7482 else 7549 7483 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7630 7564 _ACEOF 7631 7565 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 7632 as_fn_error $?"could not setup config headers machinery" "$LINENO" 57566 as_fn_error "could not setup config headers machinery" "$LINENO" 5 7633 7567 fi # test -n "$CONFIG_HEADERS" 7634 7568 … … 7643 7577 case $ac_mode$ac_tag in 7644 7578 :[FHL]*:*);; 7645 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;7579 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 7646 7580 :[FH]-) ac_tag=-:-;; 7647 7581 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 7671 7605 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 7672 7606 esac || 7673 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;7607 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 7674 7608 esac 7675 7609 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 7698 7632 case $ac_tag in 7699 7633 *:-:* | *:-) cat >"$tmp/stdin" \ 7700 || as_fn_error $? "could not create $ac_file" "$LINENO" 5;;7634 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 7701 7635 esac 7702 7636 ;; … … 7829 7763 " 7830 7764 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 7831 || as_fn_error $?"could not create $ac_file" "$LINENO" 57765 || as_fn_error "could not create $ac_file" "$LINENO" 5 7832 7766 7833 7767 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && … … 7835 7769 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 7836 7770 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7837 which seems to be undefined. Please make sure it is defined " >&57771 which seems to be undefined. Please make sure it is defined." >&5 7838 7772 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7839 which seems to be undefined. Please make sure it is defined " >&2;}7773 which seems to be undefined. Please make sure it is defined." >&2;} 7840 7774 7841 7775 rm -f "$tmp/stdin" … … 7844 7778 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 7845 7779 esac \ 7846 || as_fn_error $?"could not create $ac_file" "$LINENO" 57780 || as_fn_error "could not create $ac_file" "$LINENO" 5 7847 7781 ;; 7848 7782 :H) … … 7855 7789 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 7856 7790 } >"$tmp/config.h" \ 7857 || as_fn_error $?"could not create $ac_file" "$LINENO" 57791 || as_fn_error "could not create $ac_file" "$LINENO" 5 7858 7792 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 7859 7793 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 … … 7862 7796 rm -f "$ac_file" 7863 7797 mv "$tmp/config.h" "$ac_file" \ 7864 || as_fn_error $?"could not create $ac_file" "$LINENO" 57798 || as_fn_error "could not create $ac_file" "$LINENO" 5 7865 7799 fi 7866 7800 else 7867 7801 $as_echo "/* $configure_input */" \ 7868 7802 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 7869 || as_fn_error $?"could not create -" "$LINENO" 57803 || as_fn_error "could not create -" "$LINENO" 5 7870 7804 fi 7871 7805 ;; … … 7882 7816 7883 7817 test $ac_write_fail = 0 || 7884 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 57818 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 7885 7819 7886 7820 … … 7903 7837 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7904 7838 # would make configure fail if this is the last instruction. 7905 $ac_cs_success || as_fn_exit 17839 $ac_cs_success || as_fn_exit $? 7906 7840 fi 7907 7841 … … 8044 7978 eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ 8045 7979 --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || 8046 as_fn_error $?"$ac_sub_configure failed for $ac_dir" "$LINENO" 57980 as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 8047 7981 fi 8048 7982 -
main/branches/64_bit_Greenstone/greenstone2/build-src/configure.in
r23356 r23508 164 164 AC_PROG_RANLIB 165 165 166 AC_MSG_CHECKING(to see if architecture is 64-bit) 167 arch_64bit=no 168 case "$host_cpu" in 169 x86_64) arch_64bit=yes ;; 170 esac 171 172 if test "$arch_64bit" = yes; then 173 AC_MSG_RESULT(yes) 174 if test -z "$COMPAT32BITFLAGS" ; then 175 COMPAT32BITFLAGS="-m32" 176 fi 177 else 178 AC_MSG_RESULT(no) 179 if test -z "$COMPAT32BITFLAGS" ; then 180 COMPAT32BITFLAGS= 181 fi 182 fi 183 184 # Only need compat32bitflag if using MG or MGPP 185 if test "$ENABLE_MG" = "0" -a "$ENABLE_MGPP" = "0" ; then 186 COMPAT32BITFLAGS= 187 fi 188 189 export COMPAT32BITFLAGS 190 AC_SUBST(COMPAT32BITFLAGS) 191 166 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 167 dnl arch_64bit=no 168 dnl case "$host_cpu" in 169 dnl x86_64) arch_64bit=yes ;; 170 dnl esac 192 171 193 172 #moved CORBA MICO directory test to get version of MICO -
main/branches/64_bit_Greenstone/greenstone2/build-src/packages/configure
r22696 r23508 182 182 cd "$PACKAGES/cpan/XML-Parser-2.34" && \ 183 183 184 #Use 64-bit expat library on 64-bit machines, otherwise use 32-bit 185 if test ! -z "$COMPAT32BITFLAGS" ; then 186 perl Makefile.PL \ 187 PREFIX="$GSDLHOME/perllib/cpan/XML" \ 188 INSTALLSITELIB="$GSDLHOME/perllib/cpan/$perl_dir" \ 189 INSTALLSITEARCH="$GSDLHOME/perllib/cpan/$perl_dir" \ 190 INSTALLMAN1DIR="$GSDLHOME/perllib/cpan/$perl_dir" \ 191 INSTALLMAN3DIR="$GSDLHOME/perllib/cpan/$perl_dir" \ 192 SITEPREFIX="$GSDLHOME/perllib/cpan" \ 193 EXPATINCPATH="$GSDLHOME/common-src/packages/expat/include" \ 194 EXPATLIBPATH="$GSDLHOME/common-src/packages/expat/lib64" 195 else 184 196 185 perl Makefile.PL \ 197 186 PREFIX="$GSDLHOME/perllib/cpan/XML" \ … … 203 192 EXPATINCPATH="$GSDLHOME/common-src/packages/expat/include" \ 204 193 EXPATLIBPATH="$GSDLHOME/common-src/packages/expat/lib" 205 fi 194 206 195 207 196 # configure powerpoint converter -
main/branches/64_bit_Greenstone/greenstone2/build-src/src/hashfile/Makefile.in
r16604 r23508 29 29 30 30 CXX = @CXX@ 31 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@31 CXXFLAGS = @CXXFLAGS@ 32 32 DEFS = @DEFS@ 33 33 GSDLOS = @gsdlos@ 34 34 INCLUDES = 35 35 INSTALL = @INSTALL@ 36 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@36 LDFLAGS = @LDFLAGS@ 37 37 LIBS = @LIBS@ 38 38 -
main/branches/64_bit_Greenstone/greenstone2/build-src/src/phind/generate/Makefile.in
r16604 r23508 30 30 31 31 CXX = @CXX@ 32 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@32 CXXFLAGS = @CXXFLAGS@ 33 33 DEFS = @DEFS@ 34 34 GSDLOS = @gsdlos@ 35 35 INCLUDES = 36 36 INSTALL = @INSTALL@ 37 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@37 LDFLAGS = @LDFLAGS@ 38 38 LIBS = @LIBS@ 39 39 -
main/branches/64_bit_Greenstone/greenstone2/common-src/configure
r23356 r23508 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 7.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 5 # 6 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010 Free Software8 # Foundation,Inc.7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 9 # 10 10 # … … 317 317 done 318 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 320 321 321 … … 357 357 358 358 359 # as_fn_error STATUSERROR [LINENO LOG_FD]360 # --------------------------------- -------359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with STATUS, using 1 if that was 0.363 # script with status $?, using 1 if that was 0. 364 364 as_fn_error () 365 365 { 366 as_status=$ 1; test $as_status -eq 0 && as_status=1367 if test "$ 4"; then368 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 370 fi 371 $as_echo "$as_me: error: $ 2" >&2371 $as_echo "$as_me: error: $1" >&2 372 372 as_fn_exit $as_status 373 373 } # as_fn_error … … 531 531 532 532 # Name of the host. 533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 534 534 # so uname gets run too. 535 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 606 606 CPP 607 607 MICO_VER 608 COMPAT32BITFLAGS609 608 RANLIB 610 609 SET_MAKE … … 793 792 794 793 case $ac_option in 795 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 796 *=) ac_optarg= ;; 797 *) ac_optarg=yes ;; 794 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 795 *) ac_optarg=yes ;; 798 796 esac 799 797 … … 840 838 # Reject names that are not valid shell variable names. 841 839 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 842 as_fn_error $?"invalid feature name: $ac_useropt"840 as_fn_error "invalid feature name: $ac_useropt" 843 841 ac_useropt_orig=$ac_useropt 844 842 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 866 864 # Reject names that are not valid shell variable names. 867 865 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 868 as_fn_error $?"invalid feature name: $ac_useropt"866 as_fn_error "invalid feature name: $ac_useropt" 869 867 ac_useropt_orig=$ac_useropt 870 868 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1070 1068 # Reject names that are not valid shell variable names. 1071 1069 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1072 as_fn_error $?"invalid package name: $ac_useropt"1070 as_fn_error "invalid package name: $ac_useropt" 1073 1071 ac_useropt_orig=$ac_useropt 1074 1072 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1086 1084 # Reject names that are not valid shell variable names. 1087 1085 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1088 as_fn_error $?"invalid package name: $ac_useropt"1086 as_fn_error "invalid package name: $ac_useropt" 1089 1087 ac_useropt_orig=$ac_useropt 1090 1088 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1116 1114 x_libraries=$ac_optarg ;; 1117 1115 1118 -*) as_fn_error $?"unrecognized option: \`$ac_option'1119 Try \`$0 --help' for more information "1116 -*) as_fn_error "unrecognized option: \`$ac_option' 1117 Try \`$0 --help' for more information." 1120 1118 ;; 1121 1119 … … 1125 1123 case $ac_envvar in #( 1126 1124 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1127 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1125 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1128 1126 esac 1129 1127 eval $ac_envvar=\$ac_optarg … … 1143 1141 if test -n "$ac_prev"; then 1144 1142 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1145 as_fn_error $?"missing argument to $ac_option"1143 as_fn_error "missing argument to $ac_option" 1146 1144 fi 1147 1145 … … 1149 1147 case $enable_option_checking in 1150 1148 no) ;; 1151 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1149 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1152 1150 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1153 1151 esac … … 1172 1170 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1173 1171 esac 1174 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1172 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1175 1173 done 1176 1174 … … 1186 1184 if test "x$build_alias" = x; then 1187 1185 cross_compiling=maybe 1188 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1189 If a cross compiler is detected then cross compile mode will be used " >&21186 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1187 If a cross compiler is detected then cross compile mode will be used." >&2 1190 1188 elif test "x$build_alias" != "x$host_alias"; then 1191 1189 cross_compiling=yes … … 1202 1200 ac_ls_di=`ls -di .` && 1203 1201 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1204 as_fn_error $?"working directory cannot be determined"1202 as_fn_error "working directory cannot be determined" 1205 1203 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1206 as_fn_error $?"pwd does not report name of working directory"1204 as_fn_error "pwd does not report name of working directory" 1207 1205 1208 1206 … … 1243 1241 if test ! -r "$srcdir/$ac_unique_file"; then 1244 1242 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1245 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1243 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1246 1244 fi 1247 1245 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1248 1246 ac_abs_confdir=`( 1249 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1247 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1250 1248 pwd)` 1251 1249 # When building in place, set srcdir=. … … 1287 1285 --help=recursive display the short help of all the included packages 1288 1286 -V, --version display version information and exit 1289 -q, --quiet, --silent do not print \`checking 1287 -q, --quiet, --silent do not print \`checking...' messages 1290 1288 --cache-file=FILE cache test results in FILE [disabled] 1291 1289 -C, --config-cache alias for \`--cache-file=config.cache' … … 1450 1448 cat <<\_ACEOF 1451 1449 configure 1452 generated by GNU Autoconf 2.6 71453 1454 Copyright (C) 20 10Free Software Foundation, Inc.1450 generated by GNU Autoconf 2.65 1451 1452 Copyright (C) 2009 Free Software Foundation, Inc. 1455 1453 This configure script is free software; the Free Software Foundation 1456 1454 gives unlimited permission to copy, distribute and modify it. … … 1560 1558 fi 1561 1559 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1562 test $ac_status = 0; } > conftest.i&& {1560 test $ac_status = 0; } >/dev/null && { 1563 1561 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1564 1562 test ! -s conftest.err … … 1584 1582 { 1585 1583 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1586 if eval "test \"\${$3+set}\"" = set; then :1584 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1587 1585 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1588 1586 $as_echo_n "checking for $2... " >&6; } 1589 if eval "test \"\${$3+set}\"" = set; then :1587 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1590 1588 $as_echo_n "(cached) " >&6 1591 1589 fi … … 1623 1621 ac_header_preproc=no 1624 1622 fi 1625 rm -f conftest.err conftest. i conftest.$ac_ext1623 rm -f conftest.err conftest.$ac_ext 1626 1624 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1627 1625 $as_echo "$ac_header_preproc" >&6; } … … 1650 1648 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1651 1649 $as_echo_n "checking for $2... " >&6; } 1652 if eval "test \"\${$3+set}\"" = set; then :1650 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1653 1651 $as_echo_n "(cached) " >&6 1654 1652 else … … 1714 1712 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1715 1713 $as_echo_n "checking for $2... " >&6; } 1716 if eval "test \"\${$3+set}\"" = set; then :1714 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1717 1715 $as_echo_n "(cached) " >&6 1718 1716 else … … 1791 1789 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1792 1790 $as_echo_n "checking for $2... " >&6; } 1793 if eval "test \"\${$3+set}\"" = set; then :1791 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1794 1792 $as_echo_n "(cached) " >&6 1795 1793 else … … 1844 1842 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1845 1843 $as_echo_n "checking for $2... " >&6; } 1846 if eval "test \"\${$3+set}\"" = set; then :1844 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1847 1845 $as_echo_n "(cached) " >&6 1848 1846 else … … 1949 1947 1950 1948 It was created by $as_me, which was 1951 generated by GNU Autoconf 2.6 7. Invocation command line was1949 generated by GNU Autoconf 2.65. Invocation command line was 1952 1950 1953 1951 $ $0 $@ … … 2059 2057 echo 2060 2058 2061 $as_echo "## ---------------- ## 2059 cat <<\_ASBOX 2060 ## ---------------- ## 2062 2061 ## Cache variables. ## 2063 ## ---------------- ##" 2062 ## ---------------- ## 2063 _ASBOX 2064 2064 echo 2065 2065 # The following way of writing the cache mishandles newlines in values, … … 2095 2095 echo 2096 2096 2097 $as_echo "## ----------------- ## 2097 cat <<\_ASBOX 2098 ## ----------------- ## 2098 2099 ## Output variables. ## 2099 ## ----------------- ##" 2100 ## ----------------- ## 2101 _ASBOX 2100 2102 echo 2101 2103 for ac_var in $ac_subst_vars … … 2110 2112 2111 2113 if test -n "$ac_subst_files"; then 2112 $as_echo "## ------------------- ## 2114 cat <<\_ASBOX 2115 ## ------------------- ## 2113 2116 ## File substitutions. ## 2114 ## ------------------- ##" 2117 ## ------------------- ## 2118 _ASBOX 2115 2119 echo 2116 2120 for ac_var in $ac_subst_files … … 2126 2130 2127 2131 if test -s confdefs.h; then 2128 $as_echo "## ----------- ## 2132 cat <<\_ASBOX 2133 ## ----------- ## 2129 2134 ## confdefs.h. ## 2130 ## ----------- ##" 2135 ## ----------- ## 2136 _ASBOX 2131 2137 echo 2132 2138 cat confdefs.h … … 2183 2189 ac_site_file2=NONE 2184 2190 if test -n "$CONFIG_SITE"; then 2185 # We do not want a PATH search for config.site. 2186 case $CONFIG_SITE in #(( 2187 -*) ac_site_file1=./$CONFIG_SITE;; 2188 */*) ac_site_file1=$CONFIG_SITE;; 2189 *) ac_site_file1=./$CONFIG_SITE;; 2190 esac 2191 ac_site_file1=$CONFIG_SITE 2191 2192 elif test "x$prefix" != xNONE; then 2192 2193 ac_site_file1=$prefix/share/config.site … … 2203 2204 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2204 2205 sed 's/^/| /' "$ac_site_file" >&5 2205 . "$ac_site_file" \ 2206 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2207 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2208 as_fn_error $? "failed to load site script $ac_site_file 2209 See \`config.log' for more details" "$LINENO" 5 ; } 2206 . "$ac_site_file" 2210 2207 fi 2211 2208 done … … 2283 2280 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2284 2281 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2285 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52282 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2286 2283 fi 2287 2284 ## -------------------- ## … … 2848 2845 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2849 2846 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2850 as_fn_error $?"no acceptable C compiler found in \$PATH2851 See \`config.log' for more details " "$LINENO" 5; }2847 as_fn_error "no acceptable C compiler found in \$PATH 2848 See \`config.log' for more details." "$LINENO" 5; } 2852 2849 2853 2850 # Provide some information about the compiler. … … 2963 2960 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2964 2961 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2965 as_fn_error 77 "C compiler cannot create executables 2966 See \`config.log' for more details" "$LINENO" 5 ; } 2962 { as_fn_set_status 77 2963 as_fn_error "C compiler cannot create executables 2964 See \`config.log' for more details." "$LINENO" 5; }; } 2967 2965 else 2968 2966 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 … … 3006 3004 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3007 3005 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3008 as_fn_error $?"cannot compute suffix of executables: cannot compile and link3009 See \`config.log' for more details " "$LINENO" 5; }3006 as_fn_error "cannot compute suffix of executables: cannot compile and link 3007 See \`config.log' for more details." "$LINENO" 5; } 3010 3008 fi 3011 3009 rm -f conftest conftest$ac_cv_exeext … … 3064 3062 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3065 3063 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3066 as_fn_error $?"cannot run C compiled programs.3064 as_fn_error "cannot run C compiled programs. 3067 3065 If you meant to cross compile, use \`--host'. 3068 See \`config.log' for more details " "$LINENO" 5; }3066 See \`config.log' for more details." "$LINENO" 5; } 3069 3067 fi 3070 3068 fi … … 3117 3115 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3118 3116 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3119 as_fn_error $?"cannot compute suffix of object files: cannot compile3120 See \`config.log' for more details " "$LINENO" 5; }3117 as_fn_error "cannot compute suffix of object files: cannot compile 3118 See \`config.log' for more details." "$LINENO" 5; } 3121 3119 fi 3122 3120 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3687 3685 3688 3686 fi 3689 test x$JAVA = x && as_fn_error $?"no acceptable Java virtual machine found in \$PATH" "$LINENO" 53687 test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 3690 3688 fi 3691 3689 … … 3749 3747 ac_cv_prog_uudecode_base64=yes 3750 3748 else 3751 echo "configure: 37 51: uudecode had trouble decoding base 64 file 'Test.uue'" >&53749 echo "configure: 3749: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 3752 3750 echo "configure: failed file was:" >&5 3753 3751 cat Test.uue >&5 … … 3764 3762 $as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} 3765 3763 if test x$ac_cv_prog_javac_works = xno; then 3766 as_fn_error $?"Cannot compile java source. $JAVAC does not work properly" "$LINENO" 53764 as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 3767 3765 fi 3768 3766 if test x$ac_cv_prog_javac_works = x; then … … 3857 3855 3858 3856 fi 3859 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 53857 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 3860 3858 else 3861 3859 echo "Checking for javac... $JAVAC" … … 3872 3870 CLASS_TEST=Test.class 3873 3871 cat << \EOF > $JAVA_TEST 3874 /* #line 387 4"configure" */3872 /* #line 3872 "configure" */ 3875 3873 public class Test { 3876 3874 } … … 3884 3882 ac_cv_prog_javac_works=yes 3885 3883 else 3886 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 53884 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3887 3885 echo "configure: failed program was:" >&5 3888 3886 cat $JAVA_TEST >&5 … … 3911 3909 TEST=Test 3912 3910 cat << \EOF > $JAVA_TEST 3913 /* [#]line 391 3"configure" */3911 /* [#]line 3911 "configure" */ 3914 3912 public class Test { 3915 3913 public static void main (String args[]) { … … 3928 3926 echo "configure: failed program was:" >&5 3929 3927 cat $JAVA_TEST >&5 3930 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 53928 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3931 3929 fi 3932 3930 fi … … 3941 3939 echo "configure: failed program was:" >&5 3942 3940 cat $JAVA_TEST >&5 3943 as_fn_error $?"The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 53941 as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3944 3942 fi 3945 3943 rm -fr $JAVA_TEST $CLASS_TEST Test.uue … … 4041 4039 4042 4040 fi 4043 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 54041 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 4044 4042 else 4045 4043 echo "Checking for javac... $JAVAC" … … 4056 4054 CLASS_TEST=Test.class 4057 4055 cat << \EOF > $JAVA_TEST 4058 /* #line 405 8"configure" */4056 /* #line 4056 "configure" */ 4059 4057 public class Test { 4060 4058 } … … 4068 4066 ac_cv_prog_javac_works=yes 4069 4067 else 4070 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54068 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4071 4069 echo "configure: failed program was:" >&5 4072 4070 cat $JAVA_TEST >&5 … … 4171 4169 ac_aux_dir= 4172 4170 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 4173 if test -f "$ac_dir/install-sh"; then 4174 ac_aux_dir=$ac_dir 4175 ac_install_sh="$ac_aux_dir/install-sh -c" 4176 break 4177 elif test -f "$ac_dir/install.sh"; then 4178 ac_aux_dir=$ac_dir 4179 ac_install_sh="$ac_aux_dir/install.sh -c" 4180 break 4181 elif test -f "$ac_dir/shtool"; then 4182 ac_aux_dir=$ac_dir 4183 ac_install_sh="$ac_aux_dir/shtool install -c" 4184 break 4185 fi 4171 for ac_t in install-sh install.sh shtool; do 4172 if test -f "$ac_dir/$ac_t"; then 4173 ac_aux_dir=$ac_dir 4174 ac_install_sh="$ac_aux_dir/$ac_t -c" 4175 break 2 4176 fi 4177 done 4186 4178 done 4187 4179 if test -z "$ac_aux_dir"; then 4188 as_fn_error $?"cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 54180 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 4189 4181 fi 4190 4182 … … 4200 4192 # Make sure we can run config.sub. 4201 4193 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 4202 as_fn_error $?"cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 54194 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 4203 4195 4204 4196 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 … … 4211 4203 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 4212 4204 test "x$ac_build_alias" = x && 4213 as_fn_error $?"cannot guess build type; you must specify one" "$LINENO" 54205 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 4214 4206 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 4215 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 54207 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 4216 4208 4217 4209 fi … … 4220 4212 case $ac_cv_build in 4221 4213 *-*-*) ;; 4222 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;4214 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 4223 4215 esac 4224 4216 build=$ac_cv_build … … 4245 4237 else 4246 4238 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 4247 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 54239 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 4248 4240 fi 4249 4241 … … 4253 4245 case $ac_cv_host in 4254 4246 *-*-*) ;; 4255 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;4247 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 4256 4248 esac 4257 4249 host=$ac_cv_host … … 4278 4270 else 4279 4271 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 4280 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 54272 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 4281 4273 fi 4282 4274 … … 4286 4278 case $ac_cv_target in 4287 4279 *-*-*) ;; 4288 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;4280 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 4289 4281 esac 4290 4282 target=$ac_cv_target … … 4417 4409 set x ${MAKE-make} 4418 4410 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 4419 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :4411 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 4420 4412 $as_echo_n "(cached) " >&6 4421 4413 else … … 4425 4417 @echo '@@@%%%=$(MAKE)=@@@%%%' 4426 4418 _ACEOF 4427 # GNU make sometimes prints "make[1]: Entering 4419 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 4428 4420 case `${MAKE-make} -f conftest.make 2>/dev/null` in 4429 4421 *@@@%%%=?*=@@@%%%*) … … 4535 4527 RANLIB="$ac_cv_prog_RANLIB" 4536 4528 fi 4537 4538 4539 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&54540 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }4541 arch_64bit=no4542 case "$host_cpu" in4543 x86_64) arch_64bit=yes ;;4544 esac4545 4546 if test "$arch_64bit" = yes; then4547 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&54548 $as_echo "yes" >&6; }4549 if test -z "$COMPAT32BITFLAGS" ; then4550 COMPAT32BITFLAGS="-m32"4551 fi4552 else4553 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&54554 $as_echo "no" >&6; }4555 if test -z "$COMPAT32BITFLAGS" ; then4556 COMPAT32BITFLAGS=4557 fi4558 fi4559 4560 # Only need compat32bitflag if using MG or MGPP4561 if test "$ENABLE_MG" = "0" ; then4562 COMPAT32BITFLAGS=4563 else4564 if test "$ENABLE_MGPP" = "0" ; then4565 COMPAT32BITFLAGS=4566 fi4567 fi4568 4569 export COMPAT32BITFLAGS4570 4529 4571 4530 … … 4644 4603 continue 4645 4604 fi 4646 rm -f conftest.err conftest. i conftest.$ac_ext4605 rm -f conftest.err conftest.$ac_ext 4647 4606 4648 4607 # OK, works on sane cases. Now check whether nonexistent headers … … 4660 4619 break 4661 4620 fi 4662 rm -f conftest.err conftest. i conftest.$ac_ext4621 rm -f conftest.err conftest.$ac_ext 4663 4622 4664 4623 done 4665 4624 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4666 rm -f conftest. i conftest.err conftest.$ac_ext4625 rm -f conftest.err conftest.$ac_ext 4667 4626 if $ac_preproc_ok; then : 4668 4627 break … … 4703 4662 continue 4704 4663 fi 4705 rm -f conftest.err conftest. i conftest.$ac_ext4664 rm -f conftest.err conftest.$ac_ext 4706 4665 4707 4666 # OK, works on sane cases. Now check whether nonexistent headers … … 4719 4678 break 4720 4679 fi 4721 rm -f conftest.err conftest. i conftest.$ac_ext4680 rm -f conftest.err conftest.$ac_ext 4722 4681 4723 4682 done 4724 4683 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4725 rm -f conftest. i conftest.err conftest.$ac_ext4684 rm -f conftest.err conftest.$ac_ext 4726 4685 if $ac_preproc_ok; then : 4727 4686 … … 4729 4688 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4730 4689 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4731 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4732 See \`config.log' for more details " "$LINENO" 5; }4690 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4691 See \`config.log' for more details." "$LINENO" 5; } 4733 4692 fi 4734 4693 … … 4791 4750 IFS=$as_save_IFS 4792 4751 if test -z "$ac_cv_path_GREP"; then 4793 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54752 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4794 4753 fi 4795 4754 else … … 4857 4816 IFS=$as_save_IFS 4858 4817 if test -z "$ac_cv_path_EGREP"; then 4859 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54818 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4860 4819 fi 4861 4820 else … … 4989 4948 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4990 4949 " 4991 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4950 eval as_val=\$$as_ac_Header 4951 if test "x$as_val" = x""yes; then : 4992 4952 cat >>confdefs.h <<_ACEOF 4993 4953 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5505 5465 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 5506 5466 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 5507 if eval "test \"\${$as_ac_Header+set}\"" = set; then :5467 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 5508 5468 $as_echo_n "(cached) " >&6 5509 5469 else … … 5532 5492 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 5533 5493 $as_echo "$ac_res" >&6; } 5534 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5494 eval as_val=\$$as_ac_Header 5495 if test "x$as_val" = x""yes; then : 5535 5496 cat >>confdefs.h <<_ACEOF 5536 5497 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 … … 5774 5735 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5775 5736 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5776 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5737 eval as_val=\$$as_ac_Header 5738 if test "x$as_val" = x""yes; then : 5777 5739 cat >>confdefs.h <<_ACEOF 5778 5740 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5947 5909 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5948 5910 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5949 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5911 eval as_val=\$$as_ac_var 5912 if test "x$as_val" = x""yes; then : 5950 5913 5951 5914 cat >>confdefs.h <<_ACEOF … … 6107 6070 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6108 6071 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6109 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 6072 eval as_val=\$$as_ac_var 6073 if test "x$as_val" = x""yes; then : 6110 6074 cat >>confdefs.h <<_ACEOF 6111 6075 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 … … 6115 6079 done 6116 6080 6117 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 6118 if test "x$ac_cv_func_ftruncate" = x""yes; then : 6119 $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 6081 for ac_func in ftruncate strstr strcasecmp 6082 do : 6083 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6084 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6085 eval as_val=\$$as_ac_var 6086 if test "x$as_val" = x""yes; then : 6087 cat >>confdefs.h <<_ACEOF 6088 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 6089 _ACEOF 6120 6090 6121 6091 else 6122 6092 case " $LIBOBJS " in 6123 *" ftruncate.$ac_objext "* ) ;;6124 *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"6093 *" $ac_func.$ac_objext "* ) ;; 6094 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 6125 6095 ;; 6126 6096 esac 6127 6097 6128 6098 fi 6129 6130 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 6131 if test "x$ac_cv_func_strstr" = x""yes; then : 6132 $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 6133 6134 else 6135 case " $LIBOBJS " in 6136 *" strstr.$ac_objext "* ) ;; 6137 *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 6138 ;; 6139 esac 6140 6141 fi 6142 6143 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 6144 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 6145 $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 6146 6147 else 6148 case " $LIBOBJS " in 6149 *" strcasecmp.$ac_objext "* ) ;; 6150 *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 6151 ;; 6152 esac 6153 6154 fi 6099 done 6155 6100 6156 6101 … … 6360 6305 { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5 6361 6306 $as_echo "\"yes\"" >&6; } 6362 as_fn_error $?"\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 56307 as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5 6363 6308 fi 6364 6309 … … 6592 6537 ;; #( 6593 6538 *) 6594 as_fn_error $?"unknown endianness6595 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 6539 as_fn_error "unknown endianness 6540 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 6596 6541 esac 6597 6542 … … 6650 6595 src/gdbmedit/gdbmget/Makefile \ 6651 6596 src/gdbmedit/gdbmset/Makefile \ 6652 6653 6597 src/gdbmedit/gdbmkeys/Makefile \ 6598 src/gdbmedit/gdbmdel/Makefile \ 6654 6599 src/getpw/Makefile \ 6655 6600 src/jdbmedit/Makefile" 6656 6601 6657 6602 ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs" … … 6740 6685 ac_libobjs= 6741 6686 ac_ltlibobjs= 6742 U=6743 6687 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 6744 6688 # 1. Remove the extension, and $U if already installed. … … 6903 6847 6904 6848 6905 # as_fn_error STATUSERROR [LINENO LOG_FD]6906 # --------------------------------- -------6849 # as_fn_error ERROR [LINENO LOG_FD] 6850 # --------------------------------- 6907 6851 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 6908 6852 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 6909 # script with STATUS, using 1 if that was 0.6853 # script with status $?, using 1 if that was 0. 6910 6854 as_fn_error () 6911 6855 { 6912 as_status=$ 1; test $as_status -eq 0 && as_status=16913 if test "$ 4"; then6914 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack6915 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$46856 as_status=$?; test $as_status -eq 0 && as_status=1 6857 if test "$3"; then 6858 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6859 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 6916 6860 fi 6917 $as_echo "$as_me: error: $ 2" >&26861 $as_echo "$as_me: error: $1" >&2 6918 6862 as_fn_exit $as_status 6919 6863 } # as_fn_error … … 7111 7055 done 7112 7056 test -z "$as_dirs" || eval "mkdir $as_dirs" 7113 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"7057 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 7114 7058 7115 7059 … … 7165 7109 ac_log=" 7166 7110 This file was extended by $as_me, which was 7167 generated by GNU Autoconf 2.6 7. Invocation command line was7111 generated by GNU Autoconf 2.65. Invocation command line was 7168 7112 7169 7113 CONFIG_FILES = $CONFIG_FILES … … 7227 7171 ac_cs_version="\\ 7228 7172 config.status 7229 configured by $0, generated by GNU Autoconf 2.6 7,7173 configured by $0, generated by GNU Autoconf 2.65, 7230 7174 with options \\"\$ac_cs_config\\" 7231 7175 7232 Copyright (C) 20 10Free Software Foundation, Inc.7176 Copyright (C) 2009 Free Software Foundation, Inc. 7233 7177 This config.status script is free software; the Free Software Foundation 7234 7178 gives unlimited permission to copy, distribute and modify it." … … 7247 7191 do 7248 7192 case $1 in 7249 --*= ?*)7193 --*=*) 7250 7194 ac_option=`expr "X$1" : 'X\([^=]*\)='` 7251 7195 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 7252 ac_shift=:7253 ;;7254 --*=)7255 ac_option=`expr "X$1" : 'X\([^=]*\)='`7256 ac_optarg=7257 7196 ac_shift=: 7258 7197 ;; … … 7278 7217 case $ac_optarg in 7279 7218 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 7280 '') as_fn_error $? "missing file argument" ;;7281 7219 esac 7282 7220 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 7291 7229 --he | --h) 7292 7230 # Conflict between --help and --header 7293 as_fn_error $?"ambiguous option: \`$1'7231 as_fn_error "ambiguous option: \`$1' 7294 7232 Try \`$0 --help' for more information.";; 7295 7233 --help | --hel | -h ) … … 7300 7238 7301 7239 # This is an error. 7302 -*) as_fn_error $?"unrecognized option: \`$1'7240 -*) as_fn_error "unrecognized option: \`$1' 7303 7241 Try \`$0 --help' for more information." ;; 7304 7242 … … 7355 7293 "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;; 7356 7294 7357 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;7295 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 7358 7296 esac 7359 7297 done … … 7392 7330 tmp=./conf$$-$RANDOM 7393 7331 (umask 077 && mkdir "$tmp") 7394 } || as_fn_error $?"cannot create a temporary directory in ." "$LINENO" 57332 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 7395 7333 7396 7334 # Set up the scripts for CONFIG_FILES section. … … 7409 7347 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 7410 7348 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 7411 ac_cs_awk_cr='\ \r'7349 ac_cs_awk_cr='\r' 7412 7350 else 7413 7351 ac_cs_awk_cr=$ac_cr … … 7423 7361 echo "_ACEOF" 7424 7362 } >conf$$subs.sh || 7425 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57426 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`7363 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7364 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 7427 7365 ac_delim='%!_!# ' 7428 7366 for ac_last_try in false false false false false :; do 7429 7367 . ./conf$$subs.sh || 7430 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57368 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7431 7369 7432 7370 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 7434 7372 break 7435 7373 elif $ac_last_try; then 7436 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57374 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7437 7375 else 7438 7376 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7523 7461 cat 7524 7462 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 7525 || as_fn_error $?"could not setup config files machinery" "$LINENO" 57526 _ACEOF 7527 7528 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),7529 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and7463 || as_fn_error "could not setup config files machinery" "$LINENO" 5 7464 _ACEOF 7465 7466 # VPATH may cause trouble with some makes, so we remove $(srcdir), 7467 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 7530 7468 # trailing colons and then remove the whole line if VPATH becomes empty 7531 7469 # (actually we leave an empty line to preserve line numbers). 7532 7470 if test "x$srcdir" = x.; then 7533 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 7534 h 7535 s/// 7536 s/^/:/ 7537 s/[ ]*$/:/ 7538 s/:\$(srcdir):/:/g 7539 s/:\${srcdir}:/:/g 7540 s/:@srcdir@:/:/g 7541 s/^:*// 7471 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 7472 s/:*\$(srcdir):*/:/ 7473 s/:*\${srcdir}:*/:/ 7474 s/:*@srcdir@:*/:/ 7475 s/^\([^=]*=[ ]*\):*/\1/ 7542 7476 s/:*$// 7543 x7544 s/\(=[ ]*\).*/\1/7545 G7546 s/\n//7547 7477 s/^[^=]*=[ ]*$// 7548 7478 }' … … 7572 7502 break 7573 7503 elif $ac_last_try; then 7574 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 57504 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 7575 7505 else 7576 7506 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7657 7587 _ACEOF 7658 7588 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 7659 as_fn_error $?"could not setup config headers machinery" "$LINENO" 57589 as_fn_error "could not setup config headers machinery" "$LINENO" 5 7660 7590 fi # test -n "$CONFIG_HEADERS" 7661 7591 … … 7670 7600 case $ac_mode$ac_tag in 7671 7601 :[FHL]*:*);; 7672 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;7602 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 7673 7603 :[FH]-) ac_tag=-:-;; 7674 7604 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 7698 7628 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 7699 7629 esac || 7700 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;7630 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 7701 7631 esac 7702 7632 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 7725 7655 case $ac_tag in 7726 7656 *:-:* | *:-) cat >"$tmp/stdin" \ 7727 || as_fn_error $? "could not create $ac_file" "$LINENO" 5;;7657 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 7728 7658 esac 7729 7659 ;; … … 7856 7786 " 7857 7787 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 7858 || as_fn_error $?"could not create $ac_file" "$LINENO" 57788 || as_fn_error "could not create $ac_file" "$LINENO" 5 7859 7789 7860 7790 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && … … 7862 7792 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 7863 7793 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7864 which seems to be undefined. Please make sure it is defined " >&57794 which seems to be undefined. Please make sure it is defined." >&5 7865 7795 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7866 which seems to be undefined. Please make sure it is defined " >&2;}7796 which seems to be undefined. Please make sure it is defined." >&2;} 7867 7797 7868 7798 rm -f "$tmp/stdin" … … 7871 7801 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 7872 7802 esac \ 7873 || as_fn_error $?"could not create $ac_file" "$LINENO" 57803 || as_fn_error "could not create $ac_file" "$LINENO" 5 7874 7804 ;; 7875 7805 :H) … … 7882 7812 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 7883 7813 } >"$tmp/config.h" \ 7884 || as_fn_error $?"could not create $ac_file" "$LINENO" 57814 || as_fn_error "could not create $ac_file" "$LINENO" 5 7885 7815 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 7886 7816 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 … … 7889 7819 rm -f "$ac_file" 7890 7820 mv "$tmp/config.h" "$ac_file" \ 7891 || as_fn_error $?"could not create $ac_file" "$LINENO" 57821 || as_fn_error "could not create $ac_file" "$LINENO" 5 7892 7822 fi 7893 7823 else 7894 7824 $as_echo "/* $configure_input */" \ 7895 7825 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 7896 || as_fn_error $?"could not create -" "$LINENO" 57826 || as_fn_error "could not create -" "$LINENO" 5 7897 7827 fi 7898 7828 ;; … … 7909 7839 7910 7840 test $ac_write_fail = 0 || 7911 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 57841 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 7912 7842 7913 7843 … … 7930 7860 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7931 7861 # would make configure fail if this is the last instruction. 7932 $ac_cs_success || as_fn_exit 17862 $ac_cs_success || as_fn_exit $? 7933 7863 fi 7934 7864 … … 8071 8001 eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ 8072 8002 --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || 8073 as_fn_error $?"$ac_sub_configure failed for $ac_dir" "$LINENO" 58003 as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 8074 8004 fi 8075 8005 -
main/branches/64_bit_Greenstone/greenstone2/common-src/configure.in
r23356 r23508 216 216 AC_PROG_RANLIB 217 217 218 AC_MSG_CHECKING(to see if architecture is 64-bit) 219 arch_64bit=no 220 case "$host_cpu" in 221 x86_64) arch_64bit=yes ;; 222 esac 223 224 if test "$arch_64bit" = yes; then 225 AC_MSG_RESULT(yes) 226 if test -z "$COMPAT32BITFLAGS" ; then 227 COMPAT32BITFLAGS="-m32" 228 fi 229 else 230 AC_MSG_RESULT(no) 231 if test -z "$COMPAT32BITFLAGS" ; then 232 COMPAT32BITFLAGS= 233 fi 234 fi 235 236 # Only need compat32bitflag if using MG or MGPP 237 if test "$ENABLE_MG" = "0" ; then 238 COMPAT32BITFLAGS= 239 else 240 if test "$ENABLE_MGPP" = "0" ; then 241 COMPAT32BITFLAGS= 242 fi 243 fi 244 245 export COMPAT32BITFLAGS 246 AC_SUBST(COMPAT32BITFLAGS) 247 218 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 219 dnl arch_64bit=no 220 dnl case "$host_cpu" in 221 dnl x86_64) arch_64bit=yes ;; 222 dnl esac 248 223 249 224 #moved CORBA MICO directory test to get version of MICO -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/configure.ac
r23356 r23508 84 84 AC_SUBST(ENABLE_LUCENE) 85 85 86 87 AC_DEFINE_UNQUOTED(COMPAT32BITFLAGS, $COMPAT32BITFLAGS)88 AC_SUBST(COMPAT32BITFLAGS)89 90 86 dnl 91 87 dnl Make sure Javac and Java are available if were are compiling Lucene -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/Makefile.in
r22058 r23508 28 28 29 29 CC = @CC@ 30 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-fpic30 CFLAGS = @CFLAGS@ -fpic 31 31 INSTALL = @INSTALL@ 32 32 INSTALL_DATA = @INSTALL_DATA@ 33 33 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 34 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@34 LDFLAGS = @LDFLAGS@ 35 35 LIBS = @LIBS@ 36 36 TOUCH = echo timestamp > -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/configure
r23356 r23508 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 7.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 5 # 6 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010 Free Software8 # Foundation,Inc.7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 9 # 10 10 # … … 317 317 done 318 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 320 321 321 … … 357 357 358 358 359 # as_fn_error STATUSERROR [LINENO LOG_FD]360 # --------------------------------- -------359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with STATUS, using 1 if that was 0.363 # script with status $?, using 1 if that was 0. 364 364 as_fn_error () 365 365 { 366 as_status=$ 1; test $as_status -eq 0 && as_status=1367 if test "$ 4"; then368 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 370 fi 371 $as_echo "$as_me: error: $ 2" >&2371 $as_echo "$as_me: error: $1" >&2 372 372 as_fn_exit $as_status 373 373 } # as_fn_error … … 531 531 532 532 # Name of the host. 533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 534 534 # so uname gets run too. 535 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 626 626 CXXFLAGS 627 627 CXX 628 COMPAT32BITFLAGS629 628 ENABLE_JAVA 630 629 VERSION … … 763 762 764 763 case $ac_option in 765 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 766 *=) ac_optarg= ;; 767 *) ac_optarg=yes ;; 764 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 765 *) ac_optarg=yes ;; 768 766 esac 769 767 … … 810 808 # Reject names that are not valid shell variable names. 811 809 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 812 as_fn_error $?"invalid feature name: $ac_useropt"810 as_fn_error "invalid feature name: $ac_useropt" 813 811 ac_useropt_orig=$ac_useropt 814 812 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 836 834 # Reject names that are not valid shell variable names. 837 835 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 838 as_fn_error $?"invalid feature name: $ac_useropt"836 as_fn_error "invalid feature name: $ac_useropt" 839 837 ac_useropt_orig=$ac_useropt 840 838 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1040 1038 # Reject names that are not valid shell variable names. 1041 1039 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1042 as_fn_error $?"invalid package name: $ac_useropt"1040 as_fn_error "invalid package name: $ac_useropt" 1043 1041 ac_useropt_orig=$ac_useropt 1044 1042 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1056 1054 # Reject names that are not valid shell variable names. 1057 1055 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1058 as_fn_error $?"invalid package name: $ac_useropt"1056 as_fn_error "invalid package name: $ac_useropt" 1059 1057 ac_useropt_orig=$ac_useropt 1060 1058 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1086 1084 x_libraries=$ac_optarg ;; 1087 1085 1088 -*) as_fn_error $?"unrecognized option: \`$ac_option'1089 Try \`$0 --help' for more information "1086 -*) as_fn_error "unrecognized option: \`$ac_option' 1087 Try \`$0 --help' for more information." 1090 1088 ;; 1091 1089 … … 1095 1093 case $ac_envvar in #( 1096 1094 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1097 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1095 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1098 1096 esac 1099 1097 eval $ac_envvar=\$ac_optarg … … 1113 1111 if test -n "$ac_prev"; then 1114 1112 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1115 as_fn_error $?"missing argument to $ac_option"1113 as_fn_error "missing argument to $ac_option" 1116 1114 fi 1117 1115 … … 1119 1117 case $enable_option_checking in 1120 1118 no) ;; 1121 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1119 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1122 1120 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1123 1121 esac … … 1142 1140 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1143 1141 esac 1144 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1142 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1145 1143 done 1146 1144 … … 1156 1154 if test "x$build_alias" = x; then 1157 1155 cross_compiling=maybe 1158 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1159 If a cross compiler is detected then cross compile mode will be used " >&21156 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1157 If a cross compiler is detected then cross compile mode will be used." >&2 1160 1158 elif test "x$build_alias" != "x$host_alias"; then 1161 1159 cross_compiling=yes … … 1172 1170 ac_ls_di=`ls -di .` && 1173 1171 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1174 as_fn_error $?"working directory cannot be determined"1172 as_fn_error "working directory cannot be determined" 1175 1173 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1176 as_fn_error $?"pwd does not report name of working directory"1174 as_fn_error "pwd does not report name of working directory" 1177 1175 1178 1176 … … 1213 1211 if test ! -r "$srcdir/$ac_unique_file"; then 1214 1212 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1215 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1213 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1216 1214 fi 1217 1215 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1218 1216 ac_abs_confdir=`( 1219 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1217 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1220 1218 pwd)` 1221 1219 # When building in place, set srcdir=. … … 1257 1255 --help=recursive display the short help of all the included packages 1258 1256 -V, --version display version information and exit 1259 -q, --quiet, --silent do not print \`checking 1257 -q, --quiet, --silent do not print \`checking...' messages 1260 1258 --cache-file=FILE cache test results in FILE [disabled] 1261 1259 -C, --config-cache alias for \`--cache-file=config.cache' … … 1413 1411 cat <<\_ACEOF 1414 1412 configure 1415 generated by GNU Autoconf 2.6 71416 1417 Copyright (C) 20 10Free Software Foundation, Inc.1413 generated by GNU Autoconf 2.65 1414 1415 Copyright (C) 2009 Free Software Foundation, Inc. 1418 1416 This configure script is free software; the Free Software Foundation 1419 1417 gives unlimited permission to copy, distribute and modify it. … … 1523 1521 fi 1524 1522 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1525 test $ac_status = 0; } > conftest.i&& {1523 test $ac_status = 0; } >/dev/null && { 1526 1524 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1527 1525 test ! -s conftest.err … … 1547 1545 { 1548 1546 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1549 if eval "test \"\${$3+set}\"" = set; then :1547 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1550 1548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1551 1549 $as_echo_n "checking for $2... " >&6; } 1552 if eval "test \"\${$3+set}\"" = set; then :1550 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1553 1551 $as_echo_n "(cached) " >&6 1554 1552 fi … … 1586 1584 ac_header_preproc=no 1587 1585 fi 1588 rm -f conftest.err conftest. i conftest.$ac_ext1586 rm -f conftest.err conftest.$ac_ext 1589 1587 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1590 1588 $as_echo "$ac_header_preproc" >&6; } … … 1613 1611 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1614 1612 $as_echo_n "checking for $2... " >&6; } 1615 if eval "test \"\${$3+set}\"" = set; then :1613 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1616 1614 $as_echo_n "(cached) " >&6 1617 1615 else … … 1677 1675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1678 1676 $as_echo_n "checking for $2... " >&6; } 1679 if eval "test \"\${$3+set}\"" = set; then :1677 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1680 1678 $as_echo_n "(cached) " >&6 1681 1679 else … … 1754 1752 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1755 1753 $as_echo_n "checking for $2... " >&6; } 1756 if eval "test \"\${$3+set}\"" = set; then :1754 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1757 1755 $as_echo_n "(cached) " >&6 1758 1756 else … … 1807 1805 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1808 1806 $as_echo_n "checking for $2... " >&6; } 1809 if eval "test \"\${$3+set}\"" = set; then :1807 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1810 1808 $as_echo_n "(cached) " >&6 1811 1809 else … … 1870 1868 1871 1869 It was created by $as_me, which was 1872 generated by GNU Autoconf 2.6 7. Invocation command line was1870 generated by GNU Autoconf 2.65. Invocation command line was 1873 1871 1874 1872 $ $0 $@ … … 1980 1978 echo 1981 1979 1982 $as_echo "## ---------------- ## 1980 cat <<\_ASBOX 1981 ## ---------------- ## 1983 1982 ## Cache variables. ## 1984 ## ---------------- ##" 1983 ## ---------------- ## 1984 _ASBOX 1985 1985 echo 1986 1986 # The following way of writing the cache mishandles newlines in values, … … 2016 2016 echo 2017 2017 2018 $as_echo "## ----------------- ## 2018 cat <<\_ASBOX 2019 ## ----------------- ## 2019 2020 ## Output variables. ## 2020 ## ----------------- ##" 2021 ## ----------------- ## 2022 _ASBOX 2021 2023 echo 2022 2024 for ac_var in $ac_subst_vars … … 2031 2033 2032 2034 if test -n "$ac_subst_files"; then 2033 $as_echo "## ------------------- ## 2035 cat <<\_ASBOX 2036 ## ------------------- ## 2034 2037 ## File substitutions. ## 2035 ## ------------------- ##" 2038 ## ------------------- ## 2039 _ASBOX 2036 2040 echo 2037 2041 for ac_var in $ac_subst_files … … 2047 2051 2048 2052 if test -s confdefs.h; then 2049 $as_echo "## ----------- ## 2053 cat <<\_ASBOX 2054 ## ----------- ## 2050 2055 ## confdefs.h. ## 2051 ## ----------- ##" 2056 ## ----------- ## 2057 _ASBOX 2052 2058 echo 2053 2059 cat confdefs.h … … 2104 2110 ac_site_file2=NONE 2105 2111 if test -n "$CONFIG_SITE"; then 2106 # We do not want a PATH search for config.site. 2107 case $CONFIG_SITE in #(( 2108 -*) ac_site_file1=./$CONFIG_SITE;; 2109 */*) ac_site_file1=$CONFIG_SITE;; 2110 *) ac_site_file1=./$CONFIG_SITE;; 2111 esac 2112 ac_site_file1=$CONFIG_SITE 2112 2113 elif test "x$prefix" != xNONE; then 2113 2114 ac_site_file1=$prefix/share/config.site … … 2124 2125 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2125 2126 sed 's/^/| /' "$ac_site_file" >&5 2126 . "$ac_site_file" \ 2127 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2128 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2129 as_fn_error $? "failed to load site script $ac_site_file 2130 See \`config.log' for more details" "$LINENO" 5 ; } 2127 . "$ac_site_file" 2131 2128 fi 2132 2129 done … … 2204 2201 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2205 2202 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2206 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52203 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2207 2204 fi 2208 2205 ## -------------------- ## … … 2222 2219 ac_aux_dir= 2223 2220 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2224 if test -f "$ac_dir/install-sh"; then 2225 ac_aux_dir=$ac_dir 2226 ac_install_sh="$ac_aux_dir/install-sh -c" 2227 break 2228 elif test -f "$ac_dir/install.sh"; then 2229 ac_aux_dir=$ac_dir 2230 ac_install_sh="$ac_aux_dir/install.sh -c" 2231 break 2232 elif test -f "$ac_dir/shtool"; then 2233 ac_aux_dir=$ac_dir 2234 ac_install_sh="$ac_aux_dir/shtool install -c" 2235 break 2236 fi 2221 for ac_t in install-sh install.sh shtool; do 2222 if test -f "$ac_dir/$ac_t"; then 2223 ac_aux_dir=$ac_dir 2224 ac_install_sh="$ac_aux_dir/$ac_t -c" 2225 break 2 2226 fi 2227 done 2237 2228 done 2238 2229 if test -z "$ac_aux_dir"; then 2239 as_fn_error $?"cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 52230 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2240 2231 fi 2241 2232 … … 2251 2242 # Make sure we can run config.sub. 2252 2243 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 2253 as_fn_error $?"cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 52244 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 2254 2245 2255 2246 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 … … 2262 2253 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 2263 2254 test "x$ac_build_alias" = x && 2264 as_fn_error $?"cannot guess build type; you must specify one" "$LINENO" 52255 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 2265 2256 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 2266 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 52257 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 2267 2258 2268 2259 fi … … 2271 2262 case $ac_cv_build in 2272 2263 *-*-*) ;; 2273 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;2264 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 2274 2265 esac 2275 2266 build=$ac_cv_build … … 2296 2287 else 2297 2288 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 2298 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 52289 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 2299 2290 fi 2300 2291 … … 2304 2295 case $ac_cv_host in 2305 2296 *-*-*) ;; 2306 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;2297 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 2307 2298 esac 2308 2299 host=$ac_cv_host … … 2329 2320 else 2330 2321 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 2331 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 52322 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 2332 2323 fi 2333 2324 … … 2337 2328 case $ac_cv_target in 2338 2329 *-*-*) ;; 2339 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;2330 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 2340 2331 esac 2341 2332 target=$ac_cv_target … … 2402 2393 else 2403 2394 ENABLE_JAVA=0 2404 fi2405 2406 2407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&52408 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }2409 arch_64bit=no2410 case "$host_cpu" in2411 x86_64) arch_64bit=yes ;;2412 esac2413 2414 if test "$arch_64bit" = yes; then2415 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&52416 $as_echo "yes" >&6; }2417 if test -z "$COMPAT32BITFLAGS" ; then2418 COMPAT32BITFLAGS="-m32"2419 fi2420 else2421 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&52422 $as_echo "no" >&6; }2423 if test -z "$COMPAT32BITFLAGS" ; then2424 COMPAT32BITFLAGS=2425 fi2426 2395 fi 2427 2396 … … 2651 2620 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2652 2621 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2653 as_fn_error 77 "C++ compiler cannot create executables 2654 See \`config.log' for more details" "$LINENO" 5 ; } 2622 { as_fn_set_status 77 2623 as_fn_error "C++ compiler cannot create executables 2624 See \`config.log' for more details." "$LINENO" 5; }; } 2655 2625 else 2656 2626 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 … … 2694 2664 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2695 2665 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2696 as_fn_error $?"cannot compute suffix of executables: cannot compile and link2697 See \`config.log' for more details " "$LINENO" 5; }2666 as_fn_error "cannot compute suffix of executables: cannot compile and link 2667 See \`config.log' for more details." "$LINENO" 5; } 2698 2668 fi 2699 2669 rm -f conftest conftest$ac_cv_exeext … … 2752 2722 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2753 2723 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2754 as_fn_error $?"cannot run C++ compiled programs.2724 as_fn_error "cannot run C++ compiled programs. 2755 2725 If you meant to cross compile, use \`--host'. 2756 See \`config.log' for more details " "$LINENO" 5; }2726 See \`config.log' for more details." "$LINENO" 5; } 2757 2727 fi 2758 2728 fi … … 2805 2775 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2806 2776 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2807 as_fn_error $?"cannot compute suffix of object files: cannot compile2808 See \`config.log' for more details " "$LINENO" 5; }2777 as_fn_error "cannot compute suffix of object files: cannot compile 2778 See \`config.log' for more details." "$LINENO" 5; } 2809 2779 fi 2810 2780 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3320 3290 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3321 3291 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3322 as_fn_error $?"no acceptable C compiler found in \$PATH3323 See \`config.log' for more details " "$LINENO" 5; }3292 as_fn_error "no acceptable C compiler found in \$PATH 3293 See \`config.log' for more details." "$LINENO" 5; } 3324 3294 3325 3295 # Provide some information about the compiler. … … 3668 3638 set x ${MAKE-make} 3669 3639 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 3670 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :3640 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 3671 3641 $as_echo_n "(cached) " >&6 3672 3642 else … … 3676 3646 @echo '@@@%%%=$(MAKE)=@@@%%%' 3677 3647 _ACEOF 3678 # GNU make sometimes prints "make[1]: Entering 3648 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 3679 3649 case `${MAKE-make} -f conftest.make 2>/dev/null` in 3680 3650 *@@@%%%=?*=@@@%%%*) … … 3879 3849 3880 3850 fi 3881 test x$JAVA = x && as_fn_error $?"no acceptable Java virtual machine found in \$PATH" "$LINENO" 53851 test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 3882 3852 fi 3883 3853 … … 3941 3911 ac_cv_prog_uudecode_base64=yes 3942 3912 else 3943 echo "configure: 39 43: uudecode had trouble decoding base 64 file 'Test.uue'" >&53913 echo "configure: 3913: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 3944 3914 echo "configure: failed file was:" >&5 3945 3915 cat Test.uue >&5 … … 3956 3926 $as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} 3957 3927 if test x$ac_cv_prog_javac_works = xno; then 3958 as_fn_error $?"Cannot compile java source. $JAVAC does not work properly" "$LINENO" 53928 as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 3959 3929 fi 3960 3930 if test x$ac_cv_prog_javac_works = x; then … … 4049 4019 4050 4020 fi 4051 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 54021 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 4052 4022 else 4053 4023 echo "Checking for javac... $JAVAC" … … 4064 4034 CLASS_TEST=Test.class 4065 4035 cat << \EOF > $JAVA_TEST 4066 /* #line 40 66 "configure" */4036 /* #line 4036 "configure" */ 4067 4037 public class Test { 4068 4038 } … … 4076 4046 ac_cv_prog_javac_works=yes 4077 4047 else 4078 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54048 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4079 4049 echo "configure: failed program was:" >&5 4080 4050 cat $JAVA_TEST >&5 … … 4103 4073 TEST=Test 4104 4074 cat << \EOF > $JAVA_TEST 4105 /* [#]line 4 105 "configure" */4075 /* [#]line 4075 "configure" */ 4106 4076 public class Test { 4107 4077 public static void main (String args[]) { … … 4120 4090 echo "configure: failed program was:" >&5 4121 4091 cat $JAVA_TEST >&5 4122 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54092 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4123 4093 fi 4124 4094 fi … … 4133 4103 echo "configure: failed program was:" >&5 4134 4104 cat $JAVA_TEST >&5 4135 as_fn_error $?"The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 54105 as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4136 4106 fi 4137 4107 rm -fr $JAVA_TEST $CLASS_TEST Test.uue … … 4233 4203 4234 4204 fi 4235 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 54205 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 4236 4206 else 4237 4207 echo "Checking for javac... $JAVAC" … … 4248 4218 CLASS_TEST=Test.class 4249 4219 cat << \EOF > $JAVA_TEST 4250 /* #line 42 50 "configure" */4220 /* #line 4220 "configure" */ 4251 4221 public class Test { 4252 4222 } … … 4260 4230 ac_cv_prog_javac_works=yes 4261 4231 else 4262 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54232 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4263 4233 echo "configure: failed program was:" >&5 4264 4234 cat $JAVA_TEST >&5 … … 4320 4290 continue 4321 4291 fi 4322 rm -f conftest.err conftest. i conftest.$ac_ext4292 rm -f conftest.err conftest.$ac_ext 4323 4293 4324 4294 # OK, works on sane cases. Now check whether nonexistent headers … … 4336 4306 break 4337 4307 fi 4338 rm -f conftest.err conftest. i conftest.$ac_ext4308 rm -f conftest.err conftest.$ac_ext 4339 4309 4340 4310 done 4341 4311 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4342 rm -f conftest. i conftest.err conftest.$ac_ext4312 rm -f conftest.err conftest.$ac_ext 4343 4313 if $ac_preproc_ok; then : 4344 4314 break … … 4379 4349 continue 4380 4350 fi 4381 rm -f conftest.err conftest. i conftest.$ac_ext4351 rm -f conftest.err conftest.$ac_ext 4382 4352 4383 4353 # OK, works on sane cases. Now check whether nonexistent headers … … 4395 4365 break 4396 4366 fi 4397 rm -f conftest.err conftest. i conftest.$ac_ext4367 rm -f conftest.err conftest.$ac_ext 4398 4368 4399 4369 done 4400 4370 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4401 rm -f conftest. i conftest.err conftest.$ac_ext4371 rm -f conftest.err conftest.$ac_ext 4402 4372 if $ac_preproc_ok; then : 4403 4373 … … 4405 4375 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4406 4376 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4407 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4408 See \`config.log' for more details " "$LINENO" 5; }4377 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4378 See \`config.log' for more details." "$LINENO" 5; } 4409 4379 fi 4410 4380 … … 4467 4437 IFS=$as_save_IFS 4468 4438 if test -z "$ac_cv_path_GREP"; then 4469 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54439 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4470 4440 fi 4471 4441 else … … 4533 4503 IFS=$as_save_IFS 4534 4504 if test -z "$ac_cv_path_EGREP"; then 4535 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54505 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4536 4506 fi 4537 4507 else … … 4665 4635 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4666 4636 " 4667 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4637 eval as_val=\$$as_ac_Header 4638 if test "x$as_val" = x""yes; then : 4668 4639 cat >>confdefs.h <<_ACEOF 4669 4640 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5097 5068 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 5098 5069 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 5099 if eval "test \"\${$as_ac_Header+set}\"" = set; then :5070 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 5100 5071 $as_echo_n "(cached) " >&6 5101 5072 else … … 5124 5095 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 5125 5096 $as_echo "$ac_res" >&6; } 5126 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5097 eval as_val=\$$as_ac_Header 5098 if test "x$as_val" = x""yes; then : 5127 5099 cat >>confdefs.h <<_ACEOF 5128 5100 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 … … 5366 5338 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5367 5339 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5368 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5340 eval as_val=\$$as_ac_Header 5341 if test "x$as_val" = x""yes; then : 5369 5342 cat >>confdefs.h <<_ACEOF 5370 5343 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5539 5512 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5540 5513 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5541 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5514 eval as_val=\$$as_ac_var 5515 if test "x$as_val" = x""yes; then : 5542 5516 5543 5517 cat >>confdefs.h <<_ACEOF … … 5699 5673 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5700 5674 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5701 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5675 eval as_val=\$$as_ac_var 5676 if test "x$as_val" = x""yes; then : 5702 5677 cat >>confdefs.h <<_ACEOF 5703 5678 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 … … 5707 5682 done 5708 5683 5709 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 5710 if test "x$ac_cv_func_ftruncate" = x""yes; then : 5711 $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 5684 for ac_func in ftruncate strstr strcasecmp 5685 do : 5686 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5687 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5688 eval as_val=\$$as_ac_var 5689 if test "x$as_val" = x""yes; then : 5690 cat >>confdefs.h <<_ACEOF 5691 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 5692 _ACEOF 5712 5693 5713 5694 else 5714 5695 case " $LIBOBJS " in 5715 *" ftruncate.$ac_objext "* ) ;;5716 *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"5696 *" $ac_func.$ac_objext "* ) ;; 5697 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 5717 5698 ;; 5718 5699 esac 5719 5700 5720 5701 fi 5721 5722 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 5723 if test "x$ac_cv_func_strstr" = x""yes; then : 5724 $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 5725 5726 else 5727 case " $LIBOBJS " in 5728 *" strstr.$ac_objext "* ) ;; 5729 *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 5730 ;; 5731 esac 5732 5733 fi 5734 5735 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 5736 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 5737 $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 5738 5739 else 5740 case " $LIBOBJS " in 5741 *" strcasecmp.$ac_objext "* ) ;; 5742 *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 5743 ;; 5744 esac 5745 5746 fi 5702 done 5747 5703 5748 5704 … … 6093 6049 ;; #( 6094 6050 *) 6095 as_fn_error $?"unknown endianness6096 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 6051 as_fn_error "unknown endianness 6052 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 6097 6053 esac 6098 6054 … … 6204 6160 ac_libobjs= 6205 6161 ac_ltlibobjs= 6206 U=6207 6162 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 6208 6163 # 1. Remove the extension, and $U if already installed. … … 6367 6322 6368 6323 6369 # as_fn_error STATUSERROR [LINENO LOG_FD]6370 # --------------------------------- -------6324 # as_fn_error ERROR [LINENO LOG_FD] 6325 # --------------------------------- 6371 6326 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 6372 6327 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 6373 # script with STATUS, using 1 if that was 0.6328 # script with status $?, using 1 if that was 0. 6374 6329 as_fn_error () 6375 6330 { 6376 as_status=$ 1; test $as_status -eq 0 && as_status=16377 if test "$ 4"; then6378 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack6379 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$46331 as_status=$?; test $as_status -eq 0 && as_status=1 6332 if test "$3"; then 6333 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6334 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 6380 6335 fi 6381 $as_echo "$as_me: error: $ 2" >&26336 $as_echo "$as_me: error: $1" >&2 6382 6337 as_fn_exit $as_status 6383 6338 } # as_fn_error … … 6575 6530 done 6576 6531 test -z "$as_dirs" || eval "mkdir $as_dirs" 6577 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"6532 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 6578 6533 6579 6534 … … 6629 6584 ac_log=" 6630 6585 This file was extended by $as_me, which was 6631 generated by GNU Autoconf 2.6 7. Invocation command line was6586 generated by GNU Autoconf 2.65. Invocation command line was 6632 6587 6633 6588 CONFIG_FILES = $CONFIG_FILES … … 6695 6650 ac_cs_version="\\ 6696 6651 config.status 6697 configured by $0, generated by GNU Autoconf 2.6 7,6652 configured by $0, generated by GNU Autoconf 2.65, 6698 6653 with options \\"\$ac_cs_config\\" 6699 6654 6700 Copyright (C) 20 10Free Software Foundation, Inc.6655 Copyright (C) 2009 Free Software Foundation, Inc. 6701 6656 This config.status script is free software; the Free Software Foundation 6702 6657 gives unlimited permission to copy, distribute and modify it." … … 6715 6670 do 6716 6671 case $1 in 6717 --*= ?*)6672 --*=*) 6718 6673 ac_option=`expr "X$1" : 'X\([^=]*\)='` 6719 6674 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 6720 ac_shift=:6721 ;;6722 --*=)6723 ac_option=`expr "X$1" : 'X\([^=]*\)='`6724 ac_optarg=6725 6675 ac_shift=: 6726 6676 ;; … … 6746 6696 case $ac_optarg in 6747 6697 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 6748 '') as_fn_error $? "missing file argument" ;;6749 6698 esac 6750 6699 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 6759 6708 --he | --h) 6760 6709 # Conflict between --help and --header 6761 as_fn_error $?"ambiguous option: \`$1'6710 as_fn_error "ambiguous option: \`$1' 6762 6711 Try \`$0 --help' for more information.";; 6763 6712 --help | --hel | -h ) … … 6768 6717 6769 6718 # This is an error. 6770 -*) as_fn_error $?"unrecognized option: \`$1'6719 -*) as_fn_error "unrecognized option: \`$1' 6771 6720 Try \`$0 --help' for more information." ;; 6772 6721 … … 6825 6774 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 6826 6775 6827 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;6776 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 6828 6777 esac 6829 6778 done … … 6863 6812 tmp=./conf$$-$RANDOM 6864 6813 (umask 077 && mkdir "$tmp") 6865 } || as_fn_error $?"cannot create a temporary directory in ." "$LINENO" 56814 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 6866 6815 6867 6816 # Set up the scripts for CONFIG_FILES section. … … 6880 6829 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 6881 6830 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 6882 ac_cs_awk_cr='\ \r'6831 ac_cs_awk_cr='\r' 6883 6832 else 6884 6833 ac_cs_awk_cr=$ac_cr … … 6894 6843 echo "_ACEOF" 6895 6844 } >conf$$subs.sh || 6896 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 56897 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`6845 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6846 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 6898 6847 ac_delim='%!_!# ' 6899 6848 for ac_last_try in false false false false false :; do 6900 6849 . ./conf$$subs.sh || 6901 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 56850 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6902 6851 6903 6852 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 6905 6854 break 6906 6855 elif $ac_last_try; then 6907 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 56856 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6908 6857 else 6909 6858 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 6994 6943 cat 6995 6944 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 6996 || as_fn_error $?"could not setup config files machinery" "$LINENO" 56997 _ACEOF 6998 6999 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),7000 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and6945 || as_fn_error "could not setup config files machinery" "$LINENO" 5 6946 _ACEOF 6947 6948 # VPATH may cause trouble with some makes, so we remove $(srcdir), 6949 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 7001 6950 # trailing colons and then remove the whole line if VPATH becomes empty 7002 6951 # (actually we leave an empty line to preserve line numbers). 7003 6952 if test "x$srcdir" = x.; then 7004 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 7005 h 7006 s/// 7007 s/^/:/ 7008 s/[ ]*$/:/ 7009 s/:\$(srcdir):/:/g 7010 s/:\${srcdir}:/:/g 7011 s/:@srcdir@:/:/g 7012 s/^:*// 6953 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 6954 s/:*\$(srcdir):*/:/ 6955 s/:*\${srcdir}:*/:/ 6956 s/:*@srcdir@:*/:/ 6957 s/^\([^=]*=[ ]*\):*/\1/ 7013 6958 s/:*$// 7014 x7015 s/\(=[ ]*\).*/\1/7016 G7017 s/\n//7018 6959 s/^[^=]*=[ ]*$// 7019 6960 }' … … 7043 6984 break 7044 6985 elif $ac_last_try; then 7045 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 56986 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 7046 6987 else 7047 6988 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7128 7069 _ACEOF 7129 7070 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 7130 as_fn_error $?"could not setup config headers machinery" "$LINENO" 57071 as_fn_error "could not setup config headers machinery" "$LINENO" 5 7131 7072 fi # test -n "$CONFIG_HEADERS" 7132 7073 … … 7141 7082 case $ac_mode$ac_tag in 7142 7083 :[FHL]*:*);; 7143 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;7084 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 7144 7085 :[FH]-) ac_tag=-:-;; 7145 7086 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 7169 7110 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 7170 7111 esac || 7171 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;7112 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 7172 7113 esac 7173 7114 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 7196 7137 case $ac_tag in 7197 7138 *:-:* | *:-) cat >"$tmp/stdin" \ 7198 || as_fn_error $? "could not create $ac_file" "$LINENO" 5;;7139 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 7199 7140 esac 7200 7141 ;; … … 7327 7268 " 7328 7269 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 7329 || as_fn_error $?"could not create $ac_file" "$LINENO" 57270 || as_fn_error "could not create $ac_file" "$LINENO" 5 7330 7271 7331 7272 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && … … 7333 7274 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 7334 7275 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7335 which seems to be undefined. Please make sure it is defined " >&57276 which seems to be undefined. Please make sure it is defined." >&5 7336 7277 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7337 which seems to be undefined. Please make sure it is defined " >&2;}7278 which seems to be undefined. Please make sure it is defined." >&2;} 7338 7279 7339 7280 rm -f "$tmp/stdin" … … 7342 7283 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 7343 7284 esac \ 7344 || as_fn_error $?"could not create $ac_file" "$LINENO" 57285 || as_fn_error "could not create $ac_file" "$LINENO" 5 7345 7286 ;; 7346 7287 :H) … … 7353 7294 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 7354 7295 } >"$tmp/config.h" \ 7355 || as_fn_error $?"could not create $ac_file" "$LINENO" 57296 || as_fn_error "could not create $ac_file" "$LINENO" 5 7356 7297 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 7357 7298 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 … … 7360 7301 rm -f "$ac_file" 7361 7302 mv "$tmp/config.h" "$ac_file" \ 7362 || as_fn_error $?"could not create $ac_file" "$LINENO" 57303 || as_fn_error "could not create $ac_file" "$LINENO" 5 7363 7304 fi 7364 7305 else 7365 7306 $as_echo "/* $configure_input */" \ 7366 7307 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 7367 || as_fn_error $?"could not create -" "$LINENO" 57308 || as_fn_error "could not create -" "$LINENO" 5 7368 7309 fi 7369 7310 ;; … … 7387 7328 7388 7329 test $ac_write_fail = 0 || 7389 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 57330 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 7390 7331 7391 7332 … … 7408 7349 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7409 7350 # would make configure fail if this is the last instruction. 7410 $ac_cs_success || as_fn_exit 17351 $ac_cs_success || as_fn_exit $? 7411 7352 fi 7412 7353 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/configure.in
r23356 r23508 34 34 AC_SUBST(ENABLE_JAVA) 35 35 36 AC_MSG_CHECKING(to see if architecture is 64-bit) 37 arch_64bit=no 38 case "$host_cpu" in 39 x86_64) arch_64bit=yes ;; 40 esac 41 42 if test "$arch_64bit" = yes; then 43 AC_MSG_RESULT(yes) 44 if test -z "$COMPAT32BITFLAGS" ; then 45 COMPAT32BITFLAGS="-m32" 46 fi 47 else 48 AC_MSG_RESULT(no) 49 if test -z "$COMPAT32BITFLAGS" ; then 50 COMPAT32BITFLAGS= 51 fi 52 fi 53 AC_SUBST(COMPAT32BITFLAGS) 54 36 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 37 dnl arch_64bit=no 38 dnl case "$host_cpu" in 39 dnl x86_64) arch_64bit=yes ;; 40 dnl esac 55 41 56 42 dnl Checks for programs. -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Makefile.in
r23356 r23508 17 17 JAVAH = javah 18 18 JAR = jar 19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -DSILENT -DSHORT_SUFFIX20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-DSILENT -DSHORT_SUFFIX19 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 20 CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX 21 21 JAVACFLAGS = @JAVACFLAGS@ 22 22 DEFS = @DEFS@ … … 25 25 INSTALL_DATA = @INSTALL_DATA@ 26 26 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@27 LDFLAGS = @LDFLAGS@ 28 28 LIBS = -lstdc++ @LIBS@ 29 29 TOUCH = echo timestamp > -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGRetrieveWrapperImpl.c
r16583 r23508 180 180 181 181 /* Save the object on the Java side */ 182 (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, ( long) data);182 (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data); 183 183 184 184 /* Initialise MG environment variables */ … … 250 250 query_data* qd; 251 251 252 u_long pos, len;252 mg_u_long pos, len; 253 253 u_char* c_buffer = NULL; 254 254 u_char* uc_buffer = NULL; … … 287 287 288 288 /* Get the document position and length in the text file */ 289 printf("Fetching document number % ld...\n", (unsignedlong) j_docnum);290 FetchDocStart(qd, ( unsignedlong) j_docnum, &pos, &len);291 printf("Fetched document start. Pos: % ld, Len: %ld\n", pos, len);289 printf("Fetching document number %d...\n", (mg_u_long) j_docnum); 290 FetchDocStart(qd, (mg_u_long) j_docnum, &pos, &len); 291 printf("Fetched document start. Pos: %d, Len: %d\n", pos, len); 292 292 293 293 /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGSearchWrapperImpl.c
r16583 r23508 619 619 620 620 /* Print the data to a character array */ 621 sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t% ld\n",621 sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%d\n", 622 622 (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index), 623 623 (data->defaultStemMethod & 1), -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c
r16583 r23508 168 168 169 169 /* Save the object on the Java side */ 170 (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, ( long) data);170 (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data); 171 171 172 172 /* Initialise MG environment variables */ … … 285 285 query_data* qd; 286 286 287 u_long pos, len;287 mg_u_long pos, len; 288 288 u_char* c_buffer = NULL; 289 289 u_char* uc_buffer = NULL; … … 322 322 323 323 /* Get the document position and length in the text file */ 324 printf("Fetching document number % ld...\n", (unsignedlong) j_docnum);325 FetchDocStart(qd, ( unsignedlong) j_docnum, &pos, &len);326 printf("Fetched document start. Pos: % ld, Len: %ld\n", pos, len);324 printf("Fetching document number %d...\n", (mg_u_long) j_docnum); 325 FetchDocStart(qd, (mg_u_long) j_docnum, &pos, &len); 326 printf("Fetched document start. Pos: %d, Len: %d\n", pos, len); 327 327 328 328 /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */ … … 730 730 731 731 /* Print the data to a character array */ 732 sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t% ld\n",732 sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%d\n", 733 733 (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index), 734 734 (data->defaultStemMethod & 1), -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.h
r16583 r23508 36 36 char* index; 37 37 /* Maximum number of documents to retrieve */ 38 unsignedlong maxDocs;38 mg_u_long maxDocs; 39 39 /* Whether term frequency information is desired (boolean value) */ 40 40 int needTermFreqs; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/Makefile.in
r22070 r23508 14 14 AR = ar 15 15 CC = @CC@ 16 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM16 CFLAGS = @CFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM 17 17 DEFS = @DEFS@ 18 18 RANLIB = @RANLIB@ … … 20 20 INSTALL_DATA = @INSTALL_DATA@ 21 21 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 22 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@22 LDFLAGS = @LDFLAGS@ 23 23 #NOTE: libmgtext.a needs to come before libmglib.a !!! 24 24 QUERY_LIBS = ../src/text/libmgtext.a ../lib/libmglib.a @LIBS@ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/Makefile.in
r22070 r23508 34 34 AR = ar 35 35 CC = @CC@ 36 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-fpic36 CFLAGS = @CFLAGS@ -fpic 37 37 DEFS = @DEFS@ 38 38 RANLIB = @RANLIB@ … … 41 41 # Uncomment for compiling for the nzdl project 42 42 # 43 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-DQUIET -fpic43 CFLAGS = @CFLAGS@ -DQUIET -fpic 44 44 ########################################## 45 45 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_gen.c
r16583 r23508 28 28 int fprintf (FILE *, const char *,...); 29 29 30 unsignedlong31 BIO_Unary_Length ( unsignedlong val)30 mg_u_long 31 BIO_Unary_Length (mg_u_long val) 32 32 { 33 register unsignedlong num;33 register mg_u_long num; 34 34 UNARY_LENGTH (val, num); 35 35 return (num); … … 37 37 38 38 39 unsignedlong40 BIO_Binary_Length ( unsigned long val, unsignedlong b)39 mg_u_long 40 BIO_Binary_Length (mg_u_long val, mg_u_long b) 41 41 { 42 register unsignedlong num;42 register mg_u_long num; 43 43 BINARY_LENGTH (val, b, num); 44 44 return (num); … … 46 46 47 47 48 unsignedlong49 BIO_Gamma_Length ( unsignedlong val)48 mg_u_long 49 BIO_Gamma_Length (mg_u_long val) 50 50 { 51 register unsignedlong num;51 register mg_u_long num; 52 52 GAMMA_LENGTH (val, num); 53 53 return (num); … … 55 55 56 56 57 unsignedlong58 BIO_Delta_Length ( unsignedlong val)57 mg_u_long 58 BIO_Delta_Length (mg_u_long val) 59 59 { 60 register unsignedlong num;60 register mg_u_long num; 61 61 DELTA_LENGTH (val, num); 62 62 return (num); … … 64 64 65 65 66 unsignedlong67 BIO_Elias_Length ( unsigned long val, unsignedlong b, double s)66 mg_u_long 67 BIO_Elias_Length (mg_u_long val, mg_u_long b, double s) 68 68 { 69 register unsignedlong num;69 register mg_u_long num; 70 70 ELIAS_LENGTH (val, b, s, num); 71 71 return (num); 72 72 } 73 73 74 unsignedlong75 BIO_Bblock_Length ( unsigned long val, unsignedlong b)74 mg_u_long 75 BIO_Bblock_Length (mg_u_long val, mg_u_long b) 76 76 { 77 register unsignedlong num;77 register mg_u_long num; 78 78 BBLOCK_LENGTH (val, b, num); 79 79 return (num); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_gen.h
r16583 r23508 33 33 #define H_BITIO_GEN 34 34 35 unsigned long BIO_Unary_Length (unsignedlong val);35 mg_u_long BIO_Unary_Length (mg_u_long val); 36 36 37 unsigned long BIO_Binary_Length (unsigned long val, unsignedlong b);37 mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b); 38 38 39 unsigned long BIO_Gamma_Length (unsignedlong val);39 mg_u_long BIO_Gamma_Length (mg_u_long val); 40 40 41 unsigned long BIO_Delta_Length (unsignedlong val);41 mg_u_long BIO_Delta_Length (mg_u_long val); 42 42 43 unsigned long BIO_Elias_Length (unsigned long val, unsignedlong b, double s);43 mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s); 44 44 45 unsigned long BIO_Bblock_Length (unsigned long val, unsignedlong b);45 mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b); 46 46 47 47 int BIO_Bblock_Init (int N, int p); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m.h
r16583 r23508 50 50 #define POSITIVE(f, x) \ 51 51 if ((x)<=0) \ 52 fprintf(stderr,"Error: Cannot "#f" encode % lu\n",(unsignedlong)x),exit(1);52 fprintf(stderr,"Error: Cannot "#f" encode %d\n",(mg_u_long)x),exit(1); 53 53 54 54 … … 75 75 #define UNARY_ENCODE(x) \ 76 76 do { \ 77 register unsignedlong _B_x = (x); \77 register mg_u_long _B_x = (x); \ 78 78 BIO_ENCODE_PROLOGUE; \ 79 79 POSITIVE(unary, _B_x); \ … … 85 85 #define UNARY_ENCODE_L(x, count) \ 86 86 do { \ 87 register unsignedlong _B_x = (x); \87 register mg_u_long _B_x = (x); \ 88 88 BIO_ENCODE_PROLOGUE; \ 89 89 POSITIVE(unary, _B_x); \ … … 124 124 #define BINARY_ENCODE(x, b) \ 125 125 do { \ 126 register unsignedlong _B_x = (x); \127 register unsignedlong _B_b = (b); \126 register mg_u_long _B_x = (x); \ 127 register mg_u_long _B_b = (b); \ 128 128 register int _B_nbits, _B_logofb, _B_thresh; \ 129 129 BIO_ENCODE_PROLOGUE; \ … … 145 145 #define BINARY_ENCODE_L(x, b, count) \ 146 146 do { \ 147 register unsignedlong _B_x = (x); \148 register unsignedlong _B_b = (b); \147 register mg_u_long _B_x = (x); \ 148 register mg_u_long _B_b = (b); \ 149 149 register int _B_nbits, _B_logofb, _B_thresh; \ 150 150 BIO_ENCODE_PROLOGUE; \ … … 168 168 #define BINARY_DECODE(x, b) \ 169 169 do { \ 170 register unsignedlong _B_x = 0; \171 register unsignedlong _B_b = (b); \170 register mg_u_long _B_x = 0; \ 171 register mg_u_long _B_b = (b); \ 172 172 register int _B_i, _B_logofb, _B_thresh; \ 173 173 BIO_DECODE_PROLOGUE; \ … … 193 193 #define BINARY_DECODE_L(x, b, count) \ 194 194 do { \ 195 register unsignedlong _B_x = 0; \196 register unsignedlong _B_b = (b); \195 register mg_u_long _B_x = 0; \ 196 register mg_u_long _B_b = (b); \ 197 197 register int _B_i, _B_logofb, _B_thresh; \ 198 198 BIO_DECODE_PROLOGUE; \ … … 220 220 #define BINARY_LENGTH(x, b, count) \ 221 221 do { \ 222 register unsignedlong _B_x = (x); \223 register unsignedlong _B_b = (b); \222 register mg_u_long _B_x = (x); \ 223 register mg_u_long _B_b = (b); \ 224 224 register int _B_nbits, _B_logofb, _B_thresh; \ 225 225 POSITIVE(binary, _B_x); \ … … 240 240 #define GAMMA_ENCODE(x) \ 241 241 do { \ 242 register unsignedlong _B_xx = (x); \242 register mg_u_long _B_xx = (x); \ 243 243 register int _B_logofb; \ 244 244 register int _B_nbits; \ … … 255 255 #define GAMMA_ENCODE_L(x, count) \ 256 256 do { \ 257 register unsignedlong _B_xx = (x); \257 register mg_u_long _B_xx = (x); \ 258 258 register int _B_logofb; \ 259 259 register int _B_nbits; \ … … 271 271 #define GAMMA_DECODE(x) \ 272 272 do { \ 273 register unsignedlong _B_xx = 1; \273 register mg_u_long _B_xx = 1; \ 274 274 register int _B_nbits = 0; \ 275 275 BIO_DECODE_PROLOGUE; \ … … 283 283 #define GAMMA_DECODE_L(x, count) \ 284 284 do { \ 285 register unsignedlong _B_xx = 1; \285 register mg_u_long _B_xx = 1; \ 286 286 register int _B_nbits = 0; \ 287 287 BIO_DECODE_PROLOGUE; \ … … 296 296 #define GAMMA_LENGTH(x, count) \ 297 297 do { \ 298 register unsignedlong _B_xx = (x); \298 register mg_u_long _B_xx = (x); \ 299 299 register int _B_logofb; \ 300 300 POSITIVE(gamma, _B_xx); \ … … 310 310 #define DELTA_ENCODE(x) \ 311 311 do { \ 312 register unsignedlong _B_xxx = (x); \312 register mg_u_long _B_xxx = (x); \ 313 313 register int _B_logx; \ 314 314 FLOORLOG_2(_B_xxx, _B_logx); \ … … 319 319 #define DELTA_ENCODE_L(x, count) \ 320 320 do { \ 321 register unsignedlong _B_xxx = (x); \321 register mg_u_long _B_xxx = (x); \ 322 322 register int _B_logx; \ 323 323 FLOORLOG_2(_B_xxx, _B_logx); \ … … 329 329 #define DELTA_DECODE(x) \ 330 330 do { \ 331 register unsignedlong _B_xxx; \331 register mg_u_long _B_xxx; \ 332 332 register int _B_logx; \ 333 333 GAMMA_DECODE(_B_logx); --_B_logx; \ … … 338 338 #define DELTA_DECODE_L(x, count) \ 339 339 do { \ 340 register unsignedlong _B_xxx; \340 register mg_u_long _B_xxx; \ 341 341 register int _B_logx; \ 342 342 GAMMA_DECODE_L(_B_logx, count); --_B_logx; \ … … 347 347 #define DELTA_LENGTH(x, count) \ 348 348 do { \ 349 register unsignedlong _B_xxx = (x); \349 register mg_u_long _B_xxx = (x); \ 350 350 register int _B_logx, _B_dcount; \ 351 351 FLOORLOG_2(_B_xxx, _B_logx); \ … … 363 363 #define ELIAS_ENCODE(x, b, s) \ 364 364 do { \ 365 register unsignedlong _B_xx = (x); \366 register unsignedlong _B_b = (b); \365 register mg_u_long _B_xx = (x); \ 366 register mg_u_long _B_b = (b); \ 367 367 register double _B_s = (s); \ 368 368 register int _B_lower=1, _B_upper=1; \ … … 383 383 #define ELIAS_ENCODE_L(x, b, s, count) \ 384 384 do { \ 385 register unsignedlong _B_xx = (x); \386 register unsignedlong _B_b = (b); \385 register mg_u_long _B_xx = (x); \ 386 register mg_u_long _B_b = (b); \ 387 387 register double _B_s = (s); \ 388 388 register int _B_lower=1, _B_upper=1; \ … … 403 403 #define ELIAS_DECODE(x, b, s) \ 404 404 do { \ 405 register unsignedlong _B_xx; \406 register unsignedlong _B_b = (b); \405 register mg_u_long _B_xx; \ 406 register mg_u_long _B_b = (b); \ 407 407 register double _B_s = (s); \ 408 408 register int _B_lower=1, _B_upper=1; \ … … 423 423 #define ELIAS_DECODE_L(x, b, s, count) \ 424 424 do { \ 425 register unsignedlong _B_xx; \426 register unsignedlong _B_b = (b); \425 register mg_u_long _B_xx; \ 426 register mg_u_long _B_b = (b); \ 427 427 register double _B_s = (s); \ 428 428 register int _B_lower=1, _B_upper=1; \ … … 443 443 #define ELIAS_LENGTH(x, b, s, count) \ 444 444 do { \ 445 register unsignedlong _B_xx = (x); \446 register unsignedlong _B_b = (b); \445 register mg_u_long _B_xx = (x); \ 446 register mg_u_long _B_b = (b); \ 447 447 register double _B_s = (s); \ 448 448 register int _B_lower=1, _B_upper=1; \ … … 468 468 #define BBLOCK_ENCODE(x, b) \ 469 469 do { \ 470 register unsignedlong _B_xx = (x); \471 register unsignedlong _B_bb = (b); \470 register mg_u_long _B_xx = (x); \ 471 register mg_u_long _B_bb = (b); \ 472 472 register int _B_xdivb = 0; \ 473 473 POSITIVE(bblock, _B_xx); \ … … 484 484 #define BBLOCK_ENCODE_L(x, b, count) \ 485 485 do { \ 486 register unsignedlong _B_xx = (x); \487 register unsignedlong _B_bb = (b); \486 register mg_u_long _B_xx = (x); \ 487 register mg_u_long _B_bb = (b); \ 488 488 register int _B_xdivb = 0; \ 489 489 POSITIVE(bblock, _B_xx); \ … … 500 500 #define BBLOCK_DECODE(x, b) \ 501 501 do { \ 502 register unsignedlong _B_x1, _B_xx = 0; \503 register unsignedlong _B_bb = (b); \502 register mg_u_long _B_x1, _B_xx = 0; \ 503 register mg_u_long _B_bb = (b); \ 504 504 register int _B_xdivb; \ 505 505 UNARY_DECODE(_B_xdivb); --_B_xdivb; \ … … 512 512 #define BBLOCK_DECODE_L(x, b, count) \ 513 513 do { \ 514 register unsignedlong _B_x1, _B_xx = 0; \515 register unsignedlong _B_bb = (b); \514 register mg_u_long _B_x1, _B_xx = 0; \ 515 register mg_u_long _B_bb = (b); \ 516 516 register int _B_xdivb; \ 517 517 UNARY_DECODE_L(_B_xdivb, count); --_B_xdivb; \ … … 524 524 #define BBLOCK_LENGTH(x, b, count) \ 525 525 do { \ 526 register unsignedlong _B_bcount, _B_xx = (x); \527 register unsignedlong _B_bb = (b); \526 register mg_u_long _B_bcount, _B_xx = (x); \ 527 register mg_u_long _B_bb = (b); \ 528 528 register int _B_xdivb = 0; \ 529 529 POSITIVE(bblock, _B_xx); \ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m_mems.h
r16583 r23508 36 36 { 37 37 unsigned char *Base; 38 unsignedlong pos;38 mg_u_long pos; 39 39 } 40 40 mems_bitio_state; … … 44 44 { \ 45 45 register unsigned char *__base = b; \ 46 register unsignedlong __pos = p;46 register mg_u_long __pos = p; 47 47 48 48 #define ENCODE_CONTINUE(b) \ 49 49 { \ 50 50 register unsigned char *__base = (b).Base; \ 51 register unsignedlong __pos = (b).pos;51 register mg_u_long __pos = (b).pos; 52 52 53 53 #define ENCODE_BIT(b) \ … … 76 76 { \ 77 77 register unsigned char *__base = b; \ 78 register unsignedlong __pos = p;78 register mg_u_long __pos = p; 79 79 80 80 #define DECODE_CONTINUE(b) \ 81 81 { \ 82 82 register unsigned char *__base = (b).Base; \ 83 register unsignedlong __pos = (b).pos;83 register mg_u_long __pos = (b).pos; 84 84 85 85 #define DECODE_ADD_FF(b) \ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m_random.h
r16583 r23508 38 38 FILE *File; 39 39 unsigned char *Buf; 40 unsignedlong Base;41 unsignedlong Used;42 unsignedlong pos;43 unsignedlong len;44 unsignedlong sft;40 mg_u_long Base; 41 mg_u_long Used; 42 mg_u_long pos; 43 mg_u_long len; 44 mg_u_long sft; 45 45 } 46 46 random_bitio_state; … … 51 51 register FILE *__file = f; \ 52 52 register unsigned char *__buf; \ 53 register unsignedlong __pos = 0; \54 register unsignedlong __base = 0; \55 register unsignedlong __is_used = 0; \56 register unsignedlong __len = (l)-1; \57 register unsignedlong __sft = 0; \53 register mg_u_long __pos = 0; \ 54 register mg_u_long __base = 0; \ 55 register mg_u_long __is_used = 0; \ 56 register mg_u_long __len = (l)-1; \ 57 register mg_u_long __sft = 0; \ 58 58 while (__len) { ++__sft; __len >>=1; } \ 59 59 __len = 1<<__sft; \ … … 66 66 register FILE *__file = (b).File; \ 67 67 register unsigned char *__buf = (b).Buf; \ 68 register unsignedlong __pos = (b).pos; \69 register unsignedlong __base = (b).Base; \70 register unsignedlong __is_used = (b).Used; \71 register unsignedlong __len = (b).len; \72 register unsignedlong __sft = (b).sft;68 register mg_u_long __pos = (b).pos; \ 69 register mg_u_long __base = (b).Base; \ 70 register mg_u_long __is_used = (b).Used; \ 71 register mg_u_long __len = (b).len; \ 72 register mg_u_long __sft = (b).sft; 73 73 74 74 #define SEEK fprintf(stderr, "Seek to %d\n",__base) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_mem.c
r16583 r23508 55 55 56 56 void 57 BIO_Mem_Unary_Encode ( unsignedlong val, mem_bitio_state * bs,58 unsignedlong *bits)57 BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs, 58 mg_u_long *bits) 59 59 { 60 60 ENCODE_CONTINUE (*bs) … … 67 67 68 68 69 unsignedlong69 mg_u_long 70 70 BIO_Mem_Unary_Decode (mem_bitio_state * bs, 71 unsignedlong *bits)72 { 73 register unsignedlong val;71 mg_u_long *bits) 72 { 73 register mg_u_long val; 74 74 DECODE_CONTINUE (*bs) 75 75 if (bits) … … 88 88 89 89 void 90 BIO_Mem_Binary_Encode ( unsigned long val, unsignedlong b,91 mem_bitio_state * bs, unsignedlong *bits)90 BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b, 91 mem_bitio_state * bs, mg_u_long *bits) 92 92 { 93 93 ENCODE_CONTINUE (*bs) … … 100 100 101 101 102 unsignedlong103 BIO_Mem_Binary_Decode ( unsignedlong b, mem_bitio_state * bs,104 unsignedlong *bits)105 { 106 register unsignedlong val;102 mg_u_long 103 BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs, 104 mg_u_long *bits) 105 { 106 register mg_u_long val; 107 107 DECODE_CONTINUE (*bs) 108 108 if (bits) … … 121 121 122 122 void 123 BIO_Mem_Gamma_Encode ( unsignedlong val, mem_bitio_state * bs,124 unsignedlong *bits)123 BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs, 124 mg_u_long *bits) 125 125 { 126 126 ENCODE_CONTINUE (*bs) … … 133 133 134 134 135 unsignedlong136 BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsignedlong *bits)137 { 138 register unsignedlong val;135 mg_u_long 136 BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits) 137 { 138 register mg_u_long val; 139 139 DECODE_CONTINUE (*bs) 140 140 if (bits) … … 150 150 151 151 void 152 BIO_Mem_Delta_Encode ( unsignedlong val, mem_bitio_state * bs,153 unsignedlong *bits)152 BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs, 153 mg_u_long *bits) 154 154 { 155 155 ENCODE_CONTINUE (*bs) … … 162 162 163 163 164 unsignedlong165 BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsignedlong *bits)166 { 167 register unsignedlong val;164 mg_u_long 165 BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits) 166 { 167 register mg_u_long val; 168 168 DECODE_CONTINUE (*bs) 169 169 if (bits) … … 176 176 177 177 void 178 BIO_Mem_Elias_Encode ( unsigned long val, unsignedlong b, double s,179 mem_bitio_state * bs, unsignedlong *bits)178 BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s, 179 mem_bitio_state * bs, mg_u_long *bits) 180 180 { 181 181 ENCODE_CONTINUE (*bs) … … 188 188 189 189 190 unsignedlong191 BIO_Mem_Elias_Decode ( unsignedlong b, double s,192 mem_bitio_state * bs, unsignedlong *bits)193 { 194 register unsignedlong val;190 mg_u_long 191 BIO_Mem_Elias_Decode (mg_u_long b, double s, 192 mem_bitio_state * bs, mg_u_long *bits) 193 { 194 register mg_u_long val; 195 195 DECODE_CONTINUE (*bs) 196 196 if (bits) … … 203 203 204 204 void 205 BIO_Mem_Bblock_Encode ( unsigned long val, unsignedlong b,206 mem_bitio_state * bs, unsignedlong *bits)205 BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b, 206 mem_bitio_state * bs, mg_u_long *bits) 207 207 { 208 208 ENCODE_CONTINUE (*bs) … … 215 215 216 216 217 unsignedlong218 BIO_Mem_Bblock_Decode ( unsignedlong b, mem_bitio_state * bs,219 unsignedlong *bits)220 { 221 register unsignedlong val;217 mg_u_long 218 BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs, 219 mg_u_long *bits) 220 { 221 register mg_u_long val; 222 222 DECODE_CONTINUE (*bs) 223 223 if (bits) … … 230 230 231 231 void 232 BIO_Mem_Decode_Seek ( unsignedlong pos, mem_bitio_state * bs)232 BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs) 233 233 { 234 234 DECODE_CONTINUE (*bs) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_mem.h
r16583 r23508 61 61 62 62 63 void BIO_Mem_Unary_Encode ( unsignedlong val, mem_bitio_state * bs,64 unsignedlong *bits);65 unsignedlong BIO_Mem_Unary_Decode (mem_bitio_state * bs,66 unsignedlong *bits);63 void BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs, 64 mg_u_long *bits); 65 mg_u_long BIO_Mem_Unary_Decode (mem_bitio_state * bs, 66 mg_u_long *bits); 67 67 68 68 69 69 70 void BIO_Mem_Binary_Encode ( unsigned long val, unsignedlong b,71 mem_bitio_state * bs, unsignedlong *bits);72 unsigned long BIO_Mem_Binary_Decode (unsignedlong b, mem_bitio_state * bs,73 unsignedlong *bits);70 void BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b, 71 mem_bitio_state * bs, mg_u_long *bits); 72 mg_u_long BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs, 73 mg_u_long *bits); 74 74 75 75 76 76 77 void BIO_Mem_Gamma_Encode ( unsignedlong val, mem_bitio_state * bs,78 unsignedlong *bits);79 unsigned long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsignedlong *bits);77 void BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs, 78 mg_u_long *bits); 79 mg_u_long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits); 80 80 81 81 82 82 83 void BIO_Mem_Delta_Encode ( unsignedlong val, mem_bitio_state * bs,84 unsignedlong *bits);85 unsigned long BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsignedlong *bits);83 void BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs, 84 mg_u_long *bits); 85 mg_u_long BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits); 86 86 87 87 88 void BIO_Mem_Elias_Encode ( unsigned long val, unsignedlong b, double s,89 mem_bitio_state * bs, unsignedlong *bits);90 unsigned long BIO_Mem_Elias_Decode (unsignedlong b, double s,91 mem_bitio_state * bs, unsignedlong *bits);88 void BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s, 89 mem_bitio_state * bs, mg_u_long *bits); 90 mg_u_long BIO_Mem_Elias_Decode (mg_u_long b, double s, 91 mem_bitio_state * bs, mg_u_long *bits); 92 92 93 93 94 void BIO_Mem_Bblock_Encode ( unsigned long val, unsignedlong b,95 mem_bitio_state * bs, unsignedlong *bits);96 unsigned long BIO_Mem_Bblock_Decode (unsignedlong b, mem_bitio_state * bs,97 unsignedlong *bits);94 void BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b, 95 mem_bitio_state * bs, mg_u_long *bits); 96 mg_u_long BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs, 97 mg_u_long *bits); 98 98 99 99 100 void BIO_Mem_Decode_Seek ( unsignedlong pos, mem_bitio_state * bs);100 void BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs); 101 101 102 102 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_mems.c
r16583 r23508 30 30 31 31 void 32 BIO_Mems_Encode_Start (unsigned char *buf, unsignedlong pos,32 BIO_Mems_Encode_Start (unsigned char *buf, mg_u_long pos, 33 33 mems_bitio_state * bs) 34 34 { … … 46 46 47 47 void 48 BIO_Mems_Decode_Start (unsigned char *buf, unsignedlong pos,48 BIO_Mems_Decode_Start (unsigned char *buf, mg_u_long pos, 49 49 mems_bitio_state * bs) 50 50 { … … 57 57 58 58 void 59 BIO_Mems_Unary_Encode ( unsignedlong val, mems_bitio_state * bs,60 unsignedlong *bits)59 BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs, 60 mg_u_long *bits) 61 61 { 62 62 ENCODE_CONTINUE (*bs) … … 69 69 70 70 71 unsignedlong71 mg_u_long 72 72 BIO_Mems_Unary_Decode (mems_bitio_state * bs, 73 unsignedlong *bits)74 { 75 register unsignedlong val;73 mg_u_long *bits) 74 { 75 register mg_u_long val; 76 76 DECODE_CONTINUE (*bs) 77 77 if (bits) … … 90 90 91 91 void 92 BIO_Mems_Binary_Encode ( unsigned long val, unsignedlong b,93 mems_bitio_state * bs, unsignedlong *bits)92 BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b, 93 mems_bitio_state * bs, mg_u_long *bits) 94 94 { 95 95 ENCODE_CONTINUE (*bs) … … 102 102 103 103 104 unsignedlong105 BIO_Mems_Binary_Decode ( unsignedlong b, mems_bitio_state * bs,106 unsignedlong *bits)107 { 108 register unsignedlong val;104 mg_u_long 105 BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs, 106 mg_u_long *bits) 107 { 108 register mg_u_long val; 109 109 DECODE_CONTINUE (*bs) 110 110 if (bits) … … 123 123 124 124 void 125 BIO_Mems_Gamma_Encode ( unsignedlong val, mems_bitio_state * bs,126 unsignedlong *bits)125 BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs, 126 mg_u_long *bits) 127 127 { 128 128 ENCODE_CONTINUE (*bs) … … 135 135 136 136 137 unsignedlong138 BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsignedlong *bits)139 { 140 register unsignedlong val;137 mg_u_long 138 BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits) 139 { 140 register mg_u_long val; 141 141 DECODE_CONTINUE (*bs) 142 142 if (bits) … … 152 152 153 153 void 154 BIO_Mems_Delta_Encode ( unsignedlong val, mems_bitio_state * bs,155 unsignedlong *bits)154 BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs, 155 mg_u_long *bits) 156 156 { 157 157 ENCODE_CONTINUE (*bs) … … 164 164 165 165 166 unsignedlong167 BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsignedlong *bits)168 { 169 register unsignedlong val;166 mg_u_long 167 BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits) 168 { 169 register mg_u_long val; 170 170 DECODE_CONTINUE (*bs) 171 171 if (bits) … … 178 178 179 179 void 180 BIO_Mems_Elias_Encode ( unsigned long val, unsignedlong b, double s,181 mems_bitio_state * bs, unsignedlong *bits)180 BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s, 181 mems_bitio_state * bs, mg_u_long *bits) 182 182 { 183 183 ENCODE_CONTINUE (*bs) … … 190 190 191 191 192 unsignedlong193 BIO_Mems_Elias_Decode ( unsignedlong b, double s,194 mems_bitio_state * bs, unsignedlong *bits)195 { 196 register unsignedlong val;192 mg_u_long 193 BIO_Mems_Elias_Decode (mg_u_long b, double s, 194 mems_bitio_state * bs, mg_u_long *bits) 195 { 196 register mg_u_long val; 197 197 DECODE_CONTINUE (*bs) 198 198 if (bits) … … 205 205 206 206 void 207 BIO_Mems_Bblock_Encode ( unsigned long val, unsignedlong b,208 mems_bitio_state * bs, unsignedlong *bits)207 BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b, 208 mems_bitio_state * bs, mg_u_long *bits) 209 209 { 210 210 ENCODE_CONTINUE (*bs) … … 217 217 218 218 219 unsignedlong220 BIO_Mems_Bblock_Decode ( unsignedlong b, mems_bitio_state * bs,221 unsignedlong *bits)222 { 223 register unsignedlong val;219 mg_u_long 220 BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs, 221 mg_u_long *bits) 222 { 223 register mg_u_long val; 224 224 DECODE_CONTINUE (*bs) 225 225 if (bits) … … 232 232 233 233 void 234 BIO_Mems_Decode_Seek ( unsignedlong pos, mems_bitio_state * bs)234 BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs) 235 235 { 236 236 DECODE_CONTINUE (*bs) … … 240 240 241 241 void 242 BIO_Mems_Encode_Seek ( unsignedlong pos, mems_bitio_state * bs)242 BIO_Mems_Encode_Seek (mg_u_long pos, mems_bitio_state * bs) 243 243 { 244 244 ENCODE_CONTINUE (*bs) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_mems.h
r16583 r23508 38 38 { 39 39 unsigned char *Base; 40 unsignedlong pos;40 mg_u_long pos; 41 41 } 42 42 mems_bitio_state; … … 46 46 47 47 48 void BIO_Mems_Encode_Start (char *buf, unsignedlong pos, mems_bitio_state * bs);48 void BIO_Mems_Encode_Start (char *buf, mg_u_long pos, mems_bitio_state * bs); 49 49 void BIO_Mems_Encode_Done (mems_bitio_state * bs); 50 50 51 51 52 52 53 void BIO_Mems_Decode_Start (void *buf, unsignedlong pos, mems_bitio_state * bs);53 void BIO_Mems_Decode_Start (void *buf, mg_u_long pos, mems_bitio_state * bs); 54 54 55 55 56 56 57 void BIO_Mems_Unary_Encode ( unsignedlong val, mems_bitio_state * bs,58 unsignedlong *bits);59 unsignedlong BIO_Mems_Unary_Decode (mems_bitio_state * bs,60 unsignedlong *bits);57 void BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs, 58 mg_u_long *bits); 59 mg_u_long BIO_Mems_Unary_Decode (mems_bitio_state * bs, 60 mg_u_long *bits); 61 61 62 62 63 63 64 void BIO_Mems_Binary_Encode ( unsigned long val, unsignedlong b,65 mems_bitio_state * bs, unsignedlong *bits);66 unsigned long BIO_Mems_Binary_Decode (unsignedlong b, mems_bitio_state * bs,67 unsignedlong *bits);64 void BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b, 65 mems_bitio_state * bs, mg_u_long *bits); 66 mg_u_long BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs, 67 mg_u_long *bits); 68 68 69 69 70 70 71 void BIO_Mems_Gamma_Encode ( unsignedlong val, mems_bitio_state * bs,72 unsignedlong *bits);73 unsigned long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsignedlong *bits);71 void BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs, 72 mg_u_long *bits); 73 mg_u_long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits); 74 74 75 75 76 76 77 void BIO_Mems_Delta_Encode ( unsignedlong val, mems_bitio_state * bs,78 unsignedlong *bits);79 unsigned long BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsignedlong *bits);77 void BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs, 78 mg_u_long *bits); 79 mg_u_long BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits); 80 80 81 81 82 void BIO_Mems_Elias_Encode ( unsigned long val, unsignedlong b, double s,83 mems_bitio_state * bs, unsignedlong *bits);84 unsigned long BIO_Mems_Elias_Decode (unsignedlong b, double s,85 mems_bitio_state * bs, unsignedlong *bits);82 void BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s, 83 mems_bitio_state * bs, mg_u_long *bits); 84 mg_u_long BIO_Mems_Elias_Decode (mg_u_long b, double s, 85 mems_bitio_state * bs, mg_u_long *bits); 86 86 87 87 88 void BIO_Mems_Bblock_Encode ( unsigned long val, unsignedlong b,89 mems_bitio_state * bs, unsignedlong *bits);90 unsigned long BIO_Mems_Bblock_Decode (unsignedlong b, mems_bitio_state * bs,91 unsignedlong *bits);88 void BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b, 89 mems_bitio_state * bs, mg_u_long *bits); 90 mg_u_long BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs, 91 mg_u_long *bits); 92 92 93 93 94 void BIO_Mems_Decode_Seek ( unsignedlong pos, mems_bitio_state * bs);94 void BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs); 95 95 96 96 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_random.c
r16583 r23508 30 30 31 31 void 32 BIO_Random_Start (FILE * f, unsignedlong len,32 BIO_Random_Start (FILE * f, mg_u_long len, 33 33 random_bitio_state * bs) 34 34 { … … 64 64 65 65 void 66 BIO_Random_Unary_Encode ( unsignedlong val, random_bitio_state * bs,67 unsignedlong *bits)66 BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs, 67 mg_u_long *bits) 68 68 { 69 69 ENCODE_CONTINUE (*bs) … … 76 76 77 77 78 unsignedlong78 mg_u_long 79 79 BIO_Random_Unary_Decode (random_bitio_state * bs, 80 unsignedlong *bits)81 { 82 register unsignedlong val;80 mg_u_long *bits) 81 { 82 register mg_u_long val; 83 83 DECODE_CONTINUE (*bs) 84 84 if (bits) … … 97 97 98 98 void 99 BIO_Random_Binary_Encode ( unsigned long val, unsignedlong b,100 random_bitio_state * bs, unsignedlong *bits)99 BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b, 100 random_bitio_state * bs, mg_u_long *bits) 101 101 { 102 102 ENCODE_CONTINUE (*bs) … … 109 109 110 110 111 unsignedlong112 BIO_Random_Binary_Decode ( unsignedlong b,111 mg_u_long 112 BIO_Random_Binary_Decode (mg_u_long b, 113 113 random_bitio_state * bs, 114 unsignedlong *bits)115 { 116 register unsignedlong val;114 mg_u_long *bits) 115 { 116 register mg_u_long val; 117 117 DECODE_CONTINUE (*bs) 118 118 if (bits) … … 131 131 132 132 void 133 BIO_Random_Gamma_Encode ( unsignedlong val, random_bitio_state * bs,134 unsignedlong *bits)133 BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs, 134 mg_u_long *bits) 135 135 { 136 136 ENCODE_CONTINUE (*bs) … … 143 143 144 144 145 unsignedlong145 mg_u_long 146 146 BIO_Random_Gamma_Decode (random_bitio_state * bs, 147 unsignedlong *bits)148 { 149 register unsignedlong val;147 mg_u_long *bits) 148 { 149 register mg_u_long val; 150 150 DECODE_CONTINUE (*bs) 151 151 if (bits) … … 161 161 162 162 void 163 BIO_Random_Delta_Encode ( unsignedlong val, random_bitio_state * bs,164 unsignedlong *bits)163 BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs, 164 mg_u_long *bits) 165 165 { 166 166 ENCODE_CONTINUE (*bs) … … 173 173 174 174 175 unsignedlong175 mg_u_long 176 176 BIO_Random_Delta_Decode (random_bitio_state * bs, 177 unsignedlong *bits)178 { 179 register unsignedlong val;177 mg_u_long *bits) 178 { 179 register mg_u_long val; 180 180 DECODE_CONTINUE (*bs) 181 181 if (bits) … … 188 188 189 189 void 190 BIO_Random_Elias_Encode ( unsigned long val, unsignedlong b, double s,191 random_bitio_state * bs, unsignedlong *bits)190 BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s, 191 random_bitio_state * bs, mg_u_long *bits) 192 192 { 193 193 ENCODE_CONTINUE (*bs) … … 200 200 201 201 202 unsignedlong203 BIO_Random_Elias_Decode ( unsignedlong b, double s,202 mg_u_long 203 BIO_Random_Elias_Decode (mg_u_long b, double s, 204 204 random_bitio_state * bs, 205 unsignedlong *bits)206 { 207 register unsignedlong val;205 mg_u_long *bits) 206 { 207 register mg_u_long val; 208 208 DECODE_CONTINUE (*bs) 209 209 if (bits) … … 216 216 217 217 void 218 BIO_Random_Bblock_Encode ( unsigned long val, unsignedlong b,219 random_bitio_state * bs, unsignedlong *bits)218 BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b, 219 random_bitio_state * bs, mg_u_long *bits) 220 220 { 221 221 ENCODE_CONTINUE (*bs) … … 228 228 229 229 230 unsignedlong231 BIO_Random_Bblock_Decode ( unsignedlong b,230 mg_u_long 231 BIO_Random_Bblock_Decode (mg_u_long b, 232 232 random_bitio_state * bs, 233 unsignedlong *bits)234 { 235 register unsignedlong val;233 mg_u_long *bits) 234 { 235 register mg_u_long val; 236 236 DECODE_CONTINUE (*bs) 237 237 if (bits) … … 244 244 245 245 void 246 BIO_Random_Seek ( unsignedlong pos, random_bitio_state * bs)246 BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs) 247 247 { 248 248 ENCODE_CONTINUE (*bs) … … 258 258 } 259 259 260 unsignedlong260 mg_u_long 261 261 BIO_Random_Tell (random_bitio_state * bs) 262 262 { 263 register unsignedlong t;263 register mg_u_long t; 264 264 ENCODE_CONTINUE (*bs) 265 265 t = ENCODE_TELL; … … 278 278 ((((pos)+7) >> 3) < (mg_ullong)(__base + __len))) 279 279 { 280 __pos = ( long)((pos) - (mg_ullong)(__base << 3));280 __pos = (mg_s_long)((pos) - (mg_ullong)(__base << 3)); 281 281 } 282 282 else 283 283 { 284 284 ENCODE_FLUSH; 285 __base = ( long)(((pos) >> (__sft+3)) << __sft);285 __base = (mg_s_long)(((pos) >> (__sft+3)) << __sft); 286 286 287 287 fseek(__file,__base,0); 288 288 fread(__buf,1,__len,__file); 289 __pos = ( long)((pos) & ((8 << __sft)-1));289 __pos = (mg_s_long)((pos) & ((8 << __sft)-1)); 290 290 } 291 291 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_random.h
r16583 r23508 43 43 FILE *File; 44 44 unsigned char *Buf; 45 unsignedlong Base;46 unsignedlong Used;47 unsignedlong pos;48 unsignedlong len;49 unsignedlong sft;45 mg_u_long Base; 46 mg_u_long Used; 47 mg_u_long pos; 48 mg_u_long len; 49 mg_u_long sft; 50 50 } 51 51 random_bitio_state; … … 55 55 56 56 57 void BIO_Random_Start (FILE * f, unsignedlong len,57 void BIO_Random_Start (FILE * f, mg_u_long len, 58 58 random_bitio_state * bs); 59 59 void BIO_Random_Done (random_bitio_state * bs); … … 61 61 62 62 63 void BIO_Random_Decode_Start (void *buf, unsignedlong pos,63 void BIO_Random_Decode_Start (void *buf, mg_u_long pos, 64 64 random_bitio_state * bs); 65 65 … … 69 69 70 70 71 void BIO_Random_Unary_Encode ( unsignedlong val, random_bitio_state * bs,72 unsignedlong *bits);73 unsignedlong BIO_Random_Unary_Decode (random_bitio_state * bs,74 unsignedlong *bits);71 void BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs, 72 mg_u_long *bits); 73 mg_u_long BIO_Random_Unary_Decode (random_bitio_state * bs, 74 mg_u_long *bits); 75 75 76 76 77 77 78 void BIO_Random_Binary_Encode ( unsigned long val, unsignedlong b,79 random_bitio_state * bs, unsignedlong *bits);80 unsigned long BIO_Random_Binary_Decode (unsignedlong b, random_bitio_state * bs,81 unsignedlong *bits);78 void BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b, 79 random_bitio_state * bs, mg_u_long *bits); 80 mg_u_long BIO_Random_Binary_Decode (mg_u_long b, random_bitio_state * bs, 81 mg_u_long *bits); 82 82 83 83 84 84 85 void BIO_Random_Gamma_Encode ( unsignedlong val, random_bitio_state * bs,86 unsignedlong *bits);87 unsignedlong BIO_Random_Gamma_Decode (random_bitio_state * bs,88 unsignedlong *bits);85 void BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs, 86 mg_u_long *bits); 87 mg_u_long BIO_Random_Gamma_Decode (random_bitio_state * bs, 88 mg_u_long *bits); 89 89 90 90 91 91 92 void BIO_Random_Delta_Encode ( unsignedlong val, random_bitio_state * bs,93 unsignedlong *bits);94 unsignedlong BIO_Random_Delta_Decode (random_bitio_state * bs,95 unsignedlong *bits);92 void BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs, 93 mg_u_long *bits); 94 mg_u_long BIO_Random_Delta_Decode (random_bitio_state * bs, 95 mg_u_long *bits); 96 96 97 97 98 void BIO_Random_Elias_Encode ( unsigned long val, unsignedlong b, double s,99 random_bitio_state * bs, unsignedlong *bits);100 unsigned long BIO_Random_Elias_Decode (unsignedlong b, double s,98 void BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s, 99 random_bitio_state * bs, mg_u_long *bits); 100 mg_u_long BIO_Random_Elias_Decode (mg_u_long b, double s, 101 101 random_bitio_state * bs, 102 unsignedlong *bits);102 mg_u_long *bits); 103 103 104 104 105 void BIO_Random_Bblock_Encode ( unsigned long val, unsignedlong b,106 random_bitio_state * bs, unsignedlong *bits);107 unsigned long BIO_Random_Bblock_Decode (unsignedlong b,105 void BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b, 106 random_bitio_state * bs, mg_u_long *bits); 107 mg_u_long BIO_Random_Bblock_Decode (mg_u_long b, 108 108 random_bitio_state * bs, 109 unsignedlong *bits);109 mg_u_long *bits); 110 110 111 111 112 void BIO_Random_Seek ( unsignedlong pos, random_bitio_state * bs);112 void BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs); 113 113 114 114 void BIO_Random_Flush (random_bitio_state * bs); 115 115 116 unsignedlong BIO_Random_Tell (random_bitio_state * bs);116 mg_u_long BIO_Random_Tell (random_bitio_state * bs); 117 117 118 118 #ifdef USE_LONG_LONG -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_stdio.c
r16583 r23508 72 72 73 73 void 74 BIO_Stdio_Unary_Encode ( unsignedlong val, stdio_bitio_state * bs,75 unsignedlong *bits)74 BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs, 75 mg_u_long *bits) 76 76 { 77 77 ENCODE_CONTINUE (*bs) … … 84 84 85 85 86 unsignedlong86 mg_u_long 87 87 BIO_Stdio_Unary_Decode (stdio_bitio_state * bs, 88 unsignedlong *bits)89 { 90 register unsignedlong val;88 mg_u_long *bits) 89 { 90 register mg_u_long val; 91 91 DECODE_CONTINUE (*bs) 92 92 if (bits) … … 105 105 106 106 void 107 BIO_Stdio_Binary_Encode ( unsigned long val, unsignedlong b,108 stdio_bitio_state * bs, unsignedlong *bits)107 BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b, 108 stdio_bitio_state * bs, mg_u_long *bits) 109 109 { 110 110 ENCODE_CONTINUE (*bs) … … 117 117 118 118 119 unsignedlong120 BIO_Stdio_Binary_Decode ( unsignedlong b, stdio_bitio_state * bs,121 unsignedlong *bits)122 { 123 register unsignedlong val;119 mg_u_long 120 BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs, 121 mg_u_long *bits) 122 { 123 register mg_u_long val; 124 124 DECODE_CONTINUE (*bs) 125 125 if (bits) … … 138 138 139 139 void 140 BIO_Stdio_Gamma_Encode ( unsignedlong val, stdio_bitio_state * bs,141 unsignedlong *bits)140 BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs, 141 mg_u_long *bits) 142 142 { 143 143 ENCODE_CONTINUE (*bs) … … 150 150 151 151 152 unsignedlong152 mg_u_long 153 153 BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs, 154 unsignedlong *bits)155 { 156 register unsignedlong val;154 mg_u_long *bits) 155 { 156 register mg_u_long val; 157 157 DECODE_CONTINUE (*bs) 158 158 if (bits) … … 168 168 169 169 void 170 BIO_Stdio_Delta_Encode ( unsignedlong val, stdio_bitio_state * bs,171 unsignedlong *bits)170 BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs, 171 mg_u_long *bits) 172 172 { 173 173 ENCODE_CONTINUE (*bs) … … 180 180 181 181 182 unsignedlong182 mg_u_long 183 183 BIO_Stdio_Delta_Decode (stdio_bitio_state * bs, 184 unsignedlong *bits)185 { 186 register unsignedlong val;184 mg_u_long *bits) 185 { 186 register mg_u_long val; 187 187 DECODE_CONTINUE (*bs) 188 188 if (bits) … … 198 198 199 199 void 200 BIO_Stdio_Elias_Encode ( unsigned long val, unsignedlong b, double s,201 stdio_bitio_state * bs, unsignedlong *bits)200 BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s, 201 stdio_bitio_state * bs, mg_u_long *bits) 202 202 { 203 203 ENCODE_CONTINUE (*bs) … … 210 210 211 211 212 unsignedlong213 BIO_Stdio_Elias_Decode ( unsignedlong b, double s,212 mg_u_long 213 BIO_Stdio_Elias_Decode (mg_u_long b, double s, 214 214 stdio_bitio_state * bs, 215 unsignedlong *bits)216 { 217 register unsignedlong val;215 mg_u_long *bits) 216 { 217 register mg_u_long val; 218 218 DECODE_CONTINUE (*bs) 219 219 if (bits) … … 228 228 229 229 void 230 BIO_Stdio_Bblock_Encode ( unsigned long val, unsignedlong b,231 stdio_bitio_state * bs, unsignedlong *bits)230 BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b, 231 stdio_bitio_state * bs, mg_u_long *bits) 232 232 { 233 233 ENCODE_CONTINUE (*bs) … … 240 240 241 241 242 unsignedlong243 BIO_Stdio_Bblock_Decode ( unsignedlong b, stdio_bitio_state * bs,244 unsignedlong *bits)245 { 246 register unsignedlong val;242 mg_u_long 243 BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs, 244 mg_u_long *bits) 245 { 246 register mg_u_long val; 247 247 DECODE_CONTINUE (*bs) 248 248 if (bits) … … 255 255 256 256 void 257 BIO_Stdio_Decode_Seek ( unsignedlong pos, stdio_bitio_state * bs)257 BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs) 258 258 { 259 259 DECODE_CONTINUE (*bs) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_stdio.h
r16583 r23508 59 59 60 60 61 void BIO_Stdio_Unary_Encode ( unsignedlong val, stdio_bitio_state * bs,62 unsignedlong *bits);63 unsignedlong BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,64 unsignedlong *bits);61 void BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs, 62 mg_u_long *bits); 63 mg_u_long BIO_Stdio_Unary_Decode (stdio_bitio_state * bs, 64 mg_u_long *bits); 65 65 66 66 67 67 68 void BIO_Stdio_Binary_Encode ( unsigned long val, unsignedlong b,69 stdio_bitio_state * bs, unsignedlong *bits);70 unsigned long BIO_Stdio_Binary_Decode (unsignedlong b, stdio_bitio_state * bs,71 unsignedlong *bits);68 void BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b, 69 stdio_bitio_state * bs, mg_u_long *bits); 70 mg_u_long BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs, 71 mg_u_long *bits); 72 72 73 73 74 74 75 void BIO_Stdio_Gamma_Encode ( unsignedlong val, stdio_bitio_state * bs,76 unsignedlong *bits);77 unsignedlong BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,78 unsignedlong *bits);75 void BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs, 76 mg_u_long *bits); 77 mg_u_long BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs, 78 mg_u_long *bits); 79 79 80 80 81 81 82 void BIO_Stdio_Delta_Encode ( unsignedlong val, stdio_bitio_state * bs,83 unsignedlong *bits);84 unsignedlong BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,85 unsignedlong *bits);82 void BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs, 83 mg_u_long *bits); 84 mg_u_long BIO_Stdio_Delta_Decode (stdio_bitio_state * bs, 85 mg_u_long *bits); 86 86 87 87 88 88 89 void BIO_Stdio_Elias_Encode ( unsigned long val, unsignedlong b, double s,90 stdio_bitio_state * bs, unsignedlong *bits);91 unsigned long BIO_Stdio_Elias_Decode (unsignedlong b, double s,89 void BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s, 90 stdio_bitio_state * bs, mg_u_long *bits); 91 mg_u_long BIO_Stdio_Elias_Decode (mg_u_long b, double s, 92 92 stdio_bitio_state * bs, 93 unsignedlong *bits);93 mg_u_long *bits); 94 94 95 95 96 void BIO_Stdio_Bblock_Encode ( unsigned long val, unsignedlong b,97 stdio_bitio_state * bs, unsignedlong *bits);98 unsigned long BIO_Stdio_Bblock_Decode (unsignedlong b, stdio_bitio_state * bs,99 unsignedlong *bits);96 void BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b, 97 stdio_bitio_state * bs, mg_u_long *bits); 98 mg_u_long BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs, 99 mg_u_long *bits); 100 100 101 101 102 void BIO_Stdio_Decode_Seek ( unsignedlong pos, stdio_bitio_state * bs);102 void BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs); 103 103 104 104 #endif -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/filestats.c
r16583 r23508 28 28 29 29 File * 30 Fopen (char *name, char *mode, unsignedlong magic)30 Fopen (char *name, char *mode, mg_u_long magic) 31 31 { 32 32 FILE *f; 33 33 File *F; 34 unsignedlong m;34 mg_u_long m; 35 35 if (!(f = fopen (name, mode))) 36 36 return (NULL); … … 90 90 91 91 int 92 Fseek (File * F, long offset, int ptrname)92 Fseek (File * F, mg_s_long offset, int ptrname) 93 93 { 94 94 int num; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/filestats.h
r16583 r23508 26 26 typedef struct FileStats 27 27 { 28 unsignedlong NumSeeks;29 unsignedlong NumReads;30 unsignedlong NumBytes;28 mg_u_long NumSeeks; 29 mg_u_long NumReads; 30 mg_u_long NumBytes; 31 31 } 32 32 FileStats; … … 45 45 46 46 /* if magic is 0 no magic number is read or written */ 47 File *Fopen (char *name, char *mode, unsignedlong magic);47 File *Fopen (char *name, char *mode, mg_u_long magic); 48 48 49 49 size_t Fread (void *ptr, size_t size, size_t nitems, File * F); 50 50 51 int Fseek (File * F, long offset, int ptrname);51 int Fseek (File * F, mg_s_long offset, int ptrname); 52 52 53 53 void Rewind (File * F); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/gmalloc.c
r16583 r23508 401 401 { 402 402 __ptr_t result; 403 unsigned long intadj;403 mg_u_long adj; 404 404 405 405 result = (*__morecore) (size); 406 adj = ( unsigned long int) ((unsigned long int) ((char *) result -406 adj = (mg_u_long) ((mg_u_long) ((char *) result - 407 407 (char *) NULL)) % BLOCKSIZE; 408 408 if (adj != 0) … … 549 549 block = BLOCK (result); 550 550 if (--_heapinfo[block].busy.info.frag.nfree != 0) 551 _heapinfo[block].busy.info.frag.first = ( unsigned long int)552 (( unsigned long int) ((char *) next->next - (char *) NULL)551 _heapinfo[block].busy.info.frag.first = (mg_u_long) 552 ((mg_u_long) ((char *) next->next - (char *) NULL) 553 553 % BLOCKSIZE) >> log; 554 554 … … 872 872 prev = (struct list *) ptr; 873 873 _heapinfo[block].busy.info.frag.nfree = 1; 874 _heapinfo[block].busy.info.frag.first = ( unsigned long int)875 (( unsigned long int) ((char *) ptr - (char *) NULL)874 _heapinfo[block].busy.info.frag.first = (mg_u_long) 875 ((mg_u_long) ((char *) ptr - (char *) NULL) 876 876 % BLOCKSIZE >> type); 877 877 prev->next = _fraghead[type].next; … … 1284 1284 { 1285 1285 __ptr_t result; 1286 unsignedlong int adj;1286 mg_u_long int adj; 1287 1287 1288 1288 size = ((size + alignment - 1) / alignment) * alignment; … … 1291 1291 if (result == NULL) 1292 1292 return NULL; 1293 adj = ( unsigned long int) ((unsigned long int) ((char *) result -1293 adj = (mg_u_long) ((mg_u_long) ((char *) result - 1294 1294 (char *) NULL)) % alignment; 1295 1295 if (adj != 0) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman.c
r16583 r23508 30 30 */ 31 31 huff_data * 32 Generate_Huffman_Data (int num, long *freqs, huff_data * data,33 u_long * mem)32 Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 33 mg_u_long * mem) 34 34 { 35 35 int HNum, i, count; 36 unsignedlong *heap;36 mg_u_long *heap; 37 37 huff_data *hd = data; 38 38 if (!hd) … … 73 73 if (heap[heap[curr - 1]] > heap[heap[child - 1]]) 74 74 { 75 register u_long temp;75 register mg_u_long temp; 76 76 temp = heap[child - 1]; 77 77 heap[child - 1] = heap[curr - 1]; … … 141 141 142 142 /* Calculate the code lens */ 143 heap[0] = -1 UL;143 heap[0] = -1; 144 144 heap[1] = 0; 145 145 for (i = 2; i < num * 2; i++) … … 154 154 for (i = 0; i < num; i++) 155 155 { 156 register u_long codelen = heap[i + num];156 register mg_u_long codelen = heap[i + num]; 157 157 hd->clens[i] = (char) codelen; 158 158 if (!codelen) … … 190 190 } 191 191 192 unsignedlong *193 Generate_Huffman_Codes (huff_data * data, u_long * mem)192 mg_u_long * 193 Generate_Huffman_Codes (huff_data * data, mg_u_long * mem) 194 194 { 195 195 int i; 196 unsignedlong *codes;197 unsignedlong mc[MAX_HUFFCODE_LEN + 1];196 mg_u_long *codes; 197 mg_u_long mc[MAX_HUFFCODE_LEN + 1]; 198 198 199 199 if (!data) … … 212 212 213 213 214 unsignedlong **215 Generate_Huffman_Vals (huff_data * data, u_long * mem)214 mg_u_long ** 215 Generate_Huffman_Vals (huff_data * data, mg_u_long * mem) 216 216 { 217 217 int i; 218 unsignedlong *fcode[MAX_HUFFCODE_LEN + 1];219 unsignedlong **values;220 unsignedlong *vals;218 mg_u_long *fcode[MAX_HUFFCODE_LEN + 1]; 219 mg_u_long **values; 220 mg_u_long *vals; 221 221 222 222 if (!data) … … 224 224 if (!(vals = Xmalloc (data->num_codes * sizeof (*vals)))) 225 225 return (NULL); 226 if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *))))226 if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)))) 227 227 { 228 228 free (vals); … … 230 230 } 231 231 232 bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *));232 bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)); 233 233 234 234 if (mem) 235 235 *mem += data->num_codes * sizeof (*vals) + 236 (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);236 (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 237 237 238 238 fcode[0] = values[0] = &vals[0]; … … 249 249 250 250 double 251 Calculate_Huffman_Size (int num, long *freqs,long *counts)251 Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts) 252 252 { 253 253 double size = 0; … … 321 321 static int 322 322 General_Read_Huffman_Data (size_t (*rd) (), void *f, 323 huff_data * hd, u_long * mem,u_long * disk)323 huff_data * hd, mg_u_long * mem, mg_u_long * disk) 324 324 { 325 325 if (rd (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1) … … 392 392 393 393 int 394 Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem,u_long * disk)394 Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) 395 395 { 396 396 return General_Read_Huffman_Data (fread, f, hd, mem, disk); … … 401 401 402 402 int 403 F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem,u_long * disk)403 F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) 404 404 { 405 405 return General_Read_Huffman_Data (Fread, f, hd, mem, disk); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman.h
r16583 r23508 37 37 int maxcodelen; 38 38 int lencount[MAX_HUFFCODE_LEN + 1]; 39 unsignedlong min_code[MAX_HUFFCODE_LEN + 1];39 mg_u_long min_code[MAX_HUFFCODE_LEN + 1]; 40 40 char *clens; 41 41 } … … 43 43 44 44 45 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data,46 u_long * mem);45 huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 46 mg_u_long * mem); 47 47 48 unsigned long *Generate_Huffman_Codes (huff_data * data,u_long * mem);48 mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem); 49 49 50 unsigned long **Generate_Huffman_Vals (huff_data * data,u_long * mem);50 mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem); 51 51 52 52 int Write_Huffman_Data (FILE * f, huff_data * hd); 53 53 54 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem,u_long * disk);54 int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk); 55 55 56 int F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem,u_long * disk);56 int F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk); 57 57 58 58 /* Calculate the number of bits required to code the data with the 59 59 specified frequencies. Normally freqs and counts should point to 60 60 the same array. */ 61 double Calculate_Huffman_Size (int num, long *freqs,long *counts);61 double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts); 62 62 63 63 … … 67 67 register int __i; \ 68 68 register int __clen = (lens)[x]; \ 69 register unsignedlong __code = (codes)[x]; \69 register mg_u_long __code = (codes)[x]; \ 70 70 for (__i=__clen-1; __i>=0; --__i) \ 71 71 ENCODE_BIT((__code >> __i) & 1); \ … … 81 81 #define HUFF_DECODE(x, mcodes, values) \ 82 82 do { \ 83 register unsignedlong *__min_code = (mcodes); \84 register unsignedlong *__mclen = __min_code; \85 register unsignedlong **__values = (values); \86 register unsignedlong __code = 0; \83 register mg_u_long *__min_code = (mcodes); \ 84 register mg_u_long *__mclen = __min_code; \ 85 register mg_u_long **__values = (values); \ 86 register mg_u_long __code = 0; \ 87 87 do \ 88 88 { \ … … 96 96 #define HUFF_DECODE_L(x, mcodes, values, count) \ 97 97 do { \ 98 register unsignedlong *__min_code = (mcodes); \99 register unsignedlong *__mclen = __min_code; \100 register unsignedlong **__values = (values); \101 register unsignedlong __code = 0; \98 register mg_u_long *__min_code = (mcodes); \ 99 register mg_u_long *__mclen = __min_code; \ 100 register mg_u_long **__values = (values); \ 101 register mg_u_long __code = 0; \ 102 102 do \ 103 103 { \ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_mem.c
r16583 r23508 30 30 31 31 void 32 BIO_Mem_Huff_Encode ( unsigned long val, unsignedlong *codes,32 BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes, 33 33 char *clens, mem_bitio_state * bs) 34 34 { … … 38 38 } 39 39 40 unsignedlong41 BIO_Mem_Huff_Decode ( unsignedlong *mincodes,42 unsignedlong **values, mem_bitio_state * bs)40 mg_u_long 41 BIO_Mem_Huff_Decode (mg_u_long *mincodes, 42 mg_u_long **values, mem_bitio_state * bs) 43 43 { 44 unsignedlong val;44 mg_u_long val; 45 45 DECODE_CONTINUE (*bs) 46 46 HUFF_DECODE (val, mincodes, values); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_mem.h
r16583 r23508 25 25 26 26 27 void BIO_Mem_Huff_Encode ( unsigned long val, unsignedlong *codes,27 void BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes, 28 28 char *clens, mem_bitio_state * bs); 29 29 30 unsigned long BIO_Mem_Huff_Decode (unsignedlong *mincodes,31 unsignedlong **values, mem_bitio_state * bs);30 mg_u_long BIO_Mem_Huff_Decode (mg_u_long *mincodes, 31 mg_u_long **values, mem_bitio_state * bs); 32 32 33 33 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_stdio.c
r16583 r23508 33 33 34 34 void 35 BIO_Stdio_Huff_Encode ( unsigned long val, unsignedlong *codes,35 BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes, 36 36 char *clens, stdio_bitio_state * bs) 37 37 { … … 41 41 } 42 42 43 unsignedlong44 BIO_Stdio_Huff_Decode ( unsignedlong *mincodes,45 unsignedlong **values,43 mg_u_long 44 BIO_Stdio_Huff_Decode (mg_u_long *mincodes, 45 mg_u_long **values, 46 46 stdio_bitio_state * bs) 47 47 { 48 unsignedlong val;48 mg_u_long val; 49 49 DECODE_CONTINUE (*bs) 50 50 HUFF_DECODE (val, mincodes, values); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_stdio.h
r16583 r23508 25 25 26 26 27 void BIO_Stdio_Huff_Encode ( unsigned long val, unsignedlong *codes,27 void BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes, 28 28 char *clens, stdio_bitio_state * bs); 29 29 30 30 31 unsigned long BIO_Stdio_Huff_Decode (unsignedlong *mincodes,32 unsignedlong **values,31 mg_u_long BIO_Stdio_Huff_Decode (mg_u_long *mincodes, 32 mg_u_long **values, 33 33 stdio_bitio_state * bs); 34 34 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/longlong.h
r16583 r23508 22 22 #ifndef H_LONGLONG 23 23 #define H_LONGLONG 24 25 #include "mglong.h" 24 26 25 27 #ifndef __WIN32__ … … 71 73 72 74 /* Not using GCC, so fall back on plain "long" (32-bit) types */ 73 typedef u nsigned long int mg_ullong;74 typedef long int mg_llong;75 typedef uint32_t mg_ullong; 76 typedef int32_t mg_llong; 75 77 76 #define ULL_FS " lu"77 #define LL_FS " ld"78 #define ULL_FS "u" 79 #define LL_FS "d" 78 80 79 81 #endif /* __GNUC__ */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/messages.c
r16583 r23508 28 28 29 29 30 void VOLATILE30 void 31 31 FatalError (int ExitCode, const char *fmt,...) 32 32 { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/messages.h
r16583 r23508 31 31 extern char *msg_prefix; 32 32 33 void VOLATILEFatalError (int ExitCode, const char *fmt,...);33 void FatalError (int ExitCode, const char *fmt,...); 34 34 35 35 void Message (const char *fmt,...); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/netorder.h
r22257 r23508 17 17 #define HTOND(d) \ 18 18 do { \ 19 unsignedlong tmph, tmpl; \19 mg_u_long tmph, tmpl; \ 20 20 bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1); \ 21 21 bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1); \ … … 27 27 #define NTOHD(d) \ 28 28 do { \ 29 unsignedlong tmph, tmpl; \29 mg_u_long tmph, tmpl; \ 30 30 bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1); \ 31 31 bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1); \ … … 37 37 #define HTOND2(hd, nd) \ 38 38 do { \ 39 unsignedlong tmph, tmpl; \39 mg_u_long tmph, tmpl; \ 40 40 bcopy ((char *) &hd, (char *) &tmph, sizeof(double) >> 1); \ 41 41 bcopy ((char *) &hd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1); \ … … 47 47 #define NTOHD2(nd, hd) \ 48 48 do { \ 49 unsignedlong tmph, tmpl; \49 mg_u_long tmph, tmpl; \ 50 50 bcopy ((char *) &nd, (char *) &tmph, sizeof(double) >> 1); \ 51 51 bcopy ((char *) &nd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1); \ … … 59 59 #define HTONF(f) \ 60 60 do { \ 61 unsignedlong tmp; \61 mg_u_long tmp; \ 62 62 bcopy ((char *) &(f), (char *) &tmp, sizeof (float)); \ 63 63 HTONUL (tmp); \ … … 66 66 #define NTOHF(f) \ 67 67 do { \ 68 unsignedlong tmp; \68 mg_u_long tmp; \ 69 69 bcopy ((char *) &(f), (char *) &tmp, sizeof (float)); \ 70 70 NTOHUL (tmp); \ … … 73 73 #define HTONF2(hf, nf) \ 74 74 do { \ 75 unsignedlong tmp; \75 mg_u_long tmp; \ 76 76 bcopy ((char *) &(hf), (char *) &tmp, sizeof (float)); \ 77 77 HTONUL (tmp); \ … … 80 80 #define NTOHF2(nf, hf) \ 81 81 do { \ 82 unsignedlong tmp; \82 mg_u_long tmp; \ 83 83 bcopy ((char *) &(nf), (char *) &tmp, sizeof (float)); \ 84 84 NTOHUL (tmp); \ … … 115 115 116 116 /* pointers */ 117 #define HTONP(p) ((p) = (void *) htonl (( unsignedlong) p))118 #define NTOHP(p) ((p) = (void *) ntohl (( unsignedlong) p))119 #define HTONP2(hp, np) ((np) = (void *) htonl (( unsignedlong) hp))120 #define NTOHP2(np, hp) ((hp) = (void *) ntohl (( unsignedlong) np))117 #define HTONP(p) ((p) = (void *) htonl ((mg_u_long) p)) 118 #define NTOHP(p) ((p) = (void *) ntohl ((mg_u_long) p)) 119 #define HTONP2(hp, np) ((np) = (void *) htonl ((mg_u_long) hp)) 120 #define NTOHP2(np, hp) ((hp) = (void *) ntohl ((mg_u_long) np)) 121 121 122 122 /* unsigned long */ … … 127 127 128 128 /* signed long */ 129 #define HTONSL(l) ((l) = ( long) htonl ((unsignedlong) (l)))130 #define NTOHSL(l) ((l) = ( long) ntohl ((unsignedlong) (l)))131 #define HTONSL2(hl, nl) ((nl) = ( long) htonl ((unsignedlong) (hl)))132 #define NTOHSL2(nl, hl) ((hl) = ( long) ntohl ((unsignedlong) (nl)))129 #define HTONSL(l) ((l) = (mg_s_long) htonl ((mg_u_long) (l))) 130 #define NTOHSL(l) ((l) = (mg_s_long) ntohl ((mg_u_long) (l))) 131 #define HTONSL2(hl, nl) ((nl) = (mg_s_long) htonl ((mg_u_long) (hl))) 132 #define NTOHSL2(nl, hl) ((hl) = (mg_s_long) ntohl ((mg_u_long) (nl))) 133 133 134 134 /* unsigned int */ 135 #define HTONUI(i) ((i) = (unsigned int) htonl (( unsignedlong) (i)))136 #define NTOHUI(i) ((i) = (unsigned int) ntohl (( unsignedlong) (i)))137 #define HTONUI2(hi, ni) ((ni) = (unsigned int) htonl (( unsignedlong) (hi)))138 #define NTOHUI2(ni, hi) ((hi) = (unsigned int) ntohl (( unsignedlong) (ni)))135 #define HTONUI(i) ((i) = (unsigned int) htonl ((mg_u_long) (i))) 136 #define NTOHUI(i) ((i) = (unsigned int) ntohl ((mg_u_long) (i))) 137 #define HTONUI2(hi, ni) ((ni) = (unsigned int) htonl ((mg_u_long) (hi))) 138 #define NTOHUI2(ni, hi) ((hi) = (unsigned int) ntohl ((mg_u_long) (ni))) 139 139 140 140 /* signed int */ 141 #define HTONSI(i) ((i) = (int) htonl (( unsignedlong) (i)))142 #define NTOHSI(i) ((i) = (int) ntohl (( unsignedlong) (i)))143 #define HTONSI2(hi, ni) ((ni) = (int) htonl (( unsignedlong) (hi)))144 #define NTOHSI2(ni, hi) ((hi) = (int) ntohl (( unsignedlong) (ni)))141 #define HTONSI(i) ((i) = (int) htonl ((mg_u_long) (i))) 142 #define NTOHSI(i) ((i) = (int) ntohl ((mg_u_long) (i))) 143 #define HTONSI2(hi, ni) ((ni) = (int) htonl ((mg_u_long) (hi))) 144 #define NTOHSI2(ni, hi) ((hi) = (int) ntohl ((mg_u_long) (ni))) 145 145 146 146 /* unsigned short */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/regex.c
r16583 r23508 2896 2896 register char *fastmap = bufp->fastmap; 2897 2897 unsigned char *pattern = bufp->buffer; 2898 unsignedlong size = bufp->used;2898 mg_u_long size = bufp->used; 2899 2899 unsigned char *p = pattern; 2900 2900 register unsigned char *pend = pattern + size; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/regex.h
r16583 r23508 292 292 293 293 /* Number of bytes to which `buffer' points. */ 294 unsignedlong allocated;294 mg_u_long allocated; 295 295 296 296 /* Number of bytes actually used in `buffer'. */ 297 unsignedlong used;297 mg_u_long used; 298 298 299 299 /* Syntax setting with which the pattern was compiled. */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/rx.c
r16583 r23508 615 615 616 616 #ifdef __STDC__ 617 RX_DECL unsignedlong617 RX_DECL mg_u_long 618 618 rx_bitset_hash (int size, rx_Bitset b) 619 619 #else 620 RX_DECL unsignedlong620 RX_DECL mg_u_long 621 621 rx_bitset_hash (size, b) 622 622 int size; … … 625 625 { 626 626 int x; 627 u nsigned long hash = (unsigned long)rx_bitset_hash;627 uintptr_t hash = (uintptr_t)rx_bitset_hash; 628 628 629 629 for (x = rx_bitset_numb_subsets(size) - 1; x >= 0; --x) … … 701 701 702 702 703 static unsignedlong rx_hash_masks[4] =703 static mg_u_long rx_hash_masks[4] = 704 704 { 705 705 0x12488421, … … 714 714 RX_DECL struct rx_hash_item * 715 715 rx_hash_find (struct rx_hash * table, 716 unsignedlong hash,716 mg_u_long hash, 717 717 void * value, 718 718 struct rx_hash_rules * rules) … … 721 721 rx_hash_find (table, hash, value, rules) 722 722 struct rx_hash * table; 723 unsignedlong hash;723 mg_u_long hash; 724 724 void * value; 725 725 struct rx_hash_rules * rules; … … 728 728 rx_hash_eq eq = rules->eq; 729 729 int maskc = 0; 730 long mask = rx_hash_masks [0];730 mg_s_long mask = rx_hash_masks [0]; 731 731 int bucket = (hash & mask) % 13; 732 732 … … 755 755 RX_DECL struct rx_hash_item * 756 756 rx_hash_store (struct rx_hash * table, 757 unsignedlong hash,757 mg_u_long hash, 758 758 void * value, 759 759 struct rx_hash_rules * rules) … … 762 762 rx_hash_store (table, hash, value, rules) 763 763 struct rx_hash * table; 764 unsignedlong hash;764 mg_u_long hash; 765 765 void * value; 766 766 struct rx_hash_rules * rules; … … 769 769 rx_hash_eq eq = rules->eq; 770 770 int maskc = 0; 771 long mask = rx_hash_masks[0];771 mg_s_long mask = rx_hash_masks[0]; 772 772 int bucket = (hash & mask) % 13; 773 773 int depth = 0; … … 803 803 { 804 804 struct rx_hash_item * them = table->buckets[bucket]; 805 unsignedlong newmask = rx_hash_masks[maskc + 1];805 mg_u_long newmask = rx_hash_masks[maskc + 1]; 806 806 while (them) 807 807 { … … 855 855 { 856 856 struct rx_hash * table = it->table; 857 unsignedlong hash = it->hash;857 mg_u_long hash = it->hash; 858 858 int depth = (table->parent 859 859 ? (table->parent->parent … … 1775 1775 : (!vb 1776 1776 ? 1 1777 : (( long)a->car < (long)b->car1777 : ((intptr_t)a->car < (intptr_t)b->car 1778 1778 ? 1 1779 : (( long)a->car > (long)b->car1779 : ((intptr_t)a->car > (intptr_t)b->car 1780 1780 ? -1 1781 1781 : se_list_cmp ((void *)a->cdr, (void *)b->cdr)))))); … … 1842 1842 #endif 1843 1843 { 1844 long hash = (long)car ^ (long)cdr;1844 intptr_t hash = (intptr_t)car ^ (intptr_t)cdr; 1845 1845 struct rx_se_list template; 1846 1846 … … 1955 1955 template.cdr = set; 1956 1956 node = rx_hash_store (memo, 1957 ((( long)state) >> 8) ^ (long)set,1957 (((intptr_t)state) >> 8) ^ (intptr_t)set, 1958 1958 &template, &nfa_set_hash_rules); 1959 1959 if (!node) … … 2264 2264 RX_DECL int 2265 2265 rx_compactify_nfa (struct rx *rx, 2266 void **mem, unsignedlong *size)2266 void **mem, mg_u_long *size) 2267 2267 #else 2268 2268 RX_DECL int … … 2270 2270 struct rx *rx; 2271 2271 void **mem; 2272 unsignedlong *size;2272 mg_u_long *size; 2273 2273 #endif 2274 2274 { … … 2279 2279 int se_list_consc = count_hash_nodes (&rx->se_list_memo); 2280 2280 int nfa_setc = count_hash_nodes (&rx->set_list_memo); 2281 unsignedlong total_size;2281 mg_u_long total_size; 2282 2282 2283 2283 /* This takes place in two stages. First, the total size of the … … 2407 2407 { 2408 2408 sp = rx_hash_find (&rx->se_list_memo, 2409 ( long)sesrc->car ^ (long)sesrc->cdr,2409 (intptr_t)sesrc->car ^ (intptr_t)sesrc->cdr, 2410 2410 sesrc, &se_list_hash_rules); 2411 2411 if (sp->binding) … … 2425 2425 { 2426 2426 sp = rx_hash_find (&rx->set_list_memo, 2427 (((( long)destlst->car) >> 8)2428 ^ ( long)destlst->cdr),2427 ((((intptr_t)destlst->car) >> 8) 2428 ^ (intptr_t)destlst->cdr), 2429 2429 destlst, &nfa_set_hash_rules); 2430 2430 if (sp->binding) … … 2798 2798 (rx_hash_find 2799 2799 (&cache->superset_table, 2800 ( unsigned long)set->car ^ set->id ^ (unsigned long)set->cdr,2800 (intptr_t)set->car ^ set->id ^ (intptr_t)set->cdr, 2801 2801 (void *)set, 2802 2802 &cache->superset_hash_rules), … … 3056 3056 = ((struct rx_cache *) 3057 3057 ((char *)rules 3058 - ( unsigned long)(&((struct rx_cache *)0)->superset_hash_rules)));3058 - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules))); 3059 3059 struct rx_superset * template = (struct rx_superset *)val; 3060 3060 struct rx_superset * newset … … 3088 3088 = ((struct rx_cache *) 3089 3089 ((char *)rules 3090 - ( unsigned long)(&((struct rx_cache *)0)->superset_hash_rules)));3090 - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules))); 3091 3091 return ((struct rx_hash *) 3092 3092 rx_cache_malloc_or_get (cache, … … 3107 3107 struct rx_cache * cache 3108 3108 = ((struct rx_cache *) 3109 (char *)rules - ( long)(&((struct rx_cache *)0)->superset_hash_rules));3109 (char *)rules - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules)); 3110 3110 rx_cache_free (cache, &cache->free_hash, (char *)hash); 3111 3111 } … … 3264 3264 template.id = car->id; 3265 3265 hit = rx_hash_store (&cache->superset_table, 3266 ( unsigned long)car ^ car->id ^ (unsigned long)cdr,3266 (intptr_t)car ^ car->id ^ (intptr_t)cdr, 3267 3267 (void *)&template, 3268 3268 &cache->superset_hash_rules); … … 4332 4332 return; 4333 4333 case r_side_effect: 4334 if ( (( long)rexp->params.side_effect >= 0)4335 && (params [( long)rexp->params.side_effect].se == re_se_backref))4336 out[ params [( long)rexp->params.side_effect].op1] = 1;4334 if ( ((intptr_t)rexp->params.side_effect >= 0) 4335 && (params [(intptr_t)rexp->params.side_effect].se == re_se_backref)) 4336 out[ params [(intptr_t)rexp->params.side_effect].op1] = 1; 4337 4337 return; 4338 4338 } … … 4516 4516 case r_side_effect: 4517 4517 { 4518 int se = ( long)rexp->params.side_effect;4518 int se = (intptr_t)rexp->params.side_effect; 4519 4519 if ( (se >= 0) 4520 4520 && ( ((enum re_side_effects)params[se].se == re_se_lparen) … … 4563 4563 return pointless_if_repeated (node->params.pair.left, params); 4564 4564 case r_side_effect: 4565 switch ((enum re_side_effects) ((( long)node->params.side_effect < 0)4566 ? (enum re_side_effects) ( long) node->params.side_effect4567 : (enum re_side_effects)params[( long)node->params.side_effect].se))4565 switch ((enum re_side_effects) (((intptr_t)node->params.side_effect < 0) 4566 ? (enum re_side_effects) (intptr_t) node->params.side_effect 4567 : (enum re_side_effects)params[(intptr_t)node->params.side_effect].se)) 4568 4568 { 4569 4569 case re_se_try: … … 4588 4588 case re_se_backref: 4589 4589 return 0; 4590 case re_se_pushback: 4591 case re_se_push0: 4592 case re_se_pushpos: 4593 case re_se_chkpos: 4594 case re_se_poppos: 4595 case re_se_tv: 4596 case re_floogle_flap: 4597 return -1; 4590 4598 } 4591 4599 case r_data: … … 4637 4645 case r_side_effect: 4638 4646 { 4639 int se = ( long)rexp->params.side_effect;4647 int se = (intptr_t)rexp->params.side_effect; 4640 4648 if ( in_danger 4641 4649 && (se >= 0) … … 4757 4765 case r_side_effect: 4758 4766 return 4759 !(( long)rexp->params.side_effect > 04760 ? idempotent_complex_se [ params [( long)rexp->params.side_effect].se ]4761 : idempotent_se [-( long)rexp->params.side_effect]);4767 !((intptr_t)rexp->params.side_effect > 0 4768 ? idempotent_complex_se [ params [(intptr_t)rexp->params.side_effect].se ] 4769 : idempotent_se [-(intptr_t)rexp->params.side_effect]); 4762 4770 4763 4771 case r_alternate: … … 4811 4819 4812 4820 case r_side_effect: 4813 return (( long)rexp->params.side_effect >= 0);4821 return ((intptr_t)rexp->params.side_effect >= 0); 4814 4822 4815 4823 case r_alternate: … … 5204 5212 if (need_sync) 5205 5213 { 5206 int sync_se = paramc;5214 intptr_t sync_se = paramc; 5207 5215 params = (params 5208 5216 ? ((struct re_se_params *) … … 5552 5560 handle_close: 5553 5561 /* See similar code for backslashed left paren above. */ 5554 if (COMPILE_STACK_EMPTY) 5555 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) 5562 if (COMPILE_STACK_EMPTY){ 5563 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD){ 5556 5564 goto normal_char; 5557 else 5565 } 5566 else{ 5558 5567 return REG_ERPAREN; 5568 } 5569 } 5559 5570 5560 5571 /* Since we just checked for an empty stack above, this … … 5573 5584 this_group_regnum = COMPILE_STACK_TOP.regnum; 5574 5585 { 5575 int left_se = paramc;5576 int right_se = paramc + 1;5586 intptr_t left_se = paramc; 5587 intptr_t right_se = paramc + 1; 5577 5588 5578 5589 params = (params … … 5625 5636 last_expression = &alt->params.pair.right; 5626 5637 { 5627 int sync_se = paramc;5638 intptr_t sync_se = paramc; 5628 5639 5629 5640 params = (params … … 5742 5753 /* Otherwise, we have a nontrivial interval. */ 5743 5754 { 5744 int iter_se = paramc;5745 int end_se = paramc + 1;5755 intptr_t iter_se = paramc; 5756 intptr_t end_se = paramc + 1; 5746 5757 params = (params 5747 5758 ? ((struct re_se_params *) … … 5939 5950 5940 5951 { 5941 int backref_se = paramc;5952 intptr_t backref_se = paramc; 5942 5953 params = (params 5943 5954 ? ((struct re_se_params *) … … 6009 6020 6010 6021 { 6011 int win_se = paramc;6022 intptr_t win_se = paramc; 6012 6023 params = (params 6013 6024 ? ((struct re_se_params *) … … 6149 6160 { 6150 6161 void * mem = (void *)rxb->buffer; 6151 unsignedlong size = rxb->allocated;6162 mg_u_long size = rxb->allocated; 6152 6163 int start_id; 6153 6164 char * perm_mem; … … 6757 6768 while (list) 6758 6769 { 6759 if (( long)list->car >= 0)6770 if ((intptr_t)list->car >= 0) 6760 6771 ++x; 6761 6772 list = list->cdr; … … 6812 6823 for (ai = al - 1; ai >= 0; --ai) 6813 6824 { 6814 while (( long)ap->car < 0)6825 while ((intptr_t)ap->car < 0) 6815 6826 ap = ap->cdr; 6816 6827 av[ai] = ap->car; … … 6820 6831 for (bi = bl - 1; bi >= 0; --bi) 6821 6832 { 6822 while (( long)bp->car < 0)6833 while ((intptr_t)bp->car < 0) 6823 6834 bp = bp->cdr; 6824 6835 bv[bi] = bp->car; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/rx.h
r16583 r23508 22 22 /* t. lord Wed Sep 23 18:20:57 1992 */ 23 23 24 25 26 27 28 29 30 24 #include "mglong.h" 31 25 32 26 #ifndef RX_WANT_SE_DEFS … … 91 85 struct rx_hash_item * next_same_hash; 92 86 struct rx_hash * table; 93 unsignedlong hash;87 mg_u_long hash; 94 88 void * data; 95 89 void * binding; … … 273 267 */ 274 268 void * buffer; 275 unsignedlong allocated;269 mg_u_long allocated; 276 270 277 271 /* Clients of RX can ask for some extra storage in the space pointed … … 280 274 * at (buffer + allocated - reserved) 281 275 */ 282 unsignedlong reserved;276 mg_u_long reserved; 283 277 284 278 /* --------- The remaining fields are for internal use only. --------- */ … … 1274 1268 1275 1269 void * buffer; /* Malloced memory for the nfa. */ 1276 unsignedlong allocated; /* Size of that memory. */1270 mg_u_long allocated; /* Size of that memory. */ 1277 1271 1278 1272 /* Pointer to a fastmap, if any, otherwise zero. re_search uses … … 1580 1574 rx_Bitset a, rx_Bitset b); 1581 1575 RX_DECL void rx_bitset_xor (int size, rx_Bitset a, rx_Bitset b); 1582 RX_DECL unsignedlong rx_bitset_hash (int size, rx_Bitset b);1576 RX_DECL mg_u_long rx_bitset_hash (int size, rx_Bitset b); 1583 1577 RX_DECL struct rx_hash_item * rx_hash_find (struct rx_hash * table, 1584 unsignedlong hash,1578 mg_u_long hash, 1585 1579 void * value, 1586 1580 struct rx_hash_rules * rules); 1587 1581 RX_DECL struct rx_hash_item * rx_hash_store (struct rx_hash * table, 1588 unsignedlong hash,1582 mg_u_long hash, 1589 1583 void * value, 1590 1584 struct rx_hash_rules * rules); … … 1637 1631 RX_DECL void rx_delete_epsilon_transitions (struct rx *rx); 1638 1632 RX_DECL int rx_compactify_nfa (struct rx *rx, 1639 void **mem, unsignedlong *size);1633 void **mem, mg_u_long *size); 1640 1634 RX_DECL void rx_release_superset (struct rx *rx, 1641 1635 struct rx_superset *set); … … 1665 1659 RX_DECL void rx_bitset_revdifference (); 1666 1660 RX_DECL void rx_bitset_xor (); 1667 RX_DECL unsignedlong rx_bitset_hash ();1661 RX_DECL mg_u_long rx_bitset_hash (); 1668 1662 RX_DECL struct rx_hash_item * rx_hash_find (); 1669 1663 RX_DECL struct rx_hash_item * rx_hash_store (); … … 2230 2224 2231 2225 2232 2233 2226 /* How many characters in the character set. */ 2234 2227 #define CHAR_SET_SIZE (1 << CHARBITS) … … 2344 2337 RX_DECL __inline__ int 2345 2338 rx_search (struct re_pattern_buffer * rxb, 2346 int startpos,2339 intptr_t startpos, 2347 2340 int range, 2348 2341 int stop, … … 2361 2354 app_closure, regs, resume_state, save_state) 2362 2355 struct re_pattern_buffer * rxb; 2363 int startpos;2356 intptr_t startpos; 2364 2357 int range; 2365 2358 int stop; … … 2739 2732 { 2740 2733 enum rx_test_match_entry test_pc; 2741 int inx;2734 intptr_t inx; 2742 2735 test_pc = search_state.test_match_resume_pt; 2743 2736 if (test_pc == rx_test_start) … … 2839 2832 ((struct rx_superstate *) 2840 2833 ((char *)this_tr_table 2841 - (( unsignedlong)2834 - ((mg_u_long) 2842 2835 ((struct rx_superstate *)0)->transitions))); 2843 2836 … … 2904 2897 ((struct rx_superstate *) 2905 2898 ((char *)this_tr_table 2906 - ((u nsigned long)2899 - ((uintptr_t) 2907 2900 ((struct rx_superstate *)0)->transitions))); 2908 2901 } … … 2911 2904 * Dispatch that instruction: 2912 2905 */ 2913 inx = (int )search_state.ifr->inx;2906 inx = (intptr_t)search_state.ifr->inx; 2914 2907 #ifdef RX_DEBUG_0 2915 2908 if (rx_debug_trace) … … 2949 2942 while (el) 2950 2943 { 2951 longeffect;2952 effect = ( long)el->car;2944 intptr_t effect; 2945 effect = (intptr_t)el->car; 2953 2946 if (effect < 0) 2954 2947 { … … 2990 2983 = ((struct rx_superstate *) 2991 2984 ((char *)search_state.ifr->data 2992 - ( long)(((struct rx_superstate *)0)2985 - (intptr_t)(((struct rx_superstate *)0) 2993 2986 ->transitions))); 2994 2987 goto top_of_cycle; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/sptree.c
r16583 r23508 293 293 q->par = p; \ 294 294 q->rght = p->left; \ 295 if(q->rght) \ 296 q->rght->par = q; \ 295 if(q->rght){ \ 296 q->rght->par = q; \ 297 } \ 297 298 p->left = q; \ 298 if(p->par) \ 299 if(q == p->par->left) \ 300 p->par->left = p; \ 301 else \ 302 p->par->rght = p; \ 299 if(p->par){ \ 300 if(q == p->par->left){ \ 301 p->par->left = p; \ 302 } \ 303 else{ \ 304 p->par->rght = p; \ 305 } \ 306 } \ 303 307 }while(0) 304 308 … … 308 312 q->par = p; \ 309 313 q->left = p->rght; \ 310 if(q->left) \ 311 q->left->par = q; \ 314 if(q->left){ \ 315 q->left->par = q; \ 316 } \ 312 317 p->rght = q; \ 313 if(p->par) \ 314 if(q == p->par->left) \ 315 p->par->left = p; \ 316 else \ 317 p->par->rght = p; \ 318 if(p->par){ \ 319 if(q == p->par->left){ \ 320 p->par->left = p; \ 321 } \ 322 else{ \ 323 p->par->rght = p; \ 324 } \ 325 } \ 318 326 }while(0) 319 327 … … 341 349 if (p == q->left) 342 350 { 343 if (g == NNULL) 351 if (g == NNULL){ 344 352 ROTATER (p, q); 353 } 345 354 else if (q == g->left) 346 355 { … … 356 365 else 357 366 { 358 if (g == NNULL) 367 if (g == NNULL){ 359 368 ROTATEL (p, q); 369 } 360 370 else if (q == g->rght) 361 371 { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/sptree.h
r16583 r23508 29 29 { 30 30 int no_of_items; 31 unsignedlong mem_in_use;31 mg_u_long mem_in_use; 32 32 int (*cmp) (void *, void *); 33 33 void *root; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/unitool.c
r23431 r23508 15 15 * column 16 16 */ 17 unsignedlong *unicode_cat_data=NULL;17 mg_u_long *unicode_cat_data=NULL; 18 18 19 19 … … 1464 1464 * column 1465 1465 */ 1466 unsignedlong *unicode_cat_data;1466 mg_u_long *unicode_cat_data; 1467 1467 1468 1468 void create_unicat_data () { … … 1470 1470 int min_start=0; 1471 1471 int min_end=0; 1472 register unsignedlong min_value=0; /* filling the whole byte */1472 register mg_u_long min_value=0; /* filling the whole byte */ 1473 1473 1474 1474 const unirange *letter_here = letter_info; … … 1529 1529 1530 1530 } else { 1531 register unsignedlong mask = 3 << ((i % 16) * 2);1531 register mg_u_long mask = 3 << ((i % 16) * 2); 1532 1532 unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) | 1533 1533 (min_value & mask); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/win32in.c
r16583 r23508 4 4 /* unix systems. */ 5 5 6 unsigned long htonl(unsignedlong x) {6 mg_u_long htonl(mg_u_long x) { 7 7 #if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 8 8 x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | … … 25 25 } 26 26 27 unsigned long ntohl(unsignedlong x) {27 mg_u_long ntohl(mg_u_long x) { 28 28 #if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 29 29 x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | … … 51 51 52 52 main () { 53 long x;53 mg_s_long x; 54 54 short sx; 55 55 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/win32in.h
r16583 r23508 4 4 #include "longlong.h" 5 5 6 unsigned long htonl(unsignedlong x);7 unsigned long ntohl(unsignedlong x);6 mg_u_long htonl(mg_u_long x); 7 mg_u_long ntohl(mg_u_long x); 8 8 mg_ullong ntohll(mg_ullong x); 9 9 unsigned short htons(unsigned short x); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/Makefile.in
r16583 r23508 36 36 37 37 CC = @CC@ 38 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@38 CFLAGS = @CFLAGS@ 39 39 CPPFLAGS = @CPPFLAGS@ 40 40 DEFS = @DEFS@ … … 42 42 INSTALL_DATA = @INSTALL_DATA@ 43 43 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 44 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@44 LDFLAGS = @LDFLAGS@ 45 45 LIBS = ../../lib/libmglib.a @LIBS@ 46 46 TOUCH = echo timestamp > -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/Makefile.in
r22070 r23508 38 38 AR = ar 39 39 CC = @CC@ 40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-fpic40 CFLAGS = @CFLAGS@ -fpic 41 41 DEFS = @DEFS@ 42 42 RANLIB = @RANLIB@ … … 44 44 INSTALL_DATA = @INSTALL_DATA@ 45 45 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 46 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@46 LDFLAGS = @LDFLAGS@ 47 47 LIBS = ../../lib/libmglib.a @LIBS@ 48 48 TOUCH = echo timestamp > … … 53 53 # Uncomment for compiling for the nzdl project 54 54 # 55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM55 CFLAGS = @CFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM 56 56 ########################################## 57 57 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/backend.c
r16583 r23508 47 47 48 48 static File * 49 OpenFile (char *base, char *suffix, unsignedlong magic, int *ok)49 OpenFile (char *base, char *suffix, mg_u_long magic, int *ok) 50 50 { 51 51 char FileName[512]; … … 62 62 if (magic) 63 63 { 64 unsignedlong m;64 mg_u_long m; 65 65 if (fread ((char *) &m, sizeof (m), 1, F->f) == 0) 66 66 { … … 475 475 if (qd->id->ifh.InvfLevel == 3) 476 476 { 477 unsignedlong magic;477 mg_u_long magic; 478 478 FILE *paragraph; 479 479 int i; … … 507 507 { 508 508 extern char *trec_ids; 509 extern long *trec_paras;509 extern mg_s_long *trec_paras; 510 510 int size; 511 511 char FileName[512]; … … 533 533 { 534 534 int i, d; 535 unsignedlong magic;536 trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof ( long));535 mg_u_long magic; 536 trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (mg_s_long)); 537 537 if (!trec_paras) 538 538 { … … 598 598 */ 599 599 void 600 ChangeMemInUse (query_data * qd, long delta)600 ChangeMemInUse (query_data * qd, mg_s_long delta) 601 601 { 602 602 qd->mem_in_use += delta; … … 775 775 } 776 776 777 long777 mg_s_long 778 778 GetDocCompLength (query_data * qd) 779 779 { … … 785 785 786 786 u_char * 787 GetDocText (query_data * qd, unsignedlong *len)787 GetDocText (query_data * qd, mg_u_long *len) 788 788 { 789 789 DocEntry *DE; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/backend.h
r16583 r23508 40 40 { 41 41 File *InvfFile; 42 unsignedlong N;43 unsignedlong Nstatic; /* N parameter for decoding inverted file entries */42 mg_u_long N; 43 mg_u_long Nstatic; /* N parameter for decoding inverted file entries */ 44 44 struct invf_file_header ifh; 45 45 } … … 51 51 File *TextIdxFile; 52 52 File *TextIdxWgtFile; 53 long current_pos;53 mg_s_long current_pos; 54 54 struct 55 55 { 56 unsignedlong Start;56 mg_u_long Start; 57 57 float Weight; 58 58 } … … 78 78 compression_dict_header cdh; 79 79 comp_frags_header *cfh[2]; 80 unsignedlong MemForCompDict;80 mg_u_long MemForCompDict; 81 81 u_char ***values[2]; 82 82 u_char *escape[2]; 83 83 huff_data *chars_huff[2]; 84 u_long **chars_vals[2];84 mg_u_long **chars_vals[2]; 85 85 huff_data *lens_huff[2]; 86 u_long **lens_vals[2];86 mg_u_long **lens_vals[2]; 87 87 auxiliary_dict *ad; 88 88 int fast_loaded; … … 96 96 struct stem_idx_header sih; 97 97 u_char **index; 98 unsignedlong *pos;98 mg_u_long *pos; 99 99 int active; 100 100 u_char *buffer; 101 unsignedlong MemForStemIdx;101 mg_u_long MemForStemIdx; 102 102 } 103 103 stemmed_idx; … … 109 109 struct stem_dict_header sdh; 110 110 u_char **index; 111 unsignedlong *pos;111 mg_u_long *pos; 112 112 int active; 113 113 u_char *buffer; 114 unsignedlong MemForStemDict;114 mg_u_long MemForStemDict; 115 115 116 116 /* [RPAP - Jan 97: Stem Index Change] */ … … 126 126 double L; 127 127 double B; 128 unsignedlong *DocWeights;128 mg_u_long *DocWeights; 129 129 char bits; 130 130 float *table; 131 unsignedlong mask;132 unsignedlong MemForWeights;133 unsignedlong num_of_docs;131 mg_u_long mask; 132 mg_u_long MemForWeights; 133 mg_u_long num_of_docs; 134 134 } 135 135 approx_weights_data; … … 140 140 int QueryFreqs; 141 141 int Exact; /* use exact weights for ranking or not */ 142 long MaxDocsToRetrieve; /* may be -1 for all */143 long MaxParasToRetrieve;142 mg_s_long MaxDocsToRetrieve; /* may be -1 for all */ 143 mg_s_long MaxParasToRetrieve; 144 144 int Sort; 145 145 char AccumMethod; /* 'A' = array, 'S' = splay tree, 'H' = hash_table */ 146 long MaxAccums; /* may be -1 for all */147 long MaxTerms; /* may be -1 for all */146 mg_s_long MaxAccums; /* may be -1 for all */ 147 mg_s_long MaxTerms; /* may be -1 for all */ 148 148 int StopAtMaxAccum; /* Stop at maximum accumulator or not */ 149 long HashTblSize;149 mg_s_long HashTblSize; 150 150 char *skip_dump; 151 151 } … … 156 156 typedef struct BooleanQueryInfo 157 157 { 158 long MaxDocsToRetrieve;158 mg_s_long MaxDocsToRetrieve; 159 159 } 160 160 BooleanQueryInfo; … … 191 191 File *File_invf; 192 192 File *File_weight_approx; 193 unsignedlong mem_in_use, max_mem_in_use;194 unsignedlong num_of_ptrs, tot_num_of_ptrs;195 unsignedlong num_of_terms, tot_num_of_terms;196 unsignedlong num_of_accum, tot_num_of_accum;197 unsignedlong num_of_ans, tot_num_of_ans;198 unsignedlong hops_taken, tot_hops_taken;199 unsignedlong text_idx_lookups, tot_text_idx_lookups;200 unsignedlong max_buffers;193 mg_u_long mem_in_use, max_mem_in_use; 194 mg_u_long num_of_ptrs, tot_num_of_ptrs; 195 mg_u_long num_of_terms, tot_num_of_terms; 196 mg_u_long num_of_accum, tot_num_of_accum; 197 mg_u_long num_of_ans, tot_num_of_ans; 198 mg_u_long hops_taken, tot_hops_taken; 199 mg_u_long text_idx_lookups, tot_text_idx_lookups; 200 mg_u_long max_buffers; 201 201 unsigned doc_pos; 202 202 unsigned buf_in_use; … … 226 226 query_data *InitQuerySystem (char *dir, char *name, char *textname, InitQueryTimes * iqt); 227 227 228 void ChangeMemInUse (query_data * qd, long delta);228 void ChangeMemInUse (query_data * qd, mg_s_long delta); 229 229 230 230 void FinishQuerySystem (query_data * qd); … … 251 251 float GetDocWeight (query_data * qd); 252 252 253 long GetDocCompLength (query_data * qd);254 255 u_char *GetDocText (query_data * qd, unsignedlong *len);253 mg_s_long GetDocCompLength (query_data * qd); 254 255 u_char *GetDocText (query_data * qd, mg_u_long *len); 256 256 257 257 DocEntry *GetDocChain (query_data * qd); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_parser.c
r16583 r23508 44 44 static QueryTermList **query_term_list; 45 45 static int word_num; 46 static u_long count;47 static u_long doc_count;48 static u_long invf_ptr;49 static u_long invf_len;46 static mg_u_long count; 47 static mg_u_long doc_count; 48 static mg_u_long invf_ptr; 49 static mg_u_long invf_len; 50 50 51 51 #line 66 "bool_parser.y" -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_parser.y
r16583 r23508 57 57 static QueryTermList **query_term_list; 58 58 static int word_num; 59 static u_long count;60 static u_long doc_count;61 static u_long invf_ptr;62 static u_long invf_len;59 static mg_u_long count; 60 static mg_u_long doc_count; 61 static mg_u_long invf_ptr; 62 static mg_u_long invf_len; 63 63 %} 64 64 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_tester.c
r16583 r23508 151 151 prompt (str); 152 152 te->WE.doc_count = atoi (line); 153 printf ("doc_count = % ld\n", te->WE.doc_count);153 printf ("doc_count = %d\n", te->WE.doc_count); 154 154 } /*for */ 155 155 } /*if */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_tree.c
r16583 r23508 56 56 bool_tree_node * 57 57 CreateBoolTermNode (TermList ** tl, char *text, int Count, int word_num, 58 u_long count, u_long doc_count, u_long invf_ptr,u_long invf_len, /* [RPAP - Feb 97: Term Frequency] */58 mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, mg_u_long invf_len, /* [RPAP - Feb 97: Term Frequency] */ 59 59 int stemmer_num) 60 60 { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_tree.h
r16583 r23508 102 102 bool_tree_node *CopyBoolTree (bool_tree_node * tree); 103 103 bool_tree_node *CreateBoolTermNode (TermList ** tl, char *text, int Count, int word_num, 104 u_long count, u_long doc_count,u_long invf_ptr,105 u_long invf_len, int stemmer_num);104 mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, 105 mg_u_long invf_len, int stemmer_num); 106 106 bool_tree_node *CreateBoolTreeNode (N_Tag tag, 107 107 bool_tree_node * left, bool_tree_node * right); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/build.h
r16583 r23508 111 111 112 112 113 extern unsignedlong buf_size;113 extern mg_u_long buf_size; 114 114 /* 115 115 * The size of the document input buffer. 116 116 */ 117 117 118 extern unsignedlong ChunkLimit;118 extern mg_u_long ChunkLimit; 119 119 /* 120 120 * The maximum number of chunks that can be written to disk. 121 121 */ 122 122 123 extern unsignedlong invf_buffer_size;123 extern mg_u_long invf_buffer_size; 124 124 /* 125 125 * The amount of memory to allocate to the invertion buffer. -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/comp_dict.c
r16583 r23508 66 66 huff_data char_huff[2]; 67 67 huff_data lens_huff[2]; 68 u_long *char_codes[2], *lens_codes[2];69 u_long Words_disk = 0;70 u_long Chars_disk = 0;68 mg_u_long *char_codes[2], *lens_codes[2]; 69 mg_u_long Words_disk = 0; 70 mg_u_long Chars_disk = 0; 71 71 72 72 … … 79 79 dict_hash_table *ht; 80 80 u_char **words; 81 u_long ht_size;81 mg_u_long ht_size; 82 82 83 83 ht_size = prime (cfh->hd.num_codes * HASH_RATIO); … … 133 133 register u_char **wptr; 134 134 register int tsize = ht->size; 135 register unsignedlong hashval, step;135 register mg_u_long hashval, step; 136 136 137 137 HASH (hashval, step, allwords, tsize); … … 163 163 return COMPERROR; 164 164 165 Words_disk = sizeof ( u_long);165 Words_disk = sizeof (mg_u_long); 166 166 167 167 if (Read_cdh (dict, &cdh, NULL, &Words_disk) == -1) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/comp_dict.h
r16583 r23508 32 32 typedef struct dict_hash_table 33 33 { 34 u_long size;34 mg_u_long size; 35 35 huff_data *hd; 36 u_long *codes;36 mg_u_long *codes; 37 37 u_char **words; 38 38 u_char **table[1]; … … 51 51 extern huff_data char_huff[2]; 52 52 extern huff_data lens_huff[2]; 53 extern u_long *char_codes[2], *lens_codes[2];54 extern u_long Words_disk;55 extern u_long Chars_disk;53 extern mg_u_long *char_codes[2], *lens_codes[2]; 54 extern mg_u_long Words_disk; 55 extern mg_u_long Chars_disk; 56 56 57 57 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/environment.c
r16583 r23508 347 347 * or default on a error 348 348 */ 349 long350 IntEnv (char *data, long def)351 { 352 long val;349 mg_s_long 350 IntEnv (char *data, mg_s_long def) 351 { 352 mg_s_long val; 353 353 char *ptr; 354 354 if (!data) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/environment.h
r16583 r23508 54 54 char *GetEnvName (int i); 55 55 int BooleanEnv (char *data, int def); 56 long IntEnv (char *data,long def);56 mg_s_long IntEnv (char *data, mg_s_long def); 57 57 58 58 void InitEnv (void); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/hash.h
r16583 r23508 31 31 do { \ 32 32 register u_char *p=wd; \ 33 register long len = *p++; \34 register unsignedlong hval; \33 register mg_s_long len = *p++; \ 34 register mg_u_long hval; \ 35 35 if (len>25) len = 25; \ 36 36 for (hval=0; len; --len) \ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/invf.h
r16583 r23508 30 30 struct invf_dict_header 31 31 { 32 unsignedlong lookback;33 unsignedlong dict_size;34 unsignedlong total_bytes;35 unsignedlong index_string_bytes;32 mg_u_long lookback; 33 mg_u_long dict_size; 34 mg_u_long total_bytes; 35 mg_u_long index_string_bytes; 36 36 double input_bytes; /* [RJM 07/97: 4G limit] */ 37 unsignedlong num_of_docs;38 unsignedlong static_num_of_docs;39 unsignedlong num_of_words;40 unsignedlong stemmer_num;41 unsignedlong stem_method;37 mg_u_long num_of_docs; 38 mg_u_long static_num_of_docs; 39 mg_u_long num_of_words; 40 mg_u_long stemmer_num; 41 mg_u_long stem_method; 42 42 }; 43 43 44 44 struct stem_dict_header 45 45 { 46 unsignedlong lookback;47 unsignedlong block_size;48 unsignedlong num_blocks;49 unsignedlong blocks_start;50 unsignedlong index_chars;51 unsignedlong num_of_docs;52 unsignedlong static_num_of_docs;53 unsignedlong num_of_words;54 unsignedlong stemmer_num;55 unsignedlong stem_method;56 unsignedlong indexed; /* [RPAP - Jan 97: Stem Index Change] */46 mg_u_long lookback; 47 mg_u_long block_size; 48 mg_u_long num_blocks; 49 mg_u_long blocks_start; 50 mg_u_long index_chars; 51 mg_u_long num_of_docs; 52 mg_u_long static_num_of_docs; 53 mg_u_long num_of_words; 54 mg_u_long stemmer_num; 55 mg_u_long stem_method; 56 mg_u_long indexed; /* [RPAP - Jan 97: Stem Index Change] */ 57 57 }; 58 58 59 59 struct invf_file_header 60 60 { 61 unsignedlong no_of_words;62 unsignedlong no_of_ptrs;63 unsignedlong skip_mode;64 unsignedlong params[16];65 unsignedlong InvfLevel;61 mg_u_long no_of_words; 62 mg_u_long no_of_ptrs; 63 mg_u_long skip_mode; 64 mg_u_long params[16]; 65 mg_u_long InvfLevel; 66 66 }; 67 67 … … 69 69 struct stem_idx_header 70 70 { 71 unsignedlong lookback;72 unsignedlong block_size;73 unsignedlong num_blocks;74 unsignedlong blocks_start;75 unsignedlong index_chars;76 unsignedlong num_of_words;71 mg_u_long lookback; 72 mg_u_long block_size; 73 mg_u_long num_blocks; 74 mg_u_long blocks_start; 75 mg_u_long index_chars; 76 mg_u_long num_of_words; 77 77 }; 78 78 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/invf_get.c
r16583 r23508 166 166 167 167 static void 168 HT_Sup_Add (Hash_Table * HT, unsignedlong DN, float Sum)168 HT_Sup_Add (Hash_Table * HT, mg_u_long DN, float Sum) 169 169 { 170 170 Invf_Doc_EntryH *IDEH; … … 176 176 177 177 Invf_Doc_Entry * 178 HT_find (Hash_Table * HT, unsignedlong DN)178 HT_find (Hash_Table * HT, mg_u_long DN) 179 179 { 180 180 Invf_Doc_EntryH *IDEH; … … 194 194 static int 195 195 HT_insert (Hash_Table * HT, 196 unsignedlong DN, float Sum)196 mg_u_long DN, float Sum) 197 197 { 198 198 Invf_Doc_EntryH **IDEH; … … 316 316 317 317 Invf_Doc_Entry * 318 LT_find (List_Table * LT, unsignedlong DN)318 LT_find (List_Table * LT, mg_u_long DN) 319 319 { 320 320 int l = 0; … … 337 337 static List_Table * 338 338 LT_add (query_data * qd, List_Table * LT, 339 unsignedlong DN, float Sum)339 mg_u_long DN, float Sum) 340 340 { 341 341 Invf_Doc_Entry *ide; … … 472 472 case 1: 473 473 { 474 unsignedlong len;474 mg_u_long len; 475 475 if (*p <= qd->id->ifh.params[0]) 476 476 *k = 0; … … 488 488 case 2: 489 489 { 490 unsignedlong len;490 mg_u_long len; 491 491 if (*p <= qd->id->ifh.params[1]) 492 492 *k = 0; … … 533 533 DocEntry *src = NULL, *dest = NULL; 534 534 int i; /* index counter into inverted list */ 535 unsignedlong pos;535 mg_u_long pos; 536 536 int next_start, next_doc_num, next_i; 537 537 int block_counter; /* within counter in block */ … … 540 540 int blk; /* bblock control parameter */ 541 541 int ft; /* The number of documents the word occurs in */ 542 unsignedlong CurrDoc = 0; /* NOTE: Document numbers start at 1 */542 mg_u_long CurrDoc = 0; /* NOTE: Document numbers start at 1 */ 543 543 float Weight; 544 544 … … 582 582 while (i < ft && ((op == op_term) || src - L->DE < L->num)) 583 583 { 584 unsignedlong diff, Temp;584 mg_u_long diff, Temp; 585 585 586 586 if (have_skipping) … … 754 754 u_char *buffer; 755 755 int i, kd; 756 unsignedlong next_mjr_dn = 0;757 unsignedlong CurrDocNum = 0; /* NOTE: Document numbers start at 1 */758 unsignedlong LastDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */759 unsignedlong TempDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */756 mg_u_long next_mjr_dn = 0; 757 mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */ 758 mg_u_long LastDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */ 759 mg_u_long TempDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */ 760 760 double Wqt, WordLog; 761 761 int dn_blk = 0, len_blk = 0, k; … … 787 787 int Count; /* The number of times the word occurs in a document */ 788 788 double Wdt; 789 unsignedlong diff;789 mg_u_long diff; 790 790 if (kd == k) 791 791 { … … 919 919 skip_header = 1; 920 920 fprintf (sk, "%s", skip_header_text[qd->id->ifh.skip_mode]); 921 fprintf (sk, "\nSkipping method % ld\n", qd->id->ifh.skip_mode);921 fprintf (sk, "\nSkipping method %d\n", qd->id->ifh.skip_mode); 922 922 switch (qd->id->ifh.skip_mode) 923 923 { 924 924 case 1: 925 fprintf (sk, "Skipping is every % ld docnums\n",925 fprintf (sk, "Skipping is every %d docnums\n", 926 926 qd->id->ifh.params[0]); 927 927 break; 928 928 case 2: 929 fprintf (sk, "Max nodes = % ld\nNo skips smaller or equal to %ld\n",929 fprintf (sk, "Max nodes = %d\nNo skips smaller or equal to %d\n", 930 930 qd->id->ifh.params[0], qd->id->ifh.params[1]); 931 931 break; … … 958 958 u_char *buffer; 959 959 int pos, i; 960 unsignedlong CurrDocNum = 0; /* NOTE: Document numbers start at 1 */960 mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */ 961 961 double Wqt, WordLog; 962 962 int dn_blk = 0, len_blk = 0, k, kd; … … 971 971 if (sk) 972 972 { 973 fprintf (sk, "%3d : %8 ld %6ld \"%.*s\"%*s", j, we->count,973 fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count, 974 974 we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1, 975 975 indent - Terms->TE[j].Word[0], ""); … … 1010 1010 int Count; /* The number of times the occurs in a document */ 1011 1011 double Wdt; 1012 unsignedlong diff;1012 mg_u_long diff; 1013 1013 Invf_Doc_Entry ent, *mem; 1014 1014 if (k) … … 1026 1026 } 1027 1027 if (kd == k - 1) 1028 { 1028 1029 if (i + k < p) 1029 1030 { … … 1036 1037 } 1037 1038 else 1039 { 1038 1040 next_doc_num = -1; 1041 } 1042 } 1039 1043 if (Anding && i + k < p && next->DocNum > next_doc_num && 1040 1044 next_doc_num >= 0) … … 1149 1153 skip_header = 1; 1150 1154 fprintf (sk, "%s", skip_header_text[qd->id->ifh.skip_mode]); 1151 fprintf (sk, "\nSkipping method % ld\n", qd->id->ifh.skip_mode);1155 fprintf (sk, "\nSkipping method %d\n", qd->id->ifh.skip_mode); 1152 1156 switch (qd->id->ifh.skip_mode) 1153 1157 { 1154 1158 case 1: 1155 fprintf (sk, "Skipping is every % ld docnums\n",1159 fprintf (sk, "Skipping is every %d docnums\n", 1156 1160 qd->id->ifh.params[0]); 1157 1161 break; 1158 1162 case 2: 1159 fprintf (sk, "Max nodes = % ld\nNo skips smaller or equal to %ld\n",1163 fprintf (sk, "Max nodes = %d\nNo skips smaller or equal to %d\n", 1160 1164 qd->id->ifh.params[0], qd->id->ifh.params[1]); 1161 1165 break; … … 1188 1192 int pos; 1189 1193 int i; 1190 unsignedlong CurrDocNum = 0; /* NOTE: Document numbers start at 1 */1194 mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */ 1191 1195 double Wqt, WordLog; 1192 1196 int dn_blk = 0, len_blk = 0, k, kd; … … 1201 1205 if (sk) 1202 1206 { 1203 fprintf (sk, "%3d : %8 ld %6ld \"%.*s\"%*s", j, we->count,1207 fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count, 1204 1208 we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1, 1205 1209 indent - Terms->TE[j].Word[0], ""); … … 1245 1249 int Count; /* The number of times the occurs in a document */ 1246 1250 double Wdt; 1247 unsignedlong diff;1251 mg_u_long diff; 1248 1252 Invf_Doc_Entry *mem; 1249 1253 if (k) … … 1391 1395 skip_header = 1; 1392 1396 fprintf (sk, "%s", skip_header_text[qd->id->ifh.skip_mode]); 1393 fprintf (sk, "\nSkipping method % ld\n", qd->id->ifh.skip_mode);1397 fprintf (sk, "\nSkipping method %d\n", qd->id->ifh.skip_mode); 1394 1398 switch (qd->id->ifh.skip_mode) 1395 1399 { 1396 1400 case 1: 1397 fprintf (sk, "Skipping is every % ld docnums\n",1401 fprintf (sk, "Skipping is every %d docnums\n", 1398 1402 qd->id->ifh.params[0]); 1399 1403 break; 1400 1404 case 2: 1401 fprintf (sk, "Max nodes = % ld\nNo skips smaller or equal to %ld\n",1405 fprintf (sk, "Max nodes = %d\nNo skips smaller or equal to %d\n", 1402 1406 qd->id->ifh.params[0], qd->id->ifh.params[1]); 1403 1407 break; … … 1431 1435 int pos; 1432 1436 int i, n = 0; 1433 unsignedlong CurrDocNum = 0; /* NOTE: Document numbers start at 1 */1434 unsignedlong LastDocNum = 0; /* [RJM 07/97: Ranked Required Match] */1437 mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */ 1438 mg_u_long LastDocNum = 0; /* [RJM 07/97: Ranked Required Match] */ 1435 1439 int this_item = 0; /* [RJM 07/97: Ranked Required Match] points to the next possible LT to delete */ 1436 1440 double Wqt, WordLog; … … 1448 1452 if (sk) 1449 1453 { 1450 fprintf (sk, "%3d : %8 ld %6ld \"%.*s\"%*s", j, we->count,1454 fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count, 1451 1455 we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1, 1452 1456 indent - Terms->TE[j].Word[0], ""); … … 1511 1515 int Count; /* The number of times the occurs in a document */ 1512 1516 double Wdt; 1513 unsignedlong diff;1517 mg_u_long diff; 1514 1518 Invf_Doc_Entry *mem; 1515 1519 … … 1530 1534 } 1531 1535 if (kd == k - 1) 1536 { 1532 1537 if (i + k < p) 1533 1538 { … … 1540 1545 } 1541 1546 else 1547 { 1542 1548 next_doc_num = -1; 1543 1549 } 1550 } 1544 1551 /* should we take another skip? */ 1545 1552 if (Anding && i + k < p && next->DocNum > next_doc_num && -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/invf_get.h
r16583 r23508 75 75 Op_types; 76 76 77 /*Invf_Doc_Entry *HT_find(Hash_Table *HT, unsignedlong DN); */77 /*Invf_Doc_Entry *HT_find(Hash_Table *HT, mg_u_long DN); */ 78 78 void HT_free (query_data * qd, Hash_Table * HT); 79 79 void LT_free (query_data * qd, List_Table * LT); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/ivf.pass1.c
r16583 r23508 117 117 typedef struct hash_rec 118 118 { 119 unsignedlong fcnt; /* fragment frequency */120 unsignedlong lfcnt; /* local fragment frequency */121 unsignedlong fnum; /* last fragment to use stem */122 unsignedlong wcnt; /* stem frequency */123 unsignedlong lwcnt; /* local stem frequency */119 mg_u_long fcnt; /* fragment frequency */ 120 mg_u_long lfcnt; /* local fragment frequency */ 121 mg_u_long fnum; /* last fragment to use stem */ 122 mg_u_long wcnt; /* stem frequency */ 123 mg_u_long lwcnt; /* local stem frequency */ 124 124 u_char *word; 125 125 } 126 126 hash_rec; 127 127 128 static unsignedlong words_read = 0, words_diff = 0, bytes_diff = 0;129 static unsignedlong outputbytes = 0;130 static unsignedlong inputbytes = 0;131 static unsignedlong MaxMemInUse = 0;132 static unsignedlong MemInUse = 0;133 static unsignedlong ChunksWritten = 0;128 static mg_u_long words_read = 0, words_diff = 0, bytes_diff = 0; 129 static mg_u_long outputbytes = 0; 130 static mg_u_long inputbytes = 0; 131 static mg_u_long MaxMemInUse = 0; 132 static mg_u_long MemInUse = 0; 133 static mg_u_long ChunksWritten = 0; 134 134 135 135 … … 138 138 139 139 static hash_rec **HashTable; 140 static unsignedlong HashSize=0;141 static unsignedlong HashUsed=0;140 static mg_u_long HashSize=0; 141 static mg_u_long HashUsed=0; 142 142 static u_char *Pool; 143 143 static int PoolLeft=0; … … 152 152 static mg_ullong L2_bits = 0; 153 153 static mg_ullong L3_bits = 0; 154 static unsignedlong L1_ohead = 0;155 static unsignedlong L2_ohead = 0;156 static unsignedlong L3_ohead = 0;157 static unsignedlong callnum = 0, lcallnum = 0, wordnum = 0, lwordnum = 0;158 static unsignedlong ptrcnt = 0;159 static unsignedlong checknum=0;160 static long max_mem = 0;154 static mg_u_long L1_ohead = 0; 155 static mg_u_long L2_ohead = 0; 156 static mg_u_long L3_ohead = 0; 157 static mg_u_long callnum = 0, lcallnum = 0, wordnum = 0, lwordnum = 0; 158 static mg_u_long ptrcnt = 0; 159 static mg_u_long checknum=0; 160 static mg_s_long max_mem = 0; 161 161 162 162 … … 211 211 MG_MESSAGE))) /* [RPAP - Feb 97: WIN32 Port] */ 212 212 return (COMPERROR); 213 fwrite (" ", sizeof ( u_long), 1, ic); /* Space for the maxmem */213 fwrite (" ", sizeof (mg_u_long), 1, ic); /* Space for the maxmem */ 214 214 ENCODE_START (ic) 215 215 ENCODE_PAUSE (sbs) … … 256 256 257 257 258 static unsignedlong258 static mg_u_long 259 259 mem_reqd (void) 260 260 { 261 261 register int i; 262 register unsignedlong total = 0;263 /* register unsignedlong N = InvfLevel == 3 ? lwordnum : lcallnum; */264 register unsignedlong N = lcallnum;262 register mg_u_long total = 0; 263 /* register mg_u_long N = InvfLevel == 3 ? lwordnum : lcallnum; */ 264 register mg_u_long N = lcallnum; 265 265 for (i = 0; i < HashUsed; i++) 266 266 { 267 267 register hash_rec *ent = first_occr[i]; 268 /* register unsignedlong p = InvfLevel == 3 ? ent->lwcnt : ent->lfcnt; */269 register unsignedlong p = ent->lfcnt;268 /* register mg_u_long p = InvfLevel == 3 ? ent->lwcnt : ent->lfcnt; */ 269 register mg_u_long p = ent->lfcnt; 270 270 if (p) 271 271 total += BIO_Bblock_Bound (N, p); … … 278 278 } 279 279 280 static unsignedlong280 static mg_u_long 281 281 max_mem_reqd (void) 282 282 { 283 283 register int i; 284 register unsignedlong total = 0;285 /* register unsignedlong N = InvfLevel == 3 ? wordnum : callnum; */286 register unsignedlong N = callnum;284 register mg_u_long total = 0; 285 /* register mg_u_long N = InvfLevel == 3 ? wordnum : callnum; */ 286 register mg_u_long N = callnum; 287 287 for (i = 0; i < HashUsed; i++) 288 288 { 289 289 register hash_rec *ent = first_occr[i]; 290 /* register unsignedlong p = InvfLevel == 3 ? ent->wcnt : ent->fcnt; */291 register unsignedlong p = ent->fcnt;290 /* register mg_u_long p = InvfLevel == 3 ? ent->wcnt : ent->fcnt; */ 291 register mg_u_long p = ent->fcnt; 292 292 if (p) 293 293 total += BIO_Bblock_Bound (N, p); … … 302 302 303 303 static void 304 dump_dict ( unsignedlong mem)304 dump_dict (mg_u_long mem) 305 305 { 306 306 int i; … … 367 367 /* Search the hash table for Word */ 368 368 { 369 register unsignedlong hashval, step;369 register mg_u_long hashval, step; 370 370 register int hsize = HashSize; 371 371 HASH (hashval, step, Word, hsize); … … 464 464 { 465 465 hash_rec **ht; 466 unsignedlong size;467 unsignedlong i;466 mg_u_long size; 467 mg_u_long i; 468 468 size = prime (HashSize * 2); 469 469 if (!(ht = Xmalloc (sizeof (hash_rec *) * size))) … … 480 480 register u_char *wptr; 481 481 hash_rec *ent; 482 register unsignedlong hashval, step;482 register mg_u_long hashval, step; 483 483 484 484 wptr = HashTable[i]->word; … … 504 504 if (ptrcnt >= checknum) 505 505 { 506 unsignedlong mem;506 mg_u_long mem; 507 507 /*fprintf(stderr, "Checking at %u . . . ", ptrcnt); */ 508 508 mem = mem_reqd (); … … 617 617 /* check for overflow */ 618 618 if (L1_bits + L2_bits < oldL12_bits) { 619 fprintf(stderr, "ERROR: Inverted file size will probably overflow % dbyte unsigned integer\n", sizeof (mg_ullong));619 fprintf(stderr, "ERROR: Inverted file size will probably overflow %lu byte unsigned integer\n", sizeof (mg_ullong)); 620 620 fprintf(stderr, " counter in pass 2.\n"); 621 621 if (sizeof (mg_ullong) < 8) { … … 659 659 write_stem_file (char *file_name) 660 660 { 661 long j;661 mg_s_long j; 662 662 struct invf_dict_header idh; 663 long lookback = (1 << LOGLOOKBACK); /* ???? */664 long totalbytes = 0; /* The sum of the length of all words, including663 mg_s_long lookback = (1 << LOGLOOKBACK); /* ???? */ 664 mg_s_long totalbytes = 0; /* The sum of the length of all words, including 665 665 the length byte */ 666 long indexstringbytes = 0; /* The amount of space required to store the666 mg_s_long indexstringbytes = 0; /* The amount of space required to store the 667 667 words in the diction, this takes into account 668 668 the prefixes */ … … 706 706 { 707 707 int i; 708 unsignedlong wcnt, fcnt; /* [RPAP - Jan 97: Endian Ordering] */708 mg_u_long wcnt, fcnt; /* [RPAP - Jan 97: Endian Ordering] */ 709 709 hash_rec *ent = HashTable[j]; 710 710 if (lastword != NULL) … … 750 750 write_codes (char *file_name) 751 751 { 752 unsignedlong dicts = 0;752 mg_u_long dicts = 0; 753 753 outputbytes = 0; 754 754 write_stem_file (file_name); … … 805 805 { 806 806 /* [RPAP - Jan 97: Endian Ordering] */ 807 unsignedlong fnum;807 mg_u_long fnum; 808 808 HTONUL2(first_occur[i]->fnum, fnum); 809 fwrite ((char *) &fnum, sizeof ( unsignedlong), 1, f);809 fwrite ((char *) &fnum, sizeof (mg_u_long), 1, f); 810 810 } 811 811 #endif … … 837 837 GAMMA_ENCODE (1); 838 838 ENCODE_DONE 839 fseek (ic, sizeof ( long), 0);839 fseek (ic, sizeof (mg_s_long), 0); 840 840 841 841 HTONSL(max_mem); /* [RPAP - Jan 97: Endian Ordering] */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/ivf.pass2.c
r16583 r23508 39 39 * Revision 1.2 1997/08/02 05:01:57 wew 40 40 * changed literal values of 32 for the bit size of magic numbers of 41 * files to sizeof ( unsignedlong) * 8, increased the gap at the start41 * files to sizeof (mg_u_long) * 8, increased the gap at the start 42 42 * of the invf during processing to 200 bytes 43 43 … … 127 127 struct stat file_state;\ 128 128 fstat(fileno(invf_out), &file_state);\ 129 Message("len(invf) = % ld", file_state.st_size);\129 Message("len(invf) = %d", file_state.st_size);\ 130 130 }while(0) 131 131 132 132 typedef struct word_rec 133 133 { 134 unsignedlong ptr;135 unsignedlong last;134 mg_u_long ptr; 135 mg_u_long last; 136 136 } 137 137 word_rec; … … 141 141 mg_ullong Disk_Ptr; 142 142 mg_ullong Disk_Last; 143 unsignedlong Disk_B;143 mg_u_long Disk_B; 144 144 } 145 145 invf_state_rec; … … 147 147 typedef struct chunk 148 148 { 149 unsignedlong start_doc;150 unsignedlong params_pos;151 unsignedlong disk_pos;152 unsignedlong N;149 mg_u_long start_doc; 150 mg_u_long params_pos; 151 mg_u_long disk_pos; 152 mg_u_long N; 153 153 } 154 154 chunk; … … 175 175 176 176 static int docs_left = 0, next_docs_left = 0; 177 static unsignedlong N;177 static mg_u_long N; 178 178 179 179 static word_rec *WordRecs; … … 182 182 183 183 static char *MemoryBuffer = NULL; 184 static unsignedlong MemBufSize;185 static unsignedlong BufToUse;184 static mg_u_long MemBufSize; 185 static mg_u_long BufToUse; 186 186 static struct invf_dict_header idh; 187 187 188 188 static perf_hash_data *phd; 189 189 190 static unsignedlong *word_list = NULL;191 static unsignedlong wl_size = 0;192 193 static unsignedlong dict_size;194 static unsignedlong no_of_ptrs = 0;195 static unsignedlong chunks_read = 0;196 static unsignedlong Disk_pos = 0;197 static unsignedlong callnum = 0;198 static unsignedlong wordnum = 0;199 200 static unsignedlong totalIbytes = 0;201 static unsignedlong totalDbytes = 0;202 static unsignedlong totalHbytes = 0;203 204 static unsignedlong MemInUse = 0;205 static unsignedlong MaxMemInUse = 0;206 static unsignedlong max_buffer_len;190 static mg_u_long *word_list = NULL; 191 static mg_u_long wl_size = 0; 192 193 static mg_u_long dict_size; 194 static mg_u_long no_of_ptrs = 0; 195 static mg_u_long chunks_read = 0; 196 static mg_u_long Disk_pos = 0; 197 static mg_u_long callnum = 0; 198 static mg_u_long wordnum = 0; 199 200 static mg_u_long totalIbytes = 0; 201 static mg_u_long totalDbytes = 0; 202 static mg_u_long totalHbytes = 0; 203 204 static mg_u_long MemInUse = 0; 205 static mg_u_long MaxMemInUse = 0; 206 static mg_u_long max_buffer_len; 207 207 208 208 void … … 292 292 return (COMPERROR); 293 293 294 sprintf (FName, FILE_NAME_FORMAT ".% ld", get_basepath (), file_name,295 ".invf.state", ( long) getpid ()); /* [RPAP - Feb 97: WIN32 Port] */294 sprintf (FName, FILE_NAME_FORMAT ".%d", get_basepath (), file_name, 295 ".invf.state", (mg_s_long) getpid ()); /* [RPAP - Feb 97: WIN32 Port] */ 296 296 if (!(invf_state = fopen (FName, "w+b"))) /* [RPAP - Feb 97: WIN32 Port] */ 297 297 { … … 301 301 unlink (FName); 302 302 303 sprintf (FName, FILE_NAME_FORMAT ".% ld", get_basepath (), file_name,304 ".chunk.state", ( long) getpid ()); /* [RPAP - Feb 97: WIN32 Port] */303 sprintf (FName, FILE_NAME_FORMAT ".%d", get_basepath (), file_name, 304 ".chunk.state", (mg_s_long) getpid ()); /* [RPAP - Feb 97: WIN32 Port] */ 305 305 if (!(chunk_state = fopen (FName, "w+b"))) /* [RPAP - Feb 97: WIN32 Port] */ 306 306 { … … 312 312 ChangeMemInUse (RND_BUF_SIZE); 313 313 314 sprintf (FName, FILE_NAME_FORMAT ".% ld", get_basepath (), file_name,315 ".chunks", ( long) getpid ()); /* [RPAP - Feb 97: WIN32 Port] */314 sprintf (FName, FILE_NAME_FORMAT ".%d", get_basepath (), file_name, 315 ".chunks", (mg_s_long) getpid ()); /* [RPAP - Feb 97: WIN32 Port] */ 316 316 if (!(chunks = fopen (FName, "w+b"))) /* [RPAP - Feb 97: WIN32 Port] */ 317 317 { … … 329 329 330 330 #define ISR_CACHE 1024 331 #define ISR_ENTRY_SIZE (sizeof(mg_ullong)*2 + sizeof( unsignedlong))331 #define ISR_ENTRY_SIZE (sizeof(mg_ullong)*2 + sizeof(mg_u_long)) 332 332 333 333 invf_state_rec * … … 360 360 361 361 362 unsignedlong363 occur_to_lexical ( long occ, int clear_state)364 { 365 static long pos = -1;362 mg_u_long 363 occur_to_lexical (mg_s_long occ, int clear_state) 364 { 365 static mg_s_long pos = -1; 366 366 static random_bitio_state rbs; 367 367 static int val = 0; … … 383 383 return 0; 384 384 } 385 BIO_Random_Seek_X (sizeof ( unsignedlong) * 8, &rbs);385 BIO_Random_Seek_X (sizeof (mg_u_long) * 8, &rbs); 386 386 pos = 0; 387 387 } … … 396 396 397 397 void 398 add_chunk_state ( unsigned long pos, unsignedlong start_doc,399 unsignedlong N)398 add_chunk_state (mg_u_long pos, mg_u_long start_doc, 399 mg_u_long N) 400 400 { 401 401 chunk_data[chunks_read].params_pos = pos; … … 448 448 totalHbytes = sizeof (perf_hash_data) + sizeof (u_char) * 256 + 449 449 sizeof (int) * (phd->MAX_N + 1) + sizeof (int *) * 3 * phd->MAX_CH + 450 sizeof ( long) * phd->MAX_CH * phd->MAX_L;450 sizeof (mg_s_long) * phd->MAX_CH * phd->MAX_L; 451 451 452 452 if (!(WordRecs = Xmalloc (sizeof (word_rec) * idh.dict_size))) … … 488 488 totalDbytes += sizeof (chunk) * (ChunkLimit + 2); 489 489 490 totalIbits = sizeof ( unsignedlong) * 8; /* The magic number */490 totalIbits = sizeof (mg_u_long) * 8; /* The magic number */ 491 491 totalIbits += 8 * 200; /* A 200 byte gap */ 492 492 … … 506 506 { 507 507 invf_state_rec *isr; 508 register unsignedlong copy, suff, p;509 unsignedlong fcnt, wcnt;508 register mg_u_long copy, suff, p; 509 mg_u_long fcnt, wcnt; 510 510 511 511 lasttotalIbits = totalIbits; … … 551 551 552 552 if (totalIbits < lasttotalIbits) { 553 fprintf(stderr, "ERROR: The totalIbits counter (% dbyte unsigned integer) has overflowed.\n", sizeof (mg_ullong));553 fprintf(stderr, "ERROR: The totalIbits counter (%lu byte unsigned integer) has overflowed.\n", sizeof (mg_ullong)); 554 554 if (sizeof (mg_ullong) < 8) { 555 555 fprintf(stderr, " Try compiling with GCC to enable use of 8 bytes for this counter.\n"); … … 578 578 LoadCounts (void) 579 579 { 580 unsignedlong numwords, i, last_total;581 static unsignedlong local_N = 0;582 unsignedlong totalIbits, crbs_pos;580 mg_u_long numwords, i, last_total; 581 static mg_u_long local_N = 0; 582 mg_u_long totalIbits, crbs_pos; 583 583 word_rec *wr; 584 unsignedlong *counts;584 mg_u_long *counts; 585 585 586 586 if (MemoryBuffer == NULL) 587 587 { 588 MemBufSize = sizeof ( unsignedlong) * dict_size;588 MemBufSize = sizeof (mg_u_long) * dict_size; 589 589 if (max_buffer_len > MemBufSize) 590 590 MemBufSize = max_buffer_len; … … 593 593 ChangeMemInUse (MemBufSize); 594 594 } 595 counts = ( unsignedlong *) MemoryBuffer;596 /* bzero ((char *) counts, sizeof ( unsignedlong) * dict_size); */595 counts = (mg_u_long *) MemoryBuffer; 596 /* bzero ((char *) counts, sizeof (mg_u_long) * dict_size); */ 597 597 bzero ((char *) counts, MemBufSize); 598 598 docs_left = next_docs_left; … … 613 613 for (i = 0; i < numwords; i++) 614 614 { 615 unsignedlong word_num, wcnt, fcnt, p;615 mg_u_long word_num, wcnt, fcnt, p; 616 616 word_num = occur_to_lexical (i,0); 617 617 … … 628 628 if (wcnt) 629 629 { 630 register unsignedlong length;630 register mg_u_long length; 631 631 counts[word_num] = p; 632 632 length = BIO_Bblock_Bound (local_N, p); … … 644 644 for (wr = WordRecs, i = 0; i < dict_size; i++, wr++) 645 645 { 646 register unsignedlong length;646 register mg_u_long length; 647 647 length = wr->ptr; 648 648 wr->last = callnum; … … 688 688 random_bitio_state *rbsi; 689 689 random_bitio_state *chks = NULL; 690 unsignedlong *chunk_ptrs;690 mg_u_long *chunk_ptrs; 691 691 int i; 692 692 693 693 BIO_Random_Flush (&crbs); 694 694 695 chunk_ptrs = Xmalloc (chunks_read * sizeof ( unsignedlong));696 ChangeMemInUse (chunks_read * sizeof ( unsignedlong));697 bzero ((char *) chunk_ptrs, chunks_read * sizeof ( unsignedlong));695 chunk_ptrs = Xmalloc (chunks_read * sizeof (mg_u_long)); 696 ChangeMemInUse (chunks_read * sizeof (mg_u_long)); 697 bzero ((char *) chunk_ptrs, chunks_read * sizeof (mg_u_long)); 698 698 699 699 rbsi = Xmalloc (chunks_read * sizeof (random_bitio_state)); … … 752 752 for (k = 0; k < p; k++) 753 753 { 754 register unsignedlong x, tf;754 register mg_u_long x, tf; 755 755 BBLOCK_DECODE (x, b); 756 756 if (k == 0) … … 775 775 for (k = 0; k < p; k++) 776 776 { 777 register unsignedlong x, tf;777 register mg_u_long x, tf; 778 778 x = BIO_Random_Bblock_Decode (b, Chks, NULL); 779 779 if (k == 0) … … 816 816 /* chunks_read = 0; */ 817 817 Xfree (chunk_ptrs); 818 ChangeMemInUse (-chunks_read * sizeof ( unsignedlong));818 ChangeMemInUse (-chunks_read * sizeof (mg_u_long)); 819 819 chunks_read = 0; 820 820 Disk_pos = 0; … … 860 860 int res; 861 861 u_char *end = s_in + l_in - 1; 862 unsignedlong tocode;863 unsignedlong wl_pos = 0;862 mg_u_long tocode; 863 mg_u_long wl_pos = 0; 864 864 865 865 if (!docs_left) … … 934 934 if (wl_pos) 935 935 { 936 unsignedlong *wl = word_list;937 unsignedlong i, count, val;936 mg_u_long *wl = word_list; 937 mg_u_long i, count, val; 938 938 qsort (wl, wl_pos, sizeof (*wl), wl_comp); 939 939 count = 1; … … 999 999 1000 1000 static void 1001 stats ( unsignedlong len)1001 stats (mg_u_long len) 1002 1002 { 1003 1003 #ifndef SILENT … … 1029 1029 done_ivf_2 (char *FileName) 1030 1030 { 1031 long i;1031 mg_s_long i; 1032 1032 mg_ullong totalIbits; 1033 unsignedlong invf_len;1034 unsignedlong bytes_output;1033 mg_u_long invf_len; 1034 mg_u_long bytes_output; 1035 1035 struct invf_file_header ifh; 1036 1036 … … 1054 1054 invf_len = ftell (invf); 1055 1055 1056 fseek (invf_out, sizeof ( long), 0);1056 fseek (invf_out, sizeof (mg_s_long), 0); 1057 1057 /* [RPAP - Jan 97: Endian Ordering] */ 1058 1058 HTONUL2(dict_size, ifh.no_of_words); … … 1065 1065 bytes_output = ftell (invf_out); 1066 1066 1067 totalIbits = sizeof ( unsignedlong) * 8; /* The magic number */1067 totalIbits = sizeof (mg_u_long) * 8; /* The magic number */ 1068 1068 totalIbits += 8 * 200; /* A 200 byte gap */ 1069 1069 1070 1070 /* find the right place in the file to start reading p values */ 1071 fseek (dict, sizeof ( unsignedlong) + sizeof (struct invf_dict_header), 0);1071 fseek (dict, sizeof (mg_u_long) + sizeof (struct invf_dict_header), 0); 1072 1072 for (i = 0; i < dict_size; i++) 1073 1073 { 1074 1074 invf_state_rec *isr; 1075 unsignedlong fcnt, wcnt, s, e;1076 register unsignedlong p;1075 mg_u_long fcnt, wcnt, s, e; 1076 register mg_u_long p; 1077 1077 u_char dummy1, dummy2[MAXSTEMLEN + 1]; 1078 1078 … … 1147 1147 { 1148 1148 char *temp_str = msg_prefix; 1149 unsignedlong total;1149 mg_u_long total; 1150 1150 msg_prefix = "ivf.pass2"; 1151 1151 stats (invf_len); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/lists.h
r16583 r23508 32 32 float Weight; 33 33 int DocNum; 34 unsignedlong SeekPos; /* position in the text file in bytes */35 unsignedlong Len; /* length of the document in bytes */34 mg_u_long SeekPos; /* position in the text file in bytes */ 35 mg_u_long Len; /* length of the document in bytes */ 36 36 char *CompTextBuffer; 37 37 struct DocEntry *Next; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/locallib.c
r16583 r23508 100 100 101 101 int 102 huffcodebits ( unsignedlong *A, int n)102 huffcodebits (mg_u_long *A, int n) 103 103 { 104 104 int i, j, tot = 0, bits = 0, v1, v2, *B; … … 136 136 137 137 int 138 modelbits ( unsignedlong *A, int n)138 modelbits (mg_u_long *A, int n) 139 139 { 140 140 int i, bits = 0, last, N = 0; … … 185 185 186 186 int 187 Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem,188 u_long * disk)187 Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, 188 mg_u_long * disk) 189 189 { 190 190 if (disk) … … 212 212 213 213 int 214 F_Read_cdh (File * f, compression_dict_header * cdh, u_long * mem,215 u_long * disk)214 F_Read_cdh (File * f, compression_dict_header * cdh, mg_u_long * mem, 215 mg_u_long * disk) 216 216 { 217 217 if (disk) … … 239 239 240 240 int 241 Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem,u_long * disk)241 Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk) 242 242 { 243 243 int i; /* [RPAP - Jan 97: Endian Ordering] */ … … 274 274 275 275 int 276 F_Read_cfh (File * f, comp_frags_header * cfh, u_long * mem,u_long * disk)276 F_Read_cfh (File * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk) 277 277 { 278 278 int i; /* [RPAP - Jan 97: Endian Ordering] */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/locallib.h
r16583 r23508 33 33 int vecentropy (int *A, int n); 34 34 35 int huffcodebits ( unsignedlong *A, int n);35 int huffcodebits (mg_u_long *A, int n); 36 36 37 int modelbits ( unsignedlong *A, int n);37 int modelbits (mg_u_long *A, int n); 38 38 39 39 int prime (int p); 40 40 41 41 42 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem,u_long * disk);42 int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, mg_u_long * disk); 43 43 44 int Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem,u_long * disk);44 int Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk); 45 45 46 int F_Read_cdh (File * f, compression_dict_header * cdh, u_long * mem,47 u_long * disk);46 int F_Read_cdh (File * f, compression_dict_header * cdh, mg_u_long * mem, 47 mg_u_long * disk); 48 48 49 int F_Read_cfh (File * f, comp_frags_header * cfh, u_long * mem,u_long * disk);49 int F_Read_cfh (File * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk); 50 50 51 51 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_compression_dict.c
r16583 r23508 41 41 #include "mg.h" 42 42 43 #define MAXBITS (sizeof( unsignedlong) * 8)43 #define MAXBITS (sizeof(mg_mg_u_long) * 8) 44 44 45 45 /* … … 98 98 typedef struct WordData 99 99 { 100 u_long freq, occur_num;100 mg_u_long freq, occur_num; 101 101 float saving; 102 102 float char_bit_cost; 103 u_long num_trans;103 mg_u_long num_trans; 104 104 u_char *word; 105 105 } … … 107 107 108 108 static WordData *Words[2]; 109 static u_long Num[2];110 static u_long chars[2];109 static mg_u_long Num[2]; 110 static mg_u_long chars[2]; 111 111 112 112 #define KIND(p) (((p) >= Words[0] && (p) < Words[0] + Num[0]) ? 0 : 1) … … 118 118 { 119 119 WordData **wd; 120 u_long num_wds;121 u_long chars;120 mg_u_long num_wds; 121 mg_u_long chars; 122 122 } 123 123 DictData; … … 129 129 130 130 static char *file_name = ""; 131 static u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;131 static mg_u_long novel_method = MG_NOVEL_HUFFMAN_CHARS; 132 132 133 133 … … 136 136 static void Method3 (int k); 137 137 static void Select_all (void); 138 static u_long WriteOutWords (char *,u_long, int);138 static mg_u_long WriteOutWords (char *, mg_u_long, int); 139 139 static int DecFreqIncWL (void *a, void *b); 140 140 static int OccuranceOrder (void *a, void *b); … … 150 150 int lookback = 2; 151 151 double k = 0; 152 u_long mem_reqd;152 mg_u_long mem_reqd; 153 153 opterr = 0; 154 154 msg_prefix = argv[0]; … … 264 264 { 265 265 FILE *f; 266 unsignedlong i;266 mg_u_long i; 267 267 f = open_file (filename, TEXT_STATS_DICT_SUFFIX, "rb", 268 268 MAGIC_STATS_DICT, MG_ABORT); /* [RPAP - Feb 97: WIN32 Port] */ … … 468 468 CalcCharCounts (WordData ** wd, int num, 469 469 char *char_lens[2], char *len_lens[2], 470 u_long escape[2])471 { 472 long char_freqs[2][256];473 long len_freqs[2][16];470 mg_u_long escape[2]) 471 { 472 mg_u_long char_freqs[2][256]; 473 mg_u_long len_freqs[2][16]; 474 474 huff_data hd; 475 475 int i; … … 480 480 for (i = 0; i < num; i++, wd++) 481 481 { 482 u_long freq = (*wd)->freq;482 mg_u_long freq = (*wd)->freq; 483 483 u_char *buf = (*wd)->word; 484 484 int len = *buf++; … … 487 487 escape[idx] += freq; 488 488 for (; len; len--, buf++) 489 char_freqs[idx][( u_long) (*buf)] += freq;489 char_freqs[idx][(mg_u_long) (*buf)] += freq; 490 490 } 491 491 Generate_Huffman_Data (256, char_freqs[0], &hd, NULL); … … 511 511 CalcBitCost (WordData ** discard_word, int discard_num, 512 512 WordData ** keep_word, int keep_num, double freqs_trans[2], 513 u_long escape[2], int num_trans)513 mg_u_long escape[2], int num_trans) 514 514 { 515 515 char *char_lens[2]; … … 525 525 u_char *buf = (*discard_word)->word; 526 526 int len = *buf++; 527 u_long freq = (*discard_word)->freq;527 mg_u_long freq = (*discard_word)->freq; 528 528 int idx = KIND (*discard_word); 529 529 530 530 cbc = len_lens[idx][len]; 531 531 for (; len; len--, buf++) 532 cbc += char_lens[idx][( u_long) (*buf)];532 cbc += char_lens[idx][(mg_u_long) (*buf)]; 533 533 534 534 (*discard_word)->char_bit_cost = (cbc + esc[idx]) * freq; … … 546 546 u_char *buf = (*keep_word)->word; 547 547 int len = *buf++; 548 u_long freq = (*keep_word)->freq;548 mg_u_long freq = (*keep_word)->freq; 549 549 int idx = KIND (*keep_word); 550 550 551 551 cbc = len_lens[idx][len]; 552 552 for (; len; len--, buf++) 553 cbc += char_lens[idx][( u_long) (*buf)];553 cbc += char_lens[idx][(mg_u_long) (*buf)]; 554 554 555 555 (*keep_word)->char_bit_cost = (cbc + esc[idx]) * freq; … … 578 578 int recalcs = 0; 579 579 double freqs_trans[2], total; 580 u_long escape[2];580 mg_u_long escape[2]; 581 581 WordData **keep_heap, **discard_heap; 582 582 … … 831 831 832 832 833 static u_long833 static mg_u_long 834 834 Write_data (FILE * f, DictData * dd, int lookback) 835 835 { 836 u_long mem_reqd;836 mg_u_long mem_reqd; 837 837 huff_data *hd; 838 838 int i; 839 u_long us = dd->num_wds;840 long *freqs;841 u_long huff_words_size[MAX_HUFFCODE_LEN + 1];842 u_long lencounts[MAX_HUFFCODE_LEN + 1];839 mg_u_long us = dd->num_wds; 840 mg_s_long *freqs; 841 mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1]; 842 mg_u_long lencounts[MAX_HUFFCODE_LEN + 1]; 843 843 u_char *lastword[MAX_HUFFCODE_LEN + 1]; 844 844 … … 932 932 { 933 933 int j; 934 long freqs[256];934 mg_s_long freqs[256]; 935 935 WordData **wd = dd->wd; 936 936 huff_data *hd; … … 943 943 int len = *buf++; 944 944 for (; len; len--, buf++) 945 freqs[( u_long) (*buf)] += (*wd)->freq;945 freqs[(mg_u_long) (*buf)] += (*wd)->freq; 946 946 } 947 947 … … 968 968 { 969 969 int j; 970 long freqs[16];970 mg_s_long freqs[16]; 971 971 WordData **wd = dd->wd; 972 972 huff_data *hd; … … 995 995 996 996 997 static u_long998 WriteOutWords (char *file_name, u_long type, int lookback)997 static mg_u_long 998 WriteOutWords (char *file_name, mg_u_long type, int lookback) 999 999 { 1000 1000 FILE *f; 1001 1001 int i; 1002 u_long mem_reqd = 0;1002 mg_u_long mem_reqd = 0; 1003 1003 1004 1004 compression_dict_header cdh; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_decompress_text.c
r16583 r23508 34 34 35 35 int ch; 36 unsignedlong start, finish, len;37 u_long total_chars = 0;36 mg_u_long start, finish, len; 37 mg_u_long total_chars = 0; 38 38 u_char *c_buffer = 0; 39 39 int buf_len = -1; … … 42 42 compression_dict *cd = NULL; 43 43 compressed_text_header cth; 44 u_long doc;44 mg_u_long doc; 45 45 int count; 46 46 char *filename = ""; … … 161 161 162 162 #if 0 163 printf ("\n#Total chars output = % lu\n", total_chars);163 printf ("\n#Total chars output = %u\n", total_chars); 164 164 #endif 165 165 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_fast_comp_dict.c
r16583 r23508 91 91 92 92 93 static u_long mem_for_comp_dict (char *filename);93 static mg_u_long mem_for_comp_dict (char *filename); 94 94 static void load_comp_dict (char *filename); 95 95 static void save_fast_dict (char *filename); … … 100 100 static void *cur; 101 101 static u_char *fixup; 102 static u _longmem, fixup_mem;102 static uintptr_t mem, fixup_mem; 103 103 104 104 int main (int argc, char **argv) … … 142 142 Message ("Actual memory for fast_dict %u", (char *) cur - (char *) buffer); 143 143 144 if ((u _long) cur > (u_long) buffer + mem)144 if ((uintptr_t) cur > (uintptr_t) buffer + mem) 145 145 FatalError (1, "The buffer was not big enough for the dictionary"); 146 146 … … 211 211 unfixup_buffer () 212 212 { 213 u _long*p;214 for (p = buffer; (u _long) p < (u_long) cur; p++)213 uintptr_t *p; 214 for (p = buffer; (uintptr_t) p < (uintptr_t) cur; p++) 215 215 { 216 216 if (IS_FIXUP (p)) 217 *p = *p - (u _long) buffer;218 } 219 } 220 221 222 223 224 static u_long217 *p = *p - (uintptr_t) buffer; 218 } 219 } 220 221 222 223 224 static mg_u_long 225 225 mem_for_aux_dict (compression_dict_header * cdh, char *filename) 226 226 { 227 227 int i; 228 u_long mem = sizeof (auxiliary_dict);228 mg_u_long mem = sizeof (auxiliary_dict); 229 229 FILE *aux; 230 230 … … 249 249 250 250 251 static u_long251 static mg_u_long 252 252 mem_for_words (FILE * dict, compression_dict_header * cdh, 253 253 comp_frags_header * cfh) 254 254 { 255 u_long mem = 0;256 u_long i, lookback;255 mg_u_long mem = 0; 256 mg_u_long i, lookback; 257 257 int ptrs_reqd = 0; 258 258 int mem_reqd = 0; … … 282 282 283 283 284 static u_long284 static mg_u_long 285 285 mem_for_comp_dict (char *filename) 286 286 { 287 u_long mem = sizeof (compression_dict);287 mg_u_long mem = sizeof (compression_dict); 288 288 compression_dict_header cdh; 289 289 comp_frags_header cfh; … … 343 343 if (hd.clens) 344 344 Xfree (hd.clens); 345 mem += hd.num_codes * sizeof ( unsignedlong);346 mem += (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);345 mem += hd.num_codes * sizeof (mg_u_long); 346 mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 347 347 348 348 mem += sizeof (hd); … … 350 350 if (hd.clens) 351 351 Xfree (hd.clens); 352 mem += hd.num_codes * sizeof ( unsignedlong);353 mem += (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);352 mem += hd.num_codes * sizeof (mg_u_long); 353 mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 354 354 } 355 355 break; … … 377 377 if (hd.clens) 378 378 Xfree (hd.clens); 379 mem += hd.num_codes * sizeof ( unsignedlong);380 mem += (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);379 mem += hd.num_codes * sizeof (mg_u_long); 380 mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 381 381 382 382 mem += sizeof (hd); … … 384 384 if (hd.clens) 385 385 Xfree (hd.clens); 386 mem += hd.num_codes * sizeof ( unsignedlong);387 mem += (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);386 mem += hd.num_codes * sizeof (mg_u_long); 387 mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 388 388 break; 389 389 case MG_NOVEL_BINARY: … … 413 413 414 414 void * 415 getmem ( u_long size, int align)415 getmem (mg_u_long size, int align) 416 416 { 417 417 void *res; 418 cur = (void *) (((u _long) cur + (align - 1)) & (~(align - 1)));418 cur = (void *) (((uintptr_t) cur + (align - 1)) & (~(align - 1))); 419 419 res = cur; 420 420 cur = (char *) cur + size; 421 if (( long) cur > (long) buffer + mem)421 if ((intptr_t) cur > (intptr_t) buffer + mem) 422 422 FatalError (1, "The buffer was not big enough for the dictionary"); 423 423 return res; … … 592 592 593 593 594 static unsignedlong **595 Generate_Fast_Huffman_Vals (huff_data * data, u_long * mem)594 static mg_u_long ** 595 Generate_Fast_Huffman_Vals (huff_data * data, mg_u_long * mem) 596 596 { 597 597 int i; 598 unsignedlong *fcode[MAX_HUFFCODE_LEN + 1];599 unsignedlong **values;600 unsignedlong *vals;598 mg_u_long *fcode[MAX_HUFFCODE_LEN + 1]; 599 mg_u_long **values; 600 mg_u_long *vals; 601 601 602 602 if (!data) 603 603 return (NULL); 604 vals = getmem (data->num_codes * sizeof (*vals), sizeof ( long *));605 values = getmem ((MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *),606 sizeof ( long *));607 608 bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *));604 vals = getmem (data->num_codes * sizeof (*vals), sizeof (mg_s_long *)); 605 values = getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *), 606 sizeof (mg_s_long *)); 607 608 bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)); 609 609 610 610 if (mem) 611 611 *mem += data->num_codes * sizeof (*vals) + 612 (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);612 (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 613 613 614 614 fcode[0] = values[0] = &vals[0]; … … 661 661 { 662 662 huff_data *hd; 663 u_long **vals;663 mg_u_long **vals; 664 664 if (cd->cdh.num_words[which]) 665 665 { … … 702 702 { 703 703 huff_data *hd; 704 u_long **vals;704 mg_u_long **vals; 705 705 if (cd->cdh.num_words[which]) 706 706 { … … 776 776 777 777 { 778 u _long*p;779 for (p = buffer; (u _long) p < (u_long) cur; p++)778 uintptr_t *p; 779 for (p = buffer; (uintptr_t) p < (uintptr_t) cur; p++) 780 780 { 781 781 if (IS_FIXUP (p)) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_files.c
r16583 r23508 110 110 FILE * 111 111 open_named_file (const char *name, const char *mode, 112 u_long magic_num, int err_mode)113 { 114 unsignedlong magic;112 mg_u_long magic_num, int err_mode) 113 { 114 mg_u_long magic; 115 115 FILE *f = NULL; 116 116 char *err; … … 172 172 FILE * 173 173 open_file (const char *name, const char *suffix, const char *mode, 174 u_long magic_num, int err_mode)174 mg_u_long magic_num, int err_mode) 175 175 { 176 176 char path[512]; … … 200 200 FILE * 201 201 create_named_file (const char *name, const char *mode, 202 u_long magic_num, int err_mode)202 mg_u_long magic_num, int err_mode) 203 203 { 204 204 FILE *f = NULL; … … 252 252 FILE * 253 253 create_file (const char *name, const char *suffix, const char *mode, 254 u_long magic_num, int err_mode)254 mg_u_long magic_num, int err_mode) 255 255 { 256 256 char path[512]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_files.h
r16583 r23508 29 29 /* Magic numbers for the different types of files */ 30 30 31 #define GEN_MAGIC(a,b,c,d) (( unsignedlong)(((a)<<24) + ((b)<<16) + \31 #define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \ 32 32 ((c)<<8) + (d))) 33 33 … … 55 55 #define MAGIC_STEM_3 GEN_MAGIC('M','G','s','3') 56 56 57 #define IS_MAGIC(a) (((( u_long)(a)) & 0xffff0000) == MAGIC_XXXX)57 #define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX) 58 58 59 59 … … 268 268 an error message. */ 269 269 FILE *open_named_file (const char *name, const char *mode, 270 u_long magic_num, int err_mode);270 mg_u_long magic_num, int err_mode); 271 271 272 272 … … 286 286 an error message. */ 287 287 FILE *open_file (const char *name, const char *suffix, const char *mode, 288 u_long magic_num, int err_mode);288 mg_u_long magic_num, int err_mode); 289 289 290 290 … … 305 305 an error message. */ 306 306 FILE *create_named_file (const char *name, const char *mode, 307 u_long magic_num, int err_mode);307 mg_u_long magic_num, int err_mode); 308 308 309 309 … … 322 322 an error message. */ 323 323 FILE *create_file (const char *name, const char *suffix, const char *mode, 324 u_long magic_num, int err_mode);325 326 327 328 329 #endif 324 mg_u_long magic_num, int err_mode); 325 326 327 328 329 #endif -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_invf_dict.c
r16583 r23508 115 115 { 116 116 FILE *id, *idb, *tmp, *ii; 117 unsignedlong i, pos, num, First_word, invf_ptr, invf_len;118 unsignedlong last_ptr = 0;117 mg_u_long i, pos, num, First_word, invf_ptr, invf_len; 118 mg_u_long last_ptr = 0; 119 119 char *FName; 120 120 struct invf_dict_header idh; … … 179 179 for (i = 0; i < idh.dict_size; i++) 180 180 { 181 register unsignedlong extra, copy, suff;182 unsignedlong wcnt, fcnt;181 register mg_u_long extra, copy, suff; 182 mg_u_long wcnt, fcnt; 183 183 184 184 /* build a new word on top of prev */ … … 304 304 305 305 rewind (tmp); 306 sdh.blocks_start = sdh.index_chars + sizeof ( u_long) + sizeof (sdh) +306 sdh.blocks_start = sdh.index_chars + sizeof (mg_u_long) + sizeof (sdh) + 307 307 sdh.num_blocks * sizeof (pos); 308 308 if (force) … … 323 323 324 324 /* skip over the magic number */ 325 fseek (idb, sizeof ( u_long), 0);325 fseek (idb, sizeof (mg_u_long), 0); 326 326 327 327 /* [RPAP - Jan 97: Endian Ordering] */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_invf_dump.c
r16583 r23508 36 36 #include "invf.h" 37 37 38 extern unsignedlong S_btg;38 extern mg_u_long S_btg; 39 39 40 40 /* … … 124 124 process_files (char *name) 125 125 { 126 unsignedlong N, Nstatic, k;126 mg_u_long N, Nstatic, k; 127 127 FILE *dict; 128 128 FILE *invf; … … 172 172 } 173 173 else 174 printf ("% ld %ld\n", N, ifh.no_of_words);174 printf ("%d %d\n", N, ifh.no_of_words); 175 175 for (k = 0; k < ifh.no_of_words; k++) 176 176 { 177 177 int i, blk, doc; 178 register unsignedlong suff, prefix;179 unsignedlong fcnt, wcnt;178 register mg_u_long suff, prefix; 179 mg_u_long fcnt, wcnt; 180 180 char term[MAXSTEMLEN + 1]; 181 181 … … 196 196 { 197 197 if (term_dump) 198 printf ("% ld \"%s\"\n", fcnt, term);198 printf ("%d \"%s\"\n", fcnt, term); 199 199 else 200 printf ("% ld\n", fcnt);200 printf ("%d\n", fcnt); 201 201 } 202 202 blk = BIO_Bblock_Init (Nstatic, fcnt); … … 215 215 GAMMA_DECODE (count); 216 216 if (word_counts) 217 { 217 218 if (binary) 219 { 218 220 fwrite ((char *) &count, sizeof (count), 1, stdout); 221 } 219 222 else 223 { 220 224 printf (" %d", count); 225 } 226 } 221 227 } 222 228 if (!binary) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_invf_merge.c
r16583 r23508 58 58 struct invf_dict_header idh; 59 59 struct invf_file_header ifh; 60 u_long nDocs;60 mg_u_long nDocs; 61 61 62 62 /* Lexicon processing variables */ 63 u_long fcnt, wcnt;63 mg_u_long fcnt, wcnt; 64 64 int suff, pref; 65 65 unsigned char term[MAXSTEMLEN + 1]; 66 u_long term_count;66 mg_u_long term_count; 67 67 int done; 68 68 69 69 /* Variables used for merging */ 70 70 struct stdio_bitio_state sbs; /* for bit-based I/O on inverted files */ 71 u_long nTerms; /* = number of invf entries */71 mg_u_long nTerms; /* = number of invf entries */ 72 72 int *fcntlist; /* store fcnt values read in from the lexicons */ 73 73 … … 81 81 82 82 merge_info m[3]; /* m[OLD], m[NEW] and m[MERGE] */ 83 u_long magicsize; /* how big is magic number? currently always 4 */84 u_long Nstatic; /* static # of documents in file */83 mg_u_long magicsize; /* how big is magic number? currently always 4 */ 84 mg_u_long Nstatic; /* static # of documents in file */ 85 85 86 86 float *DocWeightBuffer; … … 97 97 int fastMerge = 1; /* True if fast merge selected. Default = true */ 98 98 99 u_long oldIdxValue; /* stores last read value from m[OLD].idx99 mg_u_long oldIdxValue; /* stores last read value from m[OLD].idx 100 100 Used to calculate entry lengths */ 101 u_long bytes_output; /* for writing .invf.idx file */102 u_long oldOnlyBits = 0; /* entries in old only */103 u_long oldMergeBits = 0; /* entries in old that are merged with101 mg_u_long bytes_output; /* for writing .invf.idx file */ 102 mg_u_long oldOnlyBits = 0; /* entries in old only */ 103 mg_u_long oldMergeBits = 0; /* entries in old that are merged with 104 104 a new entry */ 105 105 … … 242 242 m[OLD].idx = open_file (m[OLD].fname, INVF_IDX_SUFFIX, "rb", 243 243 MAGIC_INVI, MG_ABORT); 244 fread (&oldIdxValue, sizeof ( u_long), 1, m[OLD].idx);244 fread (&oldIdxValue, sizeof (mg_u_long), 1, m[OLD].idx); 245 245 NTOHUL(oldIdxValue); /* [RPAP - Jan 97: Endian Ordering] */ 246 246 … … 280 280 *=======================================================================*/ 281 281 void 282 procEntry_slow (int tnum, int type, u_long oldN, u_long newN,u_long mergeN)282 procEntry_slow (int tnum, int type, mg_u_long oldN, mg_u_long newN, mg_u_long mergeN) 283 283 /* 284 284 * Process an invf entry. … … 295 295 int fcntNEW = m[NEW].fcntlist[tnum]; 296 296 int inblk, outblk; 297 u_long inbits = 0, outbits = 0;297 mg_u_long inbits = 0, outbits = 0; 298 298 299 299 /* write .invf.idx pointer */ 300 300 HTONUL(bytes_output); /* [RPAP - Jan 97: Endian Ordering] */ 301 fwrite (&bytes_output, sizeof ( u_long), 1, m[MERGE].idx);301 fwrite (&bytes_output, sizeof (mg_u_long), 1, m[MERGE].idx); 302 302 NTOHUL(bytes_output); /* [RPAP - Jan 97: Endian Ordering] */ 303 303 … … 383 383 */ 384 384 { 385 u_long newIdxValue, len = 0;385 mg_u_long newIdxValue, len = 0; 386 386 387 387 /* Calculate IFold entry length in bytes if not NEW type */ 388 388 if (type != NEW) /* read in an index number from m[OLD].idx */ 389 389 { 390 fread (&newIdxValue, sizeof ( u_long), 1, m[OLD].idx);390 fread (&newIdxValue, sizeof (mg_u_long), 1, m[OLD].idx); 391 391 NTOHUL(newIdxValue); /* [RPAP - Jan 97: Endian Ordering] */ 392 392 len = newIdxValue - oldIdxValue; … … 400 400 /* write .invf.idx pointer */ 401 401 HTONUL(bytes_output); /* [RPAP - Jan 97: Endian Ordering] */ 402 fwrite (&bytes_output, sizeof ( u_long), 1, m[MERGE].idx);402 fwrite (&bytes_output, sizeof (mg_u_long), 1, m[MERGE].idx); 403 403 NTOHUL(bytes_output); /* [RPAP - Jan 97: Endian Ordering] */ 404 404 … … 468 468 m[x].term_count = m[x].term_count + 1; 469 469 470 fread ((char *) &(m[x].fcnt), sizeof ( u_long), 1, m[x].dict);471 fread ((char *) &(m[x].wcnt), sizeof ( u_long), 1, m[x].dict);470 fread ((char *) &(m[x].fcnt), sizeof (mg_u_long), 1, m[x].dict); 471 fread ((char *) &(m[x].wcnt), sizeof (mg_u_long), 1, m[x].dict); 472 472 473 473 /* [RPAP - Jan 97: Endian Ordering] */ … … 620 620 /* print some results about terms */ 621 621 { 622 fprintf (stderr, " Terms: OLD = % ld, NEW = %ld, MERGE = %ld\n",622 fprintf (stderr, " Terms: OLD = %d, NEW = %d, MERGE = %d\n", 623 623 m[OLD].nTerms, m[NEW].nTerms, m[MERGE].nTerms); 624 fprintf (stderr, " In OLD only: % ld, In NEW only: %ld, BOTH: %ld\n",624 fprintf (stderr, " In OLD only: %d, In NEW only: %d, BOTH: %d\n", 625 625 (m[MERGE].nTerms - m[NEW].nTerms), 626 626 (m[MERGE].nTerms - m[OLD].nTerms), … … 645 645 /* write final .invf.idx pointer */ 646 646 HTONUL(bytes_output); /* [RPAP - Jan 97: Endian Ordering] */ 647 fwrite (&bytes_output, sizeof ( u_long), 1, m[MERGE].idx);647 fwrite (&bytes_output, sizeof (mg_u_long), 1, m[MERGE].idx); 648 648 NTOHUL(bytes_output); /* [RPAP - Jan 97: Endian Ordering] */ 649 649 650 fprintf (stderr, "Old invf: old only bits: % ld, merged bits: %ld\n",650 fprintf (stderr, "Old invf: old only bits: %d, merged bits: %d\n", 651 651 oldOnlyBits, oldMergeBits); 652 652 } … … 729 729 if (weightfile) 730 730 { 731 u_long i; /* [RPAP - Jan 97: Endian Ordering] */732 733 fprintf (stderr, "writing new weights: Nnew = % ld\n", m[NEW].nDocs);731 mg_u_long i; /* [RPAP - Jan 97: Endian Ordering] */ 732 733 fprintf (stderr, "writing new weights: Nnew = %d\n", m[NEW].nDocs); 734 734 fseek (weightfile, 0, 2); /* end of file */ 735 735 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_invf_rebuild.c
r16583 r23508 43 43 typedef struct invf_info 44 44 { 45 unsignedlong doc_num, count, bits_so_far, count_bits;45 mg_u_long doc_num, count, bits_so_far, count_bits; 46 46 } 47 47 invf_info; … … 200 200 { 201 201 FILE *in, *out, *idx, *odx, *dict; 202 unsignedlong magic, outmode, N, in_k, out_k;203 unsignedlong bits_out, bytes_out, i, j;202 mg_u_long magic, outmode, N, in_k, out_k; 203 mg_u_long bits_out, bytes_out, i, j; 204 204 stdio_bitio_state out_buf, in_buf; 205 205 struct invf_dict_header idh; … … 351 351 for (i = 0; i < ifh_in.no_of_words; i++) 352 352 { 353 unsignedlong blk, p;354 unsignedlong odn_blk = 0, olen_blk = 0;355 unsignedlong idn_blk = 0, ilen_blk = 0;356 register unsignedlong suff;357 unsignedlong fcnt, wcnt, doc_num, bits_so_far, last_major;358 unsignedlong next_mjr_dn, kd;353 mg_u_long blk, p; 354 mg_u_long odn_blk = 0, olen_blk = 0; 355 mg_u_long idn_blk = 0, ilen_blk = 0; 356 register mg_u_long suff; 357 mg_u_long fcnt, wcnt, doc_num, bits_so_far, last_major; 358 mg_u_long next_mjr_dn, kd; 359 359 char dummy2[MAXSTEMLEN + 1]; 360 360 invf_info *ii; … … 380 380 case 1: 381 381 { 382 unsignedlong len;382 mg_u_long len; 383 383 if (p <= ifh_out.params[0]) 384 384 out_k = 0; … … 396 396 case 2: 397 397 { 398 unsignedlong len;398 mg_u_long len; 399 399 if (p <= mins) 400 400 out_k = 0; … … 421 421 case 1: 422 422 { 423 unsignedlong len;423 mg_u_long len; 424 424 if (p <= ifh_in.params[0]) 425 425 in_k = 0; … … 437 437 case 2: 438 438 { 439 unsignedlong len;439 mg_u_long len; 440 440 if (p <= ifh_in.params[1]) 441 441 { … … 469 469 for (j = 0; j < p; j++, kd++) 470 470 { 471 unsignedlong doc_diff, count = 0;471 mg_u_long doc_diff, count = 0; 472 472 if (kd == in_k) 473 473 kd = 0; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_passes.c
r16583 r23508 103 103 #define TERMRECORD '\002' 104 104 105 unsignedlong buf_size = 3 * 1024 * 1024; /* 3Mb */106 unsignedlong invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */107 unsignedlong ChunkLimit = 0;105 mg_u_long buf_size = 3 * 1024 * 1024; /* 3Mb */ 106 mg_u_long invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */ 107 mg_u_long ChunkLimit = 0; 108 108 char InvfLevel = 2; 109 109 char SkipSGML = 0; … … 117 117 118 118 static char Passes = 0; 119 static unsignedlong trace = 0;119 static mg_u_long trace = 0; 120 120 static int Dump = 0; 121 121 static char **files = NULL; … … 181 181 #if 0 182 182 static char * 183 str_comma ( unsignedlong u)183 str_comma (mg_u_long u) 184 184 { 185 185 static char buf[20]; 186 unsignedlong a, b, c, d;186 mg_u_long a, b, c, d; 187 187 a = u / 1000000000; 188 188 u -= a * 1000000000; … … 229 229 230 230 char *buffer = Xmalloc (buf_size); 231 unsignedlong num_docs = 0;232 unsignedlong block_bytes = 0;231 mg_u_long num_docs = 0; 232 mg_u_long block_bytes = 0; 233 233 register int buf_left = buf_size; 234 234 register char *look_pos = buffer; … … 358 358 } 359 359 if (Trace) 360 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs | %s\n",360 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n", 361 361 bytes_processed, num_docs, 362 362 ElapsedTime (&StartTime, NULL)); … … 383 383 mi = mallinfo (); 384 384 block_bytes -= trace; 385 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs |%7.3f Mb | %s\n",385 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n", 386 386 bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0, 387 387 ElapsedTime (&StartTime, NULL)); 388 388 #else 389 389 block_bytes -= trace; 390 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs | %s\n",390 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n", 391 391 bytes_processed, num_docs, 392 392 ElapsedTime (&StartTime, NULL)); … … 439 439 struct mallinfo mi; 440 440 mi = mallinfo (); 441 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs |%7.3f Mb | %s\n",441 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n", 442 442 bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0, 443 443 ElapsedTime (&StartTime, NULL)); 444 444 #else 445 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs | %s\n",445 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n", 446 446 bytes_processed, num_docs, 447 447 ElapsedTime (&StartTime, NULL)); … … 563 563 break; 564 564 case 't': 565 trace = ( unsignedlong) (atof (optarg) * 1024 * 1024);565 trace = (mg_u_long) (atof (optarg) * 1024 * 1024); 566 566 break; 567 567 case 'M': -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_passes_4jni.c
r16583 r23508 57 57 #define TERMRECORD '\002' 58 58 59 unsignedlong buf_size = 3 * 1024 * 1024; /* 3Mb */60 unsignedlong invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */61 unsignedlong ChunkLimit = 0;59 mg_u_long buf_size = 3 * 1024 * 1024; /* 3Mb */ 60 mg_u_long invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */ 61 mg_u_long ChunkLimit = 0; 62 62 char InvfLevel = 2; 63 63 char SkipSGML = 0; … … 71 71 FILE * Trace; 72 72 char * filename; 73 unsignedlong num_docs = 0;74 unsignedlong block_bytes = 0;73 mg_u_long num_docs = 0; 74 mg_u_long block_bytes = 0; 75 75 76 76 static char Passes = 0; 77 static unsignedlong trace = 0;77 static mg_u_long trace = 0; 78 78 static int Dump = 0; 79 79 static char **files = NULL; … … 193 193 194 194 /* -b arg to mg_passes */ 195 void set_buffer_size( long size) {195 void set_buffer_size(mg_s_long size) { 196 196 buf_size = size * 1024; 197 197 if (buf_size < MIN_BUF) { … … 201 201 202 202 /* -c arg to mg_passes */ 203 void set_chunk_limit( long chunk_limit) {203 void set_chunk_limit(mg_s_long chunk_limit) { 204 204 ChunkLimit = chunk_limit; 205 205 } … … 259 259 /* -t arg to mg_passes */ 260 260 void set_trace_point(int tracepos) { 261 trace = ( unsignedlong) (tracepos * 1024 * 1024);261 trace = (mg_u_long) (tracepos * 1024 * 1024); 262 262 } 263 263 … … 410 410 } 411 411 if (Trace) 412 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs | %s\n",412 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n", 413 413 bytes_processed, num_docs, 414 414 ElapsedTime (&StartTime, NULL)); … … 435 435 mi = mallinfo (); 436 436 block_bytes -= trace; 437 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs |%7.3f Mb | %s\n",437 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n", 438 438 bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0, 439 439 ElapsedTime (&StartTime, NULL)); 440 440 #else 441 441 block_bytes -= trace; 442 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs | %s\n",442 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n", 443 443 bytes_processed, num_docs, 444 444 ElapsedTime (&StartTime, NULL)); … … 492 492 struct mallinfo mi; 493 493 mi = mallinfo (); 494 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs |%7.3f Mb | %s\n",494 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n", 495 495 bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0, 496 496 ElapsedTime (&StartTime, NULL)); 497 497 #else 498 fprintf (Trace, "%11" ULL_FS " bytes |%7 lu docs | %s\n",498 fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n", 499 499 bytes_processed, num_docs, 500 500 ElapsedTime (&StartTime, NULL)); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_passes_4jni.h
r16583 r23508 40 40 41 41 /* -b arg to mg_passes */ 42 void set_buffer_size( long size);42 void set_buffer_size(mg_s_long size); 43 43 44 44 /* -c arg to mg_passes */ 45 void set_chunk_limit( long chunk_limit);45 void set_chunk_limit(mg_s_long chunk_limit); 46 46 47 47 /* -C arg to mg_passes */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_perf_hash_build.c
r16583 r23508 116 116 { 117 117 FILE *dict, *hash; 118 unsignedlong i;118 mg_u_long i; 119 119 u_char prev[MAXSTEMLEN + 1]; 120 120 struct invf_dict_header idh; … … 154 154 for (i = 0; i < idh.dict_size; i++) 155 155 { 156 register unsignedlong copy, suff, l;157 unsignedlong wcnt, fcnt;156 register mg_u_long copy, suff, l; 157 mg_u_long wcnt, fcnt; 158 158 159 159 /* build a new word on top of prev */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_stem_idx.c
r16583 r23508 69 69 70 70 71 static unsignedlong MaxMemInUse = 0;72 static unsignedlong MemInUse = 0;71 static mg_u_long MaxMemInUse = 0; 72 static mg_u_long MemInUse = 0; 73 73 74 74 static idx_hash_rec **IdxHashTable; 75 static unsignedlong IdxHashSize;76 static unsignedlong IdxHashUsed;75 static mg_u_long IdxHashSize; 76 static mg_u_long IdxHashUsed; 77 77 static u_char *IdxPool; 78 78 static int IdxPoolLeft; … … 88 88 int force = 0; 89 89 90 static long lookback = 4;90 static mg_s_long lookback = 4; 91 91 92 92 static void … … 216 216 ReadStemDictBlk (File * stem_file) 217 217 { 218 unsignedlong i;218 mg_u_long i; 219 219 stemmed_dict *sd; 220 220 u_char *buffer; … … 357 357 register unsigned int res; 358 358 int num_indexes; 359 unsignedlong *first_word, *last_invf_len;359 mg_u_long *first_word, *last_invf_len; 360 360 unsigned short *num_words; 361 361 u_char *base; … … 368 368 369 369 /* Move through block header */ 370 first_word = ( unsignedlong *) (sd->buffer);370 first_word = (mg_u_long *) (sd->buffer); 371 371 NTOHUL(*first_word); /* [RPAP - Jan 97: Endian Ordering] */ 372 last_invf_len = ( unsignedlong *) (first_word + 1);372 last_invf_len = (mg_u_long *) (first_word + 1); 373 373 NTOHUL(*last_invf_len); /* [RPAP - Jan 97: Endian Ordering] */ 374 374 num_words = (unsigned short *) (last_invf_len + 1); … … 404 404 405 405 /* Skip irrelevant word info */ 406 base += sizeof ( u_long);407 base += sizeof ( u_long);408 base += sizeof ( u_long);406 base += sizeof (mg_u_long); 407 base += sizeof (mg_u_long); 408 base += sizeof (mg_u_long); 409 409 410 410 /* Stem word */ … … 419 419 { 420 420 /* Search the idx hash table for word */ 421 register unsignedlong hashval, step;421 register mg_u_long hashval, step; 422 422 register int hsize = IdxHashSize; 423 423 HASH (hashval, step, word, hsize); … … 516 516 { 517 517 idx_hash_rec **ht; 518 unsignedlong size;519 unsignedlong i;518 mg_u_long size; 519 mg_u_long i; 520 520 size = prime (IdxHashSize * 2); 521 521 if (!(ht = Xmalloc (sizeof (idx_hash_rec *) * size))) … … 529 529 register u_char *wptr; 530 530 idx_hash_rec *ent; 531 register unsignedlong hashval, step;531 register mg_u_long hashval, step; 532 532 533 533 wptr = IdxHashTable[i]->word; … … 568 568 { 569 569 char *FName; 570 unsignedlong i, j, pos, First_word, num;570 mg_u_long i, j, pos, First_word, num; 571 571 struct stem_idx_header sih; 572 572 u_char *buffer, *last_word = NULL; … … 636 636 for (i = 0; i < IdxHashUsed; i++) 637 637 { 638 register unsignedlong extra, copy, suff;638 register mg_u_long extra, copy, suff; 639 639 register struct idx_hash_rec *ent = IdxHashTable[i]; 640 640 … … 765 765 766 766 rewind (tmp); 767 sih.blocks_start = sih.index_chars + sizeof ( u_long) + sizeof (sih) +767 sih.blocks_start = sih.index_chars + sizeof (mg_u_long) + sizeof (sih) + 768 768 sih.num_blocks * sizeof (pos); 769 769 if (force) … … 784 784 785 785 /* skip over the magic number */ 786 fseek (idbi, sizeof ( u_long), 0);786 fseek (idbi, sizeof (mg_u_long), 0); 787 787 788 788 /* [RPAP - Jan 97: Endian Ordering] */ … … 821 821 sdh.indexed |= 1 << (stem_method - 1); 822 822 HTONUL(sdh.indexed); 823 fseek (idb, sizeof ( u_long), 0);823 fseek (idb, sizeof (mg_u_long), 0); 824 824 fwrite ((char *) &sdh, sizeof (sdh), 1, idb); 825 825 fclose (idb); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_text_estimate.c
r16583 r23508 91 91 typedef struct stats_t 92 92 { 93 u_long freq, occur;94 u_long len;93 mg_u_long freq, occur; 94 mg_u_long len; 95 95 } 96 96 stats_t; 97 97 98 static u_long huff_count = 0;99 static u_long escape_count = 0;98 static mg_u_long huff_count = 0; 99 static mg_u_long escape_count = 0; 100 100 101 101 … … 106 106 static double ReadInWordsSpecial (char *name, double *num_bytes, 107 107 double *num_extra_bytes, 108 u_long *aux_compressed);108 mg_u_long *aux_compressed); 109 109 110 110 … … 116 116 ProgTime StartTime; 117 117 double num_bytes, num_extra_bytes = 0; /* [RJM 07/97: 4G limit] */ 118 u_long aux_compressed;118 mg_u_long aux_compressed; 119 119 int ch; 120 120 double bytes; … … 207 207 compression_stats_header csh; 208 208 FILE *f; 209 u_long which;209 mg_u_long which; 210 210 double bytes, bits = 0; 211 211 … … 246 246 if (ht[which]) 247 247 { 248 register unsignedlong hashval, step;248 register mg_u_long hashval, step; 249 249 register int tsize = ht[which]->size; 250 250 register u_char **wptr; … … 335 335 bits += 5.5 * csh.num_docs; 336 336 337 bytes = bits / 8 + sizeof (compressed_text_header) + sizeof ( u_long);337 bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (mg_u_long); 338 338 339 339 *num_bytes = csh.num_bytes; … … 356 356 ReadInWordsSpecial (char *name, double *num_bytes, 357 357 double *num_extra_bytes, 358 u_long *aux_compressed)358 mg_u_long *aux_compressed) 359 359 { 360 360 compression_stats_header csh; 361 361 FILE *f; 362 u_long magic, which;362 mg_u_long magic, which; 363 363 double bytes, bits = 0; 364 364 double size[2]; … … 386 386 frags_stats_header fsh; 387 387 int j, num = 0; 388 long lens[16], chars[256];388 mg_s_long lens[16], chars[256]; 389 389 390 390 bzero ((char *) lens, sizeof (lens)); … … 420 420 if (ht[which]) 421 421 { 422 register unsignedlong hashval, step;422 register mg_u_long hashval, step; 423 423 register int tsize = ht[which]->size; 424 424 register u_char **wptr; … … 489 489 int j, num_buckets = 0; 490 490 int start[10], end[10]; 491 long flens[16], fchars[256];491 mg_u_long flens[16], fchars[256]; 492 492 493 493 for (j = 0; j < 256; j++) … … 577 577 bits += 5.5 * csh.num_docs; 578 578 579 bytes = bits / 8 + sizeof (compressed_text_header) + sizeof ( u_long);579 bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (mg_u_long); 580 580 581 581 *num_bytes = csh.num_bytes; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_text_merge.c
r16583 r23508 43 43 FileName old_name, new_name, merge_name; 44 44 45 long magicsize; /* == where the header in a file begins */45 mg_s_long magicsize; /* == where the header in a file begins */ 46 46 47 47 compressed_text_header cth[3]; … … 100 100 { 101 101 int i; 102 u_long data, offset;102 mg_u_long data, offset; 103 103 byte c; 104 104 … … 135 135 for (i = 0; i < cth[OLD].num_of_docs; i++) 136 136 { 137 fread (&data, sizeof ( u_long), 1, idx[OLD]);138 fwrite (&data, sizeof ( u_long), 1, idx[MERGE]);137 fread (&data, sizeof (mg_u_long), 1, idx[OLD]); 138 fwrite (&data, sizeof (mg_u_long), 1, idx[MERGE]); 139 139 } 140 140 141 141 /* offset is the amount to add to each entry from idx[NEW] */ 142 fread (&offset, sizeof ( u_long), 1, idx[OLD]);142 fread (&offset, sizeof (mg_u_long), 1, idx[OLD]); 143 143 NTOHUL(offset); /* [RPAP - Jan 97: Endian Ordering] */ 144 144 offset -= (4 + sizeof (cth[OLD])); /* 4 for the magic number */ … … 146 146 for (i = 0; i < cth[NEW].num_of_docs; i++) 147 147 { 148 fread (&data, sizeof ( u_long), 1, idx[NEW]);148 fread (&data, sizeof (mg_u_long), 1, idx[NEW]); 149 149 NTOHUL(data); /* [RPAP - Jan 97: Endian Ordering] */ 150 150 data += offset; 151 151 HTONUL(data); /* [RPAP - Jan 97: Endian Ordering] */ 152 fwrite (&data, sizeof ( u_long), 1, idx[MERGE]);152 fwrite (&data, sizeof (mg_u_long), 1, idx[MERGE]); 153 153 } 154 /* write last u_long in idx[MERGE] (= length of file) */155 fread (&data, sizeof ( u_long), 1, idx[NEW]);154 /* write last mg_u_long in idx[MERGE] (= length of file) */ 155 fread (&data, sizeof (mg_u_long), 1, idx[NEW]); 156 156 NTOHUL(data); /* [RPAP - Jan 97: Endian Ordering] */ 157 157 data += offset; 158 158 HTONUL(data); /* [RPAP - Jan 97: Endian Ordering] */ 159 fwrite (&data, sizeof ( u_long), 1, idx[MERGE]);159 fwrite (&data, sizeof (mg_u_long), 1, idx[MERGE]); 160 160 161 161 /******* update .text *******/ … … 188 188 fclose (idx[NEW]); 189 189 190 fprintf (stderr, "mg_text_merge: % ld documents added to %s\n",190 fprintf (stderr, "mg_text_merge: %d documents added to %s\n", 191 191 cth[NEW].num_of_docs, merge_name); 192 192 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_weights_build.c
r16583 r23508 38 38 #include "words.h" 39 39 40 #define MAXBITS (sizeof( unsignedlong) * 8)40 #define MAXBITS (sizeof(mg_u_long) * 8) 41 41 42 42 /* … … 81 81 static char *file_name = ""; 82 82 static char *text_file_name = ""; 83 static unsignedlong NumPara = 0;84 static unsignedlong StaticNumOfDocs = 0;85 86 unsignedlong get_NumPara (void);87 unsignedlong get_StaticNumOfDocs (void);83 static mg_u_long NumPara = 0; 84 static mg_u_long StaticNumOfDocs = 0; 85 86 mg_u_long get_NumPara (void); 87 mg_u_long get_StaticNumOfDocs (void); 88 88 void GenerateWeights (void); 89 89 void Make_weight_approx (void); … … 141 141 142 142 143 unsignedlong143 mg_u_long 144 144 get_NumPara (void) 145 145 { … … 158 158 159 159 160 unsignedlong160 mg_u_long 161 161 get_StaticNumOfDocs (void) 162 162 /* the static number of documents is the N parameter used to … … 253 253 { 254 254 u_char dummy1, dummy2[MAXSTEMLEN + 1]; 255 unsignedlong fcnt, wcnt, blk, CurrDoc, p, j;255 mg_u_long fcnt, wcnt, blk, CurrDoc, p, j; 256 256 float idf; 257 257 … … 281 281 /* check the inverted file index entry for this word */ 282 282 { 283 unsignedlong loc;283 mg_u_long loc; 284 284 fread ((char *) &loc, sizeof (loc), 1, idx); 285 285 NTOHUL(loc); /* [RPAP - Jan 97: Endian Ordering] */ … … 292 292 for (j = 0; j < p; j++) 293 293 { 294 unsignedlong x, tf;294 mg_u_long x, tf; 295 295 BBLOCK_DECODE (x, blk); 296 296 CurrDoc += x; … … 346 346 { 347 347 int i, pos, max; 348 unsignedlong buf;348 mg_u_long buf; 349 349 double U, L, B; 350 350 FILE *approx, *exact; … … 368 368 369 369 } 370 fseek (exact, sizeof ( u_long), SEEK_SET);370 fseek (exact, sizeof (mg_u_long), SEEK_SET); 371 371 372 372 B = pow (U / L, pow (2.0, -(double) bits)); … … 392 392 for (buf = pos = i = 0; i < NumPara; i++) 393 393 { 394 unsignedlong fx;394 mg_u_long fx; 395 395 float wgt; 396 396 fread ((char *) &wgt, sizeof (wgt), 1, exact); … … 476 476 struct 477 477 { 478 unsignedlong Start;478 mg_u_long Start; 479 479 float Weight; 480 480 } … … 483 483 { 484 484 int count; 485 fread ((char *) &data.Start, sizeof ( unsignedlong), 1, idx);485 fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx); 486 486 if (para && i < cth.num_of_docs) 487 487 { … … 502 502 } 503 503 /* Write out the extra entry for the idx file */ 504 fread ((char *) &data.Start, sizeof ( unsignedlong), 1, idx);504 fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx); 505 505 data.Weight = 0; 506 506 fwrite((char*)&data, sizeof(data), 1, idx_wgt); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgdictlist.c
r16583 r23508 73 73 int quick = 0; 74 74 int no_of_words[2]; 75 u_long maxcodelen[2];75 mg_u_long maxcodelen[2]; 76 76 77 77 char *dictname = ""; … … 102 102 103 103 if (quick) 104 printf ("% ld\n", idh.dict_size);104 printf ("%d\n", idh.dict_size); 105 105 else 106 106 { 107 printf ("# lookback = % lu\n", idh.lookback);108 printf ("# dict size = % lu\n", idh.dict_size);109 printf ("# total bytes = % lu\n", idh.total_bytes);110 printf ("# index string bytes = % lu\n", idh.index_string_bytes);107 printf ("# lookback = %u\n", idh.lookback); 108 printf ("# dict size = %u\n", idh.dict_size); 109 printf ("# total bytes = %u\n", idh.total_bytes); 110 printf ("# index string bytes = %u\n", idh.index_string_bytes); 111 111 printf ("# input bytes = %.0f\n", idh.input_bytes); /* [RJM 07/97: 4G limit] */ 112 printf ("# num of docs = % lu\n", idh.num_of_docs);113 printf ("# static num of docs = % lu\n", idh.static_num_of_docs);114 printf ("# num of words = % lu\n", idh.num_of_words);112 printf ("# num of docs = %u\n", idh.num_of_docs); 113 printf ("# static num of docs = %u\n", idh.static_num_of_docs); 114 printf ("# num of words = %u\n", idh.num_of_words); 115 115 printf ("#\n"); 116 116 } … … 118 118 for (i = 0; i < idh.dict_size; i++) 119 119 { 120 register unsignedlong copy, suff;121 unsignedlong wcnt, fcnt;120 register mg_u_long copy, suff; 121 mg_u_long wcnt, fcnt; 122 122 123 123 /* build a new word on top of prev */ … … 137 137 if (!quick) 138 138 { 139 printf ("%d: %8 ld ", i, wcnt);140 printf ("/ %5 ld ", fcnt);141 printf ("%2d %2 ld\t\"", *prev, copy);139 printf ("%d: %8d ", i, wcnt); 140 printf ("/ %5d ", fcnt); 141 printf ("%2d %2d\t\"", *prev, copy); 142 142 } 143 143 printf ("%s", word2str (prev)); 144 144 if (quick) 145 printf (" % ld %ld\n", wcnt, fcnt);145 printf (" %d %d\n", wcnt, fcnt); 146 146 else 147 147 { … … 159 159 { 160 160 comp_frags_header cfh; 161 u_long *codes;161 mg_u_long *codes; 162 162 u_char prev[MAXSTEMLEN + 1]; 163 163 int i; … … 168 168 printf ("#\n"); 169 169 printf ("# max code len = %u\n", cfh.hd.maxcodelen); 170 printf ("# total bytes = % lu\n", cfh.uncompressed_size);170 printf ("# total bytes = %d\n", cfh.uncompressed_size); 171 171 printf ("#\n"); 172 172 … … 202 202 int i; 203 203 huff_data hd; 204 u_long *codes;204 mg_u_long *codes; 205 205 206 206 if (Read_Huffman_Data (f, &hd, NULL, NULL) == -1) … … 232 232 int i; 233 233 huff_data hd; 234 u_long *codes;234 mg_u_long *codes; 235 235 236 236 if (Read_Huffman_Data (f, &hd, NULL, NULL) == -1) … … 280 280 break; 281 281 } 282 printf ("# num words = % lu\n", cdh.num_words[1]);283 printf ("# num word chars = % lu\n", cdh.num_word_chars[1]);284 printf ("# num non-words = % lu\n", cdh.num_words[0]);285 printf ("# num non-word chars = % lu\n", cdh.num_word_chars[0]);286 printf ("# lookback = % lu\n", cdh.lookback);282 printf ("# num words = %d\n", cdh.num_words[1]); 283 printf ("# num word chars = %d\n", cdh.num_word_chars[1]); 284 printf ("# num non-words = %d\n", cdh.num_words[0]); 285 printf ("# num non-word chars = %d\n", cdh.num_word_chars[0]); 286 printf ("# lookback = %d\n", cdh.lookback); 287 287 288 288 for (which = 0; which < 2; which++) … … 338 338 339 339 if (!quick) 340 printf ("#\n# num %9s = % lu\n#\n", i ? "words" : "non-words",340 printf ("#\n# num %9s = %u\n#\n", i ? "words" : "non-words", 341 341 fsh.num_frags); 342 342 … … 344 344 { 345 345 u_char Word[16]; 346 u_long freq, occur_num;346 mg_u_long freq, occur_num; 347 347 348 348 fread (&freq, sizeof (freq), 1, f); … … 355 355 Word[0] = fgetc (f); 356 356 fread (Word + 1, Word[0], 1, f); 357 printf ("%d: %7 ld : %7ld : \"%s\"\n", j, freq,357 printf ("%d: %7d : %7d : \"%s\"\n", j, freq, 358 358 occur_num, word2str (Word)); 359 359 } … … 365 365 { 366 366 FILE *fp; 367 unsignedlong magic = 0;367 mg_u_long magic = 0; 368 368 369 369 if (argc < 2) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgpass.c
r16583 r23508 100 100 #define path_length 256 101 101 102 unsignedlong buf_size = 3 * 1024 * 1024; /* 3Mb */103 unsignedlong invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */104 unsignedlong ChunkLimit = 0;102 mg_u_long buf_size = 3 * 1024 * 1024; /* 3Mb */ 103 mg_u_long invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */ 104 mg_u_long ChunkLimit = 0; 105 105 char InvfLevel = 2; 106 106 char SkipSGML = 0; … … 115 115 116 116 static char Passes = 0; 117 static unsignedlong trace = 0;117 static mg_u_long trace = 0; 118 118 static int Dump = 0; 119 119 static char **files = NULL; … … 237 237 void search(char *dname, char *fname) 238 238 { 239 long dirtag; struct _finddata_t dirinfo; int in_fd; char *res;239 mg_s_long dirtag; struct _finddata_t dirinfo; int in_fd; char *res; 240 240 char search_name[path_length], found_name[path_length]; 241 241 … … 433 433 break; 434 434 case 't': 435 trace = ( unsignedlong) (atof (optarg) * 1024 * 1024);435 trace = (mg_u_long) (atof (optarg) * 1024 * 1024); 436 436 break; 437 437 case 'h': -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgquery.c
r16583 r23508 143 143 #ifdef TREC_MODE 144 144 char *trec_ids = NULL; 145 long *trec_paras = NULL;145 mg_s_long *trec_paras = NULL; 146 146 #endif 147 147 … … 264 264 265 265 #ifdef USE_PROCESS_MEM 266 static u_long266 static mg_u_long 267 267 process_mem (void) 268 268 { … … 272 272 { 273 273 char buf[128]; 274 sprintf (buf, "/proc/% ld", (long) getpid ());274 sprintf (buf, "/proc/%d", (mg_s_long) getpid ()); 275 275 fd = open (buf, O_RDONLY); 276 276 } … … 347 347 StatFile (File * F) 348 348 { 349 static unsignedlong NumBytes = 0, NumSeeks = 0, NumReads = 0;349 static mg_u_long NumBytes = 0, NumSeeks = 0, NumReads = 0; 350 350 if (F) 351 351 { 352 if ((int ) F != -1)352 if ((intptr_t) F != -1) 353 353 { 354 354 if (!BooleanEnv (GetEnv ("briefstats"), 0)) … … 533 533 /* num should be greater than or equal to 1 */ 534 534 int 535 RawDocOutput (query_data * qd, u_long num, FILE * Output)536 { 537 static u_long last_pos = 0;535 RawDocOutput (query_data * qd, mg_u_long num, FILE * Output) 536 { 537 static mg_u_long last_pos = 0; 538 538 static u_char *c_buffer = 0; 539 539 static int buf_len = -1; 540 540 static u_char *uc_buffer = 0; 541 u_long pos, len;541 mg_u_long pos, len; 542 542 int ULen; 543 543 … … 570 570 void 571 571 StringOut (FILE * Output, char *string, 572 int intvalid, unsignedlong intval,572 int intvalid, mg_u_long intval, 573 573 int floatvalid, double floatval) 574 574 { … … 583 583 case 'n': 584 584 if (intvalid) 585 fprintf (Output, "% lu", intval);585 fprintf (Output, "%d", intval); 586 586 else 587 587 fprintf (Output, "%%n"); … … 603 603 604 604 void 605 HeaderOut (FILE * Output, u_char * UDoc, unsignedlong ULen, int heads_length)605 HeaderOut (FILE * Output, u_char * UDoc, mg_u_long ULen, int heads_length) 606 606 { 607 607 int i, space = 1, num = 0; … … 688 688 { 689 689 u_char *UDoc = NULL; 690 unsignedlong ULen;690 mg_u_long ULen; 691 691 692 692 if (need_text) … … 760 760 } 761 761 #else 762 fprintf (Output, "%7d %6.4f %7 lu\n", GetDocNum (qd),762 fprintf (Output, "%7d %6.4f %7u\n", GetDocNum (qd), 763 763 GetDocWeight (qd), GetDocCompLength (qd)); 764 764 #endif … … 776 776 if (PagerRunning && trec_ids) 777 777 { 778 long DN, PN = GetDocNum (qd) - 1;778 mg_s_long DN, PN = GetDocNum (qd) - 1; 779 779 if (trec_paras) 780 780 DN = trec_paras[PN]; 781 781 else 782 782 DN = PN; 783 fprintf (Output, "%-14.14s %8 ld %10.5f\n",783 fprintf (Output, "%-14.14s %8d %10.5f\n", 784 784 &trec_ids[DN * 14], PN + 1, GetDocWeight (qd)); 785 785 } … … 991 991 return; 992 992 } 993 sprintf (pager, "%s --style=%s --pager=%s --stem_method=% ld --stemmer=%ld %s",993 sprintf (pager, "%s --style=%s --pager=%s --stem_method=%d --stemmer=%d %s", 994 994 HILITE_PAGER, 995 995 GetEnv ("hilite_style"), -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgstat.c
r16583 r23508 70 70 void ProcessDict (char *); 71 71 void ProcessStem (char *); 72 long ProcessStemBlk (char *name); /* [RPAP - Jan 97: Stem Index Change] */72 mg_s_long ProcessStemBlk (char *name); /* [RPAP - Jan 97: Stem Index Change] */ 73 73 74 74 static mg_ullong inputbytes = 0; … … 86 86 int ch; 87 87 int exact = 0; 88 long indexed = 0; /* [RPAP - Jan 97: Stem Index Change] */88 mg_s_long indexed = 0; /* [RPAP - Jan 97: Stem Index Change] */ 89 89 opterr = 0; 90 90 while ((ch = getopt (argc, argv, "Ehf:d:")) != -1) … … 258 258 { 259 259 inputbytes = cth.num_of_bytes; 260 printf ("Input bytes : %10 " ULL_FS ", %8.2f Mbyte\n",260 printf ("Input bytes : %10f, %8.2f Mbyte\n", 261 261 cth.num_of_bytes, (double) cth.num_of_bytes / 1024 / 1024); 262 printf ("Documents : %10 lu\n", cth.num_of_docs);263 printf ("Words in collection [dict] : %10 lu\n", cth.num_of_words);264 printf ("Longest doc in collection [dict] : %10 lucharacters\n",262 printf ("Documents : %10d\n", cth.num_of_docs); 263 printf ("Words in collection [dict] : %10d\n", cth.num_of_words); 264 printf ("Longest doc in collection [dict] : %10d characters\n", 265 265 cth.length_of_longest_doc); 266 266 printf ("Maximum ratio : %10.2f\n", cth.ratio); … … 269 269 if (have_cdh) 270 270 { 271 printf ("Words in dict : %10 lu\n", cdh.num_words[1]);272 printf ("Non-words in dict : %10 lu\n", cdh.num_words[0]);273 printf ("Total chars of distinct words : %10 lu\n", cdh.num_word_chars[1]);274 printf ("Total chars of distinct non-words : %10 lu\n", cdh.num_word_chars[0]);271 printf ("Words in dict : %10d\n", cdh.num_words[1]); 272 printf ("Non-words in dict : %10d\n", cdh.num_words[0]); 273 printf ("Total chars of distinct words : %10d\n", cdh.num_word_chars[1]); 274 printf ("Total chars of distinct non-words : %10d\n", cdh.num_word_chars[0]); 275 275 } 276 276 … … 294 294 return; 295 295 fread ((char *) &idh, sizeof (idh), 1, f); 296 printf ("Words in collection [stem] : %10 ld\n", NTOHUL(idh.num_of_words)); /* [RPAP - Jan 97: Endian Ordering] */297 printf ("Words in stem : %10 ld\n", NTOHUL(idh.dict_size)); /* [RPAP - Jan 97: Endian Ordering] */298 printf ("Indexed fragments : %10 ld\n", NTOHUL(idh.num_of_docs)); /* [RPAP - Jan 97: Endian Ordering] */299 printf ("Total chars of stem words : %10 ld\n", NTOHUL(idh.total_bytes)); /* [RPAP - Jan 97: Endian Ordering] */296 printf ("Words in collection [stem] : %10d\n", NTOHUL(idh.num_of_words)); /* [RPAP - Jan 97: Endian Ordering] */ 297 printf ("Words in stem : %10d\n", NTOHUL(idh.dict_size)); /* [RPAP - Jan 97: Endian Ordering] */ 298 printf ("Indexed fragments : %10d\n", NTOHUL(idh.num_of_docs)); /* [RPAP - Jan 97: Endian Ordering] */ 299 printf ("Total chars of stem words : %10d\n", NTOHUL(idh.total_bytes)); /* [RPAP - Jan 97: Endian Ordering] */ 300 300 fclose (f); 301 301 } … … 306 306 307 307 /* [RPAP - Jan 97: Stem Index Change] */ 308 long308 mg_s_long 309 309 ProcessStemBlk (char *name) 310 310 { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgstemidxlist.c
r16583 r23508 36 36 read_3_in_4 (FILE * idbi) 37 37 { 38 unsignedlong i;38 mg_u_long i; 39 39 stemmed_idx *si; 40 40 u_char *buffer; … … 106 106 } 107 107 108 printf ("# lookback = % lu\n", si->sih.lookback);109 printf ("# block_size = % lu\n", si->sih.block_size);110 printf ("# num_blocks = % lu\n", si->sih.num_blocks);111 printf ("# blocks_start = % lu\n", si->sih.blocks_start);112 printf ("# index_chars = % lu\n", si->sih.index_chars);113 printf ("# num_of_words = % lu\n", si->sih.num_of_words);108 printf ("# lookback = %u\n", si->sih.lookback); 109 printf ("# block_size = %u\n", si->sih.block_size); 110 printf ("# num_blocks = %u\n", si->sih.num_blocks); 111 printf ("# blocks_start = %u\n", si->sih.blocks_start); 112 printf ("# index_chars = %u\n", si->sih.index_chars); 113 printf ("# num_of_words = %u\n", si->sih.num_of_words); 114 114 115 115 block = 0; 116 116 while (block < si->sih.num_blocks) 117 117 { 118 unsignedlong *first_word;118 mg_u_long *first_word; 119 119 unsigned short *num_words; 120 120 unsigned short *index; 121 long res;121 mg_s_long res; 122 122 u_char *base; 123 123 int num_indexes; … … 128 128 si->active = si->pos[block]; 129 129 130 first_word = ( unsignedlong *) (si->buffer);130 first_word = (mg_u_long *) (si->buffer); 131 131 NTOHUL(*first_word); /* [RPAP - Jan 97: Endian Ordering] */ 132 132 num_words = (unsigned short *) (first_word + 1); … … 143 143 144 144 printf ("\n# block = %d\n", block); 145 printf ("# first_word = % lu\n", *first_word);145 printf ("# first_word = %u\n", *first_word); 146 146 printf ("# num_words = %u\n", *num_words); 147 147 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/query.docnums.c
r16583 r23508 64 64 { 65 65 DocList *Docs = MakeDocList (0); 66 unsignedlong start = 0, finish;66 mg_u_long start = 0, finish; 67 67 int range = 0; /* is there a range or not ? */ 68 68 … … 75 75 finish <= qd->sd->sdh.num_of_docs) 76 76 { 77 unsignedlong i;77 mg_u_long i; 78 78 if (!range) 79 79 start = finish; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/query.ranked.c
r16583 r23508 89 89 float *OrgWeight; 90 90 int DocNum; 91 u_long SeekPos; /* position in the text file in bytes */92 u_long Len; /* length of the document in bytes */91 mg_u_long SeekPos; /* position in the text file in bytes */ 92 mg_u_long Len; /* length of the document in bytes */ 93 93 } 94 94 HeapEntry; … … 290 290 { 291 291 int j; 292 long num_entries, word_num;293 unsignedlong count, doc_count, invf_ptr, invf_len;292 mg_s_long num_entries, word_num; 293 mg_u_long count, doc_count, invf_ptr, invf_len; 294 294 int weight_to_apply, stem_to_apply; 295 295 int method_using = -1; … … 408 408 { 409 409 int i; 410 u_long max_doc_count = 0;410 mg_u_long max_doc_count = 0; 411 411 412 412 /* get the maximum doc count */ … … 748 748 for (i = 0; i < ST->no_of_items; i++, ide = SP_get_next (ST)) 749 749 { 750 u_long SeekPos, Len;750 mg_u_long SeekPos, Len; 751 751 float Weight; 752 752 if (!ide->Sum) … … 777 777 for (i = 0; i < qd->sd->sdh.num_of_docs; i++, fptr++) 778 778 { 779 u_long SeekPos, Len;779 mg_u_long SeekPos, Len; 780 780 float Weight; 781 781 if (!*fptr) … … 803 803 for (ideh = HT->Head; ideh; ideh = ideh->next) 804 804 { 805 u_long SeekPos, Len;805 mg_u_long SeekPos, Len; 806 806 float Weight; 807 807 if (!ideh->IDE.Sum) … … 829 829 for (i = 0; i < LT->num; i++, ide++) 830 830 { 831 u_long SeekPos, Len;831 mg_u_long SeekPos, Len; 832 832 float Weight; 833 833 if (!ide->Sum) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/stem_search.c
r16583 r23508 83 83 ReadStemDictBlk (File * stem_file) 84 84 { 85 unsignedlong i;85 mg_u_long i; 86 86 stemmed_dict *sd; 87 87 u_char *buffer; … … 173 173 ReadStemIdxBlk (File * stem_idx_file) 174 174 { 175 unsignedlong i;175 mg_u_long i; 176 176 stemmed_idx *si; 177 177 u_char *buffer; … … 300 300 * This function looks up a word in the stemmed dictionary, it returns -1 301 301 * if the word cound not be found, and 0 if it successfully finds the word. 302 * If count is non-null the u longit is pointing to is set to the number of302 * If count is non-null the unsigned it is pointing to is set to the number of 303 303 * occurances of the stemmed word in the collection. i.e wcnt. 304 * If doc_count is non-null the u longit is pointing to is set to the number304 * If doc_count is non-null the unsigned it is pointing to is set to the number 305 305 * of documents that the word occurs in. i.e fcnt 306 * If invf_ptr is non-null the u longit is pointing to is set to the position306 * If invf_ptr is non-null the unsigned it is pointing to is set to the position 307 307 * of the inverted file where the entry for this word start. 308 308 */ 309 309 int 310 FindWord (stemmed_dict * sd, u_char * Word, unsignedlong *count,311 unsigned long *doc_count, unsignedlong *invf_ptr,312 unsignedlong *invf_len)310 FindWord (stemmed_dict * sd, u_char * Word, mg_u_long *count, 311 mg_u_long *doc_count, mg_u_long *invf_ptr, 312 mg_u_long *invf_len) 313 313 { 314 314 register int lo, hi, mid, c; 315 315 register unsigned int res; 316 316 int block, num_indexes; 317 unsignedlong *first_word, *last_invf_len;317 mg_u_long *first_word, *last_invf_len; 318 318 unsigned short *num_words; 319 319 u_char *base; … … 332 332 333 333 /* [RPAP - Jan 97: Endian Ordering] */ 334 first_word = ( unsignedlong *) (sd->buffer);334 first_word = (mg_u_long *) (sd->buffer); 335 335 NTOHUL(*first_word); 336 last_invf_len = ( unsignedlong *) (first_word + 1);336 last_invf_len = (mg_u_long *) (first_word + 1); 337 337 NTOHUL(*last_invf_len); 338 338 num_words = (unsigned short *) (last_invf_len + 1); … … 346 346 else 347 347 { 348 first_word = ( unsignedlong *) (sd->buffer);349 last_invf_len = ( unsignedlong *) (first_word + 1);348 first_word = (mg_u_long *) (sd->buffer); 349 last_invf_len = (mg_u_long *) (first_word + 1); 350 350 num_words = (unsigned short *) (last_invf_len + 1); 351 351 index = num_words + 1; … … 379 379 { 380 380 unsigned copy, suff; 381 unsignedlong invfp;381 mg_u_long invfp; 382 382 if (res >= *num_words) 383 383 return (-1); … … 417 417 { 418 418 /* Calculate invf_len is necessary */ 419 unsignedlong next_invfp;419 mg_u_long next_invfp; 420 420 if (!invf_len) 421 421 return (*first_word + res); … … 432 432 base++; 433 433 suff = *base++; 434 base += suff + sizeof ( unsignedlong) * 2;434 base += suff + sizeof (mg_u_long) * 2; 435 435 bcopy ((char *) base, (char *) &next_invfp, sizeof (next_invfp)); 436 436 NTOHUL(next_invfp); /* [RPAP - Jan 97: Endian Ordering] */ … … 453 453 454 454 int block, num_indexes; 455 unsignedlong *first_word, *last_invf_len;455 mg_u_long *first_word, *last_invf_len; 456 456 unsigned short *num_words; 457 457 u_char *base; … … 460 460 461 461 int idx_block, idx_num_indexes; 462 unsignedlong *idx_first_word;462 mg_u_long *idx_first_word; 463 463 unsigned short *idx_num_words; 464 464 u_char *idx_base; … … 512 512 si->active = si->pos[idx_block]; 513 513 514 idx_first_word = ( unsignedlong *) (si->buffer);514 idx_first_word = (mg_u_long *) (si->buffer); 515 515 NTOHUL(*idx_first_word); /* [RPAP - Jan 97: Endian Ordering] */ 516 516 idx_num_words = (unsigned short *) (idx_first_word + 1); … … 525 525 else 526 526 { 527 idx_first_word = ( unsignedlong *) (si->buffer);527 idx_first_word = (mg_u_long *) (si->buffer); 528 528 idx_num_words = (unsigned short *) (idx_first_word + 1); 529 529 idx_index = idx_num_words + 1; … … 591 591 { 592 592 unsigned copy, suff; 593 unsignedlong invfp;593 mg_u_long invfp; 594 594 /* Read next stem index pos */ 595 595 bcopy ((char *) idx_base, (char *) &num_cases, sizeof (num_cases)); … … 613 613 sd->active = sd->pos[block]; 614 614 615 first_word = ( unsignedlong *) (sd->buffer);615 first_word = (mg_u_long *) (sd->buffer); 616 616 NTOHUL(*first_word); /* [RPAP - Jan 97: Endian Ordering] */ 617 last_invf_len = ( unsignedlong *) (first_word + 1);617 last_invf_len = (mg_u_long *) (first_word + 1); 618 618 NTOHUL(*last_invf_len); /* [RPAP - Jan 97: Endian Ordering] */ 619 619 num_words = (unsigned short *) (last_invf_len + 1); … … 628 628 else 629 629 { 630 first_word = ( unsignedlong *) (sd->buffer);631 last_invf_len = ( unsignedlong *) (first_word + 1);630 first_word = (mg_u_long *) (sd->buffer); 631 last_invf_len = (mg_u_long *) (first_word + 1); 632 632 num_words = (unsigned short *) (last_invf_len + 1); 633 633 index = num_words + 1; … … 646 646 base += suff; 647 647 *prev = copy + suff; 648 base += sizeof ( unsignedlong); /* skip doc_count */649 base += sizeof ( unsignedlong); /* skip count */650 base += sizeof ( unsignedlong); /* skip invf_ptr */648 base += sizeof (mg_u_long); /* skip doc_count */ 649 base += sizeof (mg_u_long); /* skip count */ 650 base += sizeof (mg_u_long); /* skip invf_ptr */ 651 651 res++; 652 652 } … … 694 694 else 695 695 { 696 unsignedlong next_invfp;696 mg_u_long next_invfp; 697 697 u_char *oldbase = base; 698 698 … … 700 700 base++; 701 701 suff = *base++; 702 base += suff + sizeof ( unsignedlong) * 2;702 base += suff + sizeof (mg_u_long) * 2; 703 703 bcopy ((char *) base, (char *) &next_invfp, sizeof (next_invfp)); 704 704 NTOHUL(next_invfp); /* [RPAP - Jan 97: Endian Ordering] */ … … 720 720 sd->active = sd->pos[block]; 721 721 722 first_word = ( unsignedlong *) (sd->buffer);722 first_word = (mg_u_long *) (sd->buffer); 723 723 NTOHUL(*first_word); /* [RPAP - Jan 97: Endian Ordering] */ 724 last_invf_len = ( unsignedlong *) (first_word + 1);724 last_invf_len = (mg_u_long *) (first_word + 1); 725 725 NTOHUL(*last_invf_len); /* [RPAP - Jan 97: Endian Ordering] */ 726 726 num_words = (unsigned short *) (last_invf_len + 1); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/stem_search.h
r16583 r23508 29 29 stemmed_idx *ReadStemIdxBlk (File * stem_idx_file); 30 30 31 int FindWord (stemmed_dict * sd, u_char * Word, unsignedlong *count,32 unsigned long *doc_count, unsignedlong *invf_ptr,33 unsignedlong *invf_len);31 int FindWord (stemmed_dict * sd, u_char * Word, mg_u_long *count, 32 mg_u_long *doc_count, mg_u_long *invf_ptr, 33 mg_u_long *invf_len); 34 34 35 35 /* [RPAP - Jan 97: Stem Index Change] */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/term_lists.c
r16583 r23508 200 200 int 201 201 AddTerm (TermList ** query_term_list, u_char * Word, int Count, int word_num, 202 u_long count, u_long doc_count, u_long invf_ptr,u_long invf_len, int stemmer_num) /* [RPAP - Feb 97: Term Frequency] */202 mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, mg_u_long invf_len, int stemmer_num) /* [RPAP - Feb 97: Term Frequency] */ 203 203 { 204 204 int j; … … 283 283 { 284 284 fprintf (file, "we->word_num = %d\n", we->word_num); 285 fprintf (file, "we->count = % ld\n", we->count);286 fprintf (file, "we->doc_count = % ld\n", we->doc_count);287 fprintf (file, "we->max_doc_count = % ld\n", we->max_doc_count);288 fprintf (file, "we->invf_ptr = % ld\n", we->invf_ptr);289 fprintf (file, "we->invf_len = % ld\n", we->invf_len);285 fprintf (file, "we->count = %d\n", we->count); 286 fprintf (file, "we->doc_count = %d\n", we->doc_count); 287 fprintf (file, "we->max_doc_count = %d\n", we->max_doc_count); 288 fprintf (file, "we->invf_ptr = %d\n", we->invf_ptr); 289 fprintf (file, "we->invf_len = %d\n", we->invf_len); 290 290 } 291 291 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/term_lists.h
r16583 r23508 59 59 { 60 60 int word_num; /* Unique number for each different word */ 61 u_long count; /* Number of times the word occurs in the text */62 u_long doc_count; /* Number of documents that contain the word */63 u_long max_doc_count; /* [RPAP - Jan 97: Stem Index Change] */64 u_long invf_ptr; /* This is a byte position of the61 mg_u_long count; /* Number of times the word occurs in the text */ 62 mg_u_long doc_count; /* Number of documents that contain the word */ 63 mg_u_long max_doc_count; /* [RPAP - Jan 97: Stem Index Change] */ 64 mg_u_long invf_ptr; /* This is a byte position of the 65 65 inverted file entry corresponding to the word */ 66 u_long invf_len; /* This is the length of the inverted66 mg_u_long invf_len; /* This is the length of the inverted 67 67 file entry in bytes */ 68 68 } … … 93 93 int AddTermEntry (TermList ** query_term_list, TermEntry * te); 94 94 int AddTerm (TermList ** query_term_list, u_char * Word, int Count, int word_num, 95 u_long count, u_long doc_count, u_long invf_ptr,u_long invf_len, /* [RPAP - Feb 97: Term Frequency] */95 mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, mg_u_long invf_len, /* [RPAP - Feb 97: Term Frequency] */ 96 96 int stemmer_num); 97 97 void ResetTermList (TermList ** tl); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text.h
r16583 r23508 117 117 typedef struct compression_dict_header 118 118 { 119 u_long dict_type;120 u_long novel_method;121 u_long params[TEXT_PARAMS];122 u_long num_words[2];123 u_long num_word_chars[2];124 u_long lookback;119 mg_u_long dict_type; 120 mg_u_long novel_method; 121 mg_u_long params[TEXT_PARAMS]; 122 mg_u_long num_words[2]; 123 mg_u_long num_word_chars[2]; 124 mg_u_long lookback; 125 125 } 126 126 compression_dict_header; … … 130 130 { 131 131 huff_data hd; 132 u_long uncompressed_size;133 u_long huff_words_size[MAX_HUFFCODE_LEN + 1];132 mg_u_long uncompressed_size; 133 mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1]; 134 134 } 135 135 comp_frags_header; … … 139 139 typedef struct compressed_text_header 140 140 { 141 u_long num_of_docs;142 u_long num_of_words; /* number of words in collection */141 mg_u_long num_of_docs; 142 mg_u_long num_of_words; /* number of words in collection */ 143 143 double num_of_bytes; /* [RJM 07/97: 4G limit] */ 144 144 double ratio; 145 u_long length_of_longest_doc; /* (characters) */146 u_long dummy; /* added to make the structure the same on different architectures */145 mg_u_long length_of_longest_doc; /* (characters) */ 146 mg_u_long dummy; /* added to make the structure the same on different architectures */ 147 147 } 148 148 compressed_text_header; … … 151 151 typedef struct compression_stats_header 152 152 { 153 u_long num_docs;154 u_long dummy; /* added to make the structure the same on different architectures */153 mg_u_long num_docs; 154 mg_u_long dummy; /* added to make the structure the same on different architectures */ 155 155 double num_bytes; /* [RJM 07/97: 4G limit] */ 156 156 } … … 160 160 typedef struct frags_stats_header 161 161 { 162 u_long num_frags;163 u_long mem_for_frags;162 mg_u_long num_frags; 163 mg_u_long mem_for_frags; 164 164 } 165 165 frags_stats_header; … … 168 168 typedef struct aux_frags_header 169 169 { 170 u_long num_frags;171 u_long mem_for_frags;170 mg_u_long num_frags; 171 mg_u_long mem_for_frags; 172 172 } 173 173 aux_frags_header; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text.pass1.c
r16583 r23508 50 50 typedef struct hash_rec 51 51 { 52 unsignedlong wcnt; /* word frequency */53 unsignedlong occurance_num;52 mg_u_long wcnt; /* word frequency */ 53 mg_u_long occurance_num; 54 54 u_char *word; 55 55 } … … 59 59 { 60 60 hash_rec *HashTable; 61 unsignedlong HashSize;62 unsignedlong HashUsed;63 unsignedlong wordnum;64 unsignedlong words_read;65 unsignedlong bytes_diff;61 mg_u_long HashSize; 62 mg_u_long HashUsed; 63 mg_u_long wordnum; 64 mg_u_long words_read; 65 mg_u_long bytes_diff; 66 66 huff_data hd; 67 67 } … … 70 70 71 71 72 static unsignedlong LongestDoc = 0;73 static unsignedlong occurance_num = 0;72 static mg_u_long LongestDoc = 0; 73 static mg_u_long occurance_num = 0; 74 74 static dict_data DictData[2]; 75 75 … … 77 77 static int PoolLeft; 78 78 static double inputbytes = 0; /* [RJM 07/97: 4G limit] */ 79 static unsignedlong MaxMemInUse = 0;80 static unsignedlong MemInUse = 0;79 static mg_u_long MaxMemInUse = 0; 80 static mg_u_long MemInUse = 0; 81 81 static compression_stats_header csh = 82 82 {0, 0.0}; /* [RJM 07/97: 4G limit] */ … … 131 131 register u_char *wptr; 132 132 register int hsize = dd->HashSize; 133 register unsignedlong hashval, step;133 register mg_u_long hashval, step; 134 134 135 135 HASH (hashval, step, word, hsize); … … 189 189 /* Search the hash table for Word */ 190 190 { 191 register unsignedlong hashval, step;191 register mg_u_long hashval, step; 192 192 register int hsize = dd->HashSize; 193 193 HASH (hashval, step, Word, hsize); … … 248 248 { 249 249 hash_rec *ht; 250 unsignedlong size;251 unsignedlong i;250 mg_u_long size; 251 mg_u_long i; 252 252 size = prime (dd->HashSize * 2); 253 253 if (!(ht = Xmalloc (sizeof (hash_rec) * size))) … … 263 263 { 264 264 register u_char *wptr; 265 register unsignedlong hashval, step;265 register mg_u_long hashval, step; 266 266 267 267 wptr = dd->HashTable[i].word; … … 325 325 { 326 326 frags_stats_header fsh; 327 u_long j = 0;327 mg_u_long j = 0; 328 328 u_char *curr; 329 329 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text.pass2.c
r16583 r23508 82 82 { 83 83 struct char_pool *next; 84 u_long left;84 mg_u_long left; 85 85 u_char *ptr; 86 86 u_char pool[POOL_SIZE]; … … 90 90 typedef struct novel_hash_rec 91 91 { 92 u_long ordinal_num;92 mg_u_long ordinal_num; 93 93 u_char *word; 94 94 } … … 102 102 { 103 103 novel_hash_rec *HashTable; 104 u_long HashSize, HashUsed;104 mg_u_long HashSize, HashUsed; 105 105 char_pool *first_pool; 106 106 char_pool *pool; 107 u_long next_num, binary_start;107 mg_u_long next_num, binary_start; 108 108 novel_hash_rec **code_to_nhr; 109 109 } … … 115 115 static u_char *comp_buffer; 116 116 117 static u_long text_length;117 static mg_u_long text_length; 118 118 119 119 /* [RJM 07/97: 4G limit] */ … … 125 125 static novel_hash_table nht[2]; 126 126 127 static u_long prefix_len = 0;127 static mg_u_long prefix_len = 0; 128 128 129 129 int blk_start[2][33], blk_end[2][33]; … … 165 165 return COMPERROR; 166 166 167 text_length = sizeof ( u_long) + sizeof (cth);167 text_length = sizeof (mg_u_long) + sizeof (cth); 168 168 169 169 if (!(text_idx = create_file (file_name, TEXT_IDX_SUFFIX, "w+b", … … 287 287 if (ht[which]) 288 288 { 289 register unsignedlong hashval, step;289 register mg_u_long hashval, step; 290 290 register int tsize = ht[which]->size; 291 291 register u_char **wptr; … … 336 336 if (cdh.dict_type == MG_PARTIAL_DICTIONARY) 337 337 { 338 u_long i;338 mg_u_long i; 339 339 if (ht[which]) 340 340 { … … 358 358 case MG_NOVEL_HUFFMAN_CHARS: 359 359 { 360 u_long i;360 mg_u_long i; 361 361 HUFF_ENCODE (Word[0], lens_codes[which], 362 362 lens_huff[which].clens); … … 371 371 case MG_NOVEL_HYBRID_MTF: 372 372 { 373 register unsignedlong hashval, step;373 register mg_u_long hashval, step; 374 374 register novel_hash_table *h = &nht[which]; 375 375 register int hsize = h->HashSize; … … 481 481 { 482 482 novel_hash_rec *ht; 483 unsignedlong size;484 unsignedlong i;483 mg_u_long size; 484 mg_u_long i; 485 485 size = prime (h->HashSize * 2); 486 486 if (cdh.novel_method == MG_NOVEL_HYBRID_MTF) … … 501 501 { 502 502 register u_char *wptr; 503 register unsignedlong hashval, step;503 register mg_u_long hashval, step; 504 504 505 505 wptr = h->HashTable[i].word; … … 674 674 { 675 675 int i; 676 u_long aux_compressed = 0, total_uncomp = 0;676 mg_u_long aux_compressed = 0, total_uncomp = 0; 677 677 for (i = 0; i <= 1; i++) 678 678 { 679 679 int j; 680 long chars[256], fchars[256];681 long lens[16], flens[16];680 mg_s_long chars[256], fchars[256]; 681 mg_s_long lens[16], flens[16]; 682 682 char_pool *cp; 683 683 bzero ((char *) chars, sizeof (chars)); … … 743 743 HTOND(cth.ratio); 744 744 745 if (fseek (text_idx, sizeof ( u_long), SEEK_SET) == -1 ||745 if (fseek (text_idx, sizeof (mg_u_long), SEEK_SET) == -1 || 746 746 fwrite (&cth, sizeof (cth), 1, text_idx) != 1) 747 747 return COMPERROR; 748 748 fclose (text_idx); 749 749 750 if (fseek (text, sizeof ( u_long), SEEK_SET) == -1 ||750 if (fseek (text, sizeof (mg_u_long), SEEK_SET) == -1 || 751 751 fwrite (&cth, sizeof (cth), 1, text) != 1) 752 752 return COMPERROR; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text_get.c
r16583 r23508 84 84 85 85 static double 86 FetchDocStartLev1 (text_data * td, u_long DN,87 u_long * seek_pos,u_long * len)88 { 89 unsignedlong data[2];86 FetchDocStartLev1 (text_data * td, mg_u_long DN, 87 mg_u_long * seek_pos, mg_u_long * len) 88 { 89 mg_u_long data[2]; 90 90 /* [TS:Sep/94] Fixed up the seek call to give the correct offset */ 91 91 Fseek (td->TextIdxFile, 92 sizeof ( unsignedlong) * (DN - 1) + /* the doc offsets */93 sizeof ( unsignedlong) + /* the magic number */92 sizeof (mg_u_long) * (DN - 1) + /* the doc offsets */ 93 sizeof (mg_u_long) + /* the magic number */ 94 94 sizeof (compressed_text_header), /* the header */ 95 95 0); … … 108 108 109 109 static int 110 LoadIdx (text_data * td, unsignedlong DN)110 LoadIdx (text_data * td, mg_u_long DN) 111 111 { 112 112 if (!td->idx_data) … … 121 121 int i, num; /* [RPAP - Jan 97: Endian Ordering] */ 122 122 123 long rn = (long) DN - (MG_PAGE_SIZE >> 1);123 mg_s_long rn = (mg_s_long) DN - (MG_PAGE_SIZE >> 1); 124 124 if (rn < 1) 125 125 rn = 1; 126 Fseek (td->TextIdxWgtFile, (sizeof ( unsignedlong) + sizeof (float)) *127 (rn - 1) + sizeof ( unsignedlong), 0);126 Fseek (td->TextIdxWgtFile, (sizeof (mg_u_long) + sizeof (float)) * 127 (rn - 1) + sizeof (mg_u_long), 0); 128 128 num = Fread ((char *) td->idx_data, sizeof (*(td->idx_data)), MG_PAGE_SIZE, /* [RPAP - Jan 97: Endian Ordering] */ 129 129 td->TextIdxWgtFile); … … 142 142 143 143 static double 144 FDSL2 (text_data * td, unsigned long DN, unsignedlong *Pos)145 { 146 unsignedlong pos = LoadIdx (td, DN);144 FDSL2 (text_data * td, mg_u_long DN, mg_u_long *Pos) 145 { 146 mg_u_long pos = LoadIdx (td, DN); 147 147 *Pos = td->idx_data[pos].Start; 148 148 return (td->idx_data[pos].Weight); … … 151 151 152 152 static double 153 FetchDocStartLev2 (text_data * td, u_long DN,154 u_long * seek_pos,u_long * len)153 FetchDocStartLev2 (text_data * td, mg_u_long DN, 154 mg_u_long * seek_pos, mg_u_long * len) 155 155 { 156 156 double Weight; 157 unsignedlong s1, s2;157 mg_u_long s1, s2; 158 158 Weight = FDSL2 (td, DN, &s1); 159 159 do … … 172 172 173 173 double 174 FetchDocStart (query_data * qd, u_long DN, u_long * seek_pos,u_long * len)174 FetchDocStart (query_data * qd, mg_u_long DN, mg_u_long * seek_pos, mg_u_long * len) 175 175 { 176 176 qd->text_idx_lookups++; … … 181 181 } 182 182 183 unsignedlong184 FetchInitialParagraph (text_data * td, unsignedlong ParaNum)183 mg_u_long 184 FetchInitialParagraph (text_data * td, mg_u_long ParaNum) 185 185 { 186 186 if (td->TextIdxWgtFile) 187 187 { 188 unsignedlong pos;189 unsignedlong start;188 mg_u_long pos; 189 mg_u_long start; 190 190 int PN = ParaNum - 1; 191 191 pos = LoadIdx (td, ParaNum); … … 583 583 { 584 584 huff_data *hd; 585 u_long **vals;585 mg_u_long **vals; 586 586 if (cd->cdh.num_words[which]) 587 587 { … … 625 625 { 626 626 huff_data *hd; 627 u_long **vals;627 mg_u_long **vals; 628 628 if (cd->cdh.num_words[which]) 629 629 { … … 716 716 { 717 717 compression_dict *cd; 718 u _long*p, *end;718 uintptr_t *p, *end; 719 719 u_char *fixup; 720 u_long mem;721 u_long fixup_mem;720 mg_u_long mem; 721 mg_u_long fixup_mem; 722 722 int i; /* [RPAP - Jan 97: Endian Ordering] */ 723 723 … … 732 732 } 733 733 734 end = (u _long*) (((u_char *) cd) + mem);734 end = (uintptr_t *) (((u_char *) cd) + mem); 735 735 Fread (cd, sizeof (u_char), mem, text_fast_comp_dict); 736 736 … … 743 743 Fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict); 744 744 745 for (p = (u _long *) cd; (u_long) p < (u_long) end; p++)745 for (p = (uintptr_t *) cd; (uintptr_t) p < (uintptr_t) end; p++) 746 746 if (IS_FIXUP (p)) 747 747 { 748 748 NTOHUL(*p); /* [RPAP - Jan 97: Endian Ordering] */ 749 *p = *p + (u _long) cd;749 *p = *p + (uintptr_t) cd; 750 750 } 751 751 … … 863 863 #define MY_HUFF_DECODE(len, code, mcodes) \ 864 864 do { \ 865 register unsignedlong *__min_code = (mcodes); \866 register unsignedlong *__mclen = __min_code; \867 register unsignedlong __code = 0; \865 register mg_u_long *__min_code = (mcodes); \ 866 register mg_u_long *__mclen = __min_code; \ 867 register mg_u_long __code = 0; \ 868 868 do \ 869 869 { \ … … 886 886 auxiliary_dict *ad = cd->ad; 887 887 int which; 888 u_long num_bits, bits;888 mg_u_long num_bits, bits; 889 889 u_char *ptr = s_out; 890 890 static int num = 0; 891 u_long binary_start[2];891 mg_u_long binary_start[2]; 892 892 int novels_used[2]; 893 893 int swaps[2][MAX_SWAPS]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text_get.h
r16583 r23508 32 32 * It returns the true weight of the document. 33 33 */ 34 double FetchDocStart (query_data * qd, u_long DN, u_long * seek_pos,u_long * len);34 double FetchDocStart (query_data * qd, mg_u_long DN, mg_u_long * seek_pos, mg_u_long * len); 35 35 36 unsigned long FetchInitialParagraph (text_data * td, unsignedlong ParaNum);36 mg_u_long FetchInitialParagraph (text_data * td, mg_u_long ParaNum); 37 37 38 38 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/weights.c
r16583 r23508 39 39 #include "mg_errors.h" 40 40 41 #define MAXBITS (sizeof( unsignedlong) * 8)41 #define MAXBITS (sizeof(mg_u_long) * 8) 42 42 43 43 /* … … 63 63 approx_weights_data * 64 64 LoadDocWeights (File * weight_file, 65 unsignedlong num_of_docs)65 mg_u_long num_of_docs) 66 66 { 67 67 approx_weights_data *awd; … … 74 74 } 75 75 76 Fseek (weight_file, sizeof ( long), 0);76 Fseek (weight_file, sizeof (mg_s_long), 0); 77 77 Fread (&awd->bits, sizeof (awd->bits), 1, weight_file); 78 78 Fread (&awd->L, sizeof (awd->L), 1, weight_file); … … 84 84 85 85 num = (num_of_docs * awd->bits + 31) / 32; 86 if (!(awd->DocWeights = Xmalloc (sizeof ( unsignedlong) * num)))86 if (!(awd->DocWeights = Xmalloc (sizeof (mg_u_long) * num))) 87 87 { 88 88 Xfree (awd); … … 91 91 } 92 92 93 Fread (awd->DocWeights, sizeof ( unsignedlong), num, weight_file);93 Fread (awd->DocWeights, sizeof (mg_u_long), num, weight_file); 94 94 { 95 95 /* [RPAP - Jan 97: Endian Ordering] */ 96 unsignedlong i;96 mg_u_long i; 97 97 for (i = 0; i < num; i++) 98 98 NTOHUL(awd->DocWeights[i]); 99 99 } 100 100 101 awd->MemForWeights = num * sizeof ( unsignedlong);101 awd->MemForWeights = num * sizeof (mg_u_long); 102 102 awd->num_of_docs = num_of_docs; 103 103 … … 129 129 GetLowerApproxDocWeight (approx_weights_data * awd, register int DocNum) 130 130 { 131 register unsignedlong c, Pos;132 register unsignedlong *dw;131 register mg_u_long c, Pos; 132 register mg_u_long *dw; 133 133 if (awd == NULL) 134 134 return 1.0; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/weights.h
r16583 r23508 26 26 27 27 approx_weights_data *LoadDocWeights (File * weight_file, 28 unsignedlong num_of_docs);28 mg_u_long num_of_docs); 29 29 30 30 float GetLowerApproxDocWeight (approx_weights_data * awd, register int DocNum); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/sysfuncs.h
r16583 r23508 351 351 #endif 352 352 353 /* [RPAP - Feb 97: WIN32 Port] */ 354 #ifndef u_long 355 # define u_long unsigned long 356 #endif 353 #include "mglong.h" 354 357 355 #ifndef u_char 358 356 # define u_char unsigned char 359 357 #endif 360 358 361 362 359 #endif /* SYSFUNCS_H */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/Makefile.in
r16583 r23508 29 29 CC = @CC@ 30 30 CXX = @CXX@ 31 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi31 CFLAGS = @CFLAGS@ -ansi 32 32 INSTALL = @INSTALL@ 33 33 INSTALL_DATA = @INSTALL_DATA@ 34 34 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@35 LDFLAGS = @LDFLAGS@ 36 36 LIBS = @LIBS@ 37 37 TOUCH = echo timestamp > -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/configure
r23356 r23508 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 7.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 5 # 6 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010 Free Software8 # Foundation,Inc.7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 9 # 10 10 # … … 317 317 done 318 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 320 321 321 … … 357 357 358 358 359 # as_fn_error STATUSERROR [LINENO LOG_FD]360 # --------------------------------- -------359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with STATUS, using 1 if that was 0.363 # script with status $?, using 1 if that was 0. 364 364 as_fn_error () 365 365 { 366 as_status=$ 1; test $as_status -eq 0 && as_status=1367 if test "$ 4"; then368 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 370 fi 371 $as_echo "$as_me: error: $ 2" >&2371 $as_echo "$as_me: error: $1" >&2 372 372 as_fn_exit $as_status 373 373 } # as_fn_error … … 531 531 532 532 # Name of the host. 533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 534 534 # so uname gets run too. 535 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 628 628 CXX 629 629 ENABLE_ACCENTFOLD 630 COMPAT32BITFLAGS631 630 ENABLE_JAVA 632 631 VERSION … … 769 768 770 769 case $ac_option in 771 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 772 *=) ac_optarg= ;; 773 *) ac_optarg=yes ;; 770 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 771 *) ac_optarg=yes ;; 774 772 esac 775 773 … … 816 814 # Reject names that are not valid shell variable names. 817 815 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 818 as_fn_error $?"invalid feature name: $ac_useropt"816 as_fn_error "invalid feature name: $ac_useropt" 819 817 ac_useropt_orig=$ac_useropt 820 818 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 842 840 # Reject names that are not valid shell variable names. 843 841 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 844 as_fn_error $?"invalid feature name: $ac_useropt"842 as_fn_error "invalid feature name: $ac_useropt" 845 843 ac_useropt_orig=$ac_useropt 846 844 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1046 1044 # Reject names that are not valid shell variable names. 1047 1045 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1048 as_fn_error $?"invalid package name: $ac_useropt"1046 as_fn_error "invalid package name: $ac_useropt" 1049 1047 ac_useropt_orig=$ac_useropt 1050 1048 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1062 1060 # Reject names that are not valid shell variable names. 1063 1061 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1064 as_fn_error $?"invalid package name: $ac_useropt"1062 as_fn_error "invalid package name: $ac_useropt" 1065 1063 ac_useropt_orig=$ac_useropt 1066 1064 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1092 1090 x_libraries=$ac_optarg ;; 1093 1091 1094 -*) as_fn_error $?"unrecognized option: \`$ac_option'1095 Try \`$0 --help' for more information "1092 -*) as_fn_error "unrecognized option: \`$ac_option' 1093 Try \`$0 --help' for more information." 1096 1094 ;; 1097 1095 … … 1101 1099 case $ac_envvar in #( 1102 1100 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1103 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1101 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1104 1102 esac 1105 1103 eval $ac_envvar=\$ac_optarg … … 1119 1117 if test -n "$ac_prev"; then 1120 1118 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1121 as_fn_error $?"missing argument to $ac_option"1119 as_fn_error "missing argument to $ac_option" 1122 1120 fi 1123 1121 … … 1125 1123 case $enable_option_checking in 1126 1124 no) ;; 1127 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1125 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1128 1126 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1129 1127 esac … … 1148 1146 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1149 1147 esac 1150 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1148 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1151 1149 done 1152 1150 … … 1162 1160 if test "x$build_alias" = x; then 1163 1161 cross_compiling=maybe 1164 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1165 If a cross compiler is detected then cross compile mode will be used " >&21162 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1163 If a cross compiler is detected then cross compile mode will be used." >&2 1166 1164 elif test "x$build_alias" != "x$host_alias"; then 1167 1165 cross_compiling=yes … … 1178 1176 ac_ls_di=`ls -di .` && 1179 1177 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1180 as_fn_error $?"working directory cannot be determined"1178 as_fn_error "working directory cannot be determined" 1181 1179 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1182 as_fn_error $?"pwd does not report name of working directory"1180 as_fn_error "pwd does not report name of working directory" 1183 1181 1184 1182 … … 1219 1217 if test ! -r "$srcdir/$ac_unique_file"; then 1220 1218 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1221 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1219 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1222 1220 fi 1223 1221 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1224 1222 ac_abs_confdir=`( 1225 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1223 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1226 1224 pwd)` 1227 1225 # When building in place, set srcdir=. … … 1263 1261 --help=recursive display the short help of all the included packages 1264 1262 -V, --version display version information and exit 1265 -q, --quiet, --silent do not print \`checking 1263 -q, --quiet, --silent do not print \`checking...' messages 1266 1264 --cache-file=FILE cache test results in FILE [disabled] 1267 1265 -C, --config-cache alias for \`--cache-file=config.cache' … … 1424 1422 cat <<\_ACEOF 1425 1423 configure 1426 generated by GNU Autoconf 2.6 71427 1428 Copyright (C) 20 10Free Software Foundation, Inc.1424 generated by GNU Autoconf 2.65 1425 1426 Copyright (C) 2009 Free Software Foundation, Inc. 1429 1427 This configure script is free software; the Free Software Foundation 1430 1428 gives unlimited permission to copy, distribute and modify it. … … 1534 1532 fi 1535 1533 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1536 test $ac_status = 0; } > conftest.i&& {1534 test $ac_status = 0; } >/dev/null && { 1537 1535 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1538 1536 test ! -s conftest.err … … 1558 1556 { 1559 1557 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1560 if eval "test \"\${$3+set}\"" = set; then :1558 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1561 1559 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1562 1560 $as_echo_n "checking for $2... " >&6; } 1563 if eval "test \"\${$3+set}\"" = set; then :1561 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1564 1562 $as_echo_n "(cached) " >&6 1565 1563 fi … … 1597 1595 ac_header_preproc=no 1598 1596 fi 1599 rm -f conftest.err conftest. i conftest.$ac_ext1597 rm -f conftest.err conftest.$ac_ext 1600 1598 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1601 1599 $as_echo "$ac_header_preproc" >&6; } … … 1624 1622 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1625 1623 $as_echo_n "checking for $2... " >&6; } 1626 if eval "test \"\${$3+set}\"" = set; then :1624 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1627 1625 $as_echo_n "(cached) " >&6 1628 1626 else … … 1688 1686 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1689 1687 $as_echo_n "checking for $2... " >&6; } 1690 if eval "test \"\${$3+set}\"" = set; then :1688 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1691 1689 $as_echo_n "(cached) " >&6 1692 1690 else … … 1765 1763 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1766 1764 $as_echo_n "checking for $2... " >&6; } 1767 if eval "test \"\${$3+set}\"" = set; then :1765 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1768 1766 $as_echo_n "(cached) " >&6 1769 1767 else … … 1818 1816 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1819 1817 $as_echo_n "checking for $2... " >&6; } 1820 if eval "test \"\${$3+set}\"" = set; then :1818 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1821 1819 $as_echo_n "(cached) " >&6 1822 1820 else … … 2059 2057 2060 2058 It was created by $as_me, which was 2061 generated by GNU Autoconf 2.6 7. Invocation command line was2059 generated by GNU Autoconf 2.65. Invocation command line was 2062 2060 2063 2061 $ $0 $@ … … 2169 2167 echo 2170 2168 2171 $as_echo "## ---------------- ## 2169 cat <<\_ASBOX 2170 ## ---------------- ## 2172 2171 ## Cache variables. ## 2173 ## ---------------- ##" 2172 ## ---------------- ## 2173 _ASBOX 2174 2174 echo 2175 2175 # The following way of writing the cache mishandles newlines in values, … … 2205 2205 echo 2206 2206 2207 $as_echo "## ----------------- ## 2207 cat <<\_ASBOX 2208 ## ----------------- ## 2208 2209 ## Output variables. ## 2209 ## ----------------- ##" 2210 ## ----------------- ## 2211 _ASBOX 2210 2212 echo 2211 2213 for ac_var in $ac_subst_vars … … 2220 2222 2221 2223 if test -n "$ac_subst_files"; then 2222 $as_echo "## ------------------- ## 2224 cat <<\_ASBOX 2225 ## ------------------- ## 2223 2226 ## File substitutions. ## 2224 ## ------------------- ##" 2227 ## ------------------- ## 2228 _ASBOX 2225 2229 echo 2226 2230 for ac_var in $ac_subst_files … … 2236 2240 2237 2241 if test -s confdefs.h; then 2238 $as_echo "## ----------- ## 2242 cat <<\_ASBOX 2243 ## ----------- ## 2239 2244 ## confdefs.h. ## 2240 ## ----------- ##" 2245 ## ----------- ## 2246 _ASBOX 2241 2247 echo 2242 2248 cat confdefs.h … … 2293 2299 ac_site_file2=NONE 2294 2300 if test -n "$CONFIG_SITE"; then 2295 # We do not want a PATH search for config.site. 2296 case $CONFIG_SITE in #(( 2297 -*) ac_site_file1=./$CONFIG_SITE;; 2298 */*) ac_site_file1=$CONFIG_SITE;; 2299 *) ac_site_file1=./$CONFIG_SITE;; 2300 esac 2301 ac_site_file1=$CONFIG_SITE 2301 2302 elif test "x$prefix" != xNONE; then 2302 2303 ac_site_file1=$prefix/share/config.site … … 2313 2314 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2314 2315 sed 's/^/| /' "$ac_site_file" >&5 2315 . "$ac_site_file" \ 2316 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2317 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2318 as_fn_error $? "failed to load site script $ac_site_file 2319 See \`config.log' for more details" "$LINENO" 5 ; } 2316 . "$ac_site_file" 2320 2317 fi 2321 2318 done … … 2393 2390 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2394 2391 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2395 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52392 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2396 2393 fi 2397 2394 ## -------------------- ## … … 2411 2408 ac_aux_dir= 2412 2409 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2413 if test -f "$ac_dir/install-sh"; then 2414 ac_aux_dir=$ac_dir 2415 ac_install_sh="$ac_aux_dir/install-sh -c" 2416 break 2417 elif test -f "$ac_dir/install.sh"; then 2418 ac_aux_dir=$ac_dir 2419 ac_install_sh="$ac_aux_dir/install.sh -c" 2420 break 2421 elif test -f "$ac_dir/shtool"; then 2422 ac_aux_dir=$ac_dir 2423 ac_install_sh="$ac_aux_dir/shtool install -c" 2424 break 2425 fi 2410 for ac_t in install-sh install.sh shtool; do 2411 if test -f "$ac_dir/$ac_t"; then 2412 ac_aux_dir=$ac_dir 2413 ac_install_sh="$ac_aux_dir/$ac_t -c" 2414 break 2 2415 fi 2416 done 2426 2417 done 2427 2418 if test -z "$ac_aux_dir"; then 2428 as_fn_error $?"cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 52419 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2429 2420 fi 2430 2421 … … 2440 2431 # Make sure we can run config.sub. 2441 2432 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 2442 as_fn_error $?"cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 52433 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 2443 2434 2444 2435 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 … … 2451 2442 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 2452 2443 test "x$ac_build_alias" = x && 2453 as_fn_error $?"cannot guess build type; you must specify one" "$LINENO" 52444 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 2454 2445 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 2455 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 52446 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 2456 2447 2457 2448 fi … … 2460 2451 case $ac_cv_build in 2461 2452 *-*-*) ;; 2462 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;2453 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 2463 2454 esac 2464 2455 build=$ac_cv_build … … 2485 2476 else 2486 2477 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 2487 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 52478 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 2488 2479 fi 2489 2480 … … 2493 2484 case $ac_cv_host in 2494 2485 *-*-*) ;; 2495 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;2486 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 2496 2487 esac 2497 2488 host=$ac_cv_host … … 2518 2509 else 2519 2510 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 2520 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 52511 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 2521 2512 fi 2522 2513 … … 2526 2517 case $ac_cv_target in 2527 2518 *-*-*) ;; 2528 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;2519 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 2529 2520 esac 2530 2521 target=$ac_cv_target … … 2593 2584 fi 2594 2585 2595 2596 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&52597 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }2598 arch_64bit=no2599 case "$host_cpu" in2600 x86_64) arch_64bit=yes ;;2601 esac2602 2603 if test "$arch_64bit" = yes; then2604 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&52605 $as_echo "yes" >&6; }2606 if test -z "$COMPAT32BITFLAGS" ; then2607 COMPAT32BITFLAGS="-m32"2608 fi2609 else2610 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&52611 $as_echo "no" >&6; }2612 if test -z "$COMPAT32BITFLAGS" ; then2613 COMPAT32BITFLAGS=2614 fi2615 fi2616 2586 2617 2587 … … 2856 2826 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2857 2827 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2858 as_fn_error 77 "C++ compiler cannot create executables 2859 See \`config.log' for more details" "$LINENO" 5 ; } 2828 { as_fn_set_status 77 2829 as_fn_error "C++ compiler cannot create executables 2830 See \`config.log' for more details." "$LINENO" 5; }; } 2860 2831 else 2861 2832 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 … … 2899 2870 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2900 2871 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2901 as_fn_error $?"cannot compute suffix of executables: cannot compile and link2902 See \`config.log' for more details " "$LINENO" 5; }2872 as_fn_error "cannot compute suffix of executables: cannot compile and link 2873 See \`config.log' for more details." "$LINENO" 5; } 2903 2874 fi 2904 2875 rm -f conftest conftest$ac_cv_exeext … … 2957 2928 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2958 2929 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2959 as_fn_error $?"cannot run C++ compiled programs.2930 as_fn_error "cannot run C++ compiled programs. 2960 2931 If you meant to cross compile, use \`--host'. 2961 See \`config.log' for more details " "$LINENO" 5; }2932 See \`config.log' for more details." "$LINENO" 5; } 2962 2933 fi 2963 2934 fi … … 3010 2981 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3011 2982 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3012 as_fn_error $?"cannot compute suffix of object files: cannot compile3013 See \`config.log' for more details " "$LINENO" 5; }2983 as_fn_error "cannot compute suffix of object files: cannot compile 2984 See \`config.log' for more details." "$LINENO" 5; } 3014 2985 fi 3015 2986 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3525 3496 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3526 3497 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3527 as_fn_error $?"no acceptable C compiler found in \$PATH3528 See \`config.log' for more details " "$LINENO" 5; }3498 as_fn_error "no acceptable C compiler found in \$PATH 3499 See \`config.log' for more details." "$LINENO" 5; } 3529 3500 3530 3501 # Provide some information about the compiler. … … 3873 3844 set x ${MAKE-make} 3874 3845 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 3875 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :3846 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 3876 3847 $as_echo_n "(cached) " >&6 3877 3848 else … … 3881 3852 @echo '@@@%%%=$(MAKE)=@@@%%%' 3882 3853 _ACEOF 3883 # GNU make sometimes prints "make[1]: Entering 3854 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 3884 3855 case `${MAKE-make} -f conftest.make 2>/dev/null` in 3885 3856 *@@@%%%=?*=@@@%%%*) … … 4084 4055 4085 4056 fi 4086 test x$JAVA = x && as_fn_error $?"no acceptable Java virtual machine found in \$PATH" "$LINENO" 54057 test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 4087 4058 fi 4088 4059 … … 4146 4117 ac_cv_prog_uudecode_base64=yes 4147 4118 else 4148 echo "configure: 41 48: uudecode had trouble decoding base 64 file 'Test.uue'" >&54119 echo "configure: 4119: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 4149 4120 echo "configure: failed file was:" >&5 4150 4121 cat Test.uue >&5 … … 4161 4132 $as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} 4162 4133 if test x$ac_cv_prog_javac_works = xno; then 4163 as_fn_error $?"Cannot compile java source. $JAVAC does not work properly" "$LINENO" 54134 as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 4164 4135 fi 4165 4136 if test x$ac_cv_prog_javac_works = x; then … … 4254 4225 4255 4226 fi 4256 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 54227 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 4257 4228 else 4258 4229 echo "Checking for javac... $JAVAC" … … 4269 4240 CLASS_TEST=Test.class 4270 4241 cat << \EOF > $JAVA_TEST 4271 /* #line 42 71"configure" */4242 /* #line 4242 "configure" */ 4272 4243 public class Test { 4273 4244 } … … 4281 4252 ac_cv_prog_javac_works=yes 4282 4253 else 4283 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54254 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4284 4255 echo "configure: failed program was:" >&5 4285 4256 cat $JAVA_TEST >&5 … … 4308 4279 TEST=Test 4309 4280 cat << \EOF > $JAVA_TEST 4310 /* [#]line 4 310"configure" */4281 /* [#]line 4281 "configure" */ 4311 4282 public class Test { 4312 4283 public static void main (String args[]) { … … 4325 4296 echo "configure: failed program was:" >&5 4326 4297 cat $JAVA_TEST >&5 4327 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54298 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4328 4299 fi 4329 4300 fi … … 4338 4309 echo "configure: failed program was:" >&5 4339 4310 cat $JAVA_TEST >&5 4340 as_fn_error $?"The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 54311 as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4341 4312 fi 4342 4313 rm -fr $JAVA_TEST $CLASS_TEST Test.uue … … 4438 4409 4439 4410 fi 4440 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 54411 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 4441 4412 else 4442 4413 echo "Checking for javac... $JAVAC" … … 4453 4424 CLASS_TEST=Test.class 4454 4425 cat << \EOF > $JAVA_TEST 4455 /* #line 44 55"configure" */4426 /* #line 4426 "configure" */ 4456 4427 public class Test { 4457 4428 } … … 4465 4436 ac_cv_prog_javac_works=yes 4466 4437 else 4467 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54438 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4468 4439 echo "configure: failed program was:" >&5 4469 4440 cat $JAVA_TEST >&5 … … 4525 4496 continue 4526 4497 fi 4527 rm -f conftest.err conftest. i conftest.$ac_ext4498 rm -f conftest.err conftest.$ac_ext 4528 4499 4529 4500 # OK, works on sane cases. Now check whether nonexistent headers … … 4541 4512 break 4542 4513 fi 4543 rm -f conftest.err conftest. i conftest.$ac_ext4514 rm -f conftest.err conftest.$ac_ext 4544 4515 4545 4516 done 4546 4517 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4547 rm -f conftest. i conftest.err conftest.$ac_ext4518 rm -f conftest.err conftest.$ac_ext 4548 4519 if $ac_preproc_ok; then : 4549 4520 break … … 4584 4555 continue 4585 4556 fi 4586 rm -f conftest.err conftest. i conftest.$ac_ext4557 rm -f conftest.err conftest.$ac_ext 4587 4558 4588 4559 # OK, works on sane cases. Now check whether nonexistent headers … … 4600 4571 break 4601 4572 fi 4602 rm -f conftest.err conftest. i conftest.$ac_ext4573 rm -f conftest.err conftest.$ac_ext 4603 4574 4604 4575 done 4605 4576 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4606 rm -f conftest. i conftest.err conftest.$ac_ext4577 rm -f conftest.err conftest.$ac_ext 4607 4578 if $ac_preproc_ok; then : 4608 4579 … … 4610 4581 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4611 4582 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4612 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4613 See \`config.log' for more details " "$LINENO" 5; }4583 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4584 See \`config.log' for more details." "$LINENO" 5; } 4614 4585 fi 4615 4586 … … 4672 4643 IFS=$as_save_IFS 4673 4644 if test -z "$ac_cv_path_GREP"; then 4674 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54645 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4675 4646 fi 4676 4647 else … … 4738 4709 IFS=$as_save_IFS 4739 4710 if test -z "$ac_cv_path_EGREP"; then 4740 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54711 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4741 4712 fi 4742 4713 else … … 4870 4841 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4871 4842 " 4872 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4843 eval as_val=\$$as_ac_Header 4844 if test "x$as_val" = x""yes; then : 4873 4845 cat >>confdefs.h <<_ACEOF 4874 4846 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5442 5414 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 5443 5415 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 5444 if eval "test \"\${$as_ac_Header+set}\"" = set; then :5416 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 5445 5417 $as_echo_n "(cached) " >&6 5446 5418 else … … 5469 5441 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 5470 5442 $as_echo "$ac_res" >&6; } 5471 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5443 eval as_val=\$$as_ac_Header 5444 if test "x$as_val" = x""yes; then : 5472 5445 cat >>confdefs.h <<_ACEOF 5473 5446 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 … … 5711 5684 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5712 5685 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5713 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5686 eval as_val=\$$as_ac_Header 5687 if test "x$as_val" = x""yes; then : 5714 5688 cat >>confdefs.h <<_ACEOF 5715 5689 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5884 5858 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5885 5859 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5886 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5860 eval as_val=\$$as_ac_var 5861 if test "x$as_val" = x""yes; then : 5887 5862 5888 5863 cat >>confdefs.h <<_ACEOF … … 6044 6019 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6045 6020 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6046 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 6021 eval as_val=\$$as_ac_var 6022 if test "x$as_val" = x""yes; then : 6047 6023 cat >>confdefs.h <<_ACEOF 6048 6024 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 … … 6052 6028 done 6053 6029 6054 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 6055 if test "x$ac_cv_func_ftruncate" = x""yes; then : 6056 $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 6030 for ac_func in ftruncate strstr strcasecmp 6031 do : 6032 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6033 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6034 eval as_val=\$$as_ac_var 6035 if test "x$as_val" = x""yes; then : 6036 cat >>confdefs.h <<_ACEOF 6037 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 6038 _ACEOF 6057 6039 6058 6040 else 6059 6041 case " $LIBOBJS " in 6060 *" ftruncate.$ac_objext "* ) ;;6061 *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"6042 *" $ac_func.$ac_objext "* ) ;; 6043 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 6062 6044 ;; 6063 6045 esac 6064 6046 6065 6047 fi 6066 6067 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 6068 if test "x$ac_cv_func_strstr" = x""yes; then : 6069 $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 6070 6071 else 6072 case " $LIBOBJS " in 6073 *" strstr.$ac_objext "* ) ;; 6074 *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 6075 ;; 6076 esac 6077 6078 fi 6079 6080 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 6081 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 6082 $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 6083 6084 else 6085 case " $LIBOBJS " in 6086 *" strcasecmp.$ac_objext "* ) ;; 6087 *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 6088 ;; 6089 esac 6090 6091 fi 6048 done 6092 6049 6093 6050 … … 6228 6185 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 6229 6186 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 6230 as_fn_error 77 "cannot compute sizeof (unsigned char *) 6231 See \`config.log' for more details" "$LINENO" 5 ; } 6187 { as_fn_set_status 77 6188 as_fn_error "cannot compute sizeof (unsigned char *) 6189 See \`config.log' for more details." "$LINENO" 5; }; } 6232 6190 else 6233 6191 ac_cv_sizeof_unsigned_char_p=0 … … 6615 6573 ;; #( 6616 6574 *) 6617 as_fn_error $?"unknown endianness6618 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 6575 as_fn_error "unknown endianness 6576 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 6619 6577 esac 6620 6578 … … 6736 6694 ac_libobjs= 6737 6695 ac_ltlibobjs= 6738 U=6739 6696 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 6740 6697 # 1. Remove the extension, and $U if already installed. … … 6899 6856 6900 6857 6901 # as_fn_error STATUSERROR [LINENO LOG_FD]6902 # --------------------------------- -------6858 # as_fn_error ERROR [LINENO LOG_FD] 6859 # --------------------------------- 6903 6860 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 6904 6861 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 6905 # script with STATUS, using 1 if that was 0.6862 # script with status $?, using 1 if that was 0. 6906 6863 as_fn_error () 6907 6864 { 6908 as_status=$ 1; test $as_status -eq 0 && as_status=16909 if test "$ 4"; then6910 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack6911 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$46865 as_status=$?; test $as_status -eq 0 && as_status=1 6866 if test "$3"; then 6867 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6868 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 6912 6869 fi 6913 $as_echo "$as_me: error: $ 2" >&26870 $as_echo "$as_me: error: $1" >&2 6914 6871 as_fn_exit $as_status 6915 6872 } # as_fn_error … … 7107 7064 done 7108 7065 test -z "$as_dirs" || eval "mkdir $as_dirs" 7109 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"7066 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 7110 7067 7111 7068 … … 7161 7118 ac_log=" 7162 7119 This file was extended by $as_me, which was 7163 generated by GNU Autoconf 2.6 7. Invocation command line was7120 generated by GNU Autoconf 2.65. Invocation command line was 7164 7121 7165 7122 CONFIG_FILES = $CONFIG_FILES … … 7227 7184 ac_cs_version="\\ 7228 7185 config.status 7229 configured by $0, generated by GNU Autoconf 2.6 7,7186 configured by $0, generated by GNU Autoconf 2.65, 7230 7187 with options \\"\$ac_cs_config\\" 7231 7188 7232 Copyright (C) 20 10Free Software Foundation, Inc.7189 Copyright (C) 2009 Free Software Foundation, Inc. 7233 7190 This config.status script is free software; the Free Software Foundation 7234 7191 gives unlimited permission to copy, distribute and modify it." … … 7247 7204 do 7248 7205 case $1 in 7249 --*= ?*)7206 --*=*) 7250 7207 ac_option=`expr "X$1" : 'X\([^=]*\)='` 7251 7208 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 7252 ac_shift=:7253 ;;7254 --*=)7255 ac_option=`expr "X$1" : 'X\([^=]*\)='`7256 ac_optarg=7257 7209 ac_shift=: 7258 7210 ;; … … 7278 7230 case $ac_optarg in 7279 7231 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 7280 '') as_fn_error $? "missing file argument" ;;7281 7232 esac 7282 7233 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 7291 7242 --he | --h) 7292 7243 # Conflict between --help and --header 7293 as_fn_error $?"ambiguous option: \`$1'7244 as_fn_error "ambiguous option: \`$1' 7294 7245 Try \`$0 --help' for more information.";; 7295 7246 --help | --hel | -h ) … … 7300 7251 7301 7252 # This is an error. 7302 -*) as_fn_error $?"unrecognized option: \`$1'7253 -*) as_fn_error "unrecognized option: \`$1' 7303 7254 Try \`$0 --help' for more information." ;; 7304 7255 … … 7357 7308 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 7358 7309 7359 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;7310 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 7360 7311 esac 7361 7312 done … … 7395 7346 tmp=./conf$$-$RANDOM 7396 7347 (umask 077 && mkdir "$tmp") 7397 } || as_fn_error $?"cannot create a temporary directory in ." "$LINENO" 57348 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 7398 7349 7399 7350 # Set up the scripts for CONFIG_FILES section. … … 7412 7363 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 7413 7364 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 7414 ac_cs_awk_cr='\ \r'7365 ac_cs_awk_cr='\r' 7415 7366 else 7416 7367 ac_cs_awk_cr=$ac_cr … … 7426 7377 echo "_ACEOF" 7427 7378 } >conf$$subs.sh || 7428 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57429 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`7379 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7380 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 7430 7381 ac_delim='%!_!# ' 7431 7382 for ac_last_try in false false false false false :; do 7432 7383 . ./conf$$subs.sh || 7433 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57384 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7434 7385 7435 7386 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 7437 7388 break 7438 7389 elif $ac_last_try; then 7439 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57390 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7440 7391 else 7441 7392 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7526 7477 cat 7527 7478 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 7528 || as_fn_error $?"could not setup config files machinery" "$LINENO" 57529 _ACEOF 7530 7531 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),7532 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and7479 || as_fn_error "could not setup config files machinery" "$LINENO" 5 7480 _ACEOF 7481 7482 # VPATH may cause trouble with some makes, so we remove $(srcdir), 7483 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 7533 7484 # trailing colons and then remove the whole line if VPATH becomes empty 7534 7485 # (actually we leave an empty line to preserve line numbers). 7535 7486 if test "x$srcdir" = x.; then 7536 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 7537 h 7538 s/// 7539 s/^/:/ 7540 s/[ ]*$/:/ 7541 s/:\$(srcdir):/:/g 7542 s/:\${srcdir}:/:/g 7543 s/:@srcdir@:/:/g 7544 s/^:*// 7487 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 7488 s/:*\$(srcdir):*/:/ 7489 s/:*\${srcdir}:*/:/ 7490 s/:*@srcdir@:*/:/ 7491 s/^\([^=]*=[ ]*\):*/\1/ 7545 7492 s/:*$// 7546 x7547 s/\(=[ ]*\).*/\1/7548 G7549 s/\n//7550 7493 s/^[^=]*=[ ]*$// 7551 7494 }' … … 7575 7518 break 7576 7519 elif $ac_last_try; then 7577 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 57520 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 7578 7521 else 7579 7522 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7660 7603 _ACEOF 7661 7604 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 7662 as_fn_error $?"could not setup config headers machinery" "$LINENO" 57605 as_fn_error "could not setup config headers machinery" "$LINENO" 5 7663 7606 fi # test -n "$CONFIG_HEADERS" 7664 7607 … … 7673 7616 case $ac_mode$ac_tag in 7674 7617 :[FHL]*:*);; 7675 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;7618 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 7676 7619 :[FH]-) ac_tag=-:-;; 7677 7620 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 7701 7644 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 7702 7645 esac || 7703 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;7646 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 7704 7647 esac 7705 7648 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 7728 7671 case $ac_tag in 7729 7672 *:-:* | *:-) cat >"$tmp/stdin" \ 7730 || as_fn_error $? "could not create $ac_file" "$LINENO" 5;;7673 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 7731 7674 esac 7732 7675 ;; … … 7859 7802 " 7860 7803 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 7861 || as_fn_error $?"could not create $ac_file" "$LINENO" 57804 || as_fn_error "could not create $ac_file" "$LINENO" 5 7862 7805 7863 7806 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && … … 7865 7808 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 7866 7809 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7867 which seems to be undefined. Please make sure it is defined " >&57810 which seems to be undefined. Please make sure it is defined." >&5 7868 7811 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7869 which seems to be undefined. Please make sure it is defined " >&2;}7812 which seems to be undefined. Please make sure it is defined." >&2;} 7870 7813 7871 7814 rm -f "$tmp/stdin" … … 7874 7817 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 7875 7818 esac \ 7876 || as_fn_error $?"could not create $ac_file" "$LINENO" 57819 || as_fn_error "could not create $ac_file" "$LINENO" 5 7877 7820 ;; 7878 7821 :H) … … 7885 7828 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 7886 7829 } >"$tmp/config.h" \ 7887 || as_fn_error $?"could not create $ac_file" "$LINENO" 57830 || as_fn_error "could not create $ac_file" "$LINENO" 5 7888 7831 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 7889 7832 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 … … 7892 7835 rm -f "$ac_file" 7893 7836 mv "$tmp/config.h" "$ac_file" \ 7894 || as_fn_error $?"could not create $ac_file" "$LINENO" 57837 || as_fn_error "could not create $ac_file" "$LINENO" 5 7895 7838 fi 7896 7839 else 7897 7840 $as_echo "/* $configure_input */" \ 7898 7841 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 7899 || as_fn_error $?"could not create -" "$LINENO" 57842 || as_fn_error "could not create -" "$LINENO" 5 7900 7843 fi 7901 7844 ;; … … 7919 7862 7920 7863 test $ac_write_fail = 0 || 7921 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 57864 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 7922 7865 7923 7866 … … 7940 7883 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7941 7884 # would make configure fail if this is the last instruction. 7942 $ac_cs_success || as_fn_exit 17885 $ac_cs_success || as_fn_exit $? 7943 7886 fi 7944 7887 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/configure.in
r23356 r23508 34 34 AC_SUBST(ENABLE_JAVA) 35 35 36 AC_MSG_CHECKING(to see if architecture is 64-bit) 37 arch_64bit=no 38 case "$host_cpu" in 39 x86_64) arch_64bit=yes ;; 40 esac 41 42 if test "$arch_64bit" = yes; then 43 AC_MSG_RESULT(yes) 44 if test -z "$COMPAT32BITFLAGS" ; then 45 COMPAT32BITFLAGS="-m32" 46 fi 47 else 48 AC_MSG_RESULT(no) 49 if test -z "$COMPAT32BITFLAGS" ; then 50 COMPAT32BITFLAGS= 51 fi 52 fi 53 AC_SUBST(COMPAT32BITFLAGS) 36 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 37 dnl arch_64bit=no 38 dnl case "$host_cpu" in 39 dnl x86_64) arch_64bit=yes ;; 40 dnl esac 54 41 55 42 dnl -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in
r23356 r23508 17 17 JAVAH = javah 18 18 JAR = jar 19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -DSILENT -DSHORT_SUFFIX20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-DSILENT -DSHORT_SUFFIX19 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 20 CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX 21 21 JAVACFLAGS = @JAVACFLAGS@ 22 22 DEFS = @DEFS@ … … 25 25 INSTALL_DATA = @INSTALL_DATA@ 26 26 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@27 LDFLAGS = @LDFLAGS@ 28 28 LIBS = -lstdc++ @LIBS@ 29 29 TOUCH = echo timestamp > -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/jni/MGPPRetrieveWrapperImpl.cpp
r16583 r23508 56 56 57 57 // does this work alright? j_docnum is a long (64 bit) 58 unsignedlong docnum = j_docnum;58 mg_u_long docnum = j_docnum; 59 59 TextData td; 60 60 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/jni/Makefile.in
r22070 r23508 26 26 CC = @CC@ 27 27 CXX = @CXX@ 28 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-fPIC -ansi -DSILENT -DSHORT_SUFFIX29 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-fPIC -DSILENT -DSHORT_SUFFIX28 CFLAGS = @CFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX 29 CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX 30 30 DEFS = @DEFS@ 31 31 RANLIB = @RANLIB@ … … 33 33 INSTALL_DATA = @INSTALL_DATA@ 34 34 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@35 LDFLAGS = @LDFLAGS@ 36 36 #NOTE: libmgpptext.a needs to come before libmgpplib.a !!! 37 37 QUERY_LIBS = ../text/libmgpptext.a ../lib/libmgpplib.a $(AFLIBS) -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/Makefile.in
r22070 r23508 36 36 CXX = @CXX@ 37 37 ifneq ($(NZDL), 1) 38 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -fPIC38 CFLAGS = @CFLAGS@ -ansi -fPIC 39 39 else 40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -fPIC -DSILENT40 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT 41 41 endif 42 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-fPIC42 CXXFLAGS = @CXXFLAGS@ -fPIC 43 43 DEFS = @DEFS@ 44 44 RANLIB = @RANLIB@ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/alloca.c
r16583 r23508 59 59 60 60 #if defined (CRAY) && defined (CRAY_STACKSEG_END) 61 long i00afunc ();61 mg_s_long i00afunc (); 62 62 #define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) 63 63 #else … … 237 237 struct stack_control_header 238 238 { 239 long shgrow:32; /* Number of times stack has grown. */240 long shaseg:32; /* Size of increments to stack. */241 long shhwm:32; /* High water mark of stack. */242 long shsize:32; /* Current size of stack (all segments). */239 mg_s_long shgrow:32; /* Number of times stack has grown. */ 240 mg_s_long shaseg:32; /* Size of increments to stack. */ 241 mg_s_long shhwm:32; /* High water mark of stack. */ 242 mg_s_long shsize:32; /* Current size of stack (all segments). */ 243 243 }; 244 244 … … 252 252 struct stack_segment_linkage 253 253 { 254 long ss[0200]; /* 0200 overflow words. */255 long sssize:32; /* Number of words in this segment. */256 long ssbase:32; /* Offset to stack base. */257 long:32;258 long sspseg:32; /* Offset to linkage control of previous254 mg_s_long ss[0200]; /* 0200 overflow words. */ 255 mg_s_long sssize:32; /* Number of words in this segment. */ 256 mg_s_long ssbase:32; /* Offset to stack base. */ 257 mg_s_long:32; 258 mg_s_long sspseg:32; /* Offset to linkage control of previous 259 259 segment of stack. */ 260 long:32;261 long sstcpt:32; /* Pointer to task common address block. */262 long sscsnm; /* Private control structure number for260 mg_s_long:32; 261 mg_s_long sstcpt:32; /* Pointer to task common address block. */ 262 mg_s_long sscsnm; /* Private control structure number for 263 263 microtasking. */ 264 long ssusr1; /* Reserved for user. */265 long ssusr2; /* Reserved for user. */266 long sstpid; /* Process ID for pid based multi-tasking. */267 long ssgvup; /* Pointer to multitasking thread giveup. */268 long sscray[7]; /* Reserved for Cray Research. */269 long ssa0;270 long ssa1;271 long ssa2;272 long ssa3;273 long ssa4;274 long ssa5;275 long ssa6;276 long ssa7;277 long sss0;278 long sss1;279 long sss2;280 long sss3;281 long sss4;282 long sss5;283 long sss6;284 long sss7;264 mg_s_long ssusr1; /* Reserved for user. */ 265 mg_s_long ssusr2; /* Reserved for user. */ 266 mg_s_long sstpid; /* Process ID for pid based multi-tasking. */ 267 mg_s_long ssgvup; /* Pointer to multitasking thread giveup. */ 268 mg_s_long sscray[7]; /* Reserved for Cray Research. */ 269 mg_s_long ssa0; 270 mg_s_long ssa1; 271 mg_s_long ssa2; 272 mg_s_long ssa3; 273 mg_s_long ssa4; 274 mg_s_long ssa5; 275 mg_s_long ssa6; 276 mg_s_long ssa7; 277 mg_s_long sss0; 278 mg_s_long sss1; 279 mg_s_long sss2; 280 mg_s_long sss3; 281 mg_s_long sss4; 282 mg_s_long sss5; 283 mg_s_long sss6; 284 mg_s_long sss7; 285 285 }; 286 286 … … 290 290 struct stk_stat 291 291 { 292 long now; /* Current total stack size. */293 long maxc; /* Amount of contiguous space which would292 mg_s_long now; /* Current total stack size. */ 293 mg_s_long maxc; /* Amount of contiguous space which would 294 294 be required to satisfy the maximum 295 295 stack demand to date. */ 296 long high_water; /* Stack high-water mark. */297 long overflows; /* Number of stack overflow ($STKOFEN) calls. */298 long hits; /* Number of internal buffer hits. */299 long extends; /* Number of block extensions. */300 long stko_mallocs; /* Block allocations by $STKOFEN. */301 long underflows; /* Number of stack underflow calls ($STKRETN). */302 long stko_free; /* Number of deallocations by $STKRETN. */303 long stkm_free; /* Number of deallocations by $STKMRET. */304 long segments; /* Current number of stack segments. */305 long maxs; /* Maximum number of stack segments so far. */306 long pad_size; /* Stack pad size. */307 long current_address; /* Current stack segment address. */308 long current_size; /* Current stack segment size. This296 mg_s_long high_water; /* Stack high-water mark. */ 297 mg_s_long overflows; /* Number of stack overflow ($STKOFEN) calls. */ 298 mg_s_long hits; /* Number of internal buffer hits. */ 299 mg_s_long extends; /* Number of block extensions. */ 300 mg_s_long stko_mallocs; /* Block allocations by $STKOFEN. */ 301 mg_s_long underflows; /* Number of stack underflow calls ($STKRETN). */ 302 mg_s_long stko_free; /* Number of deallocations by $STKRETN. */ 303 mg_s_long stkm_free; /* Number of deallocations by $STKMRET. */ 304 mg_s_long segments; /* Current number of stack segments. */ 305 mg_s_long maxs; /* Maximum number of stack segments so far. */ 306 mg_s_long pad_size; /* Stack pad size. */ 307 mg_s_long current_address; /* Current stack segment address. */ 308 mg_s_long current_size; /* Current stack segment size. This 309 309 number is actually corrupted by STKSTAT to 310 310 include the fifteen word trailer area. */ 311 long initial_address; /* Address of initial segment. */312 long initial_size; /* Size of initial segment. */311 mg_s_long initial_address; /* Address of initial segment. */ 312 mg_s_long initial_size; /* Size of initial segment. */ 313 313 }; 314 314 … … 319 319 struct stk_trailer 320 320 { 321 long this_address; /* Address of this block. */322 long this_size; /* Size of this block (does not include321 mg_s_long this_address; /* Address of this block. */ 322 mg_s_long this_size; /* Size of this block (does not include 323 323 this trailer). */ 324 long unknown2;325 long unknown3;326 long link; /* Address of trailer block of previous324 mg_s_long unknown2; 325 mg_s_long unknown3; 326 mg_s_long link; /* Address of trailer block of previous 327 327 segment. */ 328 long unknown5;329 long unknown6;330 long unknown7;331 long unknown8;332 long unknown9;333 long unknown10;334 long unknown11;335 long unknown12;336 long unknown13;337 long unknown14;328 mg_s_long unknown5; 329 mg_s_long unknown6; 330 mg_s_long unknown7; 331 mg_s_long unknown8; 332 mg_s_long unknown9; 333 mg_s_long unknown10; 334 mg_s_long unknown11; 335 mg_s_long unknown12; 336 mg_s_long unknown13; 337 mg_s_long unknown14; 338 338 }; 339 339 … … 345 345 I doubt that "lint" will like this much. */ 346 346 347 static long348 i00afunc ( long *address)347 static mg_s_long 348 i00afunc (mg_s_long *address) 349 349 { 350 350 struct stk_stat status; 351 351 struct stk_trailer *trailer; 352 long *block, size;353 long result = 0;352 mg_s_long *block, size; 353 mg_s_long result = 0; 354 354 355 355 /* We want to iterate through all of the segments. The first … … 376 376 while (trailer != 0) 377 377 { 378 block = ( long *) trailer->this_address;378 block = (mg_s_long *) trailer->this_address; 379 379 size = trailer->this_size; 380 380 if (block == 0 || size == 0) … … 419 419 for alloca. */ 420 420 421 static long422 i00afunc ( long address)421 static mg_s_long 422 i00afunc (mg_s_long address) 423 423 { 424 long stkl = 0;425 426 long size, pseg, this_segment, stack;427 long result = 0;424 mg_s_long stkl = 0; 425 426 mg_s_long size, pseg, this_segment, stack; 427 mg_s_long result = 0; 428 428 429 429 struct stack_segment_linkage *ssptr; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.cpp
r16583 r23508 25 25 int fprintf (FILE *, const char *,...); 26 26 27 unsignedlong28 BIO_Unary_Length ( unsignedlong val)27 mg_u_long 28 BIO_Unary_Length (mg_u_long val) 29 29 { 30 register unsignedlong num;30 register mg_u_long num; 31 31 num = bitio_buffer::unary_length(val); 32 32 // UNARY_LENGTH (val, num); … … 35 35 36 36 37 unsignedlong38 BIO_Binary_Length ( unsigned long val, unsignedlong b)37 mg_u_long 38 BIO_Binary_Length (mg_u_long val, mg_u_long b) 39 39 { 40 register unsignedlong num;40 register mg_u_long num; 41 41 num = bitio_buffer::binary_length (val, b); 42 42 return (num); … … 44 44 45 45 46 unsigned long BIO_Gamma_Length (unsignedlong val) {47 register unsignedlong num;46 mg_u_long BIO_Gamma_Length (mg_u_long val) { 47 register mg_u_long num; 48 48 num = bitio_buffer::gamma_length(val); 49 49 return (num); … … 51 51 52 52 53 unsignedlong54 BIO_Delta_Length ( unsignedlong val)53 mg_u_long 54 BIO_Delta_Length (mg_u_long val) 55 55 { 56 register unsignedlong num;56 register mg_u_long num; 57 57 num = bitio_buffer::delta_length(val); 58 58 return (num); … … 60 60 61 61 62 unsignedlong63 BIO_Elias_Length ( unsigned long val, unsignedlong b, double s)62 mg_u_long 63 BIO_Elias_Length (mg_u_long val, mg_u_long b, double s) 64 64 { 65 register unsignedlong num;65 register mg_u_long num; 66 66 num = bitio_buffer::elias_length(val, b, s); 67 67 return (num); 68 68 } 69 69 70 unsignedlong71 BIO_Bblock_Length ( unsigned long val, unsignedlong b)70 mg_u_long 71 BIO_Bblock_Length (mg_u_long val, mg_u_long b) 72 72 { 73 register unsignedlong num;73 register mg_u_long num; 74 74 num = bitio_buffer::bblock_length (val, b); 75 75 return (num); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.h
r16583 r23508 33 33 #define H_BITIO_GEN 34 34 35 unsigned long BIO_Unary_Length (unsignedlong val);35 mg_u_long BIO_Unary_Length (mg_u_long val); 36 36 37 unsigned long BIO_Binary_Length (unsigned long val, unsignedlong b);37 mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b); 38 38 39 unsigned long BIO_Gamma_Length (unsignedlong val);39 mg_u_long BIO_Gamma_Length (mg_u_long val); 40 40 41 unsigned long BIO_Delta_Length (unsignedlong val);41 mg_u_long BIO_Delta_Length (mg_u_long val); 42 42 43 unsigned long BIO_Elias_Length (unsigned long val, unsignedlong b, double s);43 mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s); 44 44 45 unsigned long BIO_Bblock_Length (unsigned long val, unsignedlong b);45 mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b); 46 46 47 47 int BIO_Bblock_Init (int N, int p); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_abstract.h
r18716 r23508 1 1 #ifndef H_BITIO_ABSTRACT 2 2 #define H_BITIO_ABSTRACT 3 #include "mglong.h" 3 4 #include <cstdlib> 4 5 class bitio_buffer { … … 6 7 virtual int bit() = 0; 7 8 virtual void encodeBit(int bit) = 0; 8 virtual void seek(unsigned long topos) = 0; 9 10 static inline void check_positive(char *type, unsigned long x) { 9 virtual void seek(mg_u_long topos) = 0; 10 11 virtual ~bitio_buffer() {} 12 13 static inline void check_positive(char *type, mg_u_long x) { 11 14 if (x <= 0) { 12 fprintf(stderr, "Error: Cannot %s encode % lu\n", type, x);15 fprintf(stderr, "Error: Cannot %s encode %u\n", type, x); 13 16 exit(1); 14 17 } 15 18 } 16 19 17 static inline int floor_log2( unsignedlong x) {18 unsignedlong _B_x = x;20 static inline int floor_log2(mg_u_long x) { 21 mg_u_long _B_x = x; 19 22 int reply; 20 23 … … 27 30 } 28 31 29 static inline int ceil_log2( unsignedlong x) {32 static inline int ceil_log2(mg_u_long x) { 30 33 register int _B_x; 31 unsignedlong reply;34 mg_u_long reply; 32 35 33 36 _B_x = x - 1; … … 40 43 } 41 44 42 inline unsigned long unary_decode(unsignedlong *count) {43 unsignedlong x;45 inline mg_u_long unary_decode(mg_u_long *count) { 46 mg_u_long x; 44 47 45 48 x = 1; … … 51 54 } 52 55 53 inline void unary_encode( unsigned long x, unsignedlong *count) {54 register unsignedlong _B_x = x;55 check_positive( "unary", _B_x);56 inline void unary_encode(mg_u_long x, mg_u_long *count) { 57 register mg_u_long _B_x = x; 58 check_positive((char*)"unary", _B_x); 56 59 if (count != NULL) { 57 60 *count += _B_x; … … 63 66 64 67 65 inline unsigned long binary_decode(unsigned long b, unsignedlong *count) {66 register unsignedlong _B_x = 0;67 register unsignedlong _B_b = b;68 inline mg_u_long binary_decode(mg_u_long b, mg_u_long *count) { 69 register mg_u_long _B_x = 0; 70 register mg_u_long _B_b = b; 68 71 register int _B_i, _B_logofb, _B_thresh; 69 register unsignedlong reply;72 register mg_u_long reply; 70 73 71 74 if (_B_b != 1) { … … 96 99 } 97 100 98 inline void binary_encode( unsigned long x, unsigned long b, unsignedlong *count) {99 register unsignedlong _B_x = (x);100 register unsignedlong _B_b = (b);101 inline void binary_encode(mg_u_long x, mg_u_long b, mg_u_long *count) { 102 register mg_u_long _B_x = (x); 103 register mg_u_long _B_b = (b); 101 104 register int _B_nbits, _B_logofb, _B_thresh; 102 105 103 check_positive( "binary", _B_x);106 check_positive((char*)"binary", _B_x); 104 107 _B_logofb = ceil_log2(_B_b); 105 108 … … 117 120 } 118 121 119 inline unsigned long bblock_decode(unsigned long b, unsignedlong *count) {120 register unsignedlong _B_x1, _B_xx = 0;121 register unsignedlong _B_bb = (b);122 inline mg_u_long bblock_decode(mg_u_long b, mg_u_long *count) { 123 register mg_u_long _B_x1, _B_xx = 0; 124 register mg_u_long _B_bb = (b); 122 125 register int _B_xdivb; 123 126 … … 131 134 } 132 135 133 inline void bblock_encode( unsigned long x, unsigned long b, unsignedlong *count) {134 register unsignedlong _B_xx = (x);135 register unsignedlong _B_bb = (b);136 inline void bblock_encode(mg_u_long x, mg_u_long b, mg_u_long *count) { 137 register mg_u_long _B_xx = (x); 138 register mg_u_long _B_bb = (b); 136 139 register int _B_xdivb = 0; 137 check_positive( "bblock", _B_xx);140 check_positive((char*)"bblock", _B_xx); 138 141 --_B_xx; 139 142 while (_B_xx >= _B_bb) { … … 145 148 } 146 149 147 inline unsigned long elias_decode(unsigned long b, double s, unsignedlong *count) {148 register unsignedlong _B_xx;149 register unsignedlong _B_b = b;150 inline mg_u_long elias_decode(mg_u_long b, double s, mg_u_long *count) { 151 register mg_u_long _B_xx; 152 register mg_u_long _B_b = b; 150 153 register double _B_s = s; 151 154 register int _B_lower=1, _B_upper=1; … … 162 165 _B_xx = this->binary_decode(_B_upper-_B_lower+1, count); 163 166 --_B_xx; 164 check_positive( "gamma", _B_xx+_B_lower);167 check_positive((char*)"gamma", _B_xx+_B_lower); 165 168 return _B_xx+_B_lower; 166 169 } 167 170 168 inline void elias_encode( unsigned long x, unsigned long b, double s, unsignedlong *count) {169 register unsignedlong _B_xx = x;170 register unsignedlong _B_b = b;171 inline void elias_encode(mg_u_long x, mg_u_long b, double s, mg_u_long *count) { 172 register mg_u_long _B_xx = x; 173 register mg_u_long _B_b = b; 171 174 register double _B_s = s; 172 175 register int _B_lower=1, _B_upper=1; … … 174 177 register double _B_pow=1.0; 175 178 176 check_positive( "elias", _B_xx);179 check_positive((char*)"elias", _B_xx); 177 180 178 181 while ((int)_B_xx>_B_upper) { … … 186 189 } 187 190 188 inline unsigned long gamma_decode(unsignedlong *count) {189 register unsignedlong _B_xx = 1;191 inline mg_u_long gamma_decode(mg_u_long *count) { 192 register mg_u_long _B_xx = 1; 190 193 register int _B_nbits = 0; 191 194 … … 199 202 } 200 203 201 inline void gamma_encode( unsigned long x, unsignedlong *count) {202 register unsignedlong _B_xx = x;204 inline void gamma_encode(mg_u_long x, mg_u_long *count) { 205 register mg_u_long _B_xx = x; 203 206 register int _B_logofb; 204 207 register int _B_nbits; 205 208 206 check_positive( "gamma", _B_xx);209 check_positive((char*)"gamma", _B_xx); 207 210 _B_logofb = floor_log2(_B_xx); 208 211 _B_nbits = _B_logofb+1; … … 215 218 } 216 219 217 inline unsigned long delta_decode(unsignedlong *count) {218 register unsignedlong _B_xxx;220 inline mg_u_long delta_decode(mg_u_long *count) { 221 register mg_u_long _B_xxx; 219 222 register int _B_logx; 220 223 _B_logx = gamma_decode(count); … … 225 228 } 226 229 227 inline void delta_encode( unsigned long x, unsignedlong *count) {228 register unsignedlong _B_xxx = x;230 inline void delta_encode(mg_u_long x, mg_u_long *count) { 231 register mg_u_long _B_xxx = x; 229 232 register int _B_logx; 230 233 _B_logx = floor_log2(_B_xxx); … … 233 236 } 234 237 235 inline unsigned long huff_decode(unsigned long *mcodes, unsignedlong **values,236 unsignedlong *count = NULL) {237 register unsignedlong *__min_code = mcodes;238 register unsignedlong *__mclen = mcodes;239 register unsignedlong **__values = values;240 register unsignedlong __code = 0;238 inline mg_u_long huff_decode(mg_u_long *mcodes, mg_u_long **values, 239 mg_u_long *count = NULL) { 240 register mg_u_long *__min_code = mcodes; 241 register mg_u_long *__mclen = mcodes; 242 register mg_u_long **__values = values; 243 register mg_u_long __code = 0; 241 244 do { 242 245 __code += __code + bit(); … … 247 250 } 248 251 249 inline void huff_encode( unsigned long x, unsignedlong *codes, char *lens,250 unsignedlong *count = NULL) {252 inline void huff_encode(mg_u_long x, mg_u_long *codes, char *lens, 253 mg_u_long *count = NULL) { 251 254 register int __i; 252 255 register int __clen = lens[x]; 253 register unsignedlong __code = codes[x];256 register mg_u_long __code = codes[x]; 254 257 for (__i=__clen-1; __i>=0; --__i) { 255 258 encodeBit((__code >> __i) & 1); … … 260 263 } 261 264 262 static inline unsigned long unary_length(unsignedlong x) {263 check_positive( "unary", x);265 static inline mg_u_long unary_length(mg_u_long x) { 266 check_positive((char*)"unary", x); 264 267 return x; 265 268 } 266 269 267 static inline int binary_length( unsigned long x, unsignedlong b) {268 register unsignedlong _B_x = (x);269 register unsignedlong _B_b = (b);270 static inline int binary_length(mg_u_long x, mg_u_long b) { 271 register mg_u_long _B_x = (x); 272 register mg_u_long _B_b = (b); 270 273 register int _B_nbits, _B_logofb, _B_thresh; 271 274 272 check_positive( "binary", _B_x);275 check_positive((char*)"binary", _B_x); 273 276 _B_logofb = ceil_log2(_B_b); 274 277 _B_thresh = (1<<_B_logofb) - _B_b; … … 278 281 } 279 282 280 static inline unsigned long bblock_length(unsigned long x, unsignedlong b) {281 register unsignedlong _B_bcount, count, _B_xx = (x);282 register unsignedlong _B_bb = (b);283 static inline mg_u_long bblock_length(mg_u_long x, mg_u_long b) { 284 register mg_u_long _B_bcount, count, _B_xx = (x); 285 register mg_u_long _B_bb = (b); 283 286 register int _B_xdivb = 0; 284 287 285 check_positive( "bblock", _B_xx);288 check_positive((char*)"bblock", _B_xx); 286 289 --_B_xx; 287 290 while (_B_xx >= _B_bb) { … … 295 298 } 296 299 297 static inline unsigned long elias_length(unsigned long x, unsignedlong b,300 static inline mg_u_long elias_length(mg_u_long x, mg_u_long b, 298 301 double s) { 299 register unsignedlong _B_xx = x;300 register unsignedlong _B_b = b;302 register mg_u_long _B_xx = x; 303 register mg_u_long _B_b = b; 301 304 register double _B_s = s; 302 305 register int _B_lower=1, _B_upper=1; 303 306 register int _B_k=0, _B_ecount; 304 307 register double _B_pow=1.0; 305 register unsignedlong count;306 check_positive( "gamma", _B_xx);308 register mg_u_long count; 309 check_positive((char*)"gamma", _B_xx); 307 310 308 311 while ((int)(_B_xx)>_B_upper) { … … 318 321 } 319 322 320 static inline unsigned long gamma_length(unsignedlong x) {321 register unsignedlong _B_xx = x;323 static inline mg_u_long gamma_length(mg_u_long x) { 324 register mg_u_long _B_xx = x; 322 325 register int _B_logofb; 323 check_positive( "gamma", _B_xx);326 check_positive((char*)"gamma", _B_xx); 324 327 _B_logofb = floor_log2(_B_xx); 325 328 return _B_logofb*2+1; 326 329 } 327 330 328 static inline unsigned long delta_length(unsignedlong x) {329 register unsignedlong _B_xxx = x;331 static inline mg_u_long delta_length(mg_u_long x) { 332 register mg_u_long _B_xxx = x; 330 333 register int _B_logx, _B_dcount; 331 register unsignedlong count;334 register mg_u_long count; 332 335 _B_logx = floor_log2 (_B_xxx); 333 336 count = gamma_length(_B_logx+1); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.cpp
r16583 r23508 27 27 28 28 29 void mem_bitio_buffer::seek( unsignedlong toPos) {30 register long _newPos;29 void mem_bitio_buffer::seek(mg_u_long toPos) { 30 register mg_s_long _newPos; 31 31 do { 32 32 _newPos = toPos; … … 38 38 } 39 39 40 long mem_bitio_buffer::addff(long b) {40 mg_s_long mem_bitio_buffer::addff(mg_s_long b) { 41 41 do { 42 42 if (btg == 0) { … … 55 55 } 56 56 57 long mem_bitio_buffer::add00(long b) {57 mg_s_long mem_bitio_buffer::add00(mg_s_long b) { 58 58 do { 59 59 if (btg == 0) { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.h
r16583 r23508 35 35 36 36 #include "bitio_m_abstract.h" 37 #include "mglong.h" 37 38 38 39 … … 48 49 mem_bitio_buffer (); 49 50 mem_bitio_buffer (unsigned char *buffer, int size); 50 void seek ( unsignedlong topos);51 void seek (mg_u_long topos); 51 52 void error (); 52 long add00 (long b);53 long addff (long b);53 mg_s_long add00 (mg_s_long b); 54 mg_s_long addff (mg_s_long b); 54 55 int bit (); 55 56 void done (); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.cpp
r16583 r23508 12 12 } 13 13 14 mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, long _pos)14 mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos) 15 15 { 16 16 base = readbuffer; … … 31 31 32 32 33 void mems_bitio_buffer::seek( unsignedlong toPos)33 void mems_bitio_buffer::seek(mg_u_long toPos) 34 34 { 35 35 pos = toPos; 36 36 } 37 37 38 unsignedlong mems_bitio_buffer::position()38 mg_u_long mems_bitio_buffer::position() 39 39 { 40 40 return pos; 41 41 } 42 42 43 long mems_bitio_buffer::addff(long b)43 mg_s_long mems_bitio_buffer::addff(mg_s_long b) 44 44 { 45 45 do … … 53 53 } 54 54 55 long mems_bitio_buffer::add00(long b)55 mg_s_long mems_bitio_buffer::add00(mg_s_long b) 56 56 { 57 57 return addff(b); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.h
r16583 r23508 34 34 35 35 #include "bitio_m_abstract.h" 36 36 #include "mglong.h" 37 37 38 38 class mems_bitio_buffer : public bitio_buffer { 39 39 protected: 40 40 unsigned char *base; 41 unsignedlong pos;41 mg_u_long pos; 42 42 43 43 public: 44 44 mems_bitio_buffer(); 45 mems_bitio_buffer(unsigned char *readbuffer, long _pos);46 void seek( unsignedlong topos);45 mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos); 46 void seek(mg_u_long topos); 47 47 void error(); 48 long add00(long b);49 long addff(long b);48 mg_s_long add00(mg_s_long b); 49 mg_s_long addff(mg_s_long b); 50 50 int bit(); 51 51 // int bitOffset(); 52 52 void done(); 53 53 54 unsignedlong position();54 mg_u_long position(); 55 55 56 56 void encodeStart(); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.cpp
r16583 r23508 9 9 #include "bitio_m_random.h" 10 10 11 random_bitio_buffer::random_bitio_buffer(FILE *f, unsignedlong length)11 random_bitio_buffer::random_bitio_buffer(FILE *f, mg_u_long length) 12 12 { 13 13 buffer = NULL; … … 19 19 } 20 20 21 void random_bitio_buffer::attachFile (FILE *f, unsignedlong length) {21 void random_bitio_buffer::attachFile (FILE *f, mg_u_long length) { 22 22 // delete the old buffer 23 23 if (buffer != NULL) { … … 47 47 if (file != NULL) { 48 48 fseek(file, 0, 0); 49 fread(buffer, 1, len, file); 49 size_t numbytes = fread(buffer, 1, len, file); 50 51 if (len != numbytes){ 52 #ifdef DEBUG 53 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L52] number of bytes read by fread does not match the requested amount\n"); 54 #endif 55 } 50 56 } 51 57 } … … 88 94 base += len; 89 95 fseek(file, base, 0); 90 fread(buffer, 1, len, file); 96 size_t numbytes = fread(buffer, 1, len, file); 97 if (numbytes != len) 98 { 99 #ifdef DEBUG 100 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L97] number of bytes read by fread does not match the requested amount\n"); 101 #endif 102 } 91 103 pos = 0; 92 104 used = 0; … … 136 148 } 137 149 138 unsignedlong random_bitio_buffer::tell()150 mg_u_long random_bitio_buffer::tell() 139 151 { 140 152 return ((base << 3) + pos); 141 153 } 142 154 143 void random_bitio_buffer::seek( unsignedlong toPos)155 void random_bitio_buffer::seek(mg_u_long toPos) 144 156 { 145 157 if (((toPos >> 3) >= base) && (((toPos+7) >> 3) < (base + len))) … … 153 165 base = (toPos >> (shift + 3)) << shift; 154 166 fseek(file, base, 0); 155 fread(buffer, 1, len, file); 167 size_t numbytes = fread(buffer, 1, len, file); 168 if (numbytes != len) 169 { 170 #ifdef DEBUG 171 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L166] number of bytes read by fread does not match the requested amount\n"); 172 #endif 173 } 156 174 pos = toPos & 0x07; 157 175 pos = toPos & ((8 << shift) - 1); … … 171 189 } 172 190 173 long random_bitio_buffer::addff(long b)191 mg_s_long random_bitio_buffer::addff(mg_s_long b) 174 192 { 175 193 return b + b + bit(); 176 194 } 177 195 178 long random_bitio_buffer::add00(long b)196 mg_s_long random_bitio_buffer::add00(mg_s_long b) 179 197 { 180 198 return addff(b); … … 198 216 (((toPos + 7) >> 3) < (mg_ullong) (base + len))) 199 217 { 200 pos = ( long) (toPos - (mg_ullong) (base << 3));218 pos = (mg_s_long) (toPos - (mg_ullong) (base << 3)); 201 219 } 202 220 else 203 221 { 204 222 flush(); 205 base = (long) ((toPos >> (shift + 3)) << shift); 206 207 fseek(file, base, 0); 208 fread(buffer, 1, len, file); 209 pos = (long) (toPos & ((8 << shift) - 1)); 223 base = (mg_s_long) ((toPos >> (shift + 3)) << shift); 224 225 fseek(file, base, 0); 226 size_t numbytes = fread(buffer, 1, len, file); 227 if (numbytes != len) 228 { 229 #ifdef DEBUG 230 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L223] number of bytes read by fread does not match the requested amount\n"); 231 #endif 232 } 233 pos = (mg_s_long) (toPos & ((8 << shift) - 1)); 210 234 } 211 235 } -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.h
r16583 r23508 42 42 FILE *file; 43 43 unsigned char *buffer; 44 unsignedlong base;45 unsignedlong used;46 unsignedlong pos;47 unsignedlong len;48 unsignedlong shift;44 mg_u_long base; 45 mg_u_long used; 46 mg_u_long pos; 47 mg_u_long len; 48 mg_u_long shift; 49 49 void writeRead(); 50 50 51 51 random_bitio_buffer(FILE *f = 0, 52 unsignedlong length = 8*1024);52 mg_u_long length = 8*1024); 53 53 virtual ~random_bitio_buffer(); 54 54 55 void attachFile (FILE *f, unsignedlong length);55 void attachFile (FILE *f, mg_u_long length); 56 56 57 57 random_bitio_buffer &operator= (const random_bitio_buffer &_rbb); … … 60 60 void encodeBit(int b); 61 61 void flush(); 62 unsignedlong tell();62 mg_u_long tell(); 63 63 64 void seek( unsignedlong topos);64 void seek(mg_u_long topos); 65 65 void error(); 66 long add00(long b);67 long addff(long b);66 mg_s_long add00(mg_s_long b); 67 mg_s_long addff(mg_s_long b); 68 68 int bit(); 69 69 int bitOffset(); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.cpp
r16583 r23508 24 24 } 25 25 26 void stdio_bitio_buffer::seek ( unsignedlong byte, unsigned char bit) {26 void stdio_bitio_buffer::seek (mg_u_long byte, unsigned char bit) { 27 27 if (fseek (file, byte, SEEK_SET) != 0) return; 28 28 buffer = getc(file); … … 31 31 } 32 32 33 void stdio_bitio_buffer::seek( unsignedlong topos) {33 void stdio_bitio_buffer::seek(mg_u_long topos) { 34 34 if (fseek(file, topos >> 3, SEEK_SET) != 0) return; 35 35 buffer = getc(file); … … 38 38 } 39 39 40 long stdio_bitio_buffer::addff(long b)40 mg_s_long stdio_bitio_buffer::addff(mg_s_long b) 41 41 { 42 42 if (!btg) … … 59 59 } 60 60 61 long stdio_bitio_buffer::add00(long b)61 mg_s_long stdio_bitio_buffer::add00(mg_s_long b) 62 62 { 63 63 if (!btg) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.h
r16583 r23508 33 33 34 34 #include "bitio_m_abstract.h" 35 35 #include "mglong.h" 36 36 37 37 class stdio_bitio_buffer : public bitio_buffer { … … 40 40 unsigned char buffer; 41 41 unsigned char btg; 42 unsignedlong bytesWritten;42 mg_u_long bytesWritten; 43 43 44 44 public: … … 48 48 49 49 unsigned char GetBtg () { return btg; } 50 unsignedlong GetBytesWritten () { return bytesWritten; }50 mg_u_long GetBytesWritten () { return bytesWritten; } 51 51 52 void seek (u nsigned longbyte, unsigned char bit);53 void seek ( unsignedlong topos);52 void seek (u_int byte, unsigned char bit); 53 void seek (mg_u_long topos); 54 54 void error(); 55 long add00(long b);56 long addff(long b);55 mg_s_long add00(mg_s_long b); 56 mg_s_long addff(mg_s_long b); 57 57 int bit(); 58 58 int bitOffset() { return btg; } -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/gmalloc.c
r16583 r23508 401 401 { 402 402 __ptr_t result; 403 unsigned long intadj;403 mg_u_long adj; 404 404 405 405 result = (*__morecore) (size); 406 adj = ( unsigned long int) ((unsigned long int) ((char *) result -406 adj = (mg_u_long) ((mg_u_long) ((char *) result - 407 407 (char *) NULL)) % BLOCKSIZE; 408 408 if (adj != 0) … … 549 549 block = BLOCK (result); 550 550 if (--_heapinfo[block].busy.info.frag.nfree != 0) 551 _heapinfo[block].busy.info.frag.first = ( unsigned long int)552 (( unsigned long int) ((char *) next->next - (char *) NULL)551 _heapinfo[block].busy.info.frag.first = (mg_u_long) 552 ((mg_u_long) ((char *) next->next - (char *) NULL) 553 553 % BLOCKSIZE) >> log; 554 554 … … 872 872 prev = (struct list *) ptr; 873 873 _heapinfo[block].busy.info.frag.nfree = 1; 874 _heapinfo[block].busy.info.frag.first = ( unsigned long int)875 (( unsigned long int) ((char *) ptr - (char *) NULL)874 _heapinfo[block].busy.info.frag.first = (mg_u_long) 875 ((mg_u_long) ((char *) ptr - (char *) NULL) 876 876 % BLOCKSIZE >> type); 877 877 prev->next = _fraghead[type].next; … … 1284 1284 { 1285 1285 __ptr_t result; 1286 unsigned long intadj;1286 mg_u_long adj; 1287 1287 1288 1288 size = ((size + alignment - 1) / alignment) * alignment; … … 1291 1291 if (result == NULL) 1292 1292 return NULL; 1293 adj = ( unsigned long int) ((unsigned long int) ((char *) result -1293 adj = (mg_u_long) ((mg_u_long) ((char *) result - 1294 1294 (char *) NULL)) % alignment; 1295 1295 if (adj != 0) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/huffman.cpp
r16583 r23508 30 30 */ 31 31 huff_data * 32 Generate_Huffman_Data (int num, long *freqs, huff_data * data,33 u_long * mem)32 Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 33 mg_u_long * mem) 34 34 { 35 35 int HNum, i, count; 36 unsignedlong *heap;36 mg_u_long *heap; 37 37 huff_data *hd = data; 38 38 if (!hd) … … 41 41 goto error0; 42 42 } 43 if (!(heap = new unsignedlong[num * 2]))43 if (!(heap = new mg_u_long[num * 2])) 44 44 goto error1; 45 45 if (!(hd->clens = new char[num])) … … 73 73 if (heap[heap[curr - 1]] > heap[heap[child - 1]]) 74 74 { 75 register u_long temp;75 register mg_u_long temp; 76 76 temp = heap[child - 1]; 77 77 heap[child - 1] = heap[curr - 1]; … … 141 141 142 142 /* Calculate the code lens */ 143 heap[0] = -1 UL;143 heap[0] = -1; 144 144 heap[1] = 0; 145 145 for (i = 2; i < num * 2; ++i) … … 154 154 for (i = 0; i < num; ++i) 155 155 { 156 register u_long codelen = heap[i + num];156 register mg_u_long codelen = heap[i + num]; 157 157 hd->clens[i] = (char) codelen; 158 158 if (!codelen) … … 190 190 } 191 191 192 unsignedlong *193 Generate_Huffman_Codes (huff_data * data, u_long * mem)192 mg_u_long * 193 Generate_Huffman_Codes (huff_data * data, mg_u_long * mem) 194 194 { 195 195 int i; 196 unsignedlong *codes;197 unsignedlong mc[MAX_HUFFCODE_LEN + 1];196 mg_u_long *codes; 197 mg_u_long mc[MAX_HUFFCODE_LEN + 1]; 198 198 199 199 if (!data) 200 200 return (NULL); 201 if (!(codes = new unsignedlong[data->num_codes]))201 if (!(codes = new mg_u_long[data->num_codes])) 202 202 return (NULL); 203 203 if (mem) … … 212 212 213 213 214 unsignedlong **215 Generate_Huffman_Vals (huff_data * data, u_long * mem)214 mg_u_long ** 215 Generate_Huffman_Vals (huff_data * data, mg_u_long * mem) 216 216 { 217 217 int i; 218 unsignedlong *fcode[MAX_HUFFCODE_LEN + 1];219 unsignedlong **values;220 unsignedlong *vals;218 mg_u_long *fcode[MAX_HUFFCODE_LEN + 1]; 219 mg_u_long **values; 220 mg_u_long *vals; 221 221 222 222 if (!data) 223 223 return (NULL); 224 if (!(vals = new unsignedlong[data->num_codes]))224 if (!(vals = new mg_u_long[data->num_codes])) 225 225 return (NULL); 226 if (!(values = new unsignedlong *[MAX_HUFFCODE_LEN + 1]))226 if (!(values = new mg_u_long *[MAX_HUFFCODE_LEN + 1])) 227 227 { 228 228 delete []vals; … … 230 230 } 231 231 232 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *));232 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)); 233 233 234 234 if (mem) 235 235 *mem += data->num_codes * sizeof (*vals) + 236 (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);236 (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 237 237 238 238 fcode[0] = values[0] = &vals[0]; … … 249 249 250 250 double 251 Calculate_Huffman_Size (int num, long *freqs,long *counts)251 Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts) 252 252 { 253 253 double size = 0; … … 318 318 319 319 320 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem,u_long * disk) {320 int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) { 321 321 if (fread (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1) 322 322 return -1; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/huffman.h
r16583 r23508 35 35 int maxcodelen; 36 36 int lencount[MAX_HUFFCODE_LEN + 1]; 37 unsignedlong min_code[MAX_HUFFCODE_LEN + 1];37 mg_u_long min_code[MAX_HUFFCODE_LEN + 1]; 38 38 char *clens; 39 39 }; 40 40 41 41 42 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data,43 u_long * mem);42 huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 43 mg_u_long * mem); 44 44 45 unsigned long *Generate_Huffman_Codes (huff_data * data,u_long * mem);45 mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem); 46 46 47 unsigned long **Generate_Huffman_Vals (huff_data * data,u_long * mem);47 mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem); 48 48 49 49 int Write_Huffman_Data (FILE * f, huff_data * hd); 50 50 51 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem,u_long * disk);51 int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk); 52 52 53 53 /* Calculate the number of bits required to code the data with the 54 54 specified frequencies. Normally freqs and counts should point to 55 55 the same array. */ 56 double Calculate_Huffman_Size (int num, long *freqs,long *counts);56 double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts); 57 57 58 58 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/local_strings.cpp
r16583 r23508 52 52 char *str_ptr = str; 53 53 char ch = '\0'; 54 long scale = 1;54 mg_s_long scale = 1; 55 55 56 56 /* find any scale letter immediately after digits */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/local_strings.h
r16583 r23508 54 54 copy = fgetc(dict); 55 55 suff = fgetc(dict); 56 fread(data + copy + 1, sizeof(u_char), suff, dict); 56 size_t numbytes = fread(data + copy + 1, sizeof(u_char), suff, dict); 57 if(numbytes != suff) 58 { 59 #ifdef DEBUG 60 fprintf(stderr, "[mgpp/lib/local_strings.h L59] number of bytes read by fread does not match the requested amount\n"); 61 #endif 62 } 57 63 *data = copy + suff; 58 64 } -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/longlong.h
r16583 r23508 74 74 #else 75 75 76 #include <stdint.h> 76 77 /* Not using GCC, so fall back on plain "long" (32-bit) types */ 77 typedef u nsigned long int mg_ullong;78 typedef long int mg_llong;78 typedef uint32_t mg_ullong; 79 typedef int32_t mg_llong; 79 80 80 81 #define ULL_FS "lu" -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/lovinstem.cpp
r16583 r23508 497 497 static Recode_Rules Rules[] = 498 498 { 499 "uad", "uas", 2, NULL, 0,500 "vad", "vas", 2, NULL, 0,501 "cid", "cis", 2, NULL, 0,502 "lid", "lis", 2, NULL, 0,503 "erid", "eris", 3, NULL, 0,504 "pand", "pans", 3, NULL, 0,505 "end", "ens", 2, s, 0,506 "end", "ens", 2, m, 0,507 "ond", "ons", 2, NULL, 0,508 "lud", "lus", 2, NULL, 0,509 "rud", "rus", 2, NULL, 1,510 511 "ul", "l", 1, aio, 1,512 513 "istr", "ister", 3, NULL, 0,514 "metr", "meter", 3, NULL, 0,515 "her", "hes", 2, pt, 1,516 517 "urs", "ur", 2, NULL, 1,518 519 "uct", "uc", 2, NULL, 0,520 "umpt", "um", 3, NULL, 0,521 "rpt", "rb", 2, NULL, 0,522 "mit", "mis", 2, NULL, 0,523 "ert", "ers", 2, NULL, 0,524 "et", "es", 1, n, 0,525 "yt", "ys", 1, NULL, 1,526 527 "iev", "ief", 2, NULL, 0,528 "olv", "olut", 2, NULL, 1,529 530 "bex", "bic", 2, NULL, 0,531 "dex", "dic", 2, NULL, 0,532 "pex", "pic", 2, NULL, 0,533 "tex", "tic", 2, NULL, 0,534 "ax", "ac", 1, NULL, 0,535 "ex", "ec", 1, NULL, 0,536 "ix", "ic", 1, NULL, 0,537 "lux", "luc", 2, NULL, 1,538 539 "yz", "ys", 1, NULL, 1499 {(char*)"uad", (char*)"uas", 2, NULL, 0}, 500 {(char*)"vad", (char*)"vas", 2, NULL, 0}, 501 {(char*)"cid", (char*)"cis", 2, NULL, 0}, 502 {(char*)"lid", (char*)"lis", 2, NULL, 0}, 503 {(char*)"erid", (char*)"eris", 3, NULL, 0}, 504 {(char*)"pand", (char*)"pans", 3, NULL, 0}, 505 {(char*)"end", (char*)"ens", 2, s, 0}, 506 {(char*)"end", (char*)"ens", 2, m, 0}, 507 {(char*)"ond", (char*)"ons", 2, NULL, 0}, 508 {(char*)"lud", (char*)"lus", 2, NULL, 0}, 509 {(char*)"rud", (char*)"rus", 2, NULL, 1}, 510 511 {(char*)"ul", (char*)"l", 1, aio, 1}, 512 513 {(char*)"istr", (char*)"ister", 3, NULL, 0}, 514 {(char*)"metr", (char*)"meter", 3, NULL, 0}, 515 {(char*)"her", (char*)"hes", 2, pt, 1}, 516 517 {(char*)"urs", (char*)"ur", 2, NULL, 1}, 518 519 {(char*)"uct", (char*)"uc", 2, NULL, 0}, 520 {(char*)"umpt", (char*)"um", 3, NULL, 0}, 521 {(char*)"rpt", (char*)"rb", 2, NULL, 0}, 522 {(char*)"mit", (char*)"mis", 2, NULL, 0}, 523 {(char*)"ert", (char*)"ers", 2, NULL, 0}, 524 {(char*)"et", (char*)"es", 1, n, 0}, 525 {(char*)"yt", (char*)"ys", 1, NULL, 1}, 526 527 {(char*)"iev", (char*)"ief", 2, NULL, 0}, 528 {(char*)"olv", (char*)"olut", 2, NULL, 1}, 529 530 {(char*)"bex", (char*)"bic", 2, NULL, 0}, 531 {(char*)"dex", (char*)"dic", 2, NULL, 0}, 532 {(char*)"pex", (char*)"pic", 2, NULL, 0}, 533 {(char*)"tex", (char*)"tic", 2, NULL, 0}, 534 {(char*)"ax", (char*)"ac", 1, NULL, 0}, 535 {(char*)"ex", (char*)"ec", 1, NULL, 0}, 536 {(char*)"ix", (char*)"ic", 1, NULL, 0}, 537 {(char*)"lux", (char*)"luc", 2, NULL, 1}, 538 539 {(char*)"yz", (char*)"ys", 1, NULL, 1} 540 540 }; 541 541 … … 560 560 static Last_Char_Node pr[] = 561 561 { 562 'd', NULL, NULL, Rules,563 'l', pr, pr + 2, Rules + 11,564 'r', NULL, NULL, Rules + 12,565 's', pr + 1, pr + 6, Rules + 15,566 't', NULL, pr + 5, Rules + 16,567 'v', NULL, NULL, Rules + 23,568 'x', pr + 4, pr + 7, Rules + 25,569 'z', NULL, NULL, Rules + 33,562 {'d', NULL, NULL, Rules}, 563 {'l', pr, pr + 2, Rules + 11}, 564 {'r', NULL, NULL, Rules + 12}, 565 {'s', pr + 1, pr + 6, Rules + 15}, 566 {'t', NULL, pr + 5, Rules + 16}, 567 {'v', NULL, NULL, Rules + 23}, 568 {'x', pr + 4, pr + 7, Rules + 25}, 569 {'z', NULL, NULL, Rules + 33}, 570 570 }; 571 571 … … 655 655 static Ending_List List[] = 656 656 { 657 "a", NULL, 0, 0,658 659 "ae", NULL, 0, 0,660 "al", BB, -1, 2,661 "ar", X, 0, 0,662 "as", B, -1, 0,663 664 "acy", NULL, 0, 1,665 "age", B, 0, 0,666 "aic", NULL, -2, 1,667 "als", BB, 0, 0,668 "ant", B, -2, 2,669 "ars", O, 0, 0,670 "ary", F, -1, 2,671 "ata", NULL, 0, 0,672 "ate", NULL, -1, 0,673 674 "able", NULL, 0, 1,675 "ably", NULL, 0, 0,676 "ages", B, -2, 2,677 "ally", B, 0, 0,678 "ance", B, -1, 1,679 "ancy", B, 0, 0,680 "ants", B, -4, 4,681 "aric", NULL, 0, 0,682 "arly", K, -1, 1,683 "ated", I, 0, 0,684 "ates", NULL, -2, 2,685 "atic", B, 0, 0,686 "ator", NULL, -1, 0,687 688 "acies", NULL, 0, 0,689 "acity", NULL, -1, 1,690 "aging", B, 0, 0,691 "aical", NULL, -2, 2,692 "alist", NULL, 0, 0,693 "alism", B, -1, 0,694 "ality", NULL, -3, 3,695 "alize", NULL, 0, 1,696 "allic", BB, 0, 0,697 "anced", B, -2, 2,698 "ances", B, 0, 0,699 "antic", C, -1, 0,700 "arial", NULL, -6, 6,701 "aries", NULL, 0, 1,702 "arily", NULL, 0, 0,703 "arity", B, -2, 2,704 "arize", NULL, 0, 0,705 "aroid", NULL, -1, 0,706 "ately", NULL, -3, 3,707 "ating", I, 0, 1,708 "ation", B, 0, 0,709 "ative", NULL, -2, 2,710 "ators", NULL, 0, 0,711 "atory", NULL, -1, 1,712 "ature", E, 0, 0,713 714 "aceous", NULL, 0, 1,715 "acious", B, 0, 0,716 "action", G, -2, 2,717 "alness", NULL, 0, 0,718 "ancial", NULL, -1, 1,719 "ancies", NULL, 0, 0,720 "ancing", B, -4, 4,721 "ariser", NULL, 0, 0,722 "arized", NULL, -1, 1,723 "arizer", NULL, 0, 0,724 "atable", NULL, -2, 2,725 "ations", B, 0, 0,726 "atives", NULL, -1, 0,727 728 "ability", NULL, 0, 1,729 "aically", NULL, 0, 0,730 "alistic", B, -2, 2,731 "alities", NULL, 0, 0,732 "ariness", E, -1, 0,733 "aristic", NULL, -3, 3,734 "arizing", NULL, 0, 1,735 "ateness", NULL, 0, 0,736 "atingly", NULL, -2, 2,737 "ational", B, 0, 0,738 "atively", NULL, -1, 1,739 "ativism", NULL, 0, 0,740 741 "ableness", NULL, 0, 1,742 "arizable", NULL, 0, 0,743 744 "allically", C, 0, 0,745 "antaneous", NULL, -1, 1,746 "antiality", NULL, 0, 0,747 "arisation", NULL, -2, 2,748 "arization", NULL, 0, 0,749 "ationally", B, -1, 1,750 "ativeness", NULL, 0, 0,751 752 "antialness", NULL, 0, 0,753 "arisations", NULL, -1, 1,754 "arizations", NULL, 0, 0,755 756 "alistically", B, 0, 1,757 "arizability", NULL, 0, 0,758 759 "e", NULL, 0, 0,760 761 "ed", E, 0, 0,762 "en", F, -1, 1,763 "es", E, 0, 0,764 765 "eal", Y, 0, 0,766 "ear", Y, -1, 1,767 "ely", E, 0, 0,768 "ene", E, -2, 2,769 "ent", C, 0, 0,770 "ery", E, -1, 1,771 "ese", NULL, 0, 0,772 773 "ealy", Y, 0, 1,774 "edly", E, 0, 0,775 "eful", NULL, -2, 1,776 "eity", NULL, 0, 0,777 "ence", NULL, -2, 2,778 "ency", NULL, 0, 0,779 "ened", E, -1, 2,780 "enly", E, 0, 0,781 "eous", NULL, -1, 0,782 783 "early", Y, 0, 1,784 "ehood", NULL, 0, 0,785 "eless", NULL, -2, 2,786 "elity", NULL, 0, 0,787 "ement", NULL, -1, 0,788 "enced", NULL, -3, 3,789 "ences", NULL, 0, 1,790 "eness", E, 0, 0,791 "ening", E, -2, 2,792 "ental", NULL, 0, 0,793 "ented", C, -1, 1,794 "ently", NULL, 0, 0,795 796 "eature", Z, 0, 0,797 "efully", NULL, -1, 1,798 "encies", NULL, 0, 0,799 "encing", NULL, -2, 2,800 "ential", NULL, 0, 0,801 "enting", C, -1, 1,802 "entist", NULL, 0, 1,803 "eously", NULL, 0, 0,804 805 "elihood", E, 0, 1,806 "encible", NULL, 0, 0,807 "entally", NULL, -2, 2,808 "entials", NULL, 0, 0,809 "entiate", NULL, -1, 1,810 "entness", NULL, 0, 0,811 812 "entation", NULL, 0, 0,813 "entially", NULL, -1, 1,814 "eousness", NULL, 0, 0,815 816 "eableness", E, 0, 1,817 "entations", NULL, 0, 0,818 "entiality", NULL, -2, 2,819 "entialize", NULL, 0, 0,820 "entiation", NULL, -1, 0,821 822 "entialness", NULL, 0, 0,823 824 "ful", NULL, 0, 0,825 826 "fully", NULL, 0, 0,827 828 "fulness", NULL, 0, 0,829 830 "hood", NULL, 0, 0,831 832 "i", NULL, 0, 0,833 834 "ia", NULL, 0, 0,835 "ic", NULL, -1, 1,836 "is", NULL, 0, 0,837 838 "ial", NULL, 0, 0,839 "ian", NULL, -1, 1,840 "ics", NULL, 0, 1,841 "ide", L, 0, 0,842 "ied", NULL, -3, 3,843 "ier", NULL, 0, 0,844 "ies", P, -1, 0,845 "ily", NULL, -1, 1,846 "ine", M, 0, 0,847 "ing", N, -5, 5,848 "ion", Q, 0, 0,849 "ish", C, -1, 1,850 "ism", B, 0, 1,851 "ist", NULL, 0, 0,852 "ite", AA, -3, 3,853 "ity", NULL, 0, 0,854 "ium", NULL, -1, 0,855 "ive", NULL, -1, 1,856 "ize", F, 0, 0,857 858 "ials", NULL, 0, 0,859 "ians", NULL, -1, 0,860 "ible", NULL, -1, 1,861 "ibly", NULL, 0, 0,862 "ical", NULL, -2, 2,863 "ides", L, 0, 0,864 "iers", NULL, -1, 1,865 "iful", NULL, 0, 0,866 "ines", M, -4, 4,867 "ings", N, 0, 0,868 "ions", B, -1, 1,869 "ious", NULL, 0, 0,870 "isms", B, -2, 2,871 "ists", NULL, 0, 0,872 "itic", H, -1, 1,873 "ized", F, 0, 1,874 "izer", F, 0, 0,875 876 "ially", NULL, 0, 0,877 "icant", NULL, -1, 1,878 "ician", NULL, 0, 0,879 "icide", NULL, -2, 2,880 "icism", NULL, 0, 0,881 "icist", NULL, -1, 0,882 "icity", NULL, -3, 3,883 "idine", I, 0, 1,884 "iedly", NULL, 0, 0,885 "ihood", NULL, -2, 2,886 "inate", NULL, 0, 0,887 "iness", NULL, -1, 0,888 "ingly", B, -6, 6,889 "inism", J, 0, 1,890 "inity", CC, 0, 0,891 "ional", NULL, -2, 2,892 "ioned", NULL, 0, 0,893 "ished", NULL, -1, 0,894 "istic", NULL, -3, 3,895 "ities", NULL, 0, 1,896 "itous", NULL, 0, 0,897 "ively", NULL, -2, 2,898 "ivity", NULL, 0, 0,899 "izers", F, -1, 1,900 "izing", F, 0, 0,901 902 "ialist", NULL, 0, 0,903 "iality", NULL, -1, 1,904 "ialize", NULL, 0, 0,905 "ically", NULL, -2, 2,906 "icance", NULL, 0, 0,907 "icians", NULL, -1, 1,908 "icists", NULL, 0, 0,909 "ifully", NULL, -4, 4,910 "ionals", NULL, 0, 0,911 "ionate", D, -1, 1,912 "ioning", NULL, 0, 0,913 "ionist", NULL, -2, 2,914 "iously", NULL, 0, 0,915 "istics", NULL, -1, 1,916 "izable", E, 0, 0,917 918 "ibility", NULL, 0, 0,919 "icalism", NULL, -1, 1,920 "icalist", NULL, 0, 1,921 "icality", NULL, 0, 0,922 "icalize", NULL, -3, 3,923 "ication", G, 0, 0,924 "icianry", NULL, -1, 0,925 "ination", NULL, -1, 1,926 "ingness", NULL, 0, 0,927 "ionally", NULL, -5, 5,928 "isation", NULL, 0, 0,929 "ishness", NULL, -1, 1,930 "istical", NULL, 0, 1,931 "iteness", NULL, 0, 0,932 "iveness", NULL, -3, 3,933 "ivistic", NULL, 0, 0,934 "ivities", NULL, -1, 0,935 "ization", F, -1, 1,936 "izement", NULL, 0, 0,937 938 "ibleness", NULL, 0, 0,939 "icalness", NULL, -1, 1,940 "ionalism", NULL, 0, 0,941 "ionality", NULL, -2, 2,942 "ionalize", NULL, 0, 0,943 "iousness", NULL, -1, 1,944 "izations", NULL, 0, 0,945 946 "ionalness", NULL, 0, 1,947 "istically", NULL, 0, 0,948 "itousness", NULL, -2, 2,949 "izability", NULL, 0, 0,950 "izational", NULL, -1, 0,951 952 "izationally", B, 0, 0,953 954 "ly", B, 0, 0,955 956 "less", NULL, 0, 1,957 "lily", NULL, 0, 0,958 959 "lessly", NULL, 0, 0,960 961 "lessness", NULL, 0, 0,962 963 "ness", NULL, 0, 0,964 965 "nesses", NULL, 0, 0,966 967 "o", NULL, 0, 0,968 969 "on", S, 0, 1,970 "or", T, 0, 0,971 972 "oid", NULL, 0, 0,973 "one", R, -1, 1,974 "ous", NULL, 0, 0,975 976 "ogen", NULL, 0, 0,977 978 "oidal", NULL, 0, 0,979 "oides", NULL, -1, 2,980 "otide", NULL, 0, 0,981 "ously", NULL, -1, 0,982 983 "oidism", NULL, 0, 0,984 985 "oidally", NULL, 0, 1,986 "ousness", NULL, 0, 0,987 988 "s", W, 0, 0,989 990 "s'", NULL, 0, 0,991 992 "um", U, 0, 1,993 "us", V, 0, 0,994 995 "ward", NULL, 0, 1,996 "wise", NULL, 0, 0,997 998 "y", B, 0, 0,999 1000 "yl", R, 0, 0,1001 1002 "ying", B, 0, 1,1003 "yish", NULL, 0, 0,1004 1005 "'s", NULL, 0, 0,657 {(char*)"a", NULL, 0, 0}, 658 659 {(char*)"ae", NULL, 0, 0}, 660 {(char*)"al", BB, -1, 2}, 661 {(char*)"ar", X, 0, 0}, 662 {(char*)"as", B, -1, 0}, 663 664 {(char*)"acy", NULL, 0, 1}, 665 {(char*)"age", B, 0, 0}, 666 {(char*)"aic", NULL, -2, 1}, 667 {(char*)"als", BB, 0, 0}, 668 {(char*)"ant", B, -2, 2}, 669 {(char*)"ars", O, 0, 0}, 670 {(char*)"ary", F, -1, 2}, 671 {(char*)"ata", NULL, 0, 0}, 672 {(char*)"ate", NULL, -1, 0}, 673 674 {(char*)"able", NULL, 0, 1}, 675 {(char*)"ably", NULL, 0, 0}, 676 {(char*)"ages", B, -2, 2}, 677 {(char*)"ally", B, 0, 0}, 678 {(char*)"ance", B, -1, 1}, 679 {(char*)"ancy", B, 0, 0}, 680 {(char*)"ants", B, -4, 4}, 681 {(char*)"aric", NULL, 0, 0}, 682 {(char*)"arly", K, -1, 1}, 683 {(char*)"ated", I, 0, 0}, 684 {(char*)"ates", NULL, -2, 2}, 685 {(char*)"atic", B, 0, 0}, 686 {(char*)"ator", NULL, -1, 0}, 687 688 {(char*)"acies", NULL, 0, 0}, 689 {(char*)"acity", NULL, -1, 1}, 690 {(char*)"aging", B, 0, 0}, 691 {(char*)"aical", NULL, -2, 2}, 692 {(char*)"alist", NULL, 0, 0}, 693 {(char*)"alism", B, -1, 0}, 694 {(char*)"ality", NULL, -3, 3}, 695 {(char*)"alize", NULL, 0, 1}, 696 {(char*)"allic", BB, 0, 0}, 697 {(char*)"anced", B, -2, 2}, 698 {(char*)"ances", B, 0, 0}, 699 {(char*)"antic", C, -1, 0}, 700 {(char*)"arial", NULL, -6, 6}, 701 {(char*)"aries", NULL, 0, 1}, 702 {(char*)"arily", NULL, 0, 0}, 703 {(char*)"arity", B, -2, 2}, 704 {(char*)"arize", NULL, 0, 0}, 705 {(char*)"aroid", NULL, -1, 0}, 706 {(char*)"ately", NULL, -3, 3}, 707 {(char*)"ating", I, 0, 1}, 708 {(char*)"ation", B, 0, 0}, 709 {(char*)"ative", NULL, -2, 2}, 710 {(char*)"ators", NULL, 0, 0}, 711 {(char*)"atory", NULL, -1, 1}, 712 {(char*)"ature", E, 0, 0}, 713 714 {(char*)"aceous", NULL, 0, 1}, 715 {(char*)"acious", B, 0, 0}, 716 {(char*)"action", G, -2, 2}, 717 {(char*)"alness", NULL, 0, 0}, 718 {(char*)"ancial", NULL, -1, 1}, 719 {(char*)"ancies", NULL, 0, 0}, 720 {(char*)"ancing", B, -4, 4}, 721 {(char*)"ariser", NULL, 0, 0}, 722 {(char*)"arized", NULL, -1, 1}, 723 {(char*)"arizer", NULL, 0, 0}, 724 {(char*)"atable", NULL, -2, 2}, 725 {(char*)"ations", B, 0, 0}, 726 {(char*)"atives", NULL, -1, 0}, 727 728 {(char*)"ability", NULL, 0, 1}, 729 {(char*)"aically", NULL, 0, 0}, 730 {(char*)"alistic", B, -2, 2}, 731 {(char*)"alities", NULL, 0, 0}, 732 {(char*)"ariness", E, -1, 0}, 733 {(char*)"aristic", NULL, -3, 3}, 734 {(char*)"arizing", NULL, 0, 1}, 735 {(char*)"ateness", NULL, 0, 0}, 736 {(char*)"atingly", NULL, -2, 2}, 737 {(char*)"ational", B, 0, 0}, 738 {(char*)"atively", NULL, -1, 1}, 739 {(char*)"ativism", NULL, 0, 0}, 740 741 {(char*)"ableness", NULL, 0, 1}, 742 {(char*)"arizable", NULL, 0, 0}, 743 744 {(char*)"allically", C, 0, 0}, 745 {(char*)"antaneous", NULL, -1, 1}, 746 {(char*)"antiality", NULL, 0, 0}, 747 {(char*)"arisation", NULL, -2, 2}, 748 {(char*)"arization", NULL, 0, 0}, 749 {(char*)"ationally", B, -1, 1}, 750 {(char*)"ativeness", NULL, 0, 0}, 751 752 {(char*)"antialness", NULL, 0, 0}, 753 {(char*)"arisations", NULL, -1, 1}, 754 {(char*)"arizations", NULL, 0, 0}, 755 756 {(char*)"alistically", B, 0, 1}, 757 {(char*)"arizability", NULL, 0, 0}, 758 759 {(char*)"e", NULL, 0, 0}, 760 761 {(char*)"ed", E, 0, 0}, 762 {(char*)"en", F, -1, 1}, 763 {(char*)"es", E, 0, 0}, 764 765 {(char*)"eal", Y, 0, 0}, 766 {(char*)"ear", Y, -1, 1}, 767 {(char*)"ely", E, 0, 0}, 768 {(char*)"ene", E, -2, 2}, 769 {(char*)"ent", C, 0, 0}, 770 {(char*)"ery", E, -1, 1}, 771 {(char*)"ese", NULL, 0, 0}, 772 773 {(char*)"ealy", Y, 0, 1}, 774 {(char*)"edly", E, 0, 0}, 775 {(char*)"eful", NULL, -2, 1}, 776 {(char*)"eity", NULL, 0, 0}, 777 {(char*)"ence", NULL, -2, 2}, 778 {(char*)"ency", NULL, 0, 0}, 779 {(char*)"ened", E, -1, 2}, 780 {(char*)"enly", E, 0, 0}, 781 {(char*)"eous", NULL, -1, 0}, 782 783 {(char*)"early", Y, 0, 1}, 784 {(char*)"ehood", NULL, 0, 0}, 785 {(char*)"eless", NULL, -2, 2}, 786 {(char*)"elity", NULL, 0, 0}, 787 {(char*)"ement", NULL, -1, 0}, 788 {(char*)"enced", NULL, -3, 3}, 789 {(char*)"ences", NULL, 0, 1}, 790 {(char*)"eness", E, 0, 0}, 791 {(char*)"ening", E, -2, 2}, 792 {(char*)"ental", NULL, 0, 0}, 793 {(char*)"ented", C, -1, 1}, 794 {(char*)"ently", NULL, 0, 0}, 795 796 {(char*)"eature", Z, 0, 0}, 797 {(char*)"efully", NULL, -1, 1}, 798 {(char*)"encies", NULL, 0, 0}, 799 {(char*)"encing", NULL, -2, 2}, 800 {(char*)"ential", NULL, 0, 0}, 801 {(char*)"enting", C, -1, 1}, 802 {(char*)"entist", NULL, 0, 1}, 803 {(char*)"eously", NULL, 0, 0}, 804 805 {(char*)"elihood", E, 0, 1}, 806 {(char*)"encible", NULL, 0, 0}, 807 {(char*)"entally", NULL, -2, 2}, 808 {(char*)"entials", NULL, 0, 0}, 809 {(char*)"entiate", NULL, -1, 1}, 810 {(char*)"entness", NULL, 0, 0}, 811 812 {(char*)"entation", NULL, 0, 0}, 813 {(char*)"entially", NULL, -1, 1}, 814 {(char*)"eousness", NULL, 0, 0}, 815 816 {(char*)"eableness", E, 0, 1}, 817 {(char*)"entations", NULL, 0, 0}, 818 {(char*)"entiality", NULL, -2, 2}, 819 {(char*)"entialize", NULL, 0, 0}, 820 {(char*)"entiation", NULL, -1, 0}, 821 822 {(char*)"entialness", NULL, 0, 0}, 823 824 {(char*)"ful", NULL, 0, 0}, 825 826 {(char*)"fully", NULL, 0, 0}, 827 828 {(char*)"fulness", NULL, 0, 0}, 829 830 {(char*)"hood", NULL, 0, 0}, 831 832 {(char*)"i", NULL, 0, 0}, 833 834 {(char*)"ia", NULL, 0, 0}, 835 {(char*)"ic", NULL, -1, 1}, 836 {(char*)"is", NULL, 0, 0}, 837 838 {(char*)"ial", NULL, 0, 0}, 839 {(char*)"ian", NULL, -1, 1}, 840 {(char*)"ics", NULL, 0, 1}, 841 {(char*)"ide", L, 0, 0}, 842 {(char*)"ied", NULL, -3, 3}, 843 {(char*)"ier", NULL, 0, 0}, 844 {(char*)"ies", P, -1, 0}, 845 {(char*)"ily", NULL, -1, 1}, 846 {(char*)"ine", M, 0, 0}, 847 {(char*)"ing", N, -5, 5}, 848 {(char*)"ion", Q, 0, 0}, 849 {(char*)"ish", C, -1, 1}, 850 {(char*)"ism", B, 0, 1}, 851 {(char*)"ist", NULL, 0, 0}, 852 {(char*)"ite", AA, -3, 3}, 853 {(char*)"ity", NULL, 0, 0}, 854 {(char*)"ium", NULL, -1, 0}, 855 {(char*)"ive", NULL, -1, 1}, 856 {(char*)"ize", F, 0, 0}, 857 858 {(char*)"ials", NULL, 0, 0}, 859 {(char*)"ians", NULL, -1, 0}, 860 {(char*)"ible", NULL, -1, 1}, 861 {(char*)"ibly", NULL, 0, 0}, 862 {(char*)"ical", NULL, -2, 2}, 863 {(char*)"ides", L, 0, 0}, 864 {(char*)"iers", NULL, -1, 1}, 865 {(char*)"iful", NULL, 0, 0}, 866 {(char*)"ines", M, -4, 4}, 867 {(char*)"ings", N, 0, 0}, 868 {(char*)"ions", B, -1, 1}, 869 {(char*)"ious", NULL, 0, 0}, 870 {(char*)"isms", B, -2, 2}, 871 {(char*)"ists", NULL, 0, 0}, 872 {(char*)"itic", H, -1, 1}, 873 {(char*)"ized", F, 0, 1}, 874 {(char*)"izer", F, 0, 0}, 875 876 {(char*)"ially", NULL, 0, 0}, 877 {(char*)"icant", NULL, -1, 1}, 878 {(char*)"ician", NULL, 0, 0}, 879 {(char*)"icide", NULL, -2, 2}, 880 {(char*)"icism", NULL, 0, 0}, 881 {(char*)"icist", NULL, -1, 0}, 882 {(char*)"icity", NULL, -3, 3}, 883 {(char*)"idine", I, 0, 1}, 884 {(char*)"iedly", NULL, 0, 0}, 885 {(char*)"ihood", NULL, -2, 2}, 886 {(char*)"inate", NULL, 0, 0}, 887 {(char*)"iness", NULL, -1, 0}, 888 {(char*)"ingly", B, -6, 6}, 889 {(char*)"inism", J, 0, 1}, 890 {(char*)"inity", CC, 0, 0}, 891 {(char*)"ional", NULL, -2, 2}, 892 {(char*)"ioned", NULL, 0, 0}, 893 {(char*)"ished", NULL, -1, 0}, 894 {(char*)"istic", NULL, -3, 3}, 895 {(char*)"ities", NULL, 0, 1}, 896 {(char*)"itous", NULL, 0, 0}, 897 {(char*)"ively", NULL, -2, 2}, 898 {(char*)"ivity", NULL, 0, 0}, 899 {(char*)"izers", F, -1, 1}, 900 {(char*)"izing", F, 0, 0}, 901 902 {(char*)"ialist", NULL, 0, 0}, 903 {(char*)"iality", NULL, -1, 1}, 904 {(char*)"ialize", NULL, 0, 0}, 905 {(char*)"ically", NULL, -2, 2}, 906 {(char*)"icance", NULL, 0, 0}, 907 {(char*)"icians", NULL, -1, 1}, 908 {(char*)"icists", NULL, 0, 0}, 909 {(char*)"ifully", NULL, -4, 4}, 910 {(char*)"ionals", NULL, 0, 0}, 911 {(char*)"ionate", D, -1, 1}, 912 {(char*)"ioning", NULL, 0, 0}, 913 {(char*)"ionist", NULL, -2, 2}, 914 {(char*)"iously", NULL, 0, 0}, 915 {(char*)"istics", NULL, -1, 1}, 916 {(char*)"izable", E, 0, 0}, 917 918 {(char*)"ibility", NULL, 0, 0}, 919 {(char*)"icalism", NULL, -1, 1}, 920 {(char*)"icalist", NULL, 0, 1}, 921 {(char*)"icality", NULL, 0, 0}, 922 {(char*)"icalize", NULL, -3, 3}, 923 {(char*)"ication", G, 0, 0}, 924 {(char*)"icianry", NULL, -1, 0}, 925 {(char*)"ination", NULL, -1, 1}, 926 {(char*)"ingness", NULL, 0, 0}, 927 {(char*)"ionally", NULL, -5, 5}, 928 {(char*)"isation", NULL, 0, 0}, 929 {(char*)"ishness", NULL, -1, 1}, 930 {(char*)"istical", NULL, 0, 1}, 931 {(char*)"iteness", NULL, 0, 0}, 932 {(char*)"iveness", NULL, -3, 3}, 933 {(char*)"ivistic", NULL, 0, 0}, 934 {(char*)"ivities", NULL, -1, 0}, 935 {(char*)"ization", F, -1, 1}, 936 {(char*)"izement", NULL, 0, 0}, 937 938 {(char*)"ibleness", NULL, 0, 0}, 939 {(char*)"icalness", NULL, -1, 1}, 940 {(char*)"ionalism", NULL, 0, 0}, 941 {(char*)"ionality", NULL, -2, 2}, 942 {(char*)"ionalize", NULL, 0, 0}, 943 {(char*)"iousness", NULL, -1, 1}, 944 {(char*)"izations", NULL, 0, 0}, 945 946 {(char*)"ionalness", NULL, 0, 1}, 947 {(char*)"istically", NULL, 0, 0}, 948 {(char*)"itousness", NULL, -2, 2}, 949 {(char*)"izability", NULL, 0, 0}, 950 {(char*)"izational", NULL, -1, 0}, 951 952 {(char*)"izationally", B, 0, 0}, 953 954 {(char*)"ly", B, 0, 0}, 955 956 {(char*)"less", NULL, 0, 1}, 957 {(char*)"lily", NULL, 0, 0}, 958 959 {(char*)"lessly", NULL, 0, 0}, 960 961 {(char*)"lessness", NULL, 0, 0}, 962 963 {(char*)"ness", NULL, 0, 0}, 964 965 {(char*)"nesses", NULL, 0, 0}, 966 967 {(char*)"o", NULL, 0, 0}, 968 969 {(char*)"on", S, 0, 1}, 970 {(char*)"or", T, 0, 0}, 971 972 {(char*)"oid", NULL, 0, 0}, 973 {(char*)"one", R, -1, 1}, 974 {(char*)"ous", NULL, 0, 0}, 975 976 {(char*)"ogen", NULL, 0, 0}, 977 978 {(char*)"oidal", NULL, 0, 0}, 979 {(char*)"oides", NULL, -1, 2}, 980 {(char*)"otide", NULL, 0, 0}, 981 {(char*)"ously", NULL, -1, 0}, 982 983 {(char*)"oidism", NULL, 0, 0}, 984 985 {(char*)"oidally", NULL, 0, 1}, 986 {(char*)"ousness", NULL, 0, 0}, 987 988 {(char*)"s", W, 0, 0}, 989 990 {(char*)"s'", NULL, 0, 0}, 991 992 {(char*)"um", U, 0, 1}, 993 {(char*)"us", V, 0, 0}, 994 995 {(char*)"ward", NULL, 0, 1}, 996 {(char*)"wise", NULL, 0, 0}, 997 998 {(char*)"y", B, 0, 0}, 999 1000 {(char*)"yl", R, 0, 0}, 1001 1002 {(char*)"ying", B, 0, 1}, 1003 {(char*)"yish", NULL, 0, 0}, 1004 1005 {(char*)"'s", NULL, 0, 0}, 1006 1006 }; 1007 1007 … … 1017 1017 static First_Char_Node First[] = 1018 1018 { 1019 '\'', NULL, NULL,1019 {'\'', NULL, NULL, 1020 1020 {NULL, 1021 1021 List + 293, NULL, NULL, NULL, NULL, 1022 NULL, NULL, NULL, NULL, NULL} ,1023 1024 'a', First, NULL,1022 NULL, NULL, NULL, NULL, NULL}}, 1023 1024 {'a', First, NULL, 1025 1025 {List, 1026 1026 List + 2, List + 9, List + 20, List + 39, List + 58, 1027 List + 70, List + 77, List + 82, List + 87, List + 89} ,1028 1029 'e', First + 1, First + 4,1027 List + 70, List + 77, List + 82, List + 87, List + 89}}, 1028 1029 {'e', First + 1, First + 4, 1030 1030 {List + 91, 1031 1031 List + 93, List + 98, List + 106, List + 116, List + 126, 1032 List + 133, List + 138, List + 142, List + 145, NULL} ,1033 1034 'f', NULL, NULL,1032 List + 133, List + 138, List + 142, List + 145, NULL}}, 1033 1034 {'f', NULL, NULL, 1035 1035 {NULL, 1036 1036 NULL, List + 146, NULL, List + 147, NULL, 1037 List + 148, NULL, NULL, NULL, NULL} ,1038 1039 'h', First + 3, First + 5,1037 List + 148, NULL, NULL, NULL, NULL}}, 1038 1039 {'h', First + 3, First + 5, 1040 1040 {NULL, 1041 1041 NULL, NULL, List + 149, NULL, NULL, 1042 NULL, NULL, NULL, NULL, NULL} ,1043 1044 'i', NULL, NULL,1042 NULL, NULL, NULL, NULL, NULL}}, 1043 1044 {'i', NULL, NULL, 1045 1045 {List + 150, 1046 1046 List + 152, List + 163, List + 181, List + 202, List + 222, 1047 List + 239, List + 252, List + 258, NULL, List + 261} ,1048 1049 'l', First + 2, First + 10,1047 List + 239, List + 252, List + 258, NULL, List + 261}}, 1048 1049 {'l', First + 2, First + 10, 1050 1050 {NULL, 1051 1051 List + 262, NULL, List + 263, NULL, List + 265, 1052 NULL, List + 266, NULL, NULL, NULL} ,1053 1054 'n', NULL, NULL,1052 NULL, List + 266, NULL, NULL, NULL}}, 1053 1054 {'n', NULL, NULL, 1055 1055 {NULL, 1056 1056 NULL, NULL, List + 267, NULL, List + 268, 1057 NULL, NULL, NULL, NULL, NULL} ,1058 1059 'o', First + 7, First + 9,1057 NULL, NULL, NULL, NULL, NULL}}, 1058 1059 {'o', First + 7, First + 9, 1060 1060 {List + 269, 1061 1061 List + 270, List + 273, List + 275, List + 277, List + 280, 1062 List + 281, NULL, NULL, NULL, NULL} ,1063 1064 's', NULL, NULL,1062 List + 281, NULL, NULL, NULL, NULL}}, 1063 1064 {'s', NULL, NULL, 1065 1065 {List + 283, 1066 1066 List + 284, NULL, NULL, NULL, NULL, 1067 NULL, NULL, NULL, NULL, NULL} ,1068 1069 'u', First + 8, First + 12,1067 NULL, NULL, NULL, NULL, NULL}}, 1068 1069 {'u', First + 8, First + 12, 1070 1070 {NULL, 1071 1071 List + 285, NULL, NULL, NULL, NULL, 1072 NULL, NULL, NULL, NULL, NULL} ,1073 1074 'w', NULL, NULL,1072 NULL, NULL, NULL, NULL, NULL}}, 1073 1074 {'w', NULL, NULL, 1075 1075 {NULL, 1076 1076 NULL, NULL, List + 287, NULL, NULL, 1077 NULL, NULL, NULL, NULL, NULL} ,1078 1079 'y', First + 11, NULL,1077 NULL, NULL, NULL, NULL, NULL}}, 1078 1079 {'y', First + 11, NULL, 1080 1080 {List + 289, 1081 1081 List + 290, NULL, List + 291, NULL, NULL, 1082 NULL, NULL, NULL, NULL, NULL} ,1082 NULL, NULL, NULL, NULL, NULL}}, 1083 1083 }; 1084 1084 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/messages.cpp
r16583 r23508 25 25 #include "messages.h" 26 26 27 char *msg_prefix = "";27 char *msg_prefix = (char*)""; 28 28 29 29 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/netorder.h
r22257 r23508 16 16 #define HTOND(d) \ 17 17 do { \ 18 unsignedlong tmph, tmpl; \18 mg_u_long tmph, tmpl; \ 19 19 memcpy ((void *) &tmph, (const void *) &d, sizeof(double) >> 1); \ 20 memcpy ((void *) &tmpl, (const void *) ((unsigned int) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \20 memcpy ((void *) &tmpl, (const void *) ((unsigned char*) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \ 21 21 tmph = htonl (tmph); \ 22 22 tmpl = htonl (tmpl); \ 23 23 memcpy ( (void *) &d, (const void *) &tmpl, sizeof (double) >> 1); \ 24 memcpy ((void *) ((unsigned int) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \24 memcpy ((void *) ((unsigned char*) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \ 25 25 }while(0) 26 26 #define NTOHD(d) \ 27 27 do { \ 28 unsignedlong tmph, tmpl; \28 mg_u_long tmph, tmpl; \ 29 29 memcpy ((void *) &tmph, (const void *) &d, sizeof(double) >> 1); \ 30 memcpy ((void *) &tmpl, (const void *) (( int) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \30 memcpy ((void *) &tmpl, (const void *) ((unsigned char*) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \ 31 31 tmph = ntohl (tmph); \ 32 32 tmpl = ntohl (tmpl); \ 33 33 memcpy((void *) &d, (const void *) &tmpl, sizeof (double) >> 1); \ 34 memcpy ((void *) (( int) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \34 memcpy ((void *) ((unsigned char*) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \ 35 35 }while(0) 36 36 #define HTOND2(hd, nd) \ 37 37 do { \ 38 unsignedlong tmph, tmpl; \38 mg_u_long tmph, tmpl; \ 39 39 memcpy ((void *) &tmph, (const void *) &hd, sizeof(double) >> 1);\ 40 40 memcpy ((void *) &tmpl, (const void *) ((unsigned int) &hd + (sizeof(double) >> 1)), sizeof (double) >> 1); \ … … 46 46 #define NTOHD2(nd, hd) \ 47 47 do { \ 48 unsignedlong tmph, tmpl; \48 mg_u_long tmph, tmpl; \ 49 49 memcpy ((void *) &nd, (void *) &tmph, sizeof(double) >> 1); \ 50 50 memcpy ((void *) &tmpl, (const void *) &nd + (sizeof(double) >> 1), sizeof (double) >> 1); \ … … 58 58 #define HTONF(f) \ 59 59 do { \ 60 unsignedlong tmp; \60 mg_u_long tmp; \ 61 61 memcpy ((void *) &tmp, (const void *) &(f), sizeof (float)); \ 62 62 HTONUL (tmp); \ … … 65 65 #define NTOHF(f) \ 66 66 do { \ 67 unsignedlong tmp; \67 mg_u_long tmp; \ 68 68 memcpy ((void *) &tmp, (const void *) &(f), sizeof (float)); \ 69 69 NTOHUL (tmp); \ … … 72 72 #define HTONF2(hf, nf) \ 73 73 do { \ 74 unsignedlong tmp; \74 mg_u_long tmp; \ 75 75 memcpy ((void *) &tmp, (const void *) &(hf), sizeof (float)); \ 76 76 HTONUL (tmp); \ … … 79 79 #define NTOHF2(nf, hf) \ 80 80 do { \ 81 unsignedlong tmp; \81 mg_u_long tmp; \ 82 82 memcpy ((void *) &tmp, (const void *) &(nf), sizeof (float)); \ 83 83 NTOHUL (tmp); \ … … 114 114 115 115 /* pointers */ 116 #define HTONP(p) ((p) = (void *) htonl (( unsignedlong) p))117 #define NTOHP(p) ((p) = (void *) ntohl (( unsignedlong) p))118 #define HTONP2(hp, np) ((np) = (void *) htonl (( unsignedlong) hp))119 #define NTOHP2(np, hp) ((hp) = (void *) ntohl (( unsignedlong) np))116 #define HTONP(p) ((p) = (void *) htonl ((mg_u_long) p)) 117 #define NTOHP(p) ((p) = (void *) ntohl ((mg_u_long) p)) 118 #define HTONP2(hp, np) ((np) = (void *) htonl ((mg_u_long) hp)) 119 #define NTOHP2(np, hp) ((hp) = (void *) ntohl ((mg_u_long) np)) 120 120 121 121 /* unsigned long */ … … 126 126 127 127 /* signed long */ 128 #define HTONSL(l) ((l) = ( long) htonl ((unsignedlong) (l)))129 #define NTOHSL(l) ((l) = ( long) ntohl ((unsignedlong) (l)))130 #define HTONSL2(hl, nl) ((nl) = ( long) htonl ((unsignedlong) (hl)))131 #define NTOHSL2(nl, hl) ((hl) = ( long) ntohl ((unsignedlong) (nl)))128 #define HTONSL(l) ((l) = (mg_s_long) htonl ((mg_u_long) (l))) 129 #define NTOHSL(l) ((l) = (mg_s_long) ntohl ((mg_u_long) (l))) 130 #define HTONSL2(hl, nl) ((nl) = (mg_s_long) htonl ((mg_u_long) (hl))) 131 #define NTOHSL2(nl, hl) ((hl) = (mg_s_long) ntohl ((mg_u_long) (nl))) 132 132 133 133 /* unsigned int */ 134 #define HTONUI(i) ((i) = (unsigned int) htonl (( unsignedlong) (i)))135 #define NTOHUI(i) ((i) = (unsigned int) ntohl (( unsignedlong) (i)))136 #define HTONUI2(hi, ni) ((ni) = (unsigned int) htonl (( unsignedlong) (hi)))137 #define NTOHUI2(ni, hi) ((hi) = (unsigned int) ntohl (( unsignedlong) (ni)))134 #define HTONUI(i) ((i) = (unsigned int) htonl ((mg_u_long) (i))) 135 #define NTOHUI(i) ((i) = (unsigned int) ntohl ((mg_u_long) (i))) 136 #define HTONUI2(hi, ni) ((ni) = (unsigned int) htonl ((mg_u_long) (hi))) 137 #define NTOHUI2(ni, hi) ((hi) = (unsigned int) ntohl ((mg_u_long) (ni))) 138 138 139 139 /* signed int */ 140 #define HTONSI(i) ((i) = (int) htonl (( unsignedlong) (i)))141 #define NTOHSI(i) ((i) = (int) ntohl (( unsignedlong) (i)))142 #define HTONSI2(hi, ni) ((ni) = (int) htonl (( unsignedlong) (hi)))143 #define NTOHSI2(ni, hi) ((hi) = (int) ntohl (( unsignedlong) (ni)))140 #define HTONSI(i) ((i) = (int) htonl ((mg_u_long) (i))) 141 #define NTOHSI(i) ((i) = (int) ntohl ((mg_u_long) (i))) 142 #define HTONSI2(hi, ni) ((ni) = (int) htonl ((mg_u_long) (hi))) 143 #define NTOHSI2(ni, hi) ((hi) = (int) ntohl ((mg_u_long) (ni))) 144 144 145 145 /* unsigned short */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/non_ansi.h
r16583 r23508 3 3 4 4 #include "config.h" 5 #include "mglong.h" 5 6 # if !defined(__STDC__) 6 7 … … 11 12 12 13 int fileno(FILE *); 13 int ftruncate(int, long);14 int ftruncate(int, mg_s_long); 14 15 int pclose(FILE *); 15 16 FILE *popen(const char *command, const char *type); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/perf_hash.cpp
r16583 r23508 44 44 /* Random Number stuff */ 45 45 46 long irandm (long is[2]); /* from random.c */47 48 static long seed[] = {0, 0};46 mg_s_long irandm (mg_s_long is[2]); /* from random.c */ 47 48 static mg_s_long seed[] = {0, 0}; 49 49 #define RANDOM() irandm(seed) 50 50 #define SEED_RANDOM(the_seed) do{ seed[0] = the_seed; }while(0) … … 107 107 108 108 #ifndef STRUCT 109 static long **tb0, **tb1, **tb2;109 static mg_s_long **tb0, **tb1, **tb2; 110 110 #else 111 111 struct tb_entry **tb; … … 700 700 { 701 701 if (tb0) 702 if (!(tb0[i] = Xmalloc (sizeof ( long) * MAX_L)))702 if (!(tb0[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 703 703 ok = 0; 704 704 if (tb1) 705 if (!(tb1[i] = Xmalloc (sizeof ( long) * MAX_L)))705 if (!(tb1[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 706 706 ok = 0; 707 707 if (tb2) 708 if (!(tb2[i] = Xmalloc (sizeof ( long) * MAX_L)))708 if (!(tb2[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 709 709 ok = 0; 710 710 } … … 744 744 745 745 if (r <= 0) 746 SEED_RANDOM (( long) time ((time_t *) NULL));746 SEED_RANDOM ((mg_s_long) time ((time_t *) NULL)); 747 747 else 748 748 SEED_RANDOM (r); … … 902 902 { 903 903 if (phd->tb0) 904 if (!(phd->tb0[i] = Xmalloc (sizeof ( long) * phd->MAX_L)))904 if (!(phd->tb0[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 905 905 ok = 0; 906 906 if (phd->tb1) 907 if (!(phd->tb1[i] = Xmalloc (sizeof ( long) * phd->MAX_L)))907 if (!(phd->tb1[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 908 908 ok = 0; 909 909 if (phd->tb2) 910 if (!(phd->tb2[i] = Xmalloc (sizeof ( long) * phd->MAX_L)))910 if (!(phd->tb2[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 911 911 ok = 0; 912 912 } … … 946 946 int j; 947 947 948 tot += fread ((char *) phd->tb0[i], sizeof ( long), phd->MAX_L, f) *948 tot += fread ((char *) phd->tb0[i], sizeof (mg_s_long), phd->MAX_L, f) * 949 949 sizeof (int); 950 tot += fread ((char *) phd->tb1[i], sizeof ( long), phd->MAX_L, f) *950 tot += fread ((char *) phd->tb1[i], sizeof (mg_s_long), phd->MAX_L, f) * 951 951 sizeof (int); 952 tot += fread ((char *) phd->tb2[i], sizeof ( long), phd->MAX_L, f) *952 tot += fread ((char *) phd->tb2[i], sizeof (mg_s_long), phd->MAX_L, f) * 953 953 sizeof (int); 954 954 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/perf_hash.h
r16583 r23508 25 25 struct tb_entry 26 26 { 27 long tb0, tb1, tb2;27 mg_s_long tb0, tb1, tb2; 28 28 }; 29 29 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/random.cpp
r16583 r23508 33 33 * The table mt[0:127] is defined by mt[i] = 69069 ** (128-i) 34 34 */ 35 36 #define MASK ((long) 593970775) 35 #include "random.h" 36 37 #define MASK ((mg_s_long) 593970775) 37 38 /* or in hex, 23674657 */ 38 39 … … 40 41 /* i.e. 2 to power -31 */ 41 42 42 static long mt [128] = {43 static mg_s_long mt [128] = { 43 44 902906369, 44 45 2030498053, … … 172 173 173 174 double 174 random ( long is [2])175 random (mg_s_long is [2]) 175 176 { 176 long it, leh, nit;177 mg_s_long it, leh, nit; 177 178 178 179 it = is [0]; … … 187 188 is [0] = it; is [1] = leh; 188 189 if (leh < 0) leh = ~leh; 189 return (SCALE * (( long) (leh | 1)));190 return (SCALE * ((mg_s_long) (leh | 1))); 190 191 } 191 192 192 193 193 194 194 long195 irandm ( long is [2])195 mg_s_long 196 irandm (mg_s_long is [2]) 196 197 { 197 long it, leh, nit;198 mg_s_long it, leh, nit; 198 199 199 200 it = is [0]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/random.h
r16583 r23508 36 36 * The table mt[0:127] is defined by mt[i] = 69069 ** (128-i) 37 37 */ 38 #include "mglong.h" 38 39 39 double random ( long is [2]);40 long irandm (long is [2]);40 double random (mg_s_long is [2]); 41 mg_s_long irandm (mg_s_long is [2]); 41 42 42 43 #endif -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/sysfuncs.h
r16583 r23508 377 377 #endif 378 378 379 /* [RPAP - Feb 97: WIN32 Port] */ 380 #ifndef u_long 381 # define u_long unsigned long 382 #endif 379 #include "mglong.h" 380 383 381 #ifndef u_char 384 # define u_char unsigned char 385 #endif 386 382 # define u_char uint8_t 383 #endif 387 384 388 385 #endif /* SYSFUNCS_H */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/unitool.cpp
r23424 r23508 15 15 * column 16 16 */ 17 static unsignedlong *unicode_cat_data=NULL;17 static mg_u_long *unicode_cat_data=NULL; 18 18 19 19 … … 40 40 #define NUM_DECOMPOSE_INFO 1269 41 41 static const unidecompose decompose_info[NUM_DECOMPOSE_INFO] = { 42 {0xC0, 0x41,0x300,0x0}, {0xC1,0x41,0x301,0x0}, {0xC2,0x41,0x302,0x0},43 {0xC3, 0x41,0x303,0x0}, {0xC4,0x41,0x308,0x0}, {0xC5,0x41,0x30A,0x0},44 {0xC7, 0x43,0x327,0x0}, {0xC8,0x45,0x300,0x0}, {0xC9,0x45,0x301,0x0},45 {0xCA, 0x45,0x302,0x0}, {0xCB,0x45,0x308,0x0}, {0xCC,0x49,0x300,0x0},46 {0xCD, 0x49,0x301,0x0}, {0xCE,0x49,0x302,0x0}, {0xCF,0x49,0x308,0x0},47 {0xD1, 0x4E,0x303,0x0}, {0xD2,0x4F,0x300,0x0}, {0xD3,0x4F,0x301,0x0},48 {0xD4, 0x4F,0x302,0x0}, {0xD5,0x4F,0x303,0x0}, {0xD6,0x4F,0x308,0x0},49 {0xD9, 0x55,0x300,0x0}, {0xDA,0x55,0x301,0x0}, {0xDB,0x55,0x302,0x0},50 {0xDC, 0x55,0x308,0x0}, {0xDD,0x59,0x301,0x0}, {0xE0,0x61,0x300,0x0},51 {0xE1, 0x61,0x301,0x0}, {0xE2,0x61,0x302,0x0}, {0xE3,0x61,0x303,0x0},52 {0xE4, 0x61,0x308,0x0}, {0xE5,0x61,0x30A,0x0}, {0xE7,0x63,0x327,0x0},53 {0xE8, 0x65,0x300,0x0}, {0xE9,0x65,0x301,0x0}, {0xEA,0x65,0x302,0x0},54 {0xEB, 0x65,0x308,0x0}, {0xEC,0x69,0x300,0x0}, {0xED,0x69,0x301,0x0},55 {0xEE, 0x69,0x302,0x0}, {0xEF,0x69,0x308,0x0}, {0xF1,0x6E,0x303,0x0},56 {0xF2, 0x6F,0x300,0x0}, {0xF3,0x6F,0x301,0x0}, {0xF4,0x6F,0x302,0x0},57 {0xF5, 0x6F,0x303,0x0}, {0xF6,0x6F,0x308,0x0}, {0xF9,0x75,0x300,0x0},58 {0xFA, 0x75,0x301,0x0}, {0xFB,0x75,0x302,0x0}, {0xFC,0x75,0x308,0x0},59 {0xFD, 0x79,0x301,0x0}, {0xFF,0x79,0x308,0x0}, {0x100,0x41,0x304,0x0},60 {0x101, 0x61,0x304,0x0}, {0x102,0x41,0x306,0x0}, {0x103,0x61,0x306,0x0},61 {0x104, 0x41,0x328,0x0}, {0x105,0x61,0x328,0x0}, {0x106,0x43,0x301,0x0},62 {0x107, 0x63,0x301,0x0}, {0x108,0x43,0x302,0x0}, {0x109,0x63,0x302,0x0},63 {0x10A, 0x43,0x307,0x0}, {0x10B,0x63,0x307,0x0}, {0x10C,0x43,0x30C,0x0},64 {0x10D, 0x63,0x30C,0x0}, {0x10E,0x44,0x30C,0x0}, {0x10F,0x64,0x30C,0x0},65 {0x112, 0x45,0x304,0x0}, {0x113,0x65,0x304,0x0}, {0x114,0x45,0x306,0x0},66 {0x115, 0x65,0x306,0x0}, {0x116,0x45,0x307,0x0}, {0x117,0x65,0x307,0x0},67 {0x118, 0x45,0x328,0x0}, {0x119,0x65,0x328,0x0}, {0x11A,0x45,0x30C,0x0},68 {0x11B, 0x65,0x30C,0x0}, {0x11C,0x47,0x302,0x0}, {0x11D,0x67,0x302,0x0},69 {0x11E, 0x47,0x306,0x0}, {0x11F,0x67,0x306,0x0}, {0x120,0x47,0x307,0x0},70 {0x121, 0x67,0x307,0x0}, {0x122,0x47,0x327,0x0}, {0x123,0x67,0x327,0x0},71 {0x124, 0x48,0x302,0x0}, {0x125,0x68,0x302,0x0}, {0x128,0x49,0x303,0x0},72 {0x129, 0x69,0x303,0x0}, {0x12A,0x49,0x304,0x0}, {0x12B,0x69,0x304,0x0},73 {0x12C, 0x49,0x306,0x0}, {0x12D,0x69,0x306,0x0}, {0x12E,0x49,0x328,0x0},74 {0x12F, 0x69,0x328,0x0}, {0x130,0x49,0x307,0x0}, {0x134,0x4A,0x302,0x0},75 {0x135, 0x6A,0x302,0x0}, {0x136,0x4B,0x327,0x0}, {0x137,0x6B,0x327,0x0},76 {0x139, 0x4C,0x301,0x0}, {0x13A,0x6C,0x301,0x0}, {0x13B,0x4C,0x327,0x0},77 {0x13C, 0x6C,0x327,0x0}, {0x13D,0x4C,0x30C,0x0}, {0x13E,0x6C,0x30C,0x0},78 {0x143, 0x4E,0x301,0x0}, {0x144,0x6E,0x301,0x0}, {0x145,0x4E,0x327,0x0},79 {0x146, 0x6E,0x327,0x0}, {0x147,0x4E,0x30C,0x0}, {0x148,0x6E,0x30C,0x0},80 {0x14C, 0x4F,0x304,0x0}, {0x14D,0x6F,0x304,0x0}, {0x14E,0x4F,0x306,0x0},81 {0x14F, 0x6F,0x306,0x0}, {0x150,0x4F,0x30B,0x0}, {0x151,0x6F,0x30B,0x0},82 {0x154, 0x52,0x301,0x0}, {0x155,0x72,0x301,0x0}, {0x156,0x52,0x327,0x0},83 {0x157, 0x72,0x327,0x0}, {0x158,0x52,0x30C,0x0}, {0x159,0x72,0x30C,0x0},84 {0x15A, 0x53,0x301,0x0}, {0x15B,0x73,0x301,0x0}, {0x15C,0x53,0x302,0x0},85 {0x15D, 0x73,0x302,0x0}, {0x15E,0x53,0x327,0x0}, {0x15F,0x73,0x327,0x0},86 {0x160, 0x53,0x30C,0x0}, {0x161,0x73,0x30C,0x0}, {0x162,0x54,0x327,0x0},87 {0x163, 0x74,0x327,0x0}, {0x164,0x54,0x30C,0x0}, {0x165,0x74,0x30C,0x0},88 {0x168, 0x55,0x303,0x0}, {0x169,0x75,0x303,0x0}, {0x16A,0x55,0x304,0x0},89 {0x16B, 0x75,0x304,0x0}, {0x16C,0x55,0x306,0x0}, {0x16D,0x75,0x306,0x0},90 {0x16E, 0x55,0x30A,0x0}, {0x16F,0x75,0x30A,0x0}, {0x170,0x55,0x30B,0x0},91 {0x171, 0x75,0x30B,0x0}, {0x172,0x55,0x328,0x0}, {0x173,0x75,0x328,0x0},92 {0x174, 0x57,0x302,0x0}, {0x175,0x77,0x302,0x0}, {0x176,0x59,0x302,0x0},93 {0x177, 0x79,0x302,0x0}, {0x178,0x59,0x308,0x0}, {0x179,0x5A,0x301,0x0},94 {0x17A, 0x7A,0x301,0x0}, {0x17B,0x5A,0x307,0x0}, {0x17C,0x7A,0x307,0x0},95 {0x17D, 0x5A,0x30C,0x0}, {0x17E,0x7A,0x30C,0x0}, {0x1A0,0x4F,0x31B,0x0},96 {0x1A1, 0x6F,0x31B,0x0}, {0x1AF,0x55,0x31B,0x0}, {0x1B0,0x75,0x31B,0x0},97 {0x1CD, 0x41,0x30C,0x0}, {0x1CE,0x61,0x30C,0x0}, {0x1CF,0x49,0x30C,0x0},98 {0x1D0, 0x69,0x30C,0x0}, {0x1D1,0x4F,0x30C,0x0}, {0x1D2,0x6F,0x30C,0x0},99 {0x1D3, 0x55,0x30C,0x0}, {0x1D4,0x75,0x30C,0x0}, {0x1D5,0xDC,0x304,0x0},100 {0x1D6, 0xFC,0x304,0x0}, {0x1D7,0xDC,0x301,0x0}, {0x1D8,0xFC,0x301,0x0},101 {0x1D9, 0xDC,0x30C,0x0}, {0x1DA,0xFC,0x30C,0x0}, {0x1DB,0xDC,0x300,0x0},102 {0x1DC, 0xFC,0x300,0x0}, {0x1DE,0xC4,0x304,0x0}, {0x1DF,0xE4,0x304,0x0},103 {0x1E0, 0x41,0x307,0x304}, {0x1E1,0x61,0x307,0x304}, {0x1E2,0xC6,0x304,0x0},104 {0x1E3, 0xE6,0x304,0x0}, {0x1E6,0x47,0x30C,0x0}, {0x1E7,0x67,0x30C,0x0},105 {0x1E8, 0x4B,0x30C,0x0}, {0x1E9,0x6B,0x30C,0x0}, {0x1EA,0x4F,0x328,0x0},106 {0x1EB, 0x6F,0x328,0x0}, {0x1EC,0x1EA,0x304,0x0}, {0x1ED,0x1EB,0x304,0x0},107 {0x1EE, 0x1B7,0x30C,0x0}, {0x1EF,0x292,0x30C,0x0}, {0x1F0,0x6A,0x30C,0x0},108 {0x1F4, 0x47,0x301,0x0}, {0x1F5,0x67,0x301,0x0}, {0x1FA,0xC5,0x301,0x0},109 {0x1FB, 0xE5,0x301,0x0}, {0x1FC,0xC6,0x301,0x0}, {0x1FD,0xE6,0x301,0x0},110 {0x1FE, 0xD8,0x301,0x0}, {0x1FF,0xF8,0x301,0x0}, {0x200,0x41,0x30F,0x0},111 {0x201, 0x61,0x30F,0x0}, {0x202,0x41,0x311,0x0}, {0x203,0x61,0x311,0x0},112 {0x204, 0x45,0x30F,0x0}, {0x205,0x65,0x30F,0x0}, {0x206,0x45,0x311,0x0},113 {0x207, 0x65,0x311,0x0}, {0x208,0x49,0x30F,0x0}, {0x209,0x69,0x30F,0x0},114 {0x20A, 0x49,0x311,0x0}, {0x20B,0x69,0x311,0x0}, {0x20C,0x4F,0x30F,0x0},115 {0x20D, 0x6F,0x30F,0x0}, {0x20E,0x4F,0x311,0x0}, {0x20F,0x6F,0x311,0x0},116 {0x210, 0x52,0x30F,0x0}, {0x211,0x72,0x30F,0x0}, {0x212,0x52,0x311,0x0},117 {0x213, 0x72,0x311,0x0}, {0x214,0x55,0x30F,0x0}, {0x215,0x75,0x30F,0x0},118 {0x216, 0x55,0x311,0x0}, {0x217,0x75,0x311,0x0}, {0x310,0x306,0x307,0x0},119 {0x340, 0x300,0x0,0x0}, {0x341,0x301,0x0,0x0}, {0x343,0x313,0x0,0x0},120 {0x344, 0x308,0x30D,0x0}, {0x374,0x2B9,0x0,0x0}, {0x37E,0x3B,0x0,0x0},121 {0x385, 0xA8,0x30D,0x0}, {0x386,0x391,0x30D,0x0}, {0x387,0xB7,0x0,0x0},122 {0x388, 0x395,0x30D,0x0}, {0x389,0x397,0x30D,0x0}, {0x38A,0x399,0x30D,0x0},123 {0x38C, 0x39F,0x30D,0x0}, {0x38E,0x3A5,0x30D,0x0}, {0x38F,0x3A9,0x30D,0x0},124 {0x390, 0x3B9,0x344,0x0}, {0x3AA,0x399,0x308,0x0}, {0x3AB,0x3A5,0x308,0x0},125 {0x3AC, 0x3B1,0x30D,0x0}, {0x3AD,0x3B5,0x30D,0x0}, {0x3AE,0x3B7,0x30D,0x0},126 {0x3AF, 0x3B9,0x30D,0x0}, {0x3B0,0x3C5,0x344,0x0}, {0x3CA,0x3B9,0x308,0x0},127 {0x3CB, 0x3C5,0x308,0x0}, {0x3CC,0x3BF,0x30D,0x0}, {0x3CD,0x3C5,0x30D,0x0},128 {0x3CE, 0x3C9,0x30D,0x0}, {0x3D3,0x3D2,0x30D,0x0}, {0x3D4,0x3D2,0x308,0x0},129 {0x401, 0x415,0x308,0x0}, {0x403,0x413,0x301,0x0}, {0x407,0x406,0x308,0x0},130 {0x40C, 0x41A,0x301,0x0}, {0x40E,0x423,0x306,0x0}, {0x419,0x418,0x306,0x0},131 {0x439, 0x438,0x306,0x0}, {0x451,0x435,0x308,0x0}, {0x453,0x433,0x301,0x0},132 {0x457, 0x456,0x308,0x0}, {0x45C,0x43A,0x301,0x0}, {0x45E,0x443,0x306,0x0},133 {0x476, 0x474,0x30F,0x0}, {0x477,0x475,0x30F,0x0}, {0x4C1,0x416,0x306,0x0},134 {0x4C2, 0x436,0x306,0x0}, {0x4D0,0x410,0x306,0x0}, {0x4D1,0x430,0x306,0x0},135 {0x4D2, 0x410,0x308,0x0}, {0x4D3,0x430,0x308,0x0}, {0x4D6,0x415,0x306,0x0},136 {0x4D7, 0x435,0x306,0x0}, {0x4DA,0x4D8,0x308,0x0}, {0x4DB,0x4D9,0x308,0x0},137 {0x4DC, 0x416,0x308,0x0}, {0x4DD,0x436,0x308,0x0}, {0x4DE,0x417,0x308,0x0},138 {0x4DF, 0x437,0x308,0x0}, {0x4E2,0x418,0x304,0x0}, {0x4E3,0x438,0x304,0x0},139 {0x4E4, 0x418,0x308,0x0}, {0x4E5,0x438,0x308,0x0}, {0x4E6,0x41E,0x308,0x0},140 {0x4E7, 0x43E,0x308,0x0}, {0x4EA,0x4E8,0x308,0x0}, {0x4EB,0x4E9,0x308,0x0},141 {0x4EE, 0x423,0x304,0x0}, {0x4EF,0x443,0x304,0x0}, {0x4F0,0x423,0x308,0x0},142 {0x4F1, 0x443,0x308,0x0}, {0x4F2,0x423,0x30B,0x0}, {0x4F3,0x443,0x30B,0x0},143 {0x4F4, 0x427,0x308,0x0}, {0x4F5,0x447,0x308,0x0}, {0x4F8,0x42B,0x308,0x0},144 {0x4F9, 0x44B,0x308,0x0}, {0x929,0x928,0x93C,0x0}, {0x931,0x930,0x93C,0x0},145 {0x934, 0x933,0x93C,0x0}, {0x958,0x915,0x93C,0x0}, {0x959,0x916,0x93C,0x0},146 {0x95A, 0x917,0x93C,0x0}, {0x95B,0x91C,0x93C,0x0}, {0x95C,0x921,0x93C,0x0},147 {0x95D, 0x922,0x93C,0x0}, {0x95E,0x92B,0x93C,0x0}, {0x95F,0x92F,0x93C,0x0},148 {0x9B0, 0x9AC,0x9BC,0x0}, {0x9CB,0x9C7,0x9BE,0x0}, {0x9CC,0x9C7,0x9D7,0x0},149 {0x9DC, 0x9A1,0x9BC,0x0}, {0x9DD,0x9A2,0x9BC,0x0}, {0x9DF,0x9AF,0x9BC,0x0},150 {0xA59, 0xA16,0xA3C,0x0}, {0xA5A,0xA17,0xA3C,0x0}, {0xA5B,0xA1C,0xA3C,0x0},151 {0xA5C, 0xA21,0xA3C,0x0}, {0xA5E,0xA2B,0xA3C,0x0}, {0xB48,0xB47,0xB56,0x0},152 {0xB4B, 0xB47,0xB3E,0x0}, {0xB4C,0xB47,0xB57,0x0}, {0xB5C,0xB21,0xB3C,0x0},153 {0xB5D, 0xB22,0xB3C,0x0}, {0xB5F,0xB2F,0xB3C,0x0}, {0xB94,0xB92,0xBD7,0x0},154 {0xBCA, 0xBC6,0xBBE,0x0}, {0xBCB,0xBC7,0xBBE,0x0}, {0xBCC,0xBC6,0xBD7,0x0},155 {0xC48, 0xC46,0xC56,0x0}, {0xCC0,0xCBF,0xCD5,0x0}, {0xCC7,0xCC6,0xCD5,0x0},156 {0xCC8, 0xCC6,0xCD6,0x0}, {0xCCA,0xCC6,0xCC2,0x0}, {0xCCB,0xCC6,0xCC2,0xCD5},157 {0xD4A, 0xD46,0xD3E,0x0}, {0xD4B,0xD47,0xD3E,0x0}, {0xD4C,0xD46,0xD57,0x0},158 {0xE33, 0xE4D,0xE32,0x0}, {0xEB3,0xECD,0xEB2,0x0}, {0xF43,0xF42,0xFB7,0x0},159 {0xF4D, 0xF4C,0xFB7,0x0}, {0xF52,0xF51,0xFB7,0x0}, {0xF57,0xF56,0xFB7,0x0},160 {0xF5C, 0xF5B,0xFB7,0x0}, {0xF69,0xF40,0xFB5,0x0}, {0xF73,0xF72,0xF71,0x0},161 {0xF75, 0xF71,0xF74,0x0}, {0xF76,0xFB2,0xF80,0x0}, {0xF77,0xF76,0xF71,0x0},162 {0xF78, 0xFB3,0xF80,0x0}, {0xF79,0xF78,0xF71,0x0}, {0xF81,0xF80,0xF71,0x0},163 {0xF93, 0xF92,0xFB7,0x0}, {0xF9D,0xF9C,0xFB7,0x0}, {0xFA2,0xFA1,0xFB7,0x0},164 {0xFA7, 0xFA6,0xFB7,0x0}, {0xFAC,0xFAB,0xFB7,0x0}, {0xFB9,0xF90,0xFB5,0x0},165 {0x1E00, 0x41,0x325,0x0}, {0x1E01,0x61,0x325,0x0}, {0x1E02,0x42,0x307,0x0},166 {0x1E03, 0x62,0x307,0x0}, {0x1E04,0x42,0x323,0x0}, {0x1E05,0x62,0x323,0x0},167 {0x1E06, 0x42,0x331,0x0}, {0x1E07,0x62,0x331,0x0}, {0x1E08,0xC7,0x301,0x0},168 {0x1E09, 0xE7,0x301,0x0}, {0x1E0A,0x44,0x307,0x0}, {0x1E0B,0x64,0x307,0x0},169 {0x1E0C, 0x44,0x323,0x0}, {0x1E0D,0x64,0x323,0x0}, {0x1E0E,0x44,0x331,0x0},170 {0x1E0F, 0x64,0x331,0x0}, {0x1E10,0x44,0x327,0x0}, {0x1E11,0x64,0x327,0x0},171 {0x1E12, 0x44,0x32D,0x0}, {0x1E13,0x64,0x32D,0x0}, {0x1E14,0x112,0x300,0x0},172 {0x1E15, 0x113,0x300,0x0}, {0x1E16,0x112,0x301,0x0}, {0x1E17,0x113,0x301,0x0},173 {0x1E18, 0x45,0x32D,0x0}, {0x1E19,0x65,0x32D,0x0}, {0x1E1A,0x45,0x330,0x0},174 {0x1E1B, 0x65,0x330,0x0}, {0x1E1C,0x114,0x327,0x0}, {0x1E1D,0x115,0x327,0x0},175 {0x1E1E, 0x46,0x307,0x0}, {0x1E1F,0x66,0x307,0x0}, {0x1E20,0x47,0x304,0x0},176 {0x1E21, 0x67,0x304,0x0}, {0x1E22,0x48,0x307,0x0}, {0x1E23,0x68,0x307,0x0},177 {0x1E24, 0x48,0x323,0x0}, {0x1E25,0x68,0x323,0x0}, {0x1E26,0x48,0x308,0x0},178 {0x1E27, 0x68,0x308,0x0}, {0x1E28,0x48,0x327,0x0}, {0x1E29,0x68,0x327,0x0},179 {0x1E2A, 0x48,0x32E,0x0}, {0x1E2B,0x68,0x32E,0x0}, {0x1E2C,0x49,0x330,0x0},180 {0x1E2D, 0x69,0x330,0x0}, {0x1E2E,0xCF,0x301,0x0}, {0x1E2F,0xEF,0x301,0x0},181 {0x1E30, 0x4B,0x301,0x0}, {0x1E31,0x6B,0x301,0x0}, {0x1E32,0x4B,0x323,0x0},182 {0x1E33, 0x6B,0x323,0x0}, {0x1E34,0x4B,0x331,0x0}, {0x1E35,0x6B,0x331,0x0},183 {0x1E36, 0x4C,0x323,0x0}, {0x1E37,0x6C,0x323,0x0}, {0x1E38,0x1E36,0x304,0x0},184 {0x1E39, 0x1E37,0x304,0x0}, {0x1E3A,0x4C,0x331,0x0}, {0x1E3B,0x6C,0x331,0x0},185 {0x1E3C, 0x4C,0x32D,0x0}, {0x1E3D,0x6C,0x32D,0x0}, {0x1E3E,0x4D,0x301,0x0},186 {0x1E3F, 0x6D,0x301,0x0}, {0x1E40,0x4D,0x307,0x0}, {0x1E41,0x6D,0x307,0x0},187 {0x1E42, 0x4D,0x323,0x0}, {0x1E43,0x6D,0x323,0x0}, {0x1E44,0x4E,0x307,0x0},188 {0x1E45, 0x6E,0x307,0x0}, {0x1E46,0x4E,0x323,0x0}, {0x1E47,0x6E,0x323,0x0},189 {0x1E48, 0x4E,0x331,0x0}, {0x1E49,0x6E,0x331,0x0}, {0x1E4A,0x4E,0x32D,0x0},190 {0x1E4B, 0x6E,0x32D,0x0}, {0x1E4C,0xD5,0x301,0x0}, {0x1E4D,0xF5,0x301,0x0},191 {0x1E4E, 0xD5,0x308,0x0}, {0x1E4F,0xF5,0x308,0x0}, {0x1E50,0x14C,0x300,0x0},192 {0x1E51, 0x14D,0x300,0x0}, {0x1E52,0x14C,0x301,0x0}, {0x1E53,0x14D,0x301,0x0},193 {0x1E54, 0x50,0x301,0x0}, {0x1E55,0x70,0x301,0x0}, {0x1E56,0x50,0x307,0x0},194 {0x1E57, 0x70,0x307,0x0}, {0x1E58,0x52,0x307,0x0}, {0x1E59,0x72,0x307,0x0},195 {0x1E5A, 0x52,0x323,0x0}, {0x1E5B,0x72,0x323,0x0}, {0x1E5C,0x1E5A,0x304,0x0},196 {0x1E5D, 0x1E5B,0x304,0x0}, {0x1E5E,0x52,0x331,0x0}, {0x1E5F,0x72,0x331,0x0},197 {0x1E60, 0x53,0x307,0x0}, {0x1E61,0x73,0x307,0x0}, {0x1E62,0x53,0x323,0x0},198 {0x1E63, 0x73,0x323,0x0}, {0x1E64,0x15A,0x307,0x0}, {0x1E65,0x15B,0x307,0x0},199 {0x1E66, 0x160,0x307,0x0}, {0x1E67,0x161,0x307,0x0}, {0x1E68,0x1E62,0x307,0x0},200 {0x1E69, 0x1E63,0x307,0x0}, {0x1E6A,0x54,0x307,0x0}, {0x1E6B,0x74,0x307,0x0},201 {0x1E6C, 0x54,0x323,0x0}, {0x1E6D,0x74,0x323,0x0}, {0x1E6E,0x54,0x331,0x0},202 {0x1E6F, 0x74,0x331,0x0}, {0x1E70,0x54,0x32D,0x0}, {0x1E71,0x74,0x32D,0x0},203 {0x1E72, 0x55,0x324,0x0}, {0x1E73,0x75,0x324,0x0}, {0x1E74,0x55,0x330,0x0},204 {0x1E75, 0x75,0x330,0x0}, {0x1E76,0x55,0x32D,0x0}, {0x1E77,0x75,0x32D,0x0},205 {0x1E78, 0x168,0x301,0x0}, {0x1E79,0x169,0x301,0x0}, {0x1E7A,0x16A,0x308,0x0},206 {0x1E7B, 0x16B,0x308,0x0}, {0x1E7C,0x56,0x303,0x0}, {0x1E7D,0x76,0x303,0x0},207 {0x1E7E, 0x56,0x323,0x0}, {0x1E7F,0x76,0x323,0x0}, {0x1E80,0x57,0x300,0x0},208 {0x1E81, 0x77,0x300,0x0}, {0x1E82,0x57,0x301,0x0}, {0x1E83,0x77,0x301,0x0},209 {0x1E84, 0x57,0x308,0x0}, {0x1E85,0x77,0x308,0x0}, {0x1E86,0x57,0x307,0x0},210 {0x1E87, 0x77,0x307,0x0}, {0x1E88,0x57,0x323,0x0}, {0x1E89,0x77,0x323,0x0},211 {0x1E8A, 0x58,0x307,0x0}, {0x1E8B,0x78,0x307,0x0}, {0x1E8C,0x58,0x308,0x0},212 {0x1E8D, 0x78,0x308,0x0}, {0x1E8E,0x59,0x307,0x0}, {0x1E8F,0x79,0x307,0x0},213 {0x1E90, 0x5A,0x302,0x0}, {0x1E91,0x7A,0x302,0x0}, {0x1E92,0x5A,0x323,0x0},214 {0x1E93, 0x7A,0x323,0x0}, {0x1E94,0x5A,0x331,0x0}, {0x1E95,0x7A,0x331,0x0},215 {0x1E96, 0x68,0x331,0x0}, {0x1E97,0x74,0x308,0x0}, {0x1E98,0x77,0x30A,0x0},216 {0x1E99, 0x79,0x30A,0x0}, {0x1E9B,0x17F,0x307,0x0}, {0x1EA0,0x41,0x323,0x0},217 {0x1EA1, 0x61,0x323,0x0}, {0x1EA2,0x41,0x309,0x0}, {0x1EA3,0x61,0x309,0x0},218 {0x1EA4, 0xC2,0x301,0x0}, {0x1EA5,0xE2,0x301,0x0}, {0x1EA6,0xC2,0x300,0x0},219 {0x1EA7, 0xE2,0x300,0x0}, {0x1EA8,0xC2,0x309,0x0}, {0x1EA9,0xE2,0x309,0x0},220 {0x1EAA, 0xC2,0x303,0x0}, {0x1EAB,0xE2,0x303,0x0}, {0x1EAC,0xC2,0x323,0x0},221 {0x1EAD, 0xE2,0x323,0x0}, {0x1EAE,0x102,0x301,0x0}, {0x1EAF,0x103,0x301,0x0},222 {0x1EB0, 0x102,0x300,0x0}, {0x1EB1,0x103,0x300,0x0}, {0x1EB2,0x102,0x309,0x0},223 {0x1EB3, 0x103,0x309,0x0}, {0x1EB4,0x102,0x303,0x0}, {0x1EB5,0x103,0x303,0x0},224 {0x1EB6, 0x102,0x323,0x0}, {0x1EB7,0x103,0x323,0x0}, {0x1EB8,0x45,0x323,0x0},225 {0x1EB9, 0x65,0x323,0x0}, {0x1EBA,0x45,0x309,0x0}, {0x1EBB,0x65,0x309,0x0},226 {0x1EBC, 0x45,0x303,0x0}, {0x1EBD,0x65,0x303,0x0}, {0x1EBE,0xCA,0x301,0x0},227 {0x1EBF, 0xEA,0x301,0x0}, {0x1EC0,0xCA,0x300,0x0}, {0x1EC1,0xEA,0x300,0x0},228 {0x1EC2, 0xCA,0x309,0x0}, {0x1EC3,0xEA,0x309,0x0}, {0x1EC4,0xCA,0x303,0x0},229 {0x1EC5, 0xEA,0x303,0x0}, {0x1EC6,0xCA,0x323,0x0}, {0x1EC7,0xEA,0x323,0x0},230 {0x1EC8, 0x49,0x309,0x0}, {0x1EC9,0x69,0x309,0x0}, {0x1ECA,0x49,0x323,0x0},231 {0x1ECB, 0x69,0x323,0x0}, {0x1ECC,0x4F,0x323,0x0}, {0x1ECD,0x6F,0x323,0x0},232 {0x1ECE, 0x4F,0x309,0x0}, {0x1ECF,0x6F,0x309,0x0}, {0x1ED0,0xD4,0x301,0x0},233 {0x1ED1, 0xF4,0x301,0x0}, {0x1ED2,0xD4,0x300,0x0}, {0x1ED3,0xF4,0x300,0x0},234 {0x1ED4, 0xD4,0x309,0x0}, {0x1ED5,0xF4,0x309,0x0}, {0x1ED6,0xD4,0x303,0x0},235 {0x1ED7, 0xF4,0x303,0x0}, {0x1ED8,0xD4,0x323,0x0}, {0x1ED9,0xF4,0x323,0x0},236 {0x1EDA, 0x1A0,0x301,0x0}, {0x1EDB,0x1A1,0x301,0x0}, {0x1EDC,0x1A0,0x300,0x0},237 {0x1EDD, 0x1A1,0x300,0x0}, {0x1EDE,0x1A0,0x309,0x0}, {0x1EDF,0x1A1,0x309,0x0},238 {0x1EE0, 0x1A0,0x303,0x0}, {0x1EE1,0x1A1,0x303,0x0}, {0x1EE2,0x1A0,0x323,0x0},239 {0x1EE3, 0x1A1,0x323,0x0}, {0x1EE4,0x55,0x323,0x0}, {0x1EE5,0x75,0x323,0x0},240 {0x1EE6, 0x55,0x309,0x0}, {0x1EE7,0x75,0x309,0x0}, {0x1EE8,0x1AF,0x301,0x0},241 {0x1EE9, 0x1B0,0x301,0x0}, {0x1EEA,0x1AF,0x300,0x0}, {0x1EEB,0x1B0,0x300,0x0},242 {0x1EEC, 0x1AF,0x309,0x0}, {0x1EED,0x1B0,0x309,0x0}, {0x1EEE,0x1AF,0x303,0x0},243 {0x1EEF, 0x1B0,0x303,0x0}, {0x1EF0,0x1AF,0x323,0x0}, {0x1EF1,0x1B0,0x323,0x0},244 {0x1EF2, 0x59,0x300,0x0}, {0x1EF3,0x79,0x300,0x0}, {0x1EF4,0x59,0x323,0x0},245 {0x1EF5, 0x79,0x323,0x0}, {0x1EF6,0x59,0x309,0x0}, {0x1EF7,0x79,0x309,0x0},246 {0x1EF8, 0x59,0x303,0x0}, {0x1EF9,0x79,0x303,0x0}, {0x1F00,0x3B1,0x313,0x0},247 {0x1F01, 0x3B1,0x314,0x0}, {0x1F02,0x1F00,0x300,0x0}, {0x1F03,0x1F01,0x300,0x0},248 {0x1F04, 0x1F00,0x301,0x0}, {0x1F05,0x1F01,0x301,0x0}, {0x1F06,0x1F00,0x342,0x0},249 {0x1F07, 0x1F01,0x342,0x0}, {0x1F08,0x391,0x313,0x0}, {0x1F09,0x391,0x314,0x0},250 {0x1F0A, 0x1F08,0x300,0x0}, {0x1F0B,0x1F09,0x300,0x0}, {0x1F0C,0x1F08,0x301,0x0},251 {0x1F0D, 0x1F09,0x301,0x0}, {0x1F0E,0x1F08,0x342,0x0}, {0x1F0F,0x1F09,0x342,0x0},252 {0x1F10, 0x3B5,0x313,0x0}, {0x1F11,0x3B5,0x314,0x0}, {0x1F12,0x1F10,0x300,0x0},253 {0x1F13, 0x1F11,0x300,0x0}, {0x1F14,0x1F10,0x301,0x0}, {0x1F15,0x1F11,0x301,0x0},254 {0x1F18, 0x395,0x313,0x0}, {0x1F19,0x395,0x314,0x0}, {0x1F1A,0x1F18,0x300,0x0},255 {0x1F1B, 0x1F19,0x300,0x0}, {0x1F1C,0x1F18,0x301,0x0}, {0x1F1D,0x1F19,0x301,0x0},256 {0x1F20, 0x3B7,0x313,0x0}, {0x1F21,0x3B7,0x314,0x0}, {0x1F22,0x1F20,0x300,0x0},257 {0x1F23, 0x1F21,0x300,0x0}, {0x1F24,0x1F20,0x301,0x0}, {0x1F25,0x1F21,0x301,0x0},258 {0x1F26, 0x1F20,0x342,0x0}, {0x1F27,0x1F21,0x342,0x0}, {0x1F28,0x397,0x313,0x0},259 {0x1F29, 0x397,0x314,0x0}, {0x1F2A,0x1F28,0x300,0x0}, {0x1F2B,0x1F29,0x300,0x0},260 {0x1F2C, 0x1F28,0x301,0x0}, {0x1F2D,0x1F29,0x301,0x0}, {0x1F2E,0x1F28,0x342,0x0},261 {0x1F2F, 0x1F29,0x342,0x0}, {0x1F30,0x3B9,0x313,0x0}, {0x1F31,0x3B9,0x314,0x0},262 {0x1F32, 0x1F30,0x300,0x0}, {0x1F33,0x1F31,0x300,0x0}, {0x1F34,0x1F30,0x301,0x0},263 {0x1F35, 0x1F31,0x301,0x0}, {0x1F36,0x1F30,0x342,0x0}, {0x1F37,0x1F31,0x342,0x0},264 {0x1F38, 0x399,0x313,0x0}, {0x1F39,0x399,0x314,0x0}, {0x1F3A,0x1F38,0x300,0x0},265 {0x1F3B, 0x1F39,0x300,0x0}, {0x1F3C,0x1F38,0x301,0x0}, {0x1F3D,0x1F39,0x301,0x0},266 {0x1F3E, 0x1F38,0x342,0x0}, {0x1F3F,0x1F39,0x342,0x0}, {0x1F40,0x3BF,0x313,0x0},267 {0x1F41, 0x3BF,0x314,0x0}, {0x1F42,0x1F40,0x300,0x0}, {0x1F43,0x1F41,0x300,0x0},268 {0x1F44, 0x1F40,0x301,0x0}, {0x1F45,0x1F41,0x301,0x0}, {0x1F48,0x39F,0x313,0x0},269 {0x1F49, 0x39F,0x314,0x0}, {0x1F4A,0x1F48,0x300,0x0}, {0x1F4B,0x1F49,0x300,0x0},270 {0x1F4C, 0x1F48,0x301,0x0}, {0x1F4D,0x1F49,0x301,0x0}, {0x1F50,0x3C5,0x313,0x0},271 {0x1F51, 0x3C5,0x314,0x0}, {0x1F52,0x1F50,0x300,0x0}, {0x1F53,0x1F51,0x300,0x0},272 {0x1F54, 0x1F50,0x301,0x0}, {0x1F55,0x1F51,0x301,0x0}, {0x1F56,0x1F50,0x342,0x0},273 {0x1F57, 0x1F51,0x342,0x0}, {0x1F59,0x3A5,0x314,0x0}, {0x1F5B,0x1F59,0x300,0x0},274 {0x1F5D, 0x1F59,0x301,0x0}, {0x1F5F,0x1F59,0x342,0x0}, {0x1F60,0x3C9,0x313,0x0},275 {0x1F61, 0x3C9,0x314,0x0}, {0x1F62,0x1F60,0x300,0x0}, {0x1F63,0x1F61,0x300,0x0},276 {0x1F64, 0x1F60,0x301,0x0}, {0x1F65,0x1F61,0x301,0x0}, {0x1F66,0x1F60,0x342,0x0},277 {0x1F67, 0x1F61,0x342,0x0}, {0x1F68,0x3A9,0x313,0x0}, {0x1F69,0x3A9,0x314,0x0},278 {0x1F6A, 0x1F68,0x300,0x0}, {0x1F6B,0x1F69,0x300,0x0}, {0x1F6C,0x1F68,0x301,0x0},279 {0x1F6D, 0x1F69,0x301,0x0}, {0x1F6E,0x1F68,0x342,0x0}, {0x1F6F,0x1F69,0x342,0x0},280 {0x1F70, 0x3B1,0x300,0x0}, {0x1F71,0x3B1,0x301,0x0}, {0x1F72,0x3B5,0x300,0x0},281 {0x1F73, 0x3B5,0x301,0x0}, {0x1F74,0x3B7,0x300,0x0}, {0x1F75,0x3B7,0x301,0x0},282 {0x1F76, 0x3B9,0x300,0x0}, {0x1F77,0x3B9,0x301,0x0}, {0x1F78,0x3BF,0x300,0x0},283 {0x1F79, 0x3BF,0x301,0x0}, {0x1F7A,0x3C5,0x300,0x0}, {0x1F7B,0x3C5,0x301,0x0},284 {0x1F7C, 0x3C9,0x300,0x0}, {0x1F7D,0x3C9,0x301,0x0}, {0x1F80,0x1F00,0x345,0x0},285 {0x1F81, 0x1F01,0x345,0x0}, {0x1F82,0x1F02,0x345,0x0}, {0x1F83,0x1F03,0x345,0x0},286 {0x1F84, 0x1F04,0x345,0x0}, {0x1F85,0x1F05,0x345,0x0}, {0x1F86,0x1F06,0x345,0x0},287 {0x1F87, 0x1F07,0x345,0x0}, {0x1F88,0x1F08,0x345,0x0}, {0x1F89,0x1F09,0x345,0x0},288 {0x1F8A, 0x1F0A,0x345,0x0}, {0x1F8B,0x1F0B,0x345,0x0}, {0x1F8C,0x1F0C,0x345,0x0},289 {0x1F8D, 0x1F0D,0x345,0x0}, {0x1F8E,0x1F0E,0x345,0x0}, {0x1F8F,0x1F0F,0x345,0x0},290 {0x1F90, 0x1F20,0x345,0x0}, {0x1F91,0x1F21,0x345,0x0}, {0x1F92,0x1F22,0x345,0x0},291 {0x1F93, 0x1F23,0x345,0x0}, {0x1F94,0x1F24,0x345,0x0}, {0x1F95,0x1F25,0x345,0x0},292 {0x1F96, 0x1F26,0x345,0x0}, {0x1F97,0x1F27,0x345,0x0}, {0x1F98,0x1F28,0x345,0x0},293 {0x1F99, 0x1F29,0x345,0x0}, {0x1F9A,0x1F2A,0x345,0x0}, {0x1F9B,0x1F2B,0x345,0x0},294 {0x1F9C, 0x1F2C,0x345,0x0}, {0x1F9D,0x1F2D,0x345,0x0}, {0x1F9E,0x1F2E,0x345,0x0},295 {0x1F9F, 0x1F2F,0x345,0x0}, {0x1FA0,0x1F60,0x345,0x0}, {0x1FA1,0x1F61,0x345,0x0},296 {0x1FA2, 0x1F62,0x345,0x0}, {0x1FA3,0x1F63,0x345,0x0}, {0x1FA4,0x1F64,0x345,0x0},297 {0x1FA5, 0x1F65,0x345,0x0}, {0x1FA6,0x1F66,0x345,0x0}, {0x1FA7,0x1F67,0x345,0x0},298 {0x1FA8, 0x1F68,0x345,0x0}, {0x1FA9,0x1F69,0x345,0x0}, {0x1FAA,0x1F6A,0x345,0x0},299 {0x1FAB, 0x1F6B,0x345,0x0}, {0x1FAC,0x1F6C,0x345,0x0}, {0x1FAD,0x1F6D,0x345,0x0},300 {0x1FAE, 0x1F6E,0x345,0x0}, {0x1FAF,0x1F6F,0x345,0x0}, {0x1FB0,0x3B1,0x306,0x0},301 {0x1FB1, 0x3B1,0x304,0x0}, {0x1FB2,0x1F70,0x345,0x0}, {0x1FB3,0x3B1,0x345,0x0},302 {0x1FB4, 0x1F71,0x345,0x0}, {0x1FB6,0x3B1,0x342,0x0}, {0x1FB7,0x1FB6,0x345,0x0},303 {0x1FB8, 0x391,0x306,0x0}, {0x1FB9,0x391,0x304,0x0}, {0x1FBA,0x391,0x300,0x0},304 {0x1FBB, 0x391,0x301,0x0}, {0x1FBC,0x391,0x345,0x0}, {0x1FBE,0x3B9,0x0,0x0},305 {0x1FC1, 0xA8,0x342,0x0}, {0x1FC2,0x1F74,0x345,0x0}, {0x1FC3,0x3B7,0x345,0x0},306 {0x1FC4, 0x1F75,0x345,0x0}, {0x1FC6,0x3B7,0x342,0x0}, {0x1FC7,0x1FC6,0x345,0x0},307 {0x1FC8, 0x395,0x300,0x0}, {0x1FC9,0x395,0x301,0x0}, {0x1FCA,0x397,0x300,0x0},308 {0x1FCB, 0x397,0x301,0x0}, {0x1FCC,0x397,0x345,0x0}, {0x1FCD,0x1FBF,0x300,0x0},309 {0x1FCE, 0x1FBF,0x301,0x0}, {0x1FCF,0x1FBF,0x342,0x0}, {0x1FD0,0x3B9,0x306,0x0},310 {0x1FD1, 0x3B9,0x304,0x0}, {0x1FD2,0x3CA,0x300,0x0}, {0x1FD3,0x3CA,0x301,0x0},311 {0x1FD6, 0x3B9,0x342,0x0}, {0x1FD7,0x3CA,0x342,0x0}, {0x1FD8,0x399,0x306,0x0},312 {0x1FD9, 0x399,0x304,0x0}, {0x1FDA,0x399,0x300,0x0}, {0x1FDB,0x399,0x301,0x0},313 {0x1FDD, 0x1FFE,0x300,0x0}, {0x1FDE,0x1FFE,0x301,0x0}, {0x1FDF,0x1FFE,0x342,0x0},314 {0x1FE0, 0x3C5,0x306,0x0}, {0x1FE1,0x3C5,0x304,0x0}, {0x1FE2,0x3CB,0x300,0x0},315 {0x1FE3, 0x3CB,0x301,0x0}, {0x1FE4,0x3C1,0x313,0x0}, {0x1FE5,0x3C1,0x314,0x0},316 {0x1FE6, 0x3C5,0x342,0x0}, {0x1FE7,0x3CB,0x342,0x0}, {0x1FE8,0x3A5,0x306,0x0},317 {0x1FE9, 0x3A5,0x304,0x0}, {0x1FEA,0x3A5,0x300,0x0}, {0x1FEB,0x3A5,0x301,0x0},318 {0x1FEC, 0x3A1,0x314,0x0}, {0x1FED,0xA8,0x300,0x0}, {0x1FEE,0xA8,0x301,0x0},319 {0x1FEF, 0x60,0x0,0x0}, {0x1FF2,0x1F7C,0x345,0x0}, {0x1FF3,0x3C9,0x345,0x0},320 {0x1FF4, 0x1F79,0x345,0x0}, {0x1FF6,0x3C9,0x342,0x0}, {0x1FF7,0x1FF6,0x345,0x0},321 {0x1FF8, 0x39F,0x300,0x0}, {0x1FF9,0x39F,0x301,0x0}, {0x1FFA,0x3A9,0x300,0x0},322 {0x1FFB, 0x3A9,0x301,0x0}, {0x1FFC,0x3A9,0x345,0x0}, {0x1FFD,0xB4,0x0,0x0},323 {0x2000, 0x2002,0x0,0x0}, {0x2001,0x2003,0x0,0x0}, {0x2126,0x3A9,0x0,0x0},324 {0x212A, 0x4B,0x0,0x0}, {0x212B,0xC5,0x0,0x0}, {0x2204,0x2203,0x338,0x0},325 {0x2209, 0x2208,0x338,0x0}, {0x220C,0x220B,0x338,0x0}, {0x2224,0x2223,0x338,0x0},326 {0x2226, 0x2225,0x338,0x0}, {0x2241,0x7E,0x338,0x0}, {0x2244,0x2243,0x338,0x0},327 {0x2247, 0x2245,0x338,0x0}, {0x2249,0x2248,0x338,0x0}, {0x2260,0x3D,0x338,0x0},328 {0x2262, 0x2261,0x338,0x0}, {0x226D,0x224D,0x338,0x0}, {0x226E,0x3C,0x338,0x0},329 {0x226F, 0x3E,0x338,0x0}, {0x2270,0x2264,0x338,0x0}, {0x2271,0x2265,0x338,0x0},330 {0x2274, 0x2272,0x338,0x0}, {0x2275,0x2273,0x338,0x0}, {0x2278,0x2276,0x338,0x0},331 {0x2279, 0x2277,0x338,0x0}, {0x2280,0x227A,0x338,0x0}, {0x2281,0x227B,0x338,0x0},332 {0x2284, 0x2282,0x338,0x0}, {0x2285,0x2283,0x338,0x0}, {0x2288,0x2286,0x338,0x0},333 {0x2289, 0x2287,0x338,0x0}, {0x22AC,0x22A2,0x338,0x0}, {0x22AD,0x22A8,0x338,0x0},334 {0x22AE, 0x22A9,0x338,0x0}, {0x22AF,0x22AB,0x338,0x0}, {0x22E0,0x227C,0x338,0x0},335 {0x22E1, 0x227D,0x338,0x0}, {0x22E2,0x2291,0x338,0x0}, {0x22E3,0x2292,0x338,0x0},336 {0x22EA, 0x22B2,0x338,0x0}, {0x22EB,0x22B3,0x338,0x0}, {0x22EC,0x22B4,0x338,0x0},337 {0x22ED, 0x22B5,0x338,0x0}, {0x2329,0x3008,0x0,0x0}, {0x232A,0x3009,0x0,0x0},338 {0x304C, 0x304B,0x3099,0x0}, {0x304E,0x304D,0x3099,0x0}, {0x3050,0x304F,0x3099,0x0},339 {0x3052, 0x3051,0x3099,0x0}, {0x3054,0x3053,0x3099,0x0}, {0x3056,0x3055,0x3099,0x0},340 {0x3058, 0x3057,0x3099,0x0}, {0x305A,0x3059,0x3099,0x0}, {0x305C,0x305B,0x3099,0x0},341 {0x305E, 0x305D,0x3099,0x0}, {0x3060,0x305F,0x3099,0x0}, {0x3062,0x3061,0x3099,0x0},342 {0x3065, 0x3064,0x3099,0x0}, {0x3067,0x3066,0x3099,0x0}, {0x3069,0x3068,0x3099,0x0},343 {0x3070, 0x306F,0x3099,0x0}, {0x3071,0x306F,0x309A,0x0}, {0x3073,0x3072,0x3099,0x0},344 {0x3074, 0x3072,0x309A,0x0}, {0x3076,0x3075,0x3099,0x0}, {0x3077,0x3075,0x309A,0x0},345 {0x3079, 0x3078,0x3099,0x0}, {0x307A,0x3078,0x309A,0x0}, {0x307C,0x307B,0x3099,0x0},346 {0x307D, 0x307B,0x309A,0x0}, {0x3094,0x3046,0x3099,0x0}, {0x309E,0x309D,0x3099,0x0},347 {0x30AC, 0x30AB,0x3099,0x0}, {0x30AE,0x30AD,0x3099,0x0}, {0x30B0,0x30AF,0x3099,0x0},348 {0x30B2, 0x30B1,0x3099,0x0}, {0x30B4,0x30B3,0x3099,0x0}, {0x30B6,0x30B5,0x3099,0x0},349 {0x30B8, 0x30B7,0x3099,0x0}, {0x30BA,0x30B9,0x3099,0x0}, {0x30BC,0x30BB,0x3099,0x0},350 {0x30BE, 0x30BD,0x3099,0x0}, {0x30C0,0x30BF,0x3099,0x0}, {0x30C2,0x30C1,0x3099,0x0},351 {0x30C5, 0x30C4,0x3099,0x0}, {0x30C7,0x30C6,0x3099,0x0}, {0x30C9,0x30C8,0x3099,0x0},352 {0x30D0, 0x30CF,0x3099,0x0}, {0x30D1,0x30CF,0x309A,0x0}, {0x30D3,0x30D2,0x3099,0x0},353 {0x30D4, 0x30D2,0x309A,0x0}, {0x30D6,0x30D5,0x3099,0x0}, {0x30D7,0x30D5,0x309A,0x0},354 {0x30D9, 0x30D8,0x3099,0x0}, {0x30DA,0x30D8,0x309A,0x0}, {0x30DC,0x30DB,0x3099,0x0},355 {0x30DD, 0x30DB,0x309A,0x0}, {0x30F4,0x30A6,0x3099,0x0}, {0x30F7,0x30EF,0x3099,0x0},356 {0x30F8, 0x30F0,0x3099,0x0}, {0x30F9,0x30F1,0x3099,0x0}, {0x30FA,0x30F2,0x3099,0x0},357 {0x30FE, 0x30FD,0x3099,0x0}, {0xF900,0x8C48,0x0,0x0}, {0xF901,0x66F4,0x0,0x0},358 {0xF902, 0x8ECA,0x0,0x0}, {0xF903,0x8CC8,0x0,0x0}, {0xF904,0x6ED1,0x0,0x0},359 {0xF905, 0x4E32,0x0,0x0}, {0xF906,0x53E5,0x0,0x0}, {0xF907,0x9F9C,0x0,0x0},360 {0xF908, 0x9F9C,0x0,0x0}, {0xF909,0x5951,0x0,0x0}, {0xF90A,0x91D1,0x0,0x0},361 {0xF90B, 0x5587,0x0,0x0}, {0xF90C,0x5948,0x0,0x0}, {0xF90D,0x61F6,0x0,0x0},362 {0xF90E, 0x7669,0x0,0x0}, {0xF90F,0x7F85,0x0,0x0}, {0xF910,0x863F,0x0,0x0},363 {0xF911, 0x87BA,0x0,0x0}, {0xF912,0x88F8,0x0,0x0}, {0xF913,0x908F,0x0,0x0},364 {0xF914, 0x6A02,0x0,0x0}, {0xF915,0x6D1B,0x0,0x0}, {0xF916,0x70D9,0x0,0x0},365 {0xF917, 0x73DE,0x0,0x0}, {0xF918,0x843D,0x0,0x0}, {0xF919,0x916A,0x0,0x0},366 {0xF91A, 0x99F1,0x0,0x0}, {0xF91B,0x4E82,0x0,0x0}, {0xF91C,0x5375,0x0,0x0},367 {0xF91D, 0x6B04,0x0,0x0}, {0xF91E,0x721B,0x0,0x0}, {0xF91F,0x862D,0x0,0x0},368 {0xF920, 0x9E1E,0x0,0x0}, {0xF921,0x5D50,0x0,0x0}, {0xF922,0x6FEB,0x0,0x0},369 {0xF923, 0x85CD,0x0,0x0}, {0xF924,0x8964,0x0,0x0}, {0xF925,0x62C9,0x0,0x0},370 {0xF926, 0x81D8,0x0,0x0}, {0xF927,0x881F,0x0,0x0}, {0xF928,0x5ECA,0x0,0x0},371 {0xF929, 0x6717,0x0,0x0}, {0xF92A,0x6D6A,0x0,0x0}, {0xF92B,0x72FC,0x0,0x0},372 {0xF92C, 0x90CE,0x0,0x0}, {0xF92D,0x4F86,0x0,0x0}, {0xF92E,0x51B7,0x0,0x0},373 {0xF92F, 0x52DE,0x0,0x0}, {0xF930,0x64C4,0x0,0x0}, {0xF931,0x6AD3,0x0,0x0},374 {0xF932, 0x7210,0x0,0x0}, {0xF933,0x76E7,0x0,0x0}, {0xF934,0x8001,0x0,0x0},375 {0xF935, 0x8606,0x0,0x0}, {0xF936,0x865C,0x0,0x0}, {0xF937,0x8DEF,0x0,0x0},376 {0xF938, 0x9732,0x0,0x0}, {0xF939,0x9B6F,0x0,0x0}, {0xF93A,0x9DFA,0x0,0x0},377 {0xF93B, 0x788C,0x0,0x0}, {0xF93C,0x797F,0x0,0x0}, {0xF93D,0x7DA0,0x0,0x0},378 {0xF93E, 0x83C9,0x0,0x0}, {0xF93F,0x9304,0x0,0x0}, {0xF940,0x9E7F,0x0,0x0},379 {0xF941, 0x8AD6,0x0,0x0}, {0xF942,0x58DF,0x0,0x0}, {0xF943,0x5F04,0x0,0x0},380 {0xF944, 0x7C60,0x0,0x0}, {0xF945,0x807E,0x0,0x0}, {0xF946,0x7262,0x0,0x0},381 {0xF947, 0x78CA,0x0,0x0}, {0xF948,0x8CC2,0x0,0x0}, {0xF949,0x96F7,0x0,0x0},382 {0xF94A, 0x58D8,0x0,0x0}, {0xF94B,0x5C62,0x0,0x0}, {0xF94C,0x6A13,0x0,0x0},383 {0xF94D, 0x6DDA,0x0,0x0}, {0xF94E,0x6F0F,0x0,0x0}, {0xF94F,0x7D2F,0x0,0x0},384 {0xF950, 0x7E37,0x0,0x0}, {0xF951,0x96FB,0x0,0x0}, {0xF952,0x52D2,0x0,0x0},385 {0xF953, 0x808B,0x0,0x0}, {0xF954,0x51DC,0x0,0x0}, {0xF955,0x51CC,0x0,0x0},386 {0xF956, 0x7A1C,0x0,0x0}, {0xF957,0x7DBE,0x0,0x0}, {0xF958,0x83F1,0x0,0x0},387 {0xF959, 0x9675,0x0,0x0}, {0xF95A,0x8B80,0x0,0x0}, {0xF95B,0x62CF,0x0,0x0},388 {0xF95C, 0x6A02,0x0,0x0}, {0xF95D,0x8AFE,0x0,0x0}, {0xF95E,0x4E39,0x0,0x0},389 {0xF95F, 0x5BE7,0x0,0x0}, {0xF960,0x6012,0x0,0x0}, {0xF961,0x7387,0x0,0x0},390 {0xF962, 0x7570,0x0,0x0}, {0xF963,0x5317,0x0,0x0}, {0xF964,0x78FB,0x0,0x0},391 {0xF965, 0x4FBF,0x0,0x0}, {0xF966,0x5FA9,0x0,0x0}, {0xF967,0x4E0D,0x0,0x0},392 {0xF968, 0x6CCC,0x0,0x0}, {0xF969,0x6578,0x0,0x0}, {0xF96A,0x7D22,0x0,0x0},393 {0xF96B, 0x53C3,0x0,0x0}, {0xF96C,0x585E,0x0,0x0}, {0xF96D,0x7701,0x0,0x0},394 {0xF96E, 0x8449,0x0,0x0}, {0xF96F,0x8AAA,0x0,0x0}, {0xF970,0x6BBA,0x0,0x0},395 {0xF971, 0x8FB0,0x0,0x0}, {0xF972,0x6C88,0x0,0x0}, {0xF973,0x62FE,0x0,0x0},396 {0xF974, 0x82E5,0x0,0x0}, {0xF975,0x63A0,0x0,0x0}, {0xF976,0x7565,0x0,0x0},397 {0xF977, 0x4EAE,0x0,0x0}, {0xF978,0x5169,0x0,0x0}, {0xF979,0x51C9,0x0,0x0},398 {0xF97A, 0x6881,0x0,0x0}, {0xF97B,0x7CE7,0x0,0x0}, {0xF97C,0x826F,0x0,0x0},399 {0xF97D, 0x8AD2,0x0,0x0}, {0xF97E,0x91CF,0x0,0x0}, {0xF97F,0x52F5,0x0,0x0},400 {0xF980, 0x5442,0x0,0x0}, {0xF981,0x5973,0x0,0x0}, {0xF982,0x5EEC,0x0,0x0},401 {0xF983, 0x65C5,0x0,0x0}, {0xF984,0x6FFE,0x0,0x0}, {0xF985,0x792A,0x0,0x0},402 {0xF986, 0x95AD,0x0,0x0}, {0xF987,0x9A6A,0x0,0x0}, {0xF988,0x9E97,0x0,0x0},403 {0xF989, 0x9ECE,0x0,0x0}, {0xF98A,0x529B,0x0,0x0}, {0xF98B,0x66C6,0x0,0x0},404 {0xF98C, 0x6B77,0x0,0x0}, {0xF98D,0x8F62,0x0,0x0}, {0xF98E,0x5E74,0x0,0x0},405 {0xF98F, 0x6190,0x0,0x0}, {0xF990,0x6200,0x0,0x0}, {0xF991,0x649A,0x0,0x0},406 {0xF992, 0x6F23,0x0,0x0}, {0xF993,0x7149,0x0,0x0}, {0xF994,0x7489,0x0,0x0},407 {0xF995, 0x79CA,0x0,0x0}, {0xF996,0x7DF4,0x0,0x0}, {0xF997,0x806F,0x0,0x0},408 {0xF998, 0x8F26,0x0,0x0}, {0xF999,0x84EE,0x0,0x0}, {0xF99A,0x9023,0x0,0x0},409 {0xF99B, 0x934A,0x0,0x0}, {0xF99C,0x5217,0x0,0x0}, {0xF99D,0x52A3,0x0,0x0},410 {0xF99E, 0x54BD,0x0,0x0}, {0xF99F,0x70C8,0x0,0x0}, {0xF9A0,0x88C2,0x0,0x0},411 {0xF9A1, 0x8AAA,0x0,0x0}, {0xF9A2,0x5EC9,0x0,0x0}, {0xF9A3,0x5FF5,0x0,0x0},412 {0xF9A4, 0x637B,0x0,0x0}, {0xF9A5,0x6BAE,0x0,0x0}, {0xF9A6,0x7C3E,0x0,0x0},413 {0xF9A7, 0x7375,0x0,0x0}, {0xF9A8,0x4EE4,0x0,0x0}, {0xF9A9,0x56F9,0x0,0x0},414 {0xF9AA, 0x5BE7,0x0,0x0}, {0xF9AB,0x5DBA,0x0,0x0}, {0xF9AC,0x601C,0x0,0x0},415 {0xF9AD, 0x73B2,0x0,0x0}, {0xF9AE,0x7469,0x0,0x0}, {0xF9AF,0x7F9A,0x0,0x0},416 {0xF9B0, 0x8046,0x0,0x0}, {0xF9B1,0x9234,0x0,0x0}, {0xF9B2,0x96F6,0x0,0x0},417 {0xF9B3, 0x9748,0x0,0x0}, {0xF9B4,0x9818,0x0,0x0}, {0xF9B5,0x4F8B,0x0,0x0},418 {0xF9B6, 0x79AE,0x0,0x0}, {0xF9B7,0x91B4,0x0,0x0}, {0xF9B8,0x96B8,0x0,0x0},419 {0xF9B9, 0x60E1,0x0,0x0}, {0xF9BA,0x4E86,0x0,0x0}, {0xF9BB,0x50DA,0x0,0x0},420 {0xF9BC, 0x5BEE,0x0,0x0}, {0xF9BD,0x5C3F,0x0,0x0}, {0xF9BE,0x6599,0x0,0x0},421 {0xF9BF, 0x6A02,0x0,0x0}, {0xF9C0,0x71CE,0x0,0x0}, {0xF9C1,0x7642,0x0,0x0},422 {0xF9C2, 0x84FC,0x0,0x0}, {0xF9C3,0x907C,0x0,0x0}, {0xF9C4,0x9F8D,0x0,0x0},423 {0xF9C5, 0x6688,0x0,0x0}, {0xF9C6,0x962E,0x0,0x0}, {0xF9C7,0x5289,0x0,0x0},424 {0xF9C8, 0x677B,0x0,0x0}, {0xF9C9,0x67F3,0x0,0x0}, {0xF9CA,0x6D41,0x0,0x0},425 {0xF9CB, 0x6E9C,0x0,0x0}, {0xF9CC,0x7409,0x0,0x0}, {0xF9CD,0x7559,0x0,0x0},426 {0xF9CE, 0x786B,0x0,0x0}, {0xF9CF,0x7D10,0x0,0x0}, {0xF9D0,0x985E,0x0,0x0},427 {0xF9D1, 0x516D,0x0,0x0}, {0xF9D2,0x622E,0x0,0x0}, {0xF9D3,0x9678,0x0,0x0},428 {0xF9D4, 0x502B,0x0,0x0}, {0xF9D5,0x5D19,0x0,0x0}, {0xF9D6,0x6DEA,0x0,0x0},429 {0xF9D7, 0x8F2A,0x0,0x0}, {0xF9D8,0x5F8B,0x0,0x0}, {0xF9D9,0x6144,0x0,0x0},430 {0xF9DA, 0x6817,0x0,0x0}, {0xF9DB,0x7387,0x0,0x0}, {0xF9DC,0x9686,0x0,0x0},431 {0xF9DD, 0x5229,0x0,0x0}, {0xF9DE,0x540F,0x0,0x0}, {0xF9DF,0x5C65,0x0,0x0},432 {0xF9E0, 0x6613,0x0,0x0}, {0xF9E1,0x674E,0x0,0x0}, {0xF9E2,0x68A8,0x0,0x0},433 {0xF9E3, 0x6CE5,0x0,0x0}, {0xF9E4,0x7406,0x0,0x0}, {0xF9E5,0x75E2,0x0,0x0},434 {0xF9E6, 0x7F79,0x0,0x0}, {0xF9E7,0x88CF,0x0,0x0}, {0xF9E8,0x88E1,0x0,0x0},435 {0xF9E9, 0x91CC,0x0,0x0}, {0xF9EA,0x96E2,0x0,0x0}, {0xF9EB,0x533F,0x0,0x0},436 {0xF9EC, 0x6EBA,0x0,0x0}, {0xF9ED,0x541D,0x0,0x0}, {0xF9EE,0x71D0,0x0,0x0},437 {0xF9EF, 0x7498,0x0,0x0}, {0xF9F0,0x85FA,0x0,0x0}, {0xF9F1,0x96A3,0x0,0x0},438 {0xF9F2, 0x9C57,0x0,0x0}, {0xF9F3,0x9E9F,0x0,0x0}, {0xF9F4,0x6797,0x0,0x0},439 {0xF9F5, 0x6DCB,0x0,0x0}, {0xF9F6,0x81E8,0x0,0x0}, {0xF9F7,0x7ACB,0x0,0x0},440 {0xF9F8, 0x7B20,0x0,0x0}, {0xF9F9,0x7C92,0x0,0x0}, {0xF9FA,0x72C0,0x0,0x0},441 {0xF9FB, 0x7099,0x0,0x0}, {0xF9FC,0x8B58,0x0,0x0}, {0xF9FD,0x4EC0,0x0,0x0},442 {0xF9FE, 0x8336,0x0,0x0}, {0xF9FF,0x523A,0x0,0x0}, {0xFA00,0x5207,0x0,0x0},443 {0xFA01, 0x5EA6,0x0,0x0}, {0xFA02,0x62D3,0x0,0x0}, {0xFA03,0x7CD6,0x0,0x0},444 {0xFA04, 0x5B85,0x0,0x0}, {0xFA05,0x6D1E,0x0,0x0}, {0xFA06,0x66B4,0x0,0x0},445 {0xFA07, 0x8F3B,0x0,0x0}, {0xFA08,0x884C,0x0,0x0}, {0xFA09,0x964D,0x0,0x0},446 {0xFA0A, 0x898B,0x0,0x0}, {0xFA0B,0x5ED3,0x0,0x0}, {0xFA0C,0x5140,0x0,0x0},447 {0xFA0D, 0x55C0,0x0,0x0}, {0xFA10,0x585A,0x0,0x0}, {0xFA12,0x6674,0x0,0x0},448 {0xFA15, 0x51DE,0x0,0x0}, {0xFA16,0x732A,0x0,0x0}, {0xFA17,0x76CA,0x0,0x0},449 {0xFA18, 0x793C,0x0,0x0}, {0xFA19,0x795E,0x0,0x0}, {0xFA1A,0x7965,0x0,0x0},450 {0xFA1B, 0x798F,0x0,0x0}, {0xFA1C,0x9756,0x0,0x0}, {0xFA1D,0x7CBE,0x0,0x0},451 {0xFA1E, 0x7FBD,0x0,0x0}, {0xFA20,0x8612,0x0,0x0}, {0xFA22,0x8AF8,0x0,0x0},452 {0xFA25, 0x9038,0x0,0x0}, {0xFA26,0x90FD,0x0,0x0}, {0xFA2A,0x98EF,0x0,0x0},453 {0xFA2B, 0x98FC,0x0,0x0}, {0xFA2C,0x9928,0x0,0x0}, {0xFA2D,0x9DB4,0x0,0x0},454 {0xFB1F, 0x5F2,0x5B7,0x0}, {0xFB2A,0x5E9,0x5C1,0x0}, {0xFB2B,0x5E9,0x5C2,0x0},455 {0xFB2C, 0x5E9,0x5BC,0x5C1}, {0xFB2D,0x5E9,0x5BC,0x5C2}, {0xFB2E,0x5D0,0x5B7,0x0},456 {0xFB2F, 0x5D0,0x5B8,0x0}, {0xFB30,0x5D0,0x5BC,0x0}, {0xFB31,0x5D1,0x5BC,0x0},457 {0xFB32, 0x5D2,0x5BC,0x0}, {0xFB33,0x5D3,0x5BC,0x0}, {0xFB34,0x5D4,0x5BC,0x0},458 {0xFB35, 0x5D5,0x5BC,0x0}, {0xFB36,0x5D6,0x5BC,0x0}, {0xFB38,0x5D8,0x5BC,0x0},459 {0xFB39, 0x5D9,0x5BC,0x0}, {0xFB3A,0x5DA,0x5BC,0x0}, {0xFB3B,0x5DB,0x5BC,0x0},460 {0xFB3C, 0x5DC,0x5BC,0x0}, {0xFB3E,0x5DE,0x5BC,0x0}, {0xFB40,0x5E0,0x5BC,0x0},461 {0xFB41, 0x5E1,0x5BC,0x0}, {0xFB43,0x5E3,0x5BC,0x0}, {0xFB44,0x5E4,0x5BC,0x0},462 {0xFB46, 0x5E6,0x5BC,0x0}, {0xFB47,0x5E7,0x5BC,0x0}, {0xFB48,0x5E8,0x5BC,0x0},463 {0xFB49, 0x5E9,0x5BC,0x0}, {0xFB4A,0x5EA,0x5BC,0x0}, {0xFB4B,0x5D5,0x5B9,0x0},464 {0xFB4C, 0x5D1,0x5BF,0x0}, {0xFB4D,0x5DB,0x5BF,0x0}, {0xFB4E,0x5E4,0x5BF,0x0}42 {0xC0,{0x41,0x300,0x0}}, {0xC1,{0x41,0x301,0x0}}, {0xC2,{0x41,0x302,0x0}}, 43 {0xC3,{0x41,0x303,0x0}}, {0xC4,{0x41,0x308,0x0}}, {0xC5,{0x41,0x30A,0x0}}, 44 {0xC7,{0x43,0x327,0x0}}, {0xC8,{0x45,0x300,0x0}}, {0xC9,{0x45,0x301,0x0}}, 45 {0xCA,{0x45,0x302,0x0}}, {0xCB,{0x45,0x308,0x0}}, {0xCC,{0x49,0x300,0x0}}, 46 {0xCD,{0x49,0x301,0x0}}, {0xCE,{0x49,0x302,0x0}}, {0xCF,{0x49,0x308,0x0}}, 47 {0xD1,{0x4E,0x303,0x0}}, {0xD2,{0x4F,0x300,0x0}}, {0xD3,{0x4F,0x301,0x0}}, 48 {0xD4,{0x4F,0x302,0x0}}, {0xD5,{0x4F,0x303,0x0}}, {0xD6,{0x4F,0x308,0x0}}, 49 {0xD9,{0x55,0x300,0x0}}, {0xDA,{0x55,0x301,0x0}}, {0xDB,{0x55,0x302,0x0}}, 50 {0xDC,{0x55,0x308,0x0}}, {0xDD,{0x59,0x301,0x0}}, {0xE0,{0x61,0x300,0x0}}, 51 {0xE1,{0x61,0x301,0x0}}, {0xE2,{0x61,0x302,0x0}}, {0xE3,{0x61,0x303,0x0}}, 52 {0xE4,{0x61,0x308,0x0}}, {0xE5,{0x61,0x30A,0x0}}, {0xE7,{0x63,0x327,0x0}}, 53 {0xE8,{0x65,0x300,0x0}}, {0xE9,{0x65,0x301,0x0}}, {0xEA,{0x65,0x302,0x0}}, 54 {0xEB,{0x65,0x308,0x0}}, {0xEC,{0x69,0x300,0x0}}, {0xED,{0x69,0x301,0x0}}, 55 {0xEE,{0x69,0x302,0x0}}, {0xEF,{0x69,0x308,0x0}}, {0xF1,{0x6E,0x303,0x0}}, 56 {0xF2,{0x6F,0x300,0x0}}, {0xF3,{0x6F,0x301,0x0}}, {0xF4,{0x6F,0x302,0x0}}, 57 {0xF5,{0x6F,0x303,0x0}}, {0xF6,{0x6F,0x308,0x0}}, {0xF9,{0x75,0x300,0x0}}, 58 {0xFA,{0x75,0x301,0x0}}, {0xFB,{0x75,0x302,0x0}}, {0xFC,{0x75,0x308,0x0}}, 59 {0xFD,{0x79,0x301,0x0}}, {0xFF,{0x79,0x308,0x0}}, {0x100,{0x41,0x304,0x0}}, 60 {0x101,{0x61,0x304,0x0}}, {0x102,{0x41,0x306,0x0}}, {0x103,{0x61,0x306,0x0}}, 61 {0x104,{0x41,0x328,0x0}}, {0x105,{0x61,0x328,0x0}}, {0x106,{0x43,0x301,0x0}}, 62 {0x107,{0x63,0x301,0x0}}, {0x108,{0x43,0x302,0x0}}, {0x109,{0x63,0x302,0x0}}, 63 {0x10A,{0x43,0x307,0x0}}, {0x10B,{0x63,0x307,0x0}}, {0x10C,{0x43,0x30C,0x0}}, 64 {0x10D,{0x63,0x30C,0x0}}, {0x10E,{0x44,0x30C,0x0}}, {0x10F,{0x64,0x30C,0x0}}, 65 {0x112,{0x45,0x304,0x0}}, {0x113,{0x65,0x304,0x0}}, {0x114,{0x45,0x306,0x0}}, 66 {0x115,{0x65,0x306,0x0}}, {0x116,{0x45,0x307,0x0}}, {0x117,{0x65,0x307,0x0}}, 67 {0x118,{0x45,0x328,0x0}}, {0x119,{0x65,0x328,0x0}}, {0x11A,{0x45,0x30C,0x0}}, 68 {0x11B,{0x65,0x30C,0x0}}, {0x11C,{0x47,0x302,0x0}}, {0x11D,{0x67,0x302,0x0}}, 69 {0x11E,{0x47,0x306,0x0}}, {0x11F,{0x67,0x306,0x0}}, {0x120,{0x47,0x307,0x0}}, 70 {0x121,{0x67,0x307,0x0}}, {0x122,{0x47,0x327,0x0}}, {0x123,{0x67,0x327,0x0}}, 71 {0x124,{0x48,0x302,0x0}}, {0x125,{0x68,0x302,0x0}}, {0x128,{0x49,0x303,0x0}}, 72 {0x129,{0x69,0x303,0x0}}, {0x12A,{0x49,0x304,0x0}}, {0x12B,{0x69,0x304,0x0}}, 73 {0x12C,{0x49,0x306,0x0}}, {0x12D,{0x69,0x306,0x0}}, {0x12E,{0x49,0x328,0x0}}, 74 {0x12F,{0x69,0x328,0x0}}, {0x130,{0x49,0x307,0x0}}, {0x134,{0x4A,0x302,0x0}}, 75 {0x135,{0x6A,0x302,0x0}}, {0x136,{0x4B,0x327,0x0}}, {0x137,{0x6B,0x327,0x0}}, 76 {0x139,{0x4C,0x301,0x0}}, {0x13A,{0x6C,0x301,0x0}}, {0x13B,{0x4C,0x327,0x0}}, 77 {0x13C,{0x6C,0x327,0x0}}, {0x13D,{0x4C,0x30C,0x0}}, {0x13E,{0x6C,0x30C,0x0}}, 78 {0x143,{0x4E,0x301,0x0}}, {0x144,{0x6E,0x301,0x0}}, {0x145,{0x4E,0x327,0x0}}, 79 {0x146,{0x6E,0x327,0x0}}, {0x147,{0x4E,0x30C,0x0}}, {0x148,{0x6E,0x30C,0x0}}, 80 {0x14C,{0x4F,0x304,0x0}}, {0x14D,{0x6F,0x304,0x0}}, {0x14E,{0x4F,0x306,0x0}}, 81 {0x14F,{0x6F,0x306,0x0}}, {0x150,{0x4F,0x30B,0x0}}, {0x151,{0x6F,0x30B,0x0}}, 82 {0x154,{0x52,0x301,0x0}}, {0x155,{0x72,0x301,0x0}}, {0x156,{0x52,0x327,0x0}}, 83 {0x157,{0x72,0x327,0x0}}, {0x158,{0x52,0x30C,0x0}}, {0x159,{0x72,0x30C,0x0}}, 84 {0x15A,{0x53,0x301,0x0}}, {0x15B,{0x73,0x301,0x0}}, {0x15C,{0x53,0x302,0x0}}, 85 {0x15D,{0x73,0x302,0x0}}, {0x15E,{0x53,0x327,0x0}}, {0x15F,{0x73,0x327,0x0}}, 86 {0x160,{0x53,0x30C,0x0}}, {0x161,{0x73,0x30C,0x0}}, {0x162,{0x54,0x327,0x0}}, 87 {0x163,{0x74,0x327,0x0}}, {0x164,{0x54,0x30C,0x0}}, {0x165,{0x74,0x30C,0x0}}, 88 {0x168,{0x55,0x303,0x0}}, {0x169,{0x75,0x303,0x0}}, {0x16A,{0x55,0x304,0x0}}, 89 {0x16B,{0x75,0x304,0x0}}, {0x16C,{0x55,0x306,0x0}}, {0x16D,{0x75,0x306,0x0}}, 90 {0x16E,{0x55,0x30A,0x0}}, {0x16F,{0x75,0x30A,0x0}}, {0x170,{0x55,0x30B,0x0}}, 91 {0x171,{0x75,0x30B,0x0}}, {0x172,{0x55,0x328,0x0}}, {0x173,{0x75,0x328,0x0}}, 92 {0x174,{0x57,0x302,0x0}}, {0x175,{0x77,0x302,0x0}}, {0x176,{0x59,0x302,0x0}}, 93 {0x177,{0x79,0x302,0x0}}, {0x178,{0x59,0x308,0x0}}, {0x179,{0x5A,0x301,0x0}}, 94 {0x17A,{0x7A,0x301,0x0}}, {0x17B,{0x5A,0x307,0x0}}, {0x17C,{0x7A,0x307,0x0}}, 95 {0x17D,{0x5A,0x30C,0x0}}, {0x17E,{0x7A,0x30C,0x0}}, {0x1A0,{0x4F,0x31B,0x0}}, 96 {0x1A1,{0x6F,0x31B,0x0}}, {0x1AF,{0x55,0x31B,0x0}}, {0x1B0,{0x75,0x31B,0x0}}, 97 {0x1CD,{0x41,0x30C,0x0}}, {0x1CE,{0x61,0x30C,0x0}}, {0x1CF,{0x49,0x30C,0x0}}, 98 {0x1D0,{0x69,0x30C,0x0}}, {0x1D1,{0x4F,0x30C,0x0}}, {0x1D2,{0x6F,0x30C,0x0}}, 99 {0x1D3,{0x55,0x30C,0x0}}, {0x1D4,{0x75,0x30C,0x0}}, {0x1D5,{0xDC,0x304,0x0}}, 100 {0x1D6,{0xFC,0x304,0x0}}, {0x1D7,{0xDC,0x301,0x0}}, {0x1D8,{0xFC,0x301,0x0}}, 101 {0x1D9,{0xDC,0x30C,0x0}}, {0x1DA,{0xFC,0x30C,0x0}}, {0x1DB,{0xDC,0x300,0x0}}, 102 {0x1DC,{0xFC,0x300,0x0}}, {0x1DE,{0xC4,0x304,0x0}}, {0x1DF,{0xE4,0x304,0x0}}, 103 {0x1E0,{0x41,0x307,0x304}}, {0x1E1,{0x61,0x307,0x304}}, {0x1E2,{0xC6,0x304,0x0}}, 104 {0x1E3,{0xE6,0x304,0x0}}, {0x1E6,{0x47,0x30C,0x0}}, {0x1E7,{0x67,0x30C,0x0}}, 105 {0x1E8,{0x4B,0x30C,0x0}}, {0x1E9,{0x6B,0x30C,0x0}}, {0x1EA,{0x4F,0x328,0x0}}, 106 {0x1EB,{0x6F,0x328,0x0}}, {0x1EC,{0x1EA,0x304,0x0}}, {0x1ED,{0x1EB,0x304,0x0}}, 107 {0x1EE,{0x1B7,0x30C,0x0}}, {0x1EF,{0x292,0x30C,0x0}}, {0x1F0,{0x6A,0x30C,0x0}}, 108 {0x1F4,{0x47,0x301,0x0}}, {0x1F5,{0x67,0x301,0x0}}, {0x1FA,{0xC5,0x301,0x0}}, 109 {0x1FB,{0xE5,0x301,0x0}}, {0x1FC,{0xC6,0x301,0x0}}, {0x1FD,{0xE6,0x301,0x0}}, 110 {0x1FE,{0xD8,0x301,0x0}}, {0x1FF,{0xF8,0x301,0x0}}, {0x200,{0x41,0x30F,0x0}}, 111 {0x201,{0x61,0x30F,0x0}}, {0x202,{0x41,0x311,0x0}}, {0x203,{0x61,0x311,0x0}}, 112 {0x204,{0x45,0x30F,0x0}}, {0x205,{0x65,0x30F,0x0}}, {0x206,{0x45,0x311,0x0}}, 113 {0x207,{0x65,0x311,0x0}}, {0x208,{0x49,0x30F,0x0}}, {0x209,{0x69,0x30F,0x0}}, 114 {0x20A,{0x49,0x311,0x0}}, {0x20B,{0x69,0x311,0x0}}, {0x20C,{0x4F,0x30F,0x0}}, 115 {0x20D,{0x6F,0x30F,0x0}}, {0x20E,{0x4F,0x311,0x0}}, {0x20F,{0x6F,0x311,0x0}}, 116 {0x210,{0x52,0x30F,0x0}}, {0x211,{0x72,0x30F,0x0}}, {0x212,{0x52,0x311,0x0}}, 117 {0x213,{0x72,0x311,0x0}}, {0x214,{0x55,0x30F,0x0}}, {0x215,{0x75,0x30F,0x0}}, 118 {0x216,{0x55,0x311,0x0}}, {0x217,{0x75,0x311,0x0}}, {0x310,{0x306,0x307,0x0}}, 119 {0x340,{0x300,0x0,0x0}}, {0x341,{0x301,0x0,0x0}}, {0x343,{0x313,0x0,0x0}}, 120 {0x344,{0x308,0x30D,0x0}}, {0x374,{0x2B9,0x0,0x0}}, {0x37E,{0x3B,0x0,0x0}}, 121 {0x385,{0xA8,0x30D,0x0}}, {0x386,{0x391,0x30D,0x0}}, {0x387,{0xB7,0x0,0x0}}, 122 {0x388,{0x395,0x30D,0x0}}, {0x389,{0x397,0x30D,0x0}}, {0x38A,{0x399,0x30D,0x0}}, 123 {0x38C,{0x39F,0x30D,0x0}}, {0x38E,{0x3A5,0x30D,0x0}}, {0x38F,{0x3A9,0x30D,0x0}}, 124 {0x390,{0x3B9,0x344,0x0}}, {0x3AA,{0x399,0x308,0x0}}, {0x3AB,{0x3A5,0x308,0x0}}, 125 {0x3AC,{0x3B1,0x30D,0x0}}, {0x3AD,{0x3B5,0x30D,0x0}}, {0x3AE,{0x3B7,0x30D,0x0}}, 126 {0x3AF,{0x3B9,0x30D,0x0}}, {0x3B0,{0x3C5,0x344,0x0}}, {0x3CA,{0x3B9,0x308,0x0}}, 127 {0x3CB,{0x3C5,0x308,0x0}}, {0x3CC,{0x3BF,0x30D,0x0}}, {0x3CD,{0x3C5,0x30D,0x0}}, 128 {0x3CE,{0x3C9,0x30D,0x0}}, {0x3D3,{0x3D2,0x30D,0x0}}, {0x3D4,{0x3D2,0x308,0x0}}, 129 {0x401,{0x415,0x308,0x0}}, {0x403,{0x413,0x301,0x0}}, {0x407,{0x406,0x308,0x0}}, 130 {0x40C,{0x41A,0x301,0x0}}, {0x40E,{0x423,0x306,0x0}}, {0x419,{0x418,0x306,0x0}}, 131 {0x439,{0x438,0x306,0x0}}, {0x451,{0x435,0x308,0x0}}, {0x453,{0x433,0x301,0x0}}, 132 {0x457,{0x456,0x308,0x0}}, {0x45C,{0x43A,0x301,0x0}}, {0x45E,{0x443,0x306,0x0}}, 133 {0x476,{0x474,0x30F,0x0}}, {0x477,{0x475,0x30F,0x0}}, {0x4C1,{0x416,0x306,0x0}}, 134 {0x4C2,{0x436,0x306,0x0}}, {0x4D0,{0x410,0x306,0x0}}, {0x4D1,{0x430,0x306,0x0}}, 135 {0x4D2,{0x410,0x308,0x0}}, {0x4D3,{0x430,0x308,0x0}}, {0x4D6,{0x415,0x306,0x0}}, 136 {0x4D7,{0x435,0x306,0x0}}, {0x4DA,{0x4D8,0x308,0x0}}, {0x4DB,{0x4D9,0x308,0x0}}, 137 {0x4DC,{0x416,0x308,0x0}}, {0x4DD,{0x436,0x308,0x0}}, {0x4DE,{0x417,0x308,0x0}}, 138 {0x4DF,{0x437,0x308,0x0}}, {0x4E2,{0x418,0x304,0x0}}, {0x4E3,{0x438,0x304,0x0}}, 139 {0x4E4,{0x418,0x308,0x0}}, {0x4E5,{0x438,0x308,0x0}}, {0x4E6,{0x41E,0x308,0x0}}, 140 {0x4E7,{0x43E,0x308,0x0}}, {0x4EA,{0x4E8,0x308,0x0}}, {0x4EB,{0x4E9,0x308,0x0}}, 141 {0x4EE,{0x423,0x304,0x0}}, {0x4EF,{0x443,0x304,0x0}}, {0x4F0,{0x423,0x308,0x0}}, 142 {0x4F1,{0x443,0x308,0x0}}, {0x4F2,{0x423,0x30B,0x0}}, {0x4F3,{0x443,0x30B,0x0}}, 143 {0x4F4,{0x427,0x308,0x0}}, {0x4F5,{0x447,0x308,0x0}}, {0x4F8,{0x42B,0x308,0x0}}, 144 {0x4F9,{0x44B,0x308,0x0}}, {0x929,{0x928,0x93C,0x0}}, {0x931,{0x930,0x93C,0x0}}, 145 {0x934,{0x933,0x93C,0x0}}, {0x958,{0x915,0x93C,0x0}}, {0x959,{0x916,0x93C,0x0}}, 146 {0x95A,{0x917,0x93C,0x0}}, {0x95B,{0x91C,0x93C,0x0}}, {0x95C,{0x921,0x93C,0x0}}, 147 {0x95D,{0x922,0x93C,0x0}}, {0x95E,{0x92B,0x93C,0x0}}, {0x95F,{0x92F,0x93C,0x0}}, 148 {0x9B0,{0x9AC,0x9BC,0x0}}, {0x9CB,{0x9C7,0x9BE,0x0}}, {0x9CC,{0x9C7,0x9D7,0x0}}, 149 {0x9DC,{0x9A1,0x9BC,0x0}}, {0x9DD,{0x9A2,0x9BC,0x0}}, {0x9DF,{0x9AF,0x9BC,0x0}}, 150 {0xA59,{0xA16,0xA3C,0x0}}, {0xA5A,{0xA17,0xA3C,0x0}}, {0xA5B,{0xA1C,0xA3C,0x0}}, 151 {0xA5C,{0xA21,0xA3C,0x0}}, {0xA5E,{0xA2B,0xA3C,0x0}}, {0xB48,{0xB47,0xB56,0x0}}, 152 {0xB4B,{0xB47,0xB3E,0x0}}, {0xB4C,{0xB47,0xB57,0x0}}, {0xB5C,{0xB21,0xB3C,0x0}}, 153 {0xB5D,{0xB22,0xB3C,0x0}}, {0xB5F,{0xB2F,0xB3C,0x0}}, {0xB94,{0xB92,0xBD7,0x0}}, 154 {0xBCA,{0xBC6,0xBBE,0x0}}, {0xBCB,{0xBC7,0xBBE,0x0}}, {0xBCC,{0xBC6,0xBD7,0x0}}, 155 {0xC48,{0xC46,0xC56,0x0}}, {0xCC0,{0xCBF,0xCD5,0x0}}, {0xCC7,{0xCC6,0xCD5,0x0}}, 156 {0xCC8,{0xCC6,0xCD6,0x0}}, {0xCCA,{0xCC6,0xCC2,0x0}}, {0xCCB,{0xCC6,0xCC2,0xCD5}}, 157 {0xD4A,{0xD46,0xD3E,0x0}}, {0xD4B,{0xD47,0xD3E,0x0}}, {0xD4C,{0xD46,0xD57,0x0}}, 158 {0xE33,{0xE4D,0xE32,0x0}}, {0xEB3,{0xECD,0xEB2,0x0}}, {0xF43,{0xF42,0xFB7,0x0}}, 159 {0xF4D,{0xF4C,0xFB7,0x0}}, {0xF52,{0xF51,0xFB7,0x0}}, {0xF57,{0xF56,0xFB7,0x0}}, 160 {0xF5C,{0xF5B,0xFB7,0x0}}, {0xF69,{0xF40,0xFB5,0x0}}, {0xF73,{0xF72,0xF71,0x0}}, 161 {0xF75,{0xF71,0xF74,0x0}}, {0xF76,{0xFB2,0xF80,0x0}}, {0xF77,{0xF76,0xF71,0x0}}, 162 {0xF78,{0xFB3,0xF80,0x0}}, {0xF79,{0xF78,0xF71,0x0}}, {0xF81,{0xF80,0xF71,0x0}}, 163 {0xF93,{0xF92,0xFB7,0x0}}, {0xF9D,{0xF9C,0xFB7,0x0}}, {0xFA2,{0xFA1,0xFB7,0x0}}, 164 {0xFA7,{0xFA6,0xFB7,0x0}}, {0xFAC,{0xFAB,0xFB7,0x0}}, {0xFB9,{0xF90,0xFB5,0x0}}, 165 {0x1E00,{0x41,0x325,0x0}}, {0x1E01,{0x61,0x325,0x0}}, {0x1E02,{0x42,0x307,0x0}}, 166 {0x1E03,{0x62,0x307,0x0}}, {0x1E04,{0x42,0x323,0x0}}, {0x1E05,{0x62,0x323,0x0}}, 167 {0x1E06,{0x42,0x331,0x0}}, {0x1E07,{0x62,0x331,0x0}}, {0x1E08,{0xC7,0x301,0x0}}, 168 {0x1E09,{0xE7,0x301,0x0}}, {0x1E0A,{0x44,0x307,0x0}}, {0x1E0B,{0x64,0x307,0x0}}, 169 {0x1E0C,{0x44,0x323,0x0}}, {0x1E0D,{0x64,0x323,0x0}}, {0x1E0E,{0x44,0x331,0x0}}, 170 {0x1E0F,{0x64,0x331,0x0}}, {0x1E10,{0x44,0x327,0x0}}, {0x1E11,{0x64,0x327,0x0}}, 171 {0x1E12,{0x44,0x32D,0x0}}, {0x1E13,{0x64,0x32D,0x0}}, {0x1E14,{0x112,0x300,0x0}}, 172 {0x1E15,{0x113,0x300,0x0}}, {0x1E16,{0x112,0x301,0x0}}, {0x1E17,{0x113,0x301,0x0}}, 173 {0x1E18,{0x45,0x32D,0x0}}, {0x1E19,{0x65,0x32D,0x0}}, {0x1E1A,{0x45,0x330,0x0}}, 174 {0x1E1B,{0x65,0x330,0x0}}, {0x1E1C,{0x114,0x327,0x0}}, {0x1E1D,{0x115,0x327,0x0}}, 175 {0x1E1E,{0x46,0x307,0x0}}, {0x1E1F,{0x66,0x307,0x0}}, {0x1E20,{0x47,0x304,0x0}}, 176 {0x1E21,{0x67,0x304,0x0}}, {0x1E22,{0x48,0x307,0x0}}, {0x1E23,{0x68,0x307,0x0}}, 177 {0x1E24,{0x48,0x323,0x0}}, {0x1E25,{0x68,0x323,0x0}}, {0x1E26,{0x48,0x308,0x0}}, 178 {0x1E27,{0x68,0x308,0x0}}, {0x1E28,{0x48,0x327,0x0}}, {0x1E29,{0x68,0x327,0x0}}, 179 {0x1E2A,{0x48,0x32E,0x0}}, {0x1E2B,{0x68,0x32E,0x0}}, {0x1E2C,{0x49,0x330,0x0}}, 180 {0x1E2D,{0x69,0x330,0x0}}, {0x1E2E,{0xCF,0x301,0x0}}, {0x1E2F,{0xEF,0x301,0x0}}, 181 {0x1E30,{0x4B,0x301,0x0}}, {0x1E31,{0x6B,0x301,0x0}}, {0x1E32,{0x4B,0x323,0x0}}, 182 {0x1E33,{0x6B,0x323,0x0}}, {0x1E34,{0x4B,0x331,0x0}}, {0x1E35,{0x6B,0x331,0x0}}, 183 {0x1E36,{0x4C,0x323,0x0}}, {0x1E37,{0x6C,0x323,0x0}}, {0x1E38,{0x1E36,0x304,0x0}}, 184 {0x1E39,{0x1E37,0x304,0x0}}, {0x1E3A,{0x4C,0x331,0x0}}, {0x1E3B,{0x6C,0x331,0x0}}, 185 {0x1E3C,{0x4C,0x32D,0x0}}, {0x1E3D,{0x6C,0x32D,0x0}}, {0x1E3E,{0x4D,0x301,0x0}}, 186 {0x1E3F,{0x6D,0x301,0x0}}, {0x1E40,{0x4D,0x307,0x0}}, {0x1E41,{0x6D,0x307,0x0}}, 187 {0x1E42,{0x4D,0x323,0x0}}, {0x1E43,{0x6D,0x323,0x0}}, {0x1E44,{0x4E,0x307,0x0}}, 188 {0x1E45,{0x6E,0x307,0x0}}, {0x1E46,{0x4E,0x323,0x0}}, {0x1E47,{0x6E,0x323,0x0}}, 189 {0x1E48,{0x4E,0x331,0x0}}, {0x1E49,{0x6E,0x331,0x0}}, {0x1E4A,{0x4E,0x32D,0x0}}, 190 {0x1E4B,{0x6E,0x32D,0x0}}, {0x1E4C,{0xD5,0x301,0x0}}, {0x1E4D,{0xF5,0x301,0x0}}, 191 {0x1E4E,{0xD5,0x308,0x0}}, {0x1E4F,{0xF5,0x308,0x0}}, {0x1E50,{0x14C,0x300,0x0}}, 192 {0x1E51,{0x14D,0x300,0x0}}, {0x1E52,{0x14C,0x301,0x0}}, {0x1E53,{0x14D,0x301,0x0}}, 193 {0x1E54,{0x50,0x301,0x0}}, {0x1E55,{0x70,0x301,0x0}}, {0x1E56,{0x50,0x307,0x0}}, 194 {0x1E57,{0x70,0x307,0x0}}, {0x1E58,{0x52,0x307,0x0}}, {0x1E59,{0x72,0x307,0x0}}, 195 {0x1E5A,{0x52,0x323,0x0}}, {0x1E5B,{0x72,0x323,0x0}}, {0x1E5C,{0x1E5A,0x304,0x0}}, 196 {0x1E5D,{0x1E5B,0x304,0x0}}, {0x1E5E,{0x52,0x331,0x0}}, {0x1E5F,{0x72,0x331,0x0}}, 197 {0x1E60,{0x53,0x307,0x0}}, {0x1E61,{0x73,0x307,0x0}}, {0x1E62,{0x53,0x323,0x0}}, 198 {0x1E63,{0x73,0x323,0x0}}, {0x1E64,{0x15A,0x307,0x0}}, {0x1E65,{0x15B,0x307,0x0}}, 199 {0x1E66,{0x160,0x307,0x0}}, {0x1E67,{0x161,0x307,0x0}}, {0x1E68,{0x1E62,0x307,0x0}}, 200 {0x1E69,{0x1E63,0x307,0x0}}, {0x1E6A,{0x54,0x307,0x0}}, {0x1E6B,{0x74,0x307,0x0}}, 201 {0x1E6C,{0x54,0x323,0x0}}, {0x1E6D,{0x74,0x323,0x0}}, {0x1E6E,{0x54,0x331,0x0}}, 202 {0x1E6F,{0x74,0x331,0x0}}, {0x1E70,{0x54,0x32D,0x0}}, {0x1E71,{0x74,0x32D,0x0}}, 203 {0x1E72,{0x55,0x324,0x0}}, {0x1E73,{0x75,0x324,0x0}}, {0x1E74,{0x55,0x330,0x0}}, 204 {0x1E75,{0x75,0x330,0x0}}, {0x1E76,{0x55,0x32D,0x0}}, {0x1E77,{0x75,0x32D,0x0}}, 205 {0x1E78,{0x168,0x301,0x0}}, {0x1E79,{0x169,0x301,0x0}}, {0x1E7A,{0x16A,0x308,0x0}}, 206 {0x1E7B,{0x16B,0x308,0x0}}, {0x1E7C,{0x56,0x303,0x0}}, {0x1E7D,{0x76,0x303,0x0}}, 207 {0x1E7E,{0x56,0x323,0x0}}, {0x1E7F,{0x76,0x323,0x0}}, {0x1E80,{0x57,0x300,0x0}}, 208 {0x1E81,{0x77,0x300,0x0}}, {0x1E82,{0x57,0x301,0x0}}, {0x1E83,{0x77,0x301,0x0}}, 209 {0x1E84,{0x57,0x308,0x0}}, {0x1E85,{0x77,0x308,0x0}}, {0x1E86,{0x57,0x307,0x0}}, 210 {0x1E87,{0x77,0x307,0x0}}, {0x1E88,{0x57,0x323,0x0}}, {0x1E89,{0x77,0x323,0x0}}, 211 {0x1E8A,{0x58,0x307,0x0}}, {0x1E8B,{0x78,0x307,0x0}}, {0x1E8C,{0x58,0x308,0x0}}, 212 {0x1E8D,{0x78,0x308,0x0}}, {0x1E8E,{0x59,0x307,0x0}}, {0x1E8F,{0x79,0x307,0x0}}, 213 {0x1E90,{0x5A,0x302,0x0}}, {0x1E91,{0x7A,0x302,0x0}}, {0x1E92,{0x5A,0x323,0x0}}, 214 {0x1E93,{0x7A,0x323,0x0}}, {0x1E94,{0x5A,0x331,0x0}}, {0x1E95,{0x7A,0x331,0x0}}, 215 {0x1E96,{0x68,0x331,0x0}}, {0x1E97,{0x74,0x308,0x0}}, {0x1E98,{0x77,0x30A,0x0}}, 216 {0x1E99,{0x79,0x30A,0x0}}, {0x1E9B,{0x17F,0x307,0x0}}, {0x1EA0,{0x41,0x323,0x0}}, 217 {0x1EA1,{0x61,0x323,0x0}}, {0x1EA2,{0x41,0x309,0x0}}, {0x1EA3,{0x61,0x309,0x0}}, 218 {0x1EA4,{0xC2,0x301,0x0}}, {0x1EA5,{0xE2,0x301,0x0}}, {0x1EA6,{0xC2,0x300,0x0}}, 219 {0x1EA7,{0xE2,0x300,0x0}}, {0x1EA8,{0xC2,0x309,0x0}}, {0x1EA9,{0xE2,0x309,0x0}}, 220 {0x1EAA,{0xC2,0x303,0x0}}, {0x1EAB,{0xE2,0x303,0x0}}, {0x1EAC,{0xC2,0x323,0x0}}, 221 {0x1EAD,{0xE2,0x323,0x0}}, {0x1EAE,{0x102,0x301,0x0}}, {0x1EAF,{0x103,0x301,0x0}}, 222 {0x1EB0,{0x102,0x300,0x0}}, {0x1EB1,{0x103,0x300,0x0}}, {0x1EB2,{0x102,0x309,0x0}}, 223 {0x1EB3,{0x103,0x309,0x0}}, {0x1EB4,{0x102,0x303,0x0}}, {0x1EB5,{0x103,0x303,0x0}}, 224 {0x1EB6,{0x102,0x323,0x0}}, {0x1EB7,{0x103,0x323,0x0}}, {0x1EB8,{0x45,0x323,0x0}}, 225 {0x1EB9,{0x65,0x323,0x0}}, {0x1EBA,{0x45,0x309,0x0}}, {0x1EBB,{0x65,0x309,0x0}}, 226 {0x1EBC,{0x45,0x303,0x0}}, {0x1EBD,{0x65,0x303,0x0}}, {0x1EBE,{0xCA,0x301,0x0}}, 227 {0x1EBF,{0xEA,0x301,0x0}}, {0x1EC0,{0xCA,0x300,0x0}}, {0x1EC1,{0xEA,0x300,0x0}}, 228 {0x1EC2,{0xCA,0x309,0x0}}, {0x1EC3,{0xEA,0x309,0x0}}, {0x1EC4,{0xCA,0x303,0x0}}, 229 {0x1EC5,{0xEA,0x303,0x0}}, {0x1EC6,{0xCA,0x323,0x0}}, {0x1EC7,{0xEA,0x323,0x0}}, 230 {0x1EC8,{0x49,0x309,0x0}}, {0x1EC9,{0x69,0x309,0x0}}, {0x1ECA,{0x49,0x323,0x0}}, 231 {0x1ECB,{0x69,0x323,0x0}}, {0x1ECC,{0x4F,0x323,0x0}}, {0x1ECD,{0x6F,0x323,0x0}}, 232 {0x1ECE,{0x4F,0x309,0x0}}, {0x1ECF,{0x6F,0x309,0x0}}, {0x1ED0,{0xD4,0x301,0x0}}, 233 {0x1ED1,{0xF4,0x301,0x0}}, {0x1ED2,{0xD4,0x300,0x0}}, {0x1ED3,{0xF4,0x300,0x0}}, 234 {0x1ED4,{0xD4,0x309,0x0}}, {0x1ED5,{0xF4,0x309,0x0}}, {0x1ED6,{0xD4,0x303,0x0}}, 235 {0x1ED7,{0xF4,0x303,0x0}}, {0x1ED8,{0xD4,0x323,0x0}}, {0x1ED9,{0xF4,0x323,0x0}}, 236 {0x1EDA,{0x1A0,0x301,0x0}}, {0x1EDB,{0x1A1,0x301,0x0}}, {0x1EDC,{0x1A0,0x300,0x0}}, 237 {0x1EDD,{0x1A1,0x300,0x0}}, {0x1EDE,{0x1A0,0x309,0x0}}, {0x1EDF,{0x1A1,0x309,0x0}}, 238 {0x1EE0,{0x1A0,0x303,0x0}}, {0x1EE1,{0x1A1,0x303,0x0}}, {0x1EE2,{0x1A0,0x323,0x0}}, 239 {0x1EE3,{0x1A1,0x323,0x0}}, {0x1EE4,{0x55,0x323,0x0}}, {0x1EE5,{0x75,0x323,0x0}}, 240 {0x1EE6,{0x55,0x309,0x0}}, {0x1EE7,{0x75,0x309,0x0}}, {0x1EE8,{0x1AF,0x301,0x0}}, 241 {0x1EE9,{0x1B0,0x301,0x0}}, {0x1EEA,{0x1AF,0x300,0x0}}, {0x1EEB,{0x1B0,0x300,0x0}}, 242 {0x1EEC,{0x1AF,0x309,0x0}}, {0x1EED,{0x1B0,0x309,0x0}}, {0x1EEE,{0x1AF,0x303,0x0}}, 243 {0x1EEF,{0x1B0,0x303,0x0}}, {0x1EF0,{0x1AF,0x323,0x0}}, {0x1EF1,{0x1B0,0x323,0x0}}, 244 {0x1EF2,{0x59,0x300,0x0}}, {0x1EF3,{0x79,0x300,0x0}}, {0x1EF4,{0x59,0x323,0x0}}, 245 {0x1EF5,{0x79,0x323,0x0}}, {0x1EF6,{0x59,0x309,0x0}}, {0x1EF7,{0x79,0x309,0x0}}, 246 {0x1EF8,{0x59,0x303,0x0}}, {0x1EF9,{0x79,0x303,0x0}}, {0x1F00,{0x3B1,0x313,0x0}}, 247 {0x1F01,{0x3B1,0x314,0x0}}, {0x1F02,{0x1F00,0x300,0x0}}, {0x1F03,{0x1F01,0x300,0x0}}, 248 {0x1F04,{0x1F00,0x301,0x0}}, {0x1F05,{0x1F01,0x301,0x0}}, {0x1F06,{0x1F00,0x342,0x0}}, 249 {0x1F07,{0x1F01,0x342,0x0}}, {0x1F08,{0x391,0x313,0x0}}, {0x1F09,{0x391,0x314,0x0}}, 250 {0x1F0A,{0x1F08,0x300,0x0}}, {0x1F0B,{0x1F09,0x300,0x0}}, {0x1F0C,{0x1F08,0x301,0x0}}, 251 {0x1F0D,{0x1F09,0x301,0x0}}, {0x1F0E,{0x1F08,0x342,0x0}}, {0x1F0F,{0x1F09,0x342,0x0}}, 252 {0x1F10,{0x3B5,0x313,0x0}}, {0x1F11,{0x3B5,0x314,0x0}}, {0x1F12,{0x1F10,0x300,0x0}}, 253 {0x1F13,{0x1F11,0x300,0x0}}, {0x1F14,{0x1F10,0x301,0x0}}, {0x1F15,{0x1F11,0x301,0x0}}, 254 {0x1F18,{0x395,0x313,0x0}}, {0x1F19,{0x395,0x314,0x0}}, {0x1F1A,{0x1F18,0x300,0x0}}, 255 {0x1F1B,{0x1F19,0x300,0x0}}, {0x1F1C,{0x1F18,0x301,0x0}}, {0x1F1D,{0x1F19,0x301,0x0}}, 256 {0x1F20,{0x3B7,0x313,0x0}}, {0x1F21,{0x3B7,0x314,0x0}}, {0x1F22,{0x1F20,0x300,0x0}}, 257 {0x1F23,{0x1F21,0x300,0x0}}, {0x1F24,{0x1F20,0x301,0x0}}, {0x1F25,{0x1F21,0x301,0x0}}, 258 {0x1F26,{0x1F20,0x342,0x0}}, {0x1F27,{0x1F21,0x342,0x0}}, {0x1F28,{0x397,0x313,0x0}}, 259 {0x1F29,{0x397,0x314,0x0}}, {0x1F2A,{0x1F28,0x300,0x0}}, {0x1F2B,{0x1F29,0x300,0x0}}, 260 {0x1F2C,{0x1F28,0x301,0x0}}, {0x1F2D,{0x1F29,0x301,0x0}}, {0x1F2E,{0x1F28,0x342,0x0}}, 261 {0x1F2F,{0x1F29,0x342,0x0}}, {0x1F30,{0x3B9,0x313,0x0}}, {0x1F31,{0x3B9,0x314,0x0}}, 262 {0x1F32,{0x1F30,0x300,0x0}}, {0x1F33,{0x1F31,0x300,0x0}}, {0x1F34,{0x1F30,0x301,0x0}}, 263 {0x1F35,{0x1F31,0x301,0x0}}, {0x1F36,{0x1F30,0x342,0x0}}, {0x1F37,{0x1F31,0x342,0x0}}, 264 {0x1F38,{0x399,0x313,0x0}}, {0x1F39,{0x399,0x314,0x0}}, {0x1F3A,{0x1F38,0x300,0x0}}, 265 {0x1F3B,{0x1F39,0x300,0x0}}, {0x1F3C,{0x1F38,0x301,0x0}}, {0x1F3D,{0x1F39,0x301,0x0}}, 266 {0x1F3E,{0x1F38,0x342,0x0}}, {0x1F3F,{0x1F39,0x342,0x0}}, {0x1F40,{0x3BF,0x313,0x0}}, 267 {0x1F41,{0x3BF,0x314,0x0}}, {0x1F42,{0x1F40,0x300,0x0}}, {0x1F43,{0x1F41,0x300,0x0}}, 268 {0x1F44,{0x1F40,0x301,0x0}}, {0x1F45,{0x1F41,0x301,0x0}}, {0x1F48,{0x39F,0x313,0x0}}, 269 {0x1F49,{0x39F,0x314,0x0}}, {0x1F4A,{0x1F48,0x300,0x0}}, {0x1F4B,{0x1F49,0x300,0x0}}, 270 {0x1F4C,{0x1F48,0x301,0x0}}, {0x1F4D,{0x1F49,0x301,0x0}}, {0x1F50,{0x3C5,0x313,0x0}}, 271 {0x1F51,{0x3C5,0x314,0x0}}, {0x1F52,{0x1F50,0x300,0x0}}, {0x1F53,{0x1F51,0x300,0x0}}, 272 {0x1F54,{0x1F50,0x301,0x0}}, {0x1F55,{0x1F51,0x301,0x0}}, {0x1F56,{0x1F50,0x342,0x0}}, 273 {0x1F57,{0x1F51,0x342,0x0}}, {0x1F59,{0x3A5,0x314,0x0}}, {0x1F5B,{0x1F59,0x300,0x0}}, 274 {0x1F5D,{0x1F59,0x301,0x0}}, {0x1F5F,{0x1F59,0x342,0x0}}, {0x1F60,{0x3C9,0x313,0x0}}, 275 {0x1F61,{0x3C9,0x314,0x0}}, {0x1F62,{0x1F60,0x300,0x0}}, {0x1F63,{0x1F61,0x300,0x0}}, 276 {0x1F64,{0x1F60,0x301,0x0}}, {0x1F65,{0x1F61,0x301,0x0}}, {0x1F66,{0x1F60,0x342,0x0}}, 277 {0x1F67,{0x1F61,0x342,0x0}}, {0x1F68,{0x3A9,0x313,0x0}}, {0x1F69,{0x3A9,0x314,0x0}}, 278 {0x1F6A,{0x1F68,0x300,0x0}}, {0x1F6B,{0x1F69,0x300,0x0}}, {0x1F6C,{0x1F68,0x301,0x0}}, 279 {0x1F6D,{0x1F69,0x301,0x0}}, {0x1F6E,{0x1F68,0x342,0x0}}, {0x1F6F,{0x1F69,0x342,0x0}}, 280 {0x1F70,{0x3B1,0x300,0x0}}, {0x1F71,{0x3B1,0x301,0x0}}, {0x1F72,{0x3B5,0x300,0x0}}, 281 {0x1F73,{0x3B5,0x301,0x0}}, {0x1F74,{0x3B7,0x300,0x0}}, {0x1F75,{0x3B7,0x301,0x0}}, 282 {0x1F76,{0x3B9,0x300,0x0}}, {0x1F77,{0x3B9,0x301,0x0}}, {0x1F78,{0x3BF,0x300,0x0}}, 283 {0x1F79,{0x3BF,0x301,0x0}}, {0x1F7A,{0x3C5,0x300,0x0}}, {0x1F7B,{0x3C5,0x301,0x0}}, 284 {0x1F7C,{0x3C9,0x300,0x0}}, {0x1F7D,{0x3C9,0x301,0x0}}, {0x1F80,{0x1F00,0x345,0x0}}, 285 {0x1F81,{0x1F01,0x345,0x0}}, {0x1F82,{0x1F02,0x345,0x0}}, {0x1F83,{0x1F03,0x345,0x0}}, 286 {0x1F84,{0x1F04,0x345,0x0}}, {0x1F85,{0x1F05,0x345,0x0}}, {0x1F86,{0x1F06,0x345,0x0}}, 287 {0x1F87,{0x1F07,0x345,0x0}}, {0x1F88,{0x1F08,0x345,0x0}}, {0x1F89,{0x1F09,0x345,0x0}}, 288 {0x1F8A,{0x1F0A,0x345,0x0}}, {0x1F8B,{0x1F0B,0x345,0x0}}, {0x1F8C,{0x1F0C,0x345,0x0}}, 289 {0x1F8D,{0x1F0D,0x345,0x0}}, {0x1F8E,{0x1F0E,0x345,0x0}}, {0x1F8F,{0x1F0F,0x345,0x0}}, 290 {0x1F90,{0x1F20,0x345,0x0}}, {0x1F91,{0x1F21,0x345,0x0}}, {0x1F92,{0x1F22,0x345,0x0}}, 291 {0x1F93,{0x1F23,0x345,0x0}}, {0x1F94,{0x1F24,0x345,0x0}}, {0x1F95,{0x1F25,0x345,0x0}}, 292 {0x1F96,{0x1F26,0x345,0x0}}, {0x1F97,{0x1F27,0x345,0x0}}, {0x1F98,{0x1F28,0x345,0x0}}, 293 {0x1F99,{0x1F29,0x345,0x0}}, {0x1F9A,{0x1F2A,0x345,0x0}}, {0x1F9B,{0x1F2B,0x345,0x0}}, 294 {0x1F9C,{0x1F2C,0x345,0x0}}, {0x1F9D,{0x1F2D,0x345,0x0}}, {0x1F9E,{0x1F2E,0x345,0x0}}, 295 {0x1F9F,{0x1F2F,0x345,0x0}}, {0x1FA0,{0x1F60,0x345,0x0}}, {0x1FA1,{0x1F61,0x345,0x0}}, 296 {0x1FA2,{0x1F62,0x345,0x0}}, {0x1FA3,{0x1F63,0x345,0x0}}, {0x1FA4,{0x1F64,0x345,0x0}}, 297 {0x1FA5,{0x1F65,0x345,0x0}}, {0x1FA6,{0x1F66,0x345,0x0}}, {0x1FA7,{0x1F67,0x345,0x0}}, 298 {0x1FA8,{0x1F68,0x345,0x0}}, {0x1FA9,{0x1F69,0x345,0x0}}, {0x1FAA,{0x1F6A,0x345,0x0}}, 299 {0x1FAB,{0x1F6B,0x345,0x0}}, {0x1FAC,{0x1F6C,0x345,0x0}}, {0x1FAD,{0x1F6D,0x345,0x0}}, 300 {0x1FAE,{0x1F6E,0x345,0x0}}, {0x1FAF,{0x1F6F,0x345,0x0}}, {0x1FB0,{0x3B1,0x306,0x0}}, 301 {0x1FB1,{0x3B1,0x304,0x0}}, {0x1FB2,{0x1F70,0x345,0x0}}, {0x1FB3,{0x3B1,0x345,0x0}}, 302 {0x1FB4,{0x1F71,0x345,0x0}}, {0x1FB6,{0x3B1,0x342,0x0}}, {0x1FB7,{0x1FB6,0x345,0x0}}, 303 {0x1FB8,{0x391,0x306,0x0}}, {0x1FB9,{0x391,0x304,0x0}}, {0x1FBA,{0x391,0x300,0x0}}, 304 {0x1FBB,{0x391,0x301,0x0}}, {0x1FBC,{0x391,0x345,0x0}}, {0x1FBE,{0x3B9,0x0,0x0}}, 305 {0x1FC1,{0xA8,0x342,0x0}}, {0x1FC2,{0x1F74,0x345,0x0}}, {0x1FC3,{0x3B7,0x345,0x0}}, 306 {0x1FC4,{0x1F75,0x345,0x0}}, {0x1FC6,{0x3B7,0x342,0x0}}, {0x1FC7,{0x1FC6,0x345,0x0}}, 307 {0x1FC8,{0x395,0x300,0x0}}, {0x1FC9,{0x395,0x301,0x0}}, {0x1FCA,{0x397,0x300,0x0}}, 308 {0x1FCB,{0x397,0x301,0x0}}, {0x1FCC,{0x397,0x345,0x0}}, {0x1FCD,{0x1FBF,0x300,0x0}}, 309 {0x1FCE,{0x1FBF,0x301,0x0}}, {0x1FCF,{0x1FBF,0x342,0x0}}, {0x1FD0,{0x3B9,0x306,0x0}}, 310 {0x1FD1,{0x3B9,0x304,0x0}}, {0x1FD2,{0x3CA,0x300,0x0}}, {0x1FD3,{0x3CA,0x301,0x0}}, 311 {0x1FD6,{0x3B9,0x342,0x0}}, {0x1FD7,{0x3CA,0x342,0x0}}, {0x1FD8,{0x399,0x306,0x0}}, 312 {0x1FD9,{0x399,0x304,0x0}}, {0x1FDA,{0x399,0x300,0x0}}, {0x1FDB,{0x399,0x301,0x0}}, 313 {0x1FDD,{0x1FFE,0x300,0x0}}, {0x1FDE,{0x1FFE,0x301,0x0}}, {0x1FDF,{0x1FFE,0x342,0x0}}, 314 {0x1FE0,{0x3C5,0x306,0x0}}, {0x1FE1,{0x3C5,0x304,0x0}}, {0x1FE2,{0x3CB,0x300,0x0}}, 315 {0x1FE3,{0x3CB,0x301,0x0}}, {0x1FE4,{0x3C1,0x313,0x0}}, {0x1FE5,{0x3C1,0x314,0x0}}, 316 {0x1FE6,{0x3C5,0x342,0x0}}, {0x1FE7,{0x3CB,0x342,0x0}}, {0x1FE8,{0x3A5,0x306,0x0}}, 317 {0x1FE9,{0x3A5,0x304,0x0}}, {0x1FEA,{0x3A5,0x300,0x0}}, {0x1FEB,{0x3A5,0x301,0x0}}, 318 {0x1FEC,{0x3A1,0x314,0x0}}, {0x1FED,{0xA8,0x300,0x0}}, {0x1FEE,{0xA8,0x301,0x0}}, 319 {0x1FEF,{0x60,0x0,0x0}}, {0x1FF2,{0x1F7C,0x345,0x0}}, {0x1FF3,{0x3C9,0x345,0x0}}, 320 {0x1FF4,{0x1F79,0x345,0x0}}, {0x1FF6,{0x3C9,0x342,0x0}}, {0x1FF7,{0x1FF6,0x345,0x0}}, 321 {0x1FF8,{0x39F,0x300,0x0}}, {0x1FF9,{0x39F,0x301,0x0}}, {0x1FFA,{0x3A9,0x300,0x0}}, 322 {0x1FFB,{0x3A9,0x301,0x0}}, {0x1FFC,{0x3A9,0x345,0x0}}, {0x1FFD,{0xB4,0x0,0x0}}, 323 {0x2000,{0x2002,0x0,0x0}}, {0x2001,{0x2003,0x0,0x0}}, {0x2126,{0x3A9,0x0,0x0}}, 324 {0x212A,{0x4B,0x0,0x0}}, {0x212B,{0xC5,0x0,0x0}}, {0x2204,{0x2203,0x338,0x0}}, 325 {0x2209,{0x2208,0x338,0x0}}, {0x220C,{0x220B,0x338,0x0}}, {0x2224,{0x2223,0x338,0x0}}, 326 {0x2226,{0x2225,0x338,0x0}}, {0x2241,{0x7E,0x338,0x0}}, {0x2244,{0x2243,0x338,0x0}}, 327 {0x2247,{0x2245,0x338,0x0}}, {0x2249,{0x2248,0x338,0x0}}, {0x2260,{0x3D,0x338,0x0}}, 328 {0x2262,{0x2261,0x338,0x0}}, {0x226D,{0x224D,0x338,0x0}}, {0x226E,{0x3C,0x338,0x0}}, 329 {0x226F,{0x3E,0x338,0x0}}, {0x2270,{0x2264,0x338,0x0}}, {0x2271,{0x2265,0x338,0x0}}, 330 {0x2274,{0x2272,0x338,0x0}}, {0x2275,{0x2273,0x338,0x0}}, {0x2278,{0x2276,0x338,0x0}}, 331 {0x2279,{0x2277,0x338,0x0}}, {0x2280,{0x227A,0x338,0x0}}, {0x2281,{0x227B,0x338,0x0}}, 332 {0x2284,{0x2282,0x338,0x0}}, {0x2285,{0x2283,0x338,0x0}}, {0x2288,{0x2286,0x338,0x0}}, 333 {0x2289,{0x2287,0x338,0x0}}, {0x22AC,{0x22A2,0x338,0x0}}, {0x22AD,{0x22A8,0x338,0x0}}, 334 {0x22AE,{0x22A9,0x338,0x0}}, {0x22AF,{0x22AB,0x338,0x0}}, {0x22E0,{0x227C,0x338,0x0}}, 335 {0x22E1,{0x227D,0x338,0x0}}, {0x22E2,{0x2291,0x338,0x0}}, {0x22E3,{0x2292,0x338,0x0}}, 336 {0x22EA,{0x22B2,0x338,0x0}}, {0x22EB,{0x22B3,0x338,0x0}}, {0x22EC,{0x22B4,0x338,0x0}}, 337 {0x22ED,{0x22B5,0x338,0x0}}, {0x2329,{0x3008,0x0,0x0}}, {0x232A,{0x3009,0x0,0x0}}, 338 {0x304C,{0x304B,0x3099,0x0}}, {0x304E,{0x304D,0x3099,0x0}}, {0x3050,{0x304F,0x3099,0x0}}, 339 {0x3052,{0x3051,0x3099,0x0}}, {0x3054,{0x3053,0x3099,0x0}}, {0x3056,{0x3055,0x3099,0x0}}, 340 {0x3058,{0x3057,0x3099,0x0}}, {0x305A,{0x3059,0x3099,0x0}}, {0x305C,{0x305B,0x3099,0x0}}, 341 {0x305E,{0x305D,0x3099,0x0}}, {0x3060,{0x305F,0x3099,0x0}}, {0x3062,{0x3061,0x3099,0x0}}, 342 {0x3065,{0x3064,0x3099,0x0}}, {0x3067,{0x3066,0x3099,0x0}}, {0x3069,{0x3068,0x3099,0x0}}, 343 {0x3070,{0x306F,0x3099,0x0}}, {0x3071,{0x306F,0x309A,0x0}}, {0x3073,{0x3072,0x3099,0x0}}, 344 {0x3074,{0x3072,0x309A,0x0}}, {0x3076,{0x3075,0x3099,0x0}}, {0x3077,{0x3075,0x309A,0x0}}, 345 {0x3079,{0x3078,0x3099,0x0}}, {0x307A,{0x3078,0x309A,0x0}}, {0x307C,{0x307B,0x3099,0x0}}, 346 {0x307D,{0x307B,0x309A,0x0}}, {0x3094,{0x3046,0x3099,0x0}}, {0x309E,{0x309D,0x3099,0x0}}, 347 {0x30AC,{0x30AB,0x3099,0x0}}, {0x30AE,{0x30AD,0x3099,0x0}}, {0x30B0,{0x30AF,0x3099,0x0}}, 348 {0x30B2,{0x30B1,0x3099,0x0}}, {0x30B4,{0x30B3,0x3099,0x0}}, {0x30B6,{0x30B5,0x3099,0x0}}, 349 {0x30B8,{0x30B7,0x3099,0x0}}, {0x30BA,{0x30B9,0x3099,0x0}}, {0x30BC,{0x30BB,0x3099,0x0}}, 350 {0x30BE,{0x30BD,0x3099,0x0}}, {0x30C0,{0x30BF,0x3099,0x0}}, {0x30C2,{0x30C1,0x3099,0x0}}, 351 {0x30C5,{0x30C4,0x3099,0x0}}, {0x30C7,{0x30C6,0x3099,0x0}}, {0x30C9,{0x30C8,0x3099,0x0}}, 352 {0x30D0,{0x30CF,0x3099,0x0}}, {0x30D1,{0x30CF,0x309A,0x0}}, {0x30D3,{0x30D2,0x3099,0x0}}, 353 {0x30D4,{0x30D2,0x309A,0x0}}, {0x30D6,{0x30D5,0x3099,0x0}}, {0x30D7,{0x30D5,0x309A,0x0}}, 354 {0x30D9,{0x30D8,0x3099,0x0}}, {0x30DA,{0x30D8,0x309A,0x0}}, {0x30DC,{0x30DB,0x3099,0x0}}, 355 {0x30DD,{0x30DB,0x309A,0x0}}, {0x30F4,{0x30A6,0x3099,0x0}}, {0x30F7,{0x30EF,0x3099,0x0}}, 356 {0x30F8,{0x30F0,0x3099,0x0}}, {0x30F9,{0x30F1,0x3099,0x0}}, {0x30FA,{0x30F2,0x3099,0x0}}, 357 {0x30FE,{0x30FD,0x3099,0x0}}, {0xF900,{0x8C48,0x0,0x0}}, {0xF901,{0x66F4,0x0,0x0}}, 358 {0xF902,{0x8ECA,0x0,0x0}}, {0xF903,{0x8CC8,0x0,0x0}}, {0xF904,{0x6ED1,0x0,0x0}}, 359 {0xF905,{0x4E32,0x0,0x0}}, {0xF906,{0x53E5,0x0,0x0}}, {0xF907,{0x9F9C,0x0,0x0}}, 360 {0xF908,{0x9F9C,0x0,0x0}}, {0xF909,{0x5951,0x0,0x0}}, {0xF90A,{0x91D1,0x0,0x0}}, 361 {0xF90B,{0x5587,0x0,0x0}}, {0xF90C,{0x5948,0x0,0x0}}, {0xF90D,{0x61F6,0x0,0x0}}, 362 {0xF90E,{0x7669,0x0,0x0}}, {0xF90F,{0x7F85,0x0,0x0}}, {0xF910,{0x863F,0x0,0x0}}, 363 {0xF911,{0x87BA,0x0,0x0}}, {0xF912,{0x88F8,0x0,0x0}}, {0xF913,{0x908F,0x0,0x0}}, 364 {0xF914,{0x6A02,0x0,0x0}}, {0xF915,{0x6D1B,0x0,0x0}}, {0xF916,{0x70D9,0x0,0x0}}, 365 {0xF917,{0x73DE,0x0,0x0}}, {0xF918,{0x843D,0x0,0x0}}, {0xF919,{0x916A,0x0,0x0}}, 366 {0xF91A,{0x99F1,0x0,0x0}}, {0xF91B,{0x4E82,0x0,0x0}}, {0xF91C,{0x5375,0x0,0x0}}, 367 {0xF91D,{0x6B04,0x0,0x0}}, {0xF91E,{0x721B,0x0,0x0}}, {0xF91F,{0x862D,0x0,0x0}}, 368 {0xF920,{0x9E1E,0x0,0x0}}, {0xF921,{0x5D50,0x0,0x0}}, {0xF922,{0x6FEB,0x0,0x0}}, 369 {0xF923,{0x85CD,0x0,0x0}}, {0xF924,{0x8964,0x0,0x0}}, {0xF925,{0x62C9,0x0,0x0}}, 370 {0xF926,{0x81D8,0x0,0x0}}, {0xF927,{0x881F,0x0,0x0}}, {0xF928,{0x5ECA,0x0,0x0}}, 371 {0xF929,{0x6717,0x0,0x0}}, {0xF92A,{0x6D6A,0x0,0x0}}, {0xF92B,{0x72FC,0x0,0x0}}, 372 {0xF92C,{0x90CE,0x0,0x0}}, {0xF92D,{0x4F86,0x0,0x0}}, {0xF92E,{0x51B7,0x0,0x0}}, 373 {0xF92F,{0x52DE,0x0,0x0}}, {0xF930,{0x64C4,0x0,0x0}}, {0xF931,{0x6AD3,0x0,0x0}}, 374 {0xF932,{0x7210,0x0,0x0}}, {0xF933,{0x76E7,0x0,0x0}}, {0xF934,{0x8001,0x0,0x0}}, 375 {0xF935,{0x8606,0x0,0x0}}, {0xF936,{0x865C,0x0,0x0}}, {0xF937,{0x8DEF,0x0,0x0}}, 376 {0xF938,{0x9732,0x0,0x0}}, {0xF939,{0x9B6F,0x0,0x0}}, {0xF93A,{0x9DFA,0x0,0x0}}, 377 {0xF93B,{0x788C,0x0,0x0}}, {0xF93C,{0x797F,0x0,0x0}}, {0xF93D,{0x7DA0,0x0,0x0}}, 378 {0xF93E,{0x83C9,0x0,0x0}}, {0xF93F,{0x9304,0x0,0x0}}, {0xF940,{0x9E7F,0x0,0x0}}, 379 {0xF941,{0x8AD6,0x0,0x0}}, {0xF942,{0x58DF,0x0,0x0}}, {0xF943,{0x5F04,0x0,0x0}}, 380 {0xF944,{0x7C60,0x0,0x0}}, {0xF945,{0x807E,0x0,0x0}}, {0xF946,{0x7262,0x0,0x0}}, 381 {0xF947,{0x78CA,0x0,0x0}}, {0xF948,{0x8CC2,0x0,0x0}}, {0xF949,{0x96F7,0x0,0x0}}, 382 {0xF94A,{0x58D8,0x0,0x0}}, {0xF94B,{0x5C62,0x0,0x0}}, {0xF94C,{0x6A13,0x0,0x0}}, 383 {0xF94D,{0x6DDA,0x0,0x0}}, {0xF94E,{0x6F0F,0x0,0x0}}, {0xF94F,{0x7D2F,0x0,0x0}}, 384 {0xF950,{0x7E37,0x0,0x0}}, {0xF951,{0x96FB,0x0,0x0}}, {0xF952,{0x52D2,0x0,0x0}}, 385 {0xF953,{0x808B,0x0,0x0}}, {0xF954,{0x51DC,0x0,0x0}}, {0xF955,{0x51CC,0x0,0x0}}, 386 {0xF956,{0x7A1C,0x0,0x0}}, {0xF957,{0x7DBE,0x0,0x0}}, {0xF958,{0x83F1,0x0,0x0}}, 387 {0xF959,{0x9675,0x0,0x0}}, {0xF95A,{0x8B80,0x0,0x0}}, {0xF95B,{0x62CF,0x0,0x0}}, 388 {0xF95C,{0x6A02,0x0,0x0}}, {0xF95D,{0x8AFE,0x0,0x0}}, {0xF95E,{0x4E39,0x0,0x0}}, 389 {0xF95F,{0x5BE7,0x0,0x0}}, {0xF960,{0x6012,0x0,0x0}}, {0xF961,{0x7387,0x0,0x0}}, 390 {0xF962,{0x7570,0x0,0x0}}, {0xF963,{0x5317,0x0,0x0}}, {0xF964,{0x78FB,0x0,0x0}}, 391 {0xF965,{0x4FBF,0x0,0x0}}, {0xF966,{0x5FA9,0x0,0x0}}, {0xF967,{0x4E0D,0x0,0x0}}, 392 {0xF968,{0x6CCC,0x0,0x0}}, {0xF969,{0x6578,0x0,0x0}}, {0xF96A,{0x7D22,0x0,0x0}}, 393 {0xF96B,{0x53C3,0x0,0x0}}, {0xF96C,{0x585E,0x0,0x0}}, {0xF96D,{0x7701,0x0,0x0}}, 394 {0xF96E,{0x8449,0x0,0x0}}, {0xF96F,{0x8AAA,0x0,0x0}}, {0xF970,{0x6BBA,0x0,0x0}}, 395 {0xF971,{0x8FB0,0x0,0x0}}, {0xF972,{0x6C88,0x0,0x0}}, {0xF973,{0x62FE,0x0,0x0}}, 396 {0xF974,{0x82E5,0x0,0x0}}, {0xF975,{0x63A0,0x0,0x0}}, {0xF976,{0x7565,0x0,0x0}}, 397 {0xF977,{0x4EAE,0x0,0x0}}, {0xF978,{0x5169,0x0,0x0}}, {0xF979,{0x51C9,0x0,0x0}}, 398 {0xF97A,{0x6881,0x0,0x0}}, {0xF97B,{0x7CE7,0x0,0x0}}, {0xF97C,{0x826F,0x0,0x0}}, 399 {0xF97D,{0x8AD2,0x0,0x0}}, {0xF97E,{0x91CF,0x0,0x0}}, {0xF97F,{0x52F5,0x0,0x0}}, 400 {0xF980,{0x5442,0x0,0x0}}, {0xF981,{0x5973,0x0,0x0}}, {0xF982,{0x5EEC,0x0,0x0}}, 401 {0xF983,{0x65C5,0x0,0x0}}, {0xF984,{0x6FFE,0x0,0x0}}, {0xF985,{0x792A,0x0,0x0}}, 402 {0xF986,{0x95AD,0x0,0x0}}, {0xF987,{0x9A6A,0x0,0x0}}, {0xF988,{0x9E97,0x0,0x0}}, 403 {0xF989,{0x9ECE,0x0,0x0}}, {0xF98A,{0x529B,0x0,0x0}}, {0xF98B,{0x66C6,0x0,0x0}}, 404 {0xF98C,{0x6B77,0x0,0x0}}, {0xF98D,{0x8F62,0x0,0x0}}, {0xF98E,{0x5E74,0x0,0x0}}, 405 {0xF98F,{0x6190,0x0,0x0}}, {0xF990,{0x6200,0x0,0x0}}, {0xF991,{0x649A,0x0,0x0}}, 406 {0xF992,{0x6F23,0x0,0x0}}, {0xF993,{0x7149,0x0,0x0}}, {0xF994,{0x7489,0x0,0x0}}, 407 {0xF995,{0x79CA,0x0,0x0}}, {0xF996,{0x7DF4,0x0,0x0}}, {0xF997,{0x806F,0x0,0x0}}, 408 {0xF998,{0x8F26,0x0,0x0}}, {0xF999,{0x84EE,0x0,0x0}}, {0xF99A,{0x9023,0x0,0x0}}, 409 {0xF99B,{0x934A,0x0,0x0}}, {0xF99C,{0x5217,0x0,0x0}}, {0xF99D,{0x52A3,0x0,0x0}}, 410 {0xF99E,{0x54BD,0x0,0x0}}, {0xF99F,{0x70C8,0x0,0x0}}, {0xF9A0,{0x88C2,0x0,0x0}}, 411 {0xF9A1,{0x8AAA,0x0,0x0}}, {0xF9A2,{0x5EC9,0x0,0x0}}, {0xF9A3,{0x5FF5,0x0,0x0}}, 412 {0xF9A4,{0x637B,0x0,0x0}}, {0xF9A5,{0x6BAE,0x0,0x0}}, {0xF9A6,{0x7C3E,0x0,0x0}}, 413 {0xF9A7,{0x7375,0x0,0x0}}, {0xF9A8,{0x4EE4,0x0,0x0}}, {0xF9A9,{0x56F9,0x0,0x0}}, 414 {0xF9AA,{0x5BE7,0x0,0x0}}, {0xF9AB,{0x5DBA,0x0,0x0}}, {0xF9AC,{0x601C,0x0,0x0}}, 415 {0xF9AD,{0x73B2,0x0,0x0}}, {0xF9AE,{0x7469,0x0,0x0}}, {0xF9AF,{0x7F9A,0x0,0x0}}, 416 {0xF9B0,{0x8046,0x0,0x0}}, {0xF9B1,{0x9234,0x0,0x0}}, {0xF9B2,{0x96F6,0x0,0x0}}, 417 {0xF9B3,{0x9748,0x0,0x0}}, {0xF9B4,{0x9818,0x0,0x0}}, {0xF9B5,{0x4F8B,0x0,0x0}}, 418 {0xF9B6,{0x79AE,0x0,0x0}}, {0xF9B7,{0x91B4,0x0,0x0}}, {0xF9B8,{0x96B8,0x0,0x0}}, 419 {0xF9B9,{0x60E1,0x0,0x0}}, {0xF9BA,{0x4E86,0x0,0x0}}, {0xF9BB,{0x50DA,0x0,0x0}}, 420 {0xF9BC,{0x5BEE,0x0,0x0}}, {0xF9BD,{0x5C3F,0x0,0x0}}, {0xF9BE,{0x6599,0x0,0x0}}, 421 {0xF9BF,{0x6A02,0x0,0x0}}, {0xF9C0,{0x71CE,0x0,0x0}}, {0xF9C1,{0x7642,0x0,0x0}}, 422 {0xF9C2,{0x84FC,0x0,0x0}}, {0xF9C3,{0x907C,0x0,0x0}}, {0xF9C4,{0x9F8D,0x0,0x0}}, 423 {0xF9C5,{0x6688,0x0,0x0}}, {0xF9C6,{0x962E,0x0,0x0}}, {0xF9C7,{0x5289,0x0,0x0}}, 424 {0xF9C8,{0x677B,0x0,0x0}}, {0xF9C9,{0x67F3,0x0,0x0}}, {0xF9CA,{0x6D41,0x0,0x0}}, 425 {0xF9CB,{0x6E9C,0x0,0x0}}, {0xF9CC,{0x7409,0x0,0x0}}, {0xF9CD,{0x7559,0x0,0x0}}, 426 {0xF9CE,{0x786B,0x0,0x0}}, {0xF9CF,{0x7D10,0x0,0x0}}, {0xF9D0,{0x985E,0x0,0x0}}, 427 {0xF9D1,{0x516D,0x0,0x0}}, {0xF9D2,{0x622E,0x0,0x0}}, {0xF9D3,{0x9678,0x0,0x0}}, 428 {0xF9D4,{0x502B,0x0,0x0}}, {0xF9D5,{0x5D19,0x0,0x0}}, {0xF9D6,{0x6DEA,0x0,0x0}}, 429 {0xF9D7,{0x8F2A,0x0,0x0}}, {0xF9D8,{0x5F8B,0x0,0x0}}, {0xF9D9,{0x6144,0x0,0x0}}, 430 {0xF9DA,{0x6817,0x0,0x0}}, {0xF9DB,{0x7387,0x0,0x0}}, {0xF9DC,{0x9686,0x0,0x0}}, 431 {0xF9DD,{0x5229,0x0,0x0}}, {0xF9DE,{0x540F,0x0,0x0}}, {0xF9DF,{0x5C65,0x0,0x0}}, 432 {0xF9E0,{0x6613,0x0,0x0}}, {0xF9E1,{0x674E,0x0,0x0}}, {0xF9E2,{0x68A8,0x0,0x0}}, 433 {0xF9E3,{0x6CE5,0x0,0x0}}, {0xF9E4,{0x7406,0x0,0x0}}, {0xF9E5,{0x75E2,0x0,0x0}}, 434 {0xF9E6,{0x7F79,0x0,0x0}}, {0xF9E7,{0x88CF,0x0,0x0}}, {0xF9E8,{0x88E1,0x0,0x0}}, 435 {0xF9E9,{0x91CC,0x0,0x0}}, {0xF9EA,{0x96E2,0x0,0x0}}, {0xF9EB,{0x533F,0x0,0x0}}, 436 {0xF9EC,{0x6EBA,0x0,0x0}}, {0xF9ED,{0x541D,0x0,0x0}}, {0xF9EE,{0x71D0,0x0,0x0}}, 437 {0xF9EF,{0x7498,0x0,0x0}}, {0xF9F0,{0x85FA,0x0,0x0}}, {0xF9F1,{0x96A3,0x0,0x0}}, 438 {0xF9F2,{0x9C57,0x0,0x0}}, {0xF9F3,{0x9E9F,0x0,0x0}}, {0xF9F4,{0x6797,0x0,0x0}}, 439 {0xF9F5,{0x6DCB,0x0,0x0}}, {0xF9F6,{0x81E8,0x0,0x0}}, {0xF9F7,{0x7ACB,0x0,0x0}}, 440 {0xF9F8,{0x7B20,0x0,0x0}}, {0xF9F9,{0x7C92,0x0,0x0}}, {0xF9FA,{0x72C0,0x0,0x0}}, 441 {0xF9FB,{0x7099,0x0,0x0}}, {0xF9FC,{0x8B58,0x0,0x0}}, {0xF9FD,{0x4EC0,0x0,0x0}}, 442 {0xF9FE,{0x8336,0x0,0x0}}, {0xF9FF,{0x523A,0x0,0x0}}, {0xFA00,{0x5207,0x0,0x0}}, 443 {0xFA01,{0x5EA6,0x0,0x0}}, {0xFA02,{0x62D3,0x0,0x0}}, {0xFA03,{0x7CD6,0x0,0x0}}, 444 {0xFA04,{0x5B85,0x0,0x0}}, {0xFA05,{0x6D1E,0x0,0x0}}, {0xFA06,{0x66B4,0x0,0x0}}, 445 {0xFA07,{0x8F3B,0x0,0x0}}, {0xFA08,{0x884C,0x0,0x0}}, {0xFA09,{0x964D,0x0,0x0}}, 446 {0xFA0A,{0x898B,0x0,0x0}}, {0xFA0B,{0x5ED3,0x0,0x0}}, {0xFA0C,{0x5140,0x0,0x0}}, 447 {0xFA0D,{0x55C0,0x0,0x0}}, {0xFA10,{0x585A,0x0,0x0}}, {0xFA12,{0x6674,0x0,0x0}}, 448 {0xFA15,{0x51DE,0x0,0x0}}, {0xFA16,{0x732A,0x0,0x0}}, {0xFA17,{0x76CA,0x0,0x0}}, 449 {0xFA18,{0x793C,0x0,0x0}}, {0xFA19,{0x795E,0x0,0x0}}, {0xFA1A,{0x7965,0x0,0x0}}, 450 {0xFA1B,{0x798F,0x0,0x0}}, {0xFA1C,{0x9756,0x0,0x0}}, {0xFA1D,{0x7CBE,0x0,0x0}}, 451 {0xFA1E,{0x7FBD,0x0,0x0}}, {0xFA20,{0x8612,0x0,0x0}}, {0xFA22,{0x8AF8,0x0,0x0}}, 452 {0xFA25,{0x9038,0x0,0x0}}, {0xFA26,{0x90FD,0x0,0x0}}, {0xFA2A,{0x98EF,0x0,0x0}}, 453 {0xFA2B,{0x98FC,0x0,0x0}}, {0xFA2C,{0x9928,0x0,0x0}}, {0xFA2D,{0x9DB4,0x0,0x0}}, 454 {0xFB1F,{0x5F2,0x5B7,0x0}}, {0xFB2A,{0x5E9,0x5C1,0x0}}, {0xFB2B,{0x5E9,0x5C2,0x0}}, 455 {0xFB2C,{0x5E9,0x5BC,0x5C1}}, {0xFB2D,{0x5E9,0x5BC,0x5C2}}, {0xFB2E,{0x5D0,0x5B7,0x0}}, 456 {0xFB2F,{0x5D0,0x5B8,0x0}}, {0xFB30,{0x5D0,0x5BC,0x0}}, {0xFB31,{0x5D1,0x5BC,0x0}}, 457 {0xFB32,{0x5D2,0x5BC,0x0}}, {0xFB33,{0x5D3,0x5BC,0x0}}, {0xFB34,{0x5D4,0x5BC,0x0}}, 458 {0xFB35,{0x5D5,0x5BC,0x0}}, {0xFB36,{0x5D6,0x5BC,0x0}}, {0xFB38,{0x5D8,0x5BC,0x0}}, 459 {0xFB39,{0x5D9,0x5BC,0x0}}, {0xFB3A,{0x5DA,0x5BC,0x0}}, {0xFB3B,{0x5DB,0x5BC,0x0}}, 460 {0xFB3C,{0x5DC,0x5BC,0x0}}, {0xFB3E,{0x5DE,0x5BC,0x0}}, {0xFB40,{0x5E0,0x5BC,0x0}}, 461 {0xFB41,{0x5E1,0x5BC,0x0}}, {0xFB43,{0x5E3,0x5BC,0x0}}, {0xFB44,{0x5E4,0x5BC,0x0}}, 462 {0xFB46,{0x5E6,0x5BC,0x0}}, {0xFB47,{0x5E7,0x5BC,0x0}}, {0xFB48,{0x5E8,0x5BC,0x0}}, 463 {0xFB49,{0x5E9,0x5BC,0x0}}, {0xFB4A,{0x5EA,0x5BC,0x0}}, {0xFB4B,{0x5D5,0x5B9,0x0}}, 464 {0xFB4C,{0x5D1,0x5BF,0x0}}, {0xFB4D,{0x5DB,0x5BF,0x0}}, {0xFB4E,{0x5E4,0x5BF,0x0}} 465 465 }; 466 466 … … 1464 1464 * column 1465 1465 */ 1466 /* unsignedlong *unicode_cat_data;*/1466 /*mg_u_long *unicode_cat_data;*/ 1467 1467 1468 1468 void create_unicat_data () { … … 1470 1470 int min_start=0; 1471 1471 int min_end=0; 1472 register unsignedlong min_value=0; /* filling the whole byte */1472 register mg_u_long min_value=0; /* filling the whole byte */ 1473 1473 1474 1474 const unirange *letter_here = letter_info; … … 1480 1480 1481 1481 if (unicode_cat_data != NULL) return; 1482 unicode_cat_data = ( unsignedlong *) malloc (0x10000/4);1482 unicode_cat_data = (mg_u_long *) malloc (0x10000/4); 1483 1483 if (unicode_cat_data == NULL) return; 1484 1484 … … 1529 1529 1530 1530 } else { 1531 register unsignedlong mask = 3 << ((i % 16) * 2);1531 register mg_u_long mask = 3 << ((i % 16) * 2); 1532 1532 unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) | 1533 1533 (min_value & mask); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/win32in.c
r16583 r23508 3 3 #include "win32in.h" 4 4 5 unsigned long htonl(unsignedlong x) {5 mg_u_long htonl(mg_u_long x) { 6 6 #if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 7 7 x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | … … 24 24 } 25 25 26 unsigned long ntohl(unsignedlong x) {26 mg_u_long ntohl(mg_u_long x) { 27 27 #if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 28 28 x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | … … 50 50 51 51 main () { 52 long x;52 mg_s_long x; 53 53 short sx; 54 54 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/win32in.h
r16583 r23508 10 10 #endif 11 11 12 unsigned long htonl(unsignedlong x);13 unsigned long ntohl(unsignedlong x);12 mg_u_long htonl(mg_u_long x); 13 mg_u_long ntohl(mg_u_long x); 14 14 mg_ullong ntohll(mg_ullong x); 15 15 unsigned short htons(unsigned short x); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.cpp
r16583 r23508 79 79 80 80 // read in the array size 81 unsignedlong arrSize = 0;81 mg_u_long arrSize = 0; 82 82 if (!ReadVarLenUL (f, arrSize)) return false; 83 83 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.h
r16583 r23508 31 31 #endif 32 32 33 #include "mglong.h" 33 34 #include <stdio.h> 34 35 #include "UCArray.h" … … 38 39 public: 39 40 UCArray levelTag; 40 unsignedlong numEntries; // N for level41 unsignedlong approxWeightsDiskPtr;42 unsignedlong exactWeightsDiskPtr;41 mg_u_long numEntries; // N for level 42 mg_u_long approxWeightsDiskPtr; 43 mg_u_long exactWeightsDiskPtr; 43 44 bool workInLevel; // this is just a working variable, 44 45 // it is not saved or read from the file -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FText.cpp
r16583 r23508 41 41 } 42 42 43 #define BITADDRLEN (sizeof( unsignedlong) + sizeof(unsigned char))43 #define BITADDRLEN (sizeof(mg_u_long) + sizeof(unsigned char)) 44 44 45 45 … … 85 85 bool FTextLevel::Read (FILE *f) { 86 86 // read in the array size 87 unsignedlong arrSize = 0;87 mg_u_long arrSize = 0; 88 88 if (!ReadVarLenUL (f, arrSize)) return false; 89 89 … … 141 141 142 142 bool TextIdx::Read (FILE *f, const TextLevelInfo &levelInfo, 143 unsignedlong docNum) {143 mg_u_long docNum) { 144 144 if (!SeekTextIdx (f, levelInfo, docNum)) return false; 145 145 return Read (f); … … 166 166 167 167 bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo, 168 unsignedlong docNum) {168 mg_u_long docNum) { 169 169 if (docNum == 0 || docNum > levelInfo.numEntries) return false; 170 170 171 unsignedlong seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN;171 mg_u_long seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN; 172 172 if (fseek (f, seekPos, SEEK_SET) != 0) return false; 173 173 … … 176 176 177 177 178 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsignedlong arrSize) {178 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize) { 179 179 // clear the array 180 180 a.erase (a.begin(), a.end()); … … 218 218 } 219 219 220 void CompressTextInfo::SetStart ( unsignedlong startPos,220 void CompressTextInfo::SetStart (mg_u_long startPos, 221 221 unsigned char startBit, 222 222 unsigned char startWhich) { … … 232 232 } 233 233 234 void CompressTextInfo::SetEnd ( unsignedlong endPos,234 void CompressTextInfo::SetEnd (mg_u_long endPos, 235 235 unsigned char endBit) { 236 236 if (inDoc) { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FText.h
r16583 r23508 38 38 class BitAddr { 39 39 public: 40 unsignedlong byte;40 mg_u_long byte; 41 41 unsigned char bit; 42 42 … … 52 52 public: 53 53 UCArray levelTag; 54 unsignedlong textIdxPtr;55 unsignedlong numEntries;54 mg_u_long textIdxPtr; 55 mg_u_long numEntries; 56 56 57 57 TextLevelInfo (); … … 96 96 // does a seek and reads the appropriate record 97 97 bool Read (FILE *f, const TextLevelInfo &levelInfo, 98 unsignedlong docNum);98 mg_u_long docNum); 99 99 100 100 bool Read (FILE *f); … … 109 109 110 110 bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo, 111 unsignedlong docNum);111 mg_u_long docNum); 112 112 113 113 … … 115 115 typedef vector<TextIdx> TextIdxArray; 116 116 117 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsignedlong arrSize);117 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize); 118 118 bool WriteTextIdxArray (FILE *f, const TextIdxArray &a); 119 119 … … 135 135 // set the start of a level (closing off the last opening 136 136 // tag if needed) 137 void SetStart ( unsignedlong startPos,137 void SetStart (mg_u_long startPos, 138 138 unsigned char startBit, 139 139 unsigned char startWhich); … … 141 141 // if in a document, it will set the end, add the document to the 142 142 // list of document ptrs, and then call ResetStart 143 void SetEnd ( unsignedlong endPos,143 void SetEnd (mg_u_long endPos, 144 144 unsigned char endBit); 145 145 }; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.cpp
r16583 r23508 31 31 32 32 bool FragLevelConvert::Read (FILE *invfFile, 33 unsignedlong levelPtr,34 unsignedlong _numFrags,35 unsignedlong _numLevelDocs) {33 mg_u_long levelPtr, 34 mg_u_long _numFrags, 35 mg_u_long _numLevelDocs) { 36 36 levelStarts.erase (levelStarts.begin(), levelStarts.end()); 37 37 numFrags = _numFrags; … … 43 43 stdio_bitio_buffer buffer(invfFile); 44 44 45 unsignedlong pTag = numLevelDocs*2;46 unsignedlong B = BIO_Bblock_Init (numFrags+pTag, pTag);47 unsignedlong fragNum = 0;48 unsignedlong i;45 mg_u_long pTag = numLevelDocs*2; 46 mg_u_long B = BIO_Bblock_Init (numFrags+pTag, pTag); 47 mg_u_long fragNum = 0; 48 mg_u_long i; 49 49 for (i=0; i<numLevelDocs; ++i) { 50 unsignedlong delta = buffer.bblock_decode (B, NULL)-1;50 mg_u_long delta = buffer.bblock_decode (B, NULL)-1; 51 51 fragNum += delta; 52 52 … … 70 70 } 71 71 72 bool FragLevelConvert::FragToLevel ( unsignedlong fragNum,73 unsignedlong &levelDocNum) const {72 bool FragLevelConvert::FragToLevel (mg_u_long fragNum, 73 mg_u_long &levelDocNum) const { 74 74 // do binary search for something containing this fragment number 75 unsignedlong low = 1, high = numLevelDocs;76 unsignedlong mid;75 mg_u_long low = 1, high = numLevelDocs; 76 mg_u_long mid; 77 77 78 78 while ((mid = (low+high)/2) >= 1 && low <= high) { … … 89 89 90 90 bool FragLevelConvert::LevelToLevel (FragLevelConvert sectionLevelConvert, 91 unsigned long levelNum, unsignedlong &DocNum) {91 mg_u_long levelNum, mg_u_long &DocNum) { 92 92 93 93 if (levelNum==1) { … … 95 95 return true; 96 96 } 97 unsignedlong levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1;97 mg_u_long levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1; 98 98 99 99 if (FragToLevel(levelfragnum, DocNum)) { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.h
r16583 r23508 23 23 #define FRAGLEVELCONVERT_H 24 24 25 #include "mglong.h" 25 26 #include <stdio.h> 26 27 #include "UCArray.h" 27 28 28 29 29 /*Notes about levelStarts (kjm18) - this is my interpretation of … … 45 45 protected: 46 46 // note fragment start is one before before real start 47 vector< unsignedlong> levelStarts;48 unsignedlong numFrags;49 unsignedlong numLevelDocs;47 vector<mg_u_long> levelStarts; 48 mg_u_long numFrags; 49 mg_u_long numLevelDocs; 50 50 51 51 public: 52 52 FragLevelConvert (); 53 53 54 bool Read (FILE *invfFile, unsignedlong levelPtr,55 unsigned long _numFrags, unsignedlong _numLevelDocs);54 bool Read (FILE *invfFile, mg_u_long levelPtr, 55 mg_u_long _numFrags, mg_u_long _numLevelDocs); 56 56 57 bool FragToLevel ( unsigned long fragNum, unsignedlong &levelDocNum) const;57 bool FragToLevel (mg_u_long fragNum, mg_u_long &levelDocNum) const; 58 58 59 59 // this function converts from one level number to another … … 64 64 // coresponding level 65 65 bool LevelToLevel (FragLevelConvert sectionLevelConvert, 66 unsigned long levelNum, unsignedlong &DocNum);66 mg_u_long levelNum, mg_u_long &DocNum); 67 67 }; 68 68 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/GSDLQueryParser.cpp
r16583 r23508 140 140 } 141 141 142 static u nsignedlong GetStemMethod(LexEl &el, int defaultStemMethod) {142 static u_long GetStemMethod(LexEl &el, int defaultStemMethod) { 143 143 // here expect el to contain some of c,s,i,u,f,a -- see mg_files.h CHAR_FLAG_STEM_* constants 144 u nsigned long stem = (unsignedlong)defaultStemMethod;144 u_long stem = (u_long)defaultStemMethod; 145 145 146 146 UCArray::const_iterator here = el.text.begin(); … … 205 205 if (termNode.stemMethod == STEM_INVALID) { // error so backtrack 206 206 here = oldHere; 207 termNode.stemMethod = (u nsignedlong)defaultStemMethod;207 termNode.stemMethod = (u_long)defaultStemMethod; 208 208 } 209 209 } else here = oldHere; //ignore - wrong syntax -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/IndexData.cpp
r16583 r23508 163 163 // read in the information from the dictionary 164 164 block_dict_el tagEl; 165 unsignedlong tagElNum;165 mg_u_long tagElNum; 166 166 if (!SearchBlockDictEl (dictFile, biTags, bdh.entries_per_tblk, 167 167 bdh.tag_dict_size, level, tagEl, tagElNum)) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/IndexData.h
r16583 r23508 59 59 // level specific information 60 60 UCArray curLevel; // last level that was loaded 61 unsignedlong curLevelNum;61 mg_u_long curLevelNum; 62 62 FragLevelConvert levelConverter; 63 63 ApproxWeightsData weightData; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/MGQuery.cpp
r16583 r23508 40 40 void PrintNode (ostream &s, QueryNode *node, int indent) { 41 41 if (node == NULL) { 42 PrintIndentText (s, "NULL\n", indent);42 PrintIndentText (s, (char*)"NULL\n", indent); 43 43 } else { 44 44 node->Print (s, indent+2); … … 102 102 103 103 // combine document numbers and corresponding ranks 104 unsignedlong leftI = 0;105 unsignedlong rightI = 0;106 unsignedlong outI = 0;104 mg_u_long leftI = 0; 105 mg_u_long rightI = 0; 106 mg_u_long outI = 0; 107 107 while (leftI < result.docs.size() && 108 108 rightI < rightResult.docs.size()) { … … 146 146 147 147 void AndQueryNode::Print (ostream &s, int indent) const { 148 PrintIndentText (s, "leftNode:\n", indent);148 PrintIndentText (s, (char*)"leftNode:\n", indent); 149 149 PrintNode (s, leftNode, indent+2); 150 PrintIndentText (s, "AND\n", indent);151 PrintIndentText (s, "rightNode:\n", indent);150 PrintIndentText (s, (char*)"AND\n", indent); 151 PrintIndentText (s, (char*)"rightNode:\n", indent); 152 152 PrintNode (s, rightNode, indent+2); 153 153 } … … 187 187 188 188 // combine document numbers and corresponding ranks 189 unsignedlong leftSize = leftResult.docs.size();190 unsignedlong rightSize = rightResult.docs.size();191 unsignedlong leftI = 0;192 unsignedlong rightI = 0;193 unsignedlong leftDocNum = 0;194 unsignedlong rightDocNum = 0;189 mg_u_long leftSize = leftResult.docs.size(); 190 mg_u_long rightSize = rightResult.docs.size(); 191 mg_u_long leftI = 0; 192 mg_u_long rightI = 0; 193 mg_u_long leftDocNum = 0; 194 mg_u_long rightDocNum = 0; 195 195 while (leftI < leftSize || rightI < rightSize) { 196 196 // check leftI 197 197 if (leftI < leftResult.docs.size()) 198 198 leftDocNum = leftResult.docs[leftI]; 199 else leftDocNum = ULONG_MAX;199 else leftDocNum = (mg_u_long)ULONG_MAX; 200 200 201 201 // check rightI 202 202 if (rightI < rightResult.docs.size()) 203 203 rightDocNum = rightResult.docs[rightI]; 204 else rightDocNum = ULONG_MAX;204 else rightDocNum = (mg_u_long)ULONG_MAX; 205 205 206 206 // combine … … 250 250 251 251 void OrQueryNode::Print (ostream &s, int indent) const { 252 PrintIndentText (s, "leftNode:\n", indent);252 PrintIndentText (s, (char*)"leftNode:\n", indent); 253 253 PrintNode (s, leftNode, indent+2); 254 PrintIndentText (s, "OR\n", indent);255 PrintIndentText (s, "rightNode:\n", indent);254 PrintIndentText (s, (char*)"OR\n", indent); 255 PrintIndentText (s, (char*)"rightNode:\n", indent); 256 256 PrintNode (s, rightNode, indent+2); 257 257 } … … 297 297 298 298 // combine document numbers and corresponding ranks 299 unsignedlong queryI = 0;300 unsignedlong notI = 0;301 unsignedlong outI = 0;299 mg_u_long queryI = 0; 300 mg_u_long notI = 0; 301 mg_u_long outI = 0; 302 302 while (queryI < result.docs.size() && 303 303 notI < notResult.docs.size()) { … … 342 342 343 343 void NotQueryNode::Print (ostream &s, int indent) const { 344 PrintIndentText (s, "queryNode:\n", indent);344 PrintIndentText (s, (char*)"queryNode:\n", indent); 345 345 PrintNode (s, queryNode, indent+2); 346 PrintIndentText (s, "NOT\n", indent);347 PrintIndentText (s, "notNode:\n", indent);346 PrintIndentText (s, (char*)"NOT\n", indent); 347 PrintIndentText (s, (char*)"notNode:\n", indent); 348 348 PrintNode (s, notNode, indent+2); 349 349 } … … 361 361 // get information about this tag 362 362 block_dict_el tagEl; 363 unsignedlong tagElNum;363 mg_u_long tagElNum; 364 364 if (!SearchBlockDictEl (indexData.dictFile, indexData.biTags, 365 365 indexData.bdh.entries_per_tblk, … … 373 373 stdio_bitio_buffer buffer(indexData.invfFile); 374 374 375 unsignedlong pTag = tagEl.frag_occur*2;376 unsignedlong B = BIO_Bblock_Init (indexData.bdh.num_frags+pTag, pTag);377 unsignedlong fragNum = 0;378 unsignedlong i;375 mg_u_long pTag = tagEl.frag_occur*2; 376 mg_u_long B = BIO_Bblock_Init (indexData.bdh.num_frags+pTag, pTag); 377 mg_u_long fragNum = 0; 378 mg_u_long i; 379 379 FragRange thisFrag; 380 380 for (i=0; i<tagEl.frag_occur; ++i) { 381 381 // get start 382 unsignedlong delta = buffer.bblock_decode (B, NULL)-1;382 mg_u_long delta = buffer.bblock_decode (B, NULL)-1; 383 383 fragNum += delta; 384 384 … … 427 427 428 428 // get a list of term numbers 429 vector< unsignedlong> equivNums;429 vector<mg_u_long> equivNums; 430 430 FindWordNumbers (indexData, term, stemMethod, equivNums); 431 431 … … 435 435 FragData tempFragData2; 436 436 UCArray equivWord; 437 vector< unsignedlong>::iterator here = equivNums.begin();438 vector< unsignedlong>::iterator end = equivNums.end();437 vector<mg_u_long>::iterator here = equivNums.begin(); 438 vector<mg_u_long>::iterator end = equivNums.end(); 439 439 while (here != end) { 440 440 // get the information for this word … … 565 565 566 566 void ProxMatchQueryNode::Print (ostream &s, int indent) const { 567 PrintIndentText (s, "PROXMATCH\n", indent);567 PrintIndentText (s, (char*)"PROXMATCH\n", indent); 568 568 if (tagNodePtr != NULL) tagNodePtr->Print (s, indent+2); 569 569 … … 583 583 void BrowseQueryNode::Calculate (IndexData &indexData, BrowseQueryResult &result) const { 584 584 585 unsignedlong number=0;585 mg_u_long number=0; 586 586 FindNearestWordNumber(indexData, term, number); 587 587 if (number + startPosition > 0 ) { … … 604 604 605 605 void BrowseQueryNode::Print (ostream &s, int indent) const { 606 PrintIndentText(s, "BROWSEQUERYNODE\n", indent);606 PrintIndentText(s, (char*)"BROWSEQUERYNODE\n", indent); 607 607 PrintIndent (s, indent+2); 608 608 s << "TERM:"<<term<<"\n"; … … 631 631 632 632 // make weights into ranks if needed 633 unsignedlong i;633 mg_u_long i; 634 634 if (queryInfo.sortByRank || queryInfo.needRankInfo) { 635 635 for (i=0; i<result.ranks.size(); ++i) { … … 639 639 } 640 640 641 unsignedlong resultsSize = queryInfo.maxDocs;641 mg_u_long resultsSize = queryInfo.maxDocs; 642 642 if (resultsSize == 0 || resultsSize > result.docs.size()) 643 643 resultsSize = result.docs.size(); … … 655 655 result.docs.begin()+resultsSize, 656 656 result.ranks.begin()+resultsSize, 657 ( unsignedlong) result.ranks.size()-resultsSize,657 (mg_u_long) result.ranks.size()-resultsSize, 658 658 gtRank); 659 659 … … 665 665 if (queryInfo.exactWeights && 666 666 (queryInfo.sortByRank || queryInfo.needRankInfo)) { 667 unsignedlong exactDiskPtr =667 mg_u_long exactDiskPtr = 668 668 indexData.levels.levelInfo[indexData.curLevel].exactWeightsDiskPtr; 669 669 … … 737 737 } 738 738 739 unsignedlong DocNum = 0;740 741 for ( unsignedlong i=0; i<realresult.docs.size(); ++i) {739 mg_u_long DocNum = 0; 740 741 for (mg_u_long i=0; i<realresult.docs.size(); ++i) { 742 742 743 743 // do an if ! here???? -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/MGQuery.h
r16583 r23508 107 107 108 108 109 #define NO_TERM_RANGE_START ( LONG_MIN/2)110 #define NO_TERM_RANGE_END ( LONG_MAX/2)109 #define NO_TERM_RANGE_START (INT_MIN/2) 110 #define NO_TERM_RANGE_END (INT_MAX/2) 111 111 112 112 /* NOTE: range stuff - the range values are for the previous term relative … … 123 123 public: 124 124 UCArray term; 125 unsignedlong termWeight;126 unsignedlong stemMethod;127 signedlong startRange; // range relative to last term128 signedlong endRange;125 mg_u_long termWeight; 126 mg_u_long stemMethod; 127 mg_s_long startRange; // range relative to last term 128 mg_s_long endRange; 129 129 130 130 void Clear (); … … 161 161 public: 162 162 UCArray term; 163 signedlong startPosition;164 unsignedlong numTerms;163 mg_s_long startPosition; 164 mg_u_long numTerms; 165 165 166 166 void Clear(); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Makefile.in
r22070 r23508 53 53 CC = @CC@ 54 54 CXX = @CXX@ 55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)56 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)55 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 56 CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 57 57 DEFS = @DEFS@ 58 58 RANLIB = @RANLIB@ … … 60 60 INSTALL_DATA = @INSTALL_DATA@ 61 61 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 62 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@62 LDFLAGS = @LDFLAGS@ 63 63 LIBS = ../lib/libmgpplib.a $(AFLIBS) -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@ 64 64 TOUCH = echo timestamp > -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/QueryResultsSort.h
r16583 r23508 45 45 void PushHeap (DocNumArray::iterator docNumHeap, 46 46 RandomAccessIterator parallelHeap, 47 unsignedlong heapSize,47 mg_u_long heapSize, 48 48 const Compare &comp) { 49 unsignedlong holeIndex = heapSize-1;50 unsignedlong parent = (holeIndex - 1) / 2;49 mg_u_long holeIndex = heapSize-1; 50 mg_u_long parent = (holeIndex - 1) / 2; 51 51 while (holeIndex > 0 && comp (*(parallelHeap+parent), 52 52 *(parallelHeap+holeIndex))) { … … 63 63 void AdjustHeap (DocNumArray::iterator docNumHeap, 64 64 RandomAccessIterator parallelHeap, 65 unsignedlong holeIndex,66 unsignedlong heapSize,65 mg_u_long holeIndex, 66 mg_u_long heapSize, 67 67 const Compare &comp) { 68 unsignedlong secondChild = 2 * holeIndex + 2;68 mg_u_long secondChild = 2 * holeIndex + 2; 69 69 while (secondChild < heapSize) { 70 70 if (comp(*(parallelHeap + secondChild), … … 87 87 void PopHeap (DocNumArray::iterator docNumHeap, 88 88 RandomAccessIterator parallelHeap, 89 unsignedlong heapSize,89 mg_u_long heapSize, 90 90 const Compare &comp) { 91 91 swap (*(parallelHeap), *(parallelHeap+heapSize-1)); 92 92 swap (*(docNumHeap), *(docNumHeap+heapSize-1)); 93 AdjustHeap (docNumHeap, parallelHeap, ( unsignedlong)0, heapSize-1, comp);93 AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize-1, comp); 94 94 } 95 95 … … 97 97 void MakeHeap (DocNumArray::iterator docNumHeap, 98 98 RandomAccessIterator parallelHeap, 99 unsignedlong size,99 mg_u_long size, 100 100 const Compare &comp) { 101 101 if (size < 2) return; 102 102 103 unsignedlong i = 0;103 mg_u_long i = 0; 104 104 for (i=1; i<=size; ++i) 105 105 PushHeap (docNumHeap, parallelHeap, i, comp); … … 110 110 void SortHeap (DocNumArray::iterator docNumHeap, 111 111 RandomAccessIterator parallelHeap, 112 unsignedlong size,112 mg_u_long size, 113 113 const Compare &comp) { 114 114 if (size < 2) return; 115 115 116 unsignedlong i;116 mg_u_long i; 117 117 for (i=size; i>1; --i) 118 118 PopHeap (docNumHeap, parallelHeap, i, comp); … … 123 123 void SelectAddHeap (DocNumArray::iterator docNumHeap, 124 124 RandomAccessIterator parallelHeap, 125 unsignedlong heapSize,125 mg_u_long heapSize, 126 126 DocNumArray::iterator docNumAdd, 127 127 RandomAccessIterator parallelAdd, 128 unsignedlong addSize,128 mg_u_long addSize, 129 129 const Compare &comp) { 130 unsignedlong i;130 mg_u_long i; 131 131 for (i=0; i<addSize; ++i) { 132 132 if (comp(*(parallelAdd+i), *(parallelHeap))) { 133 133 swap (*(docNumHeap), *(docNumAdd+i)); 134 134 swap (*(parallelHeap), *(parallelAdd+i)); 135 AdjustHeap (docNumHeap, parallelHeap, ( unsignedlong)0, heapSize, comp);135 AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize, comp); 136 136 } 137 137 } -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Queryer.cpp
r19822 r23508 63 63 int main (int argc, char **argv) { 64 64 int ch; 65 char *textfilename = "";66 char *indexfilename = "";67 char *basePath = "";65 char *textfilename = (char*)""; 66 char *indexfilename = (char*)""; 67 char *basePath = (char*)""; 68 68 69 69 opterr = 0; … … 186 186 // print 187 187 UCArray docText; 188 u nsignedlong docNum = 0;188 u_long docNum = 0; 189 189 cin >> docNum; 190 190 cin.getline(query, 2048, '\n'); // eat up return -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Terms.cpp
r16583 r23508 50 50 << t.stemMethod << ")equiv terms("; 51 51 52 unsignedlong i;52 mg_u_long i; 53 53 for (i=0; i<t.equivTerms.size(); ++i) { 54 54 s << t.equivTerms[i] << ", "; … … 83 83 84 84 s << "termFreqs: "; 85 for ( unsignedlong i=0; i<termFreqs.size(); ++i)85 for (mg_u_long i=0; i<termFreqs.size(); ++i) 86 86 s << termFreqs[i] << ", "; 87 87 … … 94 94 ostream &operator<< (ostream &s, const QueryResult &r) { 95 95 s << "docs: "; 96 unsignedlong i;96 mg_u_long i; 97 97 for (i=0; i<r.docs.size(); ++i) 98 98 s << r.docs[i] << ", "; … … 136 136 ostream &operator<< (ostream &s, const ExtQueryResult &r) { 137 137 s << "docs: "; 138 unsignedlong i;138 mg_u_long i; 139 139 for (i=0; i<r.docs.size(); ++i) 140 140 s << r.docs[i] << ", "; … … 181 181 ostream &operator<< (ostream &s, const BrowseQueryResult &r) { 182 182 s << "terms: "; 183 unsignedlong i;183 mg_u_long i; 184 184 for (i=0; i<r.termFreqs.size(); ++i) 185 185 s << r.termFreqs[i] << ", "; … … 207 207 void FindWordNumbers (IndexData &indexData, 208 208 const UCArray &term, 209 unsignedlong stemMethod,210 vector< unsignedlong> &equivWords) {209 mg_u_long stemMethod, 210 vector<mg_u_long> &equivWords) { 211 211 equivWords.erase (equivWords.begin(), equivWords.end()); 212 212 … … 222 222 // don't need to stem the word, 223 223 // find the word number(s) for this term 224 unsignedlong wordElNum = 0;225 unsignedlong numLevels = indexData.bdh.num_levels;224 mg_u_long wordElNum = 0; 225 mg_u_long numLevels = indexData.bdh.num_levels; 226 226 word_block_dict_el wordDictEl; 227 227 wordDictEl.SetNumLevels (numLevels); … … 245 245 unsigned char mgWord[MAXSTEMLEN + 1]; 246 246 UCArray stemTerm; 247 unsignedlong stemmerNum = 0;247 mg_u_long stemmerNum = 0; 248 248 249 249 /* [JFG - Mar 06: Accent folding patch] */ … … 266 266 // need to look up this term in the appropriate dictionary 267 267 stem_block_dict_el stemDictEl; 268 unsignedlong stemElNum;268 mg_u_long stemElNum; 269 269 bool result = false; 270 270 … … 287 287 void ReadTermFragData (IndexData &indexData, 288 288 bool needFragFreqs, 289 unsignedlong termNum,289 mg_u_long termNum, 290 290 FragData &fragData, 291 291 FragRangeArray *fragLimits, … … 294 294 295 295 // look up the word in the dictionary 296 unsignedlong numLevels = indexData.bdh.num_levels;296 mg_u_long numLevels = indexData.bdh.num_levels; 297 297 word_block_dict_el wordDictEl; 298 298 wordDictEl.SetNumLevels (numLevels); … … 311 311 stdio_bitio_buffer buffer (indexData.invfFile); 312 312 313 unsignedlong B = BIO_Bblock_Init (indexData.bdh.num_frags,313 mg_u_long B = BIO_Bblock_Init (indexData.bdh.num_frags, 314 314 wordDictEl.frag_occur); 315 unsignedlong fragNum = 0;316 unsignedlong termFreq = 0;317 318 unsignedlong fragLimitI = 0;319 unsignedlong i;315 mg_u_long fragNum = 0; 316 mg_u_long termFreq = 0; 317 318 mg_u_long fragLimitI = 0; 319 mg_u_long i; 320 320 for (i=0; i<wordDictEl.frag_occur; ++i) { 321 321 fragNum += buffer.bblock_decode (B, NULL); … … 359 359 360 360 // do or 361 unsignedlong f1I = 0, f1Size = f1.fragNums.size();362 unsignedlong f2I = 0, f2Size = f2.fragNums.size();361 mg_u_long f1I = 0, f1Size = f1.fragNums.size(); 362 mg_u_long f2I = 0, f2Size = f2.fragNums.size(); 363 363 while (f1I < f1Size || f2I < f2Size) { 364 364 if (f2I < f2Size && … … 395 395 FragData &fragData, 396 396 const FragData &comFragData, 397 signedlong startRange,398 signedlong endRange,397 mg_s_long startRange, 398 mg_s_long endRange, 399 399 const FragRangeArray *fragLimits) { 400 400 // sanity check on range 401 401 if (startRange > endRange) { 402 signedlong temp = endRange;402 mg_s_long temp = endRange; 403 403 endRange = startRange; 404 404 startRange = temp; … … 409 409 fragData.matchDocs = comFragData.matchDocs; 410 410 411 unsignedlong fragDataI = 0;412 unsignedlong fragDataSize = fragData.fragNums.size();413 unsignedlong comFragDataI = 0;414 unsignedlong comFragDataSize = comFragData.fragNums.size();415 unsignedlong fragLimitI = 0;416 unsignedlong fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size();417 unsignedlong outI = 0;411 mg_u_long fragDataI = 0; 412 mg_u_long fragDataSize = fragData.fragNums.size(); 413 mg_u_long comFragDataI = 0; 414 mg_u_long comFragDataSize = comFragData.fragNums.size(); 415 mg_u_long fragLimitI = 0; 416 mg_u_long fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size(); 417 mg_u_long outI = 0; 418 418 419 419 while (fragDataI < fragDataSize && 420 420 comFragDataI < comFragDataSize) { 421 signed long fragNum = (signedlong)fragData.fragNums[fragDataI];422 signed long comFragNum = (signedlong)comFragData.fragNums[comFragDataI];421 mg_s_long fragNum = (mg_s_long)fragData.fragNums[fragDataI]; 422 mg_s_long comFragNum = (mg_s_long)comFragData.fragNums[comFragDataI]; 423 423 424 424 // go to the right fragment limit (for the com frag) 425 425 if (fragLimits != NULL) { 426 426 while (fragLimitI+1 < fragLimitSize && 427 comFragNum > ( signedlong)(*fragLimits)[fragLimitI+1].rangeStart) {427 comFragNum > (mg_s_long)(*fragLimits)[fragLimitI+1].rangeStart) { 428 428 ++fragLimitI; 429 429 } … … 432 432 if (fragNum <= comFragNum+startRange || 433 433 (fragLimits!=NULL && 434 fragNum<=( signedlong)(*fragLimits)[fragLimitI].rangeStart)) {434 fragNum<=(mg_s_long)(*fragLimits)[fragLimitI].rangeStart)) { 435 435 ++fragDataI; 436 436 437 437 } else if (fragNum > comFragNum+endRange || 438 438 (fragLimits!=NULL && 439 fragNum>( signedlong)(*fragLimits)[fragLimitI].rangeEnd)) {439 fragNum>(mg_s_long)(*fragLimits)[fragLimitI].rangeEnd)) { 440 440 ++comFragDataI; 441 441 … … 471 471 const UCArray &tag, 472 472 const UCArray &term, 473 unsignedlong stemMethod,474 unsignedlong termWeight,473 mg_u_long stemMethod, 474 mg_u_long termWeight, 475 475 UCArrayVector &equivTerms, 476 476 QueryResult &result) { … … 480 480 481 481 // log (N / ft) 482 unsignedlong N = indexData.levels.levelInfo[indexData.curLevel].numEntries;482 mg_u_long N = indexData.levels.levelInfo[indexData.curLevel].numEntries; 483 483 float wordLog = log((double)N / (double)termData.matchDocs); 484 484 … … 491 491 float Wdt; 492 492 493 unsignedlong termDataI = 0;494 unsignedlong termDataSize = termData.fragNums.size();495 unsignedlong levelDocNum = 0;496 497 unsignedlong termDocFreq = 0;498 unsignedlong lastLevelDocNum = 0;499 unsignedlong overallwordfreq = 0;493 mg_u_long termDataI = 0; 494 mg_u_long termDataSize = termData.fragNums.size(); 495 mg_u_long levelDocNum = 0; 496 497 mg_u_long termDocFreq = 0; 498 mg_u_long lastLevelDocNum = 0; 499 mg_u_long overallwordfreq = 0; 500 500 501 501 while (termDataI < termDataSize) { … … 552 552 const UCArray &tag, 553 553 const UCArray &term, 554 unsignedlong stemMethod,555 unsignedlong termWeight,554 mg_u_long stemMethod, 555 mg_u_long termWeight, 556 556 UCArrayVector &equivTerms, 557 557 QueryResult &result) { … … 571 571 float Wdt; 572 572 573 unsignedlong termDataI = 0;574 unsignedlong termDataSize = termData.fragNums.size();575 unsignedlong levelDocNum = 0;576 577 unsignedlong termDocFreq = 0;578 unsignedlong lastLevelDocNum = 0;579 unsignedlong overallwordfreq = 0;580 unsignedlong resultI = 0;581 unsignedlong resultSize = result.docs.size();582 unsignedlong resultOutI = 0;573 mg_u_long termDataI = 0; 574 mg_u_long termDataSize = termData.fragNums.size(); 575 mg_u_long levelDocNum = 0; 576 577 mg_u_long termDocFreq = 0; 578 mg_u_long lastLevelDocNum = 0; 579 mg_u_long overallwordfreq = 0; 580 mg_u_long resultI = 0; 581 mg_u_long resultSize = result.docs.size(); 582 mg_u_long resultOutI = 0; 583 583 584 584 … … 664 664 bool needRanks = (queryInfo.sortByRank || queryInfo.needRankInfo); 665 665 666 unsignedlong termDataI = 0;667 unsignedlong termDataSize = termData.fragNums.size();668 unsignedlong levelDocNum = 0;669 670 unsignedlong lastLevelDocNum = 0;671 672 unsignedlong resultI = 0;673 unsignedlong resultSize = result.docs.size();674 unsignedlong resultOutI = 0;666 mg_u_long termDataI = 0; 667 mg_u_long termDataSize = termData.fragNums.size(); 668 mg_u_long levelDocNum = 0; 669 670 mg_u_long lastLevelDocNum = 0; 671 672 mg_u_long resultI = 0; 673 mg_u_long resultSize = result.docs.size(); 674 mg_u_long resultOutI = 0; 675 675 676 676 while (termDataI < termDataSize) { … … 732 732 void FindNearestWordNumber (IndexData &indexData, 733 733 const UCArray &term, 734 unsignedlong &number) {734 mg_u_long &number) { 735 735 736 736 // find the word number for this term 737 unsignedlong wordElNum = 0;738 unsignedlong numLevels = indexData.bdh.num_levels;737 mg_u_long wordElNum = 0; 738 mg_u_long numLevels = indexData.bdh.num_levels; 739 739 word_block_dict_el wordDictEl; 740 740 wordDictEl.SetNumLevels (numLevels); … … 748 748 749 749 void GetTermList(IndexData &indexData, 750 unsignedlong startTerm,751 unsignedlong numTerms,750 mg_u_long startTerm, 751 mg_u_long numTerms, 752 752 TermFreqArray &terms) { 753 753 … … 777 777 778 778 void GetTermList(IndexData &indexData, 779 unsignedlong startTerm,780 unsignedlong numTerms,779 mg_u_long startTerm, 780 mg_u_long numTerms, 781 781 UCArrayVector &terms) { 782 782 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Terms.h
r16583 r23508 24 24 25 25 #include "IndexData.h" 26 #include "mglong.h" 26 27 27 28 #if defined(GSDL_USE_OBJECTSPACE) … … 38 39 // general query information 39 40 UCArray docLevel; 40 unsignedlong maxDocs; // 0 = all41 mg_u_long maxDocs; // 0 = all 41 42 bool sortByRank; 42 43 bool exactWeights; … … 57 58 int stemMethod; 58 59 UCArrayVector equivTerms; // the stemmed and casefolded variants of the term 59 unsignedlong matchDocs; // tf for level - num levels60 mg_u_long matchDocs; // tf for level - num levels 60 61 // containing this term 61 unsignedlong termFreq; // overall term freq - num words that62 mg_u_long termFreq; // overall term freq - num words that 62 63 // are this term 63 64 void Clear (); … … 72 73 73 74 typedef vector<float> RankArray; 74 typedef vector< unsignedlong> DocNumArray;75 typedef vector<mg_u_long> DocNumArray; 75 76 76 77 class QueryResult { … … 81 82 TermFreqArray termFreqs; 82 83 83 unsignedlong actualNumDocs;84 mg_u_long actualNumDocs; 84 85 void Clear (); 85 86 QueryResult (); … … 90 91 bool operator== (const QueryResult &r1, const QueryResult &r2); 91 92 92 typedef vector< unsignedlong> FragNumArray;93 typedef vector< unsignedlong> FragFreqArray;93 typedef vector<mg_u_long> FragNumArray; 94 typedef vector<mg_u_long> FragFreqArray; 94 95 95 96 class FragData { 96 97 public: 97 unsignedlong matchDocs; // ft for level98 mg_u_long matchDocs; // ft for level 98 99 FragNumArray fragNums; 99 100 FragFreqArray fragFreqs; … … 106 107 class FragRange { 107 108 public: 108 unsignedlong rangeStart;109 unsignedlong rangeEnd;109 mg_u_long rangeStart; 110 mg_u_long rangeEnd; 110 111 111 112 void Clear () { rangeStart = rangeEnd = 0; } … … 119 120 void FindWordNumbers (IndexData &indexData, 120 121 const UCArray &term, 121 unsignedlong stemMethod,122 vector< unsignedlong> &equivWords);122 mg_u_long stemMethod, 123 vector<mg_u_long> &equivWords); 123 124 124 125 void ReadTermFragData (IndexData &indexData, 125 126 bool needFragFreqs, 126 unsignedlong termNum,127 mg_u_long termNum, 127 128 FragData &fragData, 128 129 FragRangeArray *fragLimits, … … 138 139 FragData &fragData, 139 140 const FragData &comFragData, 140 signedlong startRange,141 signedlong endRange,141 mg_s_long startRange, 142 mg_s_long endRange, 142 143 const FragRangeArray *fragLimits); 143 144 … … 147 148 const UCArray &tag, 148 149 const UCArray &term, 149 unsignedlong stemMethod,150 unsignedlong termWeight,150 mg_u_long stemMethod, 151 mg_u_long termWeight, 151 152 UCArrayVector &equivTerms, 152 153 QueryResult &result); … … 157 158 const UCArray &tag, 158 159 const UCArray &term, 159 unsignedlong stemMethod,160 unsignedlong termWeight,160 mg_u_long stemMethod, 161 mg_u_long termWeight, 161 162 UCArrayVector &equivTerms, 162 163 QueryResult &result); … … 201 202 void FindNearestWordNumber (IndexData &indexData, 202 203 const UCArray &term, 203 unsignedlong &number);204 mg_u_long &number); 204 205 205 206 void GetTermList(IndexData &indexData, 206 unsignedlong startTerm,207 unsignedlong numTerms,207 mg_u_long startTerm, 208 mg_u_long numTerms, 208 209 TermFreqArray &terms); 209 210 210 211 void GetTermList (IndexData &indexData, 211 unsignedlong startTerm,212 unsignedlong numTerms,212 mg_u_long startTerm, 213 mg_u_long numTerms, 213 214 UCArrayVector &terms); 214 215 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextEl.cpp
r16583 r23508 246 246 } 247 247 248 static void AddTextEl (TextElArray &doc, unsignedlong &docLen,248 static void AddTextEl (TextElArray &doc, mg_u_long &docLen, 249 249 const TextEl &el) { 250 250 doc.push_back (el); … … 258 258 259 259 bool ReadDoc (FileBuf &buf, const UCArray &docTag, 260 TextElArray &doc, unsignedlong &docLen,260 TextElArray &doc, mg_u_long &docLen, 261 261 bool compatMode) { 262 262 bool compatInPara = false; … … 316 316 // copy of readdoc to get TextElArray from u_char buffer 317 317 bool ReadDoc(u_char ** buffer, const UCArray &docTag, 318 TextElArray &doc, unsignedlong &docLen,318 TextElArray &doc, mg_u_long &docLen, 319 319 bool compatMode) { 320 320 bool compatInPara = false; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextEl.h
r16583 r23508 60 60 // returns true if a document could be found 61 61 bool ReadDoc (FileBuf &buf, const UCArray &docTag, 62 TextElArray &doc, unsignedlong &docLen,62 TextElArray &doc, mg_u_long &docLen, 63 63 bool compatMode=false); 64 64 65 65 bool ReadDoc(u_char **buffer, const UCArray &docTag, 66 TextElArray &doc, unsignedlong &docLen,66 TextElArray &doc, mg_u_long &docLen, 67 67 bool compatMode=false); 68 68 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextGet.cpp
r16583 r23508 187 187 huff_type type) { 188 188 huff_data * hd; 189 u_long ** vals;189 mg_u_long ** vals; 190 190 191 191 if (!(hd = new huff_data)) … … 326 326 if (text_fast_comp_dict == NULL) return false; 327 327 328 u _long*p, *end;328 uintptr_t *p, *end; 329 329 u_char *fixup; 330 u_long mem;331 u_long fixup_mem;330 mg_u_long mem; 331 mg_u_long fixup_mem; 332 332 int i; /* [RPAP - Jan 97: Endian Ordering] */ 333 333 … … 343 343 } 344 344 345 end = (u _long*) (((u_char *) cd) + mem);345 end = (uintptr_t *) (((u_char *) cd) + mem); 346 346 fread (cd, sizeof (u_char), mem, text_fast_comp_dict); 347 347 … … 354 354 fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict); 355 355 356 for (p = (u _long *) cd; (u_long) p < (u_long) end; ++p)356 for (p = (uintptr_t *) cd; (uintptr_t) p < (uintptr_t) end; ++p) 357 357 if (IS_FIXUP (p)) 358 358 { 359 359 NTOHUL(*p); /* [RPAP - Jan 97: Endian Ordering] */ 360 *p = *p + (u _long) cd;360 *p = *p + (uintptr_t) cd; 361 361 } 362 362 … … 464 464 465 465 // seek to the appropriate place and read the level information 466 bool res = ((fseek (levelFile, sizeof ( u_long), SEEK_SET) == 0) &&466 bool res = ((fseek (levelFile, sizeof (mg_u_long), SEEK_SET) == 0) && 467 467 levels.Read (levelFile)); 468 468 … … 507 507 508 508 // read in the compressed text header 509 if ((fseek (textFile, sizeof ( u_long), SEEK_SET) != 0) || !cth.Read (textFile))509 if ((fseek (textFile, sizeof (mg_u_long), SEEK_SET) != 0) || !cth.Read (textFile)) 510 510 return false; 511 511 … … 535 535 536 536 bool GetDocIdx (TextData &td, const UCArray &docLevel, 537 unsignedlong docNum, TextIdx &docIdx) {537 mg_u_long docNum, TextIdx &docIdx) { 538 538 // make sure the text index file was opened successfully 539 539 if (td.textIdxFile == NULL) return false; … … 551 551 #define MY_HUFF_DECODE(len, code, mcodes) \ 552 552 do { \ 553 register unsignedlong *__min_code = (mcodes); \554 register unsignedlong *__mclen = __min_code; \555 register unsignedlong __code = 0; \553 register mg_u_long *__min_code = (mcodes); \ 554 register mg_u_long *__mclen = __min_code; \ 555 register mg_u_long __code = 0; \ 556 556 do \ 557 557 { \ … … 565 565 566 566 bool GetDocText (TextData &td, const UCArray &docLevel, 567 unsignedlong docNum, UCArray &docText) {567 mg_u_long docNum, UCArray &docText) { 568 568 // erase the current text 569 569 docText.erase (docText.begin(), docText.end()); … … 581 581 auxiliary_dict *ad = cd.ad; 582 582 int which = docIdx.which; 583 unsignedlong num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) -583 mg_u_long num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) - 584 584 (docIdx.start.byte*8+(8-docIdx.start.bit)); 585 unsignedlong bits = 0;585 mg_u_long bits = 0; 586 586 587 587 if (docText.capacity() < docText.size() + num_bits + 1) { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextGet.h
r16583 r23508 49 49 // get information about where a document starts and finishes 50 50 bool GetDocIdx (TextData &td, const UCArray &docLevel, 51 unsignedlong docNum, TextIdx &docIdx);51 mg_u_long docNum, TextIdx &docIdx); 52 52 53 53 54 54 // decompress a document's text 55 55 bool GetDocText (TextData &td, const UCArray &docLevel, 56 unsignedlong docNum, UCArray &docText);56 mg_u_long docNum, UCArray &docText); 57 57 58 58 #endif -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/UCArray.cpp
r16583 r23508 104 104 105 105 106 bool ReadVarLenUL (FILE *f, unsignedlong &n) {107 register unsignedlong temp = 0;106 bool ReadVarLenUL (FILE *f, mg_u_long &n) { 107 register mg_u_long temp = 0; 108 108 register unsigned int bitPos = 0; 109 109 unsigned char b = 0; … … 121 121 } 122 122 123 bool WriteVarLenUL (FILE *f, unsignedlong n) {124 register unsignedlong temp = n;123 bool WriteVarLenUL (FILE *f, mg_u_long n) { 124 register mg_u_long temp = n; 125 125 register unsigned char b = 0; 126 126 do { … … 135 135 136 136 137 bool ReadUL (FILE *f, unsignedlong &n) {138 if (fread (&n, sizeof ( unsignedlong), 1, f) <= 0) return false;137 bool ReadUL (FILE *f, mg_u_long &n) { 138 if (fread (&n, sizeof (mg_u_long), 1, f) <= 0) return false; 139 139 NTOHUL (n); 140 140 return true; … … 142 142 143 143 144 bool WriteUL (FILE *f, unsignedlong n) {144 bool WriteUL (FILE *f, mg_u_long n) { 145 145 HTONUL (n); 146 return (fwrite (&n, sizeof ( unsignedlong), 1, f) > 0);146 return (fwrite (&n, sizeof (mg_u_long), 1, f) > 0); 147 147 } 148 148 … … 174 174 175 175 // read in the array size 176 unsignedlong arraySize = 0;176 mg_u_long arraySize = 0; 177 177 if (!ReadVarLenUL (f, arraySize)) return false; 178 178 … … 382 382 383 383 384 unsignedlong PrefixLen (const UCArray &a1, const UCArray &a2) {385 unsignedlong l = (a1.size() < a2.size()) ? a1.size() : a2.size();386 unsignedlong i = 0;384 mg_u_long PrefixLen (const UCArray &a1, const UCArray &a2) { 385 mg_u_long l = (a1.size() < a2.size()) ? a1.size() : a2.size(); 386 mg_u_long i = 0; 387 387 388 388 UCArray::const_iterator a1Here = a1.begin(); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/UCArray.h
r18717 r23508 22 22 #ifndef UCARRAY_H 23 23 #define UCARRAY_H 24 25 #include "mglong.h" 24 26 25 27 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) … … 81 83 82 84 // used for reading and writing variable length unsigned longs 83 bool ReadVarLenUL (FILE *f, unsignedlong &n);84 bool WriteVarLenUL (FILE *f, unsignedlong n);85 bool ReadVarLenUL (FILE *f, mg_u_long &n); 86 bool WriteVarLenUL (FILE *f, mg_u_long n); 85 87 86 // used for reading and writing unsigned longs 87 bool ReadUL (FILE *f, unsignedlong &n);88 bool WriteUL (FILE *f, unsignedlong n);88 // used for reading and writing unsigned longs 89 bool ReadUL (FILE *f, mg_u_long &n); 90 bool WriteUL (FILE *f, mg_u_long n); 89 91 90 92 // used for reading and writing floats … … 123 125 typedef vector<UCArray> UCArrayVector; 124 126 125 unsignedlong PrefixLen (const UCArray &a1, const UCArray &a2);127 mg_u_long PrefixLen (const UCArray &a1, const UCArray &a2); 126 128 127 129 // prev == NULL if no previous string -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Weights.cpp
r16583 r23508 24 24 #include "sysfuncs.h" 25 25 26 #define MAXBITS (sizeof( unsignedlong) * 8)26 #define MAXBITS (sizeof(mg_u_long) * 8) 27 27 28 28 … … 53 53 } 54 54 55 bool ApproxWeightsData::Read (FILE *approxWeightsFile, unsignedlong diskPtr,56 unsignedlong _numLevelDocs) {55 bool ApproxWeightsData::Read (FILE *approxWeightsFile, mg_u_long diskPtr, 56 mg_u_long _numLevelDocs) { 57 57 Free (); 58 58 … … 69 69 70 70 // allocate buffer for the weights 71 unsigned long arrSize = (bits*numLevelDocs+sizeof(unsignedlong)-1) / 32;72 weightBuf = new unsignedlong[arrSize];71 mg_u_long arrSize = (bits*numLevelDocs+sizeof(mg_u_long)-1) / 32; 72 weightBuf = new mg_u_long[arrSize]; 73 73 74 74 // read in the weights 75 unsignedlong i;75 mg_u_long i; 76 76 for (i=0; i<arrSize; ++i) { 77 77 ReadUL (approxWeightsFile, weightBuf[i]); … … 81 81 // (if not small enough table == NULL 82 82 if (bits <= 12) { 83 unsignedlong i, tableSize = (1 << bits);83 mg_u_long i, tableSize = (1 << bits); 84 84 table = new float[tableSize]; 85 85 table[0] = L; … … 91 91 } 92 92 93 float ApproxWeightsData::GetLowerApproxDocWeight ( unsignedlong levelDocNum) {93 float ApproxWeightsData::GetLowerApproxDocWeight (mg_u_long levelDocNum) { 94 94 // sanity check 95 95 if (bits == 0 || weightBuf == NULL) return 1.0; 96 96 97 register unsignedlong c, pos;98 register unsignedlong *dw;97 register mg_u_long c, pos; 98 register mg_u_long *dw; 99 99 100 100 // get the compressed version of the weight … … 114 114 115 115 116 float GetExactDocWeight (FILE *exactWeightsFile, unsignedlong diskPtr,117 unsignedlong levelDocNum) {116 float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr, 117 mg_u_long levelDocNum) { 118 118 // go to the appropriate place in the weights file 119 119 fseek (exactWeightsFile, diskPtr+sizeof(float)*levelDocNum, SEEK_SET); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Weights.h
r16583 r23508 23 23 #define WEIGHTS_H 24 24 25 #include "mglong.h" 25 26 #include <stdio.h> 26 27 … … 29 30 public: 30 31 unsigned char bits; 31 unsignedlong mask;32 mg_u_long mask; 32 33 double L; 33 34 double B; 34 unsignedlong numLevelDocs;35 unsignedlong *weightBuf;35 mg_u_long numLevelDocs; 36 mg_u_long *weightBuf; 36 37 float *table; // precomputed translation table 37 38 … … 41 42 void Free (); // frees any allocated memory 42 43 43 bool Read (FILE *approxWeightsFile, unsignedlong diskPtr,44 unsignedlong _numLevelDocs);44 bool Read (FILE *approxWeightsFile, mg_u_long diskPtr, 45 mg_u_long _numLevelDocs); 45 46 46 float GetLowerApproxDocWeight ( unsignedlong levelDocNum);47 float GetLowerApproxDocWeight (mg_u_long levelDocNum); 47 48 }; 48 49 … … 50 51 // diskPtr points to the start of the exact document weights 51 52 // for this level 52 float GetExactDocWeight (FILE *exactWeightsFile, unsignedlong diskPtr,53 unsignedlong levelDocNum);53 float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr, 54 mg_u_long levelDocNum); 54 55 55 56 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/WordData.h
r16583 r23508 24 24 25 25 public: 26 unsignedlong docCount;27 unsignedlong wordCount;26 mg_u_long docCount; 27 mg_u_long wordCount; 28 28 29 29 inline void read(FILE *f) … … 36 36 } 37 37 38 inline unsignedlong documents()38 inline mg_u_long documents() 39 39 { 40 40 return docCount; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/build.h
r16583 r23508 77 77 78 78 79 extern unsignedlong invf_buffer_size;79 extern mg_u_long invf_buffer_size; 80 80 /* 81 81 * The amount of memory to allocate to the invertion buffer. -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/comp_dict.cpp
r16583 r23508 42 42 huff_data char_huff[2]; 43 43 huff_data lens_huff[2]; 44 u_long *char_codes[2], *lens_codes[2];45 u_long Words_disk = 0;46 u_long Chars_disk = 0;44 mg_u_long *char_codes[2], *lens_codes[2]; 45 mg_u_long Words_disk = 0; 46 mg_u_long Chars_disk = 0; 47 47 48 48 … … 55 55 dict_hash_table *ht; 56 56 u_char **words; 57 u_long ht_size;57 mg_u_long ht_size; 58 58 59 59 ht_size = prime (cfh->hd.num_codes * HASH_RATIO); … … 99 99 100 100 memcpy (allwords + 1, prev + 1, copy); 101 fread (allwords + copy + 1, sizeof (u_char), val, dict); 101 size_t numbytes = fread (allwords + copy + 1, sizeof (u_char), val, dict); 102 if (numbytes != val) 103 { 104 #ifdef DEBUG 105 fprintf(stderr, "[mgpp/text/comp_dict.cpp L104] number of bytes read by fread does not match the requested amount\n"); 106 #endif 107 } 102 108 *allwords = val + copy; 103 109 … … 108 114 { 109 115 register u_char **wptr; 110 register unsignedlong tsize = ht->size;111 register unsignedlong hashval, step;116 register mg_u_long tsize = ht->size; 117 register mg_u_long hashval, step; 112 118 113 119 HASH (hashval, step, allwords, tsize); … … 166 172 return COMPERROR; 167 173 168 Words_disk = sizeof ( u_long);174 Words_disk = sizeof (mg_u_long); 169 175 170 176 if (Read_cdh (dict, &cdh, NULL, &Words_disk) == -1) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/comp_dict.h
r16583 r23508 24 24 typedef struct dict_hash_table 25 25 { 26 u_long size;26 mg_u_long size; 27 27 huff_data *hd; 28 u_long *codes;28 mg_u_long *codes; 29 29 u_char **words; 30 30 u_char **table[1]; … … 40 40 extern huff_data char_huff[2]; 41 41 extern huff_data lens_huff[2]; 42 extern u_long *char_codes[2], *lens_codes[2];43 extern u_long Words_disk;44 extern u_long Chars_disk;42 extern mg_u_long *char_codes[2], *lens_codes[2]; 43 extern mg_u_long Words_disk; 44 extern mg_u_long Chars_disk; 45 45 46 46 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/hash.h
r16583 r23508 26 26 do { \ 27 27 register u_char *p=wd; \ 28 register long len = *p++; \29 register unsignedlong hval; \28 register mg_s_long len = *p++; \ 29 register mg_u_long hval; \ 30 30 if (len>25) len = 25; \ 31 31 for (hval=0; len; --len) \ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/invf.cpp
r16583 r23508 104 104 } 105 105 106 void word_dict_el::SetNumLevels ( unsignedlong numLevels) {106 void word_dict_el::SetNumLevels (mg_u_long numLevels) { 107 107 if (levelFreqs != NULL) delete [] levelFreqs; 108 levelFreqs = new unsignedlong [numLevels];109 } 110 111 bool word_dict_el::Read (FILE *f, unsignedlong numLevels) {108 levelFreqs = new mg_u_long [numLevels]; 109 } 110 111 bool word_dict_el::Read (FILE *f, mg_u_long numLevels) { 112 112 if (!dict_el::Read (f)) return false; 113 113 114 114 if (levelFreqs == NULL) return false; 115 115 116 unsignedlong i;116 mg_u_long i; 117 117 for (i=0; i<numLevels; ++i) { 118 118 if (!ReadUL (f, levelFreqs[i])) return false; … … 123 123 124 124 bool word_dict_el::Write (FILE *f, const UCArray *lastEl, 125 unsignedlong numLevels) const {125 mg_u_long numLevels) const { 126 126 if (!dict_el::Write (f, lastEl)) return false; 127 127 128 128 if (levelFreqs == NULL) return false; 129 129 130 unsignedlong i;130 mg_u_long i; 131 131 for (i=0; i<numLevels; ++i) { 132 132 if (!WriteUL (f, levelFreqs[i])) return false; … … 229 229 } 230 230 231 void word_block_dict_el::SetNumLevels ( unsignedlong numLevels) {231 void word_block_dict_el::SetNumLevels (mg_u_long numLevels) { 232 232 if (levelFreqs != NULL) delete [] levelFreqs; 233 levelFreqs = new unsignedlong [numLevels];234 } 235 236 bool word_block_dict_el::Read (FILE *f, unsignedlong numLevels) {233 levelFreqs = new mg_u_long [numLevels]; 234 } 235 236 bool word_block_dict_el::Read (FILE *f, mg_u_long numLevels) { 237 237 if (!block_dict_el::Read (f)) return false; 238 238 239 239 if (levelFreqs == NULL) return false; 240 240 241 unsignedlong i;241 mg_u_long i; 242 242 for (i=0; i<numLevels; ++i) { 243 243 if (!ReadUL (f, levelFreqs[i])) return false; … … 248 248 249 249 bool word_block_dict_el::Write (FILE *f, const UCArray *lastEl, 250 unsignedlong numLevels) const {250 mg_u_long numLevels) const { 251 251 if (!block_dict_el::Write (f, lastEl)) return false; 252 252 253 253 if (levelFreqs == NULL) return false; 254 254 255 unsignedlong i;255 mg_u_long i; 256 256 for (i=0; i<numLevels; ++i) { 257 257 if (!WriteUL (f, levelFreqs[i])) return false; … … 288 288 289 289 // read in the array size 290 unsignedlong arraySize = 0;290 mg_u_long arraySize = 0; 291 291 if (!ReadVarLenUL (f, arraySize)) return false; 292 292 … … 383 383 384 384 // read in the array size 385 unsignedlong arraySize = 0;385 mg_u_long arraySize = 0; 386 386 if (!ReadVarLenUL (f, arraySize)) return false; 387 387 388 388 // read in the array 389 unsignedlong wordNum;389 mg_u_long wordNum; 390 390 while (arraySize > 0) { 391 391 if (!ReadUL (f, wordNum)) return false; … … 404 404 if (!WriteVarLenUL (f, equivWords.size())) return false; 405 405 406 vector< unsignedlong>::const_iterator here = equivWords.begin();407 vector< unsignedlong>::const_iterator end = equivWords.end();406 vector<mg_u_long>::const_iterator here = equivWords.begin(); 407 vector<mg_u_long>::const_iterator end = equivWords.end(); 408 408 while (here != end) { 409 409 if (!WriteUL (f, (*here))) return false; … … 464 464 465 465 bool SearchElNum (const block_idx &bIdx, 466 unsignedlong entriesPerBlock,467 unsignedlong elNum,468 unsignedlong &blockIdxNum,469 unsignedlong &blockStartElNum) {466 mg_u_long entriesPerBlock, 467 mg_u_long elNum, 468 mg_u_long &blockIdxNum, 469 mg_u_long &blockStartElNum) { 470 470 blockIdxNum = 0; 471 471 blockStartElNum = 0; … … 481 481 482 482 bool SearchEl (const block_idx &bIdx, 483 unsignedlong entriesPerBlock,483 mg_u_long entriesPerBlock, 484 484 const UCArray &el, 485 unsignedlong &blockIdxNum,486 unsignedlong &blockStartElNum) {485 mg_u_long &blockIdxNum, 486 mg_u_long &blockStartElNum) { 487 487 blockIdxNum = 0; 488 488 blockStartElNum = 0; 489 489 490 unsignedlong begin = 0;491 unsignedlong bIdxEnd = bIdx.size();492 unsignedlong end = bIdxEnd;493 unsignedlong mid;490 mg_u_long begin = 0; 491 mg_u_long bIdxEnd = bIdx.size(); 492 mg_u_long end = bIdxEnd; 493 mg_u_long mid; 494 494 while (begin < end) { 495 495 mid = (begin+end)/2; … … 517 517 bool SearchBlockDictElNum (FILE *dictFile, 518 518 const block_idx &bIdx, 519 unsignedlong entriesPerBlock,520 unsignedlong dictSize,521 unsignedlong elNum,519 mg_u_long entriesPerBlock, 520 mg_u_long dictSize, 521 mg_u_long elNum, 522 522 block_dict_el &dictEl) { 523 523 UCArrayClear (dictEl.el); … … 525 525 526 526 // find the block that contains the element 527 unsignedlong blockIdxNum, curElNum;527 mg_u_long blockIdxNum, curElNum; 528 528 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 529 529 blockIdxNum, curElNum)) … … 541 541 bool SearchBlockDictEl (FILE *dictFile, 542 542 const block_idx &bIdx, 543 unsignedlong entriesPerBlock,544 unsignedlong dictSize,543 mg_u_long entriesPerBlock, 544 mg_u_long dictSize, 545 545 const UCArray &el, 546 546 block_dict_el &dictEl, 547 unsignedlong &elNum) {547 mg_u_long &elNum) { 548 548 UCArrayClear (dictEl.el); 549 549 550 550 // find the block that contains the element 551 unsignedlong blockIdxNum;551 mg_u_long blockIdxNum; 552 552 if (!SearchEl (bIdx, entriesPerBlock, el, 553 553 blockIdxNum, elNum)) 554 554 return false; 555 555 556 unsignedlong blockEndElNum = elNum + entriesPerBlock;556 mg_u_long blockEndElNum = elNum + entriesPerBlock; 557 557 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 558 558 … … 576 576 bool SearchWordBlockDictElNum (FILE *dictFile, 577 577 const block_idx &bIdx, 578 unsignedlong entriesPerBlock,579 unsignedlong dictSize,580 unsignedlong numLevels,581 unsignedlong elNum,578 mg_u_long entriesPerBlock, 579 mg_u_long dictSize, 580 mg_u_long numLevels, 581 mg_u_long elNum, 582 582 word_block_dict_el &dictEl) { 583 583 UCArrayClear (dictEl.el); … … 585 585 586 586 // find the block that contains the element 587 unsignedlong blockIdxNum, curElNum;587 mg_u_long blockIdxNum, curElNum; 588 588 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 589 589 blockIdxNum, curElNum)) … … 601 601 bool SearchWordBlockDictEl (FILE *dictFile, 602 602 const block_idx &bIdx, 603 unsignedlong entriesPerBlock,604 unsignedlong dictSize,605 unsignedlong numLevels,603 mg_u_long entriesPerBlock, 604 mg_u_long dictSize, 605 mg_u_long numLevels, 606 606 const UCArray &el, 607 607 word_block_dict_el &dictEl, 608 unsignedlong &elNum) {608 mg_u_long &elNum) { 609 609 UCArrayClear (dictEl.el); 610 610 611 611 // find the block that contains the element 612 unsignedlong blockIdxNum;612 mg_u_long blockIdxNum; 613 613 if (!SearchEl (bIdx, entriesPerBlock, el, 614 614 blockIdxNum, elNum)) 615 615 return false; 616 616 617 unsignedlong blockEndElNum = elNum + entriesPerBlock;617 mg_u_long blockEndElNum = elNum + entriesPerBlock; 618 618 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 619 619 … … 637 637 bool SearchStemBlockDictElNum (FILE *dictFile, 638 638 const block_idx &bIdx, 639 unsignedlong entriesPerBlock,640 unsignedlong dictSize,641 unsignedlong elNum,639 mg_u_long entriesPerBlock, 640 mg_u_long dictSize, 641 mg_u_long elNum, 642 642 stem_block_dict_el &dictEl) { 643 643 UCArrayClear (dictEl.el); … … 645 645 646 646 // find the block that contains the element 647 unsignedlong blockIdxNum, curElNum;647 mg_u_long blockIdxNum, curElNum; 648 648 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 649 649 blockIdxNum, curElNum)) … … 661 661 bool SearchStemBlockDictEl (FILE *dictFile, 662 662 const block_idx &bIdx, 663 unsignedlong entriesPerBlock,664 unsignedlong dictSize,663 mg_u_long entriesPerBlock, 664 mg_u_long dictSize, 665 665 const UCArray &el, 666 666 stem_block_dict_el &dictEl, 667 unsignedlong &elNum) {667 mg_u_long &elNum) { 668 668 UCArrayClear (dictEl.el); 669 669 670 670 // find the block that contains the element 671 unsignedlong blockIdxNum;671 mg_u_long blockIdxNum; 672 672 if (!SearchEl (bIdx, entriesPerBlock, el, 673 673 blockIdxNum, elNum)) 674 674 return false; 675 675 676 unsignedlong blockEndElNum = elNum + entriesPerBlock;676 mg_u_long blockEndElNum = elNum + entriesPerBlock; 677 677 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 678 678 … … 696 696 bool PartialMatchSearchWordBlockDictEl (FILE *dictFile, 697 697 const block_idx &bIdx, 698 unsignedlong entriesPerBlock,699 unsignedlong dictSize,700 unsignedlong numLevels,698 mg_u_long entriesPerBlock, 699 mg_u_long dictSize, 700 mg_u_long numLevels, 701 701 const UCArray &el, 702 702 word_block_dict_el &dictEl, 703 vector< unsignedlong> &elNumList,703 vector<mg_u_long> &elNumList, 704 704 bool casefold) { 705 705 706 706 UCArrayClear (dictEl.el); 707 707 elNumList.erase (elNumList.begin(), elNumList.end()); 708 unsignedlong elNum;708 mg_u_long elNum; 709 709 // find the block that contains the element 710 unsignedlong blockIdxNum;710 mg_u_long blockIdxNum; 711 711 // will this work?? 712 712 if (!SearchEl (bIdx, entriesPerBlock, el, … … 714 714 return false; 715 715 } 716 unsignedlong blockEndElNum = elNum + entriesPerBlock;716 mg_u_long blockEndElNum = elNum + entriesPerBlock; 717 717 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 718 718 … … 770 770 bool NearestSearchWordBlockDictEl (FILE *dictFile, 771 771 const block_idx &bIdx, 772 unsignedlong entriesPerBlock,773 unsignedlong dictSize,774 unsignedlong numLevels,772 mg_u_long entriesPerBlock, 773 mg_u_long dictSize, 774 mg_u_long numLevels, 775 775 const UCArray &el, 776 776 word_block_dict_el &dictEl, 777 unsignedlong &elNum) {777 mg_u_long &elNum) { 778 778 779 779 UCArrayClear (dictEl.el); 780 780 781 781 // find the block that contains the element 782 unsignedlong blockIdxNum;782 mg_u_long blockIdxNum; 783 783 if (!SearchEl (bIdx, entriesPerBlock, el, 784 784 blockIdxNum, elNum)) 785 785 return false; 786 786 787 unsignedlong blockEndElNum = elNum + entriesPerBlock;787 mg_u_long blockEndElNum = elNum + entriesPerBlock; 788 788 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 789 789 … … 809 809 bool SearchWordBlockDictElNumRange (FILE *dictFile, 810 810 const block_idx &bIdx, 811 unsignedlong entriesPerBlock,812 unsignedlong dictSize,813 unsignedlong numLevels,814 unsignedlong elNum,815 unsignedlong numWords,811 mg_u_long entriesPerBlock, 812 mg_u_long dictSize, 813 mg_u_long numLevels, 814 mg_u_long elNum, 815 mg_u_long numWords, 816 816 UCArrayVector &terms) { 817 817 … … 825 825 826 826 // find the block that contains the element 827 unsignedlong blockIdxNum, curElNum;827 mg_u_long blockIdxNum, curElNum; 828 828 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 829 829 blockIdxNum, curElNum)) 830 830 return false; 831 831 832 unsignedlong lastElNum = elNum + numWords - 1;832 mg_u_long lastElNum = elNum + numWords - 1; 833 833 if (lastElNum > dictSize) lastElNum = dictSize; 834 834 … … 859 859 bool SearchWordBlockDictElNumRange (FILE *dictFile, 860 860 const block_idx &bIdx, 861 unsignedlong entriesPerBlock,862 unsignedlong dictSize,863 unsignedlong numLevels,864 unsignedlong elNum,865 unsignedlong numWords,861 mg_u_long entriesPerBlock, 862 mg_u_long dictSize, 863 mg_u_long numLevels, 864 mg_u_long elNum, 865 mg_u_long numWords, 866 866 word_block_dict_el_array &terms) { 867 867 … … 876 876 877 877 // find the block that contains the element 878 unsignedlong blockIdxNum, curElNum;878 mg_u_long blockIdxNum, curElNum; 879 879 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 880 880 blockIdxNum, curElNum)) 881 881 return false; 882 882 883 unsignedlong lastElNum = elNum + numWords - 1;883 mg_u_long lastElNum = elNum + numWords - 1; 884 884 if (lastElNum > dictSize) lastElNum = dictSize; 885 885 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/invf.h
r16583 r23508 25 25 #define H_INVF 26 26 27 #include "mglong.h" 27 28 #include <stdio.h> 28 29 … … 32 33 // header info for .invf.dict file 33 34 struct invf_dict_header { 34 unsignedlong lookback;35 unsignedlong word_dict_start;36 unsignedlong word_dict_size;37 unsignedlong tag_dict_start;38 unsignedlong tag_dict_size;39 unsignedlong num_docs;40 unsignedlong num_frags;41 unsignedlong num_words;42 unsignedlong total_bytes;43 unsignedlong index_string_bytes;44 unsignedlong num_levels;35 mg_u_long lookback; 36 mg_u_long word_dict_start; 37 mg_u_long word_dict_size; 38 mg_u_long tag_dict_start; 39 mg_u_long tag_dict_size; 40 mg_u_long num_docs; 41 mg_u_long num_frags; 42 mg_u_long num_words; 43 mg_u_long total_bytes; 44 mg_u_long index_string_bytes; 45 mg_u_long num_levels; 45 46 46 47 invf_dict_header (); … … 55 56 struct dict_el { 56 57 UCArray el; // word or tag 57 unsignedlong frag_occur;58 unsignedlong freq;58 mg_u_long frag_occur; 59 mg_u_long freq; 59 60 60 61 virtual void Clear (); … … 69 70 70 71 struct word_dict_el : public dict_el { 71 unsignedlong *levelFreqs;72 mg_u_long *levelFreqs; 72 73 73 74 void Clear (); … … 75 76 ~word_dict_el (); 76 77 77 void SetNumLevels ( unsignedlong numLevels);78 void SetNumLevels (mg_u_long numLevels); 78 79 79 80 // SetNumLevels should be called before either … … 81 82 82 83 // Read assumes that the last word is in el 83 bool Read (FILE *f, unsignedlong numLevels);84 bool Read (FILE *f, mg_u_long numLevels); 84 85 bool Write (FILE *f, const UCArray *lastEl, 85 unsignedlong numLevels) const;86 mg_u_long numLevels) const; 86 87 }; 87 88 … … 100 101 // for blocked dictionaries 101 102 102 unsignedlong entries_per_wblk; // word blocks103 unsignedlong num_wblks;104 unsignedlong max_wblk_size;105 unsignedlong wblk_start;106 unsignedlong wblk_idx_start;107 108 unsignedlong entries_per_tblk; // tag blocks109 unsignedlong num_tblks;110 unsignedlong max_tblk_size;111 unsignedlong tblk_start;112 unsignedlong tblk_idx_start;103 mg_u_long entries_per_wblk; // word blocks 104 mg_u_long num_wblks; 105 mg_u_long max_wblk_size; 106 mg_u_long wblk_start; 107 mg_u_long wblk_idx_start; 108 109 mg_u_long entries_per_tblk; // tag blocks 110 mg_u_long num_tblks; 111 mg_u_long max_tblk_size; 112 mg_u_long tblk_start; 113 mg_u_long tblk_idx_start; 113 114 114 115 block_dict_header (); … … 122 123 struct block_dict_el { 123 124 UCArray el; // word or tag 124 unsignedlong frag_occur; // # entries in invf file - if have a125 mg_u_long frag_occur; // # entries in invf file - if have a 125 126 // word level index, this is the same as freq, otherwise, its the number 126 127 // of fragments containing this word 127 unsignedlong freq; // # of times this word occurs128 unsignedlong invf_ptr; // pointer into inverted file128 mg_u_long freq; // # of times this word occurs 129 mg_u_long invf_ptr; // pointer into inverted file 129 130 130 131 virtual void Clear (); … … 140 141 141 142 struct word_block_dict_el : public block_dict_el { 142 unsignedlong *levelFreqs; // freq of the word at each level143 mg_u_long *levelFreqs; // freq of the word at each level 143 144 144 145 void Clear (); … … 146 147 ~word_block_dict_el (); 147 148 148 void SetNumLevels ( unsignedlong numLevels);149 void SetNumLevels (mg_u_long numLevels); 149 150 150 151 // SetNumLevels should be called before either … … 152 153 153 154 // Read assumes that the last word is in el 154 bool Read (FILE *f, unsignedlong numLevels);155 bool Read (FILE *f, mg_u_long numLevels); 155 156 bool Write (FILE *f, const UCArray *lastEl, 156 unsignedlong numLevels) const;157 mg_u_long numLevels) const; 157 158 }; 158 159 … … 161 162 struct block_idx_info { 162 163 UCArray el; 163 unsignedlong block_ptr;164 mg_u_long block_ptr; 164 165 165 166 block_idx_info (); … … 179 180 180 181 struct stem_idx_header { 181 unsignedlong lookback;182 unsignedlong dict_size;183 184 unsignedlong entries_per_block;185 unsignedlong num_blocks;186 unsignedlong max_block_size;187 unsignedlong blocks_start;188 unsignedlong block_idx_start;189 190 unsignedlong stemmer_num;191 unsignedlong stem_method;182 mg_u_long lookback; 183 mg_u_long dict_size; 184 185 mg_u_long entries_per_block; 186 mg_u_long num_blocks; 187 mg_u_long max_block_size; 188 mg_u_long blocks_start; 189 mg_u_long block_idx_start; 190 191 mg_u_long stemmer_num; 192 mg_u_long stem_method; 192 193 193 194 stem_idx_header (); … … 200 201 struct stem_block_dict_el { 201 202 UCArray el; // word or tag 202 vector< unsignedlong> equivWords;203 vector<mg_u_long> equivWords; 203 204 204 205 stem_block_dict_el (); … … 220 221 // with num entries, and a pointer into invf file 221 222 struct invf_file_header { 222 unsignedlong no_of_words;223 unsignedlong no_of_tags;224 unsignedlong skip_mode;225 unsignedlong word_level_index; // 1 if word level index226 unsignedlong params[16];223 mg_u_long no_of_words; 224 mg_u_long no_of_tags; 225 mg_u_long skip_mode; 226 mg_u_long word_level_index; // 1 if word level index 227 mg_u_long params[16]; 227 228 228 229 invf_file_header (); … … 242 243 // the block index is sorted by DictCompare (or DictLTUCArray) 243 244 bool SearchElNum (const block_idx &bIdx, 244 unsignedlong entriesPerBlock,245 unsignedlong elNum,246 unsignedlong &blockIdxNum,247 unsignedlong &blockStartElNum);245 mg_u_long entriesPerBlock, 246 mg_u_long elNum, 247 mg_u_long &blockIdxNum, 248 mg_u_long &blockStartElNum); 248 249 bool SearchEl (const block_idx &bIdx, 249 unsignedlong entriesPerBlock,250 mg_u_long entriesPerBlock, 250 251 const UCArray &el, 251 unsignedlong &blockIdxNum,252 unsignedlong &blockStartElNum);252 mg_u_long &blockIdxNum, 253 mg_u_long &blockStartElNum); 253 254 254 255 … … 258 259 bool SearchBlockDictElNum (FILE *dictFile, 259 260 const block_idx &bIdx, 260 unsignedlong entriesPerBlock,261 unsignedlong dictSize,262 unsignedlong elNum,261 mg_u_long entriesPerBlock, 262 mg_u_long dictSize, 263 mg_u_long elNum, 263 264 block_dict_el &dictEl); 264 265 bool SearchBlockDictEl (FILE *dictFile, 265 266 const block_idx &bIdx, 266 unsignedlong entriesPerBlock,267 unsignedlong dictSize,267 mg_u_long entriesPerBlock, 268 mg_u_long dictSize, 268 269 const UCArray &el, 269 270 block_dict_el &dictEl, 270 unsignedlong &elNum);271 mg_u_long &elNum); 271 272 272 273 // assumes the numLevels has been set for dictEl 273 274 bool SearchWordBlockDictElNum (FILE *dictFile, 274 275 const block_idx &bIdx, 275 unsignedlong entriesPerBlock,276 unsignedlong dictSize,277 unsignedlong numLevels,278 unsignedlong elNum,276 mg_u_long entriesPerBlock, 277 mg_u_long dictSize, 278 mg_u_long numLevels, 279 mg_u_long elNum, 279 280 word_block_dict_el &dictEl); 280 281 bool SearchWordBlockDictEl (FILE *dictFile, 281 282 const block_idx &bIdx, 282 unsignedlong entriesPerBlock,283 unsignedlong dictSize,284 unsignedlong numLevels,283 mg_u_long entriesPerBlock, 284 mg_u_long dictSize, 285 mg_u_long numLevels, 285 286 const UCArray &el, 286 287 word_block_dict_el &dictEl, 287 unsignedlong &elNum);288 mg_u_long &elNum); 288 289 289 290 bool SearchStemBlockDictElNum (FILE *dictFile, 290 291 const block_idx &bIdx, 291 unsignedlong entriesPerBlock,292 unsignedlong dictSize,293 unsignedlong elNum,292 mg_u_long entriesPerBlock, 293 mg_u_long dictSize, 294 mg_u_long elNum, 294 295 stem_block_dict_el &dictEl); 295 296 bool SearchStemBlockDictEl (FILE *dictFile, 296 297 const block_idx &bIdx, 297 unsignedlong entriesPerBlock,298 unsignedlong dictSize,298 mg_u_long entriesPerBlock, 299 mg_u_long dictSize, 299 300 const UCArray &el, 300 301 stem_block_dict_el &dictEl, 301 unsignedlong &elNum);302 mg_u_long &elNum); 302 303 303 304 //----------------------------------------------------- … … 307 308 bool PartialMatchSearchWordBlockDictEl (FILE *dictFile, 308 309 const block_idx &bIdx, 309 unsignedlong entriesPerBlock,310 unsignedlong dictSize,311 unsignedlong numLevels,310 mg_u_long entriesPerBlock, 311 mg_u_long dictSize, 312 mg_u_long numLevels, 312 313 const UCArray &el, 313 314 word_block_dict_el &dictEl, 314 vector< unsignedlong> &elNumList,315 vector<mg_u_long> &elNumList, 315 316 bool casefold); 316 317 //---------------------------------------------------------- … … 320 321 bool NearestSearchWordBlockDictEl (FILE *dictFile, 321 322 const block_idx &bIdx, 322 unsignedlong entriesPerBlock,323 unsignedlong dictSize,324 unsignedlong numLevels,323 mg_u_long entriesPerBlock, 324 mg_u_long dictSize, 325 mg_u_long numLevels, 325 326 const UCArray &el, 326 327 word_block_dict_el &dictEl, 327 unsignedlong &elNum);328 mg_u_long &elNum); 328 329 329 330 // returns a list of word_block_dict_el, with no levelfreqs 330 331 bool SearchWordBlockDictElNumRange (FILE *dictFile, 331 332 const block_idx &bIdx, 332 unsignedlong entriesPerBlock,333 unsignedlong dictSize,334 unsignedlong numLevels,335 unsignedlong elNum,336 unsignedlong numWords,333 mg_u_long entriesPerBlock, 334 mg_u_long dictSize, 335 mg_u_long numLevels, 336 mg_u_long elNum, 337 mg_u_long numWords, 337 338 word_block_dict_el_array &terms); 338 339 … … 340 341 bool SearchWordBlockDictElNumRange (FILE *dictFile, 341 342 const block_idx &bIdx, 342 unsignedlong entriesPerBlock,343 unsignedlong dictSize,344 unsignedlong numLevels,345 unsignedlong elNum,346 unsignedlong numWords,343 mg_u_long entriesPerBlock, 344 mg_u_long dictSize, 345 mg_u_long numLevels, 346 mg_u_long elNum, 347 mg_u_long numWords, 347 348 UCArrayVector &terms); 348 349 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/ivf.pass1.cpp
r16583 r23508 51 51 // structure to determine level information 52 52 struct LevelWorker { 53 unsignedlong lastLevelDocNum;54 unsignedlong count;53 mg_u_long lastLevelDocNum; 54 mg_u_long count; 55 55 56 56 LevelWorker () { … … 62 62 // note: the word is stored in the map 63 63 struct IvfWordInfo { 64 unsignedlong wordCount; // word frequency65 unsignedlong fragCount; // number of fragments that contain the word66 unsignedlong lastFragNum; // last fragment to contain the word67 unsignedlong chunkWordCount; // word frequency within this chunk68 unsignedlong chunkFragCount; // number of fragments within this chunk that64 mg_u_long wordCount; // word frequency 65 mg_u_long fragCount; // number of fragments that contain the word 66 mg_u_long lastFragNum; // last fragment to contain the word 67 mg_u_long chunkWordCount; // word frequency within this chunk 68 mg_u_long chunkFragCount; // number of fragments within this chunk that 69 69 // contain the word 70 70 … … 81 81 // tags don't require as much information 82 82 struct IvfTagInfo { 83 unsignedlong tagCount; // tag frequency84 unsignedlong fragCount; // number of fragments that contain the tag85 unsignedlong lastFragNum; // last fragment to contain the tag86 unsignedlong chunkFragCount; // number of fragments within this chunk that83 mg_u_long tagCount; // tag frequency 84 mg_u_long fragCount; // number of fragments that contain the tag 85 mg_u_long lastFragNum; // last fragment to contain the tag 86 mg_u_long chunkFragCount; // number of fragments within this chunk that 87 87 // contain the tag 88 88 … … 109 109 IvfTagInfoItArray ivfTagInfoOccurOrder; 110 110 111 static unsignedlong chunksWritten;112 static unsignedlong maxMemNeeded;113 114 static unsignedlong numDocs;115 static unsignedlong numChunkDocs;116 117 static unsignedlong numFrags;118 static unsignedlong numChunkFrags;119 120 static unsignedlong numWords;111 static mg_u_long chunksWritten; 112 static mg_u_long maxMemNeeded; 113 114 static mg_u_long numDocs; 115 static mg_u_long numChunkDocs; 116 117 static mg_u_long numFrags; 118 static mg_u_long numChunkFrags; 119 120 static mg_u_long numWords; 121 121 122 122 // the number of document numbers in the inverted file 123 static unsignedlong numChunkEntries;123 static mg_u_long numChunkEntries; 124 124 125 125 // next entry in the inverted file to check memory 126 126 // requirements for the current chunk 127 static unsignedlong entryCheckPoint;127 static mg_u_long entryCheckPoint; 128 128 129 129 // information about all the different levels … … 173 173 MAGIC_CHUNK, MG_MESSAGE))) 174 174 return COMPERROR; 175 fwrite (" ", sizeof ( u_long), 1, ic); // Space for the maxmem175 fwrite (" ", sizeof (mg_u_long), 1, ic); // Space for the maxmem 176 176 icb.attachFile (ic); 177 177 icb.encodeStart(); … … 195 195 196 196 numChunkEntries = 0; 197 entryCheckPoint = ( unsignedlong) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);197 entryCheckPoint = (mg_u_long) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV); 198 198 199 199 // init the level information … … 347 347 348 348 349 static unsignedlong MemoryRequired (bool wordLevelIndex) {350 register unsignedlong total = 0;349 static mg_u_long MemoryRequired (bool wordLevelIndex) { 350 register mg_u_long total = 0; 351 351 352 352 // add memory required for word entries … … 372 372 if (info.chunkFragCount > 0) { 373 373 // two d entries for each frag entry 374 unsignedlong pTag = info.chunkFragCount*2;374 mg_u_long pTag = info.chunkFragCount*2; 375 375 total += BIO_Bblock_Bound (numChunkFrags+pTag, pTag); 376 376 } … … 385 385 386 386 /* 387 static void PrintChunkInfo ( unsignedlong mem) {387 static void PrintChunkInfo (mg_u_long mem) { 388 388 cout << "Chunk Number: " << chunksWritten << "\n"; 389 389 cout << "numChunkDocs " << numChunkDocs << "\n"; … … 396 396 IvfTagInfoMap::iterator tagMapHere = ivfTagInfo.begin(); 397 397 IvfTagInfoMap::iterator tagMapEnd = ivfTagInfo.end(); 398 unsignedlong tagNum = 0;398 mg_u_long tagNum = 0; 399 399 while (tagMapHere != tagMapEnd) { 400 400 cout << (*tagMapHere).first << " " << tagNum … … 406 406 */ 407 407 408 static void OutputChunkInfo ( unsignedlong mem, bool /*wordLevelIndex*/) {408 static void OutputChunkInfo (mg_u_long mem, bool /*wordLevelIndex*/) { 409 409 ++chunksWritten; 410 410 … … 493 493 // check the amount of memory needed for this chunk 494 494 if (numChunkEntries >= entryCheckPoint) { 495 unsignedlong mem = MemoryRequired (wordLevelIndex);495 mg_u_long mem = MemoryRequired (wordLevelIndex); 496 496 if (mem >= invf_buffer_size * CHECK_CLOSE) { 497 497 if (mem > maxMemNeeded) maxMemNeeded = mem; 498 498 OutputChunkInfo (mem, wordLevelIndex); 499 entryCheckPoint = ( unsignedlong)499 entryCheckPoint = (mg_u_long) 500 500 ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV); 501 501 502 502 } else { 503 entryCheckPoint = ( unsignedlong)503 entryCheckPoint = (mg_u_long) 504 504 (entryCheckPoint * ((CHECK_FRAC * (invf_buffer_size - mem)) / mem) + 505 505 entryCheckPoint); … … 513 513 514 514 515 static void CalcInvfDictSize ( unsignedlong &totalBytes,516 unsignedlong &indexStringBytes) {515 static void CalcInvfDictSize (mg_u_long &totalBytes, 516 mg_u_long &indexStringBytes) { 517 517 totalBytes = 0; // The sum of the length of all words, including 518 518 // the length byte … … 526 526 IvfWordInfoMap::iterator wordEnd = ivfWordInfo.end(); 527 527 while (wordHere != wordEnd) { 528 unsignedlong wordSize = (*wordHere).first.size();528 mg_u_long wordSize = (*wordHere).first.size(); 529 529 totalBytes += wordSize + 1; 530 530 indexStringBytes += wordSize + 2; … … 541 541 IvfTagInfoMap::iterator tagEnd = ivfTagInfo.end(); 542 542 while (tagHere != tagEnd) { 543 unsignedlong tagSize = (*tagHere).first.size();543 mg_u_long tagSize = (*tagHere).first.size(); 544 544 totalBytes += tagSize + 1; 545 545 indexStringBytes += tagSize + 2; … … 642 642 643 643 // write out the updated header 644 fseek (sp, sizeof ( u_long), SEEK_SET);644 fseek (sp, sizeof (mg_u_long), SEEK_SET); 645 645 if (!idh.Write (sp)) { fclose (sp); return; } 646 646 … … 691 691 692 692 // write out the word translation table 693 unsignedlong wordDictSize = ivfWordInfoOccurOrder.size();693 mg_u_long wordDictSize = ivfWordInfoOccurOrder.size(); 694 694 IvfWordInfoItArray::iterator wordItHere = ivfWordInfoOccurOrder.begin(); 695 695 IvfWordInfoItArray::iterator wordItEnd = ivfWordInfoOccurOrder.end(); 696 unsignedlong oN = 0;696 mg_u_long oN = 0; 697 697 while (wordItHere != wordItEnd) { 698 698 register IvfWordInfo &ivfWordInfo = (*(*wordItHere)).second; … … 703 703 704 704 // write out the tag translation table 705 unsignedlong tagDictSize = ivfTagInfoOccurOrder.size();705 mg_u_long tagDictSize = ivfTagInfoOccurOrder.size(); 706 706 IvfTagInfoItArray::iterator tagItHere = ivfTagInfoOccurOrder.begin(); 707 707 IvfTagInfoItArray::iterator tagItEnd = ivfTagInfoOccurOrder.end(); … … 737 737 738 738 char *temp_str = msg_prefix; 739 msg_prefix = "ivf.pass1";739 msg_prefix = (char*)"ivf.pass1"; 740 740 741 741 // output the last chunk 742 742 if (numChunkDocs > 0) { 743 unsignedlong mem = MemoryRequired (wordLevelIndex);743 mg_u_long mem = MemoryRequired (wordLevelIndex); 744 744 OutputChunkInfo (mem, wordLevelIndex); 745 745 if (mem > maxMemNeeded) maxMemNeeded = mem; … … 751 751 752 752 // write out the maximum memory required and close the file 753 fseek (ic, sizeof ( long), 0);753 fseek (ic, sizeof (mg_u_long), 0); 754 754 WriteUL (ic, maxMemNeeded); 755 755 fclose (ic); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/ivf.pass2.cpp
r19822 r23508 79 79 80 80 81 static unsignedlong numDocs = 0;82 static unsignedlong numChunkDocs = 0;83 static unsignedlong numDocsInChunk = 0;84 85 static unsignedlong numFrags = 0;86 static unsignedlong numFragsInChunk = 0;87 static unsignedlong chunkStartFragNum = 0;81 static mg_u_long numDocs = 0; 82 static mg_u_long numChunkDocs = 0; 83 static mg_u_long numDocsInChunk = 0; 84 85 static mg_u_long numFrags = 0; 86 static mg_u_long numFragsInChunk = 0; 87 static mg_u_long chunkStartFragNum = 0; 88 88 89 89 … … 91 91 92 92 struct BitPtr { 93 unsignedlong start;94 unsignedlong here;95 unsignedlong lastFragNum;96 unsignedlong lgB;93 mg_u_long start; 94 mg_u_long here; 95 mg_u_long lastFragNum; 96 mg_u_long lgB; 97 97 98 98 void Clear () { start = here = lastFragNum = lgB = 0; } … … 102 102 class WordBitPtrs { 103 103 protected: 104 unsignedlong numWords;105 unsignedlong numTags;106 unsignedlong size;104 mg_u_long numWords; 105 mg_u_long numTags; 106 mg_u_long size; 107 107 BitPtr *wordBitPtrs; 108 108 109 void CheckBufOverrun ( unsignedlong num) {109 void CheckBufOverrun (mg_u_long num) { 110 110 if (wordBitPtrs[num].here > wordBitPtrs[num+1].start) { 111 111 cerr << "numDocs: " << numDocs << "\n"; … … 127 127 WordBitPtrs () { wordBitPtrs = NULL; Clear(); } 128 128 ~WordBitPtrs (); 129 void SetSize ( unsignedlong _numWords,130 unsignedlong _numTags);129 void SetSize (mg_u_long _numWords, 130 mg_u_long _numTags); 131 131 132 132 void ResetPtrs () { 133 133 if (wordBitPtrs == NULL) return; 134 unsignedlong i;134 mg_u_long i; 135 135 for (i=0; i<size; ++i) wordBitPtrs[i].Clear(); 136 136 } 137 137 138 BitPtr &GetWordBitPtr ( unsignedlong wordNum)138 BitPtr &GetWordBitPtr (mg_u_long wordNum) 139 139 { return wordBitPtrs[wordNum]; } 140 unsigned long &GetWordStart (unsignedlong wordNum)140 mg_u_long &GetWordStart (mg_u_long wordNum) 141 141 { return wordBitPtrs[wordNum].start; } 142 unsigned long &GetWordHere (unsignedlong wordNum)142 mg_u_long &GetWordHere (mg_u_long wordNum) 143 143 { return wordBitPtrs[wordNum].here; } 144 void CheckWordBufOverrun ( unsignedlong wordNum)144 void CheckWordBufOverrun (mg_u_long wordNum) 145 145 { CheckBufOverrun (wordNum); } 146 146 147 BitPtr &GetTagBitPtr ( unsignedlong tagNum)147 BitPtr &GetTagBitPtr (mg_u_long tagNum) 148 148 { return wordBitPtrs[tagNum + numWords]; } 149 unsigned long &GetTagStart (unsignedlong tagNum)149 mg_u_long &GetTagStart (mg_u_long tagNum) 150 150 { return wordBitPtrs[tagNum + numWords].start; } 151 unsigned long &GetTagHere (unsignedlong tagNum)151 mg_u_long &GetTagHere (mg_u_long tagNum) 152 152 { return wordBitPtrs[tagNum + numWords].here; } 153 void CheckTagBufOverrun ( unsignedlong tagNum)153 void CheckTagBufOverrun (mg_u_long tagNum) 154 154 { CheckBufOverrun (tagNum + numWords); } 155 155 156 156 BitPtr &GetEndBitPtr () 157 157 { return wordBitPtrs[size-1]; } 158 unsignedlong &GetEndStart ()158 mg_u_long &GetEndStart () 159 159 { return wordBitPtrs[size-1].start; } 160 unsignedlong &GetEndHere ()160 mg_u_long &GetEndHere () 161 161 { return wordBitPtrs[size-1].here; } 162 162 }; … … 165 165 struct IP2TagInfo { 166 166 bool inTag; 167 unsignedlong startFrag;168 unsignedlong tagNum;167 mg_u_long startFrag; 168 mg_u_long tagNum; 169 169 170 170 IP2TagInfo () { … … 183 183 class OccurToDictConverter { 184 184 protected: 185 unsignedlong pos;186 unsignedlong val;185 mg_u_long pos; 186 mg_u_long val; 187 187 FILE *transFile; 188 188 random_bitio_buffer rbs; 189 189 190 unsignedlong wordDictSize;191 unsignedlong tagDictSize;190 mg_u_long wordDictSize; 191 mg_u_long tagDictSize; 192 192 193 193 void SeekStart (); 194 unsigned long TranslateNum (unsignedlong num);194 mg_u_long TranslateNum (mg_u_long num); 195 195 196 196 public: … … 198 198 ~OccurToDictConverter (); 199 199 200 void Open (char *filename, unsignedlong _wordDictSize,201 unsignedlong _tagDictSize);200 void Open (char *filename, mg_u_long _wordDictSize, 201 mg_u_long _tagDictSize); 202 202 203 203 // Close frees all allocated memory 204 204 void Close (); 205 205 206 unsigned long TranslateWord (unsignedlong occurNum)206 mg_u_long TranslateWord (mg_u_long occurNum) 207 207 { return TranslateNum (occurNum); } 208 unsigned long TranslateTag (unsignedlong occurNum)208 mg_u_long TranslateTag (mg_u_long occurNum) 209 209 { return TranslateNum (occurNum+wordDictSize); } 210 210 }; … … 214 214 mg_ullong start; 215 215 mg_ullong here; 216 unsignedlong lastFragNum;217 unsignedlong B;216 mg_u_long lastFragNum; 217 mg_u_long B; 218 218 219 219 void Clear () { … … 230 230 protected: 231 231 InvfStateRec recCache [ISR_SIZE]; 232 unsignedlong startNum;232 mg_u_long startNum; 233 233 234 234 FILE *stateFile; … … 248 248 // previous references to state records may be 249 249 // invalidated calling GetRec 250 InvfStateRec &GetRec ( unsignedlong num);250 InvfStateRec &GetRec (mg_u_long num); 251 251 }; 252 252 … … 258 258 static stdio_bitio_buffer chunkBuf; 259 259 260 static unsignedlong ivfMemBufSize = 0;260 static mg_u_long ivfMemBufSize = 0; 261 261 static char *ivfMemBuf = NULL; 262 262 … … 290 290 } 291 291 292 void WordBitPtrs::SetSize ( unsignedlong _numWords,293 unsignedlong _numTags){292 void WordBitPtrs::SetSize (mg_u_long _numWords, 293 mg_u_long _numTags){ 294 294 Clear(); 295 295 numWords = _numWords; … … 302 302 void OccurToDictConverter::SeekStart () { 303 303 if (transFile == NULL) return; 304 rbs.SEEK_X (sizeof ( unsignedlong) * 8);304 rbs.SEEK_X (sizeof (mg_u_long) * 8); 305 305 pos = 0; 306 306 } 307 307 308 unsigned long OccurToDictConverter::TranslateNum (unsignedlong num) {308 mg_u_long OccurToDictConverter::TranslateNum (mg_u_long num) { 309 309 if (num < pos) SeekStart (); 310 310 while (pos <= num) { … … 330 330 } 331 331 332 void OccurToDictConverter::Open (char *filename, unsignedlong _wordDictSize,333 unsignedlong _tagDictSize) {332 void OccurToDictConverter::Open (char *filename, mg_u_long _wordDictSize, 333 mg_u_long _tagDictSize) { 334 334 if (transFile != NULL) Close (); 335 335 … … 374 374 // open the state file 375 375 char path[512]; 376 sprintf (path, FILE_NAME_FORMAT ".% ld", get_basepath (), filename,377 ".invf.state", ( long) getpid ());376 sprintf (path, FILE_NAME_FORMAT ".%d", get_basepath (), filename, 377 ".invf.state", (mg_s_long) getpid ()); 378 378 if (!(stateFile = fopen (path, "wb+"))) { 379 379 Message ("Unable to create \"%s\"", path); … … 393 393 } 394 394 395 InvfStateRec &InvfStateCache::GetRec ( unsignedlong num) {395 InvfStateRec &InvfStateCache::GetRec (mg_u_long num) { 396 396 // see if cached 397 397 if ((num >= startNum) && (num < startNum + ISR_SIZE)) … … 406 406 startNum = num - (num % ISR_SIZE); 407 407 fseek (stateFile, startNum*sizeof (InvfStateRec), SEEK_SET); 408 fread ((char *) recCache, sizeof (InvfStateRec), ISR_SIZE, stateFile); 408 size_t numbytes = fread ((char *) recCache, sizeof (InvfStateRec), ISR_SIZE, stateFile); 409 if (numbytes != ISR_SIZE){ 410 #ifdef DEBUG 411 fprintf(stderr, "[mgpp/text/ivf.pass2.cpp L410] number of bytes read by fread does not match the requested amount\n"); 412 #endif 413 } 409 414 410 415 return recCache[num-startNum]; … … 413 418 414 419 415 static void ClearCharBuf (char *buf, unsignedlong size) {420 static void ClearCharBuf (char *buf, mg_u_long size) { 416 421 char *end = buf + size; 417 422 while (buf != end) *buf++ = 0; … … 436 441 fseek (dictFile, _idh.tag_dict_start, SEEK_SET); 437 442 438 unsignedlong tagNum;443 mg_u_long tagNum; 439 444 dict_el thisEl; 440 445 for (tagNum = 0; tagNum < _idh.tag_dict_size; ++tagNum) { … … 456 461 void CheckIntOverflow (mg_ullong totalIBits, mg_ullong lastTotalIBits) { 457 462 if (totalIBits < lastTotalIBits) { 458 fprintf(stderr, "ERROR: The totalIBits counter (% dbyte unsigned integer) has overflowed.\n", sizeof (mg_ullong));463 fprintf(stderr, "ERROR: The totalIBits counter (%lu byte unsigned integer) has overflowed.\n", sizeof (mg_ullong)); 459 464 if (sizeof (mg_ullong) < 8) { 460 465 fprintf(stderr, " Try compiling with GCC to enable use of 8 bytes for this counter.\n"); … … 481 486 word_dict_el wordEl; 482 487 wordEl.SetNumLevels (_idh.num_levels); 483 unsignedlong dictWordNum, p;488 mg_u_long dictWordNum, p; 484 489 mg_ullong lastTotalIBits; 485 unsignedlong N = _idh.num_frags;490 mg_u_long N = _idh.num_frags; 486 491 for (dictWordNum=0; dictWordNum<_idh.word_dict_size; ++dictWordNum) { 487 492 // lastTotalIBits is used to detect integer overflow … … 521 526 // add the tag entries 522 527 dict_el tagEl; 523 unsignedlong dictTagNum;528 mg_u_long dictTagNum; 524 529 N = _idh.num_frags; 525 530 for (dictTagNum=0; dictTagNum<_idh.tag_dict_size; ++dictTagNum) { … … 556 561 /* 557 562 // assumes the chunk tag information has been placed in .first 558 static void PrintChunkInfo ( unsignedlong chunkMem,559 unsignedlong numChunkWords,560 unsignedlong numChunkTags) {561 static unsignedlong chunksRead = 0;563 static void PrintChunkInfo (mg_u_long chunkMem, 564 mg_u_long numChunkWords, 565 mg_u_long numChunkTags) { 566 static mg_u_long chunksRead = 0; 562 567 ++chunksRead; 563 568 cout << "Chunk Number: " << chunksRead << "\n"; … … 571 576 TagMapDict::iterator tagMapEnd = tagMapDict.end(); 572 577 while (tagMapHere != tagMapEnd) { 573 unsignedlong tagMapNum = (*tagMapHere).second.tagNum;578 mg_u_long tagMapNum = (*tagMapHere).second.tagNum; 574 579 cout << (*tagMapHere).first << " " << tagMapNum << " " 575 580 << bitPtrs.GetTagBitPtr(tagMapNum).here << "\n"; … … 590 595 591 596 numFragsInChunk = chunkBuf.gamma_decode (NULL) - 1; 592 unsignedlong chunkMem = chunkBuf.gamma_decode (NULL) - 1;597 mg_u_long chunkMem = chunkBuf.gamma_decode (NULL) - 1; 593 598 594 599 if (chunkMem > ivfMemBufSize) 595 600 FatalError (1, "Chunk memory size is greater than maximum"); 596 601 597 unsignedlong numChunkWords = chunkBuf.gamma_decode (NULL) - 1;598 unsignedlong numChunkTags = chunkBuf.gamma_decode (NULL) - 1;602 mg_u_long numChunkWords = chunkBuf.gamma_decode (NULL) - 1; 603 mg_u_long numChunkTags = chunkBuf.gamma_decode (NULL) - 1; 599 604 600 605 … … 606 611 // "chunkWordCount" in "start" and the "chunkFragCount" 607 612 // in "here" 608 unsignedlong numOccur;609 unsignedlong wordNum;613 mg_u_long numOccur; 614 mg_u_long wordNum; 610 615 for (numOccur=0; numOccur<numChunkWords; ++numOccur) { 611 616 wordNum = occurConvert.TranslateWord (numOccur); … … 616 621 else wordPtr.here = wordPtr.start; 617 622 } 618 unsignedlong tagNum;623 mg_u_long tagNum; 619 624 for (numOccur=0; numOccur<numChunkTags; ++numOccur) { 620 625 tagNum = occurConvert.TranslateTag (numOccur); … … 628 633 629 634 // create the bit ptrs in dictionary order 630 unsignedlong totalIBits = 0; // only dealing with memory631 unsignedlong chunkWordCount, chunkFragCount;635 mg_u_long totalIBits = 0; // only dealing with memory 636 mg_u_long chunkWordCount, chunkFragCount; 632 637 for (wordNum=0; wordNum<_idh.word_dict_size; ++wordNum) { 633 638 BitPtr &wordPtr = bitPtrs.GetWordBitPtr (wordNum); … … 656 661 tagPtr.lgB = 0; 657 662 if (chunkFragCount > 0) { 658 unsignedlong pTag = chunkFragCount*2;663 mg_u_long pTag = chunkFragCount*2; 659 664 tagPtr.lgB = floorlog_2 (BIO_Bblock_Init_W (numFragsInChunk+pTag, 660 665 pTag)); 661 unsignedlong bLen = BIO_Bblock_Bound (numFragsInChunk+pTag,666 mg_u_long bLen = BIO_Bblock_Bound (numFragsInChunk+pTag, 662 667 pTag); 663 668 // cout << tagNum + _idh.word_dict_size << " "; … … 732 737 FILE *invfFile = create_file (filename, INVF_SUFFIX, "wb", 733 738 MAGIC_INVF, MG_ABORT); 734 totalIBits += sizeof ( unsignedlong) * 8; // magic number739 totalIBits += sizeof (mg_u_long) * 8; // magic number 735 740 totalIBits += 8 * 200; // 200 byte gap -- why?????? 736 741 fclose (invfFile); … … 748 753 // add this tag to the inverted list 749 754 BitPtr &tagBitPtr = bitPtrs.GetTagBitPtr (tInfo.tagNum); 750 unsignedlong endFrag = numFrags;755 mg_u_long endFrag = numFrags; 751 756 int b = 1 << tagBitPtr.lgB; 752 757 … … 822 827 if (wordLevelIndex) ++numFrags; 823 828 824 unsignedlong wordNum = perf_hash (wordHashDict, mgWord);829 mg_u_long wordNum = perf_hash (wordHashDict, mgWord); 825 830 826 831 /* … … 832 837 // add this word to the inverted list 833 838 BitPtr &wordBitPtr = bitPtrs.GetWordBitPtr (wordNum); 834 unsignedlong fragNum = numFrags;839 mg_u_long fragNum = numFrags; 835 840 int b = 1 << wordBitPtr.lgB; 836 841 … … 881 886 882 887 // write out the word information 883 unsignedlong wordNum;888 mg_u_long wordNum; 884 889 int b; 885 unsignedlong currFragNum;886 unsignedlong delta;887 unsignedlong currFreq;890 mg_u_long currFragNum; 891 mg_u_long delta; 892 mg_u_long currFreq; 888 893 for (wordNum=0; wordNum<idh.word_dict_size; ++wordNum) { 889 894 // go to the end of the last inverted file entry … … 916 921 917 922 // write out the tag information 918 unsignedlong tagNum;919 unsignedlong currTagStart;920 unsignedlong currTagEnd;923 mg_u_long tagNum; 924 mg_u_long currTagStart; 925 mg_u_long currTagEnd; 921 926 for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) { 922 927 // go to the end of the last inverted file entry … … 998 1003 999 1004 1000 static void CondenseInvfFile (char *filename, unsignedlong &bytesOutput) {1005 static void CondenseInvfFile (char *filename, mg_u_long &bytesOutput) { 1001 1006 FILE *inInvfFile = open_file (filename, INVF_SUFFIX, "rb", 1002 1007 MAGIC_INVF, MG_ABORT); … … 1005 1010 1006 1011 // skip the magic number 1007 fseek (outInvfFile, sizeof ( unsignedlong), SEEK_SET);1012 fseek (outInvfFile, sizeof (mg_u_long), SEEK_SET); 1008 1013 1009 1014 // write the inverted file header -- use defaults for most things … … 1017 1022 1018 1023 // process each meaningful byte in the file 1019 unsignedlong numEntries = ifh.no_of_words + ifh.no_of_tags;1020 unsignedlong entryNum;1024 mg_u_long numEntries = ifh.no_of_words + ifh.no_of_tags; 1025 mg_u_long entryNum; 1021 1026 mg_ullong lastStart = 0; 1022 1027 for (entryNum = 0; entryNum < numEntries; ++entryNum) { … … 1028 1033 lastStart = stateRec.start; 1029 1034 1030 unsignedlong oldEntryStart = stateRec.start >> 3;1031 unsignedlong oldEntryStartOver = stateRec.start & 7; // should be 01032 unsignedlong oldEntryEnd = (stateRec.here + 7) >> 3; // byte after end1033 unsignedlong oldEntryEndOver = stateRec.here & 7;1035 mg_u_long oldEntryStart = stateRec.start >> 3; 1036 mg_u_long oldEntryStartOver = stateRec.start & 7; // should be 0 1037 mg_u_long oldEntryEnd = (stateRec.here + 7) >> 3; // byte after end 1038 mg_u_long oldEntryEndOver = stateRec.here & 7; 1034 1039 1035 1040 fseek (inInvfFile, oldEntryStart, SEEK_SET); … … 1057 1062 Message ("Could not truncate invf."); 1058 1063 #else 1059 ftruncate (fileno (outInvfFile), bytesOutput); 1064 if(ftruncate (fileno (outInvfFile), bytesOutput) != 0) 1065 { 1066 fprintf(stderr, "Could not truncate invf"); 1067 } 1060 1068 #endif 1061 1069 … … 1063 1071 } 1064 1072 1065 static void OutputInvfIdx (char *filename, unsignedlong invfNumBytes) {1073 static void OutputInvfIdx (char *filename, mg_u_long invfNumBytes) { 1066 1074 FILE *invfIdxFile = create_file (filename, INVF_IDX_SUFFIX, "wb", 1067 1075 MAGIC_INVI, MG_ABORT); 1068 1076 1069 1077 // process each meaningful byte in the file 1070 unsignedlong numEntries = idh.word_dict_size + idh.tag_dict_size;1071 unsignedlong entryNum;1078 mg_u_long numEntries = idh.word_dict_size + idh.tag_dict_size; 1079 mg_u_long entryNum; 1072 1080 for (entryNum = 0; entryNum < numEntries; ++entryNum) { 1073 1081 InvfStateRec &stateRec = invfState.GetRec (entryNum); … … 1101 1109 // condense the inverted file and truncate it 1102 1110 // this function also writes out the inverted header 1103 unsignedlong invfNumBytes = 0;1111 mg_u_long invfNumBytes = 0; 1104 1112 CondenseInvfFile (filename, invfNumBytes); 1105 1113 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/locallib.cpp
r16583 r23508 75 75 76 76 int 77 huffcodebits ( unsignedlong *A, int n)77 huffcodebits (mg_u_long *A, int n) 78 78 { 79 79 int i, j, tot = 0, bits = 0, v1, v2, *B; … … 111 111 112 112 int 113 modelbits ( unsignedlong *A, int n)113 modelbits (mg_u_long *A, int n) 114 114 { 115 115 int i, bits = 0, last, N = 0; … … 159 159 160 160 161 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * /*mem*/,162 u_long * disk) {161 int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * /*mem*/, 162 mg_u_long * disk) { 163 163 if (disk) 164 164 (*disk) += sizeof (*cdh); … … 185 185 186 186 int 187 Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem,u_long * disk)187 Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk) 188 188 { 189 189 int i; /* [RPAP - Jan 97: Endian Ordering] */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/locallib.h
r16583 r23508 31 31 int vecentropy (int *A, int n); 32 32 33 int huffcodebits ( unsignedlong *A, int n);33 int huffcodebits (mg_u_long *A, int n); 34 34 35 int modelbits ( unsignedlong *A, int n);35 int modelbits (mg_u_long *A, int n); 36 36 37 37 int prime (int p); 38 38 39 39 40 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem,u_long * disk);40 int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, mg_u_long * disk); 41 41 42 int Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem,u_long * disk);42 int Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk); 43 43 44 44 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mg_errors.cpp
r19822 r23508 33 33 char *mg_errorstrs[] = 34 34 { 35 "No error",36 "Out of memory",37 "File \"%s\" not found",38 "Bad magic number in \"%s\"",39 "Error reading \"%s\"",40 "MG_BUFTOOSMALL",41 "Files required for level 2 and 3 inversion are missing"};35 (char*)"No error", 36 (char*)"Out of memory", 37 (char*)"File \"%s\" not found", 38 (char*)"Bad magic number in \"%s\"", 39 (char*)"Error reading \"%s\"", 40 (char*)"MG_BUFTOOSMALL", 41 (char*)"Files required for level 2 and 3 inversion are missing"}; 42 42 43 43 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mg_files.cpp
r22291 r23508 125 125 FILE * 126 126 open_named_file (const char *name, const char *mode, 127 u_long magic_num, int err_mode)128 { 129 unsignedlong magic;127 mg_u_long magic_num, int err_mode) 128 { 129 mg_u_long magic; 130 130 FILE *f = NULL; 131 131 char *err; … … 134 134 if (!f) 135 135 { 136 err = "Unable to open \"%s\"";136 err = (char*)"Unable to open \"%s\""; 137 137 goto error; 138 138 } … … 142 142 if (fread (&magic, sizeof (magic), 1, f) != 1) 143 143 { 144 err = "No magic number \"%s\"";144 err = (char*)"No magic number \"%s\""; 145 145 goto error; 146 146 } … … 150 150 if (!IS_MAGIC (magic)) 151 151 { 152 err = "No MG magic number \"%s\"";152 err = (char*)"No MG magic number \"%s\""; 153 153 goto error; 154 154 } … … 156 156 if (magic != magic_num) 157 157 { 158 err = "Wrong MG magic number \"%s\"";158 err = (char*)"Wrong MG magic number \"%s\""; 159 159 goto error; 160 160 } … … 187 187 FILE * 188 188 open_file (const char *name, const char *suffix, const char *mode, 189 u_long magic_num, int err_mode)189 mg_u_long magic_num, int err_mode) 190 190 { 191 191 char path[512]; … … 215 215 FILE * 216 216 create_named_file (const char *name, const char *mode, 217 u_long magic_num, int err_mode)217 mg_u_long magic_num, int err_mode) 218 218 { 219 219 FILE *f = NULL; … … 223 223 if (!f) 224 224 { 225 err = "Unable to open \"%s\"";225 err = (char*)"Unable to open \"%s\""; 226 226 goto error; 227 227 } … … 231 231 if (fwrite (&magic_num, sizeof (magic_num), 1, f) != 1) 232 232 { 233 err = "Couldn't write magic number \"%s\"";233 err = (char*)"Couldn't write magic number \"%s\""; 234 234 goto error; 235 235 } … … 267 267 FILE * 268 268 create_file (const char *name, const char *suffix, const char *mode, 269 u_long magic_num, int err_mode)269 mg_u_long magic_num, int err_mode) 270 270 { 271 271 char path[512]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mg_files.h
r16583 r23508 27 27 /* Magic numbers for the different types of files */ 28 28 29 #define GEN_MAGIC(a,b,c,d) (( unsignedlong)(((a)<<24) + ((b)<<16) + \29 #define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \ 30 30 ((c)<<8) + (d))) 31 31 … … 51 51 #define MAGIC_PARAGRAPH GEN_MAGIC('M','G','P', 0 ) 52 52 #define MAGIC_STEM_GEN(x) GEN_MAGIC('M', 'G', 's', x) 53 #define IS_MAGIC(a) (((( u_long)(a)) & 0xffff0000) == MAGIC_XXXX)53 #define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX) 54 54 55 55 … … 268 268 an error message. */ 269 269 FILE *open_named_file (const char *name, const char *mode, 270 u_long magic_num, int err_mode);270 mg_u_long magic_num, int err_mode); 271 271 272 272 … … 286 286 an error message. */ 287 287 FILE *open_file (const char *name, const char *suffix, const char *mode, 288 u_long magic_num, int err_mode);288 mg_u_long magic_num, int err_mode); 289 289 290 290 … … 305 305 an error message. */ 306 306 FILE *create_named_file (const char *name, const char *mode, 307 u_long magic_num, int err_mode);307 mg_u_long magic_num, int err_mode); 308 308 309 309 … … 322 322 an error message. */ 323 323 FILE *create_file (const char *name, const char *suffix, const char *mode, 324 u_long magic_num, int err_mode);325 326 327 328 329 #endif 324 mg_u_long magic_num, int err_mode); 325 326 327 328 329 #endif -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_compression_dict.cpp
r19822 r23508 53 53 #include "WordData.h" 54 54 55 #define MAXBITS (sizeof( unsignedlong) * 8)55 #define MAXBITS (sizeof(mg_u_long) * 8) 56 56 57 57 #define is_power_of_two(a) ((a) != 0 && (((a) & ((a)-1)) == 0)) … … 63 63 float saving; 64 64 float char_bit_cost; 65 u_long num_trans;65 mg_u_long num_trans; 66 66 u_char *word; 67 67 } … … 69 69 70 70 static DictWordData *Words[2]; 71 static u_long Num[2];72 static u_long chars[2];71 static mg_u_long Num[2]; 72 static mg_u_long chars[2]; 73 73 74 74 #define KIND(p) (((p) >= Words[0] && (p) < Words[0] + Num[0]) ? 0 : 1) … … 80 80 { 81 81 DictWordData **wd; 82 u_long num_wds;83 u_long chars;82 mg_u_long num_wds; 83 mg_u_long chars; 84 84 } 85 85 DictData; … … 90 90 static compression_stats_header csh; 91 91 92 static char *file_name = "";93 static u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;92 static char *file_name = (char*)""; 93 static mg_u_long novel_method = MG_NOVEL_HUFFMAN_CHARS; 94 94 95 95 … … 98 98 static void Method3 (int k); 99 99 static void Select_all (void); 100 static u_long WriteOutWords (char *,u_long, int);100 static mg_u_long WriteOutWords (char *, mg_u_long, int); 101 101 static int DecFreqIncWL (void *a, void *b); 102 102 static int OccuranceOrder (void *a, void *b); … … 111 111 int lookback = 2; 112 112 double k = 0; 113 u_long mem_reqd;113 mg_u_long mem_reqd; 114 114 opterr = 0; 115 115 msg_prefix = argv[0]; … … 224 224 { 225 225 FILE *f; 226 unsignedlong i;226 mg_u_long i; 227 227 f = open_file (filename, TEXT_STATS_DICT_SUFFIX, "rb", 228 228 MAGIC_STATS_DICT, MG_ABORT); /* [RPAP - Feb 97: WIN32 Port] */ … … 429 429 CalcCharCounts (DictWordData ** wd, int num, 430 430 char *char_lens[2], char *len_lens[2], 431 u_long escape[2])432 { 433 long char_freqs[2][256];434 long len_freqs[2][16];431 mg_u_long escape[2]) 432 { 433 mg_s_long char_freqs[2][256]; 434 mg_s_long len_freqs[2][16]; 435 435 huff_data hd; 436 436 int i; … … 441 441 for (i = 0; i < num; ++i, ++wd) 442 442 { 443 u_long freq = (*wd)->documents();443 mg_u_long freq = (*wd)->documents(); 444 444 u_char *buf = (*wd)->word; 445 445 int len = *buf++; … … 448 448 escape[idx] += freq; 449 449 for (; len; --len, ++buf) 450 char_freqs[idx][( u_long) (*buf)] += freq;450 char_freqs[idx][(mg_u_long) (*buf)] += freq; 451 451 } 452 452 Generate_Huffman_Data (256, char_freqs[0], &hd, NULL); … … 466 466 467 467 inline void CalcBitCostForWordData(DictWordData **word, int num, 468 double freqs_trans[2], u_long escape[2],468 double freqs_trans[2], mg_u_long escape[2], 469 469 char * char_lens[2], char *len_lens[2], 470 470 double esc[2], int num_trans) … … 477 477 u_char *buf = (*word)->word; 478 478 int len = *buf++; 479 u_long freq = (*word)->documents();479 mg_u_long freq = (*word)->documents(); 480 480 int idx = KIND (*word); 481 481 482 482 cbc = len_lens[idx][len]; 483 483 for (; len; --len, ++buf) 484 cbc += char_lens[idx][( u_long) (*buf)];484 cbc += char_lens[idx][(mg_u_long) (*buf)]; 485 485 486 486 (*word)->char_bit_cost = (cbc + esc[idx]) * freq; … … 500 500 CalcBitCost (DictWordData ** discard_word, int discard_num, 501 501 DictWordData ** keep_word, int keep_num, double freqs_trans[2], 502 u_long escape[2], int num_trans)502 mg_u_long escape[2], int num_trans) 503 503 { 504 504 char *char_lens[2]; … … 544 544 545 545 inline void m3_storeWord(DictWordData **wordHeap, int wordNum, int num_trans, 546 double freqs_trans[], u_long escape[], heap_comp hc)546 double freqs_trans[], mg_u_long escape[], heap_comp hc) 547 547 { 548 548 DictWordData *word = wordHeap[0]; … … 573 573 int recalcs = 0; 574 574 double freqs_trans[2], total; 575 u_long escape[2];575 mg_u_long escape[2]; 576 576 DictWordData **keep_heap, **discard_heap; 577 577 … … 769 769 770 770 771 static u_long771 static mg_u_long 772 772 Write_data (FILE * f, DictData * dd, int lookback) 773 773 { 774 u_long mem_reqd;774 mg_u_long mem_reqd; 775 775 huff_data *hd; 776 776 int i; 777 u_long us = dd->num_wds;778 long *freqs;779 u_long huff_words_size[MAX_HUFFCODE_LEN + 1];780 u_long lencounts[MAX_HUFFCODE_LEN + 1];777 mg_u_long us = dd->num_wds; 778 mg_s_long *freqs; 779 mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1]; 780 mg_u_long lencounts[MAX_HUFFCODE_LEN + 1]; 781 781 u_char *lastword[MAX_HUFFCODE_LEN + 1]; 782 782 783 if (!(freqs = new long [dd->num_wds]))783 if (!(freqs = new mg_s_long [dd->num_wds])) 784 784 FatalError (1, "Unable to allocate memory for freqs"); 785 785 … … 871 871 { 872 872 unsigned int j; 873 long freqs[256];873 mg_s_long freqs[256]; 874 874 DictWordData **wd = dd->wd; 875 875 huff_data *hd; … … 882 882 int len = *buf++; 883 883 for (; len; --len, ++buf) 884 freqs[( u_long) (*buf)] += (*wd)->documents();884 freqs[(mg_u_long) (*buf)] += (*wd)->documents(); 885 885 } 886 886 … … 907 907 { 908 908 unsigned int j; 909 long freqs[16];909 mg_s_long freqs[16]; 910 910 DictWordData **wd = dd->wd; 911 911 huff_data *hd; … … 934 934 935 935 936 static u_long937 WriteOutWords (char *file_name, u_long type, int lookback)936 static mg_u_long 937 WriteOutWords (char *file_name, mg_u_long type, int lookback) 938 938 { 939 939 FILE *f; 940 940 int i; 941 u_long mem_reqd = 0;941 mg_u_long mem_reqd = 0; 942 942 943 943 compression_dict_header cdh; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_decompress_text.cpp
r19822 r23508 39 39 int main (int argc, char **argv) { 40 40 int ch; 41 char *filename = "";42 char *basePath = "";41 char *filename = (char*)""; 42 char *basePath = (char*)""; 43 43 UCArray level; 44 44 SetCStr (level, "Document", 8); … … 78 78 79 79 TextLevelInfo levelInfo = td.levels.levelInfo[level]; 80 u nsignedlong docNum = 1;80 u_long docNum = 1; 81 81 UCArray docText; 82 82 while (docNum <= levelInfo.numEntries) { -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_fast_comp_dict.cpp
r19822 r23508 67 67 68 68 69 static u_long mem_for_comp_dict (char *filename);69 static mg_u_long mem_for_comp_dict (char *filename); 70 70 static void load_comp_dict (char *filename); 71 71 static void save_fast_dict (char *filename); … … 76 76 static void *cur; 77 77 static u_char *fixup; 78 static u_long mem, fixup_mem;78 static mg_u_long mem, fixup_mem; 79 79 80 80 int main (int argc, char **argv) 81 81 { 82 82 int ch; 83 char *filename = "";83 char *filename = (char*)""; 84 84 opterr = 0; 85 85 msg_prefix = argv[0]; … … 120 120 #endif 121 121 122 if ((u _long) cur > (u_long) buffer + mem)122 if ((uintptr_t) cur > (uintptr_t) buffer + mem) 123 123 FatalError (1, "The buffer was not big enough for the dictionary"); 124 124 … … 186 186 unfixup_buffer () 187 187 { 188 u _long*p;189 for (p = (u _long *) buffer; (u_long) p < (u_long) cur; ++p)188 uintptr_t *p; 189 for (p = (uintptr_t *) buffer; (uintptr_t) p < (uintptr_t) cur; ++p) 190 190 { 191 191 if (IS_FIXUP (p)) 192 *p = *p - (u _long) buffer;193 } 194 } 195 196 197 198 199 static u_long192 *p = *p - (uintptr_t) buffer; 193 } 194 } 195 196 197 198 199 static mg_u_long 200 200 mem_for_aux_dict (compression_dict_header * /*cdh*/, char *filename) 201 201 { 202 202 int i; 203 u_long mem = sizeof (auxiliary_dict);203 mg_u_long mem = sizeof (auxiliary_dict); 204 204 FILE *aux; 205 205 … … 224 224 225 225 226 static u_long226 static mg_u_long 227 227 mem_for_words (FILE * dict, compression_dict_header * cdh, 228 228 comp_frags_header * cfh) 229 229 { 230 u_long mem = 0;231 long i, lookback;230 mg_u_long mem = 0; 231 mg_s_long i, lookback; 232 232 int ptrs_reqd = 0; 233 233 int mem_reqd = 0; … … 254 254 } 255 255 256 static u_long mem_skip_hd(FILE *dict,u_long mem)256 static mg_u_long mem_skip_hd(FILE *dict, mg_u_long mem) 257 257 { huff_data hd; 258 258 … … 261 261 if (hd.clens) 262 262 delete []hd.clens; 263 mem += hd.num_codes * sizeof ( unsignedlong);264 mem += (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);263 mem += hd.num_codes * sizeof (mg_u_long); 264 mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 265 265 return mem; 266 266 } 267 267 268 static u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh,269 u_long mem)268 static mg_u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh, 269 mg_u_long mem) 270 270 { 271 271 mem += sizeof (comp_frags_header); … … 282 282 283 283 284 static u_long284 static mg_u_long 285 285 mem_for_comp_dict (char *filename) 286 286 { 287 u_long mem = sizeof (compression_dict);287 mg_u_long mem = sizeof (compression_dict); 288 288 compression_dict_header cdh; 289 289 comp_frags_header cfh; … … 360 360 361 361 void * 362 getmem ( u_long size, int align)362 getmem (mg_u_long size, int align) 363 363 { 364 364 void *res; 365 cur = (void *) (((u _long) cur + (align - 1)) & (~(align - 1)));365 cur = (void *) (((uintptr_t) cur + (align - 1)) & (~(align - 1))); 366 366 res = cur; 367 367 cur = (char *) cur + size; 368 if ((u _long) cur > (u_long)buffer + mem)368 if ((uintptr_t) cur > (uintptr_t)buffer + mem) 369 369 FatalError (1, "The buffer was not big enough for the dictionary"); 370 370 return res; … … 538 538 539 539 540 static unsignedlong **541 Generate_Fast_Huffman_Vals (huff_data * data, u_long * mem)540 static mg_u_long ** 541 Generate_Fast_Huffman_Vals (huff_data * data, mg_u_long * mem) 542 542 { 543 543 int i; 544 unsignedlong *fcode[MAX_HUFFCODE_LEN + 1];545 unsignedlong **values;546 unsignedlong *vals;544 mg_u_long *fcode[MAX_HUFFCODE_LEN + 1]; 545 mg_u_long **values; 546 mg_u_long *vals; 547 547 548 548 if (!data) 549 549 return (NULL); 550 vals = ( unsigned long *) getmem (data->num_codes * sizeof (*vals), sizeof (long *));551 values = ( unsigned long **) getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (unsignedlong *),552 sizeof ( long *));553 554 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *));550 vals = (mg_u_long *) getmem (data->num_codes * sizeof (*vals), sizeof (mg_s_long *)); 551 values = (mg_u_long **) getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *), 552 sizeof (mg_s_long *)); 553 554 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)); 555 555 556 556 if (mem) 557 557 *mem += data->num_codes * sizeof (*vals) + 558 (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);558 (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 559 559 560 560 fcode[0] = values[0] = &vals[0]; … … 576 576 { 577 577 huff_data *hd; 578 u_long **vals;578 mg_u_long **vals; 579 579 580 580 hd = (huff_data *) getmem (sizeof (huff_data), sizeof (char *)); … … 683 683 684 684 { 685 u _long*p;686 for (p = (u _long *) buffer; (u_long) p < (u_long) cur; ++p)685 uintptr_t *p; 686 for (p = (uintptr_t *) buffer; (uintptr_t) p < (uintptr_t) cur; ++p) 687 687 { 688 688 if (IS_FIXUP (p)) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict.cpp
r19822 r23508 41 41 #include "invf.h" 42 42 43 static void process_files (char *filename, unsignedlong entriesPerBlock) {43 static void process_files (char *filename, mg_u_long entriesPerBlock) { 44 44 // open the dictionary 45 45 FILE *dictFile = open_file (filename, INVF_DICT_SUFFIX, "rb", … … 83 83 84 84 85 unsignedlong wordNum;86 unsignedlong wordInvfPtr;85 mg_u_long wordNum; 86 mg_u_long wordInvfPtr; 87 87 UCArray lastEl; 88 88 word_dict_el wordEl; … … 102 102 // see if this block is the longest so far 103 103 if (wordIdx.size() > 0) { 104 unsignedlong blockLen = elIdx.block_ptr -104 mg_u_long blockLen = elIdx.block_ptr - 105 105 (*(wordIdx.end()-1)).block_ptr; 106 106 if (blockLen > bdh.max_wblk_size) bdh.max_wblk_size = blockLen; … … 116 116 wordBlockEl.freq = wordEl.freq; 117 117 wordBlockEl.invf_ptr = wordInvfPtr; 118 unsignedlong tempI;118 mg_u_long tempI; 119 119 for (tempI=0; tempI<idh.num_levels; ++tempI) 120 120 wordBlockEl.levelFreqs[tempI] = wordEl.levelFreqs[tempI]; … … 138 138 block_dict_el tagBlockEl; 139 139 140 unsignedlong tagNum;141 unsignedlong tagInvfPtr;140 mg_u_long tagNum; 141 mg_u_long tagInvfPtr; 142 142 dict_el tagEl; 143 143 lastEl.erase (lastEl.begin(), lastEl.end()); … … 156 156 // see if this block is the longest so far 157 157 if (tagIdx.size() > 0) { 158 unsignedlong blockLen = elIdx.block_ptr -158 mg_u_long blockLen = elIdx.block_ptr - 159 159 (*(tagIdx.end()-1)).block_ptr; 160 160 if (blockLen > bdh.max_tblk_size) bdh.max_tblk_size = blockLen; … … 188 188 189 189 // write out the blocked dictionary header 190 fseek (blockDictFile, sizeof( unsignedlong), SEEK_SET);190 fseek (blockDictFile, sizeof(mg_u_long), SEEK_SET); 191 191 bdh.Write (blockDictFile); 192 192 … … 208 208 209 209 int main (int argc, char **argv) { 210 unsignedlong entriesPerBlock = 16;211 char *filename = "";210 mg_u_long entriesPerBlock = 16; 211 char *filename = (char*)""; 212 212 int ch; 213 213 msg_prefix = argv[0]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict_dump.cpp
r19822 r23508 72 72 fseek (dictFile, idh.word_dict_start, SEEK_SET); 73 73 74 unsignedlong wordNum;74 mg_u_long wordNum; 75 75 word_dict_el wordEl; 76 76 wordEl.SetNumLevels (idh.num_levels); … … 87 87 fseek (dictFile, idh.tag_dict_start, SEEK_SET); 88 88 89 unsignedlong tagNum;89 mg_u_long tagNum; 90 90 dict_el tagEl; 91 91 for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) { … … 103 103 104 104 int main (int argc, char **argv) { 105 char *filename = "";105 char *filename = (char*)""; 106 106 int ch; 107 107 msg_prefix = argv[0]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dump.cpp
r19822 r23508 52 52 invf_file_header &ifh, 53 53 word_dict_el &wordEl, 54 unsignedlong wordStart,54 mg_u_long wordStart, 55 55 bool printFrags) { 56 56 cout << wordEl.frag_occur << " \"" << wordEl.el << "\"\n"; … … 62 62 stdio_bitio_buffer buffer(invfFile); 63 63 64 unsignedlong B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);65 unsignedlong fragNum = 0;66 unsignedlong i;64 mg_u_long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur); 65 mg_u_long fragNum = 0; 66 mg_u_long i; 67 67 for (i=0; i<wordEl.frag_occur; ++i) { 68 unsignedlong delta = buffer.bblock_decode (B, NULL);68 mg_u_long delta = buffer.bblock_decode (B, NULL); 69 69 fragNum += delta; 70 70 cout << " " << fragNum; 71 71 72 72 if (!ifh.word_level_index ) { 73 unsignedlong count = buffer.gamma_decode (NULL);73 mg_u_long count = buffer.gamma_decode (NULL); 74 74 cout << "(" << count << ")"; 75 75 } else { … … 88 88 invf_file_header &/*ifh*/, 89 89 dict_el &tagEl, 90 unsignedlong tagStart,90 mg_u_long tagStart, 91 91 bool printFrags) { 92 92 cout << tagEl.frag_occur << " \"<" << tagEl.el << ">\"\n"; … … 98 98 stdio_bitio_buffer buffer(invfFile); 99 99 100 unsignedlong pTag = tagEl.frag_occur*2;101 unsignedlong B = BIO_Bblock_Init (idh.num_frags+pTag, pTag);102 unsignedlong fragNum = 0;103 unsignedlong i;100 mg_u_long pTag = tagEl.frag_occur*2; 101 mg_u_long B = BIO_Bblock_Init (idh.num_frags+pTag, pTag); 102 mg_u_long fragNum = 0; 103 mg_u_long i; 104 104 for (i=0; i<tagEl.frag_occur; ++i) { 105 unsignedlong delta = buffer.bblock_decode (B, NULL)-1;105 mg_u_long delta = buffer.bblock_decode (B, NULL)-1; 106 106 fragNum += delta; 107 107 cout << " " << fragNum; … … 169 169 // process all the words 170 170 if (printWords) { 171 unsignedlong wordNum;172 unsignedlong wordStart;171 mg_u_long wordNum; 172 mg_u_long wordStart; 173 173 word_dict_el wordEl; 174 174 wordEl.SetNumLevels (idh.num_levels); … … 182 182 // process all the tags 183 183 if (printTags) { 184 unsignedlong tagNum;185 unsignedlong tagStart;184 mg_u_long tagNum; 185 mg_u_long tagStart; 186 186 dict_el tagEl; 187 187 for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) { … … 199 199 200 200 int main (int argc, char **argv) { 201 char *dir_name, *filename = "";201 char *dir_name, *filename = (char*)""; 202 202 int ch; 203 203 msg_prefix = argv[0]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_passes.cpp
r19822 r23508 74 74 75 75 76 unsignedlong invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */76 mg_u_long invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */ 77 77 78 78 static char Passes = 0; … … 90 90 91 91 static pass_data PassData[MAX_PASSES] = { 92 { "special", init_special, process_special, done_special},93 { "text.pass1", init_text_1, process_text_1, done_text_1},94 { "text.pass2", init_text_2, process_text_2, done_text_2},95 { "ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1},96 { "ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2},92 {(char*)"special", init_special, process_special, done_special}, 93 {(char*)"text.pass1", init_text_1, process_text_1, done_text_1}, 94 {(char*)"text.pass2", init_text_2, process_text_2, done_text_2}, 95 {(char*)"ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1}, 96 {(char*)"ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2}, 97 97 }; 98 98 99 static char *usage_str = "\nUSAGE:\n"99 static char *usage_str = (char*)"\nUSAGE:\n" 100 100 " %s [-J doc-tag] [-K level-tag] [-L index-level]\n" 101 101 " %*s [-m invf-memory] [-T1] [-T2] [-I1] [-I2] [-S]\n" … … 131 131 int pass; 132 132 133 unsignedlong numBytes = 0;134 unsignedlong numDocs = 0;133 mg_u_long numBytes = 0; 134 mg_u_long numDocs = 0; 135 135 136 136 // initialise all the passes … … 146 146 FileBuf buf; 147 147 TextElArray doc; 148 unsignedlong docLen = 0;148 mg_u_long docLen = 0; 149 149 150 150 // read and process each file (start with an open file) … … 222 222 Passes |= IVF_PASS_2; 223 223 else 224 Usage ( "Invalid pass number");224 Usage ((char*)"Invalid pass number"); 225 225 break; 226 226 case 'T': … … 230 230 Passes |= TEXT_PASS_2; 231 231 else 232 Usage ( "Invalid pass number");232 Usage ((char*)"Invalid pass number"); 233 233 break; 234 234 case 'S': -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_passes_4jni.cpp
r19822 r23508 76 76 77 77 78 unsignedlong invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */78 mg_u_long invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */ 79 79 80 80 static char Passes = 0; … … 85 85 char *filename = NULL; 86 86 87 unsignedlong numBytes = 0;88 unsignedlong numDocs = 0;87 mg_u_long numBytes = 0; 88 mg_u_long numDocs = 0; 89 89 int mgpp_passes_exit_value = 0; 90 90 … … 98 98 99 99 static pass_data PassData[MAX_PASSES] = { 100 { "special", init_special, process_special, done_special},101 { "text.pass1", init_text_1, process_text_1, done_text_1},102 { "text.pass2", init_text_2, process_text_2, done_text_2},103 { "ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1},104 { "ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2},100 {(char*)"special", init_special, process_special, done_special}, 101 {(char*)"text.pass1", init_text_1, process_text_1, done_text_1}, 102 {(char*)"text.pass2", init_text_2, process_text_2, done_text_2}, 103 {(char*)"ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1}, 104 {(char*)"ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2}, 105 105 }; 106 106 … … 223 223 224 224 TextElArray doc; 225 unsignedlong doc_len = 0;225 mg_u_long doc_len = 0; 226 226 227 227 while(ReadDoc(&buffer, tagInfo.docTag, doc, doc_len, false)) { … … 266 266 int pass; 267 267 268 unsignedlong numBytes = 0;269 unsignedlong numDocs = 0;268 mg_u_long numBytes = 0; 269 mg_u_long numDocs = 0; 270 270 271 271 // initialise all the passes … … 281 281 FileBuf buf; 282 282 TextElArray doc; 283 unsignedlong docLen = 0;283 mg_u_long docLen = 0; 284 284 285 285 // read and process each file (start with an open file) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_perf_hash_build.cpp
r19822 r23508 53 53 static void ProcessFiles (char *filename, int r) { 54 54 FILE *dictFile, *hashFile; 55 unsignedlong i;55 mg_u_long i; 56 56 invf_dict_header idh; 57 57 perf_hash_data *phd; 58 58 u_char *pool; 59 unsignedlong pool_left;59 mg_u_long pool_left; 60 60 u_char **starts; 61 61 … … 86 86 87 87 // push string onto pool data 88 register unsignedlong l;88 register mg_u_long l; 89 89 l = wordEl.el.size() + 1; 90 90 if (pool_left < l) { … … 119 119 int main (int argc, char **argv) { 120 120 int r = -1; 121 char *filename = "";121 char *filename = (char*)""; 122 122 int ch; 123 123 msg_prefix = argv[0]; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_stem_idx.cpp
r19822 r23508 50 50 #endif 51 51 52 typedef vector< unsignedlong> WordNumList;52 typedef vector<mg_u_long> WordNumList; 53 53 typedef map<UCArray, WordNumList, DictLTUCArray> StemMapDict; 54 54 … … 67 67 fseek (dictFile, idh.word_dict_start, SEEK_SET); 68 68 69 unsignedlong wordNum;69 mg_u_long wordNum; 70 70 u_char mgWord[MAXSTEMLEN + 1]; 71 71 word_dict_el wordEl; … … 101 101 int stemMethod, 102 102 int stemmerNum, 103 unsignedlong entriesPerBlock) {103 mg_u_long entriesPerBlock) { 104 104 105 105 /* [JFG - Mar 06: Accent folding patch] */ … … 130 130 131 131 block_idx stemIdx; 132 unsignedlong stemNum = 0;132 mg_u_long stemNum = 0; 133 133 stem_block_dict_el stemEl; 134 134 UCArray lastEl; … … 146 146 // see if this block is the longest so far 147 147 if (stemIdx.size() > 0) { 148 unsignedlong blockLen = elIdx.block_ptr -148 mg_u_long blockLen = elIdx.block_ptr - 149 149 (*(stemIdx.end()-1)).block_ptr; 150 150 if (blockLen > sih.max_block_size) sih.max_block_size = blockLen; … … 172 172 173 173 // write out the stem dictionary header 174 fseek (stemDictFile, sizeof( unsignedlong), SEEK_SET);174 fseek (stemDictFile, sizeof(mg_u_long), SEEK_SET); 175 175 sih.Write (stemDictFile); 176 176 … … 189 189 190 190 int main (int argc, char **argv) { 191 unsignedlong entriesPerBlock = 16;192 char *filename = "";191 mg_u_long entriesPerBlock = 16; 192 char *filename = (char*)""; 193 193 int ch; 194 194 int stemMethod = 0; // illegal value (no translation) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_weights_build.cpp
r19822 r23508 52 52 #endif 53 53 54 #define MAXBITS (sizeof( unsignedlong) * 8)54 #define MAXBITS (sizeof(mg_u_long) * 8) 55 55 56 56 struct WBTagPtr { 57 unsignedlong tagNum;58 unsignedlong tagPtr;59 unsignedlong fragOccur;57 mg_u_long tagNum; 58 mg_u_long tagPtr; 59 mg_u_long fragOccur; 60 60 61 61 WBTagPtr () { … … 80 80 // seek to the start of the tag information 81 81 fseek (dictFile, idh.tag_dict_start, SEEK_SET); 82 fseek (invfIdxFile, sizeof( unsignedlong) +83 idh.word_dict_size*sizeof( unsignedlong), SEEK_SET);84 85 unsignedlong tagNum;86 unsignedlong tagPtr;82 fseek (invfIdxFile, sizeof(mg_u_long) + 83 idh.word_dict_size*sizeof(mg_u_long), SEEK_SET); 84 85 mg_u_long tagNum; 86 mg_u_long tagPtr; 87 87 dict_el thisEl; 88 88 for (tagNum = 0; tagNum < idh.tag_dict_size; ++tagNum) { … … 96 96 97 97 static void AddWeight (Weights &w, 98 unsignedlong levelDocNum,99 unsignedlong termFreq,98 mg_u_long levelDocNum, 99 mg_u_long termFreq, 100 100 float idf) { 101 101 double weight = termFreq * idf; … … 105 105 static void GenerateLevelWeights (const invf_dict_header &idh, 106 106 const invf_file_header &ifh, 107 unsignedlong numLevelDocs,108 unsignedlong levelNum,107 mg_u_long numLevelDocs, 108 mg_u_long levelNum, 109 109 FILE *dictFile, 110 110 FILE *invfFile, … … 120 120 // reset the files 121 121 fseek (dictFile, idh.word_dict_start, SEEK_SET); 122 fseek (invfIdxFile, sizeof ( unsignedlong), SEEK_SET);122 fseek (invfIdxFile, sizeof (mg_u_long), SEEK_SET); 123 123 124 124 // process each word adding its contributions to the document weights 125 unsignedlong wordNum;126 unsignedlong wordStart;125 mg_u_long wordNum; 126 mg_u_long wordStart; 127 127 word_dict_el wordEl; 128 128 wordEl.SetNumLevels (idh.num_levels); … … 142 142 stdio_bitio_buffer buffer (invfFile); 143 143 144 unsignedlong B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);145 unsignedlong fragNum = 0;146 unsignedlong levelDocNum = 0;147 unsignedlong lastLevelDocNum = 0;148 unsignedlong termFreq = 0;149 unsignedlong checkLevelFreq = 0;150 151 unsignedlong count, i;144 mg_u_long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur); 145 mg_u_long fragNum = 0; 146 mg_u_long levelDocNum = 0; 147 mg_u_long lastLevelDocNum = 0; 148 mg_u_long termFreq = 0; 149 mg_u_long checkLevelFreq = 0; 150 151 mg_u_long count, i; 152 152 for (i=0; i<wordEl.frag_occur; ++i) { 153 153 fragNum += buffer.bblock_decode (B, NULL); … … 201 201 202 202 static void WriteExactWeights (FILE *weightsFile, 203 unsignedlong &diskPtr,203 mg_u_long &diskPtr, 204 204 const Weights &w) { 205 205 diskPtr = ftell(weightsFile); … … 215 215 216 216 static void WriteApproxWeights (FILE *approxWeightsFile, 217 unsignedlong &diskPtr,217 mg_u_long &diskPtr, 218 218 const Weights &w, 219 219 unsigned char bits) { … … 246 246 247 247 248 unsignedlong max = (bits == 32) ? 0xffffffff : (1 << bits) - 1;;249 unsignedlong i=0, buf=0, pos=0;248 mg_u_long max = (bits == 32) ? 0xffffffff : (1 << bits) - 1;; 249 mg_u_long i=0, buf=0, pos=0; 250 250 here = w.begin(); 251 251 end = w.end(); 252 252 while (here != end) { 253 unsignedlong fx;253 mg_u_long fx; 254 254 wgt = sqrt (*here); 255 255 if (wgt == 0) { … … 259 259 #endif 260 260 } 261 fx = ( unsignedlong) floor (log (wgt / L) / log (B));261 fx = (mg_u_long) floor (log (wgt / L) / log (B)); 262 262 263 263 if (fx > max) fx = max; … … 281 281 int main (int argc, char **argv) { 282 282 unsigned char bits = 8; 283 char *filename = "";283 char *filename = (char*)""; 284 284 int ch; 285 285 opterr = 0; … … 354 354 IvfLevelInfoMap::iterator levelHere = ivfLevel.levelInfo.begin(); 355 355 IvfLevelInfoMap::iterator levelEnd = ivfLevel.levelInfo.end(); 356 unsignedlong levelNum = 0;356 mg_u_long levelNum = 0; 357 357 while (levelHere != levelEnd) { 358 358 const UCArray &levelName = (*levelHere).first; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/text.h
r16583 r23508 109 109 110 110 struct compression_dict_header { 111 u_long dict_type;112 u_long novel_method;113 u_long params[TEXT_PARAMS];114 u_long num_words[2];115 u_long num_word_chars[2];116 u_long lookback;111 mg_u_long dict_type; 112 mg_u_long novel_method; 113 mg_u_long params[TEXT_PARAMS]; 114 mg_u_long num_words[2]; 115 mg_u_long num_word_chars[2]; 116 mg_u_long lookback; 117 117 }; 118 118 … … 120 120 struct comp_frags_header { 121 121 huff_data hd; 122 u_long uncompressed_size;123 u_long huff_words_size[MAX_HUFFCODE_LEN + 1];122 mg_u_long uncompressed_size; 123 mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1]; 124 124 }; 125 125 … … 130 130 131 131 struct compressed_text_header { 132 u_long num_of_docs;133 u_long num_of_words; // number of words in collection132 mg_u_long num_of_docs; 133 mg_u_long num_of_words; // number of words in collection 134 134 double num_of_bytes; 135 135 … … 145 145 146 146 struct compression_stats_header { 147 u_long num_docs;148 u_long dummy; // alignment147 mg_u_long num_docs; 148 mg_u_long dummy; // alignment 149 149 double num_bytes; 150 150 }; … … 152 152 153 153 struct frags_stats_header { 154 u_long num_frags;155 u_long mem_for_frags;154 mg_u_long num_frags; 155 mg_u_long mem_for_frags; 156 156 }; 157 157 158 158 159 159 struct aux_frags_header { 160 u_long num_frags;161 u_long mem_for_frags;160 mg_u_long num_frags; 161 mg_u_long mem_for_frags; 162 162 }; 163 163 … … 180 180 compression_dict_header cdh; 181 181 comp_frags_header *cfh[2]; 182 unsignedlong MemForCompDict;182 mg_u_long MemForCompDict; 183 183 u_char ***values[2]; 184 184 u_char *escape[2]; 185 185 huff_data *chars_huff[2]; 186 u_long **chars_vals[2];186 mg_u_long **chars_vals[2]; 187 187 huff_data *lens_huff[2]; 188 u_long **lens_vals[2];188 mg_u_long **lens_vals[2]; 189 189 auxiliary_dict *ad; 190 190 int fast_loaded; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/text.pass1.cpp
r16583 r23508 54 54 typedef struct hash_rec 55 55 { 56 unsignedlong wcnt; /* word frequency */57 unsignedlong occurance_num;56 mg_u_long wcnt; /* word frequency */ 57 mg_u_long occurance_num; 58 58 u_char *word; 59 59 } … … 63 63 { 64 64 hash_rec *HashTable; 65 unsignedlong HashSize;66 unsignedlong HashUsed;67 unsignedlong wordnum;68 unsignedlong words_read;69 unsignedlong bytes_diff;65 mg_u_long HashSize; 66 mg_u_long HashUsed; 67 mg_u_long wordnum; 68 mg_u_long words_read; 69 mg_u_long bytes_diff; 70 70 huff_data hd; 71 71 } … … 74 74 75 75 76 static unsignedlong longestDoc = 0;77 static unsignedlong occurance_num = 0;76 static mg_u_long longestDoc = 0; 77 static mg_u_long occurance_num = 0; 78 78 static dict_data DictData[2]; 79 79 … … 81 81 static int PoolLeft; 82 82 static double inputbytes = 0; /* [RJM 07/97: 4G limit] */ 83 static unsignedlong MaxMemInUse = 0;84 static unsignedlong MemInUse = 0;83 static mg_u_long MaxMemInUse = 0; 84 static mg_u_long MemInUse = 0; 85 85 static compression_stats_header csh = {0, 0, 0.0}; /* [RJM 07/97: 4G limit] */ 86 86 … … 126 126 register u_char *wptr; 127 127 register int hsize = dd->HashSize; 128 register unsignedlong hashval, step;128 register mg_u_long hashval, step; 129 129 130 130 HASH (hashval, step, word, hsize); … … 132 132 while (wptr) { 133 133 hashval += step; 134 if (hashval >= ( unsignedlong)hsize)134 if (hashval >= (mg_u_long)hsize) 135 135 hashval -= hsize; 136 136 wptr = (dd->HashTable + hashval)->word; … … 171 171 /* Search the hash table for Word */ 172 172 { 173 register unsignedlong hashval, step;173 register mg_u_long hashval, step; 174 174 register int hsize = dd->HashSize; 175 175 HASH (hashval, step, Word, hsize); … … 210 210 if (len) { 211 211 hashval = (hashval + step); 212 if (hashval >= ( unsignedlong)hsize) hashval -= hsize;212 if (hashval >= (mg_u_long)hsize) hashval -= hsize; 213 213 } else { 214 214 ++ent->wcnt; … … 221 221 if (dd->HashUsed >= dd->HashSize >> 1) { 222 222 hash_rec *ht; 223 unsignedlong size;224 unsignedlong i;223 mg_u_long size; 224 mg_u_long i; 225 225 size = prime (dd->HashSize * 2); 226 226 if (!(ht = (hash_rec *) Xmalloc (sizeof (hash_rec) * size))) { … … 234 234 if (dd->HashTable[i].word) { 235 235 register u_char *wptr; 236 register unsignedlong hashval, step;236 register mg_u_long hashval, step; 237 237 238 238 wptr = dd->HashTable[i].word; … … 258 258 259 259 int process_text_1 (const TagInfo &/*tagInfo*/, const TextElArray &doc) { 260 unsignedlong textLen = 0;261 unsignedlong docLen = 0;260 mg_u_long textLen = 0; 261 mg_u_long docLen = 0; 262 262 int retValue; 263 263 … … 312 312 static void WriteHashTable (FILE * fp, dict_data * dd) { 313 313 frags_stats_header fsh; 314 u_long j = 0;314 mg_u_long j = 0; 315 315 u_char *curr; 316 316 … … 369 369 370 370 temp_str = msg_prefix; 371 msg_prefix = "text.pass1";371 msg_prefix = (char*)"text.pass1"; 372 372 373 373 /* [RPAP - Jan 97: Endian Ordering] */ -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/text.pass2.cpp
r16583 r23508 57 57 struct char_pool { 58 58 struct char_pool *next; 59 u_long left;59 mg_u_long left; 60 60 u_char *ptr; 61 61 u_char pool[POOL_SIZE]; … … 63 63 64 64 struct novel_hash_rec { 65 u_long ordinal_num;65 mg_u_long ordinal_num; 66 66 u_char *word; 67 67 }; … … 72 72 struct novel_hash_table { 73 73 novel_hash_rec *HashTable; 74 u_long HashSize, HashUsed;74 mg_u_long HashSize, HashUsed; 75 75 char_pool *first_pool; 76 76 char_pool *pool; 77 u_long next_num, binary_start;77 mg_u_long next_num, binary_start; 78 78 novel_hash_rec **code_to_nhr; 79 79 }; … … 82 82 static FILE *text; 83 83 static stdio_bitio_buffer textOutBuf; 84 static u_long headLen;84 static mg_u_long headLen; 85 85 86 86 static novel_hash_table nht[2]; … … 128 128 // the length of the compressed header is the size of the 129 129 // magic number plus the size of the compressed text header 130 headLen = sizeof ( u_long) + sizeof (cth);130 headLen = sizeof (mg_u_long) + sizeof (cth); 131 131 132 132 // start off with non-word … … 173 173 static int compress_text (bitio_buffer &buffer, const u_char *s_in, 174 174 int l_in, unsigned char &which, 175 unsignedlong &numWords) {175 mg_u_long &numWords) { 176 176 const u_char *end = s_in + l_in - 1; 177 177 … … 188 188 /* Search the hash table for Word */ 189 189 if (ht[which]) { 190 register unsignedlong hashval, step;190 register mg_u_long hashval, step; 191 191 register int tsize = ht[which]->size; 192 192 register u_char **wptr; … … 211 211 if (len) { 212 212 hashval += step; 213 if (hashval >= ( unsignedlong)tsize) hashval -= tsize;213 if (hashval >= (mg_u_long)tsize) hashval -= tsize; 214 214 215 215 } else { … … 231 231 if (cdh.dict_type == MG_PARTIAL_DICTIONARY) 232 232 { 233 u_long i;233 mg_u_long i; 234 234 if (ht[which]) 235 235 { … … 253 253 case MG_NOVEL_HUFFMAN_CHARS: 254 254 { 255 u_long i;255 mg_u_long i; 256 256 buffer.huff_encode (Word[0], lens_codes[which], 257 257 lens_huff[which].clens, NULL); … … 264 264 case MG_NOVEL_HYBRID: 265 265 { 266 register unsignedlong hashval, step;266 register mg_u_long hashval, step; 267 267 register novel_hash_table *h = &nht[which]; 268 268 register int hsize = h->HashSize; … … 325 325 { 326 326 novel_hash_rec *ht; 327 unsignedlong size;328 unsignedlong i;327 mg_u_long size; 328 mg_u_long i; 329 329 size = prime (h->HashSize * 2); 330 330 if (!(ht = (novel_hash_rec *) Xmalloc (sizeof (novel_hash_rec) * size))) … … 339 339 { 340 340 register u_char *wptr; 341 register unsignedlong hashval, step;341 register mg_u_long hashval, step; 342 342 343 343 wptr = h->HashTable[i].word; … … 375 375 // we need to remember where the last text element ends 376 376 unsigned char endBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit 377 unsignedlong endPos = textOutBuf.GetBytesWritten () + headLen;377 mg_u_long endPos = textOutBuf.GetBytesWritten () + headLen; 378 378 379 379 // process each text element … … 384 384 unsigned char startWhich = whichWordType; 385 385 unsigned char startBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit 386 unsignedlong startPos = textOutBuf.GetBytesWritten () + headLen;386 mg_u_long startPos = textOutBuf.GetBytesWritten () + headLen; 387 387 388 388 // compress the text … … 464 464 static void estimate_compressed_aux_dict (void) { 465 465 int i; 466 u_long aux_compressed = 0, total_uncomp = 0;466 mg_u_long aux_compressed = 0, total_uncomp = 0; 467 467 for (i = 0; i <= 1; ++i) 468 468 { 469 469 int j; 470 long chars[256], fchars[256];471 long lens[16], flens[16];470 mg_s_long chars[256], fchars[256]; 471 mg_s_long lens[16], flens[16]; 472 472 char_pool *cp; 473 473 memset (chars, '\0', sizeof (chars)); … … 496 496 flens[j] = lens[j]; 497 497 498 aux_compressed += ( long unsigned int) ((Calculate_Huffman_Size (16, flens, lens) +498 aux_compressed += (mg_u_long) ((Calculate_Huffman_Size (16, flens, lens) + 499 499 Calculate_Huffman_Size (256, fchars, chars)) / 8); 500 500 … … 560 560 561 561 // write out the compressed text header (with updated statistics) 562 if (fseek (text, sizeof ( u_long), SEEK_SET) == -1 || !cth.Write (text))562 if (fseek (text, sizeof (mg_u_long), SEEK_SET) == -1 || !cth.Write (text)) 563 563 return COMPERROR; 564 564 fclose (text); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/packages/unac/Makefile.in
r20840 r23508 32 32 DEFS = @DEFS@ -DUNAC_VERSION=\"$(VERSION)\" 33 33 INCLUDES = -I../../../packages/iconv/include 34 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@34 CFLAGS = @CFLAGS@ 35 35 36 36 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS) -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/packages/unac/configure
r16583 r23508 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2. 59.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 # Copyright (C) 2003 Free Software Foundation, Inc. 5 # 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 # 10 # 6 11 # This configure script is free software; the Free Software Foundation 7 12 # gives unlimited permission to copy, distribute and modify it. 8 ## --------------------- ## 9 ## M4sh Initialization. ## 10 ## --------------------- ## 11 12 # Be Bourne compatible 13 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 13 ## -------------------- ## 14 ## M4sh Initialization. ## 15 ## -------------------- ## 16 17 # Be more Bourne compatible 18 DUALCASE=1; export DUALCASE # for MKS sh 19 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : 14 20 emulate sh 15 21 NULLCMD=: 16 # Zsh 3.x and 4.x performsword splitting on ${1+"$@"}, which22 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which 17 23 # is contrary to our usage. Disable this feature. 18 24 alias -g '${1+"$@"}'='"$@"' 19 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then 20 set -o posix 21 fi 22 DUALCASE=1; export DUALCASE # for MKS sh 23 24 # Support unset when possible. 25 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then 26 as_unset=unset 27 else 28 as_unset=false 29 fi 30 31 32 # Work around bugs in pre-3.0 UWIN ksh. 33 $as_unset ENV MAIL MAILPATH 25 setopt NO_GLOB_SUBST 26 else 27 case `(set -o) 2>/dev/null` in #( 28 *posix*) : 29 set -o posix ;; #( 30 *) : 31 ;; 32 esac 33 fi 34 35 36 as_nl=' 37 ' 38 export as_nl 39 # Printing a long string crashes Solaris 7 /usr/bin/printf. 40 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' 41 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo 42 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo 43 # Prefer a ksh shell builtin over an external printf program on Solaris, 44 # but without wasting forks for bash or zsh. 45 if test -z "$BASH_VERSION$ZSH_VERSION" \ 46 && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then 47 as_echo='print -r --' 48 as_echo_n='print -rn --' 49 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then 50 as_echo='printf %s\n' 51 as_echo_n='printf %s' 52 else 53 if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then 54 as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' 55 as_echo_n='/usr/ucb/echo -n' 56 else 57 as_echo_body='eval expr "X$1" : "X\\(.*\\)"' 58 as_echo_n_body='eval 59 arg=$1; 60 case $arg in #( 61 *"$as_nl"*) 62 expr "X$arg" : "X\\(.*\\)$as_nl"; 63 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; 64 esac; 65 expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" 66 ' 67 export as_echo_n_body 68 as_echo_n='sh -c $as_echo_n_body as_echo' 69 fi 70 export as_echo_body 71 as_echo='sh -c $as_echo_body as_echo' 72 fi 73 74 # The user is always right. 75 if test "${PATH_SEPARATOR+set}" != set; then 76 PATH_SEPARATOR=: 77 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { 78 (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || 79 PATH_SEPARATOR=';' 80 } 81 fi 82 83 84 # IFS 85 # We need space, tab and new line, in precisely that order. Quoting is 86 # there to prevent editors from complaining about space-tab. 87 # (If _AS_PATH_WALK were called with IFS unset, it would disable word 88 # splitting by setting IFS to empty value.) 89 IFS=" "" $as_nl" 90 91 # Find who we are. Look in the path if we contain no directory separator. 92 case $0 in #(( 93 *[\\/]* ) as_myself=$0 ;; 94 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 95 for as_dir in $PATH 96 do 97 IFS=$as_save_IFS 98 test -z "$as_dir" && as_dir=. 99 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 100 done 101 IFS=$as_save_IFS 102 103 ;; 104 esac 105 # We did not find ourselves, most probably we were run as `sh COMMAND' 106 # in which case we are not to be found in the path. 107 if test "x$as_myself" = x; then 108 as_myself=$0 109 fi 110 if test ! -f "$as_myself"; then 111 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 112 exit 1 113 fi 114 115 # Unset variables that we do not need and which cause bugs (e.g. in 116 # pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" 117 # suppresses any "Segmentation fault" message there. '((' could 118 # trigger a bug in pdksh 5.2.14. 119 for as_var in BASH_ENV ENV MAIL MAILPATH 120 do eval test x\${$as_var+set} = xset \ 121 && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : 122 done 34 123 PS1='$ ' 35 124 PS2='> ' … … 37 126 38 127 # NLS nuisances. 39 for as_var in \ 40 LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ 41 LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ 42 LC_TELEPHONE LC_TIME 128 LC_ALL=C 129 export LC_ALL 130 LANGUAGE=C 131 export LANGUAGE 132 133 # CDPATH. 134 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 135 136 if test "x$CONFIG_SHELL" = x; then 137 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : 138 emulate sh 139 NULLCMD=: 140 # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which 141 # is contrary to our usage. Disable this feature. 142 alias -g '\${1+\"\$@\"}'='\"\$@\"' 143 setopt NO_GLOB_SUBST 144 else 145 case \`(set -o) 2>/dev/null\` in #( 146 *posix*) : 147 set -o posix ;; #( 148 *) : 149 ;; 150 esac 151 fi 152 " 153 as_required="as_fn_return () { (exit \$1); } 154 as_fn_success () { as_fn_return 0; } 155 as_fn_failure () { as_fn_return 1; } 156 as_fn_ret_success () { return 0; } 157 as_fn_ret_failure () { return 1; } 158 159 exitcode=0 160 as_fn_success || { exitcode=1; echo as_fn_success failed.; } 161 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } 162 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } 163 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } 164 if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : 165 166 else 167 exitcode=1; echo positional parameters were not saved. 168 fi 169 test x\$exitcode = x0 || exit 1" 170 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 171 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 172 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && 173 test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 174 test \$(( 1 + 1 )) = 2 || exit 1" 175 if (eval "$as_required") 2>/dev/null; then : 176 as_have_required=yes 177 else 178 as_have_required=no 179 fi 180 if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : 181 182 else 183 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 184 as_found=false 185 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 43 186 do 44 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then 45 eval $as_var=C; export $as_var 187 IFS=$as_save_IFS 188 test -z "$as_dir" && as_dir=. 189 as_found=: 190 case $as_dir in #( 191 /*) 192 for as_base in sh bash ksh sh5; do 193 # Try only shells that exist, to save several forks. 194 as_shell=$as_dir/$as_base 195 if { test -f "$as_shell" || test -f "$as_shell.exe"; } && 196 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : 197 CONFIG_SHELL=$as_shell as_have_required=yes 198 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : 199 break 2 200 fi 201 fi 202 done;; 203 esac 204 as_found=false 205 done 206 $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && 207 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : 208 CONFIG_SHELL=$SHELL as_have_required=yes 209 fi; } 210 IFS=$as_save_IFS 211 212 213 if test "x$CONFIG_SHELL" != x; then : 214 # We cannot yet assume a decent shell, so we have to provide a 215 # neutralization value for shells without unset; and this also 216 # works around shells that cannot unset nonexistent variables. 217 BASH_ENV=/dev/null 218 ENV=/dev/null 219 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 220 export CONFIG_SHELL 221 exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 222 fi 223 224 if test x$as_have_required = xno; then : 225 $as_echo "$0: This script requires a shell more modern than all" 226 $as_echo "$0: the shells that I found on your system." 227 if test x${ZSH_VERSION+set} = xset ; then 228 $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" 229 $as_echo "$0: be upgraded to zsh 4.3.4 or later." 46 230 else 47 $as_unset $as_var 231 $as_echo "$0: Please tell [email protected] about your system, 232 $0: including any error possibly output before this 233 $0: message. Then install a modern shell, or manually run 234 $0: the script under such a shell if you do have one." 48 235 fi 49 done 50 51 # Required to use basename. 52 if expr a : '\(a\)' >/dev/null 2>&1; then 236 exit 1 237 fi 238 fi 239 fi 240 SHELL=${CONFIG_SHELL-/bin/sh} 241 export SHELL 242 # Unset more variables known to interfere with behavior of common tools. 243 CLICOLOR_FORCE= GREP_OPTIONS= 244 unset CLICOLOR_FORCE GREP_OPTIONS 245 246 ## --------------------- ## 247 ## M4sh Shell Functions. ## 248 ## --------------------- ## 249 # as_fn_unset VAR 250 # --------------- 251 # Portably unset VAR. 252 as_fn_unset () 253 { 254 { eval $1=; unset $1;} 255 } 256 as_unset=as_fn_unset 257 258 # as_fn_set_status STATUS 259 # ----------------------- 260 # Set $? to STATUS, without forking. 261 as_fn_set_status () 262 { 263 return $1 264 } # as_fn_set_status 265 266 # as_fn_exit STATUS 267 # ----------------- 268 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context. 269 as_fn_exit () 270 { 271 set +e 272 as_fn_set_status $1 273 exit $1 274 } # as_fn_exit 275 276 # as_fn_mkdir_p 277 # ------------- 278 # Create "$as_dir" as a directory, including parents if necessary. 279 as_fn_mkdir_p () 280 { 281 282 case $as_dir in #( 283 -*) as_dir=./$as_dir;; 284 esac 285 test -d "$as_dir" || eval $as_mkdir_p || { 286 as_dirs= 287 while :; do 288 case $as_dir in #( 289 *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( 290 *) as_qdir=$as_dir;; 291 esac 292 as_dirs="'$as_qdir' $as_dirs" 293 as_dir=`$as_dirname -- "$as_dir" || 294 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 295 X"$as_dir" : 'X\(//\)[^/]' \| \ 296 X"$as_dir" : 'X\(//\)$' \| \ 297 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || 298 $as_echo X"$as_dir" | 299 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 300 s//\1/ 301 q 302 } 303 /^X\(\/\/\)[^/].*/{ 304 s//\1/ 305 q 306 } 307 /^X\(\/\/\)$/{ 308 s//\1/ 309 q 310 } 311 /^X\(\/\).*/{ 312 s//\1/ 313 q 314 } 315 s/.*/./; q'` 316 test -d "$as_dir" && break 317 done 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 321 322 } # as_fn_mkdir_p 323 # as_fn_append VAR VALUE 324 # ---------------------- 325 # Append the text in VALUE to the end of the definition contained in VAR. Take 326 # advantage of any shell optimizations that allow amortized linear growth over 327 # repeated appends, instead of the typical quadratic growth present in naive 328 # implementations. 329 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : 330 eval 'as_fn_append () 331 { 332 eval $1+=\$2 333 }' 334 else 335 as_fn_append () 336 { 337 eval $1=\$$1\$2 338 } 339 fi # as_fn_append 340 341 # as_fn_arith ARG... 342 # ------------------ 343 # Perform arithmetic evaluation on the ARGs, and store the result in the 344 # global $as_val. Take advantage of shells that can avoid forks. The arguments 345 # must be portable across $(()) and expr. 346 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : 347 eval 'as_fn_arith () 348 { 349 as_val=$(( $* )) 350 }' 351 else 352 as_fn_arith () 353 { 354 as_val=`expr "$@" || test $? -eq 1` 355 } 356 fi # as_fn_arith 357 358 359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with status $?, using 1 if that was 0. 364 as_fn_error () 365 { 366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 fi 371 $as_echo "$as_me: error: $1" >&2 372 as_fn_exit $as_status 373 } # as_fn_error 374 375 if expr a : '\(a\)' >/dev/null 2>&1 && 376 test "X`expr 00001 : '.*\(...\)'`" = X001; then 53 377 as_expr=expr 54 378 else … … 56 380 fi 57 381 58 if (basename /) >/dev/null 2>&1 && test "X`basename/ 2>&1`" = "X/"; then382 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then 59 383 as_basename=basename 60 384 else … … 62 386 fi 63 387 64 65 # Name of the executable. 66 as_me=`$as_basename "$0" || 388 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then 389 as_dirname=dirname 390 else 391 as_dirname=false 392 fi 393 394 as_me=`$as_basename -- "$0" || 67 395 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ 68 396 X"$0" : 'X\(//\)$' \| \ 69 X"$0" : 'X\(/\)$' \| \ 70 . : '\(.\)' 2>/dev/null || 71 echo X/"$0" | 72 sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } 73 /^X\/\(\/\/\)$/{ s//\1/; q; } 74 /^X\/\(\/\).*/{ s//\1/; q; } 75 s/.*/./; q'` 76 77 78 # PATH needs CR, and LINENO needs CR and PATH. 397 X"$0" : 'X\(/\)' \| . 2>/dev/null || 398 $as_echo X/"$0" | 399 sed '/^.*\/\([^/][^/]*\)\/*$/{ 400 s//\1/ 401 q 402 } 403 /^X\/\(\/\/\)$/{ 404 s//\1/ 405 q 406 } 407 /^X\/\(\/\).*/{ 408 s//\1/ 409 q 410 } 411 s/.*/./; q'` 412 79 413 # Avoid depending upon Character Ranges. 80 414 as_cr_letters='abcdefghijklmnopqrstuvwxyz' … … 84 418 as_cr_alnum=$as_cr_Letters$as_cr_digits 85 419 86 # The user is always right. 87 if test "${PATH_SEPARATOR+set}" != set; then 88 echo "#! /bin/sh" >conf$$.sh 89 echo "exit 0" >>conf$$.sh 90 chmod +x conf$$.sh 91 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 92 PATH_SEPARATOR=';' 93 else 94 PATH_SEPARATOR=: 95 fi 96 rm -f conf$$.sh 97 fi 98 99 100 as_lineno_1=$LINENO 101 as_lineno_2=$LINENO 102 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 103 test "x$as_lineno_1" != "x$as_lineno_2" && 104 test "x$as_lineno_3" = "x$as_lineno_2" || { 105 # Find who we are. Look in the path if we contain no path at all 106 # relative or not. 107 case $0 in 108 *[\\/]* ) as_myself=$0 ;; 109 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 110 for as_dir in $PATH 111 do 112 IFS=$as_save_IFS 113 test -z "$as_dir" && as_dir=. 114 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 115 done 116 117 ;; 118 esac 119 # We did not find ourselves, most probably we were run as `sh COMMAND' 120 # in which case we are not to be found in the path. 121 if test "x$as_myself" = x; then 122 as_myself=$0 123 fi 124 if test ! -f "$as_myself"; then 125 { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 126 { (exit 1); exit 1; }; } 127 fi 128 case $CONFIG_SHELL in 129 '') 130 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 131 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 132 do 133 IFS=$as_save_IFS 134 test -z "$as_dir" && as_dir=. 135 for as_base in sh bash ksh sh5; do 136 case $as_dir in 137 /*) 138 if ("$as_dir/$as_base" -c ' 139 as_lineno_1=$LINENO 140 as_lineno_2=$LINENO 141 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 142 test "x$as_lineno_1" != "x$as_lineno_2" && 143 test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then 144 $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } 145 $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } 146 CONFIG_SHELL=$as_dir/$as_base 147 export CONFIG_SHELL 148 exec "$CONFIG_SHELL" "$0" ${1+"$@"} 149 fi;; 150 esac 151 done 152 done 153 ;; 154 esac 155 156 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO 157 # uniformly replaced by the line number. The first 'sed' inserts a 158 # line-number line before each line; the second 'sed' does the real 159 # work. The second script uses 'N' to pair each line-number line 160 # with the numbered line, and appends trailing '-' during 161 # substitution so that $LINENO is not a special case at line end. 162 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the 163 # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) 164 sed '=' <$as_myself | 420 421 as_lineno_1=$LINENO as_lineno_1a=$LINENO 422 as_lineno_2=$LINENO as_lineno_2a=$LINENO 423 eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && 424 test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { 425 # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) 426 sed -n ' 427 p 428 /[$]LINENO/= 429 ' <$as_myself | 165 430 sed ' 431 s/[$]LINENO.*/&-/ 432 t lineno 433 b 434 :lineno 166 435 N 167 s,$,-, 168 : loop 169 s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, 436 :loop 437 s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ 170 438 t loop 171 s,-$,, 172 s,^['$as_cr_digits']*\n,, 439 s/-\n.*// 173 440 ' >$as_me.lineno && 174 chmod +x $as_me.lineno || 175 { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 176 { (exit 1); exit 1; }; } 441 chmod +x "$as_me.lineno" || 442 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 177 443 178 444 # Don't try to exec as it changes $[0], causing all sort of problems 179 445 # (the dirname of $[0] is not the place where we might find the 180 # original and so on. Autoconf is especially sensi ble to this).181 . ./$as_me.lineno446 # original and so on. Autoconf is especially sensitive to this). 447 . "./$as_me.lineno" 182 448 # Exit status is that of the last command. 183 449 exit 184 450 } 185 451 186 187 case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in 188 *c*,-n*) ECHO_N= ECHO_C=' 189 ' ECHO_T=' ' ;; 190 *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; 191 *) ECHO_N= ECHO_C='\c' ECHO_T= ;; 452 ECHO_C= ECHO_N= ECHO_T= 453 case `echo -n x` in #((((( 454 -n*) 455 case `echo 'xy\c'` in 456 *c*) ECHO_T=' ';; # ECHO_T is single tab character. 457 xy) ECHO_C='\c';; 458 *) echo `echo ksh88 bug on AIX 6.1` > /dev/null 459 ECHO_T=' ';; 460 esac;; 461 *) 462 ECHO_N='-n';; 192 463 esac 193 464 194 if expr a : '\(a\)' >/dev/null 2>&1; then195 as_expr=expr196 else197 as_expr=false198 fi199 200 465 rm -f conf$$ conf$$.exe conf$$.file 201 echo >conf$$.file 202 if ln -s conf$$.file conf$$ 2>/dev/null; then 203 # We could just check for DJGPP; but this test a) works b) is more generic 204 # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). 205 if test -f conf$$.exe; then 206 # Don't use ln at all; we don't have any links 466 if test -d conf$$.dir; then 467 rm -f conf$$.dir/conf$$.file 468 else 469 rm -f conf$$.dir 470 mkdir conf$$.dir 2>/dev/null 471 fi 472 if (echo >conf$$.file) 2>/dev/null; then 473 if ln -s conf$$.file conf$$ 2>/dev/null; then 474 as_ln_s='ln -s' 475 # ... but there are two gotchas: 476 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 477 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 478 # In both cases, we have to default to `cp -p'. 479 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 480 as_ln_s='cp -p' 481 elif ln conf$$.file conf$$ 2>/dev/null; then 482 as_ln_s=ln 483 else 207 484 as_ln_s='cp -p' 208 else209 as_ln_s='ln -s'210 485 fi 211 elif ln conf$$.file conf$$ 2>/dev/null; then212 as_ln_s=ln213 486 else 214 487 as_ln_s='cp -p' 215 488 fi 216 rm -f conf$$ conf$$.exe conf$$.file 489 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 490 rmdir conf$$.dir 2>/dev/null 217 491 218 492 if mkdir -p . 2>/dev/null; then 219 as_mkdir_p= :493 as_mkdir_p='mkdir -p "$as_dir"' 220 494 else 221 495 test -d ./-p && rmdir ./-p … … 223 497 fi 224 498 225 as_executable_p="test -f" 499 if test -x / >/dev/null 2>&1; then 500 as_test_x='test -x' 501 else 502 if ls -dL / >/dev/null 2>&1; then 503 as_ls_L_option=L 504 else 505 as_ls_L_option= 506 fi 507 as_test_x=' 508 eval sh -c '\'' 509 if test -d "$1"; then 510 test -d "$1/."; 511 else 512 case $1 in #( 513 -*)set "./$1";; 514 esac; 515 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 516 ???[sx]*):;;*)false;;esac;fi 517 '\'' sh 518 ' 519 fi 520 as_executable_p=$as_test_x 226 521 227 522 # Sed expression to map a string onto a valid CPP name. … … 230 525 # Sed expression to map a string onto a valid variable name. 231 526 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" 232 233 234 # IFS235 # We need space, tab and new line, in precisely that order.236 as_nl='237 '238 IFS=" $as_nl"239 240 # CDPATH.241 $as_unset CDPATH242 527 243 528 … … 401 686 402 687 688 test -n "$DJDIR" || exec 7<&0 </dev/null 689 exec 6>&1 690 403 691 # Name of the host. 404 692 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, … … 406 694 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 407 695 408 exec 6>&1409 410 696 # 411 697 # Initializations. 412 698 # 413 699 ac_default_prefix=/usr/local 700 ac_clean_files= 414 701 ac_config_libobj_dir=. 702 LIBOBJS= 415 703 cross_compiling=no 416 704 subdirs= 417 705 MFLAGS= 418 706 MAKEFLAGS= 419 SHELL=${CONFIG_SHELL-/bin/sh}420 421 # Maximum number of lines to put in a shell here document.422 # This variable seems obsolete. It should probably be removed, and423 # only ac_max_sed_lines should be used.424 : ${ac_max_here_lines=38}425 707 426 708 # Identity of this package. … … 430 712 PACKAGE_STRING= 431 713 PACKAGE_BUGREPORT= 714 PACKAGE_URL= 432 715 433 716 ac_unique_file="config.h.in" … … 435 718 ac_includes_default="\ 436 719 #include <stdio.h> 437 #if HAVE_SYS_TYPES_H720 #ifdef HAVE_SYS_TYPES_H 438 721 # include <sys/types.h> 439 722 #endif 440 #if HAVE_SYS_STAT_H723 #ifdef HAVE_SYS_STAT_H 441 724 # include <sys/stat.h> 442 725 #endif 443 #if STDC_HEADERS726 #ifdef STDC_HEADERS 444 727 # include <stdlib.h> 445 728 # include <stddef.h> 446 729 #else 447 # if HAVE_STDLIB_H730 # ifdef HAVE_STDLIB_H 448 731 # include <stdlib.h> 449 732 # endif 450 733 #endif 451 #if HAVE_STRING_H452 # if ! STDC_HEADERS &&HAVE_MEMORY_H734 #ifdef HAVE_STRING_H 735 # if !defined STDC_HEADERS && defined HAVE_MEMORY_H 453 736 # include <memory.h> 454 737 # endif 455 738 # include <string.h> 456 739 #endif 457 #if HAVE_STRINGS_H740 #ifdef HAVE_STRINGS_H 458 741 # include <strings.h> 459 742 #endif 460 #if HAVE_INTTYPES_H743 #ifdef HAVE_INTTYPES_H 461 744 # include <inttypes.h> 462 #else463 # if HAVE_STDINT_H464 # include <stdint.h>465 # endif466 745 #endif 467 #if HAVE_UNISTD_H 746 #ifdef HAVE_STDINT_H 747 # include <stdint.h> 748 #endif 749 #ifdef HAVE_UNISTD_H 468 750 # include <unistd.h> 469 751 #endif" 470 752 471 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SET_MAKE COMPAT32BITFLAGS UNICODE_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL PERL SH MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBICONV LTLIBICONV LIBOBJS LTLIBOBJS' 753 ac_subst_vars='LTLIBOBJS 754 LIBOBJS 755 LTLIBICONV 756 LIBICONV 757 MAINT 758 MAINTAINER_MODE_FALSE 759 MAINTAINER_MODE_TRUE 760 SH 761 PERL 762 LIBTOOL 763 STRIP 764 RANLIB 765 ECHO 766 LN_S 767 EGREP 768 GREP 769 CPP 770 OBJEXT 771 EXEEXT 772 ac_ct_CC 773 CPPFLAGS 774 LDFLAGS 775 CFLAGS 776 CC 777 UNICODE_VERSION 778 SET_MAKE 779 target_os 780 target_vendor 781 target_cpu 782 target 783 host_os 784 host_vendor 785 host_cpu 786 host 787 build_os 788 build_vendor 789 build_cpu 790 build 791 VERSION 792 target_alias 793 host_alias 794 build_alias 795 LIBS 796 ECHO_T 797 ECHO_N 798 ECHO_C 799 DEFS 800 mandir 801 localedir 802 libdir 803 psdir 804 pdfdir 805 dvidir 806 htmldir 807 infodir 808 docdir 809 oldincludedir 810 includedir 811 localstatedir 812 sharedstatedir 813 sysconfdir 814 datadir 815 datarootdir 816 libexecdir 817 sbindir 818 bindir 819 program_transform_name 820 prefix 821 exec_prefix 822 PACKAGE_URL 823 PACKAGE_BUGREPORT 824 PACKAGE_STRING 825 PACKAGE_VERSION 826 PACKAGE_TARNAME 827 PACKAGE_NAME 828 PATH_SEPARATOR 829 SHELL' 472 830 ac_subst_files='' 831 ac_user_opts=' 832 enable_option_checking 833 enable_shared 834 enable_static 835 enable_fast_install 836 with_gnu_ld 837 enable_libtool_lock 838 with_pic 839 enable_maintainer_mode 840 enable_rpath 841 with_libiconv_prefix 842 ' 843 ac_precious_vars='build_alias 844 host_alias 845 target_alias 846 CC 847 CFLAGS 848 LDFLAGS 849 LIBS 850 CPPFLAGS 851 CPP' 852 473 853 474 854 # Initialize some variables set by options. 475 855 ac_init_help= 476 856 ac_init_version=false 857 ac_unrecognized_opts= 858 ac_unrecognized_sep= 477 859 # The variables have the same names as the options, with 478 860 # dashes changed to underlines. … … 497 879 # by default will actually change. 498 880 # Use braces instead of parens because sh, perl, etc. also accept them. 881 # (The list follows the same order as the GNU Coding Standards.) 499 882 bindir='${exec_prefix}/bin' 500 883 sbindir='${exec_prefix}/sbin' 501 884 libexecdir='${exec_prefix}/libexec' 502 datadir='${prefix}/share' 885 datarootdir='${prefix}/share' 886 datadir='${datarootdir}' 503 887 sysconfdir='${prefix}/etc' 504 888 sharedstatedir='${prefix}/com' 505 889 localstatedir='${prefix}/var' 506 libdir='${exec_prefix}/lib'507 890 includedir='${prefix}/include' 508 891 oldincludedir='/usr/include' 509 infodir='${prefix}/info' 510 mandir='${prefix}/man' 892 docdir='${datarootdir}/doc/${PACKAGE}' 893 infodir='${datarootdir}/info' 894 htmldir='${docdir}' 895 dvidir='${docdir}' 896 pdfdir='${docdir}' 897 psdir='${docdir}' 898 libdir='${exec_prefix}/lib' 899 localedir='${datarootdir}/locale' 900 mandir='${datarootdir}/man' 511 901 512 902 ac_prev= 903 ac_dashdash= 513 904 for ac_option 514 905 do 515 906 # If the previous option needs an argument, assign it. 516 907 if test -n "$ac_prev"; then 517 eval "$ac_prev=\$ac_option"908 eval $ac_prev=\$ac_option 518 909 ac_prev= 519 910 continue 520 911 fi 521 912 522 ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` 913 case $ac_option in 914 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 915 *) ac_optarg=yes ;; 916 esac 523 917 524 918 # Accept the important Cygnus configure options, so we can diagnose typos. 525 919 526 case $ac_option in 920 case $ac_dashdash$ac_option in 921 --) 922 ac_dashdash=yes ;; 527 923 528 924 -bindir | --bindir | --bindi | --bind | --bin | --bi) … … 546 942 cache_file=config.cache ;; 547 943 548 -datadir | --datadir | --datadi | --datad | --data | --dat | --da)944 -datadir | --datadir | --datadi | --datad) 549 945 ac_prev=datadir ;; 550 -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ 551 | --da=*) 946 -datadir=* | --datadir=* | --datadi=* | --datad=*) 552 947 datadir=$ac_optarg ;; 553 948 949 -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ 950 | --dataroo | --dataro | --datar) 951 ac_prev=datarootdir ;; 952 -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ 953 | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) 954 datarootdir=$ac_optarg ;; 955 554 956 -disable-* | --disable-*) 555 ac_ feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`957 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 556 958 # Reject names that are not valid shell variable names. 557 expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && 558 { echo "$as_me: error: invalid feature name: $ac_feature" >&2 559 { (exit 1); exit 1; }; } 560 ac_feature=`echo $ac_feature | sed 's/-/_/g'` 561 eval "enable_$ac_feature=no" ;; 959 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 960 as_fn_error "invalid feature name: $ac_useropt" 961 ac_useropt_orig=$ac_useropt 962 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 963 case $ac_user_opts in 964 *" 965 "enable_$ac_useropt" 966 "*) ;; 967 *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" 968 ac_unrecognized_sep=', ';; 969 esac 970 eval enable_$ac_useropt=no ;; 971 972 -docdir | --docdir | --docdi | --doc | --do) 973 ac_prev=docdir ;; 974 -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) 975 docdir=$ac_optarg ;; 976 977 -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) 978 ac_prev=dvidir ;; 979 -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) 980 dvidir=$ac_optarg ;; 562 981 563 982 -enable-* | --enable-*) 564 ac_ feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`983 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 565 984 # Reject names that are not valid shell variable names. 566 expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && 567 { echo "$as_me: error: invalid feature name: $ac_feature" >&2 568 { (exit 1); exit 1; }; } 569 ac_feature=`echo $ac_feature | sed 's/-/_/g'` 570 case $ac_option in 571 *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; 572 *) ac_optarg=yes ;; 985 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 986 as_fn_error "invalid feature name: $ac_useropt" 987 ac_useropt_orig=$ac_useropt 988 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 989 case $ac_user_opts in 990 *" 991 "enable_$ac_useropt" 992 "*) ;; 993 *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" 994 ac_unrecognized_sep=', ';; 573 995 esac 574 eval "enable_$ac_feature='$ac_optarg'";;996 eval enable_$ac_useropt=\$ac_optarg ;; 575 997 576 998 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ … … 599 1021 host_alias=$ac_optarg ;; 600 1022 1023 -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) 1024 ac_prev=htmldir ;; 1025 -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ 1026 | --ht=*) 1027 htmldir=$ac_optarg ;; 1028 601 1029 -includedir | --includedir | --includedi | --included | --include \ 602 1030 | --includ | --inclu | --incl | --inc) … … 623 1051 libexecdir=$ac_optarg ;; 624 1052 1053 -localedir | --localedir | --localedi | --localed | --locale) 1054 ac_prev=localedir ;; 1055 -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) 1056 localedir=$ac_optarg ;; 1057 625 1058 -localstatedir | --localstatedir | --localstatedi | --localstated \ 626 | --localstate | --localstat | --localsta | --localst \ 627 | --locals | --local | --loca | --loc | --lo) 1059 | --localstate | --localstat | --localsta | --localst | --locals) 628 1060 ac_prev=localstatedir ;; 629 1061 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ 630 | --localstate=* | --localstat=* | --localsta=* | --localst=* \ 631 | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) 1062 | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) 632 1063 localstatedir=$ac_optarg ;; 633 1064 … … 694 1125 program_transform_name=$ac_optarg ;; 695 1126 1127 -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) 1128 ac_prev=pdfdir ;; 1129 -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) 1130 pdfdir=$ac_optarg ;; 1131 1132 -psdir | --psdir | --psdi | --psd | --ps) 1133 ac_prev=psdir ;; 1134 -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) 1135 psdir=$ac_optarg ;; 1136 696 1137 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 697 1138 | -silent | --silent | --silen | --sile | --sil) … … 744 1185 745 1186 -with-* | --with-*) 746 ac_ package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`1187 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 747 1188 # Reject names that are not valid shell variable names. 748 expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && 749 { echo "$as_me: error: invalid package name: $ac_package" >&2 750 { (exit 1); exit 1; }; } 751 ac_package=`echo $ac_package| sed 's/-/_/g'` 752 case $ac_option in 753 *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; 754 *) ac_optarg=yes ;; 1189 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1190 as_fn_error "invalid package name: $ac_useropt" 1191 ac_useropt_orig=$ac_useropt 1192 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1193 case $ac_user_opts in 1194 *" 1195 "with_$ac_useropt" 1196 "*) ;; 1197 *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" 1198 ac_unrecognized_sep=', ';; 755 1199 esac 756 eval "with_$ac_package='$ac_optarg'";;1200 eval with_$ac_useropt=\$ac_optarg ;; 757 1201 758 1202 -without-* | --without-*) 759 ac_ package=`expr "x$ac_option" : 'x-*without-\(.*\)'`1203 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 760 1204 # Reject names that are not valid shell variable names. 761 expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && 762 { echo "$as_me: error: invalid package name: $ac_package" >&2 763 { (exit 1); exit 1; }; } 764 ac_package=`echo $ac_package | sed 's/-/_/g'` 765 eval "with_$ac_package=no" ;; 1205 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1206 as_fn_error "invalid package name: $ac_useropt" 1207 ac_useropt_orig=$ac_useropt 1208 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1209 case $ac_user_opts in 1210 *" 1211 "with_$ac_useropt" 1212 "*) ;; 1213 *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" 1214 ac_unrecognized_sep=', ';; 1215 esac 1216 eval with_$ac_useropt=no ;; 766 1217 767 1218 --x) … … 783 1234 x_libraries=$ac_optarg ;; 784 1235 785 -*) { echo "$as_me: error: unrecognized option: $ac_option 786 Try \`$0 --help' for more information." >&2 787 { (exit 1); exit 1; }; } 1236 -*) as_fn_error "unrecognized option: \`$ac_option' 1237 Try \`$0 --help' for more information." 788 1238 ;; 789 1239 … … 791 1241 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` 792 1242 # Reject names that are not valid shell variable names. 793 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&794 { echo "$as_me: error: invalid variable name: $ac_envvar" >&2795 { (exit 1); exit 1; }; }796 ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`797 eval "$ac_envvar='$ac_optarg'"1243 case $ac_envvar in #( 1244 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1245 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1246 esac 1247 eval $ac_envvar=\$ac_optarg 798 1248 export $ac_envvar ;; 799 1249 800 1250 *) 801 1251 # FIXME: should be removed in autoconf 3.0. 802 echo "$as_me: WARNING: you should use --build, --host, --target" >&21252 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 803 1253 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 804 echo "$as_me: WARNING: invalid host type: $ac_option" >&21254 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 805 1255 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 806 1256 ;; … … 811 1261 if test -n "$ac_prev"; then 812 1262 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 813 { echo "$as_me: error: missing argument to $ac_option" >&2 814 { (exit 1); exit 1; }; } 815 fi 816 817 # Be sure to have absolute paths. 818 for ac_var in exec_prefix prefix 1263 as_fn_error "missing argument to $ac_option" 1264 fi 1265 1266 if test -n "$ac_unrecognized_opts"; then 1267 case $enable_option_checking in 1268 no) ;; 1269 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1270 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1271 esac 1272 fi 1273 1274 # Check all directory arguments for consistency. 1275 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1276 datadir sysconfdir sharedstatedir localstatedir includedir \ 1277 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1278 libdir localedir mandir 819 1279 do 820 eval ac_val=$`echo $ac_var` 1280 eval ac_val=\$$ac_var 1281 # Remove trailing slashes. 821 1282 case $ac_val in 822 [\\/$]* | ?:[\\/]* | NONE | '' ) ;;823 *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2824 { (exit 1); exit 1; }; };;1283 */ ) 1284 ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` 1285 eval $ac_var=\$ac_val;; 825 1286 esac 826 done 827 828 # Be sure to have absolute paths. 829 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ 830 localstatedir libdir includedir oldincludedir infodir mandir 831 do 832 eval ac_val=$`echo $ac_var` 1287 # Be sure to have absolute directory names. 833 1288 case $ac_val in 834 [\\/$]* | ?:[\\/]* ) ;; 835 *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 836 { (exit 1); exit 1; }; };; 1289 [\\/$]* | ?:[\\/]* ) continue;; 1290 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 837 1291 esac 1292 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 838 1293 done 839 1294 … … 849 1304 if test "x$build_alias" = x; then 850 1305 cross_compiling=maybe 851 echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.1306 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 852 1307 If a cross compiler is detected then cross compile mode will be used." >&2 853 1308 elif test "x$build_alias" != "x$host_alias"; then … … 862 1317 863 1318 1319 ac_pwd=`pwd` && test -n "$ac_pwd" && 1320 ac_ls_di=`ls -di .` && 1321 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1322 as_fn_error "working directory cannot be determined" 1323 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1324 as_fn_error "pwd does not report name of working directory" 1325 1326 864 1327 # Find the source files, if location was not specified. 865 1328 if test -z "$srcdir"; then 866 1329 ac_srcdir_defaulted=yes 867 # Try the directory containing this script, then its parent. 868 ac_confdir=`(dirname "$0") 2>/dev/null || 869 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 870 X"$0" : 'X\(//\)[^/]' \| \ 871 X"$0" : 'X\(//\)$' \| \ 872 X"$0" : 'X\(/\)' \| \ 873 . : '\(.\)' 2>/dev/null || 874 echo X"$0" | 875 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 876 /^X\(\/\/\)[^/].*/{ s//\1/; q; } 877 /^X\(\/\/\)$/{ s//\1/; q; } 878 /^X\(\/\).*/{ s//\1/; q; } 879 s/.*/./; q'` 1330 # Try the directory containing this script, then the parent directory. 1331 ac_confdir=`$as_dirname -- "$as_myself" || 1332 $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 1333 X"$as_myself" : 'X\(//\)[^/]' \| \ 1334 X"$as_myself" : 'X\(//\)$' \| \ 1335 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || 1336 $as_echo X"$as_myself" | 1337 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 1338 s//\1/ 1339 q 1340 } 1341 /^X\(\/\/\)[^/].*/{ 1342 s//\1/ 1343 q 1344 } 1345 /^X\(\/\/\)$/{ 1346 s//\1/ 1347 q 1348 } 1349 /^X\(\/\).*/{ 1350 s//\1/ 1351 q 1352 } 1353 s/.*/./; q'` 880 1354 srcdir=$ac_confdir 881 if test ! -r $srcdir/$ac_unique_file; then1355 if test ! -r "$srcdir/$ac_unique_file"; then 882 1356 srcdir=.. 883 1357 fi … … 885 1359 ac_srcdir_defaulted=no 886 1360 fi 887 if test ! -r $srcdir/$ac_unique_file; then 888 if test "$ac_srcdir_defaulted" = yes; then 889 { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 890 { (exit 1); exit 1; }; } 891 else 892 { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 893 { (exit 1); exit 1; }; } 894 fi 895 fi 896 (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || 897 { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 898 { (exit 1); exit 1; }; } 899 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` 900 ac_env_build_alias_set=${build_alias+set} 901 ac_env_build_alias_value=$build_alias 902 ac_cv_env_build_alias_set=${build_alias+set} 903 ac_cv_env_build_alias_value=$build_alias 904 ac_env_host_alias_set=${host_alias+set} 905 ac_env_host_alias_value=$host_alias 906 ac_cv_env_host_alias_set=${host_alias+set} 907 ac_cv_env_host_alias_value=$host_alias 908 ac_env_target_alias_set=${target_alias+set} 909 ac_env_target_alias_value=$target_alias 910 ac_cv_env_target_alias_set=${target_alias+set} 911 ac_cv_env_target_alias_value=$target_alias 912 ac_env_CC_set=${CC+set} 913 ac_env_CC_value=$CC 914 ac_cv_env_CC_set=${CC+set} 915 ac_cv_env_CC_value=$CC 916 ac_env_CFLAGS_set=${CFLAGS+set} 917 ac_env_CFLAGS_value=$CFLAGS 918 ac_cv_env_CFLAGS_set=${CFLAGS+set} 919 ac_cv_env_CFLAGS_value=$CFLAGS 920 ac_env_LDFLAGS_set=${LDFLAGS+set} 921 ac_env_LDFLAGS_value=$LDFLAGS 922 ac_cv_env_LDFLAGS_set=${LDFLAGS+set} 923 ac_cv_env_LDFLAGS_value=$LDFLAGS 924 ac_env_CPPFLAGS_set=${CPPFLAGS+set} 925 ac_env_CPPFLAGS_value=$CPPFLAGS 926 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} 927 ac_cv_env_CPPFLAGS_value=$CPPFLAGS 928 ac_env_CPP_set=${CPP+set} 929 ac_env_CPP_value=$CPP 930 ac_cv_env_CPP_set=${CPP+set} 931 ac_cv_env_CPP_value=$CPP 1361 if test ! -r "$srcdir/$ac_unique_file"; then 1362 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1363 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1364 fi 1365 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1366 ac_abs_confdir=`( 1367 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1368 pwd)` 1369 # When building in place, set srcdir=. 1370 if test "$ac_abs_confdir" = "$ac_pwd"; then 1371 srcdir=. 1372 fi 1373 # Remove unnecessary trailing slashes from srcdir. 1374 # Double slashes in file names in object file debugging info 1375 # mess up M-x gdb in Emacs. 1376 case $srcdir in 1377 */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; 1378 esac 1379 for ac_var in $ac_precious_vars; do 1380 eval ac_env_${ac_var}_set=\${${ac_var}+set} 1381 eval ac_env_${ac_var}_value=\$${ac_var} 1382 eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} 1383 eval ac_cv_env_${ac_var}_value=\$${ac_var} 1384 done 932 1385 933 1386 # … … 958 1411 --srcdir=DIR find the sources in DIR [configure dir or \`..'] 959 1412 960 _ACEOF961 962 cat <<_ACEOF963 1413 Installation directories: 964 1414 --prefix=PREFIX install architecture-independent files in PREFIX 965 1415 [$ac_default_prefix] 966 1416 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX 967 1417 [PREFIX] 968 1418 969 1419 By default, \`make install' will install all the files in … … 975 1425 976 1426 Fine tuning of the installation directories: 977 --bindir=DIR user executables [EPREFIX/bin] 978 --sbindir=DIR system admin executables [EPREFIX/sbin] 979 --libexecdir=DIR program executables [EPREFIX/libexec] 980 --datadir=DIR read-only architecture-independent data [PREFIX/share] 981 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 982 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 983 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 984 --libdir=DIR object code libraries [EPREFIX/lib] 985 --includedir=DIR C header files [PREFIX/include] 986 --oldincludedir=DIR C header files for non-gcc [/usr/include] 987 --infodir=DIR info documentation [PREFIX/info] 988 --mandir=DIR man documentation [PREFIX/man] 1427 --bindir=DIR user executables [EPREFIX/bin] 1428 --sbindir=DIR system admin executables [EPREFIX/sbin] 1429 --libexecdir=DIR program executables [EPREFIX/libexec] 1430 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1431 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1432 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1433 --libdir=DIR object code libraries [EPREFIX/lib] 1434 --includedir=DIR C header files [PREFIX/include] 1435 --oldincludedir=DIR C header files for non-gcc [/usr/include] 1436 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] 1437 --datadir=DIR read-only architecture-independent data [DATAROOTDIR] 1438 --infodir=DIR info documentation [DATAROOTDIR/info] 1439 --localedir=DIR locale-dependent data [DATAROOTDIR/locale] 1440 --mandir=DIR man documentation [DATAROOTDIR/man] 1441 --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] 1442 --htmldir=DIR html documentation [DOCDIR] 1443 --dvidir=DIR dvi documentation [DOCDIR] 1444 --pdfdir=DIR pdf documentation [DOCDIR] 1445 --psdir=DIR ps documentation [DOCDIR] 989 1446 _ACEOF 990 1447 … … 1003 1460 1004 1461 Optional Features: 1462 --disable-option-checking ignore unrecognized --enable/--with options 1005 1463 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 1006 1464 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] … … 1026 1484 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a 1027 1485 nonstandard directory <lib dir> 1028 CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have 1029 headers in a nonstandard directory <include dir> 1486 LIBS libraries to pass to the linker, e.g. -l<library> 1487 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if 1488 you have headers in a nonstandard directory <include dir> 1030 1489 CPP C preprocessor 1031 1490 … … 1033 1492 it to find libraries and programs with nonstandard names/locations. 1034 1493 1494 Report bugs to the package provider. 1035 1495 _ACEOF 1496 ac_status=$? 1036 1497 fi 1037 1498 1038 1499 if test "$ac_init_help" = "recursive"; then 1039 1500 # If there are subdirs, report their specific --help. 1040 ac_popdir=`pwd`1041 1501 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue 1042 test -d $ac_dir || continue 1502 test -d "$ac_dir" || 1503 { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || 1504 continue 1043 1505 ac_builddir=. 1044 1506 1045 if test "$ac_dir" != .; then 1046 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` 1047 # A "../" for each directory in $ac_dir_suffix. 1048 ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` 1049 else 1050 ac_dir_suffix= ac_top_builddir= 1051 fi 1507 case "$ac_dir" in 1508 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; 1509 *) 1510 ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` 1511 # A ".." for each directory in $ac_dir_suffix. 1512 ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` 1513 case $ac_top_builddir_sub in 1514 "") ac_top_builddir_sub=. ac_top_build_prefix= ;; 1515 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; 1516 esac ;; 1517 esac 1518 ac_abs_top_builddir=$ac_pwd 1519 ac_abs_builddir=$ac_pwd$ac_dir_suffix 1520 # for backward compatibility: 1521 ac_top_builddir=$ac_top_build_prefix 1052 1522 1053 1523 case $srcdir in 1054 .) # No --srcdir option.We are building in place.1524 .) # We are building in place. 1055 1525 ac_srcdir=. 1056 if test -z "$ac_top_builddir"; then 1057 ac_top_srcdir=. 1526 ac_top_srcdir=$ac_top_builddir_sub 1527 ac_abs_top_srcdir=$ac_pwd ;; 1528 [\\/]* | ?:[\\/]* ) # Absolute name. 1529 ac_srcdir=$srcdir$ac_dir_suffix; 1530 ac_top_srcdir=$srcdir 1531 ac_abs_top_srcdir=$srcdir ;; 1532 *) # Relative name. 1533 ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix 1534 ac_top_srcdir=$ac_top_build_prefix$srcdir 1535 ac_abs_top_srcdir=$ac_pwd/$srcdir ;; 1536 esac 1537 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix 1538 1539 cd "$ac_dir" || { ac_status=$?; continue; } 1540 # Check for guested configure. 1541 if test -f "$ac_srcdir/configure.gnu"; then 1542 echo && 1543 $SHELL "$ac_srcdir/configure.gnu" --help=recursive 1544 elif test -f "$ac_srcdir/configure"; then 1545 echo && 1546 $SHELL "$ac_srcdir/configure" --help=recursive 1058 1547 else 1059 ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` 1060 fi ;; 1061 [\\/]* | ?:[\\/]* ) # Absolute path. 1062 ac_srcdir=$srcdir$ac_dir_suffix; 1063 ac_top_srcdir=$srcdir ;; 1064 *) # Relative path. 1065 ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix 1066 ac_top_srcdir=$ac_top_builddir$srcdir ;; 1067 esac 1068 1069 # Do not use `cd foo && pwd` to compute absolute paths, because 1070 # the directories may not exist. 1071 case `pwd` in 1072 .) ac_abs_builddir="$ac_dir";; 1073 *) 1074 case "$ac_dir" in 1075 .) ac_abs_builddir=`pwd`;; 1076 [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; 1077 *) ac_abs_builddir=`pwd`/"$ac_dir";; 1078 esac;; 1079 esac 1080 case $ac_abs_builddir in 1081 .) ac_abs_top_builddir=${ac_top_builddir}.;; 1082 *) 1083 case ${ac_top_builddir}. in 1084 .) ac_abs_top_builddir=$ac_abs_builddir;; 1085 [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; 1086 *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; 1087 esac;; 1088 esac 1089 case $ac_abs_builddir in 1090 .) ac_abs_srcdir=$ac_srcdir;; 1091 *) 1092 case $ac_srcdir in 1093 .) ac_abs_srcdir=$ac_abs_builddir;; 1094 [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; 1095 *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; 1096 esac;; 1097 esac 1098 case $ac_abs_builddir in 1099 .) ac_abs_top_srcdir=$ac_top_srcdir;; 1100 *) 1101 case $ac_top_srcdir in 1102 .) ac_abs_top_srcdir=$ac_abs_builddir;; 1103 [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; 1104 *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; 1105 esac;; 1106 esac 1107 1108 cd $ac_dir 1109 # Check for guested configure; otherwise get Cygnus style configure. 1110 if test -f $ac_srcdir/configure.gnu; then 1111 echo 1112 $SHELL $ac_srcdir/configure.gnu --help=recursive 1113 elif test -f $ac_srcdir/configure; then 1114 echo 1115 $SHELL $ac_srcdir/configure --help=recursive 1116 elif test -f $ac_srcdir/configure.ac || 1117 test -f $ac_srcdir/configure.in; then 1118 echo 1119 $ac_configure --help 1120 else 1121 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 1122 fi 1123 cd $ac_popdir 1548 $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 1549 fi || ac_status=$? 1550 cd "$ac_pwd" || { ac_status=$?; break; } 1124 1551 done 1125 1552 fi 1126 1553 1127 test -n "$ac_init_help" && exit 01554 test -n "$ac_init_help" && exit $ac_status 1128 1555 if $ac_init_version; then 1129 1556 cat <<\_ACEOF 1130 1131 Copyright (C) 2003 Free Software Foundation, Inc. 1557 configure 1558 generated by GNU Autoconf 2.65 1559 1560 Copyright (C) 2009 Free Software Foundation, Inc. 1132 1561 This configure script is free software; the Free Software Foundation 1133 1562 gives unlimited permission to copy, distribute and modify it. 1134 1563 _ACEOF 1135 exit 0 1136 fi 1137 exec 5>config.log 1138 cat >&5 <<_ACEOF 1564 exit 1565 fi 1566 1567 ## ------------------------ ## 1568 ## Autoconf initialization. ## 1569 ## ------------------------ ## 1570 1571 # ac_fn_c_try_compile LINENO 1572 # -------------------------- 1573 # Try to compile conftest.$ac_ext, and return whether this succeeded. 1574 ac_fn_c_try_compile () 1575 { 1576 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1577 rm -f conftest.$ac_objext 1578 if { { ac_try="$ac_compile" 1579 case "(($ac_try" in 1580 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 1581 *) ac_try_echo=$ac_try;; 1582 esac 1583 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 1584 $as_echo "$ac_try_echo"; } >&5 1585 (eval "$ac_compile") 2>conftest.err 1586 ac_status=$? 1587 if test -s conftest.err; then 1588 grep -v '^ *+' conftest.err >conftest.er1 1589 cat conftest.er1 >&5 1590 mv -f conftest.er1 conftest.err 1591 fi 1592 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1593 test $ac_status = 0; } && { 1594 test -z "$ac_c_werror_flag" || 1595 test ! -s conftest.err 1596 } && test -s conftest.$ac_objext; then : 1597 ac_retval=0 1598 else 1599 $as_echo "$as_me: failed program was:" >&5 1600 sed 's/^/| /' conftest.$ac_ext >&5 1601 1602 ac_retval=1 1603 fi 1604 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1605 as_fn_set_status $ac_retval 1606 1607 } # ac_fn_c_try_compile 1608 1609 # ac_fn_c_try_cpp LINENO 1610 # ---------------------- 1611 # Try to preprocess conftest.$ac_ext, and return whether this succeeded. 1612 ac_fn_c_try_cpp () 1613 { 1614 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1615 if { { ac_try="$ac_cpp conftest.$ac_ext" 1616 case "(($ac_try" in 1617 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 1618 *) ac_try_echo=$ac_try;; 1619 esac 1620 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 1621 $as_echo "$ac_try_echo"; } >&5 1622 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err 1623 ac_status=$? 1624 if test -s conftest.err; then 1625 grep -v '^ *+' conftest.err >conftest.er1 1626 cat conftest.er1 >&5 1627 mv -f conftest.er1 conftest.err 1628 fi 1629 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1630 test $ac_status = 0; } >/dev/null && { 1631 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1632 test ! -s conftest.err 1633 }; then : 1634 ac_retval=0 1635 else 1636 $as_echo "$as_me: failed program was:" >&5 1637 sed 's/^/| /' conftest.$ac_ext >&5 1638 1639 ac_retval=1 1640 fi 1641 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1642 as_fn_set_status $ac_retval 1643 1644 } # ac_fn_c_try_cpp 1645 1646 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES 1647 # ------------------------------------------------------- 1648 # Tests whether HEADER exists, giving a warning if it cannot be compiled using 1649 # the include files in INCLUDES and setting the cache variable VAR 1650 # accordingly. 1651 ac_fn_c_check_header_mongrel () 1652 { 1653 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1654 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1656 $as_echo_n "checking for $2... " >&6; } 1657 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1658 $as_echo_n "(cached) " >&6 1659 fi 1660 eval ac_res=\$$3 1661 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1662 $as_echo "$ac_res" >&6; } 1663 else 1664 # Is the header compilable? 1665 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 1666 $as_echo_n "checking $2 usability... " >&6; } 1667 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1668 /* end confdefs.h. */ 1669 $4 1670 #include <$2> 1671 _ACEOF 1672 if ac_fn_c_try_compile "$LINENO"; then : 1673 ac_header_compiler=yes 1674 else 1675 ac_header_compiler=no 1676 fi 1677 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 1678 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 1679 $as_echo "$ac_header_compiler" >&6; } 1680 1681 # Is the header present? 1682 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 1683 $as_echo_n "checking $2 presence... " >&6; } 1684 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1685 /* end confdefs.h. */ 1686 #include <$2> 1687 _ACEOF 1688 if ac_fn_c_try_cpp "$LINENO"; then : 1689 ac_header_preproc=yes 1690 else 1691 ac_header_preproc=no 1692 fi 1693 rm -f conftest.err conftest.$ac_ext 1694 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1695 $as_echo "$ac_header_preproc" >&6; } 1696 1697 # So? What about this header? 1698 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( 1699 yes:no: ) 1700 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 1701 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} 1702 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 1703 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 1704 ;; 1705 no:yes:* ) 1706 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 1707 $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} 1708 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 1709 $as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} 1710 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 1711 $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} 1712 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 1713 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 1714 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 1715 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 1716 ;; 1717 esac 1718 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1719 $as_echo_n "checking for $2... " >&6; } 1720 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1721 $as_echo_n "(cached) " >&6 1722 else 1723 eval "$3=\$ac_header_compiler" 1724 fi 1725 eval ac_res=\$$3 1726 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1727 $as_echo "$ac_res" >&6; } 1728 fi 1729 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1730 1731 } # ac_fn_c_check_header_mongrel 1732 1733 # ac_fn_c_try_run LINENO 1734 # ---------------------- 1735 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes 1736 # that executables *can* be run. 1737 ac_fn_c_try_run () 1738 { 1739 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1740 if { { ac_try="$ac_link" 1741 case "(($ac_try" in 1742 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 1743 *) ac_try_echo=$ac_try;; 1744 esac 1745 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 1746 $as_echo "$ac_try_echo"; } >&5 1747 (eval "$ac_link") 2>&5 1748 ac_status=$? 1749 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1750 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' 1751 { { case "(($ac_try" in 1752 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 1753 *) ac_try_echo=$ac_try;; 1754 esac 1755 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 1756 $as_echo "$ac_try_echo"; } >&5 1757 (eval "$ac_try") 2>&5 1758 ac_status=$? 1759 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1760 test $ac_status = 0; }; }; then : 1761 ac_retval=0 1762 else 1763 $as_echo "$as_me: program exited with status $ac_status" >&5 1764 $as_echo "$as_me: failed program was:" >&5 1765 sed 's/^/| /' conftest.$ac_ext >&5 1766 1767 ac_retval=$ac_status 1768 fi 1769 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1770 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1771 as_fn_set_status $ac_retval 1772 1773 } # ac_fn_c_try_run 1774 1775 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES 1776 # ------------------------------------------------------- 1777 # Tests whether HEADER exists and can be compiled using the include files in 1778 # INCLUDES, setting the cache variable VAR accordingly. 1779 ac_fn_c_check_header_compile () 1780 { 1781 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1782 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1783 $as_echo_n "checking for $2... " >&6; } 1784 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1785 $as_echo_n "(cached) " >&6 1786 else 1787 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1788 /* end confdefs.h. */ 1789 $4 1790 #include <$2> 1791 _ACEOF 1792 if ac_fn_c_try_compile "$LINENO"; then : 1793 eval "$3=yes" 1794 else 1795 eval "$3=no" 1796 fi 1797 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 1798 fi 1799 eval ac_res=\$$3 1800 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1801 $as_echo "$ac_res" >&6; } 1802 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1803 1804 } # ac_fn_c_check_header_compile 1805 1806 # ac_fn_c_try_link LINENO 1807 # ----------------------- 1808 # Try to link conftest.$ac_ext, and return whether this succeeded. 1809 ac_fn_c_try_link () 1810 { 1811 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1812 rm -f conftest.$ac_objext conftest$ac_exeext 1813 if { { ac_try="$ac_link" 1814 case "(($ac_try" in 1815 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 1816 *) ac_try_echo=$ac_try;; 1817 esac 1818 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 1819 $as_echo "$ac_try_echo"; } >&5 1820 (eval "$ac_link") 2>conftest.err 1821 ac_status=$? 1822 if test -s conftest.err; then 1823 grep -v '^ *+' conftest.err >conftest.er1 1824 cat conftest.er1 >&5 1825 mv -f conftest.er1 conftest.err 1826 fi 1827 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1828 test $ac_status = 0; } && { 1829 test -z "$ac_c_werror_flag" || 1830 test ! -s conftest.err 1831 } && test -s conftest$ac_exeext && { 1832 test "$cross_compiling" = yes || 1833 $as_test_x conftest$ac_exeext 1834 }; then : 1835 ac_retval=0 1836 else 1837 $as_echo "$as_me: failed program was:" >&5 1838 sed 's/^/| /' conftest.$ac_ext >&5 1839 1840 ac_retval=1 1841 fi 1842 # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information 1843 # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would 1844 # interfere with the next link command; also delete a directory that is 1845 # left behind by Apple's compiler. We do this before executing the actions. 1846 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1847 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1848 as_fn_set_status $ac_retval 1849 1850 } # ac_fn_c_try_link 1851 1852 # ac_fn_c_check_func LINENO FUNC VAR 1853 # ---------------------------------- 1854 # Tests whether FUNC exists, setting the cache variable VAR accordingly 1855 ac_fn_c_check_func () 1856 { 1857 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1858 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1859 $as_echo_n "checking for $2... " >&6; } 1860 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1861 $as_echo_n "(cached) " >&6 1862 else 1863 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1864 /* end confdefs.h. */ 1865 /* Define $2 to an innocuous variant, in case <limits.h> declares $2. 1866 For example, HP-UX 11i <limits.h> declares gettimeofday. */ 1867 #define $2 innocuous_$2 1868 1869 /* System header to define __stub macros and hopefully few prototypes, 1870 which can conflict with char $2 (); below. 1871 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 1872 <limits.h> exists even on freestanding compilers. */ 1873 1874 #ifdef __STDC__ 1875 # include <limits.h> 1876 #else 1877 # include <assert.h> 1878 #endif 1879 1880 #undef $2 1881 1882 /* Override any GCC internal prototype to avoid an error. 1883 Use char because int might match the return type of a GCC 1884 builtin and then its argument prototype would still apply. */ 1885 #ifdef __cplusplus 1886 extern "C" 1887 #endif 1888 char $2 (); 1889 /* The GNU C library defines this for functions which it implements 1890 to always fail with ENOSYS. Some functions are actually named 1891 something starting with __ and the normal name is an alias. */ 1892 #if defined __stub_$2 || defined __stub___$2 1893 choke me 1894 #endif 1895 1896 int 1897 main () 1898 { 1899 return $2 (); 1900 ; 1901 return 0; 1902 } 1903 _ACEOF 1904 if ac_fn_c_try_link "$LINENO"; then : 1905 eval "$3=yes" 1906 else 1907 eval "$3=no" 1908 fi 1909 rm -f core conftest.err conftest.$ac_objext \ 1910 conftest$ac_exeext conftest.$ac_ext 1911 fi 1912 eval ac_res=\$$3 1913 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1914 $as_echo "$ac_res" >&6; } 1915 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1916 1917 } # ac_fn_c_check_func 1918 cat >config.log <<_ACEOF 1139 1919 This file contains any messages produced by compilers while 1140 1920 running configure, to aid debugging if configure makes a mistake. 1141 1921 1142 1922 It was created by $as_me, which was 1143 generated by GNU Autoconf 2. 59. Invocation command line was1923 generated by GNU Autoconf 2.65. Invocation command line was 1144 1924 1145 1925 $ $0 $@ 1146 1926 1147 1927 _ACEOF 1928 exec 5>>config.log 1148 1929 { 1149 1930 cat <<_ASUNAME … … 1164 1945 /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` 1165 1946 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` 1166 hostinfo = `(hostinfo) 2>/dev/null|| echo unknown`1947 /usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` 1167 1948 /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` 1168 1949 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` … … 1176 1957 IFS=$as_save_IFS 1177 1958 test -z "$as_dir" && as_dir=. 1178 echo "PATH: $as_dir" 1179 done 1959 $as_echo "PATH: $as_dir" 1960 done 1961 IFS=$as_save_IFS 1180 1962 1181 1963 } >&5 … … 1199 1981 ac_configure_args0= 1200 1982 ac_configure_args1= 1201 ac_sep=1202 1983 ac_must_keep_next=false 1203 1984 for ac_pass in 1 2 … … 1210 1991 | -silent | --silent | --silen | --sile | --sil) 1211 1992 continue ;; 1212 * " "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)1213 ac_arg=` echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;1993 *\'*) 1994 ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; 1214 1995 esac 1215 1996 case $ac_pass in 1216 1) a c_configure_args0="$ac_configure_args0'$ac_arg'" ;;1997 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 1217 1998 2) 1218 a c_configure_args1="$ac_configure_args1'$ac_arg'"1999 as_fn_append ac_configure_args1 " '$ac_arg'" 1219 2000 if test $ac_must_keep_next = true; then 1220 2001 ac_must_keep_next=false # Got value, back to normal. … … 1232 2013 esac 1233 2014 fi 1234 ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" 1235 # Get rid of the leading space. 1236 ac_sep=" " 2015 as_fn_append ac_configure_args " '$ac_arg'" 1237 2016 ;; 1238 2017 esac 1239 2018 done 1240 2019 done 1241 $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0;}1242 $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1;}2020 { ac_configure_args0=; unset ac_configure_args0;} 2021 { ac_configure_args1=; unset ac_configure_args1;} 1243 2022 1244 2023 # When interrupted or exit'd, cleanup temporary files, and complete 1245 2024 # config.log. We remove comments because anyway the quotes in there 1246 2025 # would cause problems or look ugly. 1247 # WARNING: Be sure not to use single quotes in there, as some shells,1248 # such as our DU 5.0 friend, will then `close' the trap.2026 # WARNING: Use '\'' to represent an apostrophe within the trap. 2027 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. 1249 2028 trap 'exit_status=$? 1250 2029 # Save into config.log some information that might help in debugging. … … 1259 2038 echo 1260 2039 # The following way of writing the cache mishandles newlines in values, 1261 { 2040 ( 2041 for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do 2042 eval ac_val=\$$ac_var 2043 case $ac_val in #( 2044 *${as_nl}*) 2045 case $ac_var in #( 2046 *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 2047 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; 2048 esac 2049 case $ac_var in #( 2050 _ | IFS | as_nl) ;; #( 2051 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( 2052 *) { eval $ac_var=; unset $ac_var;} ;; 2053 esac ;; 2054 esac 2055 done 1262 2056 (set) 2>&1 | 1263 case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in1264 * ac_space=\ *)2057 case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( 2058 *${as_nl}ac_space=\ *) 1265 2059 sed -n \ 1266 "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; 1267 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" 2060 "s/'\''/'\''\\\\'\'''\''/g; 2061 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" 2062 ;; #( 2063 *) 2064 sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" 1268 2065 ;; 1269 *) 1270 sed -n \ 1271 "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" 1272 ;; 1273 esac; 1274 } 2066 esac | 2067 sort 2068 ) 1275 2069 echo 1276 2070 … … 1283 2077 for ac_var in $ac_subst_vars 1284 2078 do 1285 eval ac_val=$`echo $ac_var` 1286 echo "$ac_var='"'"'$ac_val'"'"'" 2079 eval ac_val=\$$ac_var 2080 case $ac_val in 2081 *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; 2082 esac 2083 $as_echo "$ac_var='\''$ac_val'\''" 1287 2084 done | sort 1288 2085 echo … … 1290 2087 if test -n "$ac_subst_files"; then 1291 2088 cat <<\_ASBOX 1292 ## ------------- ##1293 ## Output files. ##1294 ## ------------- ##2089 ## ------------------- ## 2090 ## File substitutions. ## 2091 ## ------------------- ## 1295 2092 _ASBOX 1296 2093 echo 1297 2094 for ac_var in $ac_subst_files 1298 2095 do 1299 eval ac_val=$`echo $ac_var` 1300 echo "$ac_var='"'"'$ac_val'"'"'" 2096 eval ac_val=\$$ac_var 2097 case $ac_val in 2098 *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; 2099 esac 2100 $as_echo "$ac_var='\''$ac_val'\''" 1301 2101 done | sort 1302 2102 echo … … 1310 2110 _ASBOX 1311 2111 echo 1312 sed "/^$/d" confdefs.h | sort2112 cat confdefs.h 1313 2113 echo 1314 2114 fi 1315 2115 test "$ac_signal" != 0 && 1316 echo "$as_me: caught signal $ac_signal"1317 echo "$as_me: exit $exit_status"2116 $as_echo "$as_me: caught signal $ac_signal" 2117 $as_echo "$as_me: exit $exit_status" 1318 2118 } >&5 1319 rm -f core *.core &&1320 rm -rfconftest* confdefs* conf$$* $ac_clean_files &&2119 rm -f core *.core core.conftest.* && 2120 rm -f -r conftest* confdefs* conf$$* $ac_clean_files && 1321 2121 exit $exit_status 1322 2122 ' 0 1323 2123 for ac_signal in 1 2 13 15; do 1324 trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal2124 trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal 1325 2125 done 1326 2126 ac_signal=0 1327 2127 1328 2128 # confdefs.h avoids OS command line length limits that DEFS can exceed. 1329 rm - rfconftest* confdefs.h1330 # AIX cpp loses on an empty file, so make sure it contains at least a newline. 1331 echo >confdefs.h2129 rm -f -r conftest* confdefs.h 2130 2131 $as_echo "/* confdefs.h */" > confdefs.h 1332 2132 1333 2133 # Predefined preprocessor variables. … … 1337 2137 _ACEOF 1338 2138 1339 1340 2139 cat >>confdefs.h <<_ACEOF 1341 2140 #define PACKAGE_TARNAME "$PACKAGE_TARNAME" 1342 2141 _ACEOF 1343 2142 1344 1345 2143 cat >>confdefs.h <<_ACEOF 1346 2144 #define PACKAGE_VERSION "$PACKAGE_VERSION" 1347 2145 _ACEOF 1348 2146 1349 1350 2147 cat >>confdefs.h <<_ACEOF 1351 2148 #define PACKAGE_STRING "$PACKAGE_STRING" 1352 2149 _ACEOF 1353 2150 1354 1355 2151 cat >>confdefs.h <<_ACEOF 1356 2152 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" 1357 2153 _ACEOF 1358 2154 2155 cat >>confdefs.h <<_ACEOF 2156 #define PACKAGE_URL "$PACKAGE_URL" 2157 _ACEOF 2158 1359 2159 1360 2160 # Let the site file select an alternate cache file if it wants to. 1361 # Prefer explicitly selected file to automatically selected ones. 1362 if test -z "$CONFIG_SITE"; then 1363 if test "x$prefix" != xNONE; then 1364 CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" 1365 else 1366 CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" 1367 fi 1368 fi 1369 for ac_site_file in $CONFIG_SITE; do 1370 if test -r "$ac_site_file"; then 1371 { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 1372 echo "$as_me: loading site script $ac_site_file" >&6;} 2161 # Prefer an explicitly selected file to automatically selected ones. 2162 ac_site_file1=NONE 2163 ac_site_file2=NONE 2164 if test -n "$CONFIG_SITE"; then 2165 ac_site_file1=$CONFIG_SITE 2166 elif test "x$prefix" != xNONE; then 2167 ac_site_file1=$prefix/share/config.site 2168 ac_site_file2=$prefix/etc/config.site 2169 else 2170 ac_site_file1=$ac_default_prefix/share/config.site 2171 ac_site_file2=$ac_default_prefix/etc/config.site 2172 fi 2173 for ac_site_file in "$ac_site_file1" "$ac_site_file2" 2174 do 2175 test "x$ac_site_file" = xNONE && continue 2176 if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then 2177 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2178 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 1373 2179 sed 's/^/| /' "$ac_site_file" >&5 1374 2180 . "$ac_site_file" … … 1377 2183 1378 2184 if test -r "$cache_file"; then 1379 # Some versions of bash will fail to source /dev/null (special 1380 # files actually), so we avoid doing that.1381 if test -f "$cache_file"; then1382 { echo "$as_me:$LINENO: loading cache $cache_file" >&51383 echo "$as_me: loading cache $cache_file" >&6;}2185 # Some versions of bash will fail to source /dev/null (special files 2186 # actually), so we avoid doing that. DJGPP emulates it as a regular file. 2187 if test /dev/null != "$cache_file" && test -f "$cache_file"; then 2188 { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 2189 $as_echo "$as_me: loading cache $cache_file" >&6;} 1384 2190 case $cache_file in 1385 [\\/]* | ?:[\\/]* ) . $cache_file;;1386 *) . ./$cache_file;;2191 [\\/]* | ?:[\\/]* ) . "$cache_file";; 2192 *) . "./$cache_file";; 1387 2193 esac 1388 2194 fi 1389 2195 else 1390 { echo "$as_me:$LINENO: creating cache $cache_file" >&51391 echo "$as_me: creating cache $cache_file" >&6;}2196 { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 2197 $as_echo "$as_me: creating cache $cache_file" >&6;} 1392 2198 >$cache_file 1393 2199 fi … … 1396 2202 # value. 1397 2203 ac_cache_corrupted=false 1398 for ac_var in `(set) 2>&1 | 1399 sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do 2204 for ac_var in $ac_precious_vars; do 1400 2205 eval ac_old_set=\$ac_cv_env_${ac_var}_set 1401 2206 eval ac_new_set=\$ac_env_${ac_var}_set 1402 eval ac_old_val= "\$ac_cv_env_${ac_var}_value"1403 eval ac_new_val= "\$ac_env_${ac_var}_value"2207 eval ac_old_val=\$ac_cv_env_${ac_var}_value 2208 eval ac_new_val=\$ac_env_${ac_var}_value 1404 2209 case $ac_old_set,$ac_new_set in 1405 2210 set,) 1406 { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&51407 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}2211 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 2212 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} 1408 2213 ac_cache_corrupted=: ;; 1409 2214 ,set) 1410 { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&51411 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}2215 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 2216 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} 1412 2217 ac_cache_corrupted=: ;; 1413 2218 ,);; 1414 2219 *) 1415 2220 if test "x$ac_old_val" != "x$ac_new_val"; then 1416 { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 1417 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} 1418 { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 1419 echo "$as_me: former value: $ac_old_val" >&2;} 1420 { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 1421 echo "$as_me: current value: $ac_new_val" >&2;} 1422 ac_cache_corrupted=: 2221 # differences in whitespace do not lead to failure. 2222 ac_old_val_w=`echo x $ac_old_val` 2223 ac_new_val_w=`echo x $ac_new_val` 2224 if test "$ac_old_val_w" != "$ac_new_val_w"; then 2225 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 2226 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} 2227 ac_cache_corrupted=: 2228 else 2229 { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 2230 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} 2231 eval $ac_var=\$ac_old_val 2232 fi 2233 { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 2234 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} 2235 { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 2236 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} 1423 2237 fi;; 1424 2238 esac … … 1426 2240 if test "$ac_new_set" = set; then 1427 2241 case $ac_new_val in 1428 *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) 1429 ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; 2242 *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; 1430 2243 *) ac_arg=$ac_var=$ac_new_val ;; 1431 2244 esac 1432 2245 case " $ac_configure_args " in 1433 2246 *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. 1434 *) a c_configure_args="$ac_configure_args'$ac_arg'" ;;2247 *) as_fn_append ac_configure_args " '$ac_arg'" ;; 1435 2248 esac 1436 2249 fi 1437 2250 done 1438 2251 if $ac_cache_corrupted; then 1439 { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 1440 echo "$as_me: error: changes in the environment can compromise the build" >&2;} 1441 { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 1442 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} 1443 { (exit 1); exit 1; }; } 1444 fi 2252 { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2253 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2254 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2255 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2256 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2257 fi 2258 ## -------------------- ## 2259 ## Main body of script. ## 2260 ## -------------------- ## 1445 2261 1446 2262 ac_ext=c … … 1451 2267 1452 2268 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 2269 VERSION=`cat .version` 1471 2270 … … 1474 2273 1475 2274 ac_aux_dir= 1476 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do 1477 if test -f $ac_dir/install-sh; then 1478 ac_aux_dir=$ac_dir 1479 ac_install_sh="$ac_aux_dir/install-sh -c" 1480 break 1481 elif test -f $ac_dir/install.sh; then 1482 ac_aux_dir=$ac_dir 1483 ac_install_sh="$ac_aux_dir/install.sh -c" 1484 break 1485 elif test -f $ac_dir/shtool; then 1486 ac_aux_dir=$ac_dir 1487 ac_install_sh="$ac_aux_dir/shtool install -c" 1488 break 1489 fi 2275 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2276 for ac_t in install-sh install.sh shtool; do 2277 if test -f "$ac_dir/$ac_t"; then 2278 ac_aux_dir=$ac_dir 2279 ac_install_sh="$ac_aux_dir/$ac_t -c" 2280 break 2 2281 fi 2282 done 1490 2283 done 1491 2284 if test -z "$ac_aux_dir"; then 1492 { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 1493 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 1494 { (exit 1); exit 1; }; } 1495 fi 1496 ac_config_guess="$SHELL $ac_aux_dir/config.guess" 1497 ac_config_sub="$SHELL $ac_aux_dir/config.sub" 1498 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. 2285 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2286 fi 2287 2288 # These three variables are undocumented and unsupported, 2289 # and are intended to be withdrawn in a future Autoconf release. 2290 # They can cause serious problems if a builder's source tree is in a directory 2291 # whose full name contains unusual characters. 2292 ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. 2293 ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. 2294 ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. 2295 1499 2296 1500 2297 # Make sure we can run config.sub. 1501 $ac_config_sub sun4 >/dev/null 2>&1 || 1502 { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 1503 echo "$as_me: error: cannot run $ac_config_sub" >&2;} 1504 { (exit 1); exit 1; }; } 1505 1506 echo "$as_me:$LINENO: checking build system type" >&5 1507 echo $ECHO_N "checking build system type... $ECHO_C" >&6 1508 if test "${ac_cv_build+set}" = set; then 1509 echo $ECHO_N "(cached) $ECHO_C" >&6 1510 else 1511 ac_cv_build_alias=$build_alias 1512 test -z "$ac_cv_build_alias" && 1513 ac_cv_build_alias=`$ac_config_guess` 1514 test -z "$ac_cv_build_alias" && 1515 { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 1516 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 1517 { (exit 1); exit 1; }; } 1518 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 1519 { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 1520 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} 1521 { (exit 1); exit 1; }; } 1522 1523 fi 1524 echo "$as_me:$LINENO: result: $ac_cv_build" >&5 1525 echo "${ECHO_T}$ac_cv_build" >&6 2298 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 2299 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 2300 2301 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 2302 $as_echo_n "checking build system type... " >&6; } 2303 if test "${ac_cv_build+set}" = set; then : 2304 $as_echo_n "(cached) " >&6 2305 else 2306 ac_build_alias=$build_alias 2307 test "x$ac_build_alias" = x && 2308 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 2309 test "x$ac_build_alias" = x && 2310 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 2311 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 2312 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 2313 2314 fi 2315 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 2316 $as_echo "$ac_cv_build" >&6; } 2317 case $ac_cv_build in 2318 *-*-*) ;; 2319 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 2320 esac 1526 2321 build=$ac_cv_build 1527 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1528 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 1529 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1530 1531 1532 echo "$as_me:$LINENO: checking host system type" >&5 1533 echo $ECHO_N "checking host system type... $ECHO_C" >&6 1534 if test "${ac_cv_host+set}" = set; then 1535 echo $ECHO_N "(cached) $ECHO_C" >&6 1536 else 1537 ac_cv_host_alias=$host_alias 1538 test -z "$ac_cv_host_alias" && 1539 ac_cv_host_alias=$ac_cv_build_alias 1540 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 1541 { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 1542 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 1543 { (exit 1); exit 1; }; } 1544 1545 fi 1546 echo "$as_me:$LINENO: result: $ac_cv_host" >&5 1547 echo "${ECHO_T}$ac_cv_host" >&6 2322 ac_save_IFS=$IFS; IFS='-' 2323 set x $ac_cv_build 2324 shift 2325 build_cpu=$1 2326 build_vendor=$2 2327 shift; shift 2328 # Remember, the first character of IFS is used to create $*, 2329 # except with old shells: 2330 build_os=$* 2331 IFS=$ac_save_IFS 2332 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac 2333 2334 2335 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 2336 $as_echo_n "checking host system type... " >&6; } 2337 if test "${ac_cv_host+set}" = set; then : 2338 $as_echo_n "(cached) " >&6 2339 else 2340 if test "x$host_alias" = x; then 2341 ac_cv_host=$ac_cv_build 2342 else 2343 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 2344 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 2345 fi 2346 2347 fi 2348 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 2349 $as_echo "$ac_cv_host" >&6; } 2350 case $ac_cv_host in 2351 *-*-*) ;; 2352 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 2353 esac 1548 2354 host=$ac_cv_host 1549 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1550 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 1551 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1552 1553 1554 echo "$as_me:$LINENO: checking target system type" >&5 1555 echo $ECHO_N "checking target system type... $ECHO_C" >&6 1556 if test "${ac_cv_target+set}" = set; then 1557 echo $ECHO_N "(cached) $ECHO_C" >&6 1558 else 1559 ac_cv_target_alias=$target_alias 1560 test "x$ac_cv_target_alias" = "x" && 1561 ac_cv_target_alias=$ac_cv_host_alias 1562 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 1563 { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 1564 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 1565 { (exit 1); exit 1; }; } 1566 1567 fi 1568 echo "$as_me:$LINENO: result: $ac_cv_target" >&5 1569 echo "${ECHO_T}$ac_cv_target" >&6 2355 ac_save_IFS=$IFS; IFS='-' 2356 set x $ac_cv_host 2357 shift 2358 host_cpu=$1 2359 host_vendor=$2 2360 shift; shift 2361 # Remember, the first character of IFS is used to create $*, 2362 # except with old shells: 2363 host_os=$* 2364 IFS=$ac_save_IFS 2365 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac 2366 2367 2368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 2369 $as_echo_n "checking target system type... " >&6; } 2370 if test "${ac_cv_target+set}" = set; then : 2371 $as_echo_n "(cached) " >&6 2372 else 2373 if test "x$target_alias" = x; then 2374 ac_cv_target=$ac_cv_host 2375 else 2376 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 2377 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 2378 fi 2379 2380 fi 2381 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 2382 $as_echo "$ac_cv_target" >&6; } 2383 case $ac_cv_target in 2384 *-*-*) ;; 2385 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 2386 esac 1570 2387 target=$ac_cv_target 1571 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1572 target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 1573 target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 2388 ac_save_IFS=$IFS; IFS='-' 2389 set x $ac_cv_target 2390 shift 2391 target_cpu=$1 2392 target_vendor=$2 2393 shift; shift 2394 # Remember, the first character of IFS is used to create $*, 2395 # except with old shells: 2396 target_os=$* 2397 IFS=$ac_save_IFS 2398 case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac 1574 2399 1575 2400 … … 1581 2406 program_prefix=${target_alias}- 1582 2407 1583 ac_config_headers="$ac_config_headers config.h" 1584 1585 1586 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 1587 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 1588 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` 1589 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then 1590 echo $ECHO_N "(cached) $ECHO_C" >&6 2408 2409 ac_config_headers="$ac_config_headers config.h" 2410 2411 2412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 2413 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 2414 set x ${MAKE-make} 2415 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 2416 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 2417 $as_echo_n "(cached) " >&6 1591 2418 else 1592 2419 cat >conftest.make <<\_ACEOF 2420 SHELL = /bin/sh 1593 2421 all: 1594 @echo ' ac_maketemp="$(MAKE)"'2422 @echo '@@@%%%=$(MAKE)=@@@%%%' 1595 2423 _ACEOF 1596 2424 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 1597 eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` 1598 if test -n "$ac_maketemp"; then 1599 eval ac_cv_prog_make_${ac_make}_set=yes1600 else 1601 eval ac_cv_prog_make_${ac_make}_set=no1602 fi 2425 case `${MAKE-make} -f conftest.make 2>/dev/null` in 2426 *@@@%%%=?*=@@@%%%*) 2427 eval ac_cv_prog_make_${ac_make}_set=yes;; 2428 *) 2429 eval ac_cv_prog_make_${ac_make}_set=no;; 2430 esac 1603 2431 rm -f conftest.make 1604 2432 fi 1605 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then1606 echo "$as_me:$LINENO: result: yes" >&51607 echo "${ECHO_T}yes" >&6 2433 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then 2434 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2435 $as_echo "yes" >&6; } 1608 2436 SET_MAKE= 1609 2437 else 1610 echo "$as_me:$LINENO: result: no" >&51611 echo "${ECHO_T}no" >&6 2438 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2439 $as_echo "no" >&6; } 1612 2440 SET_MAKE="MAKE=${MAKE-make}" 1613 2441 fi 1614 2442 1615 1616 echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&51617 echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&61618 arch_64bit=no1619 case "$host_cpu" in1620 x86_64) arch_64bit=yes ;;1621 esac1622 1623 if test "$arch_64bit" = yes; then1624 echo "$as_me:$LINENO: result: yes" >&51625 echo "${ECHO_T}yes" >&61626 if test -z "$COMPAT32BITFLAGS" ; then1627 COMPAT32BITFLAGS="-m32"1628 fi1629 else1630 echo "$as_me:$LINENO: result: no" >&51631 echo "${ECHO_T}no" >&61632 if test -z "$COMPAT32BITFLAGS" ; then1633 COMPAT32BITFLAGS=1634 fi1635 fi1636 2443 1637 2444 … … 1647 2454 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. 1648 2455 set dummy ${ac_tool_prefix}gcc; ac_word=$2 1649 echo "$as_me:$LINENO: checking for $ac_word" >&51650 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1651 if test "${ac_cv_prog_CC+set}" = set; then 1652 echo $ECHO_N "(cached) $ECHO_C" >&62456 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2457 $as_echo_n "checking for $ac_word... " >&6; } 2458 if test "${ac_cv_prog_CC+set}" = set; then : 2459 $as_echo_n "(cached) " >&6 1653 2460 else 1654 2461 if test -n "$CC"; then … … 1660 2467 IFS=$as_save_IFS 1661 2468 test -z "$as_dir" && as_dir=. 1662 for ac_exec_ext in '' $ac_executable_extensions; do1663 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2469 for ac_exec_ext in '' $ac_executable_extensions; do 2470 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1664 2471 ac_cv_prog_CC="${ac_tool_prefix}gcc" 1665 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52472 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1666 2473 break 2 1667 2474 fi 1668 2475 done 1669 done 2476 done 2477 IFS=$as_save_IFS 1670 2478 1671 2479 fi … … 1673 2481 CC=$ac_cv_prog_CC 1674 2482 if test -n "$CC"; then 1675 echo "$as_me:$LINENO: result: $CC" >&5 1676 echo "${ECHO_T}$CC" >&6 1677 else 1678 echo "$as_me:$LINENO: result: no" >&5 1679 echo "${ECHO_T}no" >&6 1680 fi 2483 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 2484 $as_echo "$CC" >&6; } 2485 else 2486 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2487 $as_echo "no" >&6; } 2488 fi 2489 1681 2490 1682 2491 fi … … 1685 2494 # Extract the first word of "gcc", so it can be a program name with args. 1686 2495 set dummy gcc; ac_word=$2 1687 echo "$as_me:$LINENO: checking for $ac_word" >&51688 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1689 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1690 echo $ECHO_N "(cached) $ECHO_C" >&62496 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2497 $as_echo_n "checking for $ac_word... " >&6; } 2498 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 2499 $as_echo_n "(cached) " >&6 1691 2500 else 1692 2501 if test -n "$ac_ct_CC"; then … … 1698 2507 IFS=$as_save_IFS 1699 2508 test -z "$as_dir" && as_dir=. 1700 for ac_exec_ext in '' $ac_executable_extensions; do1701 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2509 for ac_exec_ext in '' $ac_executable_extensions; do 2510 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1702 2511 ac_cv_prog_ac_ct_CC="gcc" 1703 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52512 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1704 2513 break 2 1705 2514 fi 1706 2515 done 1707 done 2516 done 2517 IFS=$as_save_IFS 1708 2518 1709 2519 fi … … 1711 2521 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1712 2522 if test -n "$ac_ct_CC"; then 1713 echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 1714 echo "${ECHO_T}$ac_ct_CC" >&6 1715 else 1716 echo "$as_me:$LINENO: result: no" >&5 1717 echo "${ECHO_T}no" >&6 1718 fi 1719 1720 CC=$ac_ct_CC 2523 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 2524 $as_echo "$ac_ct_CC" >&6; } 2525 else 2526 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2527 $as_echo "no" >&6; } 2528 fi 2529 2530 if test "x$ac_ct_CC" = x; then 2531 CC="" 2532 else 2533 case $cross_compiling:$ac_tool_warned in 2534 yes:) 2535 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2536 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2537 ac_tool_warned=yes ;; 2538 esac 2539 CC=$ac_ct_CC 2540 fi 1721 2541 else 1722 2542 CC="$ac_cv_prog_CC" … … 1724 2544 1725 2545 if test -z "$CC"; then 1726 if test -n "$ac_tool_prefix"; then1727 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.2546 if test -n "$ac_tool_prefix"; then 2547 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. 1728 2548 set dummy ${ac_tool_prefix}cc; ac_word=$2 1729 echo "$as_me:$LINENO: checking for $ac_word" >&51730 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1731 if test "${ac_cv_prog_CC+set}" = set; then 1732 echo $ECHO_N "(cached) $ECHO_C" >&62549 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2550 $as_echo_n "checking for $ac_word... " >&6; } 2551 if test "${ac_cv_prog_CC+set}" = set; then : 2552 $as_echo_n "(cached) " >&6 1733 2553 else 1734 2554 if test -n "$CC"; then … … 1740 2560 IFS=$as_save_IFS 1741 2561 test -z "$as_dir" && as_dir=. 1742 for ac_exec_ext in '' $ac_executable_extensions; do1743 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2562 for ac_exec_ext in '' $ac_executable_extensions; do 2563 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1744 2564 ac_cv_prog_CC="${ac_tool_prefix}cc" 1745 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52565 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1746 2566 break 2 1747 2567 fi 1748 2568 done 1749 done 2569 done 2570 IFS=$as_save_IFS 1750 2571 1751 2572 fi … … 1753 2574 CC=$ac_cv_prog_CC 1754 2575 if test -n "$CC"; then 1755 echo "$as_me:$LINENO: result: $CC" >&5 1756 echo "${ECHO_T}$CC" >&6 1757 else 1758 echo "$as_me:$LINENO: result: no" >&5 1759 echo "${ECHO_T}no" >&6 1760 fi 1761 1762 fi 1763 if test -z "$ac_cv_prog_CC"; then 1764 ac_ct_CC=$CC 1765 # Extract the first word of "cc", so it can be a program name with args. 1766 set dummy cc; ac_word=$2 1767 echo "$as_me:$LINENO: checking for $ac_word" >&5 1768 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1769 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1770 echo $ECHO_N "(cached) $ECHO_C" >&6 1771 else 1772 if test -n "$ac_ct_CC"; then 1773 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. 1774 else 1775 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1776 for as_dir in $PATH 1777 do 1778 IFS=$as_save_IFS 1779 test -z "$as_dir" && as_dir=. 1780 for ac_exec_ext in '' $ac_executable_extensions; do 1781 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 1782 ac_cv_prog_ac_ct_CC="cc" 1783 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 1784 break 2 2576 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 2577 $as_echo "$CC" >&6; } 2578 else 2579 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2580 $as_echo "no" >&6; } 2581 fi 2582 2583 1785 2584 fi 1786 done1787 done1788 1789 fi1790 fi1791 ac_ct_CC=$ac_cv_prog_ac_ct_CC1792 if test -n "$ac_ct_CC"; then1793 echo "$as_me:$LINENO: result: $ac_ct_CC" >&51794 echo "${ECHO_T}$ac_ct_CC" >&61795 else1796 echo "$as_me:$LINENO: result: no" >&51797 echo "${ECHO_T}no" >&61798 fi1799 1800 CC=$ac_ct_CC1801 else1802 CC="$ac_cv_prog_CC"1803 fi1804 1805 2585 fi 1806 2586 if test -z "$CC"; then 1807 2587 # Extract the first word of "cc", so it can be a program name with args. 1808 2588 set dummy cc; ac_word=$2 1809 echo "$as_me:$LINENO: checking for $ac_word" >&51810 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1811 if test "${ac_cv_prog_CC+set}" = set; then 1812 echo $ECHO_N "(cached) $ECHO_C" >&62589 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2590 $as_echo_n "checking for $ac_word... " >&6; } 2591 if test "${ac_cv_prog_CC+set}" = set; then : 2592 $as_echo_n "(cached) " >&6 1813 2593 else 1814 2594 if test -n "$CC"; then … … 1821 2601 IFS=$as_save_IFS 1822 2602 test -z "$as_dir" && as_dir=. 1823 for ac_exec_ext in '' $ac_executable_extensions; do1824 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2603 for ac_exec_ext in '' $ac_executable_extensions; do 2604 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1825 2605 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 1826 2606 ac_prog_rejected=yes … … 1828 2608 fi 1829 2609 ac_cv_prog_CC="cc" 1830 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52610 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1831 2611 break 2 1832 2612 fi 1833 2613 done 1834 done 2614 done 2615 IFS=$as_save_IFS 1835 2616 1836 2617 if test $ac_prog_rejected = yes; then … … 1850 2631 CC=$ac_cv_prog_CC 1851 2632 if test -n "$CC"; then 1852 echo "$as_me:$LINENO: result: $CC" >&5 1853 echo "${ECHO_T}$CC" >&6 1854 else 1855 echo "$as_me:$LINENO: result: no" >&5 1856 echo "${ECHO_T}no" >&6 1857 fi 2633 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 2634 $as_echo "$CC" >&6; } 2635 else 2636 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2637 $as_echo "no" >&6; } 2638 fi 2639 1858 2640 1859 2641 fi 1860 2642 if test -z "$CC"; then 1861 2643 if test -n "$ac_tool_prefix"; then 1862 for ac_prog in cl 2644 for ac_prog in cl.exe 1863 2645 do 1864 2646 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 1865 2647 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1866 echo "$as_me:$LINENO: checking for $ac_word" >&51867 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1868 if test "${ac_cv_prog_CC+set}" = set; then 1869 echo $ECHO_N "(cached) $ECHO_C" >&62648 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2649 $as_echo_n "checking for $ac_word... " >&6; } 2650 if test "${ac_cv_prog_CC+set}" = set; then : 2651 $as_echo_n "(cached) " >&6 1870 2652 else 1871 2653 if test -n "$CC"; then … … 1877 2659 IFS=$as_save_IFS 1878 2660 test -z "$as_dir" && as_dir=. 1879 for ac_exec_ext in '' $ac_executable_extensions; do1880 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2661 for ac_exec_ext in '' $ac_executable_extensions; do 2662 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1881 2663 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 1882 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52664 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1883 2665 break 2 1884 2666 fi 1885 2667 done 1886 done 2668 done 2669 IFS=$as_save_IFS 1887 2670 1888 2671 fi … … 1890 2673 CC=$ac_cv_prog_CC 1891 2674 if test -n "$CC"; then 1892 echo "$as_me:$LINENO: result: $CC" >&5 1893 echo "${ECHO_T}$CC" >&6 1894 else 1895 echo "$as_me:$LINENO: result: no" >&5 1896 echo "${ECHO_T}no" >&6 1897 fi 2675 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 2676 $as_echo "$CC" >&6; } 2677 else 2678 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2679 $as_echo "no" >&6; } 2680 fi 2681 1898 2682 1899 2683 test -n "$CC" && break … … 1902 2686 if test -z "$CC"; then 1903 2687 ac_ct_CC=$CC 1904 for ac_prog in cl 2688 for ac_prog in cl.exe 1905 2689 do 1906 2690 # Extract the first word of "$ac_prog", so it can be a program name with args. 1907 2691 set dummy $ac_prog; ac_word=$2 1908 echo "$as_me:$LINENO: checking for $ac_word" >&51909 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1910 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1911 echo $ECHO_N "(cached) $ECHO_C" >&62692 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2693 $as_echo_n "checking for $ac_word... " >&6; } 2694 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 2695 $as_echo_n "(cached) " >&6 1912 2696 else 1913 2697 if test -n "$ac_ct_CC"; then … … 1919 2703 IFS=$as_save_IFS 1920 2704 test -z "$as_dir" && as_dir=. 1921 for ac_exec_ext in '' $ac_executable_extensions; do1922 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2705 for ac_exec_ext in '' $ac_executable_extensions; do 2706 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1923 2707 ac_cv_prog_ac_ct_CC="$ac_prog" 1924 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52708 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1925 2709 break 2 1926 2710 fi 1927 2711 done 1928 done 2712 done 2713 IFS=$as_save_IFS 1929 2714 1930 2715 fi … … 1932 2717 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1933 2718 if test -n "$ac_ct_CC"; then 1934 echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 1935 echo "${ECHO_T}$ac_ct_CC" >&6 1936 else 1937 echo "$as_me:$LINENO: result: no" >&5 1938 echo "${ECHO_T}no" >&6 1939 fi 2719 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 2720 $as_echo "$ac_ct_CC" >&6; } 2721 else 2722 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2723 $as_echo "no" >&6; } 2724 fi 2725 1940 2726 1941 2727 test -n "$ac_ct_CC" && break 1942 2728 done 1943 2729 1944 CC=$ac_ct_CC 1945 fi 1946 1947 fi 1948 1949 1950 test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH 1951 See \`config.log' for more details." >&5 1952 echo "$as_me: error: no acceptable C compiler found in \$PATH 1953 See \`config.log' for more details." >&2;} 1954 { (exit 1); exit 1; }; } 2730 if test "x$ac_ct_CC" = x; then 2731 CC="" 2732 else 2733 case $cross_compiling:$ac_tool_warned in 2734 yes:) 2735 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2736 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2737 ac_tool_warned=yes ;; 2738 esac 2739 CC=$ac_ct_CC 2740 fi 2741 fi 2742 2743 fi 2744 2745 2746 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2747 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2748 as_fn_error "no acceptable C compiler found in \$PATH 2749 See \`config.log' for more details." "$LINENO" 5; } 1955 2750 1956 2751 # Provide some information about the compiler. 1957 echo "$as_me:$LINENO:" \ 1958 "checking for C compiler version" >&5 1959 ac_compiler=`set X $ac_compile; echo $2` 1960 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 1961 (eval $ac_compiler --version </dev/null >&5) 2>&5 2752 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 2753 set X $ac_compile 2754 ac_compiler=$2 2755 for ac_option in --version -v -V -qversion; do 2756 { { ac_try="$ac_compiler $ac_option >&5" 2757 case "(($ac_try" in 2758 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2759 *) ac_try_echo=$ac_try;; 2760 esac 2761 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 2762 $as_echo "$ac_try_echo"; } >&5 2763 (eval "$ac_compiler $ac_option >&5") 2>conftest.err 1962 2764 ac_status=$? 1963 echo "$as_me:$LINENO: \$? = $ac_status" >&5 1964 (exit $ac_status); } 1965 { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 1966 (eval $ac_compiler -v </dev/null >&5) 2>&5 1967 ac_status=$? 1968 echo "$as_me:$LINENO: \$? = $ac_status" >&5 1969 (exit $ac_status); } 1970 { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 1971 (eval $ac_compiler -V </dev/null >&5) 2>&5 1972 ac_status=$? 1973 echo "$as_me:$LINENO: \$? = $ac_status" >&5 1974 (exit $ac_status); } 1975 1976 cat >conftest.$ac_ext <<_ACEOF 1977 /* confdefs.h. */ 1978 _ACEOF 1979 cat confdefs.h >>conftest.$ac_ext 1980 cat >>conftest.$ac_ext <<_ACEOF 2765 if test -s conftest.err; then 2766 sed '10a\ 2767 ... rest of stderr output deleted ... 2768 10q' conftest.err >conftest.er1 2769 cat conftest.er1 >&5 2770 fi 2771 rm -f conftest.er1 conftest.err 2772 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2773 test $ac_status = 0; } 2774 done 2775 2776 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1981 2777 /* end confdefs.h. */ 1982 2778 … … 1990 2786 _ACEOF 1991 2787 ac_clean_files_save=$ac_clean_files 1992 ac_clean_files="$ac_clean_files a.out a. exe b.out"2788 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" 1993 2789 # Try to create an executable without -o first, disregard a.out. 1994 2790 # It will help us diagnose broken compilers, and finding out an intuition 1995 2791 # of exeext. 1996 echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 1997 echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 1998 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 1999 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 2000 (eval $ac_link_default) 2>&5 2792 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 2793 $as_echo_n "checking whether the C compiler works... " >&6; } 2794 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 2795 2796 # The possible output files: 2797 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" 2798 2799 ac_rmfiles= 2800 for ac_file in $ac_files 2801 do 2802 case $ac_file in 2803 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; 2804 * ) ac_rmfiles="$ac_rmfiles $ac_file";; 2805 esac 2806 done 2807 rm -f $ac_rmfiles 2808 2809 if { { ac_try="$ac_link_default" 2810 case "(($ac_try" in 2811 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2812 *) ac_try_echo=$ac_try;; 2813 esac 2814 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 2815 $as_echo "$ac_try_echo"; } >&5 2816 (eval "$ac_link_default") 2>&5 2001 2817 ac_status=$? 2002 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2003 (exit $ac_status); }; then 2004 # Find the output, starting from the most likely. This scheme is 2005 # not robust to junk in `.', hence go to wildcards (a.*) only as a last 2006 # resort. 2007 2008 # Be careful to initialize this variable, since it used to be cached. 2009 # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. 2010 ac_cv_exeext= 2011 # b.out is created by i960 compilers. 2012 for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out 2818 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2819 test $ac_status = 0; }; then : 2820 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. 2821 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' 2822 # in a Makefile. We should not override ac_cv_exeext if it was cached, 2823 # so that the user can short-circuit this test for compilers unknown to 2824 # Autoconf. 2825 for ac_file in $ac_files '' 2013 2826 do 2014 2827 test -f "$ac_file" || continue 2015 2828 case $ac_file in 2016 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) 2017 ;; 2018 conftest.$ac_ext ) 2019 # This is the source file. 2829 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) 2020 2830 ;; 2021 2831 [ab].out ) … … 2024 2834 break;; 2025 2835 *.* ) 2026 ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` 2027 # FIXME: I believe we export ac_cv_exeext for Libtool, 2028 # but it would be cool to find out if it's true. Does anybody 2029 # maintain Libtool? --akim. 2030 export ac_cv_exeext 2836 if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; 2837 then :; else 2838 ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` 2839 fi 2840 # We set ac_cv_exeext here because the later test for it is not 2841 # safe: cross compilers may not add the suffix if given an `-o' 2842 # argument, so we may need to know it at that point already. 2843 # Even if this section looks crufty: it has the advantage of 2844 # actually working. 2031 2845 break;; 2032 2846 * ) … … 2034 2848 esac 2035 2849 done 2036 else 2037 echo "$as_me: failed program was:" >&5 2850 test "$ac_cv_exeext" = no && ac_cv_exeext= 2851 2852 else 2853 ac_file='' 2854 fi 2855 if test -z "$ac_file"; then : 2856 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2857 $as_echo "no" >&6; } 2858 $as_echo "$as_me: failed program was:" >&5 2038 2859 sed 's/^/| /' conftest.$ac_ext >&5 2039 2860 2040 { { echo "$as_me:$LINENO: error: C compiler cannot create executables 2041 See \`config.log' for more details." >&5 2042 echo "$as_me: error: C compiler cannot create executables 2043 See \`config.log' for more details." >&2;} 2044 { (exit 77); exit 77; }; } 2045 fi 2046 2861 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2862 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2863 { as_fn_set_status 77 2864 as_fn_error "C compiler cannot create executables 2865 See \`config.log' for more details." "$LINENO" 5; }; } 2866 else 2867 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2868 $as_echo "yes" >&6; } 2869 fi 2870 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 2871 $as_echo_n "checking for C compiler default output file name... " >&6; } 2872 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 2873 $as_echo "$ac_file" >&6; } 2047 2874 ac_exeext=$ac_cv_exeext 2048 echo "$as_me:$LINENO: result: $ac_file" >&5 2049 echo "${ECHO_T}$ac_file" >&6 2050 2051 # Check the compiler produces executables we can run. If not, either 2052 # the compiler is broken, or we cross compile. 2053 echo "$as_me:$LINENO: checking whether the C compiler works" >&5 2054 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 2055 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 2056 # If not cross compiling, check that we can run a simple program. 2057 if test "$cross_compiling" != yes; then 2058 if { ac_try='./$ac_file' 2059 { (eval echo "$as_me:$LINENO: \"$ac_try\"")>&52060 (eval $ac_try) 2>&52875 2876 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out 2877 ac_clean_files=$ac_clean_files_save 2878 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 2879 $as_echo_n "checking for suffix of executables... " >&6; } 2880 if { { ac_try="$ac_link" 2881 case "(($ac_try" in 2882 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2883 *) ac_try_echo=$ac_try;; 2884 esac 2885 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 2886 $as_echo "$ac_try_echo"; } >&5 2887 (eval "$ac_link") 2>&5 2061 2888 ac_status=$? 2062 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2063 (exit $ac_status); }; }; then 2064 cross_compiling=no 2065 else 2066 if test "$cross_compiling" = maybe; then 2067 cross_compiling=yes 2068 else 2069 { { echo "$as_me:$LINENO: error: cannot run C compiled programs. 2070 If you meant to cross compile, use \`--host'. 2071 See \`config.log' for more details." >&5 2072 echo "$as_me: error: cannot run C compiled programs. 2073 If you meant to cross compile, use \`--host'. 2074 See \`config.log' for more details." >&2;} 2075 { (exit 1); exit 1; }; } 2076 fi 2077 fi 2078 fi 2079 echo "$as_me:$LINENO: result: yes" >&5 2080 echo "${ECHO_T}yes" >&6 2081 2082 rm -f a.out a.exe conftest$ac_cv_exeext b.out 2083 ac_clean_files=$ac_clean_files_save 2084 # Check the compiler produces executables we can run. If not, either 2085 # the compiler is broken, or we cross compile. 2086 echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 2087 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 2088 echo "$as_me:$LINENO: result: $cross_compiling" >&5 2089 echo "${ECHO_T}$cross_compiling" >&6 2090 2091 echo "$as_me:$LINENO: checking for suffix of executables" >&5 2092 echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 2093 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 2094 (eval $ac_link) 2>&5 2095 ac_status=$? 2096 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2097 (exit $ac_status); }; then 2889 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2890 test $ac_status = 0; }; then : 2098 2891 # If both `conftest.exe' and `conftest' are `present' (well, observable) 2099 2892 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will … … 2103 2896 test -f "$ac_file" || continue 2104 2897 case $ac_file in 2105 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *. o | *.obj ) ;;2898 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; 2106 2899 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` 2107 export ac_cv_exeext2108 2900 break;; 2109 2901 * ) break;; … … 2111 2903 done 2112 2904 else 2113 { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link 2114 See \`config.log' for more details." >&5 2115 echo "$as_me: error: cannot compute suffix of executables: cannot compile and link 2116 See \`config.log' for more details." >&2;} 2117 { (exit 1); exit 1; }; } 2118 fi 2119 2120 rm -f conftest$ac_cv_exeext 2121 echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 2122 echo "${ECHO_T}$ac_cv_exeext" >&6 2905 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2906 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2907 as_fn_error "cannot compute suffix of executables: cannot compile and link 2908 See \`config.log' for more details." "$LINENO" 5; } 2909 fi 2910 rm -f conftest conftest$ac_cv_exeext 2911 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 2912 $as_echo "$ac_cv_exeext" >&6; } 2123 2913 2124 2914 rm -f conftest.$ac_ext 2125 2915 EXEEXT=$ac_cv_exeext 2126 2916 ac_exeext=$EXEEXT 2127 echo "$as_me:$LINENO: checking for suffix of object files" >&5 2128 echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 2129 if test "${ac_cv_objext+set}" = set; then 2130 echo $ECHO_N "(cached) $ECHO_C" >&6 2131 else 2132 cat >conftest.$ac_ext <<_ACEOF 2133 /* confdefs.h. */ 2917 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2918 /* end confdefs.h. */ 2919 #include <stdio.h> 2920 int 2921 main () 2922 { 2923 FILE *f = fopen ("conftest.out", "w"); 2924 return ferror (f) || fclose (f) != 0; 2925 2926 ; 2927 return 0; 2928 } 2134 2929 _ACEOF 2135 cat confdefs.h >>conftest.$ac_ext 2136 cat >>conftest.$ac_ext <<_ACEOF 2930 ac_clean_files="$ac_clean_files conftest.out" 2931 # Check that the compiler produces executables we can run. If not, either 2932 # the compiler is broken, or we cross compile. 2933 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 2934 $as_echo_n "checking whether we are cross compiling... " >&6; } 2935 if test "$cross_compiling" != yes; then 2936 { { ac_try="$ac_link" 2937 case "(($ac_try" in 2938 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2939 *) ac_try_echo=$ac_try;; 2940 esac 2941 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 2942 $as_echo "$ac_try_echo"; } >&5 2943 (eval "$ac_link") 2>&5 2944 ac_status=$? 2945 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2946 test $ac_status = 0; } 2947 if { ac_try='./conftest$ac_cv_exeext' 2948 { { case "(($ac_try" in 2949 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2950 *) ac_try_echo=$ac_try;; 2951 esac 2952 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 2953 $as_echo "$ac_try_echo"; } >&5 2954 (eval "$ac_try") 2>&5 2955 ac_status=$? 2956 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2957 test $ac_status = 0; }; }; then 2958 cross_compiling=no 2959 else 2960 if test "$cross_compiling" = maybe; then 2961 cross_compiling=yes 2962 else 2963 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2964 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2965 as_fn_error "cannot run C compiled programs. 2966 If you meant to cross compile, use \`--host'. 2967 See \`config.log' for more details." "$LINENO" 5; } 2968 fi 2969 fi 2970 fi 2971 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 2972 $as_echo "$cross_compiling" >&6; } 2973 2974 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out 2975 ac_clean_files=$ac_clean_files_save 2976 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 2977 $as_echo_n "checking for suffix of object files... " >&6; } 2978 if test "${ac_cv_objext+set}" = set; then : 2979 $as_echo_n "(cached) " >&6 2980 else 2981 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2137 2982 /* end confdefs.h. */ 2138 2983 … … 2146 2991 _ACEOF 2147 2992 rm -f conftest.o conftest.obj 2148 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 2149 (eval $ac_compile) 2>&5 2993 if { { ac_try="$ac_compile" 2994 case "(($ac_try" in 2995 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2996 *) ac_try_echo=$ac_try;; 2997 esac 2998 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 2999 $as_echo "$ac_try_echo"; } >&5 3000 (eval "$ac_compile") 2>&5 2150 3001 ac_status=$? 2151 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2152 (exit $ac_status); }; then 2153 for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do 3002 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3003 test $ac_status = 0; }; then : 3004 for ac_file in conftest.o conftest.obj conftest.*; do 3005 test -f "$ac_file" || continue; 2154 3006 case $ac_file in 2155 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;3007 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; 2156 3008 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` 2157 3009 break;; … … 2159 3011 done 2160 3012 else 2161 echo "$as_me: failed program was:" >&53013 $as_echo "$as_me: failed program was:" >&5 2162 3014 sed 's/^/| /' conftest.$ac_ext >&5 2163 3015 2164 { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile 2165 See \`config.log' for more details." >&5 2166 echo "$as_me: error: cannot compute suffix of object files: cannot compile 2167 See \`config.log' for more details." >&2;} 2168 { (exit 1); exit 1; }; } 2169 fi 2170 3016 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3017 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3018 as_fn_error "cannot compute suffix of object files: cannot compile 3019 See \`config.log' for more details." "$LINENO" 5; } 3020 fi 2171 3021 rm -f conftest.$ac_cv_objext conftest.$ac_ext 2172 3022 fi 2173 echo "$as_me:$LINENO: result: $ac_cv_objext" >&52174 echo "${ECHO_T}$ac_cv_objext" >&6 3023 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 3024 $as_echo "$ac_cv_objext" >&6; } 2175 3025 OBJEXT=$ac_cv_objext 2176 3026 ac_objext=$OBJEXT 2177 echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 2178 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 2179 if test "${ac_cv_c_compiler_gnu+set}" = set; then 2180 echo $ECHO_N "(cached) $ECHO_C" >&6 2181 else 2182 cat >conftest.$ac_ext <<_ACEOF 2183 /* confdefs.h. */ 2184 _ACEOF 2185 cat confdefs.h >>conftest.$ac_ext 2186 cat >>conftest.$ac_ext <<_ACEOF 3027 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 3028 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 3029 if test "${ac_cv_c_compiler_gnu+set}" = set; then : 3030 $as_echo_n "(cached) " >&6 3031 else 3032 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2187 3033 /* end confdefs.h. */ 2188 3034 … … 2198 3044 } 2199 3045 _ACEOF 2200 rm -f conftest.$ac_objext 2201 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 2202 (eval $ac_compile) 2>conftest.er1 2203 ac_status=$? 2204 grep -v '^ *+' conftest.er1 >conftest.err 2205 rm -f conftest.er1 2206 cat conftest.err >&5 2207 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2208 (exit $ac_status); } && 2209 { ac_try='test -z "$ac_c_werror_flag" 2210 || test ! -s conftest.err' 2211 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2212 (eval $ac_try) 2>&5 2213 ac_status=$? 2214 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2215 (exit $ac_status); }; } && 2216 { ac_try='test -s conftest.$ac_objext' 2217 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2218 (eval $ac_try) 2>&5 2219 ac_status=$? 2220 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2221 (exit $ac_status); }; }; then 3046 if ac_fn_c_try_compile "$LINENO"; then : 2222 3047 ac_compiler_gnu=yes 2223 3048 else 2224 echo "$as_me: failed program was:" >&5 2225 sed 's/^/| /' conftest.$ac_ext >&5 2226 2227 ac_compiler_gnu=no 2228 fi 2229 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 3049 ac_compiler_gnu=no 3050 fi 3051 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2230 3052 ac_cv_c_compiler_gnu=$ac_compiler_gnu 2231 3053 2232 3054 fi 2233 echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 2234 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 2235 GCC=`test $ac_compiler_gnu = yes && echo yes` 3055 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 3056 $as_echo "$ac_cv_c_compiler_gnu" >&6; } 3057 if test $ac_compiler_gnu = yes; then 3058 GCC=yes 3059 else 3060 GCC= 3061 fi 2236 3062 ac_test_CFLAGS=${CFLAGS+set} 2237 3063 ac_save_CFLAGS=$CFLAGS 2238 CFLAGS="-g" 2239 echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 2240 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 2241 if test "${ac_cv_prog_cc_g+set}" = set; then 2242 echo $ECHO_N "(cached) $ECHO_C" >&6 2243 else 2244 cat >conftest.$ac_ext <<_ACEOF 2245 /* confdefs.h. */ 2246 _ACEOF 2247 cat confdefs.h >>conftest.$ac_ext 2248 cat >>conftest.$ac_ext <<_ACEOF 3064 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 3065 $as_echo_n "checking whether $CC accepts -g... " >&6; } 3066 if test "${ac_cv_prog_cc_g+set}" = set; then : 3067 $as_echo_n "(cached) " >&6 3068 else 3069 ac_save_c_werror_flag=$ac_c_werror_flag 3070 ac_c_werror_flag=yes 3071 ac_cv_prog_cc_g=no 3072 CFLAGS="-g" 3073 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2249 3074 /* end confdefs.h. */ 2250 3075 … … 2257 3082 } 2258 3083 _ACEOF 2259 rm -f conftest.$ac_objext 2260 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 2261 (eval $ac_compile) 2>conftest.er1 2262 ac_status=$? 2263 grep -v '^ *+' conftest.er1 >conftest.err 2264 rm -f conftest.er1 2265 cat conftest.err >&5 2266 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2267 (exit $ac_status); } && 2268 { ac_try='test -z "$ac_c_werror_flag" 2269 || test ! -s conftest.err' 2270 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2271 (eval $ac_try) 2>&5 2272 ac_status=$? 2273 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2274 (exit $ac_status); }; } && 2275 { ac_try='test -s conftest.$ac_objext' 2276 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2277 (eval $ac_try) 2>&5 2278 ac_status=$? 2279 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2280 (exit $ac_status); }; }; then 3084 if ac_fn_c_try_compile "$LINENO"; then : 2281 3085 ac_cv_prog_cc_g=yes 2282 3086 else 2283 echo "$as_me: failed program was:" >&5 2284 sed 's/^/| /' conftest.$ac_ext >&5 2285 2286 ac_cv_prog_cc_g=no 2287 fi 2288 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 2289 fi 2290 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 2291 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 3087 CFLAGS="" 3088 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3089 /* end confdefs.h. */ 3090 3091 int 3092 main () 3093 { 3094 3095 ; 3096 return 0; 3097 } 3098 _ACEOF 3099 if ac_fn_c_try_compile "$LINENO"; then : 3100 3101 else 3102 ac_c_werror_flag=$ac_save_c_werror_flag 3103 CFLAGS="-g" 3104 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3105 /* end confdefs.h. */ 3106 3107 int 3108 main () 3109 { 3110 3111 ; 3112 return 0; 3113 } 3114 _ACEOF 3115 if ac_fn_c_try_compile "$LINENO"; then : 3116 ac_cv_prog_cc_g=yes 3117 fi 3118 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 3119 fi 3120 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 3121 fi 3122 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 3123 ac_c_werror_flag=$ac_save_c_werror_flag 3124 fi 3125 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 3126 $as_echo "$ac_cv_prog_cc_g" >&6; } 2292 3127 if test "$ac_test_CFLAGS" = set; then 2293 3128 CFLAGS=$ac_save_CFLAGS … … 2305 3140 fi 2306 3141 fi 2307 echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&52308 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 2309 if test "${ac_cv_prog_cc_ stdc+set}" = set; then2310 echo $ECHO_N "(cached) $ECHO_C" >&62311 else 2312 ac_cv_prog_cc_ stdc=no3142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 3143 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 3144 if test "${ac_cv_prog_cc_c89+set}" = set; then : 3145 $as_echo_n "(cached) " >&6 3146 else 3147 ac_cv_prog_cc_c89=no 2313 3148 ac_save_CC=$CC 2314 cat >conftest.$ac_ext <<_ACEOF 2315 /* confdefs.h. */ 2316 _ACEOF 2317 cat confdefs.h >>conftest.$ac_ext 2318 cat >>conftest.$ac_ext <<_ACEOF 3149 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2319 3150 /* end confdefs.h. */ 2320 3151 #include <stdarg.h> … … 2344 3175 function prototypes and stuff, but not '\xHH' hex character constants. 2345 3176 These don't provoke an error unfortunately, instead are silently treated 2346 as 'x'. The following induces an error, until -std 1is added to get3177 as 'x'. The following induces an error, until -std is added to get 2347 3178 proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an 2348 3179 array size at least. It's necessary to write '\x00'==0 to get something 2349 that's true only with -std 1. */3180 that's true only with -std. */ 2350 3181 int osf4_cc_array ['\x00' == 0 ? 1 : -1]; 3182 3183 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters 3184 inside strings and character constants. */ 3185 #define FOO(x) 'x' 3186 int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; 2351 3187 2352 3188 int test (int i, double x); … … 2364 3200 } 2365 3201 _ACEOF 2366 # Don't try gcc -ansi; that turns off useful extensions and 2367 # breaks some systems' header files. 2368 # AIX -qlanglvl=ansi 2369 # Ultrix and OSF/1 -std1 2370 # HP-UX 10.20 and later -Ae 2371 # HP-UX older versions -Aa -D_HPUX_SOURCE 2372 # SVR4 -Xc -D__EXTENSIONS__ 2373 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" 3202 for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ 3203 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" 2374 3204 do 2375 3205 CC="$ac_save_CC $ac_arg" 2376 rm -f conftest.$ac_objext 2377 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 2378 (eval $ac_compile) 2>conftest.er1 2379 ac_status=$? 2380 grep -v '^ *+' conftest.er1 >conftest.err 2381 rm -f conftest.er1 2382 cat conftest.err >&5 2383 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2384 (exit $ac_status); } && 2385 { ac_try='test -z "$ac_c_werror_flag" 2386 || test ! -s conftest.err' 2387 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2388 (eval $ac_try) 2>&5 2389 ac_status=$? 2390 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2391 (exit $ac_status); }; } && 2392 { ac_try='test -s conftest.$ac_objext' 2393 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2394 (eval $ac_try) 2>&5 2395 ac_status=$? 2396 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2397 (exit $ac_status); }; }; then 2398 ac_cv_prog_cc_stdc=$ac_arg 2399 break 2400 else 2401 echo "$as_me: failed program was:" >&5 2402 sed 's/^/| /' conftest.$ac_ext >&5 2403 2404 fi 2405 rm -f conftest.err conftest.$ac_objext 3206 if ac_fn_c_try_compile "$LINENO"; then : 3207 ac_cv_prog_cc_c89=$ac_arg 3208 fi 3209 rm -f core conftest.err conftest.$ac_objext 3210 test "x$ac_cv_prog_cc_c89" != "xno" && break 2406 3211 done 2407 rm -f conftest.$ac_ext conftest.$ac_objext3212 rm -f conftest.$ac_ext 2408 3213 CC=$ac_save_CC 2409 3214 2410 3215 fi 2411 2412 case "x$ac_cv_prog_cc_stdc" in 2413 x|xno) 2414 echo "$as_me:$LINENO: result: none needed" >&5 2415 echo "${ECHO_T}none needed" >&6 ;; 3216 # AC_CACHE_VAL 3217 case "x$ac_cv_prog_cc_c89" in 3218 x) 3219 { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 3220 $as_echo "none needed" >&6; } ;; 3221 xno) 3222 { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 3223 $as_echo "unsupported" >&6; } ;; 2416 3224 *) 2417 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&52418 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 2419 CC="$CC $ac_cv_prog_cc_stdc";;3225 CC="$CC $ac_cv_prog_cc_c89" 3226 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 3227 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; 2420 3228 esac 2421 2422 # Some people use a C++ compiler to compile C. Since we use `exit', 2423 # in C++ we need to declare it. In case someone uses the same compiler 2424 # for both compiling C and C++ we need to have the C++ compiler decide 2425 # the declaration of exit, since it's the most demanding environment. 2426 cat >conftest.$ac_ext <<_ACEOF 2427 #ifndef __cplusplus 2428 choke me 2429 #endif 2430 _ACEOF 2431 rm -f conftest.$ac_objext 2432 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 2433 (eval $ac_compile) 2>conftest.er1 2434 ac_status=$? 2435 grep -v '^ *+' conftest.er1 >conftest.err 2436 rm -f conftest.er1 2437 cat conftest.err >&5 2438 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2439 (exit $ac_status); } && 2440 { ac_try='test -z "$ac_c_werror_flag" 2441 || test ! -s conftest.err' 2442 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2443 (eval $ac_try) 2>&5 2444 ac_status=$? 2445 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2446 (exit $ac_status); }; } && 2447 { ac_try='test -s conftest.$ac_objext' 2448 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2449 (eval $ac_try) 2>&5 2450 ac_status=$? 2451 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2452 (exit $ac_status); }; }; then 2453 for ac_declaration in \ 2454 '' \ 2455 'extern "C" void std::exit (int) throw (); using std::exit;' \ 2456 'extern "C" void std::exit (int); using std::exit;' \ 2457 'extern "C" void exit (int) throw ();' \ 2458 'extern "C" void exit (int);' \ 2459 'void exit (int);' 2460 do 2461 cat >conftest.$ac_ext <<_ACEOF 2462 /* confdefs.h. */ 2463 _ACEOF 2464 cat confdefs.h >>conftest.$ac_ext 2465 cat >>conftest.$ac_ext <<_ACEOF 2466 /* end confdefs.h. */ 2467 $ac_declaration 2468 #include <stdlib.h> 2469 int 2470 main () 2471 { 2472 exit (42); 2473 ; 2474 return 0; 2475 } 2476 _ACEOF 2477 rm -f conftest.$ac_objext 2478 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 2479 (eval $ac_compile) 2>conftest.er1 2480 ac_status=$? 2481 grep -v '^ *+' conftest.er1 >conftest.err 2482 rm -f conftest.er1 2483 cat conftest.err >&5 2484 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2485 (exit $ac_status); } && 2486 { ac_try='test -z "$ac_c_werror_flag" 2487 || test ! -s conftest.err' 2488 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2489 (eval $ac_try) 2>&5 2490 ac_status=$? 2491 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2492 (exit $ac_status); }; } && 2493 { ac_try='test -s conftest.$ac_objext' 2494 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2495 (eval $ac_try) 2>&5 2496 ac_status=$? 2497 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2498 (exit $ac_status); }; }; then 2499 : 2500 else 2501 echo "$as_me: failed program was:" >&5 2502 sed 's/^/| /' conftest.$ac_ext >&5 2503 2504 continue 2505 fi 2506 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 2507 cat >conftest.$ac_ext <<_ACEOF 2508 /* confdefs.h. */ 2509 _ACEOF 2510 cat confdefs.h >>conftest.$ac_ext 2511 cat >>conftest.$ac_ext <<_ACEOF 2512 /* end confdefs.h. */ 2513 $ac_declaration 2514 int 2515 main () 2516 { 2517 exit (42); 2518 ; 2519 return 0; 2520 } 2521 _ACEOF 2522 rm -f conftest.$ac_objext 2523 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 2524 (eval $ac_compile) 2>conftest.er1 2525 ac_status=$? 2526 grep -v '^ *+' conftest.er1 >conftest.err 2527 rm -f conftest.er1 2528 cat conftest.err >&5 2529 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2530 (exit $ac_status); } && 2531 { ac_try='test -z "$ac_c_werror_flag" 2532 || test ! -s conftest.err' 2533 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2534 (eval $ac_try) 2>&5 2535 ac_status=$? 2536 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2537 (exit $ac_status); }; } && 2538 { ac_try='test -s conftest.$ac_objext' 2539 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2540 (eval $ac_try) 2>&5 2541 ac_status=$? 2542 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2543 (exit $ac_status); }; }; then 2544 break 2545 else 2546 echo "$as_me: failed program was:" >&5 2547 sed 's/^/| /' conftest.$ac_ext >&5 2548 2549 fi 2550 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 2551 done 2552 rm -f conftest* 2553 if test -n "$ac_declaration"; then 2554 echo '#ifdef __cplusplus' >>confdefs.h 2555 echo $ac_declaration >>confdefs.h 2556 echo '#endif' >>confdefs.h 2557 fi 2558 2559 else 2560 echo "$as_me: failed program was:" >&5 2561 sed 's/^/| /' conftest.$ac_ext >&5 2562 2563 fi 2564 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 3229 if test "x$ac_cv_prog_cc_c89" != xno; then : 3230 3231 fi 3232 2565 3233 ac_ext=c 2566 3234 ac_cpp='$CPP $CPPFLAGS' … … 2575 3243 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 2576 3244 ac_compiler_gnu=$ac_cv_c_compiler_gnu 2577 echo "$as_me:$LINENO: checking how to run the C preprocessor" >&52578 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 3245 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 3246 $as_echo_n "checking how to run the C preprocessor... " >&6; } 2579 3247 # On Suns, sometimes $CPP names a directory. 2580 3248 if test -n "$CPP" && test -d "$CPP"; then … … 2582 3250 fi 2583 3251 if test -z "$CPP"; then 2584 if test "${ac_cv_prog_CPP+set}" = set; then 2585 echo $ECHO_N "(cached) $ECHO_C" >&63252 if test "${ac_cv_prog_CPP+set}" = set; then : 3253 $as_echo_n "(cached) " >&6 2586 3254 else 2587 3255 # Double quotes because CPP needs to be expanded … … 2597 3265 # On the NeXT, cc -E runs the code through the compiler's parser, 2598 3266 # not just through cpp. "Syntax error" is here to catch this case. 2599 cat >conftest.$ac_ext <<_ACEOF 2600 /* confdefs.h. */ 2601 _ACEOF 2602 cat confdefs.h >>conftest.$ac_ext 2603 cat >>conftest.$ac_ext <<_ACEOF 3267 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2604 3268 /* end confdefs.h. */ 2605 3269 #ifdef __STDC__ … … 2610 3274 Syntax error 2611 3275 _ACEOF 2612 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 2613 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2614 ac_status=$? 2615 grep -v '^ *+' conftest.er1 >conftest.err 2616 rm -f conftest.er1 2617 cat conftest.err >&5 2618 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2619 (exit $ac_status); } >/dev/null; then 2620 if test -s conftest.err; then 2621 ac_cpp_err=$ac_c_preproc_warn_flag 2622 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 2623 else 2624 ac_cpp_err= 2625 fi 2626 else 2627 ac_cpp_err=yes 2628 fi 2629 if test -z "$ac_cpp_err"; then 2630 : 2631 else 2632 echo "$as_me: failed program was:" >&5 2633 sed 's/^/| /' conftest.$ac_ext >&5 2634 3276 if ac_fn_c_try_cpp "$LINENO"; then : 3277 3278 else 2635 3279 # Broken: fails on valid input. 2636 3280 continue … … 2638 3282 rm -f conftest.err conftest.$ac_ext 2639 3283 2640 # OK, works on sane cases. Now check whether non -existent headers3284 # OK, works on sane cases. Now check whether nonexistent headers 2641 3285 # can be detected and how. 2642 cat >conftest.$ac_ext <<_ACEOF 2643 /* confdefs.h. */ 2644 _ACEOF 2645 cat confdefs.h >>conftest.$ac_ext 2646 cat >>conftest.$ac_ext <<_ACEOF 3286 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2647 3287 /* end confdefs.h. */ 2648 3288 #include <ac_nonexistent.h> 2649 3289 _ACEOF 2650 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 2651 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2652 ac_status=$? 2653 grep -v '^ *+' conftest.er1 >conftest.err 2654 rm -f conftest.er1 2655 cat conftest.err >&5 2656 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2657 (exit $ac_status); } >/dev/null; then 2658 if test -s conftest.err; then 2659 ac_cpp_err=$ac_c_preproc_warn_flag 2660 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 2661 else 2662 ac_cpp_err= 2663 fi 2664 else 2665 ac_cpp_err=yes 2666 fi 2667 if test -z "$ac_cpp_err"; then 3290 if ac_fn_c_try_cpp "$LINENO"; then : 2668 3291 # Broken: success on invalid input. 2669 3292 continue 2670 3293 else 2671 echo "$as_me: failed program was:" >&52672 sed 's/^/| /' conftest.$ac_ext >&52673 2674 3294 # Passes both tests. 2675 3295 ac_preproc_ok=: … … 2681 3301 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 2682 3302 rm -f conftest.err conftest.$ac_ext 2683 if $ac_preproc_ok; then 3303 if $ac_preproc_ok; then : 2684 3304 break 2685 3305 fi … … 2693 3313 ac_cv_prog_CPP=$CPP 2694 3314 fi 2695 echo "$as_me:$LINENO: result: $CPP" >&52696 echo "${ECHO_T}$CPP" >&6 3315 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 3316 $as_echo "$CPP" >&6; } 2697 3317 ac_preproc_ok=false 2698 3318 for ac_c_preproc_warn_flag in '' yes … … 2704 3324 # On the NeXT, cc -E runs the code through the compiler's parser, 2705 3325 # not just through cpp. "Syntax error" is here to catch this case. 2706 cat >conftest.$ac_ext <<_ACEOF 2707 /* confdefs.h. */ 2708 _ACEOF 2709 cat confdefs.h >>conftest.$ac_ext 2710 cat >>conftest.$ac_ext <<_ACEOF 3326 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2711 3327 /* end confdefs.h. */ 2712 3328 #ifdef __STDC__ … … 2717 3333 Syntax error 2718 3334 _ACEOF 2719 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 2720 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2721 ac_status=$? 2722 grep -v '^ *+' conftest.er1 >conftest.err 2723 rm -f conftest.er1 2724 cat conftest.err >&5 2725 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2726 (exit $ac_status); } >/dev/null; then 2727 if test -s conftest.err; then 2728 ac_cpp_err=$ac_c_preproc_warn_flag 2729 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 2730 else 2731 ac_cpp_err= 2732 fi 2733 else 2734 ac_cpp_err=yes 2735 fi 2736 if test -z "$ac_cpp_err"; then 2737 : 2738 else 2739 echo "$as_me: failed program was:" >&5 2740 sed 's/^/| /' conftest.$ac_ext >&5 2741 3335 if ac_fn_c_try_cpp "$LINENO"; then : 3336 3337 else 2742 3338 # Broken: fails on valid input. 2743 3339 continue … … 2745 3341 rm -f conftest.err conftest.$ac_ext 2746 3342 2747 # OK, works on sane cases. Now check whether non -existent headers3343 # OK, works on sane cases. Now check whether nonexistent headers 2748 3344 # can be detected and how. 2749 cat >conftest.$ac_ext <<_ACEOF 2750 /* confdefs.h. */ 2751 _ACEOF 2752 cat confdefs.h >>conftest.$ac_ext 2753 cat >>conftest.$ac_ext <<_ACEOF 3345 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2754 3346 /* end confdefs.h. */ 2755 3347 #include <ac_nonexistent.h> 2756 3348 _ACEOF 2757 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 2758 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2759 ac_status=$? 2760 grep -v '^ *+' conftest.er1 >conftest.err 2761 rm -f conftest.er1 2762 cat conftest.err >&5 2763 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2764 (exit $ac_status); } >/dev/null; then 2765 if test -s conftest.err; then 2766 ac_cpp_err=$ac_c_preproc_warn_flag 2767 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 2768 else 2769 ac_cpp_err= 2770 fi 2771 else 2772 ac_cpp_err=yes 2773 fi 2774 if test -z "$ac_cpp_err"; then 3349 if ac_fn_c_try_cpp "$LINENO"; then : 2775 3350 # Broken: success on invalid input. 2776 3351 continue 2777 3352 else 2778 echo "$as_me: failed program was:" >&52779 sed 's/^/| /' conftest.$ac_ext >&52780 2781 3353 # Passes both tests. 2782 3354 ac_preproc_ok=: … … 2788 3360 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 2789 3361 rm -f conftest.err conftest.$ac_ext 2790 if $ac_preproc_ok; then 2791 : 2792 else 2793 { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check 2794 See \`config.log' for more details." >&5 2795 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check 2796 See \`config.log' for more details." >&2;} 2797 { (exit 1); exit 1; }; } 3362 if $ac_preproc_ok; then : 3363 3364 else 3365 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3366 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3367 as_fn_error "C preprocessor \"$CPP\" fails sanity check 3368 See \`config.log' for more details." "$LINENO" 5; } 2798 3369 fi 2799 3370 … … 2805 3376 2806 3377 2807 echo "$as_me:$LINENO: checking for egrep" >&5 2808 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 2809 if test "${ac_cv_prog_egrep+set}" = set; then 2810 echo $ECHO_N "(cached) $ECHO_C" >&6 2811 else 2812 if echo a | (grep -E '(a|b)') >/dev/null 2>&1 2813 then ac_cv_prog_egrep='grep -E' 2814 else ac_cv_prog_egrep='egrep' 3378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 3379 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 3380 if test "${ac_cv_path_GREP+set}" = set; then : 3381 $as_echo_n "(cached) " >&6 3382 else 3383 if test -z "$GREP"; then 3384 ac_path_GREP_found=false 3385 # Loop through the user's path and test for each of PROGNAME-LIST 3386 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3387 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin 3388 do 3389 IFS=$as_save_IFS 3390 test -z "$as_dir" && as_dir=. 3391 for ac_prog in grep ggrep; do 3392 for ac_exec_ext in '' $ac_executable_extensions; do 3393 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 3394 { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue 3395 # Check for GNU ac_path_GREP and select it if it is found. 3396 # Check for GNU $ac_path_GREP 3397 case `"$ac_path_GREP" --version 2>&1` in 3398 *GNU*) 3399 ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; 3400 *) 3401 ac_count=0 3402 $as_echo_n 0123456789 >"conftest.in" 3403 while : 3404 do 3405 cat "conftest.in" "conftest.in" >"conftest.tmp" 3406 mv "conftest.tmp" "conftest.in" 3407 cp "conftest.in" "conftest.nl" 3408 $as_echo 'GREP' >> "conftest.nl" 3409 "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break 3410 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break 3411 as_fn_arith $ac_count + 1 && ac_count=$as_val 3412 if test $ac_count -gt ${ac_path_GREP_max-0}; then 3413 # Best one so far, save it but keep looking for a better one 3414 ac_cv_path_GREP="$ac_path_GREP" 3415 ac_path_GREP_max=$ac_count 2815 3416 fi 2816 fi 2817 echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 2818 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 2819 EGREP=$ac_cv_prog_egrep 2820 2821 2822 2823 echo "$as_me:$LINENO: checking for AIX" >&5 2824 echo $ECHO_N "checking for AIX... $ECHO_C" >&6 2825 cat >conftest.$ac_ext <<_ACEOF 2826 /* confdefs.h. */ 3417 # 10*(2^10) chars as input seems more than enough 3418 test $ac_count -gt 10 && break 3419 done 3420 rm -f conftest.in conftest.tmp conftest.nl conftest.out;; 3421 esac 3422 3423 $ac_path_GREP_found && break 3 3424 done 3425 done 3426 done 3427 IFS=$as_save_IFS 3428 if test -z "$ac_cv_path_GREP"; then 3429 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 3430 fi 3431 else 3432 ac_cv_path_GREP=$GREP 3433 fi 3434 3435 fi 3436 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 3437 $as_echo "$ac_cv_path_GREP" >&6; } 3438 GREP="$ac_cv_path_GREP" 3439 3440 3441 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 3442 $as_echo_n "checking for egrep... " >&6; } 3443 if test "${ac_cv_path_EGREP+set}" = set; then : 3444 $as_echo_n "(cached) " >&6 3445 else 3446 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 3447 then ac_cv_path_EGREP="$GREP -E" 3448 else 3449 if test -z "$EGREP"; then 3450 ac_path_EGREP_found=false 3451 # Loop through the user's path and test for each of PROGNAME-LIST 3452 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3453 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin 3454 do 3455 IFS=$as_save_IFS 3456 test -z "$as_dir" && as_dir=. 3457 for ac_prog in egrep; do 3458 for ac_exec_ext in '' $ac_executable_extensions; do 3459 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 3460 { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue 3461 # Check for GNU ac_path_EGREP and select it if it is found. 3462 # Check for GNU $ac_path_EGREP 3463 case `"$ac_path_EGREP" --version 2>&1` in 3464 *GNU*) 3465 ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; 3466 *) 3467 ac_count=0 3468 $as_echo_n 0123456789 >"conftest.in" 3469 while : 3470 do 3471 cat "conftest.in" "conftest.in" >"conftest.tmp" 3472 mv "conftest.tmp" "conftest.in" 3473 cp "conftest.in" "conftest.nl" 3474 $as_echo 'EGREP' >> "conftest.nl" 3475 "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break 3476 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break 3477 as_fn_arith $ac_count + 1 && ac_count=$as_val 3478 if test $ac_count -gt ${ac_path_EGREP_max-0}; then 3479 # Best one so far, save it but keep looking for a better one 3480 ac_cv_path_EGREP="$ac_path_EGREP" 3481 ac_path_EGREP_max=$ac_count 3482 fi 3483 # 10*(2^10) chars as input seems more than enough 3484 test $ac_count -gt 10 && break 3485 done 3486 rm -f conftest.in conftest.tmp conftest.nl conftest.out;; 3487 esac 3488 3489 $ac_path_EGREP_found && break 3 3490 done 3491 done 3492 done 3493 IFS=$as_save_IFS 3494 if test -z "$ac_cv_path_EGREP"; then 3495 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 3496 fi 3497 else 3498 ac_cv_path_EGREP=$EGREP 3499 fi 3500 3501 fi 3502 fi 3503 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 3504 $as_echo "$ac_cv_path_EGREP" >&6; } 3505 EGREP="$ac_cv_path_EGREP" 3506 3507 3508 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 3509 $as_echo_n "checking for ANSI C header files... " >&6; } 3510 if test "${ac_cv_header_stdc+set}" = set; then : 3511 $as_echo_n "(cached) " >&6 3512 else 3513 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3514 /* end confdefs.h. */ 3515 #include <stdlib.h> 3516 #include <stdarg.h> 3517 #include <string.h> 3518 #include <float.h> 3519 3520 int 3521 main () 3522 { 3523 3524 ; 3525 return 0; 3526 } 2827 3527 _ACEOF 2828 cat confdefs.h >>conftest.$ac_ext 2829 cat >>conftest.$ac_ext <<_ACEOF 3528 if ac_fn_c_try_compile "$LINENO"; then : 3529 ac_cv_header_stdc=yes 3530 else 3531 ac_cv_header_stdc=no 3532 fi 3533 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 3534 3535 if test $ac_cv_header_stdc = yes; then 3536 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 3537 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2830 3538 /* end confdefs.h. */ 2831 #ifdef _AIX 2832 yes 2833 #endif 3539 #include <string.h> 2834 3540 2835 3541 _ACEOF 2836 3542 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 2837 $EGREP "yes" >/dev/null 2>&1; then 2838 echo "$as_me:$LINENO: result: yes" >&5 2839 echo "${ECHO_T}yes" >&6 2840 cat >>confdefs.h <<\_ACEOF 2841 #define _ALL_SOURCE 1 3543 $EGREP "memchr" >/dev/null 2>&1; then : 3544 3545 else 3546 ac_cv_header_stdc=no 3547 fi 3548 rm -f conftest* 3549 3550 fi 3551 3552 if test $ac_cv_header_stdc = yes; then 3553 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 3554 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3555 /* end confdefs.h. */ 3556 #include <stdlib.h> 3557 2842 3558 _ACEOF 2843 2844 else 2845 echo "$as_me:$LINENO: result: no" >&5 2846 echo "${ECHO_T}no" >&6 3559 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 3560 $EGREP "free" >/dev/null 2>&1; then : 3561 3562 else 3563 ac_cv_header_stdc=no 2847 3564 fi 2848 3565 rm -f conftest* 2849 3566 2850 2851 echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5 2852 echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6 3567 fi 3568 3569 if test $ac_cv_header_stdc = yes; then 3570 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 3571 if test "$cross_compiling" = yes; then : 3572 : 3573 else 3574 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3575 /* end confdefs.h. */ 3576 #include <ctype.h> 3577 #include <stdlib.h> 3578 #if ((' ' & 0x0FF) == 0x020) 3579 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 3580 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 3581 #else 3582 # define ISLOWER(c) \ 3583 (('a' <= (c) && (c) <= 'i') \ 3584 || ('j' <= (c) && (c) <= 'r') \ 3585 || ('s' <= (c) && (c) <= 'z')) 3586 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 3587 #endif 3588 3589 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 3590 int 3591 main () 3592 { 3593 int i; 3594 for (i = 0; i < 256; i++) 3595 if (XOR (islower (i), ISLOWER (i)) 3596 || toupper (i) != TOUPPER (i)) 3597 return 2; 3598 return 0; 3599 } 3600 _ACEOF 3601 if ac_fn_c_try_run "$LINENO"; then : 3602 3603 else 3604 ac_cv_header_stdc=no 3605 fi 3606 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ 3607 conftest.$ac_objext conftest.beam conftest.$ac_ext 3608 fi 3609 3610 fi 3611 fi 3612 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 3613 $as_echo "$ac_cv_header_stdc" >&6; } 3614 if test $ac_cv_header_stdc = yes; then 3615 3616 $as_echo "#define STDC_HEADERS 1" >>confdefs.h 3617 3618 fi 3619 3620 # On IRIX 5.3, sys/types and inttypes.h are conflicting. 3621 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ 3622 inttypes.h stdint.h unistd.h 3623 do : 3624 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 3625 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 3626 " 3627 eval as_val=\$$as_ac_Header 3628 if test "x$as_val" = x""yes; then : 3629 cat >>confdefs.h <<_ACEOF 3630 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 3631 _ACEOF 3632 3633 fi 3634 3635 done 3636 3637 3638 3639 ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" 3640 if test "x$ac_cv_header_minix_config_h" = x""yes; then : 3641 MINIX=yes 3642 else 3643 MINIX= 3644 fi 3645 3646 3647 if test "$MINIX" = yes; then 3648 3649 $as_echo "#define _POSIX_SOURCE 1" >>confdefs.h 3650 3651 3652 $as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h 3653 3654 3655 $as_echo "#define _MINIX 1" >>confdefs.h 3656 3657 fi 3658 3659 3660 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 3661 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } 3662 if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : 3663 $as_echo_n "(cached) " >&6 3664 else 3665 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3666 /* end confdefs.h. */ 3667 3668 # define __EXTENSIONS__ 1 3669 $ac_includes_default 3670 int 3671 main () 3672 { 3673 3674 ; 3675 return 0; 3676 } 3677 _ACEOF 3678 if ac_fn_c_try_compile "$LINENO"; then : 3679 ac_cv_safe_to_define___extensions__=yes 3680 else 3681 ac_cv_safe_to_define___extensions__=no 3682 fi 3683 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 3684 fi 3685 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 3686 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } 3687 test $ac_cv_safe_to_define___extensions__ = yes && 3688 $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h 3689 3690 $as_echo "#define _ALL_SOURCE 1" >>confdefs.h 3691 3692 $as_echo "#define _GNU_SOURCE 1" >>confdefs.h 3693 3694 $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h 3695 3696 $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h 3697 3698 3699 3700 { $as_echo "$as_me:${as_lineno-$LINENO}: checking maximum warning verbosity option" >&5 3701 $as_echo_n "checking maximum warning verbosity option... " >&6; } 2853 3702 if test -n "$CXX" 2854 3703 then … … 2870 3719 ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C" 2871 3720 fi 2872 echo "$as_me:$LINENO: result: $ac_compile_warnings_msg" >&52873 echo "${ECHO_T}$ac_compile_warnings_msg" >&6 3721 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_compile_warnings_msg" >&5 3722 $as_echo "$ac_compile_warnings_msg" >&6; } 2874 3723 unset ac_compile_warnings_msg 2875 3724 unset ac_compile_warnings_opt 2876 3725 2877 3726 2878 # Check whether --enable-shared or --disable-shared was given. 2879 if test "${enable_shared+set}" = set; then 2880 enableval="$enable_shared" 2881 p=${PACKAGE-default} 3727 # Check whether --enable-shared was given. 3728 if test "${enable_shared+set}" = set; then : 3729 enableval=$enable_shared; p=${PACKAGE-default} 2882 3730 case $enableval in 2883 3731 yes) enable_shared=yes ;; … … 2897 3745 else 2898 3746 enable_shared=yes 2899 fi ;2900 # Check whether --enable-static or --disable-static was given. 2901 if test "${enable_static+set}" = set; then 2902 enableval="$enable_static" 2903 p=${PACKAGE-default}3747 fi 3748 3749 # Check whether --enable-static was given. 3750 if test "${enable_static+set}" = set; then : 3751 enableval=$enable_static; p=${PACKAGE-default} 2904 3752 case $enableval in 2905 3753 yes) enable_static=yes ;; … … 2919 3767 else 2920 3768 enable_static=yes 2921 fi ;2922 # Check whether --enable-fast-install or --disable-fast-install was given. 2923 if test "${enable_fast_install+set}" = set; then 2924 enableval="$enable_fast_install" 2925 p=${PACKAGE-default}3769 fi 3770 3771 # Check whether --enable-fast-install was given. 3772 if test "${enable_fast_install+set}" = set; then : 3773 enableval=$enable_fast_install; p=${PACKAGE-default} 2926 3774 case $enableval in 2927 3775 yes) enable_fast_install=yes ;; … … 2941 3789 else 2942 3790 enable_fast_install=yes 2943 fi; 3791 fi 3792 2944 3793 # Find the correct PATH separator. Usually this is `:', but 2945 3794 # DJGPP uses `;' like DOS. … … 2954 3803 2955 3804 2956 # Check whether --with-gnu-ld or --without-gnu-ld was given. 2957 if test "${with_gnu_ld+set}" = set; then 2958 withval="$with_gnu_ld" 2959 test "$withval" = no || with_gnu_ld=yes 3805 # Check whether --with-gnu-ld was given. 3806 if test "${with_gnu_ld+set}" = set; then : 3807 withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes 2960 3808 else 2961 3809 with_gnu_ld=no 2962 fi; 3810 fi 3811 2963 3812 ac_prog=ld 2964 3813 if test "$GCC" = yes; then 2965 3814 # Check if gcc -print-prog-name=ld gives a path. 2966 echo "$as_me:$LINENO: checking for ld used by GCC" >&52967 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 3815 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 3816 $as_echo_n "checking for ld used by GCC... " >&6; } 2968 3817 case $host in 2969 3818 *-*-mingw*) … … 2994 3843 esac 2995 3844 elif test "$with_gnu_ld" = yes; then 2996 echo "$as_me:$LINENO: checking for GNU ld" >&52997 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 2998 else 2999 echo "$as_me:$LINENO: checking for non-GNU ld" >&53000 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 3001 fi 3002 if test "${lt_cv_path_LD+set}" = set; then 3003 echo $ECHO_N "(cached) $ECHO_C" >&63845 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 3846 $as_echo_n "checking for GNU ld... " >&6; } 3847 else 3848 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 3849 $as_echo_n "checking for non-GNU ld... " >&6; } 3850 fi 3851 if test "${lt_cv_path_LD+set}" = set; then : 3852 $as_echo_n "(cached) " >&6 3004 3853 else 3005 3854 if test -z "$LD"; then … … 3027 3876 LD="$lt_cv_path_LD" 3028 3877 if test -n "$LD"; then 3029 echo "$as_me:$LINENO: result: $LD" >&5 3030 echo "${ECHO_T}$LD" >&6 3031 else 3032 echo "$as_me:$LINENO: result: no" >&5 3033 echo "${ECHO_T}no" >&6 3034 fi 3035 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 3036 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} 3037 { (exit 1); exit 1; }; } 3038 echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 3039 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 3040 if test "${lt_cv_prog_gnu_ld+set}" = set; then 3041 echo $ECHO_N "(cached) $ECHO_C" >&6 3878 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 3879 $as_echo "$LD" >&6; } 3880 else 3881 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3882 $as_echo "no" >&6; } 3883 fi 3884 test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 3885 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 3886 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } 3887 if test "${lt_cv_prog_gnu_ld+set}" = set; then : 3888 $as_echo_n "(cached) " >&6 3042 3889 else 3043 3890 # I'd rather use --version here, but apparently some GNU ld's only accept -v. … … 3048 3895 fi 3049 3896 fi 3050 echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&53051 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 3897 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 3898 $as_echo "$lt_cv_prog_gnu_ld" >&6; } 3052 3899 with_gnu_ld=$lt_cv_prog_gnu_ld 3053 3900 3054 3901 3055 echo "$as_me:$LINENO: checking for $LD option to reload object files" >&53056 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 3057 if test "${lt_cv_ld_reload_flag+set}" = set; then 3058 echo $ECHO_N "(cached) $ECHO_C" >&63902 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 3903 $as_echo_n "checking for $LD option to reload object files... " >&6; } 3904 if test "${lt_cv_ld_reload_flag+set}" = set; then : 3905 $as_echo_n "(cached) " >&6 3059 3906 else 3060 3907 lt_cv_ld_reload_flag='-r' 3061 3908 fi 3062 echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&53063 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 3909 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 3910 $as_echo "$lt_cv_ld_reload_flag" >&6; } 3064 3911 reload_flag=$lt_cv_ld_reload_flag 3065 3912 test -n "$reload_flag" && reload_flag=" $reload_flag" 3066 3913 3067 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&53068 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 3069 if test "${lt_cv_path_NM+set}" = set; then 3070 echo $ECHO_N "(cached) $ECHO_C" >&63914 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5 3915 $as_echo_n "checking for BSD-compatible nm... " >&6; } 3916 if test "${lt_cv_path_NM+set}" = set; then : 3917 $as_echo_n "(cached) " >&6 3071 3918 else 3072 3919 if test -n "$NM"; then … … 3101 3948 3102 3949 NM="$lt_cv_path_NM" 3103 echo "$as_me:$LINENO: result: $NM" >&53104 echo "${ECHO_T}$NM" >&6 3105 3106 echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&53107 echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 3108 if test "${lt_cv_path_SED+set}" = set; then 3109 echo $ECHO_N "(cached) $ECHO_C" >&63950 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 3951 $as_echo "$NM" >&6; } 3952 3953 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 3954 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 3955 if test "${lt_cv_path_SED+set}" = set; then : 3956 $as_echo_n "(cached) " >&6 3110 3957 else 3111 3958 # Loop through the user's path and test for sed and gsed. … … 3186 4033 SED=$lt_cv_path_SED 3187 4034 fi 3188 echo "$as_me:$LINENO: result: $SED" >&53189 echo "${ECHO_T}$SED" >&6 3190 3191 echo "$as_me:$LINENO: checking whether ln -s works" >&53192 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 4035 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 4036 $as_echo "$SED" >&6; } 4037 4038 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 4039 $as_echo_n "checking whether ln -s works... " >&6; } 3193 4040 LN_S=$as_ln_s 3194 4041 if test "$LN_S" = "ln -s"; then 3195 echo "$as_me:$LINENO: result: yes" >&53196 echo "${ECHO_T}yes" >&6 3197 else 3198 echo "$as_me:$LINENO: result: no, using $LN_S" >&53199 echo "${ECHO_T}no, using $LN_S" >&6 3200 fi 3201 3202 echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&53203 echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 3204 if test "${lt_cv_deplibs_check_method+set}" = set; then 3205 echo $ECHO_N "(cached) $ECHO_C" >&64042 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 4043 $as_echo "yes" >&6; } 4044 else 4045 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 4046 $as_echo "no, using $LN_S" >&6; } 4047 fi 4048 4049 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognise dependent libraries" >&5 4050 $as_echo_n "checking how to recognise dependent libraries... " >&6; } 4051 if test "${lt_cv_deplibs_check_method+set}" = set; then : 4052 $as_echo_n "(cached) " >&6 3206 4053 else 3207 4054 lt_cv_file_magic_cmd='$MAGIC_CMD' … … 3381 4228 3382 4229 fi 3383 echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&53384 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 4230 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4231 $as_echo "$lt_cv_deplibs_check_method" >&6; } 3385 4232 file_magic_cmd=$lt_cv_file_magic_cmd 3386 4233 deplibs_check_method=$lt_cv_deplibs_check_method … … 3393 4240 3394 4241 # Check for command to grab the raw symbol name followed by C symbol from nm. 3395 echo "$as_me:$LINENO: checking command to parse $NM output" >&53396 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 3397 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then 3398 echo $ECHO_N "(cached) $ECHO_C" >&64242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output" >&5 4243 $as_echo_n "checking command to parse $NM output... " >&6; } 4244 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : 4245 $as_echo_n "(cached) " >&6 3399 4246 else 3400 4247 … … 3474 4321 EOF 3475 4322 3476 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"")>&54323 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 3477 4324 (eval $ac_compile) 2>&5 3478 4325 ac_status=$? 3479 echo "$as_me:$LINENO: \$? = $ac_status" >&53480 (exit $ac_status); }; then4326 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4327 test $ac_status = 0; }; then 3481 4328 # Now try to grab the symbols. 3482 4329 nlist=conftest.nm 3483 if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"")>&54330 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 3484 4331 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 3485 4332 ac_status=$? 3486 echo "$as_me:$LINENO: \$? = $ac_status" >&53487 (exit $ac_status); } && test -s "$nlist"; then4333 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4334 test $ac_status = 0; } && test -s "$nlist"; then 3488 4335 # Try sorting and uniquifying the output. 3489 4336 if sort "$nlist" | uniq > "$nlist"T; then … … 3536 4383 LIBS="conftstm.$ac_objext" 3537 4384 CFLAGS="$CFLAGS$no_builtin_flag" 3538 if { (eval echo "$as_me:$LINENO: \"$ac_link\"")>&54385 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 3539 4386 (eval $ac_link) 2>&5 3540 4387 ac_status=$? 3541 echo "$as_me:$LINENO: \$? = $ac_status" >&53542 (exit $ac_status); } && test -s conftest; then4388 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4389 test $ac_status = 0; } && test -s conftest; then 3543 4390 pipe_works=yes 3544 4391 fi … … 3580 4427 if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; 3581 4428 then 3582 echo "$as_me:$LINENO: result: failed" >&5 3583 echo "${ECHO_T}failed" >&6 3584 else 3585 echo "$as_me:$LINENO: result: ok" >&5 3586 echo "${ECHO_T}ok" >&6 3587 fi 3588 3589 echo "$as_me:$LINENO: checking for ANSI C header files" >&5 3590 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 3591 if test "${ac_cv_header_stdc+set}" = set; then 3592 echo $ECHO_N "(cached) $ECHO_C" >&6 3593 else 3594 cat >conftest.$ac_ext <<_ACEOF 3595 /* confdefs.h. */ 3596 _ACEOF 3597 cat confdefs.h >>conftest.$ac_ext 3598 cat >>conftest.$ac_ext <<_ACEOF 3599 /* end confdefs.h. */ 3600 #include <stdlib.h> 3601 #include <stdarg.h> 3602 #include <string.h> 3603 #include <float.h> 3604 3605 int 3606 main () 3607 { 3608 3609 ; 3610 return 0; 3611 } 3612 _ACEOF 3613 rm -f conftest.$ac_objext 3614 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 3615 (eval $ac_compile) 2>conftest.er1 3616 ac_status=$? 3617 grep -v '^ *+' conftest.er1 >conftest.err 3618 rm -f conftest.er1 3619 cat conftest.err >&5 3620 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3621 (exit $ac_status); } && 3622 { ac_try='test -z "$ac_c_werror_flag" 3623 || test ! -s conftest.err' 3624 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3625 (eval $ac_try) 2>&5 3626 ac_status=$? 3627 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3628 (exit $ac_status); }; } && 3629 { ac_try='test -s conftest.$ac_objext' 3630 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3631 (eval $ac_try) 2>&5 3632 ac_status=$? 3633 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3634 (exit $ac_status); }; }; then 3635 ac_cv_header_stdc=yes 3636 else 3637 echo "$as_me: failed program was:" >&5 3638 sed 's/^/| /' conftest.$ac_ext >&5 3639 3640 ac_cv_header_stdc=no 3641 fi 3642 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 3643 3644 if test $ac_cv_header_stdc = yes; then 3645 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 3646 cat >conftest.$ac_ext <<_ACEOF 3647 /* confdefs.h. */ 3648 _ACEOF 3649 cat confdefs.h >>conftest.$ac_ext 3650 cat >>conftest.$ac_ext <<_ACEOF 3651 /* end confdefs.h. */ 3652 #include <string.h> 3653 3654 _ACEOF 3655 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 3656 $EGREP "memchr" >/dev/null 2>&1; then 3657 : 3658 else 3659 ac_cv_header_stdc=no 3660 fi 3661 rm -f conftest* 3662 3663 fi 3664 3665 if test $ac_cv_header_stdc = yes; then 3666 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 3667 cat >conftest.$ac_ext <<_ACEOF 3668 /* confdefs.h. */ 3669 _ACEOF 3670 cat confdefs.h >>conftest.$ac_ext 3671 cat >>conftest.$ac_ext <<_ACEOF 3672 /* end confdefs.h. */ 3673 #include <stdlib.h> 3674 3675 _ACEOF 3676 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 3677 $EGREP "free" >/dev/null 2>&1; then 3678 : 3679 else 3680 ac_cv_header_stdc=no 3681 fi 3682 rm -f conftest* 3683 3684 fi 3685 3686 if test $ac_cv_header_stdc = yes; then 3687 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 3688 if test "$cross_compiling" = yes; then 3689 : 3690 else 3691 cat >conftest.$ac_ext <<_ACEOF 3692 /* confdefs.h. */ 3693 _ACEOF 3694 cat confdefs.h >>conftest.$ac_ext 3695 cat >>conftest.$ac_ext <<_ACEOF 3696 /* end confdefs.h. */ 3697 #include <ctype.h> 3698 #if ((' ' & 0x0FF) == 0x020) 3699 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 3700 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 3701 #else 3702 # define ISLOWER(c) \ 3703 (('a' <= (c) && (c) <= 'i') \ 3704 || ('j' <= (c) && (c) <= 'r') \ 3705 || ('s' <= (c) && (c) <= 'z')) 3706 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 3707 #endif 3708 3709 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 3710 int 3711 main () 3712 { 3713 int i; 3714 for (i = 0; i < 256; i++) 3715 if (XOR (islower (i), ISLOWER (i)) 3716 || toupper (i) != TOUPPER (i)) 3717 exit(2); 3718 exit (0); 3719 } 3720 _ACEOF 3721 rm -f conftest$ac_exeext 3722 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 3723 (eval $ac_link) 2>&5 3724 ac_status=$? 3725 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3726 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 3727 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3728 (eval $ac_try) 2>&5 3729 ac_status=$? 3730 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3731 (exit $ac_status); }; }; then 3732 : 3733 else 3734 echo "$as_me: program exited with status $ac_status" >&5 3735 echo "$as_me: failed program was:" >&5 3736 sed 's/^/| /' conftest.$ac_ext >&5 3737 3738 ( exit $ac_status ) 3739 ac_cv_header_stdc=no 3740 fi 3741 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 3742 fi 3743 fi 3744 fi 3745 echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 3746 echo "${ECHO_T}$ac_cv_header_stdc" >&6 3747 if test $ac_cv_header_stdc = yes; then 3748 3749 cat >>confdefs.h <<\_ACEOF 3750 #define STDC_HEADERS 1 3751 _ACEOF 3752 3753 fi 3754 3755 # On IRIX 5.3, sys/types and inttypes.h are conflicting. 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ 3766 inttypes.h stdint.h unistd.h 3767 do 3768 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 3769 echo "$as_me:$LINENO: checking for $ac_header" >&5 3770 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 3771 if eval "test \"\${$as_ac_Header+set}\" = set"; then 3772 echo $ECHO_N "(cached) $ECHO_C" >&6 3773 else 3774 cat >conftest.$ac_ext <<_ACEOF 3775 /* confdefs.h. */ 3776 _ACEOF 3777 cat confdefs.h >>conftest.$ac_ext 3778 cat >>conftest.$ac_ext <<_ACEOF 3779 /* end confdefs.h. */ 3780 $ac_includes_default 3781 3782 #include <$ac_header> 3783 _ACEOF 3784 rm -f conftest.$ac_objext 3785 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 3786 (eval $ac_compile) 2>conftest.er1 3787 ac_status=$? 3788 grep -v '^ *+' conftest.er1 >conftest.err 3789 rm -f conftest.er1 3790 cat conftest.err >&5 3791 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3792 (exit $ac_status); } && 3793 { ac_try='test -z "$ac_c_werror_flag" 3794 || test ! -s conftest.err' 3795 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3796 (eval $ac_try) 2>&5 3797 ac_status=$? 3798 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3799 (exit $ac_status); }; } && 3800 { ac_try='test -s conftest.$ac_objext' 3801 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3802 (eval $ac_try) 2>&5 3803 ac_status=$? 3804 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3805 (exit $ac_status); }; }; then 3806 eval "$as_ac_Header=yes" 3807 else 3808 echo "$as_me: failed program was:" >&5 3809 sed 's/^/| /' conftest.$ac_ext >&5 3810 3811 eval "$as_ac_Header=no" 3812 fi 3813 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 3814 fi 3815 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 3816 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 3817 if test `eval echo '${'$as_ac_Header'}'` = yes; then 4429 { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 4430 $as_echo "failed" >&6; } 4431 else 4432 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 4433 $as_echo "ok" >&6; } 4434 fi 4435 4436 for ac_header in dlfcn.h 4437 do : 4438 ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" 4439 if test "x$ac_cv_header_dlfcn_h" = x""yes; then : 3818 4440 cat >>confdefs.h <<_ACEOF 3819 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 3820 _ACEOF 3821 3822 fi 3823 3824 done 3825 3826 3827 3828 for ac_header in dlfcn.h 3829 do 3830 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 3831 if eval "test \"\${$as_ac_Header+set}\" = set"; then 3832 echo "$as_me:$LINENO: checking for $ac_header" >&5 3833 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 3834 if eval "test \"\${$as_ac_Header+set}\" = set"; then 3835 echo $ECHO_N "(cached) $ECHO_C" >&6 3836 fi 3837 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 3838 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 3839 else 3840 # Is the header compilable? 3841 echo "$as_me:$LINENO: checking $ac_header usability" >&5 3842 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 3843 cat >conftest.$ac_ext <<_ACEOF 3844 /* confdefs.h. */ 3845 _ACEOF 3846 cat confdefs.h >>conftest.$ac_ext 3847 cat >>conftest.$ac_ext <<_ACEOF 3848 /* end confdefs.h. */ 3849 $ac_includes_default 3850 #include <$ac_header> 3851 _ACEOF 3852 rm -f conftest.$ac_objext 3853 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 3854 (eval $ac_compile) 2>conftest.er1 3855 ac_status=$? 3856 grep -v '^ *+' conftest.er1 >conftest.err 3857 rm -f conftest.er1 3858 cat conftest.err >&5 3859 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3860 (exit $ac_status); } && 3861 { ac_try='test -z "$ac_c_werror_flag" 3862 || test ! -s conftest.err' 3863 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3864 (eval $ac_try) 2>&5 3865 ac_status=$? 3866 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3867 (exit $ac_status); }; } && 3868 { ac_try='test -s conftest.$ac_objext' 3869 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3870 (eval $ac_try) 2>&5 3871 ac_status=$? 3872 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3873 (exit $ac_status); }; }; then 3874 ac_header_compiler=yes 3875 else 3876 echo "$as_me: failed program was:" >&5 3877 sed 's/^/| /' conftest.$ac_ext >&5 3878 3879 ac_header_compiler=no 3880 fi 3881 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 3882 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 3883 echo "${ECHO_T}$ac_header_compiler" >&6 3884 3885 # Is the header present? 3886 echo "$as_me:$LINENO: checking $ac_header presence" >&5 3887 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 3888 cat >conftest.$ac_ext <<_ACEOF 3889 /* confdefs.h. */ 3890 _ACEOF 3891 cat confdefs.h >>conftest.$ac_ext 3892 cat >>conftest.$ac_ext <<_ACEOF 3893 /* end confdefs.h. */ 3894 #include <$ac_header> 3895 _ACEOF 3896 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 3897 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 3898 ac_status=$? 3899 grep -v '^ *+' conftest.er1 >conftest.err 3900 rm -f conftest.er1 3901 cat conftest.err >&5 3902 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3903 (exit $ac_status); } >/dev/null; then 3904 if test -s conftest.err; then 3905 ac_cpp_err=$ac_c_preproc_warn_flag 3906 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 3907 else 3908 ac_cpp_err= 3909 fi 3910 else 3911 ac_cpp_err=yes 3912 fi 3913 if test -z "$ac_cpp_err"; then 3914 ac_header_preproc=yes 3915 else 3916 echo "$as_me: failed program was:" >&5 3917 sed 's/^/| /' conftest.$ac_ext >&5 3918 3919 ac_header_preproc=no 3920 fi 3921 rm -f conftest.err conftest.$ac_ext 3922 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 3923 echo "${ECHO_T}$ac_header_preproc" >&6 3924 3925 # So? What about this header? 3926 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 3927 yes:no: ) 3928 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 3929 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 3930 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 3931 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 3932 ac_header_preproc=yes 3933 ;; 3934 no:yes:* ) 3935 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 3936 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 3937 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 3938 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 3939 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 3940 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 3941 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 3942 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 3943 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 3944 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 3945 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 3946 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 3947 ( 3948 cat <<\_ASBOX 3949 ## ------------------------------------------ ## 3950 ## Report this to the AC_PACKAGE_NAME lists. ## 3951 ## ------------------------------------------ ## 3952 _ASBOX 3953 ) | 3954 sed "s/^/$as_me: WARNING: /" >&2 3955 ;; 3956 esac 3957 echo "$as_me:$LINENO: checking for $ac_header" >&5 3958 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 3959 if eval "test \"\${$as_ac_Header+set}\" = set"; then 3960 echo $ECHO_N "(cached) $ECHO_C" >&6 3961 else 3962 eval "$as_ac_Header=\$ac_header_preproc" 3963 fi 3964 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 3965 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 3966 3967 fi 3968 if test `eval echo '${'$as_ac_Header'}'` = yes; then 3969 cat >>confdefs.h <<_ACEOF 3970 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 4441 #define HAVE_DLFCN_H 1 3971 4442 _ACEOF 3972 4443 … … 3984 4455 file_magic*) 3985 4456 if test "$file_magic_cmd" = '$MAGIC_CMD'; then 3986 echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&53987 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 3988 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then 3989 echo $ECHO_N "(cached) $ECHO_C" >&64457 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 4458 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } 4459 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : 4460 $as_echo_n "(cached) " >&6 3990 4461 else 3991 4462 case $MAGIC_CMD in … … 4039 4510 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 4040 4511 if test -n "$MAGIC_CMD"; then 4041 echo "$as_me:$LINENO: result: $MAGIC_CMD" >&54042 echo "${ECHO_T}$MAGIC_CMD" >&6 4043 else 4044 echo "$as_me:$LINENO: result: no" >&54045 echo "${ECHO_T}no" >&6 4512 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 4513 $as_echo "$MAGIC_CMD" >&6; } 4514 else 4515 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4516 $as_echo "no" >&6; } 4046 4517 fi 4047 4518 4048 4519 if test -z "$lt_cv_path_MAGIC_CMD"; then 4049 4520 if test -n "$ac_tool_prefix"; then 4050 echo "$as_me:$LINENO: checking for file" >&54051 echo $ECHO_N "checking for file... $ECHO_C" >&6 4052 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then 4053 echo $ECHO_N "(cached) $ECHO_C" >&64521 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 4522 $as_echo_n "checking for file... " >&6; } 4523 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : 4524 $as_echo_n "(cached) " >&6 4054 4525 else 4055 4526 case $MAGIC_CMD in … … 4103 4574 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 4104 4575 if test -n "$MAGIC_CMD"; then 4105 echo "$as_me:$LINENO: result: $MAGIC_CMD" >&54106 echo "${ECHO_T}$MAGIC_CMD" >&6 4107 else 4108 echo "$as_me:$LINENO: result: no" >&54109 echo "${ECHO_T}no" >&6 4576 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 4577 $as_echo "$MAGIC_CMD" >&6; } 4578 else 4579 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4580 $as_echo "no" >&6; } 4110 4581 fi 4111 4582 … … 4122 4593 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 4123 4594 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 4124 echo "$as_me:$LINENO: checking for $ac_word" >&54125 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 4126 if test "${ac_cv_prog_RANLIB+set}" = set; then 4127 echo $ECHO_N "(cached) $ECHO_C" >&64595 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4596 $as_echo_n "checking for $ac_word... " >&6; } 4597 if test "${ac_cv_prog_RANLIB+set}" = set; then : 4598 $as_echo_n "(cached) " >&6 4128 4599 else 4129 4600 if test -n "$RANLIB"; then … … 4135 4606 IFS=$as_save_IFS 4136 4607 test -z "$as_dir" && as_dir=. 4137 for ac_exec_ext in '' $ac_executable_extensions; do4138 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then4608 for ac_exec_ext in '' $ac_executable_extensions; do 4609 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4139 4610 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 4140 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&54611 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4141 4612 break 2 4142 4613 fi 4143 4614 done 4144 done 4615 done 4616 IFS=$as_save_IFS 4145 4617 4146 4618 fi … … 4148 4620 RANLIB=$ac_cv_prog_RANLIB 4149 4621 if test -n "$RANLIB"; then 4150 echo "$as_me:$LINENO: result: $RANLIB" >&5 4151 echo "${ECHO_T}$RANLIB" >&6 4152 else 4153 echo "$as_me:$LINENO: result: no" >&5 4154 echo "${ECHO_T}no" >&6 4155 fi 4622 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 4623 $as_echo "$RANLIB" >&6; } 4624 else 4625 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4626 $as_echo "no" >&6; } 4627 fi 4628 4156 4629 4157 4630 fi … … 4160 4633 # Extract the first word of "ranlib", so it can be a program name with args. 4161 4634 set dummy ranlib; ac_word=$2 4162 echo "$as_me:$LINENO: checking for $ac_word" >&54163 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 4164 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then 4165 echo $ECHO_N "(cached) $ECHO_C" >&64635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4636 $as_echo_n "checking for $ac_word... " >&6; } 4637 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : 4638 $as_echo_n "(cached) " >&6 4166 4639 else 4167 4640 if test -n "$ac_ct_RANLIB"; then … … 4173 4646 IFS=$as_save_IFS 4174 4647 test -z "$as_dir" && as_dir=. 4175 for ac_exec_ext in '' $ac_executable_extensions; do4176 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then4648 for ac_exec_ext in '' $ac_executable_extensions; do 4649 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4177 4650 ac_cv_prog_ac_ct_RANLIB="ranlib" 4178 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&54651 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4179 4652 break 2 4180 4653 fi 4181 4654 done 4182 done4183 4184 test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" 4655 done 4656 IFS=$as_save_IFS 4657 4185 4658 fi 4186 4659 fi 4187 4660 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 4188 4661 if test -n "$ac_ct_RANLIB"; then 4189 echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 4190 echo "${ECHO_T}$ac_ct_RANLIB" >&6 4191 else 4192 echo "$as_me:$LINENO: result: no" >&5 4193 echo "${ECHO_T}no" >&6 4194 fi 4195 4196 RANLIB=$ac_ct_RANLIB 4662 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 4663 $as_echo "$ac_ct_RANLIB" >&6; } 4664 else 4665 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4666 $as_echo "no" >&6; } 4667 fi 4668 4669 if test "x$ac_ct_RANLIB" = x; then 4670 RANLIB=":" 4671 else 4672 case $cross_compiling:$ac_tool_warned in 4673 yes:) 4674 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 4675 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 4676 ac_tool_warned=yes ;; 4677 esac 4678 RANLIB=$ac_ct_RANLIB 4679 fi 4197 4680 else 4198 4681 RANLIB="$ac_cv_prog_RANLIB" … … 4202 4685 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 4203 4686 set dummy ${ac_tool_prefix}strip; ac_word=$2 4204 echo "$as_me:$LINENO: checking for $ac_word" >&54205 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 4206 if test "${ac_cv_prog_STRIP+set}" = set; then 4207 echo $ECHO_N "(cached) $ECHO_C" >&64687 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4688 $as_echo_n "checking for $ac_word... " >&6; } 4689 if test "${ac_cv_prog_STRIP+set}" = set; then : 4690 $as_echo_n "(cached) " >&6 4208 4691 else 4209 4692 if test -n "$STRIP"; then … … 4215 4698 IFS=$as_save_IFS 4216 4699 test -z "$as_dir" && as_dir=. 4217 for ac_exec_ext in '' $ac_executable_extensions; do4218 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then4700 for ac_exec_ext in '' $ac_executable_extensions; do 4701 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4219 4702 ac_cv_prog_STRIP="${ac_tool_prefix}strip" 4220 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&54703 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4221 4704 break 2 4222 4705 fi 4223 4706 done 4224 done 4707 done 4708 IFS=$as_save_IFS 4225 4709 4226 4710 fi … … 4228 4712 STRIP=$ac_cv_prog_STRIP 4229 4713 if test -n "$STRIP"; then 4230 echo "$as_me:$LINENO: result: $STRIP" >&5 4231 echo "${ECHO_T}$STRIP" >&6 4232 else 4233 echo "$as_me:$LINENO: result: no" >&5 4234 echo "${ECHO_T}no" >&6 4235 fi 4714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 4715 $as_echo "$STRIP" >&6; } 4716 else 4717 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4718 $as_echo "no" >&6; } 4719 fi 4720 4236 4721 4237 4722 fi … … 4240 4725 # Extract the first word of "strip", so it can be a program name with args. 4241 4726 set dummy strip; ac_word=$2 4242 echo "$as_me:$LINENO: checking for $ac_word" >&54243 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 4244 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then 4245 echo $ECHO_N "(cached) $ECHO_C" >&64727 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4728 $as_echo_n "checking for $ac_word... " >&6; } 4729 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 4730 $as_echo_n "(cached) " >&6 4246 4731 else 4247 4732 if test -n "$ac_ct_STRIP"; then … … 4253 4738 IFS=$as_save_IFS 4254 4739 test -z "$as_dir" && as_dir=. 4255 for ac_exec_ext in '' $ac_executable_extensions; do4256 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then4740 for ac_exec_ext in '' $ac_executable_extensions; do 4741 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4257 4742 ac_cv_prog_ac_ct_STRIP="strip" 4258 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&54743 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4259 4744 break 2 4260 4745 fi 4261 4746 done 4262 done4263 4264 test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" 4747 done 4748 IFS=$as_save_IFS 4749 4265 4750 fi 4266 4751 fi 4267 4752 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP 4268 4753 if test -n "$ac_ct_STRIP"; then 4269 echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 4270 echo "${ECHO_T}$ac_ct_STRIP" >&6 4271 else 4272 echo "$as_me:$LINENO: result: no" >&5 4273 echo "${ECHO_T}no" >&6 4274 fi 4275 4276 STRIP=$ac_ct_STRIP 4754 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 4755 $as_echo "$ac_ct_STRIP" >&6; } 4756 else 4757 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4758 $as_echo "no" >&6; } 4759 fi 4760 4761 if test "x$ac_ct_STRIP" = x; then 4762 STRIP=":" 4763 else 4764 case $cross_compiling:$ac_tool_warned in 4765 yes:) 4766 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 4767 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 4768 ac_tool_warned=yes ;; 4769 esac 4770 STRIP=$ac_ct_STRIP 4771 fi 4277 4772 else 4278 4773 STRIP="$ac_cv_prog_STRIP" … … 4283 4778 enable_win32_dll=no 4284 4779 4285 # Check whether --enable-libtool-lock or --disable-libtool-lockwas given.4286 if test "${enable_libtool_lock+set}" = set; then 4287 enableval= "$enable_libtool_lock"4288 4289 fi; 4780 # Check whether --enable-libtool-lock was given. 4781 if test "${enable_libtool_lock+set}" = set; then : 4782 enableval=$enable_libtool_lock; 4783 fi 4784 4290 4785 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes 4291 4786 … … 4295 4790 *-*-irix6*) 4296 4791 # Find out which ABI we are using. 4297 echo '#line 4 297"configure"' > conftest.$ac_ext4298 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"")>&54792 echo '#line 4792 "configure"' > conftest.$ac_ext 4793 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 4299 4794 (eval $ac_compile) 2>&5 4300 4795 ac_status=$? 4301 echo "$as_me:$LINENO: \$? = $ac_status" >&54302 (exit $ac_status); }; then4796 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4797 test $ac_status = 0; }; then 4303 4798 case `/usr/bin/file conftest.$ac_objext` in 4304 4799 *32-bit*) … … 4320 4815 SAVE_CFLAGS="$CFLAGS" 4321 4816 CFLAGS="$CFLAGS -belf" 4322 echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 4323 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 4324 if test "${lt_cv_cc_needs_belf+set}" = set; then 4325 echo $ECHO_N "(cached) $ECHO_C" >&6 4326 else 4327 4817 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 4818 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } 4819 if test "${lt_cv_cc_needs_belf+set}" = set; then : 4820 $as_echo_n "(cached) " >&6 4821 else 4328 4822 4329 4823 ac_ext=c … … 4333 4827 ac_compiler_gnu=$ac_cv_c_compiler_gnu 4334 4828 4335 cat >conftest.$ac_ext <<_ACEOF 4336 /* confdefs.h. */ 4337 _ACEOF 4338 cat confdefs.h >>conftest.$ac_ext 4339 cat >>conftest.$ac_ext <<_ACEOF 4829 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4340 4830 /* end confdefs.h. */ 4341 4831 … … 4348 4838 } 4349 4839 _ACEOF 4350 rm -f conftest.$ac_objext conftest$ac_exeext 4351 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4352 (eval $ac_link) 2>conftest.er1 4353 ac_status=$? 4354 grep -v '^ *+' conftest.er1 >conftest.err 4355 rm -f conftest.er1 4356 cat conftest.err >&5 4357 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4358 (exit $ac_status); } && 4359 { ac_try='test -z "$ac_c_werror_flag" 4360 || test ! -s conftest.err' 4361 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4362 (eval $ac_try) 2>&5 4363 ac_status=$? 4364 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4365 (exit $ac_status); }; } && 4366 { ac_try='test -s conftest$ac_exeext' 4367 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4368 (eval $ac_try) 2>&5 4369 ac_status=$? 4370 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4371 (exit $ac_status); }; }; then 4840 if ac_fn_c_try_link "$LINENO"; then : 4372 4841 lt_cv_cc_needs_belf=yes 4373 4842 else 4374 echo "$as_me: failed program was:" >&5 4375 sed 's/^/| /' conftest.$ac_ext >&5 4376 4377 lt_cv_cc_needs_belf=no 4378 fi 4379 rm -f conftest.err conftest.$ac_objext \ 4380 conftest$ac_exeext conftest.$ac_ext 4843 lt_cv_cc_needs_belf=no 4844 fi 4845 rm -f core conftest.err conftest.$ac_objext \ 4846 conftest$ac_exeext conftest.$ac_ext 4381 4847 ac_ext=c 4382 4848 ac_cpp='$CPP $CPPFLAGS' … … 4386 4852 4387 4853 fi 4388 echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&54389 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 4854 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 4855 $as_echo "$lt_cv_cc_needs_belf" >&6; } 4390 4856 if test x"$lt_cv_cc_needs_belf" != x"yes"; then 4391 4857 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf … … 4487 4953 compiler="$2" 4488 4954 4489 echo "$as_me:$LINENO: checking for objdir" >&54490 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 4955 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 4956 $as_echo_n "checking for objdir... " >&6; } 4491 4957 rm -f .libs 2>/dev/null 4492 4958 mkdir .libs 2>/dev/null … … 4498 4964 fi 4499 4965 rmdir .libs 2>/dev/null 4500 echo "$as_me:$LINENO: result: $objdir" >&5 4501 echo "${ECHO_T}$objdir" >&6 4502 4503 4504 4505 # Check whether --with-pic or --without-pic was given. 4506 if test "${with_pic+set}" = set; then 4507 withval="$with_pic" 4508 pic_mode="$withval" 4966 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $objdir" >&5 4967 $as_echo "$objdir" >&6; } 4968 4969 4970 4971 # Check whether --with-pic was given. 4972 if test "${with_pic+set}" = set; then : 4973 withval=$with_pic; pic_mode="$withval" 4509 4974 else 4510 4975 pic_mode=default 4511 fi; 4976 fi 4977 4512 4978 test -z "$pic_mode" && pic_mode=default 4513 4979 … … 4515 4981 # in isolation, and that seeing it set (from the cache) indicates that 4516 4982 # the associated values are set (in the cache) correctly too. 4517 echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&54518 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 4519 if test "${lt_cv_prog_cc_pic+set}" = set; then 4520 echo $ECHO_N "(cached) $ECHO_C" >&64983 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 4984 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4985 if test "${lt_cv_prog_cc_pic+set}" = set; then : 4986 $as_echo_n "(cached) " >&6 4521 4987 else 4522 4988 lt_cv_prog_cc_pic= … … 4658 5124 4659 5125 if test -z "$lt_cv_prog_cc_pic"; then 4660 echo "$as_me:$LINENO: result: none" >&54661 echo "${ECHO_T}none" >&6 4662 else 4663 echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&54664 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 5126 { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 5127 $as_echo "none" >&6; } 5128 else 5129 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_pic" >&5 5130 $as_echo "$lt_cv_prog_cc_pic" >&6; } 4665 5131 4666 5132 # Check to make sure the pic_flag actually works. 4667 echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&54668 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 4669 if test "${lt_cv_prog_cc_pic_works+set}" = set; then 4670 echo $ECHO_N "(cached) $ECHO_C" >&65133 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 5134 $as_echo_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... " >&6; } 5135 if test "${lt_cv_prog_cc_pic_works+set}" = set; then : 5136 $as_echo_n "(cached) " >&6 4671 5137 else 4672 5138 save_CFLAGS="$CFLAGS" 4673 5139 CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" 4674 cat >conftest.$ac_ext <<_ACEOF 4675 /* confdefs.h. */ 4676 _ACEOF 4677 cat confdefs.h >>conftest.$ac_ext 4678 cat >>conftest.$ac_ext <<_ACEOF 5140 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4679 5141 /* end confdefs.h. */ 4680 5142 … … 4687 5149 } 4688 5150 _ACEOF 4689 rm -f conftest.$ac_objext 4690 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4691 (eval $ac_compile) 2>conftest.er1 4692 ac_status=$? 4693 grep -v '^ *+' conftest.er1 >conftest.err 4694 rm -f conftest.er1 4695 cat conftest.err >&5 4696 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4697 (exit $ac_status); } && 4698 { ac_try='test -z "$ac_c_werror_flag" 4699 || test ! -s conftest.err' 4700 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4701 (eval $ac_try) 2>&5 4702 ac_status=$? 4703 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4704 (exit $ac_status); }; } && 4705 { ac_try='test -s conftest.$ac_objext' 4706 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4707 (eval $ac_try) 2>&5 4708 ac_status=$? 4709 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4710 (exit $ac_status); }; }; then 5151 if ac_fn_c_try_compile "$LINENO"; then : 4711 5152 case $host_os in 4712 5153 hpux9* | hpux10* | hpux11*) … … 4726 5167 4727 5168 else 4728 echo "$as_me: failed program was:" >&5 4729 sed 's/^/| /' conftest.$ac_ext >&5 4730 4731 lt_cv_prog_cc_pic_works=no 4732 4733 fi 4734 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 5169 lt_cv_prog_cc_pic_works=no 5170 5171 fi 5172 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4735 5173 CFLAGS="$save_CFLAGS" 4736 5174 … … 4745 5183 fi 4746 5184 4747 echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&54748 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 5185 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_pic_works" >&5 5186 $as_echo "$lt_cv_prog_cc_pic_works" >&6; } 4749 5187 fi 4750 5188 4751 5189 # Check for any special shared library compilation flags. 4752 5190 if test -n "$lt_cv_prog_cc_shlib"; then 4753 { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&54754 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}5191 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 5192 $as_echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} 4755 5193 if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : 4756 5194 else 4757 { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&54758 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}5195 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 5196 $as_echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} 4759 5197 lt_cv_prog_cc_can_build_shared=no 4760 5198 fi 4761 5199 fi 4762 5200 4763 echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&54764 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 4765 if test "${lt_cv_prog_cc_static_works+set}" = set; then 4766 echo $ECHO_N "(cached) $ECHO_C" >&65201 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 5202 $as_echo_n "checking if $compiler static flag $lt_cv_prog_cc_static works... " >&6; } 5203 if test "${lt_cv_prog_cc_static_works+set}" = set; then : 5204 $as_echo_n "(cached) " >&6 4767 5205 else 4768 5206 lt_cv_prog_cc_static_works=no 4769 5207 save_LDFLAGS="$LDFLAGS" 4770 5208 LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" 4771 cat >conftest.$ac_ext <<_ACEOF 4772 /* confdefs.h. */ 4773 _ACEOF 4774 cat confdefs.h >>conftest.$ac_ext 4775 cat >>conftest.$ac_ext <<_ACEOF 5209 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4776 5210 /* end confdefs.h. */ 4777 5211 … … 4784 5218 } 4785 5219 _ACEOF 4786 rm -f conftest.$ac_objext conftest$ac_exeext 4787 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4788 (eval $ac_link) 2>conftest.er1 4789 ac_status=$? 4790 grep -v '^ *+' conftest.er1 >conftest.err 4791 rm -f conftest.er1 4792 cat conftest.err >&5 4793 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4794 (exit $ac_status); } && 4795 { ac_try='test -z "$ac_c_werror_flag" 4796 || test ! -s conftest.err' 4797 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4798 (eval $ac_try) 2>&5 4799 ac_status=$? 4800 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4801 (exit $ac_status); }; } && 4802 { ac_try='test -s conftest$ac_exeext' 4803 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4804 (eval $ac_try) 2>&5 4805 ac_status=$? 4806 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4807 (exit $ac_status); }; }; then 5220 if ac_fn_c_try_link "$LINENO"; then : 4808 5221 lt_cv_prog_cc_static_works=yes 4809 else 4810 echo "$as_me: failed program was:" >&5 4811 sed 's/^/| /' conftest.$ac_ext >&5 4812 4813 fi 4814 rm -f conftest.err conftest.$ac_objext \ 4815 conftest$ac_exeext conftest.$ac_ext 5222 fi 5223 rm -f core conftest.err conftest.$ac_objext \ 5224 conftest$ac_exeext conftest.$ac_ext 4816 5225 LDFLAGS="$save_LDFLAGS" 4817 5226 … … 4821 5230 # Belt *and* braces to stop my trousers falling down: 4822 5231 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= 4823 echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&54824 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 5232 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_static_works" >&5 5233 $as_echo "$lt_cv_prog_cc_static_works" >&6; } 4825 5234 4826 5235 pic_flag="$lt_cv_prog_cc_pic" … … 4833 5242 4834 5243 # Check to see if options -o and -c are simultaneously supported by compiler 4835 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&54836 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 4837 if test "${lt_cv_compiler_c_o+set}" = set; then 4838 echo $ECHO_N "(cached) $ECHO_C" >&65244 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 5245 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } 5246 if test "${lt_cv_compiler_c_o+set}" = set; then : 5247 $as_echo_n "(cached) " >&6 4839 5248 else 4840 5249 … … 4853 5262 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" 4854 5263 compiler_c_o=no 4855 if { (eval echo configure: 4855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then5264 if { (eval echo configure:5264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then 4856 5265 # The compiler can only warn and ignore the option if not recognized 4857 5266 # So say no if there are warnings … … 4877 5286 4878 5287 compiler_c_o=$lt_cv_compiler_c_o 4879 echo "$as_me:$LINENO: result: $compiler_c_o" >&54880 echo "${ECHO_T}$compiler_c_o" >&6 5288 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_c_o" >&5 5289 $as_echo "$compiler_c_o" >&6; } 4881 5290 4882 5291 if test x"$compiler_c_o" = x"yes"; then 4883 5292 # Check to see if we can write to a .lo 4884 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&54885 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 4886 if test "${lt_cv_compiler_o_lo+set}" = set; then 4887 echo $ECHO_N "(cached) $ECHO_C" >&65293 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.lo" >&5 5294 $as_echo_n "checking if $compiler supports -c -o file.lo... " >&6; } 5295 if test "${lt_cv_compiler_o_lo+set}" = set; then : 5296 $as_echo_n "(cached) " >&6 4888 5297 else 4889 5298 … … 4893 5302 save_objext="$ac_objext" 4894 5303 ac_objext=lo 4895 cat >conftest.$ac_ext <<_ACEOF 4896 /* confdefs.h. */ 4897 _ACEOF 4898 cat confdefs.h >>conftest.$ac_ext 4899 cat >>conftest.$ac_ext <<_ACEOF 5304 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4900 5305 /* end confdefs.h. */ 4901 5306 … … 4908 5313 } 4909 5314 _ACEOF 4910 rm -f conftest.$ac_objext 4911 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4912 (eval $ac_compile) 2>conftest.er1 4913 ac_status=$? 4914 grep -v '^ *+' conftest.er1 >conftest.err 4915 rm -f conftest.er1 4916 cat conftest.err >&5 4917 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4918 (exit $ac_status); } && 4919 { ac_try='test -z "$ac_c_werror_flag" 4920 || test ! -s conftest.err' 4921 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4922 (eval $ac_try) 2>&5 4923 ac_status=$? 4924 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4925 (exit $ac_status); }; } && 4926 { ac_try='test -s conftest.$ac_objext' 4927 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4928 (eval $ac_try) 2>&5 4929 ac_status=$? 4930 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4931 (exit $ac_status); }; }; then 5315 if ac_fn_c_try_compile "$LINENO"; then : 4932 5316 # The compiler can only warn and ignore the option if not recognized 4933 5317 # So say no if there are warnings … … 4938 5322 fi 4939 5323 4940 else 4941 echo "$as_me: failed program was:" >&5 4942 sed 's/^/| /' conftest.$ac_ext >&5 4943 4944 fi 4945 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 5324 fi 5325 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4946 5326 ac_objext="$save_objext" 4947 5327 CFLAGS="$save_CFLAGS" … … 4950 5330 4951 5331 compiler_o_lo=$lt_cv_compiler_o_lo 4952 echo "$as_me:$LINENO: result: $compiler_o_lo" >&54953 echo "${ECHO_T}$compiler_o_lo" >&6 5332 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_o_lo" >&5 5333 $as_echo "$compiler_o_lo" >&6; } 4954 5334 else 4955 5335 compiler_o_lo=no … … 4960 5340 if test "$compiler_c_o" = no && test "$need_locks" != no; then 4961 5341 # do not overwrite the value of need_locks provided by the user 4962 echo "$as_me:$LINENO: checking if we can lock with hard links" >&54963 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 5342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 5343 $as_echo_n "checking if we can lock with hard links... " >&6; } 4964 5344 hard_links=yes 4965 5345 $rm conftest* … … 4968 5348 ln conftest.a conftest.b 2>&5 || hard_links=no 4969 5349 ln conftest.a conftest.b 2>/dev/null && hard_links=no 4970 echo "$as_me:$LINENO: result: $hard_links" >&54971 echo "${ECHO_T}$hard_links" >&6 5350 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 5351 $as_echo "$hard_links" >&6; } 4972 5352 if test "$hard_links" = no; then 4973 { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&54974 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}5353 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 5354 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} 4975 5355 need_locks=warn 4976 5356 fi … … 4981 5361 if test "$GCC" = yes; then 4982 5362 # Check to see if options -fno-rtti -fno-exceptions are supported by compiler 4983 echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&54984 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 5363 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 5364 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } 4985 5365 echo "int some_variable = 0;" > conftest.$ac_ext 4986 5366 save_CFLAGS="$CFLAGS" 4987 5367 CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" 4988 5368 compiler_rtti_exceptions=no 4989 cat >conftest.$ac_ext <<_ACEOF 4990 /* confdefs.h. */ 4991 _ACEOF 4992 cat confdefs.h >>conftest.$ac_ext 4993 cat >>conftest.$ac_ext <<_ACEOF 5369 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4994 5370 /* end confdefs.h. */ 4995 5371 … … 5002 5378 } 5003 5379 _ACEOF 5004 rm -f conftest.$ac_objext 5005 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 5006 (eval $ac_compile) 2>conftest.er1 5007 ac_status=$? 5008 grep -v '^ *+' conftest.er1 >conftest.err 5009 rm -f conftest.er1 5010 cat conftest.err >&5 5011 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5012 (exit $ac_status); } && 5013 { ac_try='test -z "$ac_c_werror_flag" 5014 || test ! -s conftest.err' 5015 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5016 (eval $ac_try) 2>&5 5017 ac_status=$? 5018 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5019 (exit $ac_status); }; } && 5020 { ac_try='test -s conftest.$ac_objext' 5021 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5022 (eval $ac_try) 2>&5 5023 ac_status=$? 5024 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5025 (exit $ac_status); }; }; then 5380 if ac_fn_c_try_compile "$LINENO"; then : 5026 5381 # The compiler can only warn and ignore the option if not recognized 5027 5382 # So say no if there are warnings … … 5032 5387 fi 5033 5388 5034 else 5035 echo "$as_me: failed program was:" >&5 5036 sed 's/^/| /' conftest.$ac_ext >&5 5037 5038 fi 5039 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 5389 fi 5390 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 5040 5391 CFLAGS="$save_CFLAGS" 5041 echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&55042 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 5392 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_rtti_exceptions" >&5 5393 $as_echo "$compiler_rtti_exceptions" >&6; } 5043 5394 5044 5395 if test "$compiler_rtti_exceptions" = "yes"; then … … 5050 5401 5051 5402 # See if the linker supports building shared libraries. 5052 echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&55053 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 5403 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker ($LD) supports shared libraries" >&5 5404 $as_echo_n "checking whether the linker ($LD) supports shared libraries... " >&6; } 5054 5405 5055 5406 allow_undefined_flag= … … 5742 6093 esac 5743 6094 fi 5744 echo "$as_me:$LINENO: result: $ld_shlibs" >&55745 echo "${ECHO_T}$ld_shlibs" >&6 6095 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 6096 $as_echo "$ld_shlibs" >&6; } 5746 6097 test "$ld_shlibs" = no && can_build_shared=no 5747 6098 5748 6099 # Check hardcoding attributes. 5749 echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&55750 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 6100 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 6101 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } 5751 6102 hardcode_action= 5752 6103 if test -n "$hardcode_libdir_flag_spec" || \ … … 5771 6122 hardcode_action=unsupported 5772 6123 fi 5773 echo "$as_me:$LINENO: result: $hardcode_action" >&55774 echo "${ECHO_T}$hardcode_action" >&6 6124 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 6125 $as_echo "$hardcode_action" >&6; } 5775 6126 5776 6127 striplib= 5777 6128 old_striplib= 5778 echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&55779 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 6129 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 6130 $as_echo_n "checking whether stripping libraries is possible... " >&6; } 5780 6131 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then 5781 6132 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" 5782 6133 test -z "$striplib" && striplib="$STRIP --strip-unneeded" 5783 echo "$as_me:$LINENO: result: yes" >&55784 echo "${ECHO_T}yes" >&6 5785 else 5786 echo "$as_me:$LINENO: result: no" >&55787 echo "${ECHO_T}no" >&6 6134 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 6135 $as_echo "yes" >&6; } 6136 else 6137 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6138 $as_echo "no" >&6; } 5788 6139 fi 5789 6140 … … 5792 6143 5793 6144 # PORTME Fill in your ld.so characteristics 5794 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&55795 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 6145 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 6146 $as_echo_n "checking dynamic linker characteristics... " >&6; } 5796 6147 library_names_spec= 5797 6148 libname_spec='lib$name' … … 6194 6545 ;; 6195 6546 esac 6196 echo "$as_me:$LINENO: result: $dynamic_linker" >&56197 echo "${ECHO_T}$dynamic_linker" >&6 6547 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 6548 $as_echo "$dynamic_linker" >&6; } 6198 6549 test "$dynamic_linker" = no && can_build_shared=no 6199 6550 6200 6551 # Report the final consequences. 6201 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&56202 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 6203 echo "$as_me:$LINENO: result: $can_build_shared" >&56204 echo "${ECHO_T}$can_build_shared" >&6 6205 6206 echo "$as_me:$LINENO: checking whether to build shared libraries" >&56207 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 6552 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 6553 $as_echo_n "checking if libtool supports shared libraries... " >&6; } 6554 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 6555 $as_echo "$can_build_shared" >&6; } 6556 6557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 6558 $as_echo_n "checking whether to build shared libraries... " >&6; } 6208 6559 test "$can_build_shared" = "no" && enable_shared=no 6209 6560 … … 6225 6576 ;; 6226 6577 esac 6227 echo "$as_me:$LINENO: result: $enable_shared" >&56228 echo "${ECHO_T}$enable_shared" >&6 6229 6230 echo "$as_me:$LINENO: checking whether to build static libraries" >&56231 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 6578 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 6579 $as_echo "$enable_shared" >&6; } 6580 6581 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 6582 $as_echo_n "checking whether to build static libraries... " >&6; } 6232 6583 # Make sure either enable_shared or enable_static is yes. 6233 6584 test "$enable_shared" = yes || enable_static=yes 6234 echo "$as_me:$LINENO: result: $enable_static" >&56235 echo "${ECHO_T}$enable_static" >&6 6585 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 6586 $as_echo "$enable_static" >&6; } 6236 6587 6237 6588 if test "$hardcode_action" = relink; then … … 6270 6621 6271 6622 *) 6272 echo "$as_me:$LINENO: checking for shl_load" >&5 6273 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 6274 if test "${ac_cv_func_shl_load+set}" = set; then 6275 echo $ECHO_N "(cached) $ECHO_C" >&6 6276 else 6277 cat >conftest.$ac_ext <<_ACEOF 6278 /* confdefs.h. */ 6279 _ACEOF 6280 cat confdefs.h >>conftest.$ac_ext 6281 cat >>conftest.$ac_ext <<_ACEOF 6623 ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" 6624 if test "x$ac_cv_func_shl_load" = x""yes; then : 6625 lt_cv_dlopen="shl_load" 6626 else 6627 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 6628 $as_echo_n "checking for shl_load in -ldld... " >&6; } 6629 if test "${ac_cv_lib_dld_shl_load+set}" = set; then : 6630 $as_echo_n "(cached) " >&6 6631 else 6632 ac_check_lib_save_LIBS=$LIBS 6633 LIBS="-ldld $LIBS" 6634 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6282 6635 /* end confdefs.h. */ 6283 /* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. 6284 For example, HP-UX 11i <limits.h> declares gettimeofday. */ 6285 #define shl_load innocuous_shl_load 6286 6287 /* System header to define __stub macros and hopefully few prototypes, 6288 which can conflict with char shl_load (); below. 6289 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 6290 <limits.h> exists even on freestanding compilers. */ 6291 6292 #ifdef __STDC__ 6293 # include <limits.h> 6294 #else 6295 # include <assert.h> 6296 #endif 6297 6298 #undef shl_load 6299 6300 /* Override any gcc2 internal prototype to avoid an error. */ 6636 6637 /* Override any GCC internal prototype to avoid an error. 6638 Use char because int might match the return type of a GCC 6639 builtin and then its argument prototype would still apply. */ 6301 6640 #ifdef __cplusplus 6302 6641 extern "C" 6303 {6304 6642 #endif 6305 /* We use char because int might match the return type of a gcc26306 builtin and then its argument prototype would still apply. */6307 6643 char shl_load (); 6308 /* The GNU C library defines this for functions which it implements6309 to always fail with ENOSYS. Some functions are actually named6310 something starting with __ and the normal name is an alias. */6311 #if defined (__stub_shl_load) || defined (__stub___shl_load)6312 choke me6313 #else6314 char (*f) () = shl_load;6315 #endif6316 #ifdef __cplusplus6317 }6318 #endif6319 6320 6644 int 6321 6645 main () 6322 6646 { 6323 return f != shl_load;6647 return shl_load (); 6324 6648 ; 6325 6649 return 0; 6326 6650 } 6327 6651 _ACEOF 6328 rm -f conftest.$ac_objext conftest$ac_exeext 6329 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6330 (eval $ac_link) 2>conftest.er1 6331 ac_status=$? 6332 grep -v '^ *+' conftest.er1 >conftest.err 6333 rm -f conftest.er1 6334 cat conftest.err >&5 6335 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6336 (exit $ac_status); } && 6337 { ac_try='test -z "$ac_c_werror_flag" 6338 || test ! -s conftest.err' 6339 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6340 (eval $ac_try) 2>&5 6341 ac_status=$? 6342 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6343 (exit $ac_status); }; } && 6344 { ac_try='test -s conftest$ac_exeext' 6345 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6346 (eval $ac_try) 2>&5 6347 ac_status=$? 6348 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6349 (exit $ac_status); }; }; then 6350 ac_cv_func_shl_load=yes 6351 else 6352 echo "$as_me: failed program was:" >&5 6353 sed 's/^/| /' conftest.$ac_ext >&5 6354 6355 ac_cv_func_shl_load=no 6356 fi 6357 rm -f conftest.err conftest.$ac_objext \ 6358 conftest$ac_exeext conftest.$ac_ext 6359 fi 6360 echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 6361 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 6362 if test $ac_cv_func_shl_load = yes; then 6363 lt_cv_dlopen="shl_load" 6364 else 6365 echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 6366 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 6367 if test "${ac_cv_lib_dld_shl_load+set}" = set; then 6368 echo $ECHO_N "(cached) $ECHO_C" >&6 6652 if ac_fn_c_try_link "$LINENO"; then : 6653 ac_cv_lib_dld_shl_load=yes 6654 else 6655 ac_cv_lib_dld_shl_load=no 6656 fi 6657 rm -f core conftest.err conftest.$ac_objext \ 6658 conftest$ac_exeext conftest.$ac_ext 6659 LIBS=$ac_check_lib_save_LIBS 6660 fi 6661 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 6662 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } 6663 if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : 6664 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" 6665 else 6666 ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" 6667 if test "x$ac_cv_func_dlopen" = x""yes; then : 6668 lt_cv_dlopen="dlopen" 6669 else 6670 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 6671 $as_echo_n "checking for dlopen in -ldl... " >&6; } 6672 if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 6673 $as_echo_n "(cached) " >&6 6369 6674 else 6370 6675 ac_check_lib_save_LIBS=$LIBS 6371 LIBS="-ldld $LIBS" 6372 cat >conftest.$ac_ext <<_ACEOF 6373 /* confdefs.h. */ 6374 _ACEOF 6375 cat confdefs.h >>conftest.$ac_ext 6376 cat >>conftest.$ac_ext <<_ACEOF 6676 LIBS="-ldl $LIBS" 6677 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6377 6678 /* end confdefs.h. */ 6378 6679 6379 /* Override any gcc2 internal prototype to avoid an error. */ 6680 /* Override any GCC internal prototype to avoid an error. 6681 Use char because int might match the return type of a GCC 6682 builtin and then its argument prototype would still apply. */ 6380 6683 #ifdef __cplusplus 6381 6684 extern "C" 6382 6685 #endif 6383 /* We use char because int might match the return type of a gcc2 6384 builtin and then its argument prototype would still apply. */ 6385 char shl_load (); 6686 char dlopen (); 6386 6687 int 6387 6688 main () 6388 6689 { 6389 shl_load();6690 return dlopen (); 6390 6691 ; 6391 6692 return 0; 6392 6693 } 6393 6694 _ACEOF 6394 rm -f conftest.$ac_objext conftest$ac_exeext 6395 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6396 (eval $ac_link) 2>conftest.er1 6397 ac_status=$? 6398 grep -v '^ *+' conftest.er1 >conftest.err 6399 rm -f conftest.er1 6400 cat conftest.err >&5 6401 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6402 (exit $ac_status); } && 6403 { ac_try='test -z "$ac_c_werror_flag" 6404 || test ! -s conftest.err' 6405 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6406 (eval $ac_try) 2>&5 6407 ac_status=$? 6408 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6409 (exit $ac_status); }; } && 6410 { ac_try='test -s conftest$ac_exeext' 6411 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6412 (eval $ac_try) 2>&5 6413 ac_status=$? 6414 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6415 (exit $ac_status); }; }; then 6416 ac_cv_lib_dld_shl_load=yes 6417 else 6418 echo "$as_me: failed program was:" >&5 6419 sed 's/^/| /' conftest.$ac_ext >&5 6420 6421 ac_cv_lib_dld_shl_load=no 6422 fi 6423 rm -f conftest.err conftest.$ac_objext \ 6424 conftest$ac_exeext conftest.$ac_ext 6695 if ac_fn_c_try_link "$LINENO"; then : 6696 ac_cv_lib_dl_dlopen=yes 6697 else 6698 ac_cv_lib_dl_dlopen=no 6699 fi 6700 rm -f core conftest.err conftest.$ac_objext \ 6701 conftest$ac_exeext conftest.$ac_ext 6425 6702 LIBS=$ac_check_lib_save_LIBS 6426 6703 fi 6427 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 6428 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 6429 if test $ac_cv_lib_dld_shl_load = yes; then 6430 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" 6431 else 6432 echo "$as_me:$LINENO: checking for dlopen" >&5 6433 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 6434 if test "${ac_cv_func_dlopen+set}" = set; then 6435 echo $ECHO_N "(cached) $ECHO_C" >&6 6436 else 6437 cat >conftest.$ac_ext <<_ACEOF 6438 /* confdefs.h. */ 6439 _ACEOF 6440 cat confdefs.h >>conftest.$ac_ext 6441 cat >>conftest.$ac_ext <<_ACEOF 6704 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 6705 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 6706 if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 6707 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" 6708 else 6709 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 6710 $as_echo_n "checking for dlopen in -lsvld... " >&6; } 6711 if test "${ac_cv_lib_svld_dlopen+set}" = set; then : 6712 $as_echo_n "(cached) " >&6 6713 else 6714 ac_check_lib_save_LIBS=$LIBS 6715 LIBS="-lsvld $LIBS" 6716 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6442 6717 /* end confdefs.h. */ 6443 /* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. 6444 For example, HP-UX 11i <limits.h> declares gettimeofday. */ 6445 #define dlopen innocuous_dlopen 6446 6447 /* System header to define __stub macros and hopefully few prototypes, 6448 which can conflict with char dlopen (); below. 6449 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 6450 <limits.h> exists even on freestanding compilers. */ 6451 6452 #ifdef __STDC__ 6453 # include <limits.h> 6454 #else 6455 # include <assert.h> 6456 #endif 6457 6458 #undef dlopen 6459 6460 /* Override any gcc2 internal prototype to avoid an error. */ 6718 6719 /* Override any GCC internal prototype to avoid an error. 6720 Use char because int might match the return type of a GCC 6721 builtin and then its argument prototype would still apply. */ 6461 6722 #ifdef __cplusplus 6462 6723 extern "C" 6463 {6464 6724 #endif 6465 /* We use char because int might match the return type of a gcc26466 builtin and then its argument prototype would still apply. */6467 6725 char dlopen (); 6468 /* The GNU C library defines this for functions which it implements6469 to always fail with ENOSYS. Some functions are actually named6470 something starting with __ and the normal name is an alias. */6471 #if defined (__stub_dlopen) || defined (__stub___dlopen)6472 choke me6473 #else6474 char (*f) () = dlopen;6475 #endif6476 #ifdef __cplusplus6477 }6478 #endif6479 6480 6726 int 6481 6727 main () 6482 6728 { 6483 return f != dlopen;6729 return dlopen (); 6484 6730 ; 6485 6731 return 0; 6486 6732 } 6487 6733 _ACEOF 6488 rm -f conftest.$ac_objext conftest$ac_exeext 6489 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6490 (eval $ac_link) 2>conftest.er1 6491 ac_status=$? 6492 grep -v '^ *+' conftest.er1 >conftest.err 6493 rm -f conftest.er1 6494 cat conftest.err >&5 6495 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6496 (exit $ac_status); } && 6497 { ac_try='test -z "$ac_c_werror_flag" 6498 || test ! -s conftest.err' 6499 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6500 (eval $ac_try) 2>&5 6501 ac_status=$? 6502 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6503 (exit $ac_status); }; } && 6504 { ac_try='test -s conftest$ac_exeext' 6505 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6506 (eval $ac_try) 2>&5 6507 ac_status=$? 6508 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6509 (exit $ac_status); }; }; then 6510 ac_cv_func_dlopen=yes 6511 else 6512 echo "$as_me: failed program was:" >&5 6513 sed 's/^/| /' conftest.$ac_ext >&5 6514 6515 ac_cv_func_dlopen=no 6516 fi 6517 rm -f conftest.err conftest.$ac_objext \ 6518 conftest$ac_exeext conftest.$ac_ext 6519 fi 6520 echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 6521 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 6522 if test $ac_cv_func_dlopen = yes; then 6523 lt_cv_dlopen="dlopen" 6524 else 6525 echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 6526 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 6527 if test "${ac_cv_lib_dl_dlopen+set}" = set; then 6528 echo $ECHO_N "(cached) $ECHO_C" >&6 6734 if ac_fn_c_try_link "$LINENO"; then : 6735 ac_cv_lib_svld_dlopen=yes 6736 else 6737 ac_cv_lib_svld_dlopen=no 6738 fi 6739 rm -f core conftest.err conftest.$ac_objext \ 6740 conftest$ac_exeext conftest.$ac_ext 6741 LIBS=$ac_check_lib_save_LIBS 6742 fi 6743 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 6744 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } 6745 if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : 6746 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" 6747 else 6748 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 6749 $as_echo_n "checking for dld_link in -ldld... " >&6; } 6750 if test "${ac_cv_lib_dld_dld_link+set}" = set; then : 6751 $as_echo_n "(cached) " >&6 6529 6752 else 6530 6753 ac_check_lib_save_LIBS=$LIBS 6531 LIBS="-ldl $LIBS" 6532 cat >conftest.$ac_ext <<_ACEOF 6533 /* confdefs.h. */ 6534 _ACEOF 6535 cat confdefs.h >>conftest.$ac_ext 6536 cat >>conftest.$ac_ext <<_ACEOF 6754 LIBS="-ldld $LIBS" 6755 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6537 6756 /* end confdefs.h. */ 6538 6757 6539 /* Override any gcc2 internal prototype to avoid an error. */ 6758 /* Override any GCC internal prototype to avoid an error. 6759 Use char because int might match the return type of a GCC 6760 builtin and then its argument prototype would still apply. */ 6540 6761 #ifdef __cplusplus 6541 6762 extern "C" 6542 6763 #endif 6543 /* We use char because int might match the return type of a gcc2 6544 builtin and then its argument prototype would still apply. */ 6545 char dlopen (); 6764 char dld_link (); 6546 6765 int 6547 6766 main () 6548 6767 { 6549 dlopen();6768 return dld_link (); 6550 6769 ; 6551 6770 return 0; 6552 6771 } 6553 6772 _ACEOF 6554 rm -f conftest.$ac_objext conftest$ac_exeext 6555 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6556 (eval $ac_link) 2>conftest.er1 6557 ac_status=$? 6558 grep -v '^ *+' conftest.er1 >conftest.err 6559 rm -f conftest.er1 6560 cat conftest.err >&5 6561 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6562 (exit $ac_status); } && 6563 { ac_try='test -z "$ac_c_werror_flag" 6564 || test ! -s conftest.err' 6565 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6566 (eval $ac_try) 2>&5 6567 ac_status=$? 6568 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6569 (exit $ac_status); }; } && 6570 { ac_try='test -s conftest$ac_exeext' 6571 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6572 (eval $ac_try) 2>&5 6573 ac_status=$? 6574 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6575 (exit $ac_status); }; }; then 6576 ac_cv_lib_dl_dlopen=yes 6577 else 6578 echo "$as_me: failed program was:" >&5 6579 sed 's/^/| /' conftest.$ac_ext >&5 6580 6581 ac_cv_lib_dl_dlopen=no 6582 fi 6583 rm -f conftest.err conftest.$ac_objext \ 6584 conftest$ac_exeext conftest.$ac_ext 6773 if ac_fn_c_try_link "$LINENO"; then : 6774 ac_cv_lib_dld_dld_link=yes 6775 else 6776 ac_cv_lib_dld_dld_link=no 6777 fi 6778 rm -f core conftest.err conftest.$ac_objext \ 6779 conftest$ac_exeext conftest.$ac_ext 6585 6780 LIBS=$ac_check_lib_save_LIBS 6586 6781 fi 6587 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 6588 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 6589 if test $ac_cv_lib_dl_dlopen = yes; then 6590 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" 6591 else 6592 echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 6593 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 6594 if test "${ac_cv_lib_svld_dlopen+set}" = set; then 6595 echo $ECHO_N "(cached) $ECHO_C" >&6 6596 else 6597 ac_check_lib_save_LIBS=$LIBS 6598 LIBS="-lsvld $LIBS" 6599 cat >conftest.$ac_ext <<_ACEOF 6600 /* confdefs.h. */ 6601 _ACEOF 6602 cat confdefs.h >>conftest.$ac_ext 6603 cat >>conftest.$ac_ext <<_ACEOF 6604 /* end confdefs.h. */ 6605 6606 /* Override any gcc2 internal prototype to avoid an error. */ 6607 #ifdef __cplusplus 6608 extern "C" 6609 #endif 6610 /* We use char because int might match the return type of a gcc2 6611 builtin and then its argument prototype would still apply. */ 6612 char dlopen (); 6613 int 6614 main () 6615 { 6616 dlopen (); 6617 ; 6618 return 0; 6619 } 6620 _ACEOF 6621 rm -f conftest.$ac_objext conftest$ac_exeext 6622 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6623 (eval $ac_link) 2>conftest.er1 6624 ac_status=$? 6625 grep -v '^ *+' conftest.er1 >conftest.err 6626 rm -f conftest.er1 6627 cat conftest.err >&5 6628 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6629 (exit $ac_status); } && 6630 { ac_try='test -z "$ac_c_werror_flag" 6631 || test ! -s conftest.err' 6632 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6633 (eval $ac_try) 2>&5 6634 ac_status=$? 6635 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6636 (exit $ac_status); }; } && 6637 { ac_try='test -s conftest$ac_exeext' 6638 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6639 (eval $ac_try) 2>&5 6640 ac_status=$? 6641 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6642 (exit $ac_status); }; }; then 6643 ac_cv_lib_svld_dlopen=yes 6644 else 6645 echo "$as_me: failed program was:" >&5 6646 sed 's/^/| /' conftest.$ac_ext >&5 6647 6648 ac_cv_lib_svld_dlopen=no 6649 fi 6650 rm -f conftest.err conftest.$ac_objext \ 6651 conftest$ac_exeext conftest.$ac_ext 6652 LIBS=$ac_check_lib_save_LIBS 6653 fi 6654 echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 6655 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 6656 if test $ac_cv_lib_svld_dlopen = yes; then 6657 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" 6658 else 6659 echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 6660 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 6661 if test "${ac_cv_lib_dld_dld_link+set}" = set; then 6662 echo $ECHO_N "(cached) $ECHO_C" >&6 6663 else 6664 ac_check_lib_save_LIBS=$LIBS 6665 LIBS="-ldld $LIBS" 6666 cat >conftest.$ac_ext <<_ACEOF 6667 /* confdefs.h. */ 6668 _ACEOF 6669 cat confdefs.h >>conftest.$ac_ext 6670 cat >>conftest.$ac_ext <<_ACEOF 6671 /* end confdefs.h. */ 6672 6673 /* Override any gcc2 internal prototype to avoid an error. */ 6674 #ifdef __cplusplus 6675 extern "C" 6676 #endif 6677 /* We use char because int might match the return type of a gcc2 6678 builtin and then its argument prototype would still apply. */ 6679 char dld_link (); 6680 int 6681 main () 6682 { 6683 dld_link (); 6684 ; 6685 return 0; 6686 } 6687 _ACEOF 6688 rm -f conftest.$ac_objext conftest$ac_exeext 6689 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6690 (eval $ac_link) 2>conftest.er1 6691 ac_status=$? 6692 grep -v '^ *+' conftest.er1 >conftest.err 6693 rm -f conftest.er1 6694 cat conftest.err >&5 6695 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6696 (exit $ac_status); } && 6697 { ac_try='test -z "$ac_c_werror_flag" 6698 || test ! -s conftest.err' 6699 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6700 (eval $ac_try) 2>&5 6701 ac_status=$? 6702 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6703 (exit $ac_status); }; } && 6704 { ac_try='test -s conftest$ac_exeext' 6705 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6706 (eval $ac_try) 2>&5 6707 ac_status=$? 6708 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6709 (exit $ac_status); }; }; then 6710 ac_cv_lib_dld_dld_link=yes 6711 else 6712 echo "$as_me: failed program was:" >&5 6713 sed 's/^/| /' conftest.$ac_ext >&5 6714 6715 ac_cv_lib_dld_dld_link=no 6716 fi 6717 rm -f conftest.err conftest.$ac_objext \ 6718 conftest$ac_exeext conftest.$ac_ext 6719 LIBS=$ac_check_lib_save_LIBS 6720 fi 6721 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 6722 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 6723 if test $ac_cv_lib_dld_dld_link = yes; then 6782 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 6783 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } 6784 if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : 6724 6785 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" 6725 6786 fi … … 6760 6821 LIBS="$lt_cv_dlopen_libs $LIBS" 6761 6822 6762 echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&56763 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 6764 if test "${lt_cv_dlopen_self+set}" = set; then 6765 echo $ECHO_N "(cached) $ECHO_C" >&66823 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 6824 $as_echo_n "checking whether a program can dlopen itself... " >&6; } 6825 if test "${lt_cv_dlopen_self+set}" = set; then : 6826 $as_echo_n "(cached) " >&6 6766 6827 else 6767 6828 if test "$cross_compiling" = yes; then : … … 6771 6832 lt_status=$lt_dlunknown 6772 6833 cat > conftest.$ac_ext <<EOF 6773 #line 6 773"configure"6834 #line 6834 "configure" 6774 6835 #include "confdefs.h" 6775 6836 … … 6832 6893 } 6833 6894 EOF 6834 if { (eval echo "$as_me:$LINENO: \"$ac_link\"")>&56895 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6835 6896 (eval $ac_link) 2>&5 6836 6897 ac_status=$? 6837 echo "$as_me:$LINENO: \$? = $ac_status" >&56838 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then6898 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 6899 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then 6839 6900 (./conftest; exit; ) 2>/dev/null 6840 6901 lt_status=$? … … 6853 6914 6854 6915 fi 6855 echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&56856 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 6916 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 6917 $as_echo "$lt_cv_dlopen_self" >&6; } 6857 6918 6858 6919 if test "x$lt_cv_dlopen_self" = xyes; then 6859 6920 LDFLAGS="$LDFLAGS $link_static_flag" 6860 echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&56861 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 6862 if test "${lt_cv_dlopen_self_static+set}" = set; then 6863 echo $ECHO_N "(cached) $ECHO_C" >&66921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 6922 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } 6923 if test "${lt_cv_dlopen_self_static+set}" = set; then : 6924 $as_echo_n "(cached) " >&6 6864 6925 else 6865 6926 if test "$cross_compiling" = yes; then : … … 6869 6930 lt_status=$lt_dlunknown 6870 6931 cat > conftest.$ac_ext <<EOF 6871 #line 6 871"configure"6932 #line 6932 "configure" 6872 6933 #include "confdefs.h" 6873 6934 … … 6930 6991 } 6931 6992 EOF 6932 if { (eval echo "$as_me:$LINENO: \"$ac_link\"")>&56993 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6933 6994 (eval $ac_link) 2>&5 6934 6995 ac_status=$? 6935 echo "$as_me:$LINENO: \$? = $ac_status" >&56936 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then6996 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 6997 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then 6937 6998 (./conftest; exit; ) 2>/dev/null 6938 6999 lt_status=$? … … 6951 7012 6952 7013 fi 6953 echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&56954 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 7014 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 7015 $as_echo "$lt_cv_dlopen_self_static" >&6; } 6955 7016 fi 6956 7017 … … 6982 7043 # systems, -lgcc has to come before -lc. If gcc already passes -lc 6983 7044 # to ld, don't add -lc before -lgcc. 6984 echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&56985 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 6986 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then 6987 echo $ECHO_N "(cached) $ECHO_C" >&67045 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 7046 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } 7047 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : 7048 $as_echo_n "(cached) " >&6 6988 7049 else 6989 7050 $rm conftest* 6990 7051 echo 'static int dummy;' > conftest.$ac_ext 6991 7052 6992 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"")>&57053 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 6993 7054 (eval $ac_compile) 2>&5 6994 7055 ac_status=$? 6995 echo "$as_me:$LINENO: \$? = $ac_status" >&56996 (exit $ac_status); }; then7056 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 7057 test $ac_status = 0; }; then 6997 7058 soname=conftest 6998 7059 lib=conftest … … 7007 7068 save_allow_undefined_flag=$allow_undefined_flag 7008 7069 allow_undefined_flag= 7009 if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"")>&57070 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5 7010 7071 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 7011 7072 ac_status=$? 7012 echo "$as_me:$LINENO: \$? = $ac_status" >&57013 (exit $ac_status); }7073 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 7074 test $ac_status = 0; } 7014 7075 then 7015 7076 lt_cv_archive_cmds_need_lc=no … … 7023 7084 fi 7024 7085 7025 echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&57026 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 7086 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 7087 $as_echo "$lt_cv_archive_cmds_need_lc" >&6; } 7027 7088 ;; 7028 7089 esac … … 7599 7660 # Extract the first word of "perl", so it can be a program name with args. 7600 7661 set dummy perl; ac_word=$2 7601 echo "$as_me:$LINENO: checking for $ac_word" >&57602 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 7603 if test "${ac_cv_path_PERL+set}" = set; then 7604 echo $ECHO_N "(cached) $ECHO_C" >&67662 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7663 $as_echo_n "checking for $ac_word... " >&6; } 7664 if test "${ac_cv_path_PERL+set}" = set; then : 7665 $as_echo_n "(cached) " >&6 7605 7666 else 7606 7667 case $PERL in … … 7614 7675 IFS=$as_save_IFS 7615 7676 test -z "$as_dir" && as_dir=. 7616 for ac_exec_ext in '' $ac_executable_extensions; do7617 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then7677 for ac_exec_ext in '' $ac_executable_extensions; do 7678 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7618 7679 ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" 7619 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&57680 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7620 7681 break 2 7621 7682 fi 7622 7683 done 7623 done 7684 done 7685 IFS=$as_save_IFS 7624 7686 7625 7687 test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl" … … 7628 7690 fi 7629 7691 PERL=$ac_cv_path_PERL 7630 7631 7692 if test -n "$PERL"; then 7632 echo "$as_me:$LINENO: result: $PERL" >&5 7633 echo "${ECHO_T}$PERL" >&6 7634 else 7635 echo "$as_me:$LINENO: result: no" >&5 7636 echo "${ECHO_T}no" >&6 7637 fi 7693 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 7694 $as_echo "$PERL" >&6; } 7695 else 7696 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7697 $as_echo "no" >&6; } 7698 fi 7699 7638 7700 7639 7701 # Extract the first word of "sh", so it can be a program name with args. 7640 7702 set dummy sh; ac_word=$2 7641 echo "$as_me:$LINENO: checking for $ac_word" >&57642 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 7643 if test "${ac_cv_path_SH+set}" = set; then 7644 echo $ECHO_N "(cached) $ECHO_C" >&67703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7704 $as_echo_n "checking for $ac_word... " >&6; } 7705 if test "${ac_cv_path_SH+set}" = set; then : 7706 $as_echo_n "(cached) " >&6 7645 7707 else 7646 7708 case $SH in … … 7654 7716 IFS=$as_save_IFS 7655 7717 test -z "$as_dir" && as_dir=. 7656 for ac_exec_ext in '' $ac_executable_extensions; do7657 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then7718 for ac_exec_ext in '' $ac_executable_extensions; do 7719 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7658 7720 ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext" 7659 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&57721 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7660 7722 break 2 7661 7723 fi 7662 7724 done 7663 done 7725 done 7726 IFS=$as_save_IFS 7664 7727 7665 7728 test -z "$ac_cv_path_SH" && ac_cv_path_SH="/bin/sh" … … 7668 7731 fi 7669 7732 SH=$ac_cv_path_SH 7670 7671 7733 if test -n "$SH"; then 7672 echo "$as_me:$LINENO: result: $SH" >&57673 echo "${ECHO_T}$SH" >&6 7674 else 7675 echo "$as_me:$LINENO: result: no" >&57676 echo "${ECHO_T}no" >&6 7677 fi 7678 7679 7680 echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 7681 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 7682 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. 7683 if test "${enable_maintainer_mode+set}" = set; then 7684 enableval="$enable_maintainer_mode" 7685 USE_MAINTAINER_MODE=$enableval7734 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5 7735 $as_echo "$SH" >&6; } 7736 else 7737 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7738 $as_echo "no" >&6; } 7739 fi 7740 7741 7742 7743 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 7744 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } 7745 # Check whether --enable-maintainer-mode was given. 7746 if test "${enable_maintainer_mode+set}" = set; then : 7747 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval 7686 7748 else 7687 7749 USE_MAINTAINER_MODE=no 7688 fi; 7689 echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 7690 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 7750 fi 7751 7752 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 7753 $as_echo "$USE_MAINTAINER_MODE" >&6; } 7691 7754 7692 7755 … … 7719 7782 7720 7783 7721 # Check whether --with-gnu-ld or --without-gnu-ld was given. 7722 if test "${with_gnu_ld+set}" = set; then 7723 withval="$with_gnu_ld" 7724 test "$withval" = no || with_gnu_ld=yes 7784 # Check whether --with-gnu-ld was given. 7785 if test "${with_gnu_ld+set}" = set; then : 7786 withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes 7725 7787 else 7726 7788 with_gnu_ld=no 7727 fi; 7789 fi 7790 7728 7791 ac_prog=ld 7729 7792 if test "$GCC" = yes; then 7730 7793 # Check if gcc -print-prog-name=ld gives a path. 7731 echo "$as_me:$LINENO: checking for ld used by GCC" >&57732 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 7794 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 7795 $as_echo_n "checking for ld used by GCC... " >&6; } 7733 7796 case $host in 7734 7797 *-*-mingw*) … … 7759 7822 esac 7760 7823 elif test "$with_gnu_ld" = yes; then 7761 echo "$as_me:$LINENO: checking for GNU ld" >&57762 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 7763 else 7764 echo "$as_me:$LINENO: checking for non-GNU ld" >&57765 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 7766 fi 7767 if test "${acl_cv_path_LD+set}" = set; then 7768 echo $ECHO_N "(cached) $ECHO_C" >&67824 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 7825 $as_echo_n "checking for GNU ld... " >&6; } 7826 else 7827 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 7828 $as_echo_n "checking for non-GNU ld... " >&6; } 7829 fi 7830 if test "${acl_cv_path_LD+set}" = set; then : 7831 $as_echo_n "(cached) " >&6 7769 7832 else 7770 7833 if test -z "$LD"; then … … 7792 7855 LD="$acl_cv_path_LD" 7793 7856 if test -n "$LD"; then 7794 echo "$as_me:$LINENO: result: $LD" >&5 7795 echo "${ECHO_T}$LD" >&6 7796 else 7797 echo "$as_me:$LINENO: result: no" >&5 7798 echo "${ECHO_T}no" >&6 7799 fi 7800 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 7801 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} 7802 { (exit 1); exit 1; }; } 7803 echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 7804 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 7805 if test "${acl_cv_prog_gnu_ld+set}" = set; then 7806 echo $ECHO_N "(cached) $ECHO_C" >&6 7857 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 7858 $as_echo "$LD" >&6; } 7859 else 7860 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7861 $as_echo "no" >&6; } 7862 fi 7863 test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 7864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 7865 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } 7866 if test "${acl_cv_prog_gnu_ld+set}" = set; then : 7867 $as_echo_n "(cached) " >&6 7807 7868 else 7808 7869 # I'd rather use --version here, but apparently some GNU ld's only accept -v. … … 7813 7874 fi 7814 7875 fi 7815 echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&57816 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 7876 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 7877 $as_echo "$acl_cv_prog_gnu_ld" >&6; } 7817 7878 with_gnu_ld=$acl_cv_prog_gnu_ld 7818 7879 7819 7880 7820 7881 7821 echo "$as_me:$LINENO: checking for shared library run path origin" >&57822 echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 7823 if test "${acl_cv_rpath+set}" = set; then 7824 echo $ECHO_N "(cached) $ECHO_C" >&67882 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 7883 $as_echo_n "checking for shared library run path origin... " >&6; } 7884 if test "${acl_cv_rpath+set}" = set; then : 7885 $as_echo_n "(cached) " >&6 7825 7886 else 7826 7887 … … 7832 7893 7833 7894 fi 7834 echo "$as_me:$LINENO: result: $acl_cv_rpath" >&57835 echo "${ECHO_T}$acl_cv_rpath" >&6 7895 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 7896 $as_echo "$acl_cv_rpath" >&6; } 7836 7897 wl="$acl_cv_wl" 7837 7898 libext="$acl_cv_libext" … … 7843 7904 sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" 7844 7905 sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" 7845 # Check whether --enable-rpath or --disable-rpath was given. 7846 if test "${enable_rpath+set}" = set; then 7847 enableval="$enable_rpath" 7848 : 7906 # Check whether --enable-rpath was given. 7907 if test "${enable_rpath+set}" = set; then : 7908 enableval=$enable_rpath; : 7849 7909 else 7850 7910 enable_rpath=yes 7851 fi; 7911 fi 7912 7852 7913 7853 7914 … … 7871 7932 7872 7933 7873 # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. 7874 if test "${with_libiconv_prefix+set}" = set; then 7875 withval="$with_libiconv_prefix" 7876 7934 # Check whether --with-libiconv-prefix was given. 7935 if test "${with_libiconv_prefix+set}" = set; then : 7936 withval=$with_libiconv_prefix; 7877 7937 if test "X$withval" = "Xno"; then 7878 7938 use_additional=no … … 7897 7957 fi 7898 7958 7899 fi; 7959 fi 7960 7900 7961 LIBICONV= 7901 7962 LTLIBICONV= … … 8264 8325 8265 8326 8266 echo "$as_me:$LINENO: checking for iconv" >&58267 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 8268 if test "${am_cv_func_iconv+set}" = set; then 8269 echo $ECHO_N "(cached) $ECHO_C" >&68327 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 8328 $as_echo_n "checking for iconv... " >&6; } 8329 if test "${am_cv_func_iconv+set}" = set; then : 8330 $as_echo_n "(cached) " >&6 8270 8331 else 8271 8332 8272 8333 am_cv_func_iconv="no, consider installing GNU libiconv" 8273 8334 am_cv_lib_iconv=no 8274 cat >conftest.$ac_ext <<_ACEOF 8275 /* confdefs.h. */ 8276 _ACEOF 8277 cat confdefs.h >>conftest.$ac_ext 8278 cat >>conftest.$ac_ext <<_ACEOF 8335 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8279 8336 /* end confdefs.h. */ 8280 8337 #include <stdlib.h> … … 8290 8347 } 8291 8348 _ACEOF 8292 rm -f conftest.$ac_objext conftest$ac_exeext 8293 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 8294 (eval $ac_link) 2>conftest.er1 8295 ac_status=$? 8296 grep -v '^ *+' conftest.er1 >conftest.err 8297 rm -f conftest.er1 8298 cat conftest.err >&5 8299 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8300 (exit $ac_status); } && 8301 { ac_try='test -z "$ac_c_werror_flag" 8302 || test ! -s conftest.err' 8303 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8304 (eval $ac_try) 2>&5 8305 ac_status=$? 8306 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8307 (exit $ac_status); }; } && 8308 { ac_try='test -s conftest$ac_exeext' 8309 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8310 (eval $ac_try) 2>&5 8311 ac_status=$? 8312 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8313 (exit $ac_status); }; }; then 8349 if ac_fn_c_try_link "$LINENO"; then : 8314 8350 am_cv_func_iconv=yes 8315 else 8316 echo "$as_me: failed program was:" >&5 8317 sed 's/^/| /' conftest.$ac_ext >&5 8318 8319 fi 8320 rm -f conftest.err conftest.$ac_objext \ 8321 conftest$ac_exeext conftest.$ac_ext 8351 fi 8352 rm -f core conftest.err conftest.$ac_objext \ 8353 conftest$ac_exeext conftest.$ac_ext 8322 8354 if test "$am_cv_func_iconv" != yes; then 8323 8355 am_save_LIBS="$LIBS" 8324 8356 LIBS="$LIBS $LIBICONV" 8325 cat >conftest.$ac_ext <<_ACEOF 8326 /* confdefs.h. */ 8327 _ACEOF 8328 cat confdefs.h >>conftest.$ac_ext 8329 cat >>conftest.$ac_ext <<_ACEOF 8357 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8330 8358 /* end confdefs.h. */ 8331 8359 #include <stdlib.h> … … 8341 8369 } 8342 8370 _ACEOF 8343 rm -f conftest.$ac_objext conftest$ac_exeext 8344 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 8345 (eval $ac_link) 2>conftest.er1 8346 ac_status=$? 8347 grep -v '^ *+' conftest.er1 >conftest.err 8348 rm -f conftest.er1 8349 cat conftest.err >&5 8350 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8351 (exit $ac_status); } && 8352 { ac_try='test -z "$ac_c_werror_flag" 8353 || test ! -s conftest.err' 8354 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8355 (eval $ac_try) 2>&5 8356 ac_status=$? 8357 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8358 (exit $ac_status); }; } && 8359 { ac_try='test -s conftest$ac_exeext' 8360 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8361 (eval $ac_try) 2>&5 8362 ac_status=$? 8363 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8364 (exit $ac_status); }; }; then 8371 if ac_fn_c_try_link "$LINENO"; then : 8365 8372 am_cv_lib_iconv=yes 8366 8373 am_cv_func_iconv=yes 8367 else 8368 echo "$as_me: failed program was:" >&5 8369 sed 's/^/| /' conftest.$ac_ext >&5 8370 8371 fi 8372 rm -f conftest.err conftest.$ac_objext \ 8373 conftest$ac_exeext conftest.$ac_ext 8374 fi 8375 rm -f core conftest.err conftest.$ac_objext \ 8376 conftest$ac_exeext conftest.$ac_ext 8374 8377 LIBS="$am_save_LIBS" 8375 8378 fi 8376 8379 8377 8380 fi 8378 echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&58379 echo "${ECHO_T}$am_cv_func_iconv" >&6 8381 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 8382 $as_echo "$am_cv_func_iconv" >&6; } 8380 8383 if test "$am_cv_func_iconv" = yes; then 8381 8384 8382 cat >>confdefs.h <<\_ACEOF 8383 #define HAVE_ICONV 1 8384 _ACEOF 8385 $as_echo "#define HAVE_ICONV 1" >>confdefs.h 8385 8386 8386 8387 fi 8387 8388 if test "$am_cv_lib_iconv" = yes; then 8388 echo "$as_me:$LINENO: checking how to link with libiconv" >&58389 echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 8390 echo "$as_me:$LINENO: result: $LIBICONV" >&58391 echo "${ECHO_T}$LIBICONV" >&6 8389 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 8390 $as_echo_n "checking how to link with libiconv... " >&6; } 8391 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 8392 $as_echo "$LIBICONV" >&6; } 8392 8393 else 8393 8394 CPPFLAGS="$am_save_CPPFLAGS" … … 8399 8400 8400 8401 if test "$am_cv_func_iconv" = yes; then 8401 echo "$as_me:$LINENO: checking for iconv declaration" >&5 8402 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 8403 if test "${am_cv_proto_iconv+set}" = set; then 8404 echo $ECHO_N "(cached) $ECHO_C" >&6 8405 else 8406 8407 cat >conftest.$ac_ext <<_ACEOF 8408 /* confdefs.h. */ 8409 _ACEOF 8410 cat confdefs.h >>conftest.$ac_ext 8411 cat >>conftest.$ac_ext <<_ACEOF 8402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 8403 $as_echo_n "checking for iconv declaration... " >&6; } 8404 if test "${am_cv_proto_iconv+set}" = set; then : 8405 $as_echo_n "(cached) " >&6 8406 else 8407 8408 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8412 8409 /* end confdefs.h. */ 8413 8410 … … 8432 8429 } 8433 8430 _ACEOF 8434 rm -f conftest.$ac_objext 8435 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 8436 (eval $ac_compile) 2>conftest.er1 8437 ac_status=$? 8438 grep -v '^ *+' conftest.er1 >conftest.err 8439 rm -f conftest.er1 8440 cat conftest.err >&5 8441 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8442 (exit $ac_status); } && 8443 { ac_try='test -z "$ac_c_werror_flag" 8444 || test ! -s conftest.err' 8445 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8446 (eval $ac_try) 2>&5 8447 ac_status=$? 8448 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8449 (exit $ac_status); }; } && 8450 { ac_try='test -s conftest.$ac_objext' 8451 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8452 (eval $ac_try) 2>&5 8453 ac_status=$? 8454 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8455 (exit $ac_status); }; }; then 8431 if ac_fn_c_try_compile "$LINENO"; then : 8456 8432 am_cv_proto_iconv_arg1="" 8457 8433 else 8458 echo "$as_me: failed program was:" >&5 8459 sed 's/^/| /' conftest.$ac_ext >&5 8460 8461 am_cv_proto_iconv_arg1="const" 8462 fi 8463 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 8434 am_cv_proto_iconv_arg1="const" 8435 fi 8436 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 8464 8437 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" 8465 8438 fi 8466 8439 8467 8440 am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` 8468 echo "$as_me:$LINENO: result: ${ac_t:-8441 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- 8469 8442 }$am_cv_proto_iconv" >&5 8470 echo "${ECHO_T}${ac_t:-8471 }$am_cv_proto_iconv" >&6 8443 $as_echo "${ac_t:- 8444 }$am_cv_proto_iconv" >&6; } 8472 8445 8473 8446 cat >>confdefs.h <<_ACEOF … … 8483 8456 #ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.8.tar.gz])) 8484 8457 8485 8486 8458 for ac_func in vsnprintf 8487 do 8488 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 8489 echo "$as_me:$LINENO: checking for $ac_func" >&5 8490 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 8491 if eval "test \"\${$as_ac_var+set}\" = set"; then 8492 echo $ECHO_N "(cached) $ECHO_C" >&6 8493 else 8494 cat >conftest.$ac_ext <<_ACEOF 8495 /* confdefs.h. */ 8459 do : 8460 ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" 8461 if test "x$ac_cv_func_vsnprintf" = x""yes; then : 8462 cat >>confdefs.h <<_ACEOF 8463 #define HAVE_VSNPRINTF 1 8496 8464 _ACEOF 8497 cat confdefs.h >>conftest.$ac_ext8498 cat >>conftest.$ac_ext <<_ACEOF8499 /* end confdefs.h. */8500 /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.8501 For example, HP-UX 11i <limits.h> declares gettimeofday. */8502 #define $ac_func innocuous_$ac_func8503 8504 /* System header to define __stub macros and hopefully few prototypes,8505 which can conflict with char $ac_func (); below.8506 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since8507 <limits.h> exists even on freestanding compilers. */8508 8509 #ifdef __STDC__8510 # include <limits.h>8511 #else8512 # include <assert.h>8513 #endif8514 8515 #undef $ac_func8516 8517 /* Override any gcc2 internal prototype to avoid an error. */8518 #ifdef __cplusplus8519 extern "C"8520 {8521 #endif8522 /* We use char because int might match the return type of a gcc28523 builtin and then its argument prototype would still apply. */8524 char $ac_func ();8525 /* The GNU C library defines this for functions which it implements8526 to always fail with ENOSYS. Some functions are actually named8527 something starting with __ and the normal name is an alias. */8528 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)8529 choke me8530 #else8531 char (*f) () = $ac_func;8532 #endif8533 #ifdef __cplusplus8534 }8535 #endif8536 8537 int8538 main ()8539 {8540 return f != $ac_func;8541 ;8542 return 0;8543 }8544 _ACEOF8545 rm -f conftest.$ac_objext conftest$ac_exeext8546 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&58547 (eval $ac_link) 2>conftest.er18548 ac_status=$?8549 grep -v '^ *+' conftest.er1 >conftest.err8550 rm -f conftest.er18551 cat conftest.err >&58552 echo "$as_me:$LINENO: \$? = $ac_status" >&58553 (exit $ac_status); } &&8554 { ac_try='test -z "$ac_c_werror_flag"8555 || test ! -s conftest.err'8556 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&58557 (eval $ac_try) 2>&58558 ac_status=$?8559 echo "$as_me:$LINENO: \$? = $ac_status" >&58560 (exit $ac_status); }; } &&8561 { ac_try='test -s conftest$ac_exeext'8562 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&58563 (eval $ac_try) 2>&58564 ac_status=$?8565 echo "$as_me:$LINENO: \$? = $ac_status" >&58566 (exit $ac_status); }; }; then8567 eval "$as_ac_var=yes"8568 else8569 echo "$as_me: failed program was:" >&58570 sed 's/^/| /' conftest.$ac_ext >&58571 8572 eval "$as_ac_var=no"8573 fi8574 rm -f conftest.err conftest.$ac_objext \8575 conftest$ac_exeext conftest.$ac_ext8576 fi8577 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&58578 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&68579 if test `eval echo '${'$as_ac_var'}'` = yes; then8580 cat >>confdefs.h <<_ACEOF8581 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 18582 _ACEOF8583 8465 8584 8466 fi … … 8586 8468 8587 8469 8588 ac_config_files="$ac_config_files Makefile" 8470 ac_config_files="$ac_config_files Makefile" 8471 8589 8472 cat >confcache <<\_ACEOF 8590 8473 # This file is a shell script that caches the results of configure … … 8605 8488 # The following way of writing the cache mishandles newlines in values, 8606 8489 # but we know of no workaround that is simple, portable, and efficient. 8607 # So, don't put newlines in cache variables' values.8490 # So, we kill variables containing newlines. 8608 8491 # Ultrix sh set writes to stderr and can't be redirected directly, 8609 8492 # and sets the high bit in the cache file unless we assign to the vars. 8610 { 8493 ( 8494 for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do 8495 eval ac_val=\$$ac_var 8496 case $ac_val in #( 8497 *${as_nl}*) 8498 case $ac_var in #( 8499 *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 8500 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; 8501 esac 8502 case $ac_var in #( 8503 _ | IFS | as_nl) ;; #( 8504 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( 8505 *) { eval $ac_var=; unset $ac_var;} ;; 8506 esac ;; 8507 esac 8508 done 8509 8611 8510 (set) 2>&1 | 8612 case `(ac_space=' '; set | grep ac_space) 2>&1` in8613 * ac_space=\ *)8614 # `set' does not quote correctly, so add quotes (double-quote8615 # substitution turns \\\\ into \\, and sed turns \\ into \ ).8511 case $as_nl`(ac_space=' '; set) 2>&1` in #( 8512 *${as_nl}ac_space=\ *) 8513 # `set' does not quote correctly, so add quotes: double-quote 8514 # substitution turns \\\\ into \\, and sed turns \\ into \. 8616 8515 sed -n \ 8617 8516 "s/'/'\\\\''/g; 8618 8517 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" 8619 ;; 8518 ;; #( 8620 8519 *) 8621 8520 # `set' quotes correctly as required by POSIX, so do not add quotes. 8622 sed -n \ 8623 "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" 8521 sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" 8624 8522 ;; 8625 esac; 8626 } | 8523 esac | 8524 sort 8525 ) | 8627 8526 sed ' 8527 /^ac_cv_env_/b end 8628 8528 t clear 8629 : 8529 :clear 8630 8530 s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ 8631 8531 t end 8632 /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ 8633 : end' >>confcache 8634 if diff $cache_file confcache >/dev/null 2>&1; then :; else 8635 if test -w $cache_file; then 8636 test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" 8532 s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ 8533 :end' >>confcache 8534 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 8535 if test -w "$cache_file"; then 8536 test "x$cache_file" != "x/dev/null" && 8537 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 8538 $as_echo "$as_me: updating cache $cache_file" >&6;} 8637 8539 cat confcache >$cache_file 8638 8540 else 8639 echo "not updating unwritable cache $cache_file" 8541 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 8542 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 8640 8543 fi 8641 8544 fi … … 8645 8548 # Let make expand exec_prefix. 8646 8549 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' 8647 8648 # VPATH may cause trouble with some makes, so we remove $(srcdir),8649 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and8650 # trailing colons and then remove the whole line if VPATH becomes empty8651 # (actually we leave an empty line to preserve line numbers).8652 if test "x$srcdir" = x.; then8653 ac_vpsub='/^[ ]*VPATH[ ]*=/{8654 s/:*\$(srcdir):*/:/;8655 s/:*\${srcdir}:*/:/;8656 s/:*@srcdir@:*/:/;8657 s/^\([^=]*=[ ]*\):*/\1/;8658 s/:*$//;8659 s/^[^=]*=[ ]*$//;8660 }'8661 fi8662 8550 8663 8551 DEFS=-DHAVE_CONFIG_H … … 8667 8555 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 8668 8556 # 1. Remove the extension, and $U if already installed. 8669 ac_i=`echo "$ac_i" | 8670 sed 's/\$U\././;s/\.o$//;s/\.obj$//'` 8671 # 2. Add them. 8672 ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" 8673 ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' 8557 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 8558 ac_i=`$as_echo "$ac_i" | sed "$ac_script"` 8559 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR 8560 # will be set to the directory where LIBOBJS objects are built. 8561 as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" 8562 as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' 8674 8563 done 8675 8564 LIBOBJS=$ac_libobjs … … 8680 8569 8681 8570 : ${CONFIG_STATUS=./config.status} 8571 ac_write_fail=0 8682 8572 ac_clean_files_save=$ac_clean_files 8683 8573 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 8684 { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 8685 echo "$as_me: creating $CONFIG_STATUS" >&6;} 8686 cat >$CONFIG_STATUS <<_ACEOF 8574 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 8575 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} 8576 as_write_fail=0 8577 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 8687 8578 #! $SHELL 8688 8579 # Generated by $as_me. … … 8694 8585 ac_cs_recheck=false 8695 8586 ac_cs_silent=false 8587 8696 8588 SHELL=\${CONFIG_SHELL-$SHELL} 8697 _ACEOF 8698 8699 cat >>$CONFIG_STATUS <<\_ACEOF 8700 ## --------------------- ## 8701 ## M4sh Initialization. ## 8702 ## --------------------- ## 8703 8704 # Be Bourne compatible 8705 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 8589 export SHELL 8590 _ASEOF 8591 cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 8592 ## -------------------- ## 8593 ## M4sh Initialization. ## 8594 ## -------------------- ## 8595 8596 # Be more Bourne compatible 8597 DUALCASE=1; export DUALCASE # for MKS sh 8598 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : 8706 8599 emulate sh 8707 8600 NULLCMD=: 8708 # Zsh 3.x and 4.x performsword splitting on ${1+"$@"}, which8601 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which 8709 8602 # is contrary to our usage. Disable this feature. 8710 8603 alias -g '${1+"$@"}'='"$@"' 8711 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then 8712 set -o posix 8713 fi 8714 DUALCASE=1; export DUALCASE # for MKS sh 8715 8716 # Support unset when possible. 8717 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then 8718 as_unset=unset 8719 else 8720 as_unset=false 8721 fi 8722 8723 8724 # Work around bugs in pre-3.0 UWIN ksh. 8725 $as_unset ENV MAIL MAILPATH 8604 setopt NO_GLOB_SUBST 8605 else 8606 case `(set -o) 2>/dev/null` in #( 8607 *posix*) : 8608 set -o posix ;; #( 8609 *) : 8610 ;; 8611 esac 8612 fi 8613 8614 8615 as_nl=' 8616 ' 8617 export as_nl 8618 # Printing a long string crashes Solaris 7 /usr/bin/printf. 8619 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' 8620 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo 8621 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo 8622 # Prefer a ksh shell builtin over an external printf program on Solaris, 8623 # but without wasting forks for bash or zsh. 8624 if test -z "$BASH_VERSION$ZSH_VERSION" \ 8625 && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then 8626 as_echo='print -r --' 8627 as_echo_n='print -rn --' 8628 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then 8629 as_echo='printf %s\n' 8630 as_echo_n='printf %s' 8631 else 8632 if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then 8633 as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' 8634 as_echo_n='/usr/ucb/echo -n' 8635 else 8636 as_echo_body='eval expr "X$1" : "X\\(.*\\)"' 8637 as_echo_n_body='eval 8638 arg=$1; 8639 case $arg in #( 8640 *"$as_nl"*) 8641 expr "X$arg" : "X\\(.*\\)$as_nl"; 8642 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; 8643 esac; 8644 expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" 8645 ' 8646 export as_echo_n_body 8647 as_echo_n='sh -c $as_echo_n_body as_echo' 8648 fi 8649 export as_echo_body 8650 as_echo='sh -c $as_echo_body as_echo' 8651 fi 8652 8653 # The user is always right. 8654 if test "${PATH_SEPARATOR+set}" != set; then 8655 PATH_SEPARATOR=: 8656 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { 8657 (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || 8658 PATH_SEPARATOR=';' 8659 } 8660 fi 8661 8662 8663 # IFS 8664 # We need space, tab and new line, in precisely that order. Quoting is 8665 # there to prevent editors from complaining about space-tab. 8666 # (If _AS_PATH_WALK were called with IFS unset, it would disable word 8667 # splitting by setting IFS to empty value.) 8668 IFS=" "" $as_nl" 8669 8670 # Find who we are. Look in the path if we contain no directory separator. 8671 case $0 in #(( 8672 *[\\/]* ) as_myself=$0 ;; 8673 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8674 for as_dir in $PATH 8675 do 8676 IFS=$as_save_IFS 8677 test -z "$as_dir" && as_dir=. 8678 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 8679 done 8680 IFS=$as_save_IFS 8681 8682 ;; 8683 esac 8684 # We did not find ourselves, most probably we were run as `sh COMMAND' 8685 # in which case we are not to be found in the path. 8686 if test "x$as_myself" = x; then 8687 as_myself=$0 8688 fi 8689 if test ! -f "$as_myself"; then 8690 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 8691 exit 1 8692 fi 8693 8694 # Unset variables that we do not need and which cause bugs (e.g. in 8695 # pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" 8696 # suppresses any "Segmentation fault" message there. '((' could 8697 # trigger a bug in pdksh 5.2.14. 8698 for as_var in BASH_ENV ENV MAIL MAILPATH 8699 do eval test x\${$as_var+set} = xset \ 8700 && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : 8701 done 8726 8702 PS1='$ ' 8727 8703 PS2='> ' … … 8729 8705 8730 8706 # NLS nuisances. 8731 for as_var in \ 8732 LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ 8733 LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ 8734 LC_TELEPHONE LC_TIME 8735 do 8736 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then 8737 eval $as_var=C; export $as_var 8738 else 8739 $as_unset $as_var 8707 LC_ALL=C 8708 export LC_ALL 8709 LANGUAGE=C 8710 export LANGUAGE 8711 8712 # CDPATH. 8713 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 8714 8715 8716 # as_fn_error ERROR [LINENO LOG_FD] 8717 # --------------------------------- 8718 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 8719 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 8720 # script with status $?, using 1 if that was 0. 8721 as_fn_error () 8722 { 8723 as_status=$?; test $as_status -eq 0 && as_status=1 8724 if test "$3"; then 8725 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 8726 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 8740 8727 fi 8741 done 8742 8743 # Required to use basename. 8744 if expr a : '\(a\)' >/dev/null 2>&1; then 8728 $as_echo "$as_me: error: $1" >&2 8729 as_fn_exit $as_status 8730 } # as_fn_error 8731 8732 8733 # as_fn_set_status STATUS 8734 # ----------------------- 8735 # Set $? to STATUS, without forking. 8736 as_fn_set_status () 8737 { 8738 return $1 8739 } # as_fn_set_status 8740 8741 # as_fn_exit STATUS 8742 # ----------------- 8743 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context. 8744 as_fn_exit () 8745 { 8746 set +e 8747 as_fn_set_status $1 8748 exit $1 8749 } # as_fn_exit 8750 8751 # as_fn_unset VAR 8752 # --------------- 8753 # Portably unset VAR. 8754 as_fn_unset () 8755 { 8756 { eval $1=; unset $1;} 8757 } 8758 as_unset=as_fn_unset 8759 # as_fn_append VAR VALUE 8760 # ---------------------- 8761 # Append the text in VALUE to the end of the definition contained in VAR. Take 8762 # advantage of any shell optimizations that allow amortized linear growth over 8763 # repeated appends, instead of the typical quadratic growth present in naive 8764 # implementations. 8765 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : 8766 eval 'as_fn_append () 8767 { 8768 eval $1+=\$2 8769 }' 8770 else 8771 as_fn_append () 8772 { 8773 eval $1=\$$1\$2 8774 } 8775 fi # as_fn_append 8776 8777 # as_fn_arith ARG... 8778 # ------------------ 8779 # Perform arithmetic evaluation on the ARGs, and store the result in the 8780 # global $as_val. Take advantage of shells that can avoid forks. The arguments 8781 # must be portable across $(()) and expr. 8782 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : 8783 eval 'as_fn_arith () 8784 { 8785 as_val=$(( $* )) 8786 }' 8787 else 8788 as_fn_arith () 8789 { 8790 as_val=`expr "$@" || test $? -eq 1` 8791 } 8792 fi # as_fn_arith 8793 8794 8795 if expr a : '\(a\)' >/dev/null 2>&1 && 8796 test "X`expr 00001 : '.*\(...\)'`" = X001; then 8745 8797 as_expr=expr 8746 8798 else … … 8748 8800 fi 8749 8801 8750 if (basename /) >/dev/null 2>&1 && test "X`basename/ 2>&1`" = "X/"; then8802 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then 8751 8803 as_basename=basename 8752 8804 else … … 8754 8806 fi 8755 8807 8756 8757 # Name of the executable. 8758 as_me=`$as_basename "$0" || 8808 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then 8809 as_dirname=dirname 8810 else 8811 as_dirname=false 8812 fi 8813 8814 as_me=`$as_basename -- "$0" || 8759 8815 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ 8760 8816 X"$0" : 'X\(//\)$' \| \ 8761 X"$0" : 'X\(/\)$' \| \ 8762 . : '\(.\)' 2>/dev/null || 8763 echo X/"$0" | 8764 sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } 8765 /^X\/\(\/\/\)$/{ s//\1/; q; } 8766 /^X\/\(\/\).*/{ s//\1/; q; } 8767 s/.*/./; q'` 8768 8769 8770 # PATH needs CR, and LINENO needs CR and PATH. 8817 X"$0" : 'X\(/\)' \| . 2>/dev/null || 8818 $as_echo X/"$0" | 8819 sed '/^.*\/\([^/][^/]*\)\/*$/{ 8820 s//\1/ 8821 q 8822 } 8823 /^X\/\(\/\/\)$/{ 8824 s//\1/ 8825 q 8826 } 8827 /^X\/\(\/\).*/{ 8828 s//\1/ 8829 q 8830 } 8831 s/.*/./; q'` 8832 8771 8833 # Avoid depending upon Character Ranges. 8772 8834 as_cr_letters='abcdefghijklmnopqrstuvwxyz' … … 8776 8838 as_cr_alnum=$as_cr_Letters$as_cr_digits 8777 8839 8778 # The user is always right. 8779 if test "${PATH_SEPARATOR+set}" != set; then 8780 echo "#! /bin/sh" >conf$$.sh 8781 echo "exit 0" >>conf$$.sh 8782 chmod +x conf$$.sh 8783 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 8784 PATH_SEPARATOR=';' 8840 ECHO_C= ECHO_N= ECHO_T= 8841 case `echo -n x` in #((((( 8842 -n*) 8843 case `echo 'xy\c'` in 8844 *c*) ECHO_T=' ';; # ECHO_T is single tab character. 8845 xy) ECHO_C='\c';; 8846 *) echo `echo ksh88 bug on AIX 6.1` > /dev/null 8847 ECHO_T=' ';; 8848 esac;; 8849 *) 8850 ECHO_N='-n';; 8851 esac 8852 8853 rm -f conf$$ conf$$.exe conf$$.file 8854 if test -d conf$$.dir; then 8855 rm -f conf$$.dir/conf$$.file 8856 else 8857 rm -f conf$$.dir 8858 mkdir conf$$.dir 2>/dev/null 8859 fi 8860 if (echo >conf$$.file) 2>/dev/null; then 8861 if ln -s conf$$.file conf$$ 2>/dev/null; then 8862 as_ln_s='ln -s' 8863 # ... but there are two gotchas: 8864 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 8865 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 8866 # In both cases, we have to default to `cp -p'. 8867 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 8868 as_ln_s='cp -p' 8869 elif ln conf$$.file conf$$ 2>/dev/null; then 8870 as_ln_s=ln 8785 8871 else 8786 PATH_SEPARATOR=:8872 as_ln_s='cp -p' 8787 8873 fi 8788 rm -f conf$$.sh 8789 fi 8790 8791 8792 as_lineno_1=$LINENO 8793 as_lineno_2=$LINENO 8794 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 8795 test "x$as_lineno_1" != "x$as_lineno_2" && 8796 test "x$as_lineno_3" = "x$as_lineno_2" || { 8797 # Find who we are. Look in the path if we contain no path at all 8798 # relative or not. 8799 case $0 in 8800 *[\\/]* ) as_myself=$0 ;; 8801 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8802 for as_dir in $PATH 8803 do 8804 IFS=$as_save_IFS 8805 test -z "$as_dir" && as_dir=. 8806 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 8807 done 8808 8809 ;; 8874 else 8875 as_ln_s='cp -p' 8876 fi 8877 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 8878 rmdir conf$$.dir 2>/dev/null 8879 8880 8881 # as_fn_mkdir_p 8882 # ------------- 8883 # Create "$as_dir" as a directory, including parents if necessary. 8884 as_fn_mkdir_p () 8885 { 8886 8887 case $as_dir in #( 8888 -*) as_dir=./$as_dir;; 8810 8889 esac 8811 # We did not find ourselves, most probably we were run as `sh COMMAND' 8812 # in which case we are not to be found in the path. 8813 if test "x$as_myself" = x; then 8814 as_myself=$0 8815 fi 8816 if test ! -f "$as_myself"; then 8817 { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 8818 echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} 8819 { (exit 1); exit 1; }; } 8820 fi 8821 case $CONFIG_SHELL in 8822 '') 8823 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8824 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 8825 do 8826 IFS=$as_save_IFS 8827 test -z "$as_dir" && as_dir=. 8828 for as_base in sh bash ksh sh5; do 8829 case $as_dir in 8830 /*) 8831 if ("$as_dir/$as_base" -c ' 8832 as_lineno_1=$LINENO 8833 as_lineno_2=$LINENO 8834 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 8835 test "x$as_lineno_1" != "x$as_lineno_2" && 8836 test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then 8837 $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } 8838 $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } 8839 CONFIG_SHELL=$as_dir/$as_base 8840 export CONFIG_SHELL 8841 exec "$CONFIG_SHELL" "$0" ${1+"$@"} 8842 fi;; 8843 esac 8844 done 8845 done 8846 ;; 8847 esac 8848 8849 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO 8850 # uniformly replaced by the line number. The first 'sed' inserts a 8851 # line-number line before each line; the second 'sed' does the real 8852 # work. The second script uses 'N' to pair each line-number line 8853 # with the numbered line, and appends trailing '-' during 8854 # substitution so that $LINENO is not a special case at line end. 8855 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the 8856 # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) 8857 sed '=' <$as_myself | 8858 sed ' 8859 N 8860 s,$,-, 8861 : loop 8862 s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, 8863 t loop 8864 s,-$,, 8865 s,^['$as_cr_digits']*\n,, 8866 ' >$as_me.lineno && 8867 chmod +x $as_me.lineno || 8868 { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 8869 echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} 8870 { (exit 1); exit 1; }; } 8871 8872 # Don't try to exec as it changes $[0], causing all sort of problems 8873 # (the dirname of $[0] is not the place where we might find the 8874 # original and so on. Autoconf is especially sensible to this). 8875 . ./$as_me.lineno 8876 # Exit status is that of the last command. 8877 exit 8878 } 8879 8880 8881 case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in 8882 *c*,-n*) ECHO_N= ECHO_C=' 8883 ' ECHO_T=' ' ;; 8884 *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; 8885 *) ECHO_N= ECHO_C='\c' ECHO_T= ;; 8886 esac 8887 8888 if expr a : '\(a\)' >/dev/null 2>&1; then 8889 as_expr=expr 8890 else 8891 as_expr=false 8892 fi 8893 8894 rm -f conf$$ conf$$.exe conf$$.file 8895 echo >conf$$.file 8896 if ln -s conf$$.file conf$$ 2>/dev/null; then 8897 # We could just check for DJGPP; but this test a) works b) is more generic 8898 # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). 8899 if test -f conf$$.exe; then 8900 # Don't use ln at all; we don't have any links 8901 as_ln_s='cp -p' 8902 else 8903 as_ln_s='ln -s' 8904 fi 8905 elif ln conf$$.file conf$$ 2>/dev/null; then 8906 as_ln_s=ln 8907 else 8908 as_ln_s='cp -p' 8909 fi 8910 rm -f conf$$ conf$$.exe conf$$.file 8911 8890 test -d "$as_dir" || eval $as_mkdir_p || { 8891 as_dirs= 8892 while :; do 8893 case $as_dir in #( 8894 *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( 8895 *) as_qdir=$as_dir;; 8896 esac 8897 as_dirs="'$as_qdir' $as_dirs" 8898 as_dir=`$as_dirname -- "$as_dir" || 8899 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 8900 X"$as_dir" : 'X\(//\)[^/]' \| \ 8901 X"$as_dir" : 'X\(//\)$' \| \ 8902 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || 8903 $as_echo X"$as_dir" | 8904 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 8905 s//\1/ 8906 q 8907 } 8908 /^X\(\/\/\)[^/].*/{ 8909 s//\1/ 8910 q 8911 } 8912 /^X\(\/\/\)$/{ 8913 s//\1/ 8914 q 8915 } 8916 /^X\(\/\).*/{ 8917 s//\1/ 8918 q 8919 } 8920 s/.*/./; q'` 8921 test -d "$as_dir" && break 8922 done 8923 test -z "$as_dirs" || eval "mkdir $as_dirs" 8924 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 8925 8926 8927 } # as_fn_mkdir_p 8912 8928 if mkdir -p . 2>/dev/null; then 8913 as_mkdir_p= :8929 as_mkdir_p='mkdir -p "$as_dir"' 8914 8930 else 8915 8931 test -d ./-p && rmdir ./-p … … 8917 8933 fi 8918 8934 8919 as_executable_p="test -f" 8935 if test -x / >/dev/null 2>&1; then 8936 as_test_x='test -x' 8937 else 8938 if ls -dL / >/dev/null 2>&1; then 8939 as_ls_L_option=L 8940 else 8941 as_ls_L_option= 8942 fi 8943 as_test_x=' 8944 eval sh -c '\'' 8945 if test -d "$1"; then 8946 test -d "$1/."; 8947 else 8948 case $1 in #( 8949 -*)set "./$1";; 8950 esac; 8951 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 8952 ???[sx]*):;;*)false;;esac;fi 8953 '\'' sh 8954 ' 8955 fi 8956 as_executable_p=$as_test_x 8920 8957 8921 8958 # Sed expression to map a string onto a valid CPP name. … … 8926 8963 8927 8964 8928 # IFS8929 # We need space, tab and new line, in precisely that order.8930 as_nl='8931 '8932 IFS=" $as_nl"8933 8934 # CDPATH.8935 $as_unset CDPATH8936 8937 8965 exec 6>&1 8938 8939 # Open the log real soon, to keep \$[0] and so on meaningful, and to 8966 ## ----------------------------------- ## 8967 ## Main body of $CONFIG_STATUS script. ## 8968 ## ----------------------------------- ## 8969 _ASEOF 8970 test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 8971 8972 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 8973 # Save the log message, to keep $0 and so on meaningful, and to 8940 8974 # report actual input values of CONFIG_FILES etc. instead of their 8941 # values after options handling. Logging --version etc. is OK. 8975 # values after options handling. 8976 ac_log=" 8977 This file was extended by $as_me, which was 8978 generated by GNU Autoconf 2.65. Invocation command line was 8979 8980 CONFIG_FILES = $CONFIG_FILES 8981 CONFIG_HEADERS = $CONFIG_HEADERS 8982 CONFIG_LINKS = $CONFIG_LINKS 8983 CONFIG_COMMANDS = $CONFIG_COMMANDS 8984 $ $0 $@ 8985 8986 on `(hostname || uname -n) 2>/dev/null | sed 1q` 8987 " 8988 8989 _ACEOF 8990 8991 case $ac_config_files in *" 8992 "*) set x $ac_config_files; shift; ac_config_files=$*;; 8993 esac 8994 8995 case $ac_config_headers in *" 8996 "*) set x $ac_config_headers; shift; ac_config_headers=$*;; 8997 esac 8998 8999 9000 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9001 # Files that config.status was made for. 9002 config_files="$ac_config_files" 9003 config_headers="$ac_config_headers" 9004 9005 _ACEOF 9006 9007 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9008 ac_cs_usage="\ 9009 \`$as_me' instantiates files and other configuration actions 9010 from templates according to the current configuration. Unless the files 9011 and actions are specified as TAGs, all are instantiated by default. 9012 9013 Usage: $0 [OPTION]... [TAG]... 9014 9015 -h, --help print this help, then exit 9016 -V, --version print version number and configuration settings, then exit 9017 --config print configuration, then exit 9018 -q, --quiet, --silent 9019 do not print progress messages 9020 -d, --debug don't remove temporary files 9021 --recheck update $as_me by reconfiguring in the same conditions 9022 --file=FILE[:TEMPLATE] 9023 instantiate the configuration file FILE 9024 --header=FILE[:TEMPLATE] 9025 instantiate the configuration header FILE 9026 9027 Configuration files: 9028 $config_files 9029 9030 Configuration headers: 9031 $config_headers 9032 9033 Report bugs to the package provider." 9034 9035 _ACEOF 9036 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9037 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 9038 ac_cs_version="\\ 9039 config.status 9040 configured by $0, generated by GNU Autoconf 2.65, 9041 with options \\"\$ac_cs_config\\" 9042 9043 Copyright (C) 2009 Free Software Foundation, Inc. 9044 This config.status script is free software; the Free Software Foundation 9045 gives unlimited permission to copy, distribute and modify it." 9046 9047 ac_pwd='$ac_pwd' 9048 srcdir='$srcdir' 9049 test -n "\$AWK" || AWK=awk 9050 _ACEOF 9051 9052 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9053 # The default lists apply if the user does not specify any file. 9054 ac_need_defaults=: 9055 while test $# != 0 9056 do 9057 case $1 in 9058 --*=*) 9059 ac_option=`expr "X$1" : 'X\([^=]*\)='` 9060 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 9061 ac_shift=: 9062 ;; 9063 *) 9064 ac_option=$1 9065 ac_optarg=$2 9066 ac_shift=shift 9067 ;; 9068 esac 9069 9070 case $ac_option in 9071 # Handling of the options. 9072 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 9073 ac_cs_recheck=: ;; 9074 --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 9075 $as_echo "$ac_cs_version"; exit ;; 9076 --config | --confi | --conf | --con | --co | --c ) 9077 $as_echo "$ac_cs_config"; exit ;; 9078 --debug | --debu | --deb | --de | --d | -d ) 9079 debug=: ;; 9080 --file | --fil | --fi | --f ) 9081 $ac_shift 9082 case $ac_optarg in 9083 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 9084 esac 9085 as_fn_append CONFIG_FILES " '$ac_optarg'" 9086 ac_need_defaults=false;; 9087 --header | --heade | --head | --hea ) 9088 $ac_shift 9089 case $ac_optarg in 9090 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 9091 esac 9092 as_fn_append CONFIG_HEADERS " '$ac_optarg'" 9093 ac_need_defaults=false;; 9094 --he | --h) 9095 # Conflict between --help and --header 9096 as_fn_error "ambiguous option: \`$1' 9097 Try \`$0 --help' for more information.";; 9098 --help | --hel | -h ) 9099 $as_echo "$ac_cs_usage"; exit ;; 9100 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 9101 | -silent | --silent | --silen | --sile | --sil | --si | --s) 9102 ac_cs_silent=: ;; 9103 9104 # This is an error. 9105 -*) as_fn_error "unrecognized option: \`$1' 9106 Try \`$0 --help' for more information." ;; 9107 9108 *) as_fn_append ac_config_targets " $1" 9109 ac_need_defaults=false ;; 9110 9111 esac 9112 shift 9113 done 9114 9115 ac_configure_extra_args= 9116 9117 if $ac_cs_silent; then 9118 exec 6>/dev/null 9119 ac_configure_extra_args="$ac_configure_extra_args --silent" 9120 fi 9121 9122 _ACEOF 9123 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9124 if \$ac_cs_recheck; then 9125 set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 9126 shift 9127 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 9128 CONFIG_SHELL='$SHELL' 9129 export CONFIG_SHELL 9130 exec "\$@" 9131 fi 9132 9133 _ACEOF 9134 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 8942 9135 exec 5>>config.log 8943 9136 { … … 8946 9139 ## Running $as_me. ## 8947 9140 _ASBOX 9141 $as_echo "$ac_log" 8948 9142 } >&5 8949 cat >&5 <<_CSEOF 8950 8951 This file was extended by $as_me, which was 8952 generated by GNU Autoconf 2.59. Invocation command line was 8953 8954 CONFIG_FILES = $CONFIG_FILES 8955 CONFIG_HEADERS = $CONFIG_HEADERS 8956 CONFIG_LINKS = $CONFIG_LINKS 8957 CONFIG_COMMANDS = $CONFIG_COMMANDS 8958 $ $0 $@ 8959 8960 _CSEOF 8961 echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 8962 echo >&5 9143 8963 9144 _ACEOF 8964 8965 # Files that config.status was made for. 8966 if test -n "$ac_config_files"; then 8967 echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS 8968 fi 8969 8970 if test -n "$ac_config_headers"; then 8971 echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS 8972 fi 8973 8974 if test -n "$ac_config_links"; then 8975 echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS 8976 fi 8977 8978 if test -n "$ac_config_commands"; then 8979 echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS 8980 fi 8981 8982 cat >>$CONFIG_STATUS <<\_ACEOF 8983 8984 ac_cs_usage="\ 8985 \`$as_me' instantiates files from templates according to the 8986 current configuration. 8987 8988 Usage: $0 [OPTIONS] [FILE]... 8989 8990 -h, --help print this help, then exit 8991 -V, --version print version number, then exit 8992 -q, --quiet do not print progress messages 8993 -d, --debug don't remove temporary files 8994 --recheck update $as_me by reconfiguring in the same conditions 8995 --file=FILE[:TEMPLATE] 8996 instantiate the configuration file FILE 8997 --header=FILE[:TEMPLATE] 8998 instantiate the configuration header FILE 8999 9000 Configuration files: 9001 $config_files 9002 9003 Configuration headers: 9004 $config_headers 9005 9006 Report bugs to <[email protected]>." 9145 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9007 9146 _ACEOF 9008 9147 9009 cat >>$CONFIG_STATUS <<_ACEOF 9010 ac_cs_version="\\ 9011 config.status 9012 configured by $0, generated by GNU Autoconf 2.59, 9013 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" 9014 9015 Copyright (C) 2003 Free Software Foundation, Inc. 9016 This config.status script is free software; the Free Software Foundation 9017 gives unlimited permission to copy, distribute and modify it." 9018 srcdir=$srcdir 9019 _ACEOF 9020 9021 cat >>$CONFIG_STATUS <<\_ACEOF 9022 # If no file are specified by the user, then we need to provide default 9023 # value. By we need to know if files were specified by the user. 9024 ac_need_defaults=: 9025 while test $# != 0 9026 do 9027 case $1 in 9028 --*=*) 9029 ac_option=`expr "x$1" : 'x\([^=]*\)='` 9030 ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` 9031 ac_shift=: 9032 ;; 9033 -*) 9034 ac_option=$1 9035 ac_optarg=$2 9036 ac_shift=shift 9037 ;; 9038 *) # This is not an option, so the user has probably given explicit 9039 # arguments. 9040 ac_option=$1 9041 ac_need_defaults=false;; 9042 esac 9043 9044 case $ac_option in 9045 # Handling of the options. 9046 _ACEOF 9047 cat >>$CONFIG_STATUS <<\_ACEOF 9048 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 9049 ac_cs_recheck=: ;; 9050 --version | --vers* | -V ) 9051 echo "$ac_cs_version"; exit 0 ;; 9052 --he | --h) 9053 # Conflict between --help and --header 9054 { { echo "$as_me:$LINENO: error: ambiguous option: $1 9055 Try \`$0 --help' for more information." >&5 9056 echo "$as_me: error: ambiguous option: $1 9057 Try \`$0 --help' for more information." >&2;} 9058 { (exit 1); exit 1; }; };; 9059 --help | --hel | -h ) 9060 echo "$ac_cs_usage"; exit 0 ;; 9061 --debug | --d* | -d ) 9062 debug=: ;; 9063 --file | --fil | --fi | --f ) 9064 $ac_shift 9065 CONFIG_FILES="$CONFIG_FILES $ac_optarg" 9066 ac_need_defaults=false;; 9067 --header | --heade | --head | --hea ) 9068 $ac_shift 9069 CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" 9070 ac_need_defaults=false;; 9071 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 9072 | -silent | --silent | --silen | --sile | --sil | --si | --s) 9073 ac_cs_silent=: ;; 9074 9075 # This is an error. 9076 -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 9077 Try \`$0 --help' for more information." >&5 9078 echo "$as_me: error: unrecognized option: $1 9079 Try \`$0 --help' for more information." >&2;} 9080 { (exit 1); exit 1; }; } ;; 9081 9082 *) ac_config_targets="$ac_config_targets $1" ;; 9083 9084 esac 9085 shift 9086 done 9087 9088 ac_configure_extra_args= 9089 9090 if $ac_cs_silent; then 9091 exec 6>/dev/null 9092 ac_configure_extra_args="$ac_configure_extra_args --silent" 9093 fi 9094 9095 _ACEOF 9096 cat >>$CONFIG_STATUS <<_ACEOF 9097 if \$ac_cs_recheck; then 9098 echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 9099 exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 9100 fi 9101 9102 _ACEOF 9103 9104 9105 9106 9107 9108 cat >>$CONFIG_STATUS <<\_ACEOF 9148 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9149 9150 # Handling of arguments. 9109 9151 for ac_config_target in $ac_config_targets 9110 9152 do 9111 case "$ac_config_target" in 9112 # Handling of arguments. 9113 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 9114 "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; 9115 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 9116 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 9117 { (exit 1); exit 1; }; };; 9153 case $ac_config_target in 9154 "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; 9155 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 9156 9157 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 9118 9158 esac 9119 9159 done 9160 9120 9161 9121 9162 # If the user did not use the arguments to specify the items to instantiate, … … 9129 9170 9130 9171 # Have a temporary directory for convenience. Make it in the build tree 9131 # simply because there is no reason to putit here, and in addition,9172 # simply because there is no reason against having it here, and in addition, 9132 9173 # creating and moving files from /tmp can sometimes cause problems. 9133 # Create a temporary directory, and hook for its removal unless debugging. 9174 # Hook for its removal unless debugging. 9175 # Note that there is a small window in which the directory will not be cleaned: 9176 # after its creation but before its name has been assigned to `$tmp'. 9134 9177 $debug || 9135 9178 { 9136 trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 9137 trap '{ (exit 1); exit 1; }' 1 2 13 15 9179 tmp= 9180 trap 'exit_status=$? 9181 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 9182 ' 0 9183 trap 'as_fn_exit 1' 1 2 13 15 9138 9184 } 9139 9140 9185 # Create a (secure) tmp directory for tmp files. 9141 9186 9142 9187 { 9143 tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&9188 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 9144 9189 test -n "$tmp" && test -d "$tmp" 9145 9190 } || 9146 9191 { 9147 tmp=./confstat$$-$RANDOM 9148 (umask 077 && mkdir $tmp) 9149 } || 9192 tmp=./conf$$-$RANDOM 9193 (umask 077 && mkdir "$tmp") 9194 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 9195 9196 # Set up the scripts for CONFIG_FILES section. 9197 # No need to generate them if there are no CONFIG_FILES. 9198 # This happens for instance with `./config.status config.h'. 9199 if test -n "$CONFIG_FILES"; then 9200 9201 9202 ac_cr=`echo X | tr X '\015'` 9203 # On cygwin, bash can eat \r inside `` if the user requested igncr. 9204 # But we know of no other shell where ac_cr would be empty at this 9205 # point, so we can use a bashism as a fallback. 9206 if test "x$ac_cr" = x; then 9207 eval ac_cr=\$\'\\r\' 9208 fi 9209 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 9210 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 9211 ac_cs_awk_cr='\r' 9212 else 9213 ac_cs_awk_cr=$ac_cr 9214 fi 9215 9216 echo 'BEGIN {' >"$tmp/subs1.awk" && 9217 _ACEOF 9218 9219 9150 9220 { 9151 echo "$me: cannot create a temporary directory in ." >&2 9152 { (exit 1); exit 1; } 9221 echo "cat >conf$$subs.awk <<_ACEOF" && 9222 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 9223 echo "_ACEOF" 9224 } >conf$$subs.sh || 9225 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 9226 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 9227 ac_delim='%!_!# ' 9228 for ac_last_try in false false false false false :; do 9229 . ./conf$$subs.sh || 9230 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 9231 9232 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 9233 if test $ac_delim_n = $ac_delim_num; then 9234 break 9235 elif $ac_last_try; then 9236 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 9237 else 9238 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 9239 fi 9240 done 9241 rm -f conf$$subs.sh 9242 9243 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9244 cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 9245 _ACEOF 9246 sed -n ' 9247 h 9248 s/^/S["/; s/!.*/"]=/ 9249 p 9250 g 9251 s/^[^!]*!// 9252 :repl 9253 t repl 9254 s/'"$ac_delim"'$// 9255 t delim 9256 :nl 9257 h 9258 s/\(.\{148\}\)..*/\1/ 9259 t more1 9260 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ 9261 p 9262 n 9263 b repl 9264 :more1 9265 s/["\\]/\\&/g; s/^/"/; s/$/"\\/ 9266 p 9267 g 9268 s/.\{148\}// 9269 t nl 9270 :delim 9271 h 9272 s/\(.\{148\}\)..*/\1/ 9273 t more2 9274 s/["\\]/\\&/g; s/^/"/; s/$/"/ 9275 p 9276 b 9277 :more2 9278 s/["\\]/\\&/g; s/^/"/; s/$/"\\/ 9279 p 9280 g 9281 s/.\{148\}// 9282 t delim 9283 ' <conf$$subs.awk | sed ' 9284 /^[^""]/{ 9285 N 9286 s/\n// 9153 9287 } 9154 9288 ' >>$CONFIG_STATUS || ac_write_fail=1 9289 rm -f conf$$subs.awk 9290 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9291 _ACAWK 9292 cat >>"\$tmp/subs1.awk" <<_ACAWK && 9293 for (key in S) S_is_set[key] = 1 9294 FS = "" 9295 9296 } 9297 { 9298 line = $ 0 9299 nfields = split(line, field, "@") 9300 substed = 0 9301 len = length(field[1]) 9302 for (i = 2; i < nfields; i++) { 9303 key = field[i] 9304 keylen = length(key) 9305 if (S_is_set[key]) { 9306 value = S[key] 9307 line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) 9308 len += length(value) + length(field[++i]) 9309 substed = 1 9310 } else 9311 len += 1 + keylen 9312 } 9313 9314 print line 9315 } 9316 9317 _ACAWK 9155 9318 _ACEOF 9156 9157 cat >>$CONFIG_STATUS <<_ACEOF 9158 9159 # 9160 # CONFIG_FILES section. 9161 # 9162 9163 # No need to generate the scripts if there are no CONFIG_FILES. 9164 # This happens for instance when ./config.status config.h 9165 if test -n "\$CONFIG_FILES"; then 9166 # Protect against being on the right side of a sed subst in config.status. 9167 sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; 9168 s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF 9169 s,@SHELL@,$SHELL,;t t 9170 s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t 9171 s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t 9172 s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t 9173 s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t 9174 s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t 9175 s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t 9176 s,@exec_prefix@,$exec_prefix,;t t 9177 s,@prefix@,$prefix,;t t 9178 s,@program_transform_name@,$program_transform_name,;t t 9179 s,@bindir@,$bindir,;t t 9180 s,@sbindir@,$sbindir,;t t 9181 s,@libexecdir@,$libexecdir,;t t 9182 s,@datadir@,$datadir,;t t 9183 s,@sysconfdir@,$sysconfdir,;t t 9184 s,@sharedstatedir@,$sharedstatedir,;t t 9185 s,@localstatedir@,$localstatedir,;t t 9186 s,@libdir@,$libdir,;t t 9187 s,@includedir@,$includedir,;t t 9188 s,@oldincludedir@,$oldincludedir,;t t 9189 s,@infodir@,$infodir,;t t 9190 s,@mandir@,$mandir,;t t 9191 s,@build_alias@,$build_alias,;t t 9192 s,@host_alias@,$host_alias,;t t 9193 s,@target_alias@,$target_alias,;t t 9194 s,@DEFS@,$DEFS,;t t 9195 s,@ECHO_C@,$ECHO_C,;t t 9196 s,@ECHO_N@,$ECHO_N,;t t 9197 s,@ECHO_T@,$ECHO_T,;t t 9198 s,@LIBS@,$LIBS,;t t 9199 s,@VERSION@,$VERSION,;t t 9200 s,@build@,$build,;t t 9201 s,@build_cpu@,$build_cpu,;t t 9202 s,@build_vendor@,$build_vendor,;t t 9203 s,@build_os@,$build_os,;t t 9204 s,@host@,$host,;t t 9205 s,@host_cpu@,$host_cpu,;t t 9206 s,@host_vendor@,$host_vendor,;t t 9207 s,@host_os@,$host_os,;t t 9208 s,@target@,$target,;t t 9209 s,@target_cpu@,$target_cpu,;t t 9210 s,@target_vendor@,$target_vendor,;t t 9211 s,@target_os@,$target_os,;t t 9212 s,@SET_MAKE@,$SET_MAKE,;t t 9213 s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t 9214 s,@UNICODE_VERSION@,$UNICODE_VERSION,;t t 9215 s,@CC@,$CC,;t t 9216 s,@CFLAGS@,$CFLAGS,;t t 9217 s,@LDFLAGS@,$LDFLAGS,;t t 9218 s,@CPPFLAGS@,$CPPFLAGS,;t t 9219 s,@ac_ct_CC@,$ac_ct_CC,;t t 9220 s,@EXEEXT@,$EXEEXT,;t t 9221 s,@OBJEXT@,$OBJEXT,;t t 9222 s,@CPP@,$CPP,;t t 9223 s,@EGREP@,$EGREP,;t t 9224 s,@LN_S@,$LN_S,;t t 9225 s,@ECHO@,$ECHO,;t t 9226 s,@RANLIB@,$RANLIB,;t t 9227 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t 9228 s,@STRIP@,$STRIP,;t t 9229 s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t 9230 s,@LIBTOOL@,$LIBTOOL,;t t 9231 s,@PERL@,$PERL,;t t 9232 s,@SH@,$SH,;t t 9233 s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t 9234 s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t 9235 s,@MAINT@,$MAINT,;t t 9236 s,@LIBICONV@,$LIBICONV,;t t 9237 s,@LTLIBICONV@,$LTLIBICONV,;t t 9238 s,@LIBOBJS@,$LIBOBJS,;t t 9239 s,@LTLIBOBJS@,$LTLIBOBJS,;t t 9240 CEOF 9241 9319 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9320 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then 9321 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 9322 else 9323 cat 9324 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 9325 || as_fn_error "could not setup config files machinery" "$LINENO" 5 9242 9326 _ACEOF 9243 9327 9244 cat >>$CONFIG_STATUS <<\_ACEOF 9245 # Split the substitutions into bite-sized pieces for seds with 9246 # small command number limits, like on Digital OSF/1 and HP-UX. 9247 ac_max_sed_lines=48 9248 ac_sed_frag=1 # Number of current file. 9249 ac_beg=1 # First line for current file. 9250 ac_end=$ac_max_sed_lines # Line after last line for current file. 9251 ac_more_lines=: 9252 ac_sed_cmds= 9253 while $ac_more_lines; do 9254 if test $ac_beg -gt 1; then 9255 sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag 9256 else 9257 sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag 9328 # VPATH may cause trouble with some makes, so we remove $(srcdir), 9329 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 9330 # trailing colons and then remove the whole line if VPATH becomes empty 9331 # (actually we leave an empty line to preserve line numbers). 9332 if test "x$srcdir" = x.; then 9333 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 9334 s/:*\$(srcdir):*/:/ 9335 s/:*\${srcdir}:*/:/ 9336 s/:*@srcdir@:*/:/ 9337 s/^\([^=]*=[ ]*\):*/\1/ 9338 s/:*$// 9339 s/^[^=]*=[ ]*$// 9340 }' 9341 fi 9342 9343 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9344 fi # test -n "$CONFIG_FILES" 9345 9346 # Set up the scripts for CONFIG_HEADERS section. 9347 # No need to generate them if there are no CONFIG_HEADERS. 9348 # This happens for instance with `./config.status Makefile'. 9349 if test -n "$CONFIG_HEADERS"; then 9350 cat >"$tmp/defines.awk" <<\_ACAWK || 9351 BEGIN { 9352 _ACEOF 9353 9354 # Transform confdefs.h into an awk script `defines.awk', embedded as 9355 # here-document in config.status, that substitutes the proper values into 9356 # config.h.in to produce config.h. 9357 9358 # Create a delimiter string that does not exist in confdefs.h, to ease 9359 # handling of long lines. 9360 ac_delim='%!_!# ' 9361 for ac_last_try in false false :; do 9362 ac_t=`sed -n "/$ac_delim/p" confdefs.h` 9363 if test -z "$ac_t"; then 9364 break 9365 elif $ac_last_try; then 9366 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 9367 else 9368 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 9369 fi 9370 done 9371 9372 # For the awk script, D is an array of macro values keyed by name, 9373 # likewise P contains macro parameters if any. Preserve backslash 9374 # newline sequences. 9375 9376 ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* 9377 sed -n ' 9378 s/.\{148\}/&'"$ac_delim"'/g 9379 t rset 9380 :rset 9381 s/^[ ]*#[ ]*define[ ][ ]*/ / 9382 t def 9383 d 9384 :def 9385 s/\\$// 9386 t bsnl 9387 s/["\\]/\\&/g 9388 s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ 9389 D["\1"]=" \3"/p 9390 s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p 9391 d 9392 :bsnl 9393 s/["\\]/\\&/g 9394 s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ 9395 D["\1"]=" \3\\\\\\n"\\/p 9396 t cont 9397 s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p 9398 t cont 9399 d 9400 :cont 9401 n 9402 s/.\{148\}/&'"$ac_delim"'/g 9403 t clear 9404 :clear 9405 s/\\$// 9406 t bsnlc 9407 s/["\\]/\\&/g; s/^/"/; s/$/"/p 9408 d 9409 :bsnlc 9410 s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p 9411 b cont 9412 ' <confdefs.h | sed ' 9413 s/'"$ac_delim"'/"\\\ 9414 "/g' >>$CONFIG_STATUS || ac_write_fail=1 9415 9416 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9417 for (key in D) D_is_set[key] = 1 9418 FS = "" 9419 } 9420 /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { 9421 line = \$ 0 9422 split(line, arg, " ") 9423 if (arg[1] == "#") { 9424 defundef = arg[2] 9425 mac1 = arg[3] 9426 } else { 9427 defundef = substr(arg[1], 2) 9428 mac1 = arg[2] 9429 } 9430 split(mac1, mac2, "(") #) 9431 macro = mac2[1] 9432 prefix = substr(line, 1, index(line, defundef) - 1) 9433 if (D_is_set[macro]) { 9434 # Preserve the white space surrounding the "#". 9435 print prefix "define", macro P[macro] D[macro] 9436 next 9437 } else { 9438 # Replace #undef with comments. This is necessary, for example, 9439 # in the case of _POSIX_SOURCE, which is predefined and required 9440 # on some systems where configure will not decide to define it. 9441 if (defundef == "undef") { 9442 print "/*", prefix defundef, macro, "*/" 9443 next 9444 } 9445 } 9446 } 9447 { print } 9448 _ACAWK 9449 _ACEOF 9450 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9451 as_fn_error "could not setup config headers machinery" "$LINENO" 5 9452 fi # test -n "$CONFIG_HEADERS" 9453 9454 9455 eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " 9456 shift 9457 for ac_tag 9458 do 9459 case $ac_tag in 9460 :[FHLC]) ac_mode=$ac_tag; continue;; 9461 esac 9462 case $ac_mode$ac_tag in 9463 :[FHL]*:*);; 9464 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 9465 :[FH]-) ac_tag=-:-;; 9466 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 9467 esac 9468 ac_save_IFS=$IFS 9469 IFS=: 9470 set x $ac_tag 9471 IFS=$ac_save_IFS 9472 shift 9473 ac_file=$1 9474 shift 9475 9476 case $ac_mode in 9477 :L) ac_source=$1;; 9478 :[FH]) 9479 ac_file_inputs= 9480 for ac_f 9481 do 9482 case $ac_f in 9483 -) ac_f="$tmp/stdin";; 9484 *) # Look for the file first in the build tree, then in the source tree 9485 # (if the path is not absolute). The absolute path cannot be DOS-style, 9486 # because $ac_f cannot contain `:'. 9487 test -f "$ac_f" || 9488 case $ac_f in 9489 [\\/$]*) false;; 9490 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 9491 esac || 9492 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 9493 esac 9494 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 9495 as_fn_append ac_file_inputs " '$ac_f'" 9496 done 9497 9498 # Let's still pretend it is `configure' which instantiates (i.e., don't 9499 # use $as_me), people would be surprised to read: 9500 # /* config.h. Generated by config.status. */ 9501 configure_input='Generated from '` 9502 $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' 9503 `' by configure.' 9504 if test x"$ac_file" != x-; then 9505 configure_input="$ac_file. $configure_input" 9506 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 9507 $as_echo "$as_me: creating $ac_file" >&6;} 9258 9508 fi 9259 if test ! -s $tmp/subs.frag; then 9260 ac_more_lines=false 9261 else 9262 # The purpose of the label and of the branching condition is to 9263 # speed up the sed processing (if there are no `@' at all, there 9264 # is no need to browse any of the substitutions). 9265 # These are the two extra sed commands mentioned above. 9266 (echo ':t 9267 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed 9268 if test -z "$ac_sed_cmds"; then 9269 ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" 9270 else 9271 ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" 9272 fi 9273 ac_sed_frag=`expr $ac_sed_frag + 1` 9274 ac_beg=$ac_end 9275 ac_end=`expr $ac_end + $ac_max_sed_lines` 9276 fi 9277 done 9278 if test -z "$ac_sed_cmds"; then 9279 ac_sed_cmds=cat 9280 fi 9281 fi # test -n "$CONFIG_FILES" 9282 9283 _ACEOF 9284 cat >>$CONFIG_STATUS <<\_ACEOF 9285 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue 9286 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 9287 case $ac_file in 9288 - | *:- | *:-:* ) # input from stdin 9289 cat >$tmp/stdin 9290 ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 9291 ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 9292 *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 9293 ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 9294 * ) ac_file_in=$ac_file.in ;; 9509 # Neutralize special characters interpreted by sed in replacement strings. 9510 case $configure_input in #( 9511 *\&* | *\|* | *\\* ) 9512 ac_sed_conf_input=`$as_echo "$configure_input" | 9513 sed 's/[\\\\&|]/\\\\&/g'`;; #( 9514 *) ac_sed_conf_input=$configure_input;; 9515 esac 9516 9517 case $ac_tag in 9518 *:-:* | *:-) cat >"$tmp/stdin" \ 9519 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 9520 esac 9521 ;; 9295 9522 esac 9296 9523 9297 # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. 9298 ac_dir=`(dirname "$ac_file") 2>/dev/null || 9524 ac_dir=`$as_dirname -- "$ac_file" || 9299 9525 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 9300 9526 X"$ac_file" : 'X\(//\)[^/]' \| \ 9301 9527 X"$ac_file" : 'X\(//\)$' \| \ 9302 X"$ac_file" : 'X\(/\)' \| \ 9303 . : '\(.\)' 2>/dev/null || 9304 echo X"$ac_file" | 9305 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 9306 /^X\(\/\/\)[^/].*/{ s//\1/; q; } 9307 /^X\(\/\/\)$/{ s//\1/; q; } 9308 /^X\(\/\).*/{ s//\1/; q; } 9309 s/.*/./; q'` 9310 { if $as_mkdir_p; then 9311 mkdir -p "$ac_dir" 9312 else 9313 as_dir="$ac_dir" 9314 as_dirs= 9315 while test ! -d "$as_dir"; do 9316 as_dirs="$as_dir $as_dirs" 9317 as_dir=`(dirname "$as_dir") 2>/dev/null || 9318 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 9319 X"$as_dir" : 'X\(//\)[^/]' \| \ 9320 X"$as_dir" : 'X\(//\)$' \| \ 9321 X"$as_dir" : 'X\(/\)' \| \ 9322 . : '\(.\)' 2>/dev/null || 9323 echo X"$as_dir" | 9324 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 9325 /^X\(\/\/\)[^/].*/{ s//\1/; q; } 9326 /^X\(\/\/\)$/{ s//\1/; q; } 9327 /^X\(\/\).*/{ s//\1/; q; } 9328 s/.*/./; q'` 9329 done 9330 test ! -n "$as_dirs" || mkdir $as_dirs 9331 fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 9332 echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} 9333 { (exit 1); exit 1; }; }; } 9334 9528 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || 9529 $as_echo X"$ac_file" | 9530 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 9531 s//\1/ 9532 q 9533 } 9534 /^X\(\/\/\)[^/].*/{ 9535 s//\1/ 9536 q 9537 } 9538 /^X\(\/\/\)$/{ 9539 s//\1/ 9540 q 9541 } 9542 /^X\(\/\).*/{ 9543 s//\1/ 9544 q 9545 } 9546 s/.*/./; q'` 9547 as_dir="$ac_dir"; as_fn_mkdir_p 9335 9548 ac_builddir=. 9336 9549 9337 if test "$ac_dir" != .; then 9338 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` 9339 # A "../" for each directory in $ac_dir_suffix. 9340 ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` 9341 else 9342 ac_dir_suffix= ac_top_builddir= 9343 fi 9550 case "$ac_dir" in 9551 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; 9552 *) 9553 ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` 9554 # A ".." for each directory in $ac_dir_suffix. 9555 ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` 9556 case $ac_top_builddir_sub in 9557 "") ac_top_builddir_sub=. ac_top_build_prefix= ;; 9558 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; 9559 esac ;; 9560 esac 9561 ac_abs_top_builddir=$ac_pwd 9562 ac_abs_builddir=$ac_pwd$ac_dir_suffix 9563 # for backward compatibility: 9564 ac_top_builddir=$ac_top_build_prefix 9344 9565 9345 9566 case $srcdir in 9346 .) # No --srcdir option.We are building in place.9567 .) # We are building in place. 9347 9568 ac_srcdir=. 9348 if test -z "$ac_top_builddir"; then 9349 ac_top_srcdir=. 9350 else 9351 ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` 9352 fi ;; 9353 [\\/]* | ?:[\\/]* ) # Absolute path. 9569 ac_top_srcdir=$ac_top_builddir_sub 9570 ac_abs_top_srcdir=$ac_pwd ;; 9571 [\\/]* | ?:[\\/]* ) # Absolute name. 9354 9572 ac_srcdir=$srcdir$ac_dir_suffix; 9355 ac_top_srcdir=$srcdir ;; 9356 *) # Relative path. 9357 ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix 9358 ac_top_srcdir=$ac_top_builddir$srcdir ;; 9573 ac_top_srcdir=$srcdir 9574 ac_abs_top_srcdir=$srcdir ;; 9575 *) # Relative name. 9576 ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix 9577 ac_top_srcdir=$ac_top_build_prefix$srcdir 9578 ac_abs_top_srcdir=$ac_pwd/$srcdir ;; 9359 9579 esac 9360 9361 # Do not use `cd foo && pwd` to compute absolute paths, because 9362 # the directories may not exist. 9363 case `pwd` in 9364 .) ac_abs_builddir="$ac_dir";; 9365 *) 9366 case "$ac_dir" in 9367 .) ac_abs_builddir=`pwd`;; 9368 [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; 9369 *) ac_abs_builddir=`pwd`/"$ac_dir";; 9370 esac;; 9580 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix 9581 9582 9583 case $ac_mode in 9584 :F) 9585 # 9586 # CONFIG_FILE 9587 # 9588 9589 _ACEOF 9590 9591 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9592 # If the template does not know about datarootdir, expand it. 9593 # FIXME: This hack should be removed a few years after 2.60. 9594 ac_datarootdir_hack=; ac_datarootdir_seen= 9595 ac_sed_dataroot=' 9596 /datarootdir/ { 9597 p 9598 q 9599 } 9600 /@datadir@/p 9601 /@docdir@/p 9602 /@infodir@/p 9603 /@localedir@/p 9604 /@mandir@/p' 9605 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in 9606 *datarootdir*) ac_datarootdir_seen=yes;; 9607 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) 9608 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 9609 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} 9610 _ACEOF 9611 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9612 ac_datarootdir_hack=' 9613 s&@datadir@&$datadir&g 9614 s&@docdir@&$docdir&g 9615 s&@infodir@&$infodir&g 9616 s&@localedir@&$localedir&g 9617 s&@mandir@&$mandir&g 9618 s&\\\${datarootdir}&$datarootdir&g' ;; 9371 9619 esac 9372 case $ac_abs_builddir in9373 .) ac_abs_top_builddir=${ac_top_builddir}.;;9374 *)9375 case ${ac_top_builddir}. in9376 .) ac_abs_top_builddir=$ac_abs_builddir;;9377 [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;9378 *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;9379 esac;;9380 esac9381 case $ac_abs_builddir in9382 .) ac_abs_srcdir=$ac_srcdir;;9383 *)9384 case $ac_srcdir in9385 .) ac_abs_srcdir=$ac_abs_builddir;;9386 [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;9387 *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;9388 esac;;9389 esac9390 case $ac_abs_builddir in9391 .) ac_abs_top_srcdir=$ac_top_srcdir;;9392 *)9393 case $ac_top_srcdir in9394 .) ac_abs_top_srcdir=$ac_abs_builddir;;9395 [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;9396 *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;9397 esac;;9398 esac9399 9400 9401 9402 if test x"$ac_file" != x-; then9403 { echo "$as_me:$LINENO: creating $ac_file" >&59404 echo "$as_me: creating $ac_file" >&6;}9405 rm -f "$ac_file"9406 fi9407 # Let's still pretend it is `configure' which instantiates (i.e., don't9408 # use $as_me), people would be surprised to read:9409 # /* config.h. Generated by config.status. */9410 if test x"$ac_file" = x-; then9411 configure_input=9412 else9413 configure_input="$ac_file. "9414 fi9415 configure_input=$configure_input"Generated from `echo $ac_file_in |9416 sed 's,.*/,,'` by configure."9417 9418 # First look for the input files in the build tree, otherwise in the9419 # src tree.9420 ac_file_inputs=`IFS=:9421 for f in $ac_file_in; do9422 case $f in9423 -) echo $tmp/stdin ;;9424 [\\/$]*)9425 # Absolute (can't be DOS-style, as IFS=:)9426 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&59427 echo "$as_me: error: cannot find input file: $f" >&2;}9428 { (exit 1); exit 1; }; }9429 echo "$f";;9430 *) # Relative9431 if test -f "$f"; then9432 # Build tree9433 echo "$f"9434 elif test -f "$srcdir/$f"; then9435 # Source tree9436 echo "$srcdir/$f"9437 else9438 # /dev/null tree9439 { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&59440 echo "$as_me: error: cannot find input file: $f" >&2;}9441 { (exit 1); exit 1; }; }9442 fi;;9443 esac9444 done` || { (exit 1); exit 1; }9445 9620 _ACEOF 9446 cat >>$CONFIG_STATUS <<_ACEOF 9447 sed "$ac_vpsub 9621 9622 # Neutralize VPATH when `$srcdir' = `.'. 9623 # Shell code in configure.ac might set extrasub. 9624 # FIXME: do we really want to maintain this feature? 9625 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 9626 ac_sed_extra="$ac_vpsub 9448 9627 $extrasub 9449 9628 _ACEOF 9450 cat >>$CONFIG_STATUS <<\_ACEOF 9629 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 9451 9630 :t 9452 9631 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b 9453 s,@configure_input@,$configure_input,;t t 9454 s,@srcdir@,$ac_srcdir,;t t 9455 s,@abs_srcdir@,$ac_abs_srcdir,;t t 9456 s,@top_srcdir@,$ac_top_srcdir,;t t 9457 s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t 9458 s,@builddir@,$ac_builddir,;t t 9459 s,@abs_builddir@,$ac_abs_builddir,;t t 9460 s,@top_builddir@,$ac_top_builddir,;t t 9461 s,@abs_top_builddir@,$ac_abs_top_builddir,;t t 9462 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out 9463 rm -f $tmp/stdin 9632 s|@configure_input@|$ac_sed_conf_input|;t t 9633 s&@top_builddir@&$ac_top_builddir_sub&;t t 9634 s&@top_build_prefix@&$ac_top_build_prefix&;t t 9635 s&@srcdir@&$ac_srcdir&;t t 9636 s&@abs_srcdir@&$ac_abs_srcdir&;t t 9637 s&@top_srcdir@&$ac_top_srcdir&;t t 9638 s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t 9639 s&@builddir@&$ac_builddir&;t t 9640 s&@abs_builddir@&$ac_abs_builddir&;t t 9641 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 9642 $ac_datarootdir_hack 9643 " 9644 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 9645 || as_fn_error "could not create $ac_file" "$LINENO" 5 9646 9647 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 9648 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 9649 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 9650 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 9651 which seems to be undefined. Please make sure it is defined." >&5 9652 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 9653 which seems to be undefined. Please make sure it is defined." >&2;} 9654 9655 rm -f "$tmp/stdin" 9656 case $ac_file in 9657 -) cat "$tmp/out" && rm -f "$tmp/out";; 9658 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 9659 esac \ 9660 || as_fn_error "could not create $ac_file" "$LINENO" 5 9661 ;; 9662 :H) 9663 # 9664 # CONFIG_HEADER 9665 # 9464 9666 if test x"$ac_file" != x-; then 9465 mv $tmp/out $ac_file 9466 else 9467 cat $tmp/out 9468 rm -f $tmp/out 9469 fi 9470 9471 done 9472 _ACEOF 9473 cat >>$CONFIG_STATUS <<\_ACEOF 9474 9475 # 9476 # CONFIG_HEADER section. 9477 # 9478 9479 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where 9480 # NAME is the cpp macro being defined and VALUE is the value it is being given. 9481 # 9482 # ac_d sets the value in "#define NAME VALUE" lines. 9483 ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' 9484 ac_dB='[ ].*$,\1#\2' 9485 ac_dC=' ' 9486 ac_dD=',;t' 9487 # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". 9488 ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' 9489 ac_uB='$,\1#\2define\3' 9490 ac_uC=' ' 9491 ac_uD=',;t' 9492 9493 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue 9494 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 9495 case $ac_file in 9496 - | *:- | *:-:* ) # input from stdin 9497 cat >$tmp/stdin 9498 ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 9499 ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 9500 *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 9501 ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 9502 * ) ac_file_in=$ac_file.in ;; 9503 esac 9504 9505 test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 9506 echo "$as_me: creating $ac_file" >&6;} 9507 9508 # First look for the input files in the build tree, otherwise in the 9509 # src tree. 9510 ac_file_inputs=`IFS=: 9511 for f in $ac_file_in; do 9512 case $f in 9513 -) echo $tmp/stdin ;; 9514 [\\/$]*) 9515 # Absolute (can't be DOS-style, as IFS=:) 9516 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 9517 echo "$as_me: error: cannot find input file: $f" >&2;} 9518 { (exit 1); exit 1; }; } 9519 # Do quote $f, to prevent DOS paths from being IFS'd. 9520 echo "$f";; 9521 *) # Relative 9522 if test -f "$f"; then 9523 # Build tree 9524 echo "$f" 9525 elif test -f "$srcdir/$f"; then 9526 # Source tree 9527 echo "$srcdir/$f" 9528 else 9529 # /dev/null tree 9530 { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 9531 echo "$as_me: error: cannot find input file: $f" >&2;} 9532 { (exit 1); exit 1; }; } 9533 fi;; 9534 esac 9535 done` || { (exit 1); exit 1; } 9536 # Remove the trailing spaces. 9537 sed 's/[ ]*$//' $ac_file_inputs >$tmp/in 9538 9539 _ACEOF 9540 9541 # Transform confdefs.h into two sed scripts, `conftest.defines' and 9542 # `conftest.undefs', that substitutes the proper values into 9543 # config.h.in to produce config.h. The first handles `#define' 9544 # templates, and the second `#undef' templates. 9545 # And first: Protect against being on the right side of a sed subst in 9546 # config.status. Protect against being in an unquoted here document 9547 # in config.status. 9548 rm -f conftest.defines conftest.undefs 9549 # Using a here document instead of a string reduces the quoting nightmare. 9550 # Putting comments in sed scripts is not portable. 9551 # 9552 # `end' is used to avoid that the second main sed command (meant for 9553 # 0-ary CPP macros) applies to n-ary macro definitions. 9554 # See the Autoconf documentation for `clear'. 9555 cat >confdef2sed.sed <<\_ACEOF 9556 s/[\\&,]/\\&/g 9557 s,[\\$`],\\&,g 9558 t clear 9559 : clear 9560 s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp 9561 t end 9562 s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp 9563 : end 9564 _ACEOF 9565 # If some macros were called several times there might be several times 9566 # the same #defines, which is useless. Nevertheless, we may not want to 9567 # sort them, since we want the *last* AC-DEFINE to be honored. 9568 uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines 9569 sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs 9570 rm -f confdef2sed.sed 9571 9572 # This sed command replaces #undef with comments. This is necessary, for 9573 # example, in the case of _POSIX_SOURCE, which is predefined and required 9574 # on some systems where configure will not decide to define it. 9575 cat >>conftest.undefs <<\_ACEOF 9576 s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, 9577 _ACEOF 9578 9579 # Break up conftest.defines because some shells have a limit on the size 9580 # of here documents, and old seds have small limits too (100 cmds). 9581 echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS 9582 echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS 9583 echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS 9584 echo ' :' >>$CONFIG_STATUS 9585 rm -f conftest.tail 9586 while grep . conftest.defines >/dev/null 9587 do 9588 # Write a limited-size here document to $tmp/defines.sed. 9589 echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS 9590 # Speed up: don't consider the non `#define' lines. 9591 echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS 9592 # Work around the forget-to-reset-the-flag bug. 9593 echo 't clr' >>$CONFIG_STATUS 9594 echo ': clr' >>$CONFIG_STATUS 9595 sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS 9596 echo 'CEOF 9597 sed -f $tmp/defines.sed $tmp/in >$tmp/out 9598 rm -f $tmp/in 9599 mv $tmp/out $tmp/in 9600 ' >>$CONFIG_STATUS 9601 sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail 9602 rm -f conftest.defines 9603 mv conftest.tail conftest.defines 9604 done 9605 rm -f conftest.defines 9606 echo ' fi # grep' >>$CONFIG_STATUS 9607 echo >>$CONFIG_STATUS 9608 9609 # Break up conftest.undefs because some shells have a limit on the size 9610 # of here documents, and old seds have small limits too (100 cmds). 9611 echo ' # Handle all the #undef templates' >>$CONFIG_STATUS 9612 rm -f conftest.tail 9613 while grep . conftest.undefs >/dev/null 9614 do 9615 # Write a limited-size here document to $tmp/undefs.sed. 9616 echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS 9617 # Speed up: don't consider the non `#undef' 9618 echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS 9619 # Work around the forget-to-reset-the-flag bug. 9620 echo 't clr' >>$CONFIG_STATUS 9621 echo ': clr' >>$CONFIG_STATUS 9622 sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS 9623 echo 'CEOF 9624 sed -f $tmp/undefs.sed $tmp/in >$tmp/out 9625 rm -f $tmp/in 9626 mv $tmp/out $tmp/in 9627 ' >>$CONFIG_STATUS 9628 sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail 9629 rm -f conftest.undefs 9630 mv conftest.tail conftest.undefs 9631 done 9632 rm -f conftest.undefs 9633 9634 cat >>$CONFIG_STATUS <<\_ACEOF 9635 # Let's still pretend it is `configure' which instantiates (i.e., don't 9636 # use $as_me), people would be surprised to read: 9637 # /* config.h. Generated by config.status. */ 9638 if test x"$ac_file" = x-; then 9639 echo "/* Generated by configure. */" >$tmp/config.h 9640 else 9641 echo "/* $ac_file. Generated by configure. */" >$tmp/config.h 9642 fi 9643 cat $tmp/in >>$tmp/config.h 9644 rm -f $tmp/in 9645 if test x"$ac_file" != x-; then 9646 if diff $ac_file $tmp/config.h >/dev/null 2>&1; then 9647 { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 9648 echo "$as_me: $ac_file is unchanged" >&6;} 9667 { 9668 $as_echo "/* $configure_input */" \ 9669 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 9670 } >"$tmp/config.h" \ 9671 || as_fn_error "could not create $ac_file" "$LINENO" 5 9672 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 9673 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 9674 $as_echo "$as_me: $ac_file is unchanged" >&6;} 9649 9675 else 9650 ac_dir=`(dirname "$ac_file") 2>/dev/null || 9651 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 9652 X"$ac_file" : 'X\(//\)[^/]' \| \ 9653 X"$ac_file" : 'X\(//\)$' \| \ 9654 X"$ac_file" : 'X\(/\)' \| \ 9655 . : '\(.\)' 2>/dev/null || 9656 echo X"$ac_file" | 9657 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 9658 /^X\(\/\/\)[^/].*/{ s//\1/; q; } 9659 /^X\(\/\/\)$/{ s//\1/; q; } 9660 /^X\(\/\).*/{ s//\1/; q; } 9661 s/.*/./; q'` 9662 { if $as_mkdir_p; then 9663 mkdir -p "$ac_dir" 9664 else 9665 as_dir="$ac_dir" 9666 as_dirs= 9667 while test ! -d "$as_dir"; do 9668 as_dirs="$as_dir $as_dirs" 9669 as_dir=`(dirname "$as_dir") 2>/dev/null || 9670 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 9671 X"$as_dir" : 'X\(//\)[^/]' \| \ 9672 X"$as_dir" : 'X\(//\)$' \| \ 9673 X"$as_dir" : 'X\(/\)' \| \ 9674 . : '\(.\)' 2>/dev/null || 9675 echo X"$as_dir" | 9676 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 9677 /^X\(\/\/\)[^/].*/{ s//\1/; q; } 9678 /^X\(\/\/\)$/{ s//\1/; q; } 9679 /^X\(\/\).*/{ s//\1/; q; } 9680 s/.*/./; q'` 9681 done 9682 test ! -n "$as_dirs" || mkdir $as_dirs 9683 fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 9684 echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} 9685 { (exit 1); exit 1; }; }; } 9686 9687 rm -f $ac_file 9688 mv $tmp/config.h $ac_file 9676 rm -f "$ac_file" 9677 mv "$tmp/config.h" "$ac_file" \ 9678 || as_fn_error "could not create $ac_file" "$LINENO" 5 9689 9679 fi 9690 9680 else 9691 cat $tmp/config.h 9692 rm -f $tmp/config.h 9681 $as_echo "/* $configure_input */" \ 9682 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 9683 || as_fn_error "could not create -" "$LINENO" 5 9693 9684 fi 9694 done 9685 ;; 9686 9687 9688 esac 9689 9690 done # for ac_tag 9691 9692 9693 as_fn_exit 0 9695 9694 _ACEOF 9696 9697 cat >>$CONFIG_STATUS <<\_ACEOF9698 9699 { (exit 0); exit 0; }9700 _ACEOF9701 chmod +x $CONFIG_STATUS9702 9695 ac_clean_files=$ac_clean_files_save 9696 9697 test $ac_write_fail = 0 || 9698 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 9703 9699 9704 9700 … … 9721 9717 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 9722 9718 # would make configure fail if this is the last instruction. 9723 $ac_cs_success || { (exit 1); exit 1; } 9724 fi 9725 9719 $ac_cs_success || as_fn_exit $? 9720 fi 9721 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 9722 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 9723 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} 9724 fi 9725 -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/packages/unac/configure.ac
r16583 r23508 30 30 AC_PROG_MAKE_SET 31 31 32 AC_MSG_CHECKING(to see if architecture is 64-bit) 33 arch_64bit=no 34 case "$host_cpu" in 35 x86_64) arch_64bit=yes ;; 36 esac 37 38 if test "$arch_64bit" = yes; then 39 AC_MSG_RESULT(yes) 40 if test -z "$COMPAT32BITFLAGS" ; then 41 COMPAT32BITFLAGS="-m32" 42 fi 43 else 44 AC_MSG_RESULT(no) 45 if test -z "$COMPAT32BITFLAGS" ; then 46 COMPAT32BITFLAGS= 47 fi 48 fi 49 AC_SUBST(COMPAT32BITFLAGS) 32 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 33 dnl arch_64bit=no 34 dnl case "$host_cpu" in 35 dnl x86_64) arch_64bit=yes ;; 36 dnl esac 50 37 51 38 dnl -
main/branches/64_bit_Greenstone/greenstone2/common-src/packages/configure
r23356 r23508 146 146 fi 147 147 148 cd "$PACKAGES/expat/expat-1.95.8"149 150 if test -e Makefile ; then151 echo make distclean && \152 make distclean153 fi154 155 148 #Configure and compile 32-bit expat 156 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 157 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 158 159 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $ENVIRONMENT 160 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $ENVIRONMENT 161 162 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $ENVIRONMENT 163 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $ENVIRONMENT 164 165 echo make distclean && \ 166 make distclean 167 168 if test ! -z "$COMPAT32BITFLAGS" ; then 169 echo "Generating native 64-bit version of expat" 170 #Configure and compile 64-bit expat 171 echo ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 172 ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 173 174 echo make $ENVIRONMENT 175 make $ENVIRONMENT 176 177 echo make install $ENVIRONMENT 178 make install $ENVIRONMENT 179 180 echo make distclean && \ 181 make distclean 182 fi 149 echo ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 150 151 cd "$PACKAGES/expat/expat-1.95.8" && \ 152 ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 153 154 echo make $ENVIRONMENT 155 make $ENVIRONMENT 156 157 echo make install $ENVIRONMENT 158 make install $ENVIRONMENT 183 159 184 160 # configure and compile libiconv during configuration stage … … 192 168 fi 193 169 194 cd "$PACKAGES/iconv/libiconv-1.13.1"195 196 if test -e Makefile ; then197 echo make distclean && \198 make distclean199 fi200 201 170 # configure 202 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 203 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 171 echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 172 173 cd "$PACKAGES/iconv/libiconv-1.13.1" && \ 174 ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 204 175 205 176 # make 206 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS"make $ENVIRONMENT207 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS"make $ENVIRONMENT177 echo make $ENVIRONMENT 178 make $ENVIRONMENT 208 179 209 180 # make install 210 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $ENVIRONMENT 211 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $ENVIRONMENT 212 213 if test ! -z "$COMPAT32BITFLAGS" ; then 214 echo "Generating native 64-bit version of iconv" 215 # used in apache web server, for example 216 217 # distclean 218 echo make distclean && \ 219 make distclean 220 221 # configure 222 echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 223 ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT 224 225 # make 226 echo make $ENVIRONMENT 227 make $ENVIRONMENT 228 229 # make install 230 echo make install $ENVIRONMENT 231 make install $ENVIRONMENT 232 fi 233 234 echo make distclean && \ 235 make distclean 181 echo make install $ENVIRONMENT 182 make install $ENVIRONMENT 236 183 237 184 #./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&& … … 296 243 fi 297 244 298 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS"./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT245 echo ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 299 246 300 247 cd "$PACKAGES/sqlite/sqlite-amalgamation-3.6.23.1" && \ 301 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS"./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT248 ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 302 249 else 303 250 echo "SQLite support disabled." … … 312 259 cd "$PACKAGES/search4j" 313 260 314 #echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure --bindir="$GSDLHOME/bin/$GSDLOS" $CACHE_FILE $HOSTTARGETFLAGS $ENVIRONMENT 261 315 262 echo ./configure --bindir="$GSDLHOME/bin/$GSDLOS" $CACHE_FILE $HOSTTARGETFLAGS $ENVIRONMENT 316 263 317 264 cd "$PACKAGES/search4j" && \ 318 265 ./configure --bindir="$GSDLHOME/bin/$GSDLOS" $CACHE_FILE $HOSTTARGETFLAGS $ENVIRONMENT 319 # CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure --bindir="$GSDLHOME/bin/$GSDLOS" $CACHE_FILE $HOSTTARGETFLAGS $ENVIRONMENT -
main/branches/64_bit_Greenstone/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/Makefile.in
r22259 r23508 27 27 LIBS = @LIBS@ -lc 28 28 29 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@30 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@29 CFLAGS = @CFLAGS@ 30 LDFLAGS = @LDFLAGS@ 31 31 32 32 ifeq ($(GSDLOS), "windows") -
main/branches/64_bit_Greenstone/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure.in
r21432 r23508 21 21 dnl x86_64) arch_64bit=yes ;; 22 22 dnl esac 23 dnl24 dnl if test "$arch_64bit" = yes; then25 dnl AC_MSG_RESULT(yes)26 dnl if test -z "$COMPAT32BITFLAGS" ; then27 dnl COMPAT32BITFLAGS="-m32"28 dnl LIBTOOLCOMPAT32BITFLAGS="-Wl,-m32"29 dnl fi30 dnl else31 dnl AC_MSG_RESULT(no)32 dnl if test -z "$COMPAT32BITFLAGS" ; then33 dnl COMPAT32BITFLAGS=34 dnl LIBTOOLCOMPAT32BITFLAGS=35 dnl fi36 dnl fi37 dnl export COMPAT32BITFLAGS38 dnl AC_SUBST(COMPAT32BITFLAGS)39 40 41 AC_DEFINE_UNQUOTED(COMPAT32BITFLAGS, $COMPAT32BITFLAGS)42 AC_SUBST(COMPAT32BITFLAGS)43 44 23 45 24 AC_C_CONST -
main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/db2txt/Makefile.in
r22077 r23508 31 31 32 32 CXX = @CXX@ 33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@33 CXXFLAGS = @CXXFLAGS@ 34 34 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 35 35 GSDLOS = @gsdlos@ 36 36 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 37 37 INSTALL = @INSTALL@ 38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@38 LDFLAGS = @LDFLAGS@ 39 39 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 40 40 -
main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/gdbmdel/Makefile.in
r22077 r23508 31 31 32 32 CXX = @CXX@ 33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@33 CXXFLAGS = @CXXFLAGS@ 34 34 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 35 35 GSDLOS = @gsdlos@ 36 36 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 37 37 INSTALL = @INSTALL@ 38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@38 LDFLAGS = @LDFLAGS@ 39 39 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 40 40 -
main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/gdbmkeys/Makefile.in
r22077 r23508 31 31 32 32 CXX = @CXX@ 33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@33 CXXFLAGS = @CXXFLAGS@ 34 34 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 35 35 GSDLOS = @gsdlos@ 36 36 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 37 37 INSTALL = @INSTALL@ 38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@38 LDFLAGS = @LDFLAGS@ 39 39 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 40 40 -
main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/gdbmset/Makefile.in
r22077 r23508 31 31 32 32 CXX = @CXX@ 33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@33 CXXFLAGS = @CXXFLAGS@ 34 34 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 35 35 GSDLOS = @gsdlos@ 36 36 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 37 37 INSTALL = @INSTALL@ 38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@38 LDFLAGS = @LDFLAGS@ 39 39 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 40 40 -
main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/txt2db/Makefile.in
r22077 r23508 31 31 32 32 CXX = @CXX@ 33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@33 CXXFLAGS = @CXXFLAGS@ 34 34 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 35 35 GSDLOS = @gsdlos@ 36 36 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 37 37 INSTALL = @INSTALL@ 38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@38 LDFLAGS = @LDFLAGS@ 39 39 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 40 40 -
main/branches/64_bit_Greenstone/greenstone2/common-src/src/getpw/Makefile.in
r19875 r23508 28 28 29 29 CXX = @CXX@ 30 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@30 CXXFLAGS = @CXXFLAGS@ 31 31 DEFS = @DEFS@ 32 32 GSDLOS = @gsdlos@ 33 33 INCLUDES = -I$(COMMON_DIR) -I$(COMMON_DIR)/src/lib 34 34 INSTALL = @INSTALL@ 35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@35 LDFLAGS = @LDFLAGS@ 36 36 LIBS = @LIBS@ 37 37 -
main/branches/64_bit_Greenstone/greenstone2/common-src/src/lib/Makefile.in
r22793 r23508 71 71 AR = ar 72 72 CXX = @CXX@ 73 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@73 CXXFLAGS = @CXXFLAGS@ 74 74 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 75 75 INCLUDES = -I. -I$(COMMON_DIR) $(GDBM_INCLUDES) $(SQLITE_INCLUDES) -
main/branches/64_bit_Greenstone/greenstone2/configure
r23356 r23508 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 7.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 5 # 6 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010 Free Software8 # Foundation,Inc.7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 9 # 10 10 # … … 317 317 done 318 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 320 321 321 … … 357 357 358 358 359 # as_fn_error STATUSERROR [LINENO LOG_FD]360 # --------------------------------- -------359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with STATUS, using 1 if that was 0.363 # script with status $?, using 1 if that was 0. 364 364 as_fn_error () 365 365 { 366 as_status=$ 1; test $as_status -eq 0 && as_status=1367 if test "$ 4"; then368 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 370 fi 371 $as_echo "$as_me: error: $ 2" >&2371 $as_echo "$as_me: error: $1" >&2 372 372 as_fn_exit $as_status 373 373 } # as_fn_error … … 531 531 532 532 # Name of the host. 533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 534 534 # so uname gets run too. 535 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 605 605 CPP 606 606 MICO_VER 607 COMPAT32BITFLAGS608 607 RANLIB 609 608 SET_MAKE … … 791 790 792 791 case $ac_option in 793 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 794 *=) ac_optarg= ;; 795 *) ac_optarg=yes ;; 792 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 793 *) ac_optarg=yes ;; 796 794 esac 797 795 … … 838 836 # Reject names that are not valid shell variable names. 839 837 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 840 as_fn_error $?"invalid feature name: $ac_useropt"838 as_fn_error "invalid feature name: $ac_useropt" 841 839 ac_useropt_orig=$ac_useropt 842 840 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 864 862 # Reject names that are not valid shell variable names. 865 863 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 866 as_fn_error $?"invalid feature name: $ac_useropt"864 as_fn_error "invalid feature name: $ac_useropt" 867 865 ac_useropt_orig=$ac_useropt 868 866 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1068 1066 # Reject names that are not valid shell variable names. 1069 1067 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1070 as_fn_error $?"invalid package name: $ac_useropt"1068 as_fn_error "invalid package name: $ac_useropt" 1071 1069 ac_useropt_orig=$ac_useropt 1072 1070 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1084 1082 # Reject names that are not valid shell variable names. 1085 1083 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1086 as_fn_error $?"invalid package name: $ac_useropt"1084 as_fn_error "invalid package name: $ac_useropt" 1087 1085 ac_useropt_orig=$ac_useropt 1088 1086 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1114 1112 x_libraries=$ac_optarg ;; 1115 1113 1116 -*) as_fn_error $?"unrecognized option: \`$ac_option'1117 Try \`$0 --help' for more information "1114 -*) as_fn_error "unrecognized option: \`$ac_option' 1115 Try \`$0 --help' for more information." 1118 1116 ;; 1119 1117 … … 1123 1121 case $ac_envvar in #( 1124 1122 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1125 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1123 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1126 1124 esac 1127 1125 eval $ac_envvar=\$ac_optarg … … 1141 1139 if test -n "$ac_prev"; then 1142 1140 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1143 as_fn_error $?"missing argument to $ac_option"1141 as_fn_error "missing argument to $ac_option" 1144 1142 fi 1145 1143 … … 1147 1145 case $enable_option_checking in 1148 1146 no) ;; 1149 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1147 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1150 1148 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1151 1149 esac … … 1170 1168 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1171 1169 esac 1172 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1170 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1173 1171 done 1174 1172 … … 1184 1182 if test "x$build_alias" = x; then 1185 1183 cross_compiling=maybe 1186 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1187 If a cross compiler is detected then cross compile mode will be used " >&21184 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1185 If a cross compiler is detected then cross compile mode will be used." >&2 1188 1186 elif test "x$build_alias" != "x$host_alias"; then 1189 1187 cross_compiling=yes … … 1200 1198 ac_ls_di=`ls -di .` && 1201 1199 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1202 as_fn_error $?"working directory cannot be determined"1200 as_fn_error "working directory cannot be determined" 1203 1201 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1204 as_fn_error $?"pwd does not report name of working directory"1202 as_fn_error "pwd does not report name of working directory" 1205 1203 1206 1204 … … 1241 1239 if test ! -r "$srcdir/$ac_unique_file"; then 1242 1240 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1243 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1241 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1244 1242 fi 1245 1243 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1246 1244 ac_abs_confdir=`( 1247 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1245 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1248 1246 pwd)` 1249 1247 # When building in place, set srcdir=. … … 1285 1283 --help=recursive display the short help of all the included packages 1286 1284 -V, --version display version information and exit 1287 -q, --quiet, --silent do not print \`checking 1285 -q, --quiet, --silent do not print \`checking...' messages 1288 1286 --cache-file=FILE cache test results in FILE [disabled] 1289 1287 -C, --config-cache alias for \`--cache-file=config.cache' … … 1449 1447 cat <<\_ACEOF 1450 1448 configure 1451 generated by GNU Autoconf 2.6 71452 1453 Copyright (C) 20 10Free Software Foundation, Inc.1449 generated by GNU Autoconf 2.65 1450 1451 Copyright (C) 2009 Free Software Foundation, Inc. 1454 1452 This configure script is free software; the Free Software Foundation 1455 1453 gives unlimited permission to copy, distribute and modify it. … … 1559 1557 fi 1560 1558 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1561 test $ac_status = 0; } > conftest.i&& {1559 test $ac_status = 0; } >/dev/null && { 1562 1560 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1563 1561 test ! -s conftest.err … … 1583 1581 { 1584 1582 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1585 if eval "test \"\${$3+set}\"" = set; then :1583 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1586 1584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1587 1585 $as_echo_n "checking for $2... " >&6; } 1588 if eval "test \"\${$3+set}\"" = set; then :1586 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1589 1587 $as_echo_n "(cached) " >&6 1590 1588 fi … … 1622 1620 ac_header_preproc=no 1623 1621 fi 1624 rm -f conftest.err conftest. i conftest.$ac_ext1622 rm -f conftest.err conftest.$ac_ext 1625 1623 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1626 1624 $as_echo "$ac_header_preproc" >&6; } … … 1649 1647 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1650 1648 $as_echo_n "checking for $2... " >&6; } 1651 if eval "test \"\${$3+set}\"" = set; then :1649 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1652 1650 $as_echo_n "(cached) " >&6 1653 1651 else … … 1713 1711 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1714 1712 $as_echo_n "checking for $2... " >&6; } 1715 if eval "test \"\${$3+set}\"" = set; then :1713 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1716 1714 $as_echo_n "(cached) " >&6 1717 1715 else … … 1790 1788 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1791 1789 $as_echo_n "checking for $2... " >&6; } 1792 if eval "test \"\${$3+set}\"" = set; then :1790 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1793 1791 $as_echo_n "(cached) " >&6 1794 1792 else … … 1843 1841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1844 1842 $as_echo_n "checking for $2... " >&6; } 1845 if eval "test \"\${$3+set}\"" = set; then :1843 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1846 1844 $as_echo_n "(cached) " >&6 1847 1845 else … … 1948 1946 1949 1947 It was created by $as_me, which was 1950 generated by GNU Autoconf 2.6 7. Invocation command line was1948 generated by GNU Autoconf 2.65. Invocation command line was 1951 1949 1952 1950 $ $0 $@ … … 2058 2056 echo 2059 2057 2060 $as_echo "## ---------------- ## 2058 cat <<\_ASBOX 2059 ## ---------------- ## 2061 2060 ## Cache variables. ## 2062 ## ---------------- ##" 2061 ## ---------------- ## 2062 _ASBOX 2063 2063 echo 2064 2064 # The following way of writing the cache mishandles newlines in values, … … 2094 2094 echo 2095 2095 2096 $as_echo "## ----------------- ## 2096 cat <<\_ASBOX 2097 ## ----------------- ## 2097 2098 ## Output variables. ## 2098 ## ----------------- ##" 2099 ## ----------------- ## 2100 _ASBOX 2099 2101 echo 2100 2102 for ac_var in $ac_subst_vars … … 2109 2111 2110 2112 if test -n "$ac_subst_files"; then 2111 $as_echo "## ------------------- ## 2113 cat <<\_ASBOX 2114 ## ------------------- ## 2112 2115 ## File substitutions. ## 2113 ## ------------------- ##" 2116 ## ------------------- ## 2117 _ASBOX 2114 2118 echo 2115 2119 for ac_var in $ac_subst_files … … 2125 2129 2126 2130 if test -s confdefs.h; then 2127 $as_echo "## ----------- ## 2131 cat <<\_ASBOX 2132 ## ----------- ## 2128 2133 ## confdefs.h. ## 2129 ## ----------- ##" 2134 ## ----------- ## 2135 _ASBOX 2130 2136 echo 2131 2137 cat confdefs.h … … 2182 2188 ac_site_file2=NONE 2183 2189 if test -n "$CONFIG_SITE"; then 2184 # We do not want a PATH search for config.site. 2185 case $CONFIG_SITE in #(( 2186 -*) ac_site_file1=./$CONFIG_SITE;; 2187 */*) ac_site_file1=$CONFIG_SITE;; 2188 *) ac_site_file1=./$CONFIG_SITE;; 2189 esac 2190 ac_site_file1=$CONFIG_SITE 2190 2191 elif test "x$prefix" != xNONE; then 2191 2192 ac_site_file1=$prefix/share/config.site … … 2202 2203 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2203 2204 sed 's/^/| /' "$ac_site_file" >&5 2204 . "$ac_site_file" \ 2205 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2206 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2207 as_fn_error $? "failed to load site script $ac_site_file 2208 See \`config.log' for more details" "$LINENO" 5 ; } 2205 . "$ac_site_file" 2209 2206 fi 2210 2207 done … … 2282 2279 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2283 2280 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2284 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52281 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2285 2282 fi 2286 2283 ## -------------------- ## … … 2863 2860 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2864 2861 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2865 as_fn_error $?"no acceptable C compiler found in \$PATH2866 See \`config.log' for more details " "$LINENO" 5; }2862 as_fn_error "no acceptable C compiler found in \$PATH 2863 See \`config.log' for more details." "$LINENO" 5; } 2867 2864 2868 2865 # Provide some information about the compiler. … … 2978 2975 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2979 2976 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2980 as_fn_error 77 "C compiler cannot create executables 2981 See \`config.log' for more details" "$LINENO" 5 ; } 2977 { as_fn_set_status 77 2978 as_fn_error "C compiler cannot create executables 2979 See \`config.log' for more details." "$LINENO" 5; }; } 2982 2980 else 2983 2981 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 … … 3021 3019 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3022 3020 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3023 as_fn_error $?"cannot compute suffix of executables: cannot compile and link3024 See \`config.log' for more details " "$LINENO" 5; }3021 as_fn_error "cannot compute suffix of executables: cannot compile and link 3022 See \`config.log' for more details." "$LINENO" 5; } 3025 3023 fi 3026 3024 rm -f conftest conftest$ac_cv_exeext … … 3079 3077 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3080 3078 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3081 as_fn_error $?"cannot run C compiled programs.3079 as_fn_error "cannot run C compiled programs. 3082 3080 If you meant to cross compile, use \`--host'. 3083 See \`config.log' for more details " "$LINENO" 5; }3081 See \`config.log' for more details." "$LINENO" 5; } 3084 3082 fi 3085 3083 fi … … 3132 3130 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3133 3131 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3134 as_fn_error $?"cannot compute suffix of object files: cannot compile3135 See \`config.log' for more details " "$LINENO" 5; }3132 as_fn_error "cannot compute suffix of object files: cannot compile 3133 See \`config.log' for more details." "$LINENO" 5; } 3136 3134 fi 3137 3135 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3697 3695 ac_aux_dir= 3698 3696 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 3699 if test -f "$ac_dir/install-sh"; then 3700 ac_aux_dir=$ac_dir 3701 ac_install_sh="$ac_aux_dir/install-sh -c" 3702 break 3703 elif test -f "$ac_dir/install.sh"; then 3704 ac_aux_dir=$ac_dir 3705 ac_install_sh="$ac_aux_dir/install.sh -c" 3706 break 3707 elif test -f "$ac_dir/shtool"; then 3708 ac_aux_dir=$ac_dir 3709 ac_install_sh="$ac_aux_dir/shtool install -c" 3710 break 3711 fi 3697 for ac_t in install-sh install.sh shtool; do 3698 if test -f "$ac_dir/$ac_t"; then 3699 ac_aux_dir=$ac_dir 3700 ac_install_sh="$ac_aux_dir/$ac_t -c" 3701 break 2 3702 fi 3703 done 3712 3704 done 3713 3705 if test -z "$ac_aux_dir"; then 3714 as_fn_error $?"cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 53706 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 3715 3707 fi 3716 3708 … … 3726 3718 # Make sure we can run config.sub. 3727 3719 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 3728 as_fn_error $?"cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 53720 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 3729 3721 3730 3722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 … … 3737 3729 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 3738 3730 test "x$ac_build_alias" = x && 3739 as_fn_error $?"cannot guess build type; you must specify one" "$LINENO" 53731 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 3740 3732 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 3741 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 53733 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 3742 3734 3743 3735 fi … … 3746 3738 case $ac_cv_build in 3747 3739 *-*-*) ;; 3748 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;3740 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 3749 3741 esac 3750 3742 build=$ac_cv_build … … 3771 3763 else 3772 3764 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 3773 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 53765 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 3774 3766 fi 3775 3767 … … 3779 3771 case $ac_cv_host in 3780 3772 *-*-*) ;; 3781 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;3773 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 3782 3774 esac 3783 3775 host=$ac_cv_host … … 3804 3796 else 3805 3797 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 3806 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 53798 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 3807 3799 fi 3808 3800 … … 3812 3804 case $ac_cv_target in 3813 3805 *-*-*) ;; 3814 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;3806 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 3815 3807 esac 3816 3808 target=$ac_cv_target … … 3943 3935 set x ${MAKE-make} 3944 3936 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 3945 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :3937 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 3946 3938 $as_echo_n "(cached) " >&6 3947 3939 else … … 3951 3943 @echo '@@@%%%=$(MAKE)=@@@%%%' 3952 3944 _ACEOF 3953 # GNU make sometimes prints "make[1]: Entering 3945 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 3954 3946 case `${MAKE-make} -f conftest.make 2>/dev/null` in 3955 3947 *@@@%%%=?*=@@@%%%*) … … 4061 4053 RANLIB="$ac_cv_prog_RANLIB" 4062 4054 fi 4063 4064 4065 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&54066 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }4067 arch_64bit=no4068 case "$host_cpu" in4069 x86_64) arch_64bit=yes ;;4070 esac4071 4072 if test "$arch_64bit" = yes; then4073 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&54074 $as_echo "yes" >&6; }4075 if test -z "$COMPAT32BITFLAGS" ; then4076 if test "$ENABLE_MG" = "1" -o "$ENABLE_MGPP" = "1" ; then4077 COMPAT32BITFLAGS="-m32"4078 fi4079 fi4080 else4081 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&54082 $as_echo "no" >&6; }4083 if test -z "$COMPAT32BITFLAGS" ; then4084 COMPAT32BITFLAGS=4085 fi4086 fi4087 4088 export COMPAT32BITFLAGS4089 4055 4090 4056 … … 4163 4129 continue 4164 4130 fi 4165 rm -f conftest.err conftest. i conftest.$ac_ext4131 rm -f conftest.err conftest.$ac_ext 4166 4132 4167 4133 # OK, works on sane cases. Now check whether nonexistent headers … … 4179 4145 break 4180 4146 fi 4181 rm -f conftest.err conftest. i conftest.$ac_ext4147 rm -f conftest.err conftest.$ac_ext 4182 4148 4183 4149 done 4184 4150 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4185 rm -f conftest. i conftest.err conftest.$ac_ext4151 rm -f conftest.err conftest.$ac_ext 4186 4152 if $ac_preproc_ok; then : 4187 4153 break … … 4222 4188 continue 4223 4189 fi 4224 rm -f conftest.err conftest. i conftest.$ac_ext4190 rm -f conftest.err conftest.$ac_ext 4225 4191 4226 4192 # OK, works on sane cases. Now check whether nonexistent headers … … 4238 4204 break 4239 4205 fi 4240 rm -f conftest.err conftest. i conftest.$ac_ext4206 rm -f conftest.err conftest.$ac_ext 4241 4207 4242 4208 done 4243 4209 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4244 rm -f conftest. i conftest.err conftest.$ac_ext4210 rm -f conftest.err conftest.$ac_ext 4245 4211 if $ac_preproc_ok; then : 4246 4212 … … 4248 4214 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4249 4215 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4250 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4251 See \`config.log' for more details " "$LINENO" 5; }4216 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4217 See \`config.log' for more details." "$LINENO" 5; } 4252 4218 fi 4253 4219 … … 4310 4276 IFS=$as_save_IFS 4311 4277 if test -z "$ac_cv_path_GREP"; then 4312 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54278 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4313 4279 fi 4314 4280 else … … 4376 4342 IFS=$as_save_IFS 4377 4343 if test -z "$ac_cv_path_EGREP"; then 4378 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54344 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4379 4345 fi 4380 4346 else … … 4508 4474 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4509 4475 " 4510 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4476 eval as_val=\$$as_ac_Header 4477 if test "x$as_val" = x""yes; then : 4511 4478 cat >>confdefs.h <<_ACEOF 4512 4479 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5024 4991 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 5025 4992 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 5026 if eval "test \"\${$as_ac_Header+set}\"" = set; then :4993 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 5027 4994 $as_echo_n "(cached) " >&6 5028 4995 else … … 5051 5018 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 5052 5019 $as_echo "$ac_res" >&6; } 5053 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5020 eval as_val=\$$as_ac_Header 5021 if test "x$as_val" = x""yes; then : 5054 5022 cat >>confdefs.h <<_ACEOF 5055 5023 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 … … 5293 5261 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5294 5262 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5295 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5263 eval as_val=\$$as_ac_Header 5264 if test "x$as_val" = x""yes; then : 5296 5265 cat >>confdefs.h <<_ACEOF 5297 5266 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5466 5435 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5467 5436 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5468 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5437 eval as_val=\$$as_ac_var 5438 if test "x$as_val" = x""yes; then : 5469 5439 5470 5440 cat >>confdefs.h <<_ACEOF … … 5626 5596 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5627 5597 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5628 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5598 eval as_val=\$$as_ac_var 5599 if test "x$as_val" = x""yes; then : 5629 5600 cat >>confdefs.h <<_ACEOF 5630 5601 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 … … 5634 5605 done 5635 5606 5636 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 5637 if test "x$ac_cv_func_ftruncate" = x""yes; then : 5638 $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 5607 for ac_func in ftruncate strstr strcasecmp 5608 do : 5609 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5610 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5611 eval as_val=\$$as_ac_var 5612 if test "x$as_val" = x""yes; then : 5613 cat >>confdefs.h <<_ACEOF 5614 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 5615 _ACEOF 5639 5616 5640 5617 else 5641 5618 case " $LIBOBJS " in 5642 *" ftruncate.$ac_objext "* ) ;;5643 *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"5619 *" $ac_func.$ac_objext "* ) ;; 5620 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 5644 5621 ;; 5645 5622 esac 5646 5623 5647 5624 fi 5648 5649 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 5650 if test "x$ac_cv_func_strstr" = x""yes; then : 5651 $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 5652 5653 else 5654 case " $LIBOBJS " in 5655 *" strstr.$ac_objext "* ) ;; 5656 *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 5657 ;; 5658 esac 5659 5660 fi 5661 5662 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 5663 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 5664 $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 5665 5666 else 5667 case " $LIBOBJS " in 5668 *" strcasecmp.$ac_objext "* ) ;; 5669 *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 5670 ;; 5671 esac 5672 5673 fi 5625 done 5674 5626 5675 5627 … … 5841 5793 { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5 5842 5794 $as_echo "\"no\"" >&6; } 5843 as_fn_error $?"\"Perl 5 not available - cannot install\"" "$LINENO" 55795 as_fn_error "\"Perl 5 not available - cannot install\"" "$LINENO" 5 5844 5796 fi 5845 5797 … … 5910 5862 { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5 5911 5863 $as_echo "\"yes\"" >&6; } 5912 as_fn_error $?"\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 55864 as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5 5913 5865 fi 5914 5866 … … 6142 6094 ;; #( 6143 6095 *) 6144 as_fn_error $?"unknown endianness6145 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 6096 as_fn_error "unknown endianness 6097 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 6146 6098 esac 6147 6099 … … 6289 6241 ac_libobjs= 6290 6242 ac_ltlibobjs= 6291 U=6292 6243 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 6293 6244 # 1. Remove the extension, and $U if already installed. … … 6452 6403 6453 6404 6454 # as_fn_error STATUSERROR [LINENO LOG_FD]6455 # --------------------------------- -------6405 # as_fn_error ERROR [LINENO LOG_FD] 6406 # --------------------------------- 6456 6407 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 6457 6408 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 6458 # script with STATUS, using 1 if that was 0.6409 # script with status $?, using 1 if that was 0. 6459 6410 as_fn_error () 6460 6411 { 6461 as_status=$ 1; test $as_status -eq 0 && as_status=16462 if test "$ 4"; then6463 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack6464 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$46412 as_status=$?; test $as_status -eq 0 && as_status=1 6413 if test "$3"; then 6414 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6415 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 6465 6416 fi 6466 $as_echo "$as_me: error: $ 2" >&26417 $as_echo "$as_me: error: $1" >&2 6467 6418 as_fn_exit $as_status 6468 6419 } # as_fn_error … … 6660 6611 done 6661 6612 test -z "$as_dirs" || eval "mkdir $as_dirs" 6662 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"6613 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 6663 6614 6664 6615 … … 6714 6665 ac_log=" 6715 6666 This file was extended by $as_me, which was 6716 generated by GNU Autoconf 2.6 7. Invocation command line was6667 generated by GNU Autoconf 2.65. Invocation command line was 6717 6668 6718 6669 CONFIG_FILES = $CONFIG_FILES … … 6776 6727 ac_cs_version="\\ 6777 6728 config.status 6778 configured by $0, generated by GNU Autoconf 2.6 7,6729 configured by $0, generated by GNU Autoconf 2.65, 6779 6730 with options \\"\$ac_cs_config\\" 6780 6731 6781 Copyright (C) 20 10Free Software Foundation, Inc.6732 Copyright (C) 2009 Free Software Foundation, Inc. 6782 6733 This config.status script is free software; the Free Software Foundation 6783 6734 gives unlimited permission to copy, distribute and modify it." … … 6796 6747 do 6797 6748 case $1 in 6798 --*= ?*)6749 --*=*) 6799 6750 ac_option=`expr "X$1" : 'X\([^=]*\)='` 6800 6751 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 6801 ac_shift=:6802 ;;6803 --*=)6804 ac_option=`expr "X$1" : 'X\([^=]*\)='`6805 ac_optarg=6806 6752 ac_shift=: 6807 6753 ;; … … 6827 6773 case $ac_optarg in 6828 6774 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 6829 '') as_fn_error $? "missing file argument" ;;6830 6775 esac 6831 6776 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 6840 6785 --he | --h) 6841 6786 # Conflict between --help and --header 6842 as_fn_error $?"ambiguous option: \`$1'6787 as_fn_error "ambiguous option: \`$1' 6843 6788 Try \`$0 --help' for more information.";; 6844 6789 --help | --hel | -h ) … … 6849 6794 6850 6795 # This is an error. 6851 -*) as_fn_error $?"unrecognized option: \`$1'6796 -*) as_fn_error "unrecognized option: \`$1' 6852 6797 Try \`$0 --help' for more information." ;; 6853 6798 … … 6903 6848 "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;; 6904 6849 6905 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;6850 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 6906 6851 esac 6907 6852 done … … 6940 6885 tmp=./conf$$-$RANDOM 6941 6886 (umask 077 && mkdir "$tmp") 6942 } || as_fn_error $?"cannot create a temporary directory in ." "$LINENO" 56887 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 6943 6888 6944 6889 # Set up the scripts for CONFIG_FILES section. … … 6957 6902 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 6958 6903 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 6959 ac_cs_awk_cr='\ \r'6904 ac_cs_awk_cr='\r' 6960 6905 else 6961 6906 ac_cs_awk_cr=$ac_cr … … 6971 6916 echo "_ACEOF" 6972 6917 } >conf$$subs.sh || 6973 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 56974 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`6918 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6919 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 6975 6920 ac_delim='%!_!# ' 6976 6921 for ac_last_try in false false false false false :; do 6977 6922 . ./conf$$subs.sh || 6978 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 56923 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6979 6924 6980 6925 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 6982 6927 break 6983 6928 elif $ac_last_try; then 6984 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 56929 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6985 6930 else 6986 6931 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7071 7016 cat 7072 7017 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 7073 || as_fn_error $?"could not setup config files machinery" "$LINENO" 57074 _ACEOF 7075 7076 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),7077 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and7018 || as_fn_error "could not setup config files machinery" "$LINENO" 5 7019 _ACEOF 7020 7021 # VPATH may cause trouble with some makes, so we remove $(srcdir), 7022 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 7078 7023 # trailing colons and then remove the whole line if VPATH becomes empty 7079 7024 # (actually we leave an empty line to preserve line numbers). 7080 7025 if test "x$srcdir" = x.; then 7081 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 7082 h 7083 s/// 7084 s/^/:/ 7085 s/[ ]*$/:/ 7086 s/:\$(srcdir):/:/g 7087 s/:\${srcdir}:/:/g 7088 s/:@srcdir@:/:/g 7089 s/^:*// 7026 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 7027 s/:*\$(srcdir):*/:/ 7028 s/:*\${srcdir}:*/:/ 7029 s/:*@srcdir@:*/:/ 7030 s/^\([^=]*=[ ]*\):*/\1/ 7090 7031 s/:*$// 7091 x7092 s/\(=[ ]*\).*/\1/7093 G7094 s/\n//7095 7032 s/^[^=]*=[ ]*$// 7096 7033 }' … … 7120 7057 break 7121 7058 elif $ac_last_try; then 7122 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 57059 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 7123 7060 else 7124 7061 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7205 7142 _ACEOF 7206 7143 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 7207 as_fn_error $?"could not setup config headers machinery" "$LINENO" 57144 as_fn_error "could not setup config headers machinery" "$LINENO" 5 7208 7145 fi # test -n "$CONFIG_HEADERS" 7209 7146 … … 7218 7155 case $ac_mode$ac_tag in 7219 7156 :[FHL]*:*);; 7220 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;7157 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 7221 7158 :[FH]-) ac_tag=-:-;; 7222 7159 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 7246 7183 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 7247 7184 esac || 7248 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;7185 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 7249 7186 esac 7250 7187 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 7273 7210 case $ac_tag in 7274 7211 *:-:* | *:-) cat >"$tmp/stdin" \ 7275 || as_fn_error $? "could not create $ac_file" "$LINENO" 5;;7212 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 7276 7213 esac 7277 7214 ;; … … 7404 7341 " 7405 7342 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 7406 || as_fn_error $?"could not create $ac_file" "$LINENO" 57343 || as_fn_error "could not create $ac_file" "$LINENO" 5 7407 7344 7408 7345 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && … … 7410 7347 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 7411 7348 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7412 which seems to be undefined. Please make sure it is defined " >&57349 which seems to be undefined. Please make sure it is defined." >&5 7413 7350 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7414 which seems to be undefined. Please make sure it is defined " >&2;}7351 which seems to be undefined. Please make sure it is defined." >&2;} 7415 7352 7416 7353 rm -f "$tmp/stdin" … … 7419 7356 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 7420 7357 esac \ 7421 || as_fn_error $?"could not create $ac_file" "$LINENO" 57358 || as_fn_error "could not create $ac_file" "$LINENO" 5 7422 7359 ;; 7423 7360 :H) … … 7430 7367 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 7431 7368 } >"$tmp/config.h" \ 7432 || as_fn_error $?"could not create $ac_file" "$LINENO" 57369 || as_fn_error "could not create $ac_file" "$LINENO" 5 7433 7370 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 7434 7371 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 … … 7437 7374 rm -f "$ac_file" 7438 7375 mv "$tmp/config.h" "$ac_file" \ 7439 || as_fn_error $?"could not create $ac_file" "$LINENO" 57376 || as_fn_error "could not create $ac_file" "$LINENO" 5 7440 7377 fi 7441 7378 else 7442 7379 $as_echo "/* $configure_input */" \ 7443 7380 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 7444 || as_fn_error $?"could not create -" "$LINENO" 57381 || as_fn_error "could not create -" "$LINENO" 5 7445 7382 fi 7446 7383 ;; … … 7457 7394 7458 7395 test $ac_write_fail = 0 || 7459 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 57396 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 7460 7397 7461 7398 … … 7478 7415 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7479 7416 # would make configure fail if this is the last instruction. 7480 $ac_cs_success || as_fn_exit 17417 $ac_cs_success || as_fn_exit $? 7481 7418 fi 7482 7419 … … 7619 7556 eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ 7620 7557 --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || 7621 as_fn_error $?"$ac_sub_configure failed for $ac_dir" "$LINENO" 57558 as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 7622 7559 fi 7623 7560 -
main/branches/64_bit_Greenstone/greenstone2/configure.in
r23356 r23508 224 224 AC_PROG_RANLIB 225 225 226 AC_MSG_CHECKING(to see if architecture is 64-bit) 227 arch_64bit=no 228 case "$host_cpu" in 229 x86_64) arch_64bit=yes ;; 230 esac 231 232 if test "$arch_64bit" = yes; then 233 AC_MSG_RESULT(yes) 234 if test -z "$COMPAT32BITFLAGS" ; then 235 if test "$ENABLE_MG" = "1" -o "$ENABLE_MGPP" = "1" ; then 236 COMPAT32BITFLAGS="-m32" 237 fi 238 fi 239 else 240 AC_MSG_RESULT(no) 241 if test -z "$COMPAT32BITFLAGS" ; then 242 COMPAT32BITFLAGS= 243 fi 244 fi 245 246 export COMPAT32BITFLAGS 247 AC_SUBST(COMPAT32BITFLAGS) 248 226 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 227 dnl arch_64bit=no 228 dnl case "$host_cpu" in 229 dnl x86_64) arch_64bit=yes ;; 230 dnl esac 249 231 250 232 #moved CORBA MICO directory test to get version of MICO -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/configure
r23356 r23508 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 7.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 5 # 6 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010 Free Software8 # Foundation,Inc.7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 9 # 10 10 # … … 317 317 done 318 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 320 321 321 … … 357 357 358 358 359 # as_fn_error STATUSERROR [LINENO LOG_FD]360 # --------------------------------- -------359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with STATUS, using 1 if that was 0.363 # script with status $?, using 1 if that was 0. 364 364 as_fn_error () 365 365 { 366 as_status=$ 1; test $as_status -eq 0 && as_status=1367 if test "$ 4"; then368 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 370 fi 371 $as_echo "$as_me: error: $ 2" >&2371 $as_echo "$as_me: error: $1" >&2 372 372 as_fn_exit $as_status 373 373 } # as_fn_error … … 531 531 532 532 # Name of the host. 533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 534 534 # so uname gets run too. 535 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 605 605 CPP 606 606 MICO_VER 607 COMPAT32BITFLAGS608 607 RANLIB 609 608 SET_MAKE … … 791 790 792 791 case $ac_option in 793 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 794 *=) ac_optarg= ;; 795 *) ac_optarg=yes ;; 792 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 793 *) ac_optarg=yes ;; 796 794 esac 797 795 … … 838 836 # Reject names that are not valid shell variable names. 839 837 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 840 as_fn_error $?"invalid feature name: $ac_useropt"838 as_fn_error "invalid feature name: $ac_useropt" 841 839 ac_useropt_orig=$ac_useropt 842 840 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 864 862 # Reject names that are not valid shell variable names. 865 863 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 866 as_fn_error $?"invalid feature name: $ac_useropt"864 as_fn_error "invalid feature name: $ac_useropt" 867 865 ac_useropt_orig=$ac_useropt 868 866 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1068 1066 # Reject names that are not valid shell variable names. 1069 1067 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1070 as_fn_error $?"invalid package name: $ac_useropt"1068 as_fn_error "invalid package name: $ac_useropt" 1071 1069 ac_useropt_orig=$ac_useropt 1072 1070 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1084 1082 # Reject names that are not valid shell variable names. 1085 1083 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1086 as_fn_error $?"invalid package name: $ac_useropt"1084 as_fn_error "invalid package name: $ac_useropt" 1087 1085 ac_useropt_orig=$ac_useropt 1088 1086 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1114 1112 x_libraries=$ac_optarg ;; 1115 1113 1116 -*) as_fn_error $?"unrecognized option: \`$ac_option'1117 Try \`$0 --help' for more information "1114 -*) as_fn_error "unrecognized option: \`$ac_option' 1115 Try \`$0 --help' for more information." 1118 1116 ;; 1119 1117 … … 1123 1121 case $ac_envvar in #( 1124 1122 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1125 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1123 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1126 1124 esac 1127 1125 eval $ac_envvar=\$ac_optarg … … 1141 1139 if test -n "$ac_prev"; then 1142 1140 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1143 as_fn_error $?"missing argument to $ac_option"1141 as_fn_error "missing argument to $ac_option" 1144 1142 fi 1145 1143 … … 1147 1145 case $enable_option_checking in 1148 1146 no) ;; 1149 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1147 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1150 1148 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1151 1149 esac … … 1170 1168 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1171 1169 esac 1172 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1170 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1173 1171 done 1174 1172 … … 1184 1182 if test "x$build_alias" = x; then 1185 1183 cross_compiling=maybe 1186 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1187 If a cross compiler is detected then cross compile mode will be used " >&21184 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1185 If a cross compiler is detected then cross compile mode will be used." >&2 1188 1186 elif test "x$build_alias" != "x$host_alias"; then 1189 1187 cross_compiling=yes … … 1200 1198 ac_ls_di=`ls -di .` && 1201 1199 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1202 as_fn_error $?"working directory cannot be determined"1200 as_fn_error "working directory cannot be determined" 1203 1201 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1204 as_fn_error $?"pwd does not report name of working directory"1202 as_fn_error "pwd does not report name of working directory" 1205 1203 1206 1204 … … 1241 1239 if test ! -r "$srcdir/$ac_unique_file"; then 1242 1240 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1243 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1241 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1244 1242 fi 1245 1243 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1246 1244 ac_abs_confdir=`( 1247 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1245 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1248 1246 pwd)` 1249 1247 # When building in place, set srcdir=. … … 1285 1283 --help=recursive display the short help of all the included packages 1286 1284 -V, --version display version information and exit 1287 -q, --quiet, --silent do not print \`checking 1285 -q, --quiet, --silent do not print \`checking...' messages 1288 1286 --cache-file=FILE cache test results in FILE [disabled] 1289 1287 -C, --config-cache alias for \`--cache-file=config.cache' … … 1448 1446 cat <<\_ACEOF 1449 1447 configure 1450 generated by GNU Autoconf 2.6 71451 1452 Copyright (C) 20 10Free Software Foundation, Inc.1448 generated by GNU Autoconf 2.65 1449 1450 Copyright (C) 2009 Free Software Foundation, Inc. 1453 1451 This configure script is free software; the Free Software Foundation 1454 1452 gives unlimited permission to copy, distribute and modify it. … … 1558 1556 fi 1559 1557 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1560 test $ac_status = 0; } > conftest.i&& {1558 test $ac_status = 0; } >/dev/null && { 1561 1559 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1562 1560 test ! -s conftest.err … … 1582 1580 { 1583 1581 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1584 if eval "test \"\${$3+set}\"" = set; then :1582 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1585 1583 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1586 1584 $as_echo_n "checking for $2... " >&6; } 1587 if eval "test \"\${$3+set}\"" = set; then :1585 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1588 1586 $as_echo_n "(cached) " >&6 1589 1587 fi … … 1621 1619 ac_header_preproc=no 1622 1620 fi 1623 rm -f conftest.err conftest. i conftest.$ac_ext1621 rm -f conftest.err conftest.$ac_ext 1624 1622 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1625 1623 $as_echo "$ac_header_preproc" >&6; } … … 1648 1646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1649 1647 $as_echo_n "checking for $2... " >&6; } 1650 if eval "test \"\${$3+set}\"" = set; then :1648 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1651 1649 $as_echo_n "(cached) " >&6 1652 1650 else … … 1712 1710 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1713 1711 $as_echo_n "checking for $2... " >&6; } 1714 if eval "test \"\${$3+set}\"" = set; then :1712 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1715 1713 $as_echo_n "(cached) " >&6 1716 1714 else … … 1789 1787 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1790 1788 $as_echo_n "checking for $2... " >&6; } 1791 if eval "test \"\${$3+set}\"" = set; then :1789 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1792 1790 $as_echo_n "(cached) " >&6 1793 1791 else … … 1842 1840 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1843 1841 $as_echo_n "checking for $2... " >&6; } 1844 if eval "test \"\${$3+set}\"" = set; then :1842 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1845 1843 $as_echo_n "(cached) " >&6 1846 1844 else … … 1947 1945 1948 1946 It was created by $as_me, which was 1949 generated by GNU Autoconf 2.6 7. Invocation command line was1947 generated by GNU Autoconf 2.65. Invocation command line was 1950 1948 1951 1949 $ $0 $@ … … 2057 2055 echo 2058 2056 2059 $as_echo "## ---------------- ## 2057 cat <<\_ASBOX 2058 ## ---------------- ## 2060 2059 ## Cache variables. ## 2061 ## ---------------- ##" 2060 ## ---------------- ## 2061 _ASBOX 2062 2062 echo 2063 2063 # The following way of writing the cache mishandles newlines in values, … … 2093 2093 echo 2094 2094 2095 $as_echo "## ----------------- ## 2095 cat <<\_ASBOX 2096 ## ----------------- ## 2096 2097 ## Output variables. ## 2097 ## ----------------- ##" 2098 ## ----------------- ## 2099 _ASBOX 2098 2100 echo 2099 2101 for ac_var in $ac_subst_vars … … 2108 2110 2109 2111 if test -n "$ac_subst_files"; then 2110 $as_echo "## ------------------- ## 2112 cat <<\_ASBOX 2113 ## ------------------- ## 2111 2114 ## File substitutions. ## 2112 ## ------------------- ##" 2115 ## ------------------- ## 2116 _ASBOX 2113 2117 echo 2114 2118 for ac_var in $ac_subst_files … … 2124 2128 2125 2129 if test -s confdefs.h; then 2126 $as_echo "## ----------- ## 2130 cat <<\_ASBOX 2131 ## ----------- ## 2127 2132 ## confdefs.h. ## 2128 ## ----------- ##" 2133 ## ----------- ## 2134 _ASBOX 2129 2135 echo 2130 2136 cat confdefs.h … … 2181 2187 ac_site_file2=NONE 2182 2188 if test -n "$CONFIG_SITE"; then 2183 # We do not want a PATH search for config.site. 2184 case $CONFIG_SITE in #(( 2185 -*) ac_site_file1=./$CONFIG_SITE;; 2186 */*) ac_site_file1=$CONFIG_SITE;; 2187 *) ac_site_file1=./$CONFIG_SITE;; 2188 esac 2189 ac_site_file1=$CONFIG_SITE 2189 2190 elif test "x$prefix" != xNONE; then 2190 2191 ac_site_file1=$prefix/share/config.site … … 2201 2202 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2202 2203 sed 's/^/| /' "$ac_site_file" >&5 2203 . "$ac_site_file" \ 2204 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2205 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2206 as_fn_error $? "failed to load site script $ac_site_file 2207 See \`config.log' for more details" "$LINENO" 5 ; } 2204 . "$ac_site_file" 2208 2205 fi 2209 2206 done … … 2281 2278 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2282 2279 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2283 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52280 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2284 2281 fi 2285 2282 ## -------------------- ## … … 2844 2841 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2845 2842 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2846 as_fn_error $?"no acceptable C compiler found in \$PATH2847 See \`config.log' for more details " "$LINENO" 5; }2843 as_fn_error "no acceptable C compiler found in \$PATH 2844 See \`config.log' for more details." "$LINENO" 5; } 2848 2845 2849 2846 # Provide some information about the compiler. … … 2959 2956 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2960 2957 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2961 as_fn_error 77 "C compiler cannot create executables 2962 See \`config.log' for more details" "$LINENO" 5 ; } 2958 { as_fn_set_status 77 2959 as_fn_error "C compiler cannot create executables 2960 See \`config.log' for more details." "$LINENO" 5; }; } 2963 2961 else 2964 2962 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 … … 3002 3000 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3003 3001 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3004 as_fn_error $?"cannot compute suffix of executables: cannot compile and link3005 See \`config.log' for more details " "$LINENO" 5; }3002 as_fn_error "cannot compute suffix of executables: cannot compile and link 3003 See \`config.log' for more details." "$LINENO" 5; } 3006 3004 fi 3007 3005 rm -f conftest conftest$ac_cv_exeext … … 3060 3058 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3061 3059 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3062 as_fn_error $?"cannot run C compiled programs.3060 as_fn_error "cannot run C compiled programs. 3063 3061 If you meant to cross compile, use \`--host'. 3064 See \`config.log' for more details " "$LINENO" 5; }3062 See \`config.log' for more details." "$LINENO" 5; } 3065 3063 fi 3066 3064 fi … … 3113 3111 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3114 3112 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3115 as_fn_error $?"cannot compute suffix of object files: cannot compile3116 See \`config.log' for more details " "$LINENO" 5; }3113 as_fn_error "cannot compute suffix of object files: cannot compile 3114 See \`config.log' for more details." "$LINENO" 5; } 3117 3115 fi 3118 3116 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3683 3681 3684 3682 fi 3685 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 53683 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 3686 3684 else 3687 3685 echo "Checking for javac... $JAVAC" … … 3699 3697 CLASS_TEST=Test.class 3700 3698 cat << \EOF > $JAVA_TEST 3701 /* #line 3 701"configure" */3699 /* #line 3699 "configure" */ 3702 3700 public class Test { 3703 3701 } … … 3711 3709 ac_cv_prog_javac_works=yes 3712 3710 else 3713 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 53711 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 3714 3712 echo "configure: failed program was:" >&5 3715 3713 cat $JAVA_TEST >&5 … … 3816 3814 3817 3815 fi 3818 test x$JAVA = x && as_fn_error $?"no acceptable Java virtual machine found in \$PATH" "$LINENO" 53816 test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 3819 3817 fi 3820 3818 … … 3878 3876 ac_cv_prog_uudecode_base64=yes 3879 3877 else 3880 echo "configure: 38 80: uudecode had trouble decoding base 64 file 'Test.uue'" >&53878 echo "configure: 3878: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 3881 3879 echo "configure: failed file was:" >&5 3882 3880 cat Test.uue >&5 … … 3893 3891 $as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} 3894 3892 if test x$ac_cv_prog_javac_works = xno; then 3895 as_fn_error $?"Cannot compile java source. $JAVAC does not work properly" "$LINENO" 53893 as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 3896 3894 fi 3897 3895 if test x$ac_cv_prog_javac_works = x; then … … 3986 3984 3987 3985 fi 3988 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 53986 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 3989 3987 else 3990 3988 echo "Checking for javac... $JAVAC" … … 4002 4000 CLASS_TEST=Test.class 4003 4001 cat << \EOF > $JAVA_TEST 4004 /* #line 400 4"configure" */4002 /* #line 4002 "configure" */ 4005 4003 public class Test { 4006 4004 } … … 4014 4012 ac_cv_prog_javac_works=yes 4015 4013 else 4016 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54014 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4017 4015 echo "configure: failed program was:" >&5 4018 4016 cat $JAVA_TEST >&5 … … 4041 4039 TEST=Test 4042 4040 cat << \EOF > $JAVA_TEST 4043 /* [#]line 404 3"configure" */4041 /* [#]line 4041 "configure" */ 4044 4042 public class Test { 4045 4043 public static void main (String args[]) { … … 4058 4056 echo "configure: failed program was:" >&5 4059 4057 cat $JAVA_TEST >&5 4060 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54058 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4061 4059 fi 4062 4060 fi … … 4071 4069 echo "configure: failed program was:" >&5 4072 4070 cat $JAVA_TEST >&5 4073 as_fn_error $?"The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 54071 as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4074 4072 fi 4075 4073 rm -fr $JAVA_TEST $CLASS_TEST Test.uue … … 4169 4167 ac_aux_dir= 4170 4168 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 4171 if test -f "$ac_dir/install-sh"; then 4172 ac_aux_dir=$ac_dir 4173 ac_install_sh="$ac_aux_dir/install-sh -c" 4174 break 4175 elif test -f "$ac_dir/install.sh"; then 4176 ac_aux_dir=$ac_dir 4177 ac_install_sh="$ac_aux_dir/install.sh -c" 4178 break 4179 elif test -f "$ac_dir/shtool"; then 4180 ac_aux_dir=$ac_dir 4181 ac_install_sh="$ac_aux_dir/shtool install -c" 4182 break 4183 fi 4169 for ac_t in install-sh install.sh shtool; do 4170 if test -f "$ac_dir/$ac_t"; then 4171 ac_aux_dir=$ac_dir 4172 ac_install_sh="$ac_aux_dir/$ac_t -c" 4173 break 2 4174 fi 4175 done 4184 4176 done 4185 4177 if test -z "$ac_aux_dir"; then 4186 as_fn_error $?"cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 54178 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 4187 4179 fi 4188 4180 … … 4198 4190 # Make sure we can run config.sub. 4199 4191 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 4200 as_fn_error $?"cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 54192 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 4201 4193 4202 4194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 … … 4209 4201 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 4210 4202 test "x$ac_build_alias" = x && 4211 as_fn_error $?"cannot guess build type; you must specify one" "$LINENO" 54203 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 4212 4204 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 4213 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 54205 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 4214 4206 4215 4207 fi … … 4218 4210 case $ac_cv_build in 4219 4211 *-*-*) ;; 4220 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;4212 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 4221 4213 esac 4222 4214 build=$ac_cv_build … … 4243 4235 else 4244 4236 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 4245 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 54237 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 4246 4238 fi 4247 4239 … … 4251 4243 case $ac_cv_host in 4252 4244 *-*-*) ;; 4253 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;4245 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 4254 4246 esac 4255 4247 host=$ac_cv_host … … 4276 4268 else 4277 4269 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 4278 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 54270 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 4279 4271 fi 4280 4272 … … 4284 4276 case $ac_cv_target in 4285 4277 *-*-*) ;; 4286 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;4278 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 4287 4279 esac 4288 4280 target=$ac_cv_target … … 4415 4407 set x ${MAKE-make} 4416 4408 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 4417 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :4409 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 4418 4410 $as_echo_n "(cached) " >&6 4419 4411 else … … 4423 4415 @echo '@@@%%%=$(MAKE)=@@@%%%' 4424 4416 _ACEOF 4425 # GNU make sometimes prints "make[1]: Entering 4417 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 4426 4418 case `${MAKE-make} -f conftest.make 2>/dev/null` in 4427 4419 *@@@%%%=?*=@@@%%%*) … … 4533 4525 RANLIB="$ac_cv_prog_RANLIB" 4534 4526 fi 4535 4536 4537 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&54538 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }4539 arch_64bit=no4540 case "$host_cpu" in4541 x86_64) arch_64bit=yes ;;4542 esac4543 4544 if test "$arch_64bit" = yes; then4545 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&54546 $as_echo "yes" >&6; }4547 if test -z "$COMPAT32BITFLAGS" ; then4548 COMPAT32BITFLAGS="-m32"4549 fi4550 else4551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&54552 $as_echo "no" >&6; }4553 if test -z "$COMPAT32BITFLAGS" ; then4554 COMPAT32BITFLAGS=4555 fi4556 fi4557 4558 # Only need compat32bitflag if using MG or MGPP4559 if test "$ENABLE_MG" = "0" ; then4560 COMPAT32BITFLAGS=4561 else4562 if test "$ENABLE_MGPP" = "0" ; then4563 COMPAT32BITFLAGS=4564 fi4565 fi4566 4567 export COMPAT32BITFLAGS4568 4527 4569 4528 … … 4642 4601 continue 4643 4602 fi 4644 rm -f conftest.err conftest. i conftest.$ac_ext4603 rm -f conftest.err conftest.$ac_ext 4645 4604 4646 4605 # OK, works on sane cases. Now check whether nonexistent headers … … 4658 4617 break 4659 4618 fi 4660 rm -f conftest.err conftest. i conftest.$ac_ext4619 rm -f conftest.err conftest.$ac_ext 4661 4620 4662 4621 done 4663 4622 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4664 rm -f conftest. i conftest.err conftest.$ac_ext4623 rm -f conftest.err conftest.$ac_ext 4665 4624 if $ac_preproc_ok; then : 4666 4625 break … … 4701 4660 continue 4702 4661 fi 4703 rm -f conftest.err conftest. i conftest.$ac_ext4662 rm -f conftest.err conftest.$ac_ext 4704 4663 4705 4664 # OK, works on sane cases. Now check whether nonexistent headers … … 4717 4676 break 4718 4677 fi 4719 rm -f conftest.err conftest. i conftest.$ac_ext4678 rm -f conftest.err conftest.$ac_ext 4720 4679 4721 4680 done 4722 4681 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4723 rm -f conftest. i conftest.err conftest.$ac_ext4682 rm -f conftest.err conftest.$ac_ext 4724 4683 if $ac_preproc_ok; then : 4725 4684 … … 4727 4686 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4728 4687 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4729 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4730 See \`config.log' for more details " "$LINENO" 5; }4688 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4689 See \`config.log' for more details." "$LINENO" 5; } 4731 4690 fi 4732 4691 … … 4789 4748 IFS=$as_save_IFS 4790 4749 if test -z "$ac_cv_path_GREP"; then 4791 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54750 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4792 4751 fi 4793 4752 else … … 4855 4814 IFS=$as_save_IFS 4856 4815 if test -z "$ac_cv_path_EGREP"; then 4857 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54816 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4858 4817 fi 4859 4818 else … … 4987 4946 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4988 4947 " 4989 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4948 eval as_val=\$$as_ac_Header 4949 if test "x$as_val" = x""yes; then : 4990 4950 cat >>confdefs.h <<_ACEOF 4991 4951 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5503 5463 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 5504 5464 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 5505 if eval "test \"\${$as_ac_Header+set}\"" = set; then :5465 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 5506 5466 $as_echo_n "(cached) " >&6 5507 5467 else … … 5530 5490 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 5531 5491 $as_echo "$ac_res" >&6; } 5532 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5492 eval as_val=\$$as_ac_Header 5493 if test "x$as_val" = x""yes; then : 5533 5494 cat >>confdefs.h <<_ACEOF 5534 5495 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 … … 5772 5733 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5773 5734 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5774 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5735 eval as_val=\$$as_ac_Header 5736 if test "x$as_val" = x""yes; then : 5775 5737 cat >>confdefs.h <<_ACEOF 5776 5738 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5945 5907 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5946 5908 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5947 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5909 eval as_val=\$$as_ac_var 5910 if test "x$as_val" = x""yes; then : 5948 5911 5949 5912 cat >>confdefs.h <<_ACEOF … … 6105 6068 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6106 6069 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6107 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 6070 eval as_val=\$$as_ac_var 6071 if test "x$as_val" = x""yes; then : 6108 6072 cat >>confdefs.h <<_ACEOF 6109 6073 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 … … 6113 6077 done 6114 6078 6115 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 6116 if test "x$ac_cv_func_ftruncate" = x""yes; then : 6117 $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 6079 for ac_func in ftruncate strstr strcasecmp 6080 do : 6081 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6082 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6083 eval as_val=\$$as_ac_var 6084 if test "x$as_val" = x""yes; then : 6085 cat >>confdefs.h <<_ACEOF 6086 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 6087 _ACEOF 6118 6088 6119 6089 else 6120 6090 case " $LIBOBJS " in 6121 *" ftruncate.$ac_objext "* ) ;;6122 *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"6091 *" $ac_func.$ac_objext "* ) ;; 6092 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 6123 6093 ;; 6124 6094 esac 6125 6095 6126 6096 fi 6127 6128 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 6129 if test "x$ac_cv_func_strstr" = x""yes; then : 6130 $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 6131 6132 else 6133 case " $LIBOBJS " in 6134 *" strstr.$ac_objext "* ) ;; 6135 *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 6136 ;; 6137 esac 6138 6139 fi 6140 6141 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 6142 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 6143 $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 6144 6145 else 6146 case " $LIBOBJS " in 6147 *" strcasecmp.$ac_objext "* ) ;; 6148 *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 6149 ;; 6150 esac 6151 6152 fi 6097 done 6153 6098 6154 6099 … … 6372 6317 { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5 6373 6318 $as_echo "\"yes\"" >&6; } 6374 as_fn_error $?"\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 56319 as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5 6375 6320 fi 6376 6321 … … 6604 6549 ;; #( 6605 6550 *) 6606 as_fn_error $?"unknown endianness6607 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 6551 as_fn_error "unknown endianness 6552 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 6608 6553 esac 6609 6554 … … 6656 6601 src/oaiservr/Makefile \ 6657 6602 src/z3950/Makefile \ 6658 6659 6603 src/java/org/nzdl/gsdl/GsdlCollageApplet/Makefile \ 6604 src/java/org/nzdl/gsdl/Phind/Makefile" 6660 6605 6661 6606 ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs" … … 6744 6689 ac_libobjs= 6745 6690 ac_ltlibobjs= 6746 U=6747 6691 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 6748 6692 # 1. Remove the extension, and $U if already installed. … … 6907 6851 6908 6852 6909 # as_fn_error STATUSERROR [LINENO LOG_FD]6910 # --------------------------------- -------6853 # as_fn_error ERROR [LINENO LOG_FD] 6854 # --------------------------------- 6911 6855 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 6912 6856 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 6913 # script with STATUS, using 1 if that was 0.6857 # script with status $?, using 1 if that was 0. 6914 6858 as_fn_error () 6915 6859 { 6916 as_status=$ 1; test $as_status -eq 0 && as_status=16917 if test "$ 4"; then6918 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack6919 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$46860 as_status=$?; test $as_status -eq 0 && as_status=1 6861 if test "$3"; then 6862 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6863 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 6920 6864 fi 6921 $as_echo "$as_me: error: $ 2" >&26865 $as_echo "$as_me: error: $1" >&2 6922 6866 as_fn_exit $as_status 6923 6867 } # as_fn_error … … 7115 7059 done 7116 7060 test -z "$as_dirs" || eval "mkdir $as_dirs" 7117 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"7061 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 7118 7062 7119 7063 … … 7169 7113 ac_log=" 7170 7114 This file was extended by $as_me, which was 7171 generated by GNU Autoconf 2.6 7. Invocation command line was7115 generated by GNU Autoconf 2.65. Invocation command line was 7172 7116 7173 7117 CONFIG_FILES = $CONFIG_FILES … … 7231 7175 ac_cs_version="\\ 7232 7176 config.status 7233 configured by $0, generated by GNU Autoconf 2.6 7,7177 configured by $0, generated by GNU Autoconf 2.65, 7234 7178 with options \\"\$ac_cs_config\\" 7235 7179 7236 Copyright (C) 20 10Free Software Foundation, Inc.7180 Copyright (C) 2009 Free Software Foundation, Inc. 7237 7181 This config.status script is free software; the Free Software Foundation 7238 7182 gives unlimited permission to copy, distribute and modify it." … … 7251 7195 do 7252 7196 case $1 in 7253 --*= ?*)7197 --*=*) 7254 7198 ac_option=`expr "X$1" : 'X\([^=]*\)='` 7255 7199 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 7256 ac_shift=:7257 ;;7258 --*=)7259 ac_option=`expr "X$1" : 'X\([^=]*\)='`7260 ac_optarg=7261 7200 ac_shift=: 7262 7201 ;; … … 7282 7221 case $ac_optarg in 7283 7222 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 7284 '') as_fn_error $? "missing file argument" ;;7285 7223 esac 7286 7224 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 7295 7233 --he | --h) 7296 7234 # Conflict between --help and --header 7297 as_fn_error $?"ambiguous option: \`$1'7235 as_fn_error "ambiguous option: \`$1' 7298 7236 Try \`$0 --help' for more information.";; 7299 7237 --help | --hel | -h ) … … 7304 7242 7305 7243 # This is an error. 7306 -*) as_fn_error $?"unrecognized option: \`$1'7244 -*) as_fn_error "unrecognized option: \`$1' 7307 7245 Try \`$0 --help' for more information." ;; 7308 7246 … … 7359 7297 "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;; 7360 7298 7361 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;7299 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 7362 7300 esac 7363 7301 done … … 7396 7334 tmp=./conf$$-$RANDOM 7397 7335 (umask 077 && mkdir "$tmp") 7398 } || as_fn_error $?"cannot create a temporary directory in ." "$LINENO" 57336 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 7399 7337 7400 7338 # Set up the scripts for CONFIG_FILES section. … … 7413 7351 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 7414 7352 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 7415 ac_cs_awk_cr='\ \r'7353 ac_cs_awk_cr='\r' 7416 7354 else 7417 7355 ac_cs_awk_cr=$ac_cr … … 7427 7365 echo "_ACEOF" 7428 7366 } >conf$$subs.sh || 7429 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57430 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`7367 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7368 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 7431 7369 ac_delim='%!_!# ' 7432 7370 for ac_last_try in false false false false false :; do 7433 7371 . ./conf$$subs.sh || 7434 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57372 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7435 7373 7436 7374 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 7438 7376 break 7439 7377 elif $ac_last_try; then 7440 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57378 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7441 7379 else 7442 7380 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7527 7465 cat 7528 7466 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 7529 || as_fn_error $?"could not setup config files machinery" "$LINENO" 57530 _ACEOF 7531 7532 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),7533 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and7467 || as_fn_error "could not setup config files machinery" "$LINENO" 5 7468 _ACEOF 7469 7470 # VPATH may cause trouble with some makes, so we remove $(srcdir), 7471 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 7534 7472 # trailing colons and then remove the whole line if VPATH becomes empty 7535 7473 # (actually we leave an empty line to preserve line numbers). 7536 7474 if test "x$srcdir" = x.; then 7537 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 7538 h 7539 s/// 7540 s/^/:/ 7541 s/[ ]*$/:/ 7542 s/:\$(srcdir):/:/g 7543 s/:\${srcdir}:/:/g 7544 s/:@srcdir@:/:/g 7545 s/^:*// 7475 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 7476 s/:*\$(srcdir):*/:/ 7477 s/:*\${srcdir}:*/:/ 7478 s/:*@srcdir@:*/:/ 7479 s/^\([^=]*=[ ]*\):*/\1/ 7546 7480 s/:*$// 7547 x7548 s/\(=[ ]*\).*/\1/7549 G7550 s/\n//7551 7481 s/^[^=]*=[ ]*$// 7552 7482 }' … … 7576 7506 break 7577 7507 elif $ac_last_try; then 7578 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 57508 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 7579 7509 else 7580 7510 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7661 7591 _ACEOF 7662 7592 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 7663 as_fn_error $?"could not setup config headers machinery" "$LINENO" 57593 as_fn_error "could not setup config headers machinery" "$LINENO" 5 7664 7594 fi # test -n "$CONFIG_HEADERS" 7665 7595 … … 7674 7604 case $ac_mode$ac_tag in 7675 7605 :[FHL]*:*);; 7676 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;7606 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 7677 7607 :[FH]-) ac_tag=-:-;; 7678 7608 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 7702 7632 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 7703 7633 esac || 7704 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;7634 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 7705 7635 esac 7706 7636 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 7729 7659 case $ac_tag in 7730 7660 *:-:* | *:-) cat >"$tmp/stdin" \ 7731 || as_fn_error $? "could not create $ac_file" "$LINENO" 5;;7661 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 7732 7662 esac 7733 7663 ;; … … 7860 7790 " 7861 7791 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 7862 || as_fn_error $?"could not create $ac_file" "$LINENO" 57792 || as_fn_error "could not create $ac_file" "$LINENO" 5 7863 7793 7864 7794 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && … … 7866 7796 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 7867 7797 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7868 which seems to be undefined. Please make sure it is defined " >&57798 which seems to be undefined. Please make sure it is defined." >&5 7869 7799 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7870 which seems to be undefined. Please make sure it is defined " >&2;}7800 which seems to be undefined. Please make sure it is defined." >&2;} 7871 7801 7872 7802 rm -f "$tmp/stdin" … … 7875 7805 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 7876 7806 esac \ 7877 || as_fn_error $?"could not create $ac_file" "$LINENO" 57807 || as_fn_error "could not create $ac_file" "$LINENO" 5 7878 7808 ;; 7879 7809 :H) … … 7886 7816 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 7887 7817 } >"$tmp/config.h" \ 7888 || as_fn_error $?"could not create $ac_file" "$LINENO" 57818 || as_fn_error "could not create $ac_file" "$LINENO" 5 7889 7819 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 7890 7820 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 … … 7893 7823 rm -f "$ac_file" 7894 7824 mv "$tmp/config.h" "$ac_file" \ 7895 || as_fn_error $?"could not create $ac_file" "$LINENO" 57825 || as_fn_error "could not create $ac_file" "$LINENO" 5 7896 7826 fi 7897 7827 else 7898 7828 $as_echo "/* $configure_input */" \ 7899 7829 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 7900 || as_fn_error $?"could not create -" "$LINENO" 57830 || as_fn_error "could not create -" "$LINENO" 5 7901 7831 fi 7902 7832 ;; … … 7913 7843 7914 7844 test $ac_write_fail = 0 || 7915 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 57845 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 7916 7846 7917 7847 … … 7934 7864 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7935 7865 # would make configure fail if this is the last instruction. 7936 $ac_cs_success || as_fn_exit 17866 $ac_cs_success || as_fn_exit $? 7937 7867 fi 7938 7868 … … 8075 8005 eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ 8076 8006 --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || 8077 as_fn_error $?"$ac_sub_configure failed for $ac_dir" "$LINENO" 58007 as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 8078 8008 fi 8079 8009 -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/configure.in
r23356 r23508 214 214 AC_PROG_RANLIB 215 215 216 AC_MSG_CHECKING(to see if architecture is 64-bit) 217 arch_64bit=no 218 case "$host_cpu" in 219 x86_64) arch_64bit=yes ;; 220 esac 221 222 if test "$arch_64bit" = yes; then 223 AC_MSG_RESULT(yes) 224 if test -z "$COMPAT32BITFLAGS" ; then 225 COMPAT32BITFLAGS="-m32" 226 fi 227 else 228 AC_MSG_RESULT(no) 229 if test -z "$COMPAT32BITFLAGS" ; then 230 COMPAT32BITFLAGS= 231 fi 232 fi 233 234 # Only need compat32bitflag if using MG or MGPP 235 if test "$ENABLE_MG" = "0" ; then 236 COMPAT32BITFLAGS= 237 else 238 if test "$ENABLE_MGPP" = "0" ; then 239 COMPAT32BITFLAGS= 240 fi 241 fi 242 243 export COMPAT32BITFLAGS 244 AC_SUBST(COMPAT32BITFLAGS) 245 216 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 217 dnl arch_64bit=no 218 dnl case "$host_cpu" in 219 dnl x86_64) arch_64bit=yes ;; 220 dnl esac 246 221 247 222 #moved CORBA MICO directory test to get version of MICO -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/packages/configure
r22378 r23508 210 210 cd "$PACKAGES/apache-httpd" 211 211 if [ ! -e httpd-2.2.11 ] ; then gzip -dc httpd-2.2.11-gs.tar.gz | tar -xf - ; fi 212 cd httpd-2.2.11&& \ 213 214 if [ ! -z $COMPAT32BITFLAGS ] ; then 215 CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib64" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv 216 else 217 CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv 218 fi 212 cd httpd-2.2.11 && \ 213 CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib -L${GSDLHOME}/common-src/packages/sqlite/lib" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv 219 214 220 215 else -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/colservr/Makefile.in
r22058 r23508 112 112 CC = @CC@ 113 113 CXX = @CXX@ 114 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@115 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@114 CFLAGS = @CFLAGS@ 115 CXXFLAGS = @CXXFLAGS@ 116 116 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 117 117 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/oaiservr/Makefile.in
r22378 r23508 38 38 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 39 39 ifeq ($(ENABLE_ACCENTFOLD), 1) 40 ifeq ($(COMPAT32BITFLAGS),)41 40 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 42 else43 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib64/libiconv.a44 endif45 41 else 46 42 ACCENTFOLD_LIBS = … … 93 89 94 90 CC = @CC@ 95 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@91 CFLAGS = @CFLAGS@ 96 92 CXX = @CXX@ 97 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@93 CXXFLAGS = @CXXFLAGS@ 98 94 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 99 95 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES) 100 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@96 LDFLAGS = @LDFLAGS@ 101 97 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 102 98 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/oaiservr/oaiargs.cpp
r22739 r23508 25 25 *********************************************************************/ 26 26 27 #include "mglong.h" 27 28 #include "oaiargs.h" 28 29 #include "cgiutils.h" … … 77 78 text_t label, value; 78 79 if (equals == NULL) { 79 label.setcarr((char *) start, ( long) here - (long) start);80 label.setcarr((char *) start, (uintptr_t) here - (uintptr_t) start); 80 81 value = label; 81 82 } 82 83 else { 83 label.setcarr((char *) start, ( long) equals - (long) start);84 label.setcarr((char *) start, (uintptr_t) equals - (uintptr_t) start); 84 85 ++equals; 85 value.setcarr((char *) equals, ( long) here - (long) equals);86 value.setcarr((char *) equals, (uintptr_t) here - (uintptr_t) equals); 86 87 } 87 88 -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/protocol/Makefile.in
r22078 r23508 35 35 ENABLE_MGPP = @ENABLE_MGPP@ 36 36 ifeq ($(ENABLE_MGPP), 1) 37 MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text 37 MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib 38 38 else 39 39 MGPP_INCLUDES = … … 66 66 AR = ar 67 67 CXX = @CXX@ 68 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@68 CXXFLAGS = @CXXFLAGS@ 69 69 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 70 70 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/Makefile.in
r22378 r23508 41 41 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 42 42 ifeq ($(ENABLE_ACCENTFOLD), 1) 43 ifeq ($(COMPAT32BITFLAGS),)44 43 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 45 else46 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(INDEXERS_DIR)/packages/iconv/lib64/libiconv.a47 endif48 44 else 49 45 ACCENTFOLD_LIBS = … … 151 147 AR = ar 152 148 CC = @CC@ 153 CFLAGS=@CFLAGS@ @COMPAT32BITFLAGS@149 CFLAGS=@CFLAGS@ 154 150 CXX = @CXX@ 155 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@151 CXXFLAGS = @CXXFLAGS@ 156 152 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS) 157 153 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ … … 160 156 -I$(COMMON_PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(GDBM_INCLUDES) $(Z3950_INCLUDES) 161 157 INSTALL = @INSTALL@ 162 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@158 LDFLAGS = @LDFLAGS@ 163 159 LIBS = @LIBS@ $(GDBM_LIBS) \ 164 160 $(COMMON_PACKAGES_DIR)/expat/lib/libexpat.a \ -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/cgiwrapper.cpp
r23389 r23508 30 30 #endif 31 31 32 #include "mglong.h" 32 33 #include "gsdlconf.h" 33 34 #include "cgiwrapper.h" … … 730 731 content_length_str != NULL) { 731 732 // POST form data 732 long content_length = (content_length_str ? atoi(content_length_str) : 0);733 mg_s_long content_length = (content_length_str ? atoi(content_length_str) : 0); 733 734 if (content_length > 0) { 734 735 #ifdef __WIN32__ … … 744 745 #endif 745 746 746 long length = content_length;747 mg_s_long length = content_length; 747 748 unsigned char * buffer = new unsigned char[content_length]; 748 749 -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/mod_gsdl.cpp
r22925 r23508 61 61 #endif 62 62 63 #include "mglong.h" 63 64 #include "maincfg.h" 64 65 #include "string_pool.h" … … 408 409 content_length_str != NULL) { 409 410 // POST form data 410 long content_length = (content_length_str ? atoi(content_length_str) : 0);411 mg_s_long content_length = (content_length_str ? atoi(content_length_str) : 0); 411 412 if (content_length > 0) { 412 413 #ifdef __WIN32__ … … 422 423 #endif 423 424 424 long length = content_length;425 mg_s_long length = content_length; 425 426 unsigned char * buffer = new unsigned char[content_length]; 426 427 -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/pageaction.cpp
r23058 r23508 32 32 // do the work for us, either images or pulldown. 33 33 34 34 #include "mglong.h" 35 35 #include "pageaction.h" 36 36 #include "receptionist.h" … … 726 726 disp.setmacro ("numsections", displayclass::defaultpackage, cinfo->numSections); 727 727 disp.setmacro ("numwords", displayclass::defaultpackage, cinfo->numWords); 728 unsignedlong current_time = time(NULL);729 unsignedlong builddate = (current_time - cinfo->buildDate) / 86400;728 mg_u_long current_time = time(NULL); 729 mg_u_long builddate = (current_time - cinfo->buildDate) / 86400; 730 730 disp.setmacro ("builddate", displayclass::defaultpackage, builddate); 731 731 -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/phindaction.cpp
r22984 r23508 151 151 ostream &logout) { 152 152 153 unsignedlong count_l, count_e, count_d;154 unsignedlong phrase = args["ppnum"].getulong();153 mg_u_long count_l, count_e, count_d; 154 mg_u_long phrase = args["ppnum"].getulong(); 155 155 text_t &word = args["pptext"]; 156 unsignedlong first_e = args["pfe"].getulong();157 unsignedlong last_e = args["ple"].getulong();158 unsignedlong first_l = args["pfl"].getulong();159 unsignedlong last_l = args["pll"].getulong();160 unsignedlong first_d = args["pfd"].getulong();161 unsignedlong last_d = args["pld"].getulong();156 mg_u_long first_e = args["pfe"].getulong(); 157 mg_u_long last_e = args["ple"].getulong(); 158 mg_u_long first_l = args["pfl"].getulong(); 159 mg_u_long last_l = args["pll"].getulong(); 160 mg_u_long first_d = args["pfd"].getulong(); 161 mg_u_long last_d = args["pld"].getulong(); 162 162 bool XMLmode = false; 163 163 if (args["pxml"] == "1") XMLmode = true; … … 172 172 173 173 // the frequency and occurances of the phrase 174 unsignedlong tf;175 vector < unsignedlong> el, linkdest, docNums, docfreq;174 mg_u_long tf; 175 vector <mg_u_long> el, linkdest, docNums, docfreq; 176 176 vector <UCArray> linktype; 177 177 178 178 // the number of occurances to display 179 unsignedlong ef, lf, df;179 mg_u_long ef, lf, df; 180 180 181 181 text_t basepath = filename_cat(collecthome, args["c"], … … 567 567 // ll - the list of phrases that are thesaurus links 568 568 // dl - the list of documents that contain phrase 569 bool phindaction::get_phrase_all_data(TextData &textdata, unsignedlong phrase,570 text_t &word, unsigned long &tf, unsignedlong &ef,571 unsigned long &lf, unsignedlong &df,572 vector < unsignedlong> &el,573 vector < unsignedlong> &linkdest,569 bool phindaction::get_phrase_all_data(TextData &textdata, mg_u_long phrase, 570 text_t &word, mg_u_long &tf, mg_u_long &ef, 571 mg_u_long &lf, mg_u_long &df, 572 vector <mg_u_long> &el, 573 vector <mg_u_long> &linkdest, 574 574 vector <UCArray> &linktype, 575 vector < unsignedlong> &docnum,576 vector < unsignedlong> &docfrq) {575 vector <mg_u_long> &docnum, 576 vector <mg_u_long> &docfrq) { 577 577 UCArray text; 578 578 UCArray docLevel; … … 624 624 // Get expansion list 625 625 el.clear(); 626 unsignedlong e = 0;626 mg_u_long e = 0; 627 627 for (++next; *next != ':'; ++next) { 628 628 if (*next == ',') { … … 639 639 docfrq.clear(); 640 640 bool readnum = false; 641 unsignedlong d = 0;641 mg_u_long d = 0; 642 642 for (++next; *next != ':'; ++next) { 643 643 if (*next == ',') { … … 678 678 thistype.clear(); 679 679 bool typedone = false; 680 unsignedlong l = 0;680 mg_u_long l = 0; 681 681 for (++next; *next != ':'; ++next) { 682 682 … … 711 711 712 712 bool phindaction::print_thesaurus_links(const text_t &collection, bool XMLmode, 713 TextData &textdata, vector < unsignedlong> &linkdest,714 vector <UCArray> &linktype, unsignedlong first,715 unsignedlong last, displayclass &disp,713 TextData &textdata, vector <mg_u_long> &linkdest, 714 vector <UCArray> &linktype, mg_u_long first, 715 mg_u_long last, displayclass &disp, 716 716 outconvertclass &outconvert, ostream &textout) { 717 717 718 718 // information describing each link in the list 719 unsignedlong phrase, tf, ef, df;719 mg_u_long phrase, tf, ef, df; 720 720 UCArray type, text; 721 721 722 for ( unsignedlong l = first; l < last; ++l) {722 for (mg_u_long l = first; l < last; ++l) { 723 723 724 724 // get the phrase data … … 764 764 * false if the method suffered a fatal error, true otherwise 765 765 */ 766 bool phindaction::get_phrase_freq_data(TextData &textdata, unsignedlong phrase,767 UCArray &word, unsignedlong &tf,768 unsigned long &ef, unsignedlong &df) {766 bool phindaction::get_phrase_freq_data(TextData &textdata, mg_u_long phrase, 767 UCArray &word, mg_u_long &tf, 768 mg_u_long &ef, mg_u_long &df) { 769 769 770 770 UCArray text; … … 821 821 void phindaction::print_expansions(const text_t &collection, bool XMLmode, 822 822 const text_t &body, TextData &textdata, 823 const vector < unsignedlong> &elist,824 unsigned long first, unsignedlong last,823 const vector <mg_u_long> &elist, 824 mg_u_long first, mg_u_long last, 825 825 displayclass &disp, outconvertclass &outconvert, 826 826 ostream &textout) { 827 827 828 828 UCArray word; 829 unsignedlong phrase, tf, df, ef;829 mg_u_long phrase, tf, df, ef; 830 830 831 831 UCArray suffix, prefix, ucbody; … … 833 833 toUCArray(body, ucbody); 834 834 835 for ( unsignedlong e = first; e < last; ++e) {835 for (mg_u_long e = first; e < last; ++e) { 836 836 837 837 phrase = elist[e]; … … 940 940 bool phindaction::print_documents(bool XMLmode, const text_t &basepath, 941 941 const text_t &collection, 942 const vector < unsignedlong> &docNums,943 const vector < unsignedlong> &docFreq,944 unsigned long first, unsignedlong last,942 const vector <mg_u_long> &docNums, 943 const vector <mg_u_long> &docFreq, 944 mg_u_long first, mg_u_long last, 945 945 displayclass &disp, outconvertclass &outconvert, 946 946 ostream &textout) { … … 967 967 968 968 UCArray title, hash; 969 unsignedlong freq, doc;970 971 for ( unsignedlong d = first; d < last; ++d) {969 mg_u_long freq, doc; 970 971 for (mg_u_long d = first; d < last; ++d) { 972 972 doc = docNums[d]; 973 973 freq = docFreq[d]; … … 1008 1008 * DLConsulting 12-07-2004 1009 1009 */ 1010 bool phindaction::get_document_all_data(TextData &docdata, unsignedlong docNum,1010 bool phindaction::get_document_all_data(TextData &docdata, mg_u_long docNum, 1011 1011 UCArray &title, UCArray &hash) { 1012 1012 -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/phindaction.h
r7734 r23508 32 32 #define PHINDACTION_H 33 33 34 #include "mglong.h" 34 35 #include "action.h" 35 36 … … 49 50 DocNumArray &result); 50 51 51 bool get_phrase_all_data(TextData &textdata, unsignedlong phrase,52 text_t &word, unsigned long &tf, unsignedlong &ef,53 unsigned long &lf, unsignedlong &df,54 vector < unsignedlong> &el,55 vector < unsignedlong> &linkdest,52 bool get_phrase_all_data(TextData &textdata, mg_u_long phrase, 53 text_t &word, mg_u_long &tf, mg_u_long &ef, 54 mg_u_long &lf, mg_u_long &df, 55 vector <mg_u_long> &el, 56 vector <mg_u_long> &linkdest, 56 57 vector <UCArray> &linktype, 57 vector < unsignedlong> &docnum,58 vector < unsignedlong> &docfrq);58 vector <mg_u_long> &docnum, 59 vector <mg_u_long> &docfrq); 59 60 60 61 bool print_thesaurus_links(const text_t &collection, bool XMLmode, 61 TextData &textdata, vector < unsignedlong> &linkdest,62 vector <UCArray> &linktype, unsignedlong first,63 unsignedlong last, displayclass &disp,62 TextData &textdata, vector <mg_u_long> &linkdest, 63 vector <UCArray> &linktype, mg_u_long first, 64 mg_u_long last, displayclass &disp, 64 65 outconvertclass &outconvert, ostream &textout); 65 66 66 bool get_phrase_freq_data(TextData &textdata, unsignedlong phrase,67 UCArray &word, unsignedlong &tf,68 unsigned long &ef, unsignedlong &df);67 bool get_phrase_freq_data(TextData &textdata, mg_u_long phrase, 68 UCArray &word, mg_u_long &tf, 69 mg_u_long &ef, mg_u_long &df); 69 70 70 71 void print_expansions(const text_t &collection, bool XMLmode, 71 72 const text_t &body, TextData &textdata, 72 const vector < unsignedlong> &elist,73 unsigned long first, unsignedlong last,73 const vector <mg_u_long> &elist, 74 mg_u_long first, mg_u_long last, 74 75 displayclass &disp, outconvertclass &outconvert, 75 76 ostream &textout); … … 83 84 bool print_documents(bool XMLmode, const text_t &basepath, 84 85 const text_t &collection, 85 const vector < unsignedlong> &docNums,86 const vector < unsignedlong> &docFreq,87 unsigned long first, unsignedlong last,86 const vector <mg_u_long> &docNums, 87 const vector <mg_u_long> &docFreq, 88 mg_u_long first, mg_u_long last, 88 89 displayclass &disp, outconvertclass &outconvert, 89 90 ostream &textout); 90 91 91 bool get_document_all_data(TextData &docdata, unsignedlong docNum,92 bool get_document_all_data(TextData &docdata, mg_u_long docNum, 92 93 UCArray &title, UCArray &hash); 93 94 -
main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/z3950/Makefile.in
r22378 r23508 102 102 INSTALL = @INSTALL@ 103 103 LDFLAGS = @LDFLAGS@ 104 ifeq ($(COMPAT32BITFLAGS),) 104 105 105 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 106 106 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 107 $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 108 else 109 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib64 -lexpat \ 110 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 111 $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 112 endif 107 $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a \ 108 $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 109 113 110 RANLIB = @RANLIB@ 114 111
Note:
See TracChangeset
for help on using the changeset viewer.