Ignore:
Timestamp:
2010-12-17T14:04:10+13:00 (13 years ago)
Author:
sjm84
Message:

Committing 64 bit changes into the branch

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  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    605605CPP
    606606MICO_VER
    607 COMPAT32BITFLAGS
    608607RANLIB
    609608SET_MAKE
    … …  
    783782
    784783  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 ;;
    788786  esac
    789787
    … …  
    830828    # Reject names that are not valid shell variable names.
    831829    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"
    833831    ac_useropt_orig=$ac_useropt
    834832    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    856854    # Reject names that are not valid shell variable names.
    857855    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"
    859857    ac_useropt_orig=$ac_useropt
    860858    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10601058    # Reject names that are not valid shell variable names.
    10611059    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"
    10631061    ac_useropt_orig=$ac_useropt
    10641062    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10761074    # Reject names that are not valid shell variable names.
    10771075    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"
    10791077    ac_useropt_orig=$ac_useropt
    10801078    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    11061104    x_libraries=$ac_optarg ;;
    11071105
    1108   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1109 Try \`$0 --help' for more information"
     1106  -*) as_fn_error "unrecognized option: \`$ac_option'
     1107Try \`$0 --help' for more information."
    11101108    ;;
    11111109
    … …  
    11151113    case $ac_envvar in #(
    11161114      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1117       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1115      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    11181116    esac
    11191117    eval $ac_envvar=\$ac_optarg
    … …  
    11331131if test -n "$ac_prev"; then
    11341132  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"
    11361134fi
    11371135
    … …  
    11391137  case $enable_option_checking in
    11401138    no) ;;
    1141     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1139    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11421140    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11431141  esac
    … …  
    11621160    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11631161  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"
    11651163done
    11661164
    … …  
    11761174  if test "x$build_alias" = x; then
    11771175    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" >&2
     1176    $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
    11801178  elif test "x$build_alias" != "x$host_alias"; then
    11811179    cross_compiling=yes
    … …  
    11921190ac_ls_di=`ls -di .` &&
    11931191ac_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"
    11951193test "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"
    11971195
    11981196
    … …  
    12331231if test ! -r "$srcdir/$ac_unique_file"; then
    12341232  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"
    12361234fi
    12371235ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12381236ac_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"
    12401238    pwd)`
    12411239# When building in place, set srcdir=.
    … …  
    12771275      --help=recursive    display the short help of all the included packages
    12781276  -V, --version           display version information and exit
    1279   -q, --quiet, --silent   do not print \`checking ...' messages
     1277  -q, --quiet, --silent   do not print \`checking...' messages
    12801278      --cache-file=FILE   cache test results in FILE [disabled]
    12811279  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14361434  cat <<\_ACEOF
    14371435configure
    1438 generated by GNU Autoconf 2.67
    1439 
    1440 Copyright (C) 2010 Free Software Foundation, Inc.
     1436generated by GNU Autoconf 2.65
     1437
     1438Copyright (C) 2009 Free Software Foundation, Inc.
    14411439This configure script is free software; the Free Software Foundation
    14421440gives unlimited permission to copy, distribute and modify it.
    … …  
    15461544  fi
    15471545  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1548   test $ac_status = 0; } > conftest.i && {
     1546  test $ac_status = 0; } >/dev/null && {
    15491547     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15501548     test ! -s conftest.err
    … …  
    15701568{
    15711569  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 :
    15731571  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15741572$as_echo_n "checking for $2... " >&6; }
    1575 if eval "test \"\${$3+set}\"" = set; then :
     1573if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15761574  $as_echo_n "(cached) " >&6
    15771575fi
    … …  
    16091607  ac_header_preproc=no
    16101608fi
    1611 rm -f conftest.err conftest.i conftest.$ac_ext
     1609rm -f conftest.err conftest.$ac_ext
    16121610{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    16131611$as_echo "$ac_header_preproc" >&6; }
    … …  
    16361634  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16371635$as_echo_n "checking for $2... " >&6; }
    1638 if eval "test \"\${$3+set}\"" = set; then :
     1636if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16391637  $as_echo_n "(cached) " >&6
    16401638else
    … …  
    17001698  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17011699$as_echo_n "checking for $2... " >&6; }
    1702 if eval "test \"\${$3+set}\"" = set; then :
     1700if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17031701  $as_echo_n "(cached) " >&6
    17041702else
    … …  
    17771775  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17781776$as_echo_n "checking for $2... " >&6; }
    1779 if eval "test \"\${$3+set}\"" = set; then :
     1777if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17801778  $as_echo_n "(cached) " >&6
    17811779else
    … …  
    18301828  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18311829$as_echo_n "checking for $2... " >&6; }
    1832 if eval "test \"\${$3+set}\"" = set; then :
     1830if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18331831  $as_echo_n "(cached) " >&6
    18341832else
    … …  
    19351933
    19361934It was created by $as_me, which was
    1937 generated by GNU Autoconf 2.67.  Invocation command line was
     1935generated by GNU Autoconf 2.65.  Invocation command line was
    19381936
    19391937  $ $0 $@
    … …  
    20452043    echo
    20462044
    2047     $as_echo "## ---------------- ##
     2045    cat <<\_ASBOX
     2046## ---------------- ##
    20482047## Cache variables. ##
    2049 ## ---------------- ##"
     2048## ---------------- ##
     2049_ASBOX
    20502050    echo
    20512051    # The following way of writing the cache mishandles newlines in values,
    … …  
    20812081    echo
    20822082
    2083     $as_echo "## ----------------- ##
     2083    cat <<\_ASBOX
     2084## ----------------- ##
    20842085## Output variables. ##
    2085 ## ----------------- ##"
     2086## ----------------- ##
     2087_ASBOX
    20862088    echo
    20872089    for ac_var in $ac_subst_vars
    … …  
    20962098
    20972099    if test -n "$ac_subst_files"; then
    2098       $as_echo "## ------------------- ##
     2100      cat <<\_ASBOX
     2101## ------------------- ##
    20992102## File substitutions. ##
    2100 ## ------------------- ##"
     2103## ------------------- ##
     2104_ASBOX
    21012105      echo
    21022106      for ac_var in $ac_subst_files
    … …  
    21122116
    21132117    if test -s confdefs.h; then
    2114       $as_echo "## ----------- ##
     2118      cat <<\_ASBOX
     2119## ----------- ##
    21152120## confdefs.h. ##
    2116 ## ----------- ##"
     2121## ----------- ##
     2122_ASBOX
    21172123      echo
    21182124      cat confdefs.h
    … …  
    21692175ac_site_file2=NONE
    21702176if 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
    21772178elif test "x$prefix" != xNONE; then
    21782179  ac_site_file1=$prefix/share/config.site
    … …  
    21892190$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    21902191    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"
    21962193  fi
    21972194done
    … …  
    22692266  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    22702267$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" 5
     2268  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    22722269fi
    22732270## -------------------- ##
    … …  
    27662763test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    27672764$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2768 as_fn_error $? "no acceptable C compiler found in \$PATH
    2769 See \`config.log' for more details" "$LINENO" 5 ; }
     2765as_fn_error "no acceptable C compiler found in \$PATH
     2766See \`config.log' for more details." "$LINENO" 5; }
    27702767
    27712768# Provide some information about the compiler.
    … …  
    28812878{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28822879$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
     2881as_fn_error "C compiler cannot create executables
     2882See \`config.log' for more details." "$LINENO" 5; }; }
    28852883else
    28862884  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    29242922  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29252923$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2926 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    2927 See \`config.log' for more details" "$LINENO" 5 ; }
     2924as_fn_error "cannot compute suffix of executables: cannot compile and link
     2925See \`config.log' for more details." "$LINENO" 5; }
    29282926fi
    29292927rm -f conftest conftest$ac_cv_exeext
    … …  
    29822980    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29832981$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2984 as_fn_error $? "cannot run C compiled programs.
     2982as_fn_error "cannot run C compiled programs.
    29852983If you meant to cross compile, use \`--host'.
    2986 See \`config.log' for more details" "$LINENO" 5 ; }
     2984See \`config.log' for more details." "$LINENO" 5; }
    29872985    fi
    29882986  fi
    … …  
    30353033{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30363034$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3037 as_fn_error $? "cannot compute suffix of object files: cannot compile
    3038 See \`config.log' for more details" "$LINENO" 5 ; }
     3035as_fn_error "cannot compute suffix of object files: cannot compile
     3036See \`config.log' for more details." "$LINENO" 5; }
    30393037fi
    30403038rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    36053603
    36063604  fi
    3607   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     3605  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    36083606else
    36093607  echo "Checking for javac... $JAVAC"
    … …  
    36213619CLASS_TEST=Test.class
    36223620cat << \EOF > $JAVA_TEST
    3623 /* #line 3623 "configure" */
     3621/* #line 3621 "configure" */
    36243622public class Test {
    36253623}
    … …  
    36333631  ac_cv_prog_javac_works=yes
    36343632else
    3635   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3633  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    36363634  echo "configure: failed program was:" >&5
    36373635  cat $JAVA_TEST >&5
    … …  
    37383736
    37393737    fi
    3740     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     3738    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    37413739fi
    37423740
    … …  
    38003798        ac_cv_prog_uudecode_base64=yes
    38013799else
    3802         echo "configure: 3802: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     3800        echo "configure: 3800: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    38033801        echo "configure: failed file was:" >&5
    38043802        cat Test.uue >&5
    … …  
    38153813$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    38163814        if test x$ac_cv_prog_javac_works = xno; then
    3817                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     3815                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    38183816        fi
    38193817        if test x$ac_cv_prog_javac_works = x; then
    … …  
    39083906
    39093907  fi
    3910   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     3908  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    39113909else
    39123910  echo "Checking for javac... $JAVAC"
    … …  
    39243922CLASS_TEST=Test.class
    39253923cat << \EOF > $JAVA_TEST
    3926 /* #line 3926 "configure" */
     3924/* #line 3924 "configure" */
    39273925public class Test {
    39283926}
    … …  
    39363934  ac_cv_prog_javac_works=yes
    39373935else
    3938   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3936  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    39393937  echo "configure: failed program was:" >&5
    39403938  cat $JAVA_TEST >&5
    … …  
    39633961TEST=Test
    39643962cat << \EOF > $JAVA_TEST
    3965 /* [#]line 3965 "configure" */
     3963/* [#]line 3963 "configure" */
    39663964public class Test {
    39673965public static void main (String args[]) {
    … …  
    39803978          echo "configure: failed program was:" >&5
    39813979          cat $JAVA_TEST >&5
    3982           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3980          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    39833981        fi
    39843982fi
    … …  
    39933991  echo "configure: failed program was:" >&5
    39943992  cat $JAVA_TEST >&5
    3995   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3993  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    39963994fi
    39973995rm -fr $JAVA_TEST $CLASS_TEST Test.uue
    … …  
    40914089ac_aux_dir=
    40924090for 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
    41064098done
    41074099if test -z "$ac_aux_dir"; then
    4108   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     4100  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    41094101fi
    41104102
    … …  
    41204112# Make sure we can run config.sub.
    41214113$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    4122   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     4114  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    41234115
    41244116{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    41314123  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    41324124test "x$ac_build_alias" = x &&
    4133   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     4125  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    41344126ac_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" 5
     4127  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    41364128
    41374129fi
    … …  
    41404132case $ac_cv_build in
    41414133*-*-*) ;;
    4142 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     4134*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    41434135esac
    41444136build=$ac_cv_build
    … …  
    41654157else
    41664158  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" 5
     4159    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    41684160fi
    41694161
    … …  
    41734165case $ac_cv_host in
    41744166*-*-*) ;;
    4175 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     4167*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    41764168esac
    41774169host=$ac_cv_host
    … …  
    41984190else
    41994191  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" 5
     4192    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    42014193fi
    42024194
    … …  
    42064198case $ac_cv_target in
    42074199*-*-*) ;;
    4208 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     4200*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    42094201esac
    42104202target=$ac_cv_target
    … …  
    43374329set x ${MAKE-make}
    43384330ac_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 :
     4331if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    43404332  $as_echo_n "(cached) " >&6
    43414333else
    … …  
    43454337    @echo '@@@%%%=$(MAKE)=@@@%%%'
    43464338_ACEOF
    4347 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     4339# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    43484340case `${MAKE-make} -f conftest.make 2>/dev/null` in
    43494341  *@@@%%%=?*=@@@%%%*)
    … …  
    44554447  RANLIB="$ac_cv_prog_RANLIB"
    44564448fi
    4457 
    4458 
    4459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    4460 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    4461 arch_64bit=no
    4462 case "$host_cpu" in
    4463 x86_64) arch_64bit=yes ;;
    4464 esac
    4465 
    4466 if test "$arch_64bit" = yes; then
    4467   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    4468 $as_echo "yes" >&6; }
    4469   if test -z "$COMPAT32BITFLAGS" ; then
    4470     COMPAT32BITFLAGS="-m32"
    4471   fi
    4472 else
    4473   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    4474 $as_echo "no" >&6; }
    4475   if test -z "$COMPAT32BITFLAGS" ; then
    4476     COMPAT32BITFLAGS=
    4477   fi
    4478 fi
    4479 
    4480 # Only need compat32bitflag if using MG or MGPP
    4481 if test "$ENABLE_MG" = "0" -a "$ENABLE_MGPP" = "0" ; then
    4482   COMPAT32BITFLAGS=
    4483 fi
    4484 
    4485 export COMPAT32BITFLAGS
    44864449
    44874450
    … …  
    45604523continue
    45614524fi
    4562 rm -f conftest.err conftest.i conftest.$ac_ext
     4525rm -f conftest.err conftest.$ac_ext
    45634526
    45644527  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    45764539break
    45774540fi
    4578 rm -f conftest.err conftest.i conftest.$ac_ext
     4541rm -f conftest.err conftest.$ac_ext
    45794542
    45804543done
    45814544# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4582 rm -f conftest.i conftest.err conftest.$ac_ext
     4545rm -f conftest.err conftest.$ac_ext
    45834546if $ac_preproc_ok; then :
    45844547  break
    … …  
    46194582continue
    46204583fi
    4621 rm -f conftest.err conftest.i conftest.$ac_ext
     4584rm -f conftest.err conftest.$ac_ext
    46224585
    46234586  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    46354598break
    46364599fi
    4637 rm -f conftest.err conftest.i conftest.$ac_ext
     4600rm -f conftest.err conftest.$ac_ext
    46384601
    46394602done
    46404603# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4641 rm -f conftest.i conftest.err conftest.$ac_ext
     4604rm -f conftest.err conftest.$ac_ext
    46424605if $ac_preproc_ok; then :
    46434606
    … …  
    46454608  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    46464609$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4647 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4648 See \`config.log' for more details" "$LINENO" 5 ; }
     4610as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4611See \`config.log' for more details." "$LINENO" 5; }
    46494612fi
    46504613
    … …  
    47074670IFS=$as_save_IFS
    47084671  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" 5
     4672    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    47104673  fi
    47114674else
    … …  
    47734736IFS=$as_save_IFS
    47744737  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" 5
     4738    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    47764739  fi
    47774740else
    … …  
    49054868ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    49064869"
    4907 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4870eval as_val=\$$as_ac_Header
     4871   if test "x$as_val" = x""yes; then :
    49084872  cat >>confdefs.h <<_ACEOF
    49094873#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    54605424{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    54615425$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5462 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     5426if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    54635427  $as_echo_n "(cached) " >&6
    54645428else
    … …  
    54875451           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    54885452$as_echo "$ac_res" >&6; }
    5489 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5453eval as_val=\$$as_ac_Header
     5454   if test "x$as_val" = x""yes; then :
    54905455  cat >>confdefs.h <<_ACEOF
    54915456#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    57295694  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    57305695ac_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 :
     5696eval as_val=\$$as_ac_Header
     5697   if test "x$as_val" = x""yes; then :
    57325698  cat >>confdefs.h <<_ACEOF
    57335699#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    59025868    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    59035869ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5904 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5870eval as_val=\$$as_ac_var
     5871   if test "x$as_val" = x""yes; then :
    59055872
    59065873cat >>confdefs.h <<_ACEOF
    … …  
    60626029  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    60636030ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    6064 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     6031eval as_val=\$$as_ac_var
     6032   if test "x$as_val" = x""yes; then :
    60656033  cat >>confdefs.h <<_ACEOF
    60666034#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    60706038done
    60716039
    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
     6040for ac_func in ftruncate strstr strcasecmp
     6041do :
     6042  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     6043ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     6044eval 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
    60756049
    60766050else
    60776051  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"
    60806054 ;;
    60816055esac
    60826056
    60836057fi
    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
     6058done
    61106059
    61116060
    … …  
    62776226{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5
    62786227$as_echo "\"no\"" >&6; }
    6279 as_fn_error $? "\"Perl 5 not available - cannot install\"" "$LINENO" 5
     6228as_fn_error "\"Perl 5 not available - cannot install\"" "$LINENO" 5
    62806229fi
    62816230
    … …  
    63466295{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5
    63476296$as_echo "\"yes\"" >&6; }
    6348 as_fn_error $? "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
     6297as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
    63496298fi
    63506299
    … …  
    65786527     ;; #(
    65796528   *)
    6580      as_fn_error $? "unknown endianness
    6581  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 ;;
    65826531 esac
    65836532
    … …  
    66266575srclist="src/hashfile/Makefile \
    66276576         src/phind/generate/Makefile \
    6628     src/java/org/nzdl/gsdl/Makefile"
     6577        src/java/org/nzdl/gsdl/Makefile"
    66296578
    66306579ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs"
    … …  
    67136662ac_libobjs=
    67146663ac_ltlibobjs=
    6715 U=
    67166664for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    67176665  # 1. Remove the extension, and $U if already installed.
    … …  
    68766824
    68776825
    6878 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6879 # ----------------------------------------
     6826# as_fn_error ERROR [LINENO LOG_FD]
     6827# ---------------------------------
    68806828# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    68816829# 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.
    68836831as_fn_error ()
    68846832{
    6885   as_status=$1; test $as_status -eq 0 && as_status=1
    6886   if test "$4"; then
    6887     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6888     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6833  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
    68896837  fi
    6890   $as_echo "$as_me: error: $2" >&2
     6838  $as_echo "$as_me: error: $1" >&2
    68916839  as_fn_exit $as_status
    68926840} # as_fn_error
    … …  
    70847032    done
    70857033    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"
    70877035
    70887036
    … …  
    71387086ac_log="
    71397087This file was extended by $as_me, which was
    7140 generated by GNU Autoconf 2.67.  Invocation command line was
     7088generated by GNU Autoconf 2.65.  Invocation command line was
    71417089
    71427090  CONFIG_FILES    = $CONFIG_FILES
    … …  
    72007148ac_cs_version="\\
    72017149config.status
    7202 configured by $0, generated by GNU Autoconf 2.67,
     7150configured by $0, generated by GNU Autoconf 2.65,
    72037151  with options \\"\$ac_cs_config\\"
    72047152
    7205 Copyright (C) 2010 Free Software Foundation, Inc.
     7153Copyright (C) 2009 Free Software Foundation, Inc.
    72067154This config.status script is free software; the Free Software Foundation
    72077155gives unlimited permission to copy, distribute and modify it."
    … …  
    72207168do
    72217169  case $1 in
    7222   --*=?*)
     7170  --*=*)
    72237171    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    72247172    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    7225     ac_shift=:
    7226     ;;
    7227   --*=)
    7228     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    7229     ac_optarg=
    72307173    ac_shift=:
    72317174    ;;
    … …  
    72517194    case $ac_optarg in
    72527195    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    7253     '') as_fn_error $? "missing file argument" ;;
    72547196    esac
    72557197    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    72647206  --he | --h)
    72657207    # Conflict between --help and --header
    7266     as_fn_error $? "ambiguous option: \`$1'
     7208    as_fn_error "ambiguous option: \`$1'
    72677209Try \`$0 --help' for more information.";;
    72687210  --help | --hel | -h )
    … …  
    72737215
    72747216  # This is an error.
    7275   -*) as_fn_error $? "unrecognized option: \`$1'
     7217  -*) as_fn_error "unrecognized option: \`$1'
    72767218Try \`$0 --help' for more information." ;;
    72777219
    … …  
    73287270    "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;;
    73297271
    7330   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     7272  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    73317273  esac
    73327274done
    … …  
    73657307  tmp=./conf$$-$RANDOM
    73667308  (umask 077 && mkdir "$tmp")
    7367 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     7309} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    73687310
    73697311# Set up the scripts for CONFIG_FILES section.
    … …  
    73827324ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    73837325if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    7384   ac_cs_awk_cr='\\r'
     7326  ac_cs_awk_cr='\r'
    73857327else
    73867328  ac_cs_awk_cr=$ac_cr
    … …  
    73967338  echo "_ACEOF"
    73977339} >conf$$subs.sh ||
    7398   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    7399 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     7340  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     7341ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    74007342ac_delim='%!_!# '
    74017343for ac_last_try in false false false false false :; do
    74027344  . ./conf$$subs.sh ||
    7403     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7345    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74047346
    74057347  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    74077349    break
    74087350  elif $ac_last_try; then
    7409     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7351    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74107352  else
    74117353    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    74967438  cat
    74977439fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    7498   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    7499 _ACEOF
    7500 
    7501 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7502 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     7440  || 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
    75037445# trailing colons and then remove the whole line if VPATH becomes empty
    75047446# (actually we leave an empty line to preserve line numbers).
    75057447if 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[    ]*=/{
     7449s/:*\$(srcdir):*/:/
     7450s/:*\${srcdir}:*/:/
     7451s/:*@srcdir@:*/:/
     7452s/^\([^=]*=[     ]*\):*/\1/
    75157453s/:*$//
    7516 x
    7517 s/\(=[   ]*\).*/\1/
    7518 G
    7519 s/\n//
    75207454s/^[^=]*=[   ]*$//
    75217455}'
    … …  
    75457479    break
    75467480  elif $ac_last_try; then
    7547     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     7481    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    75487482  else
    75497483    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    76307564_ACEOF
    76317565cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7632   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7566  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    76337567fi # test -n "$CONFIG_HEADERS"
    76347568
    … …  
    76437577  case $ac_mode$ac_tag in
    76447578  :[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;;
    76467580  :[FH]-) ac_tag=-:-;;
    76477581  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    76717605       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    76727606       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;;
    76747608      esac
    76757609      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    76987632    case $ac_tag in
    76997633    *:-:* | *:-) 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 ;;
    77017635    esac
    77027636    ;;
    … …  
    78297763"
    78307764eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7831   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7765  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78327766
    78337767test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    78357769  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    78367770  { $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" >&5
     7771which seems to be undefined.  Please make sure it is defined." >&5
    78387772$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;}
     7773which seems to be undefined.  Please make sure it is defined." >&2;}
    78407774
    78417775  rm -f "$tmp/stdin"
    … …  
    78447778  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    78457779  esac \
    7846   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7780  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78477781 ;;
    78487782  :H)
    … …  
    78557789      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    78567790    } >"$tmp/config.h" \
    7857       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7791      || as_fn_error "could not create $ac_file" "$LINENO" 5
    78587792    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    78597793      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    78627796      rm -f "$ac_file"
    78637797      mv "$tmp/config.h" "$ac_file" \
    7864     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7798    || as_fn_error "could not create $ac_file" "$LINENO" 5
    78657799    fi
    78667800  else
    78677801    $as_echo "/* $configure_input  */" \
    78687802      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7869       || as_fn_error $? "could not create -" "$LINENO" 5
     7803      || as_fn_error "could not create -" "$LINENO" 5
    78707804  fi
    78717805 ;;
    … …  
    78827816
    78837817test $ac_write_fail = 0 ||
    7884   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7818  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    78857819
    78867820
    … …  
    79037837  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    79047838  # would make configure fail if this is the last instruction.
    7905   $ac_cs_success || as_fn_exit 1
     7839  $ac_cs_success || as_fn_exit $?
    79067840fi
    79077841
    … …  
    80447978      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
    80457979       --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
    8046     as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     7980    as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
    80477981    fi
    80487982

  • main/branches/64_bit_Greenstone/greenstone2/build-src/configure.in

    r23356 r23508  
    164164AC_PROG_RANLIB
    165165
    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 
     166dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     167dnl arch_64bit=no
     168dnl case "$host_cpu" in
     169dnl x86_64) arch_64bit=yes ;;
     170dnl esac
    192171
    193172#moved CORBA MICO directory test to get version of MICO

  • main/branches/64_bit_Greenstone/greenstone2/build-src/packages/configure

    r22696 r23508  
    182182cd "$PACKAGES/cpan/XML-Parser-2.34" && \
    183183
    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
    196185perl Makefile.PL \
    197186  PREFIX="$GSDLHOME/perllib/cpan/XML" \
    … …  
    203192  EXPATINCPATH="$GSDLHOME/common-src/packages/expat/include" \
    204193  EXPATLIBPATH="$GSDLHOME/common-src/packages/expat/lib"
    205 fi
     194
    206195
    207196# configure powerpoint converter

  • main/branches/64_bit_Greenstone/greenstone2/build-src/src/hashfile/Makefile.in

    r16604 r23508  
    2929
    3030CXX = @CXX@
    31 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     31CXXFLAGS = @CXXFLAGS@
    3232DEFS = @DEFS@
    3333GSDLOS = @gsdlos@
    3434INCLUDES =
    3535INSTALL = @INSTALL@
    36 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     36LDFLAGS = @LDFLAGS@
    3737LIBS = @LIBS@
    3838

  • main/branches/64_bit_Greenstone/greenstone2/build-src/src/phind/generate/Makefile.in

    r16604 r23508  
    3030
    3131CXX = @CXX@
    32 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     32CXXFLAGS = @CXXFLAGS@
    3333DEFS = @DEFS@
    3434GSDLOS = @gsdlos@
    3535INCLUDES =
    3636INSTALL = @INSTALL@
    37 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     37LDFLAGS = @LDFLAGS@
    3838LIBS = @LIBS@
    3939

  • main/branches/64_bit_Greenstone/greenstone2/common-src/configure

    r23356 r23508  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    606606CPP
    607607MICO_VER
    608 COMPAT32BITFLAGS
    609608RANLIB
    610609SET_MAKE
    … …  
    793792
    794793  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 ;;
    798796  esac
    799797
    … …  
    840838    # Reject names that are not valid shell variable names.
    841839    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"
    843841    ac_useropt_orig=$ac_useropt
    844842    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    866864    # Reject names that are not valid shell variable names.
    867865    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"
    869867    ac_useropt_orig=$ac_useropt
    870868    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10701068    # Reject names that are not valid shell variable names.
    10711069    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"
    10731071    ac_useropt_orig=$ac_useropt
    10741072    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10861084    # Reject names that are not valid shell variable names.
    10871085    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"
    10891087    ac_useropt_orig=$ac_useropt
    10901088    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    11161114    x_libraries=$ac_optarg ;;
    11171115
    1118   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1119 Try \`$0 --help' for more information"
     1116  -*) as_fn_error "unrecognized option: \`$ac_option'
     1117Try \`$0 --help' for more information."
    11201118    ;;
    11211119
    … …  
    11251123    case $ac_envvar in #(
    11261124      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1127       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1125      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    11281126    esac
    11291127    eval $ac_envvar=\$ac_optarg
    … …  
    11431141if test -n "$ac_prev"; then
    11441142  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"
    11461144fi
    11471145
    … …  
    11491147  case $enable_option_checking in
    11501148    no) ;;
    1151     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1149    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11521150    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11531151  esac
    … …  
    11721170    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11731171  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"
    11751173done
    11761174
    … …  
    11861184  if test "x$build_alias" = x; then
    11871185    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" >&2
     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." >&2
    11901188  elif test "x$build_alias" != "x$host_alias"; then
    11911189    cross_compiling=yes
    … …  
    12021200ac_ls_di=`ls -di .` &&
    12031201ac_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"
    12051203test "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"
    12071205
    12081206
    … …  
    12431241if test ! -r "$srcdir/$ac_unique_file"; then
    12441242  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"
    12461244fi
    12471245ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12481246ac_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"
    12501248    pwd)`
    12511249# When building in place, set srcdir=.
    … …  
    12871285      --help=recursive    display the short help of all the included packages
    12881286  -V, --version           display version information and exit
    1289   -q, --quiet, --silent   do not print \`checking ...' messages
     1287  -q, --quiet, --silent   do not print \`checking...' messages
    12901288      --cache-file=FILE   cache test results in FILE [disabled]
    12911289  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14501448  cat <<\_ACEOF
    14511449configure
    1452 generated by GNU Autoconf 2.67
    1453 
    1454 Copyright (C) 2010 Free Software Foundation, Inc.
     1450generated by GNU Autoconf 2.65
     1451
     1452Copyright (C) 2009 Free Software Foundation, Inc.
    14551453This configure script is free software; the Free Software Foundation
    14561454gives unlimited permission to copy, distribute and modify it.
    … …  
    15601558  fi
    15611559  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1562   test $ac_status = 0; } > conftest.i && {
     1560  test $ac_status = 0; } >/dev/null && {
    15631561     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15641562     test ! -s conftest.err
    … …  
    15841582{
    15851583  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 :
    15871585  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15881586$as_echo_n "checking for $2... " >&6; }
    1589 if eval "test \"\${$3+set}\"" = set; then :
     1587if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15901588  $as_echo_n "(cached) " >&6
    15911589fi
    … …  
    16231621  ac_header_preproc=no
    16241622fi
    1625 rm -f conftest.err conftest.i conftest.$ac_ext
     1623rm -f conftest.err conftest.$ac_ext
    16261624{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    16271625$as_echo "$ac_header_preproc" >&6; }
    … …  
    16501648  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16511649$as_echo_n "checking for $2... " >&6; }
    1652 if eval "test \"\${$3+set}\"" = set; then :
     1650if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16531651  $as_echo_n "(cached) " >&6
    16541652else
    … …  
    17141712  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17151713$as_echo_n "checking for $2... " >&6; }
    1716 if eval "test \"\${$3+set}\"" = set; then :
     1714if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17171715  $as_echo_n "(cached) " >&6
    17181716else
    … …  
    17911789  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17921790$as_echo_n "checking for $2... " >&6; }
    1793 if eval "test \"\${$3+set}\"" = set; then :
     1791if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17941792  $as_echo_n "(cached) " >&6
    17951793else
    … …  
    18441842  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18451843$as_echo_n "checking for $2... " >&6; }
    1846 if eval "test \"\${$3+set}\"" = set; then :
     1844if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18471845  $as_echo_n "(cached) " >&6
    18481846else
    … …  
    19491947
    19501948It was created by $as_me, which was
    1951 generated by GNU Autoconf 2.67.  Invocation command line was
     1949generated by GNU Autoconf 2.65.  Invocation command line was
    19521950
    19531951  $ $0 $@
    … …  
    20592057    echo
    20602058
    2061     $as_echo "## ---------------- ##
     2059    cat <<\_ASBOX
     2060## ---------------- ##
    20622061## Cache variables. ##
    2063 ## ---------------- ##"
     2062## ---------------- ##
     2063_ASBOX
    20642064    echo
    20652065    # The following way of writing the cache mishandles newlines in values,
    … …  
    20952095    echo
    20962096
    2097     $as_echo "## ----------------- ##
     2097    cat <<\_ASBOX
     2098## ----------------- ##
    20982099## Output variables. ##
    2099 ## ----------------- ##"
     2100## ----------------- ##
     2101_ASBOX
    21002102    echo
    21012103    for ac_var in $ac_subst_vars
    … …  
    21102112
    21112113    if test -n "$ac_subst_files"; then
    2112       $as_echo "## ------------------- ##
     2114      cat <<\_ASBOX
     2115## ------------------- ##
    21132116## File substitutions. ##
    2114 ## ------------------- ##"
     2117## ------------------- ##
     2118_ASBOX
    21152119      echo
    21162120      for ac_var in $ac_subst_files
    … …  
    21262130
    21272131    if test -s confdefs.h; then
    2128       $as_echo "## ----------- ##
     2132      cat <<\_ASBOX
     2133## ----------- ##
    21292134## confdefs.h. ##
    2130 ## ----------- ##"
     2135## ----------- ##
     2136_ASBOX
    21312137      echo
    21322138      cat confdefs.h
    … …  
    21832189ac_site_file2=NONE
    21842190if 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
    21912192elif test "x$prefix" != xNONE; then
    21922193  ac_site_file1=$prefix/share/config.site
    … …  
    22032204$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    22042205    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"
    22102207  fi
    22112208done
    … …  
    22832280  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    22842281$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" 5
     2282  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    22862283fi
    22872284## -------------------- ##
    … …  
    28482845test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28492846$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2850 as_fn_error $? "no acceptable C compiler found in \$PATH
    2851 See \`config.log' for more details" "$LINENO" 5 ; }
     2847as_fn_error "no acceptable C compiler found in \$PATH
     2848See \`config.log' for more details." "$LINENO" 5; }
    28522849
    28532850# Provide some information about the compiler.
    … …  
    29632960{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29642961$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
     2963as_fn_error "C compiler cannot create executables
     2964See \`config.log' for more details." "$LINENO" 5; }; }
    29672965else
    29682966  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    30063004  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30073005$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3008 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    3009 See \`config.log' for more details" "$LINENO" 5 ; }
     3006as_fn_error "cannot compute suffix of executables: cannot compile and link
     3007See \`config.log' for more details." "$LINENO" 5; }
    30103008fi
    30113009rm -f conftest conftest$ac_cv_exeext
    … …  
    30643062    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30653063$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3066 as_fn_error $? "cannot run C compiled programs.
     3064as_fn_error "cannot run C compiled programs.
    30673065If you meant to cross compile, use \`--host'.
    3068 See \`config.log' for more details" "$LINENO" 5 ; }
     3066See \`config.log' for more details." "$LINENO" 5; }
    30693067    fi
    30703068  fi
    … …  
    31173115{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    31183116$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3119 as_fn_error $? "cannot compute suffix of object files: cannot compile
    3120 See \`config.log' for more details" "$LINENO" 5 ; }
     3117as_fn_error "cannot compute suffix of object files: cannot compile
     3118See \`config.log' for more details." "$LINENO" 5; }
    31213119fi
    31223120rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    36873685
    36883686    fi
    3689     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     3687    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    36903688fi
    36913689
    … …  
    37493747        ac_cv_prog_uudecode_base64=yes
    37503748else
    3751         echo "configure: 3751: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     3749        echo "configure: 3749: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    37523750        echo "configure: failed file was:" >&5
    37533751        cat Test.uue >&5
    … …  
    37643762$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    37653763        if test x$ac_cv_prog_javac_works = xno; then
    3766                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     3764                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    37673765        fi
    37683766        if test x$ac_cv_prog_javac_works = x; then
    … …  
    38573855
    38583856  fi
    3859   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     3857  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    38603858else
    38613859  echo "Checking for javac... $JAVAC"
    … …  
    38723870CLASS_TEST=Test.class
    38733871cat << \EOF > $JAVA_TEST
    3874 /* #line 3874 "configure" */
     3872/* #line 3872 "configure" */
    38753873public class Test {
    38763874}
    … …  
    38843882  ac_cv_prog_javac_works=yes
    38853883else
    3886   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3884  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    38873885  echo "configure: failed program was:" >&5
    38883886  cat $JAVA_TEST >&5
    … …  
    39113909TEST=Test
    39123910cat << \EOF > $JAVA_TEST
    3913 /* [#]line 3913 "configure" */
     3911/* [#]line 3911 "configure" */
    39143912public class Test {
    39153913public static void main (String args[]) {
    … …  
    39283926          echo "configure: failed program was:" >&5
    39293927          cat $JAVA_TEST >&5
    3930           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3928          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    39313929        fi
    39323930fi
    … …  
    39413939  echo "configure: failed program was:" >&5
    39423940  cat $JAVA_TEST >&5
    3943   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3941  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    39443942fi
    39453943rm -fr $JAVA_TEST $CLASS_TEST Test.uue
    … …  
    40414039
    40424040  fi
    4043   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4041  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    40444042else
    40454043  echo "Checking for javac... $JAVAC"
    … …  
    40564054CLASS_TEST=Test.class
    40574055cat << \EOF > $JAVA_TEST
    4058 /* #line 4058 "configure" */
     4056/* #line 4056 "configure" */
    40594057public class Test {
    40604058}
    … …  
    40684066  ac_cv_prog_javac_works=yes
    40694067else
    4070   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4068  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    40714069  echo "configure: failed program was:" >&5
    40724070  cat $JAVA_TEST >&5
    … …  
    41714169ac_aux_dir=
    41724170for 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
    41864178done
    41874179if test -z "$ac_aux_dir"; then
    4188   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     4180  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    41894181fi
    41904182
    … …  
    42004192# Make sure we can run config.sub.
    42014193$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    4202   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     4194  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    42034195
    42044196{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    42114203  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    42124204test "x$ac_build_alias" = x &&
    4213   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     4205  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    42144206ac_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" 5
     4207  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    42164208
    42174209fi
    … …  
    42204212case $ac_cv_build in
    42214213*-*-*) ;;
    4222 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     4214*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    42234215esac
    42244216build=$ac_cv_build
    … …  
    42454237else
    42464238  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" 5
     4239    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    42484240fi
    42494241
    … …  
    42534245case $ac_cv_host in
    42544246*-*-*) ;;
    4255 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     4247*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    42564248esac
    42574249host=$ac_cv_host
    … …  
    42784270else
    42794271  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" 5
     4272    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    42814273fi
    42824274
    … …  
    42864278case $ac_cv_target in
    42874279*-*-*) ;;
    4288 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     4280*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    42894281esac
    42904282target=$ac_cv_target
    … …  
    44174409set x ${MAKE-make}
    44184410ac_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 :
     4411if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    44204412  $as_echo_n "(cached) " >&6
    44214413else
    … …  
    44254417    @echo '@@@%%%=$(MAKE)=@@@%%%'
    44264418_ACEOF
    4427 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     4419# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    44284420case `${MAKE-make} -f conftest.make 2>/dev/null` in
    44294421  *@@@%%%=?*=@@@%%%*)
    … …  
    45354527  RANLIB="$ac_cv_prog_RANLIB"
    45364528fi
    4537 
    4538 
    4539 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    4540 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    4541 arch_64bit=no
    4542 case "$host_cpu" in
    4543 x86_64) arch_64bit=yes ;;
    4544 esac
    4545 
    4546 if test "$arch_64bit" = yes; then
    4547   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    4548 $as_echo "yes" >&6; }
    4549   if test -z "$COMPAT32BITFLAGS" ; then
    4550     COMPAT32BITFLAGS="-m32"
    4551   fi
    4552 else
    4553   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    4554 $as_echo "no" >&6; }
    4555   if test -z "$COMPAT32BITFLAGS" ; then
    4556     COMPAT32BITFLAGS=
    4557   fi
    4558 fi
    4559 
    4560 # Only need compat32bitflag if using MG or MGPP
    4561 if test "$ENABLE_MG" = "0" ; then
    4562   COMPAT32BITFLAGS=
    4563 else
    4564   if test "$ENABLE_MGPP" = "0" ; then
    4565     COMPAT32BITFLAGS=
    4566   fi
    4567 fi
    4568 
    4569 export COMPAT32BITFLAGS
    45704529
    45714530
    … …  
    46444603continue
    46454604fi
    4646 rm -f conftest.err conftest.i conftest.$ac_ext
     4605rm -f conftest.err conftest.$ac_ext
    46474606
    46484607  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    46604619break
    46614620fi
    4662 rm -f conftest.err conftest.i conftest.$ac_ext
     4621rm -f conftest.err conftest.$ac_ext
    46634622
    46644623done
    46654624# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4666 rm -f conftest.i conftest.err conftest.$ac_ext
     4625rm -f conftest.err conftest.$ac_ext
    46674626if $ac_preproc_ok; then :
    46684627  break
    … …  
    47034662continue
    47044663fi
    4705 rm -f conftest.err conftest.i conftest.$ac_ext
     4664rm -f conftest.err conftest.$ac_ext
    47064665
    47074666  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    47194678break
    47204679fi
    4721 rm -f conftest.err conftest.i conftest.$ac_ext
     4680rm -f conftest.err conftest.$ac_ext
    47224681
    47234682done
    47244683# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4725 rm -f conftest.i conftest.err conftest.$ac_ext
     4684rm -f conftest.err conftest.$ac_ext
    47264685if $ac_preproc_ok; then :
    47274686
    … …  
    47294688  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    47304689$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4731 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4732 See \`config.log' for more details" "$LINENO" 5 ; }
     4690as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4691See \`config.log' for more details." "$LINENO" 5; }
    47334692fi
    47344693
    … …  
    47914750IFS=$as_save_IFS
    47924751  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" 5
     4752    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    47944753  fi
    47954754else
    … …  
    48574816IFS=$as_save_IFS
    48584817  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" 5
     4818    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    48604819  fi
    48614820else
    … …  
    49894948ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    49904949"
    4991 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4950eval as_val=\$$as_ac_Header
     4951   if test "x$as_val" = x""yes; then :
    49924952  cat >>confdefs.h <<_ACEOF
    49934953#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    55055465{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    55065466$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5507 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     5467if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    55085468  $as_echo_n "(cached) " >&6
    55095469else
    … …  
    55325492           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    55335493$as_echo "$ac_res" >&6; }
    5534 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5494eval as_val=\$$as_ac_Header
     5495   if test "x$as_val" = x""yes; then :
    55355496  cat >>confdefs.h <<_ACEOF
    55365497#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    57745735  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    57755736ac_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 :
     5737eval as_val=\$$as_ac_Header
     5738   if test "x$as_val" = x""yes; then :
    57775739  cat >>confdefs.h <<_ACEOF
    57785740#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    59475909    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    59485910ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5949 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5911eval as_val=\$$as_ac_var
     5912   if test "x$as_val" = x""yes; then :
    59505913
    59515914cat >>confdefs.h <<_ACEOF
    … …  
    61076070  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    61086071ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    6109 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     6072eval as_val=\$$as_ac_var
     6073   if test "x$as_val" = x""yes; then :
    61106074  cat >>confdefs.h <<_ACEOF
    61116075#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    61156079done
    61166080
    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
     6081for ac_func in ftruncate strstr strcasecmp
     6082do :
     6083  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     6084ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     6085eval 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
    61206090
    61216091else
    61226092  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"
    61256095 ;;
    61266096esac
    61276097
    61286098fi
    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
     6099done
    61556100
    61566101
    … …  
    63606305{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5
    63616306$as_echo "\"yes\"" >&6; }
    6362 as_fn_error $? "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
     6307as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
    63636308fi
    63646309
    … …  
    65926537     ;; #(
    65936538   *)
    6594      as_fn_error $? "unknown endianness
    6595  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 ;;
    65966541 esac
    65976542
    … …  
    66506595         src/gdbmedit/gdbmget/Makefile \
    66516596         src/gdbmedit/gdbmset/Makefile \
    6652     src/gdbmedit/gdbmkeys/Makefile \
    6653     src/gdbmedit/gdbmdel/Makefile \
     6597        src/gdbmedit/gdbmkeys/Makefile \
     6598        src/gdbmedit/gdbmdel/Makefile \
    66546599         src/getpw/Makefile \
    6655     src/jdbmedit/Makefile"
     6600        src/jdbmedit/Makefile"
    66566601
    66576602ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs"
    … …  
    67406685ac_libobjs=
    67416686ac_ltlibobjs=
    6742 U=
    67436687for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    67446688  # 1. Remove the extension, and $U if already installed.
    … …  
    69036847
    69046848
    6905 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6906 # ----------------------------------------
     6849# as_fn_error ERROR [LINENO LOG_FD]
     6850# ---------------------------------
    69076851# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    69086852# 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.
    69106854as_fn_error ()
    69116855{
    6912   as_status=$1; test $as_status -eq 0 && as_status=1
    6913   if test "$4"; then
    6914     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6915     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6856  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
    69166860  fi
    6917   $as_echo "$as_me: error: $2" >&2
     6861  $as_echo "$as_me: error: $1" >&2
    69186862  as_fn_exit $as_status
    69196863} # as_fn_error
    … …  
    71117055    done
    71127056    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"
    71147058
    71157059
    … …  
    71657109ac_log="
    71667110This file was extended by $as_me, which was
    7167 generated by GNU Autoconf 2.67.  Invocation command line was
     7111generated by GNU Autoconf 2.65.  Invocation command line was
    71687112
    71697113  CONFIG_FILES    = $CONFIG_FILES
    … …  
    72277171ac_cs_version="\\
    72287172config.status
    7229 configured by $0, generated by GNU Autoconf 2.67,
     7173configured by $0, generated by GNU Autoconf 2.65,
    72307174  with options \\"\$ac_cs_config\\"
    72317175
    7232 Copyright (C) 2010 Free Software Foundation, Inc.
     7176Copyright (C) 2009 Free Software Foundation, Inc.
    72337177This config.status script is free software; the Free Software Foundation
    72347178gives unlimited permission to copy, distribute and modify it."
    … …  
    72477191do
    72487192  case $1 in
    7249   --*=?*)
     7193  --*=*)
    72507194    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    72517195    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    7252     ac_shift=:
    7253     ;;
    7254   --*=)
    7255     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    7256     ac_optarg=
    72577196    ac_shift=:
    72587197    ;;
    … …  
    72787217    case $ac_optarg in
    72797218    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    7280     '') as_fn_error $? "missing file argument" ;;
    72817219    esac
    72827220    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    72917229  --he | --h)
    72927230    # Conflict between --help and --header
    7293     as_fn_error $? "ambiguous option: \`$1'
     7231    as_fn_error "ambiguous option: \`$1'
    72947232Try \`$0 --help' for more information.";;
    72957233  --help | --hel | -h )
    … …  
    73007238
    73017239  # This is an error.
    7302   -*) as_fn_error $? "unrecognized option: \`$1'
     7240  -*) as_fn_error "unrecognized option: \`$1'
    73037241Try \`$0 --help' for more information." ;;
    73047242
    … …  
    73557293    "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;;
    73567294
    7357   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     7295  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    73587296  esac
    73597297done
    … …  
    73927330  tmp=./conf$$-$RANDOM
    73937331  (umask 077 && mkdir "$tmp")
    7394 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     7332} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    73957333
    73967334# Set up the scripts for CONFIG_FILES section.
    … …  
    74097347ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    74107348if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    7411   ac_cs_awk_cr='\\r'
     7349  ac_cs_awk_cr='\r'
    74127350else
    74137351  ac_cs_awk_cr=$ac_cr
    … …  
    74237361  echo "_ACEOF"
    74247362} >conf$$subs.sh ||
    7425   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    7426 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     7363  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     7364ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    74277365ac_delim='%!_!# '
    74287366for ac_last_try in false false false false false :; do
    74297367  . ./conf$$subs.sh ||
    7430     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7368    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74317369
    74327370  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    74347372    break
    74357373  elif $ac_last_try; then
    7436     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7374    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74377375  else
    74387376    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    75237461  cat
    75247462fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    7525   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    7526 _ACEOF
    7527 
    7528 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7529 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     7463  || 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
    75307468# trailing colons and then remove the whole line if VPATH becomes empty
    75317469# (actually we leave an empty line to preserve line numbers).
    75327470if 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[    ]*=/{
     7472s/:*\$(srcdir):*/:/
     7473s/:*\${srcdir}:*/:/
     7474s/:*@srcdir@:*/:/
     7475s/^\([^=]*=[     ]*\):*/\1/
    75427476s/:*$//
    7543 x
    7544 s/\(=[   ]*\).*/\1/
    7545 G
    7546 s/\n//
    75477477s/^[^=]*=[   ]*$//
    75487478}'
    … …  
    75727502    break
    75737503  elif $ac_last_try; then
    7574     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     7504    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    75757505  else
    75767506    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    76577587_ACEOF
    76587588cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7659   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7589  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    76607590fi # test -n "$CONFIG_HEADERS"
    76617591
    … …  
    76707600  case $ac_mode$ac_tag in
    76717601  :[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;;
    76737603  :[FH]-) ac_tag=-:-;;
    76747604  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    76987628       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    76997629       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;;
    77017631      esac
    77027632      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    77257655    case $ac_tag in
    77267656    *:-:* | *:-) 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 ;;
    77287658    esac
    77297659    ;;
    … …  
    78567786"
    78577787eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7858   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7788  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78597789
    78607790test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    78627792  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    78637793  { $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" >&5
     7794which seems to be undefined.  Please make sure it is defined." >&5
    78657795$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;}
     7796which seems to be undefined.  Please make sure it is defined." >&2;}
    78677797
    78687798  rm -f "$tmp/stdin"
    … …  
    78717801  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    78727802  esac \
    7873   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7803  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78747804 ;;
    78757805  :H)
    … …  
    78827812      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    78837813    } >"$tmp/config.h" \
    7884       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7814      || as_fn_error "could not create $ac_file" "$LINENO" 5
    78857815    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    78867816      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    78897819      rm -f "$ac_file"
    78907820      mv "$tmp/config.h" "$ac_file" \
    7891     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7821    || as_fn_error "could not create $ac_file" "$LINENO" 5
    78927822    fi
    78937823  else
    78947824    $as_echo "/* $configure_input  */" \
    78957825      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7896       || as_fn_error $? "could not create -" "$LINENO" 5
     7826      || as_fn_error "could not create -" "$LINENO" 5
    78977827  fi
    78987828 ;;
    … …  
    79097839
    79107840test $ac_write_fail = 0 ||
    7911   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7841  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    79127842
    79137843
    … …  
    79307860  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    79317861  # would make configure fail if this is the last instruction.
    7932   $ac_cs_success || as_fn_exit 1
     7862  $ac_cs_success || as_fn_exit $?
    79337863fi
    79347864
    … …  
    80718001      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
    80728002       --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
    8073     as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     8003    as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
    80748004    fi
    80758005

  • main/branches/64_bit_Greenstone/greenstone2/common-src/configure.in

    r23356 r23508  
    216216AC_PROG_RANLIB
    217217
    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 
     218dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     219dnl arch_64bit=no
     220dnl case "$host_cpu" in
     221dnl x86_64) arch_64bit=yes ;;
     222dnl esac
    248223
    249224#moved CORBA MICO directory test to get version of MICO

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/configure.ac

    r23356 r23508  
    8484AC_SUBST(ENABLE_LUCENE)
    8585
    86 
    87 AC_DEFINE_UNQUOTED(COMPAT32BITFLAGS, $COMPAT32BITFLAGS)
    88 AC_SUBST(COMPAT32BITFLAGS)
    89 
    9086dnl
    9187dnl 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  
    2828
    2929CC = @CC@
    30 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic
     30CFLAGS = @CFLAGS@ -fpic
    3131INSTALL = @INSTALL@
    3232INSTALL_DATA = @INSTALL_DATA@
    3333INSTALL_PROGRAM = @INSTALL_PROGRAM@
    34 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     34LDFLAGS = @LDFLAGS@
    3535LIBS = @LIBS@ 
    3636TOUCH = echo timestamp >

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/configure

    r23356 r23508  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    626626CXXFLAGS
    627627CXX
    628 COMPAT32BITFLAGS
    629628ENABLE_JAVA
    630629VERSION
    … …  
    763762
    764763  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 ;;
    768766  esac
    769767
    … …  
    810808    # Reject names that are not valid shell variable names.
    811809    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"
    813811    ac_useropt_orig=$ac_useropt
    814812    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    836834    # Reject names that are not valid shell variable names.
    837835    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"
    839837    ac_useropt_orig=$ac_useropt
    840838    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10401038    # Reject names that are not valid shell variable names.
    10411039    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"
    10431041    ac_useropt_orig=$ac_useropt
    10441042    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10561054    # Reject names that are not valid shell variable names.
    10571055    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"
    10591057    ac_useropt_orig=$ac_useropt
    10601058    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10861084    x_libraries=$ac_optarg ;;
    10871085
    1088   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1089 Try \`$0 --help' for more information"
     1086  -*) as_fn_error "unrecognized option: \`$ac_option'
     1087Try \`$0 --help' for more information."
    10901088    ;;
    10911089
    … …  
    10951093    case $ac_envvar in #(
    10961094      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1097       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1095      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    10981096    esac
    10991097    eval $ac_envvar=\$ac_optarg
    … …  
    11131111if test -n "$ac_prev"; then
    11141112  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"
    11161114fi
    11171115
    … …  
    11191117  case $enable_option_checking in
    11201118    no) ;;
    1121     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1119    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11221120    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11231121  esac
    … …  
    11421140    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11431141  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"
    11451143done
    11461144
    … …  
    11561154  if test "x$build_alias" = x; then
    11571155    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" >&2
     1156    $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
    11601158  elif test "x$build_alias" != "x$host_alias"; then
    11611159    cross_compiling=yes
    … …  
    11721170ac_ls_di=`ls -di .` &&
    11731171ac_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"
    11751173test "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"
    11771175
    11781176
    … …  
    12131211if test ! -r "$srcdir/$ac_unique_file"; then
    12141212  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"
    12161214fi
    12171215ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12181216ac_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"
    12201218    pwd)`
    12211219# When building in place, set srcdir=.
    … …  
    12571255      --help=recursive    display the short help of all the included packages
    12581256  -V, --version           display version information and exit
    1259   -q, --quiet, --silent   do not print \`checking ...' messages
     1257  -q, --quiet, --silent   do not print \`checking...' messages
    12601258      --cache-file=FILE   cache test results in FILE [disabled]
    12611259  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14131411  cat <<\_ACEOF
    14141412configure
    1415 generated by GNU Autoconf 2.67
    1416 
    1417 Copyright (C) 2010 Free Software Foundation, Inc.
     1413generated by GNU Autoconf 2.65
     1414
     1415Copyright (C) 2009 Free Software Foundation, Inc.
    14181416This configure script is free software; the Free Software Foundation
    14191417gives unlimited permission to copy, distribute and modify it.
    … …  
    15231521  fi
    15241522  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1525   test $ac_status = 0; } > conftest.i && {
     1523  test $ac_status = 0; } >/dev/null && {
    15261524     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15271525     test ! -s conftest.err
    … …  
    15471545{
    15481546  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 :
    15501548  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15511549$as_echo_n "checking for $2... " >&6; }
    1552 if eval "test \"\${$3+set}\"" = set; then :
     1550if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15531551  $as_echo_n "(cached) " >&6
    15541552fi
    … …  
    15861584  ac_header_preproc=no
    15871585fi
    1588 rm -f conftest.err conftest.i conftest.$ac_ext
     1586rm -f conftest.err conftest.$ac_ext
    15891587{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    15901588$as_echo "$ac_header_preproc" >&6; }
    … …  
    16131611  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16141612$as_echo_n "checking for $2... " >&6; }
    1615 if eval "test \"\${$3+set}\"" = set; then :
     1613if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16161614  $as_echo_n "(cached) " >&6
    16171615else
    … …  
    16771675  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16781676$as_echo_n "checking for $2... " >&6; }
    1679 if eval "test \"\${$3+set}\"" = set; then :
     1677if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16801678  $as_echo_n "(cached) " >&6
    16811679else
    … …  
    17541752  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17551753$as_echo_n "checking for $2... " >&6; }
    1756 if eval "test \"\${$3+set}\"" = set; then :
     1754if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17571755  $as_echo_n "(cached) " >&6
    17581756else
    … …  
    18071805  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18081806$as_echo_n "checking for $2... " >&6; }
    1809 if eval "test \"\${$3+set}\"" = set; then :
     1807if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18101808  $as_echo_n "(cached) " >&6
    18111809else
    … …  
    18701868
    18711869It was created by $as_me, which was
    1872 generated by GNU Autoconf 2.67.  Invocation command line was
     1870generated by GNU Autoconf 2.65.  Invocation command line was
    18731871
    18741872  $ $0 $@
    … …  
    19801978    echo
    19811979
    1982     $as_echo "## ---------------- ##
     1980    cat <<\_ASBOX
     1981## ---------------- ##
    19831982## Cache variables. ##
    1984 ## ---------------- ##"
     1983## ---------------- ##
     1984_ASBOX
    19851985    echo
    19861986    # The following way of writing the cache mishandles newlines in values,
    … …  
    20162016    echo
    20172017
    2018     $as_echo "## ----------------- ##
     2018    cat <<\_ASBOX
     2019## ----------------- ##
    20192020## Output variables. ##
    2020 ## ----------------- ##"
     2021## ----------------- ##
     2022_ASBOX
    20212023    echo
    20222024    for ac_var in $ac_subst_vars
    … …  
    20312033
    20322034    if test -n "$ac_subst_files"; then
    2033       $as_echo "## ------------------- ##
     2035      cat <<\_ASBOX
     2036## ------------------- ##
    20342037## File substitutions. ##
    2035 ## ------------------- ##"
     2038## ------------------- ##
     2039_ASBOX
    20362040      echo
    20372041      for ac_var in $ac_subst_files
    … …  
    20472051
    20482052    if test -s confdefs.h; then
    2049       $as_echo "## ----------- ##
     2053      cat <<\_ASBOX
     2054## ----------- ##
    20502055## confdefs.h. ##
    2051 ## ----------- ##"
     2056## ----------- ##
     2057_ASBOX
    20522058      echo
    20532059      cat confdefs.h
    … …  
    21042110ac_site_file2=NONE
    21052111if 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
    21122113elif test "x$prefix" != xNONE; then
    21132114  ac_site_file1=$prefix/share/config.site
    … …  
    21242125$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    21252126    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"
    21312128  fi
    21322129done
    … …  
    22042201  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    22052202$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" 5
     2203  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    22072204fi
    22082205## -------------------- ##
    … …  
    22222219ac_aux_dir=
    22232220for 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
    22372228done
    22382229if test -z "$ac_aux_dir"; then
    2239   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     2230  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    22402231fi
    22412232
    … …  
    22512242# Make sure we can run config.sub.
    22522243$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    2253   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     2244  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    22542245
    22552246{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    22622253  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    22632254test "x$ac_build_alias" = x &&
    2264   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     2255  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    22652256ac_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" 5
     2257  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    22672258
    22682259fi
    … …  
    22712262case $ac_cv_build in
    22722263*-*-*) ;;
    2273 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     2264*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    22742265esac
    22752266build=$ac_cv_build
    … …  
    22962287else
    22972288  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" 5
     2289    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    22992290fi
    23002291
    … …  
    23042295case $ac_cv_host in
    23052296*-*-*) ;;
    2306 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     2297*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    23072298esac
    23082299host=$ac_cv_host
    … …  
    23292320else
    23302321  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" 5
     2322    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    23322323fi
    23332324
    … …  
    23372328case $ac_cv_target in
    23382329*-*-*) ;;
    2339 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     2330*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    23402331esac
    23412332target=$ac_cv_target
    … …  
    24022393else
    24032394  ENABLE_JAVA=0
    2404 fi
    2405 
    2406 
    2407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    2408 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    2409 arch_64bit=no
    2410 case "$host_cpu" in
    2411 x86_64) arch_64bit=yes ;;
    2412 esac
    2413 
    2414 if test "$arch_64bit" = yes; then
    2415   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    2416 $as_echo "yes" >&6; }
    2417   if test -z "$COMPAT32BITFLAGS" ; then
    2418     COMPAT32BITFLAGS="-m32"
    2419   fi
    2420 else
    2421   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2422 $as_echo "no" >&6; }
    2423   if test -z "$COMPAT32BITFLAGS" ; then
    2424     COMPAT32BITFLAGS=
    2425   fi
    24262395fi
    24272396
    … …  
    26512620{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    26522621$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
     2623as_fn_error "C++ compiler cannot create executables
     2624See \`config.log' for more details." "$LINENO" 5; }; }
    26552625else
    26562626  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    26942664  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    26952665$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2696 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    2697 See \`config.log' for more details" "$LINENO" 5 ; }
     2666as_fn_error "cannot compute suffix of executables: cannot compile and link
     2667See \`config.log' for more details." "$LINENO" 5; }
    26982668fi
    26992669rm -f conftest conftest$ac_cv_exeext
    … …  
    27522722    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    27532723$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2754 as_fn_error $? "cannot run C++ compiled programs.
     2724as_fn_error "cannot run C++ compiled programs.
    27552725If you meant to cross compile, use \`--host'.
    2756 See \`config.log' for more details" "$LINENO" 5 ; }
     2726See \`config.log' for more details." "$LINENO" 5; }
    27572727    fi
    27582728  fi
    … …  
    28052775{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28062776$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2807 as_fn_error $? "cannot compute suffix of object files: cannot compile
    2808 See \`config.log' for more details" "$LINENO" 5 ; }
     2777as_fn_error "cannot compute suffix of object files: cannot compile
     2778See \`config.log' for more details." "$LINENO" 5; }
    28092779fi
    28102780rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    33203290test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    33213291$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3322 as_fn_error $? "no acceptable C compiler found in \$PATH
    3323 See \`config.log' for more details" "$LINENO" 5 ; }
     3292as_fn_error "no acceptable C compiler found in \$PATH
     3293See \`config.log' for more details." "$LINENO" 5; }
    33243294
    33253295# Provide some information about the compiler.
    … …  
    36683638set x ${MAKE-make}
    36693639ac_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 :
     3640if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    36713641  $as_echo_n "(cached) " >&6
    36723642else
    … …  
    36763646    @echo '@@@%%%=$(MAKE)=@@@%%%'
    36773647_ACEOF
    3678 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     3648# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    36793649case `${MAKE-make} -f conftest.make 2>/dev/null` in
    36803650  *@@@%%%=?*=@@@%%%*)
    … …  
    38793849
    38803850    fi
    3881     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     3851    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    38823852fi
    38833853
    … …  
    39413911        ac_cv_prog_uudecode_base64=yes
    39423912else
    3943         echo "configure: 3943: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     3913        echo "configure: 3913: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    39443914        echo "configure: failed file was:" >&5
    39453915        cat Test.uue >&5
    … …  
    39563926$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    39573927        if test x$ac_cv_prog_javac_works = xno; then
    3958                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     3928                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    39593929        fi
    39603930        if test x$ac_cv_prog_javac_works = x; then
    … …  
    40494019
    40504020  fi
    4051   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4021  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    40524022else
    40534023  echo "Checking for javac... $JAVAC"
    … …  
    40644034CLASS_TEST=Test.class
    40654035cat << \EOF > $JAVA_TEST
    4066 /* #line 4066 "configure" */
     4036/* #line 4036 "configure" */
    40674037public class Test {
    40684038}
    … …  
    40764046  ac_cv_prog_javac_works=yes
    40774047else
    4078   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4048  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    40794049  echo "configure: failed program was:" >&5
    40804050  cat $JAVA_TEST >&5
    … …  
    41034073TEST=Test
    41044074cat << \EOF > $JAVA_TEST
    4105 /* [#]line 4105 "configure" */
     4075/* [#]line 4075 "configure" */
    41064076public class Test {
    41074077public static void main (String args[]) {
    … …  
    41204090          echo "configure: failed program was:" >&5
    41214091          cat $JAVA_TEST >&5
    4122           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4092          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    41234093        fi
    41244094fi
    … …  
    41334103  echo "configure: failed program was:" >&5
    41344104  cat $JAVA_TEST >&5
    4135   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4105  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    41364106fi
    41374107rm -fr $JAVA_TEST $CLASS_TEST Test.uue
    … …  
    42334203
    42344204  fi
    4235   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4205  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    42364206else
    42374207  echo "Checking for javac... $JAVAC"
    … …  
    42484218CLASS_TEST=Test.class
    42494219cat << \EOF > $JAVA_TEST
    4250 /* #line 4250 "configure" */
     4220/* #line 4220 "configure" */
    42514221public class Test {
    42524222}
    … …  
    42604230  ac_cv_prog_javac_works=yes
    42614231else
    4262   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4232  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    42634233  echo "configure: failed program was:" >&5
    42644234  cat $JAVA_TEST >&5
    … …  
    43204290continue
    43214291fi
    4322 rm -f conftest.err conftest.i conftest.$ac_ext
     4292rm -f conftest.err conftest.$ac_ext
    43234293
    43244294  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    43364306break
    43374307fi
    4338 rm -f conftest.err conftest.i conftest.$ac_ext
     4308rm -f conftest.err conftest.$ac_ext
    43394309
    43404310done
    43414311# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4342 rm -f conftest.i conftest.err conftest.$ac_ext
     4312rm -f conftest.err conftest.$ac_ext
    43434313if $ac_preproc_ok; then :
    43444314  break
    … …  
    43794349continue
    43804350fi
    4381 rm -f conftest.err conftest.i conftest.$ac_ext
     4351rm -f conftest.err conftest.$ac_ext
    43824352
    43834353  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    43954365break
    43964366fi
    4397 rm -f conftest.err conftest.i conftest.$ac_ext
     4367rm -f conftest.err conftest.$ac_ext
    43984368
    43994369done
    44004370# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4401 rm -f conftest.i conftest.err conftest.$ac_ext
     4371rm -f conftest.err conftest.$ac_ext
    44024372if $ac_preproc_ok; then :
    44034373
    … …  
    44054375  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    44064376$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4407 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4408 See \`config.log' for more details" "$LINENO" 5 ; }
     4377as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4378See \`config.log' for more details." "$LINENO" 5; }
    44094379fi
    44104380
    … …  
    44674437IFS=$as_save_IFS
    44684438  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" 5
     4439    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    44704440  fi
    44714441else
    … …  
    45334503IFS=$as_save_IFS
    45344504  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" 5
     4505    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    45364506  fi
    45374507else
    … …  
    46654635ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    46664636"
    4667 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4637eval as_val=\$$as_ac_Header
     4638   if test "x$as_val" = x""yes; then :
    46684639  cat >>confdefs.h <<_ACEOF
    46694640#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    50975068{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    50985069$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5099 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     5070if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    51005071  $as_echo_n "(cached) " >&6
    51015072else
    … …  
    51245095           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    51255096$as_echo "$ac_res" >&6; }
    5126 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5097eval as_val=\$$as_ac_Header
     5098   if test "x$as_val" = x""yes; then :
    51275099  cat >>confdefs.h <<_ACEOF
    51285100#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    53665338  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    53675339ac_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 :
     5340eval as_val=\$$as_ac_Header
     5341   if test "x$as_val" = x""yes; then :
    53695342  cat >>confdefs.h <<_ACEOF
    53705343#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    55395512    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    55405513ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5541 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5514eval as_val=\$$as_ac_var
     5515   if test "x$as_val" = x""yes; then :
    55425516
    55435517cat >>confdefs.h <<_ACEOF
    … …  
    56995673  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    57005674ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5701 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5675eval as_val=\$$as_ac_var
     5676   if test "x$as_val" = x""yes; then :
    57025677  cat >>confdefs.h <<_ACEOF
    57035678#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    57075682done
    57085683
    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
     5684for ac_func in ftruncate strstr strcasecmp
     5685do :
     5686  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     5687ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     5688eval 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
    57125693
    57135694else
    57145695  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"
    57175698 ;;
    57185699esac
    57195700
    57205701fi
    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
     5702done
    57475703
    57485704
    … …  
    60936049     ;; #(
    60946050   *)
    6095      as_fn_error $? "unknown endianness
    6096  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 ;;
    60976053 esac
    60986054
    … …  
    62046160ac_libobjs=
    62056161ac_ltlibobjs=
    6206 U=
    62076162for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    62086163  # 1. Remove the extension, and $U if already installed.
    … …  
    63676322
    63686323
    6369 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6370 # ----------------------------------------
     6324# as_fn_error ERROR [LINENO LOG_FD]
     6325# ---------------------------------
    63716326# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    63726327# 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.
    63746329as_fn_error ()
    63756330{
    6376   as_status=$1; test $as_status -eq 0 && as_status=1
    6377   if test "$4"; then
    6378     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6379     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6331  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
    63806335  fi
    6381   $as_echo "$as_me: error: $2" >&2
     6336  $as_echo "$as_me: error: $1" >&2
    63826337  as_fn_exit $as_status
    63836338} # as_fn_error
    … …  
    65756530    done
    65766531    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"
    65786533
    65796534
    … …  
    66296584ac_log="
    66306585This file was extended by $as_me, which was
    6631 generated by GNU Autoconf 2.67.  Invocation command line was
     6586generated by GNU Autoconf 2.65.  Invocation command line was
    66326587
    66336588  CONFIG_FILES    = $CONFIG_FILES
    … …  
    66956650ac_cs_version="\\
    66966651config.status
    6697 configured by $0, generated by GNU Autoconf 2.67,
     6652configured by $0, generated by GNU Autoconf 2.65,
    66986653  with options \\"\$ac_cs_config\\"
    66996654
    6700 Copyright (C) 2010 Free Software Foundation, Inc.
     6655Copyright (C) 2009 Free Software Foundation, Inc.
    67016656This config.status script is free software; the Free Software Foundation
    67026657gives unlimited permission to copy, distribute and modify it."
    … …  
    67156670do
    67166671  case $1 in
    6717   --*=?*)
     6672  --*=*)
    67186673    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    67196674    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    6720     ac_shift=:
    6721     ;;
    6722   --*=)
    6723     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    6724     ac_optarg=
    67256675    ac_shift=:
    67266676    ;;
    … …  
    67466696    case $ac_optarg in
    67476697    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    6748     '') as_fn_error $? "missing file argument" ;;
    67496698    esac
    67506699    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    67596708  --he | --h)
    67606709    # Conflict between --help and --header
    6761     as_fn_error $? "ambiguous option: \`$1'
     6710    as_fn_error "ambiguous option: \`$1'
    67626711Try \`$0 --help' for more information.";;
    67636712  --help | --hel | -h )
    … …  
    67686717
    67696718  # This is an error.
    6770   -*) as_fn_error $? "unrecognized option: \`$1'
     6719  -*) as_fn_error "unrecognized option: \`$1'
    67716720Try \`$0 --help' for more information." ;;
    67726721
    … …  
    68256774    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    68266775
    6827   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     6776  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    68286777  esac
    68296778done
    … …  
    68636812  tmp=./conf$$-$RANDOM
    68646813  (umask 077 && mkdir "$tmp")
    6865 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     6814} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    68666815
    68676816# Set up the scripts for CONFIG_FILES section.
    … …  
    68806829ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    68816830if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    6882   ac_cs_awk_cr='\\r'
     6831  ac_cs_awk_cr='\r'
    68836832else
    68846833  ac_cs_awk_cr=$ac_cr
    … …  
    68946843  echo "_ACEOF"
    68956844} >conf$$subs.sh ||
    6896   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    6897 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     6845  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     6846ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    68986847ac_delim='%!_!# '
    68996848for ac_last_try in false false false false false :; do
    69006849  . ./conf$$subs.sh ||
    6901     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     6850    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    69026851
    69036852  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    69056854    break
    69066855  elif $ac_last_try; then
    6907     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     6856    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    69086857  else
    69096858    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    69946943  cat
    69956944fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    6996   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    6997 _ACEOF
    6998 
    6999 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7000 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     6945  || 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
    70016950# trailing colons and then remove the whole line if VPATH becomes empty
    70026951# (actually we leave an empty line to preserve line numbers).
    70036952if 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[    ]*=/{
     6954s/:*\$(srcdir):*/:/
     6955s/:*\${srcdir}:*/:/
     6956s/:*@srcdir@:*/:/
     6957s/^\([^=]*=[     ]*\):*/\1/
    70136958s/:*$//
    7014 x
    7015 s/\(=[   ]*\).*/\1/
    7016 G
    7017 s/\n//
    70186959s/^[^=]*=[   ]*$//
    70196960}'
    … …  
    70436984    break
    70446985  elif $ac_last_try; then
    7045     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     6986    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    70466987  else
    70476988    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    71287069_ACEOF
    71297070cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7130   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7071  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    71317072fi # test -n "$CONFIG_HEADERS"
    71327073
    … …  
    71417082  case $ac_mode$ac_tag in
    71427083  :[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;;
    71447085  :[FH]-) ac_tag=-:-;;
    71457086  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    71697110       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    71707111       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;;
    71727113      esac
    71737114      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    71967137    case $ac_tag in
    71977138    *:-:* | *:-) 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 ;;
    71997140    esac
    72007141    ;;
    … …  
    73277268"
    73287269eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7329   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7270  || as_fn_error "could not create $ac_file" "$LINENO" 5
    73307271
    73317272test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    73337274  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    73347275  { $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" >&5
     7276which seems to be undefined.  Please make sure it is defined." >&5
    73367277$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;}
     7278which seems to be undefined.  Please make sure it is defined." >&2;}
    73387279
    73397280  rm -f "$tmp/stdin"
    … …  
    73427283  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    73437284  esac \
    7344   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7285  || as_fn_error "could not create $ac_file" "$LINENO" 5
    73457286 ;;
    73467287  :H)
    … …  
    73537294      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    73547295    } >"$tmp/config.h" \
    7355       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7296      || as_fn_error "could not create $ac_file" "$LINENO" 5
    73567297    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    73577298      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    73607301      rm -f "$ac_file"
    73617302      mv "$tmp/config.h" "$ac_file" \
    7362     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7303    || as_fn_error "could not create $ac_file" "$LINENO" 5
    73637304    fi
    73647305  else
    73657306    $as_echo "/* $configure_input  */" \
    73667307      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7367       || as_fn_error $? "could not create -" "$LINENO" 5
     7308      || as_fn_error "could not create -" "$LINENO" 5
    73687309  fi
    73697310 ;;
    … …  
    73877328
    73887329test $ac_write_fail = 0 ||
    7389   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7330  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    73907331
    73917332
    … …  
    74087349  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    74097350  # would make configure fail if this is the last instruction.
    7410   $ac_cs_success || as_fn_exit 1
     7351  $ac_cs_success || as_fn_exit $?
    74117352fi
    74127353if 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  
    3434AC_SUBST(ENABLE_JAVA)
    3535
    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 
     36dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     37dnl arch_64bit=no
     38dnl case "$host_cpu" in
     39dnl x86_64) arch_64bit=yes ;;
     40dnl esac
    5541
    5642dnl Checks for programs.

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Makefile.in

    r23356 r23508  
    1717JAVAH = javah
    1818JAR = jar
    19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX
     19CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
     20CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX
    2121JAVACFLAGS = @JAVACFLAGS@
    2222DEFS = @DEFS@
    … …  
    2525INSTALL_DATA = @INSTALL_DATA@
    2626INSTALL_PROGRAM = @INSTALL_PROGRAM@
    27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     27LDFLAGS = @LDFLAGS@
    2828LIBS =  -lstdc++ @LIBS@
    2929TOUCH = echo timestamp >

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGRetrieveWrapperImpl.c

    r16583 r23508  
    180180
    181181  /* 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);
    183183
    184184  /* Initialise MG environment variables */
    … …  
    250250  query_data* qd;
    251251
    252   u_long pos, len;
     252  mg_u_long pos, len;
    253253  u_char* c_buffer = NULL;
    254254  u_char* uc_buffer = NULL;
    … …  
    287287
    288288  /* Get the document position and length in the text file */
    289   printf("Fetching document number %ld...\n", (unsigned long) j_docnum);
    290   FetchDocStart(qd, (unsigned long) 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);
    292292
    293293  /* 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  
    619619
    620620  /* 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",
    622622      (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index),
    623623      (data->defaultStemMethod & 1),

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

    r16583 r23508  
    168168
    169169  /* 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);
    171171
    172172  /* Initialise MG environment variables */
    … …  
    285285  query_data* qd;
    286286
    287   u_long pos, len;
     287  mg_u_long pos, len;
    288288  u_char* c_buffer = NULL;
    289289  u_char* uc_buffer = NULL;
    … …  
    322322
    323323  /* Get the document position and length in the text file */
    324   printf("Fetching document number %ld...\n", (unsigned long) j_docnum);
    325   FetchDocStart(qd, (unsigned long) 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);
    327327
    328328  /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */
    … …  
    730730
    731731  /* 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",
    733733      (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index),
    734734      (data->defaultStemMethod & 1),

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.h

    r16583 r23508  
    3636  char* index;
    3737  /* Maximum number of documents to retrieve */
    38   unsigned long maxDocs;
     38  mg_u_long maxDocs;
    3939  /* Whether term frequency information is desired (boolean value) */
    4040  int needTermFreqs;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/jni/Makefile.in

    r22070 r23508  
    1414AR = ar
    1515CC = @CC@
    16 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM
     16CFLAGS = @CFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM
    1717DEFS = @DEFS@
    1818RANLIB = @RANLIB@
    … …  
    2020INSTALL_DATA = @INSTALL_DATA@
    2121INSTALL_PROGRAM = @INSTALL_PROGRAM@
    22 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     22LDFLAGS = @LDFLAGS@
    2323#NOTE: libmgtext.a needs to come before libmglib.a !!!
    2424QUERY_LIBS = ../src/text/libmgtext.a ../lib/libmglib.a @LIBS@

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/Makefile.in

    r22070 r23508  
    3434AR = ar
    3535CC = @CC@
    36 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic
     36CFLAGS = @CFLAGS@ -fpic
    3737DEFS = @DEFS@
    3838RANLIB = @RANLIB@
    … …  
    4141# Uncomment for compiling for the nzdl project
    4242#
    43 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -DQUIET -fpic
     43CFLAGS = @CFLAGS@ -DQUIET -fpic
    4444##########################################
    4545

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_gen.c

    r16583 r23508  
    2828int fprintf (FILE *, const char *,...);
    2929
    30 unsigned long
    31 BIO_Unary_Length (unsigned long val)
     30mg_u_long
     31BIO_Unary_Length (mg_u_long val)
    3232{
    33   register unsigned long num;
     33  register mg_u_long num;
    3434  UNARY_LENGTH (val, num);
    3535  return (num);
    … …  
    3737
    3838
    39 unsigned long
    40 BIO_Binary_Length (unsigned long val, unsigned long b)
     39mg_u_long
     40BIO_Binary_Length (mg_u_long val, mg_u_long b)
    4141{
    42   register unsigned long num;
     42  register mg_u_long num;
    4343  BINARY_LENGTH (val, b, num);
    4444  return (num);
    … …  
    4646
    4747
    48 unsigned long
    49 BIO_Gamma_Length (unsigned long val)
     48mg_u_long
     49BIO_Gamma_Length (mg_u_long val)
    5050{
    51   register unsigned long num;
     51  register mg_u_long num;
    5252  GAMMA_LENGTH (val, num);
    5353  return (num);
    … …  
    5555
    5656
    57 unsigned long
    58 BIO_Delta_Length (unsigned long val)
     57mg_u_long
     58BIO_Delta_Length (mg_u_long val)
    5959{
    60   register unsigned long num;
     60  register mg_u_long num;
    6161  DELTA_LENGTH (val, num);
    6262  return (num);
    … …  
    6464
    6565
    66 unsigned long
    67 BIO_Elias_Length (unsigned long val, unsigned long b, double s)
     66mg_u_long
     67BIO_Elias_Length (mg_u_long val, mg_u_long b, double s)
    6868{
    69   register unsigned long num;
     69  register mg_u_long num;
    7070  ELIAS_LENGTH (val, b, s, num);
    7171  return (num);
    7272}
    7373
    74 unsigned long
    75 BIO_Bblock_Length (unsigned long val, unsigned long b)
     74mg_u_long
     75BIO_Bblock_Length (mg_u_long val, mg_u_long b)
    7676{
    77   register unsigned long num;
     77  register mg_u_long num;
    7878  BBLOCK_LENGTH (val, b, num);
    7979  return (num);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_gen.h

    r16583 r23508  
    3333#define H_BITIO_GEN
    3434
    35 unsigned long BIO_Unary_Length (unsigned long val);
     35mg_u_long BIO_Unary_Length (mg_u_long val);
    3636
    37 unsigned long BIO_Binary_Length (unsigned long val, unsigned long b);
     37mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b);
    3838
    39 unsigned long BIO_Gamma_Length (unsigned long val);
     39mg_u_long BIO_Gamma_Length (mg_u_long val);
    4040
    41 unsigned long BIO_Delta_Length (unsigned long val);
     41mg_u_long BIO_Delta_Length (mg_u_long val);
    4242
    43 unsigned long BIO_Elias_Length (unsigned long val, unsigned long b, double s);
     43mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s);
    4444
    45 unsigned long BIO_Bblock_Length (unsigned long val, unsigned long b);
     45mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b);
    4646
    4747int BIO_Bblock_Init (int N, int p);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m.h

    r16583 r23508  
    5050#define POSITIVE(f, x)                          \
    5151  if ((x)<=0)                               \
    52     fprintf(stderr,"Error: Cannot "#f" encode %lu\n",(unsigned long)x),exit(1);
     52    fprintf(stderr,"Error: Cannot "#f" encode %d\n",(mg_u_long)x),exit(1);
    5353
    5454
    … …  
    7575#define UNARY_ENCODE(x)                         \
    7676do {                                    \
    77   register unsigned long _B_x = (x);                    \
     77  register mg_u_long _B_x = (x);                    \
    7878  BIO_ENCODE_PROLOGUE;                          \
    7979  POSITIVE(unary, _B_x);                        \
    … …  
    8585#define UNARY_ENCODE_L(x, count)                    \
    8686do {                                    \
    87   register unsigned long _B_x = (x);                    \
     87  register mg_u_long _B_x = (x);                    \
    8888  BIO_ENCODE_PROLOGUE;                          \
    8989  POSITIVE(unary, _B_x);                        \
    … …  
    124124#define BINARY_ENCODE(x, b)                     \
    125125do {                                    \
    126   register unsigned long _B_x = (x);                    \
    127   register unsigned long _B_b = (b);                    \
     126  register mg_u_long _B_x = (x);                    \
     127  register mg_u_long _B_b = (b);                    \
    128128  register int _B_nbits, _B_logofb, _B_thresh;              \
    129129  BIO_ENCODE_PROLOGUE;                          \
    … …  
    145145#define BINARY_ENCODE_L(x, b, count)                    \
    146146do {                                    \
    147   register unsigned long _B_x = (x);                    \
    148   register unsigned long _B_b = (b);                    \
     147  register mg_u_long _B_x = (x);                    \
     148  register mg_u_long _B_b = (b);                    \
    149149  register int _B_nbits, _B_logofb, _B_thresh;              \
    150150  BIO_ENCODE_PROLOGUE;                          \
    … …  
    168168#define BINARY_DECODE(x, b)                     \
    169169do {                                    \
    170   register unsigned long _B_x = 0;                  \
    171   register unsigned long _B_b = (b);                    \
     170  register mg_u_long _B_x = 0;                  \
     171  register mg_u_long _B_b = (b);                    \
    172172  register int _B_i, _B_logofb, _B_thresh;              \
    173173  BIO_DECODE_PROLOGUE;                          \
    … …  
    193193#define BINARY_DECODE_L(x, b, count)                    \
    194194do {                                    \
    195   register unsigned long _B_x = 0;                  \
    196   register unsigned long _B_b = (b);                    \
     195  register mg_u_long _B_x = 0;                  \
     196  register mg_u_long _B_b = (b);                    \
    197197  register int _B_i, _B_logofb, _B_thresh;              \
    198198  BIO_DECODE_PROLOGUE;                          \
    … …  
    220220#define BINARY_LENGTH(x, b, count)                  \
    221221do {                                    \
    222   register unsigned long _B_x = (x);                    \
    223   register unsigned long _B_b = (b);                    \
     222  register mg_u_long _B_x = (x);                    \
     223  register mg_u_long _B_b = (b);                    \
    224224  register int _B_nbits, _B_logofb, _B_thresh;              \
    225225  POSITIVE(binary, _B_x);                       \
    … …  
    240240#define GAMMA_ENCODE(x)                         \
    241241do {                                    \
    242   register unsigned long _B_xx = (x);                   \
     242  register mg_u_long _B_xx = (x);                   \
    243243  register int _B_logofb;                       \
    244244  register int _B_nbits;                        \
    … …  
    255255#define GAMMA_ENCODE_L(x, count)                    \
    256256do {                                    \
    257   register unsigned long _B_xx = (x);                   \
     257  register mg_u_long _B_xx = (x);                   \
    258258  register int _B_logofb;                       \
    259259  register int _B_nbits;                        \
    … …  
    271271#define GAMMA_DECODE(x)                         \
    272272do {                                    \
    273   register unsigned long _B_xx = 1;                 \
     273  register mg_u_long _B_xx = 1;                 \
    274274  register int _B_nbits = 0;                        \
    275275  BIO_DECODE_PROLOGUE;                          \
    … …  
    283283#define GAMMA_DECODE_L(x, count)                    \
    284284do {                                    \
    285   register unsigned long _B_xx = 1;                 \
     285  register mg_u_long _B_xx = 1;                 \
    286286  register int _B_nbits = 0;                        \
    287287  BIO_DECODE_PROLOGUE;                          \
    … …  
    296296#define GAMMA_LENGTH(x, count)                      \
    297297do {                                    \
    298   register unsigned long _B_xx = (x);                   \
     298  register mg_u_long _B_xx = (x);                   \
    299299  register int _B_logofb;                       \
    300300  POSITIVE(gamma, _B_xx);                       \
    … …  
    310310#define DELTA_ENCODE(x)                         \
    311311do {                                    \
    312   register unsigned long _B_xxx = (x);                  \
     312  register mg_u_long _B_xxx = (x);                  \
    313313  register int _B_logx;                         \
    314314  FLOORLOG_2(_B_xxx, _B_logx);                      \
    … …  
    319319#define DELTA_ENCODE_L(x, count)                    \
    320320do {                                    \
    321   register unsigned long _B_xxx = (x);                  \
     321  register mg_u_long _B_xxx = (x);                  \
    322322  register int _B_logx;                         \
    323323  FLOORLOG_2(_B_xxx, _B_logx);                      \
    … …  
    329329#define DELTA_DECODE(x)                         \
    330330do {                                    \
    331   register unsigned long _B_xxx;                    \
     331  register mg_u_long _B_xxx;                    \
    332332  register int _B_logx;                         \
    333333  GAMMA_DECODE(_B_logx); --_B_logx;                 \
    … …  
    338338#define DELTA_DECODE_L(x, count)                    \
    339339do {                                    \
    340   register unsigned long _B_xxx;                    \
     340  register mg_u_long _B_xxx;                    \
    341341  register int _B_logx;                         \
    342342  GAMMA_DECODE_L(_B_logx, count); --_B_logx;                \
    … …  
    347347#define DELTA_LENGTH(x, count)                      \
    348348do {                                    \
    349   register unsigned long _B_xxx = (x);                  \
     349  register mg_u_long _B_xxx = (x);                  \
    350350  register int _B_logx, _B_dcount;                  \
    351351  FLOORLOG_2(_B_xxx, _B_logx);                      \
    … …  
    363363#define ELIAS_ENCODE(x, b, s)                       \
    364364do {                                    \
    365   register unsigned long _B_xx = (x);                   \
    366   register unsigned long _B_b = (b);                    \
     365  register mg_u_long _B_xx = (x);                   \
     366  register mg_u_long _B_b = (b);                    \
    367367  register double _B_s = (s);                       \
    368368  register int _B_lower=1, _B_upper=1;                  \
    … …  
    383383#define ELIAS_ENCODE_L(x, b, s, count)                  \
    384384do {                                    \
    385   register unsigned long _B_xx = (x);                   \
    386   register unsigned long _B_b = (b);                    \
     385  register mg_u_long _B_xx = (x);                   \
     386  register mg_u_long _B_b = (b);                    \
    387387  register double _B_s = (s);                       \
    388388  register int _B_lower=1, _B_upper=1;                  \
    … …  
    403403#define ELIAS_DECODE(x, b, s)                       \
    404404do {                                    \
    405   register unsigned long _B_xx;                     \
    406   register unsigned long _B_b = (b);                    \
     405  register mg_u_long _B_xx;                     \
     406  register mg_u_long _B_b = (b);                    \
    407407  register double _B_s = (s);                       \
    408408  register int _B_lower=1, _B_upper=1;                  \
    … …  
    423423#define ELIAS_DECODE_L(x, b, s, count)                  \
    424424do {                                    \
    425   register unsigned long _B_xx;                     \
    426   register unsigned long _B_b = (b);                    \
     425  register mg_u_long _B_xx;                     \
     426  register mg_u_long _B_b = (b);                    \
    427427  register double _B_s = (s);                       \
    428428  register int _B_lower=1, _B_upper=1;                  \
    … …  
    443443#define ELIAS_LENGTH(x, b, s, count)                    \
    444444do {                                    \
    445   register unsigned long _B_xx = (x);                   \
    446   register unsigned long _B_b = (b);                    \
     445  register mg_u_long _B_xx = (x);                   \
     446  register mg_u_long _B_b = (b);                    \
    447447  register double _B_s = (s);                       \
    448448  register int _B_lower=1, _B_upper=1;                  \
    … …  
    468468#define BBLOCK_ENCODE(x, b)                     \
    469469do {                                    \
    470   register unsigned long _B_xx = (x);                   \
    471   register unsigned long _B_bb = (b);                   \
     470  register mg_u_long _B_xx = (x);                   \
     471  register mg_u_long _B_bb = (b);                   \
    472472  register int _B_xdivb = 0;                        \
    473473  POSITIVE(bblock, _B_xx);                      \
    … …  
    484484#define BBLOCK_ENCODE_L(x, b, count)                    \
    485485do {                                    \
    486   register unsigned long _B_xx = (x);                   \
    487   register unsigned long _B_bb = (b);                   \
     486  register mg_u_long _B_xx = (x);                   \
     487  register mg_u_long _B_bb = (b);                   \
    488488  register int _B_xdivb = 0;                        \
    489489  POSITIVE(bblock, _B_xx);                      \
    … …  
    500500#define BBLOCK_DECODE(x, b)                     \
    501501do {                                    \
    502   register unsigned long _B_x1, _B_xx = 0;              \
    503   register unsigned long _B_bb = (b);                   \
     502  register mg_u_long _B_x1, _B_xx = 0;              \
     503  register mg_u_long _B_bb = (b);                   \
    504504  register int _B_xdivb;                        \
    505505  UNARY_DECODE(_B_xdivb); --_B_xdivb;                   \
    … …  
    512512#define BBLOCK_DECODE_L(x, b, count)                    \
    513513do {                                    \
    514   register unsigned long _B_x1, _B_xx = 0;              \
    515   register unsigned long _B_bb = (b);                   \
     514  register mg_u_long _B_x1, _B_xx = 0;              \
     515  register mg_u_long _B_bb = (b);                   \
    516516  register int _B_xdivb;                        \
    517517  UNARY_DECODE_L(_B_xdivb, count); --_B_xdivb;              \
    … …  
    524524#define BBLOCK_LENGTH(x, b, count)                  \
    525525do {                                    \
    526   register unsigned long _B_bcount, _B_xx = (x);            \
    527   register unsigned long _B_bb = (b);                   \
     526  register mg_u_long _B_bcount, _B_xx = (x);            \
     527  register mg_u_long _B_bb = (b);                   \
    528528  register int _B_xdivb = 0;                        \
    529529  POSITIVE(bblock, _B_xx);                      \

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m_mems.h

    r16583 r23508  
    3636  {
    3737    unsigned char *Base;
    38     unsigned long pos;
     38    mg_u_long pos;
    3939  }
    4040mems_bitio_state;
    … …  
    4444  {                                 \
    4545    register unsigned char *__base = b;                 \
    46     register unsigned long __pos = p;
     46    register mg_u_long __pos = p;
    4747
    4848#define ENCODE_CONTINUE(b)                      \
    4949  {                                 \
    5050    register unsigned char *__base = (b).Base;              \
    51     register unsigned long __pos = (b).pos;
     51    register mg_u_long __pos = (b).pos;
    5252
    5353#define ENCODE_BIT(b)                           \
    … …  
    7676  {                                 \
    7777    register unsigned char *__base = b;                 \
    78     register unsigned long __pos = p;
     78    register mg_u_long __pos = p;
    7979
    8080#define DECODE_CONTINUE(b)                      \
    8181  {                                 \
    8282    register unsigned char *__base = (b).Base;              \
    83     register unsigned long __pos = (b).pos;
     83    register mg_u_long __pos = (b).pos;
    8484
    8585#define DECODE_ADD_FF(b)                        \

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_m_random.h

    r16583 r23508  
    3838    FILE *File;
    3939    unsigned char *Buf;
    40     unsigned long Base;
    41     unsigned long Used;
    42     unsigned long pos;
    43     unsigned long len;
    44     unsigned long 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;
    4545  }
    4646random_bitio_state;
    … …  
    5151    register FILE *__file = f;                      \
    5252    register unsigned char *__buf;                  \
    53     register unsigned long __pos = 0;                   \
    54     register unsigned long __base = 0;                  \
    55     register unsigned long __is_used = 0;                   \
    56     register unsigned long __len = (l)-1;               \
    57     register unsigned long __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;                   \
    5858    while (__len) { ++__sft; __len >>=1; }              \
    5959    __len = 1<<__sft;                           \
    … …  
    6666    register FILE *__file = (b).File;                   \
    6767    register unsigned char *__buf = (b).Buf;                \
    68     register unsigned long __pos = (b).pos;             \
    69     register unsigned long __base = (b).Base;               \
    70     register unsigned long __is_used = (b).Used;                \
    71     register unsigned long __len = (b).len;             \
    72     register unsigned long __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;
    7373
    7474#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  
    5555
    5656void
    57 BIO_Mem_Unary_Encode (unsigned long val, mem_bitio_state * bs,
    58               unsigned long *bits)
     57BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs,
     58              mg_u_long *bits)
    5959{
    6060  ENCODE_CONTINUE (*bs)
    … …  
    6767
    6868
    69 unsigned long
     69mg_u_long
    7070BIO_Mem_Unary_Decode (mem_bitio_state * bs,
    71               unsigned long *bits)
    72 {
    73   register unsigned long val;
     71              mg_u_long *bits)
     72{
     73  register mg_u_long val;
    7474  DECODE_CONTINUE (*bs)
    7575    if (bits)
    … …  
    8888
    8989void
    90 BIO_Mem_Binary_Encode (unsigned long val, unsigned long b,
    91                mem_bitio_state * bs, unsigned long *bits)
     90BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b,
     91               mem_bitio_state * bs, mg_u_long *bits)
    9292{
    9393  ENCODE_CONTINUE (*bs)
    … …  
    100100
    101101
    102 unsigned long
    103 BIO_Mem_Binary_Decode (unsigned long b, mem_bitio_state * bs,
    104                unsigned long *bits)
    105 {
    106   register unsigned long val;
     102mg_u_long
     103BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs,
     104               mg_u_long *bits)
     105{
     106  register mg_u_long val;
    107107  DECODE_CONTINUE (*bs)
    108108    if (bits)
    … …  
    121121
    122122void
    123 BIO_Mem_Gamma_Encode (unsigned long val, mem_bitio_state * bs,
    124               unsigned long *bits)
     123BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs,
     124              mg_u_long *bits)
    125125{
    126126  ENCODE_CONTINUE (*bs)
    … …  
    133133
    134134
    135 unsigned long
    136 BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsigned long *bits)
    137 {
    138   register unsigned long val;
     135mg_u_long
     136BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits)
     137{
     138  register mg_u_long val;
    139139  DECODE_CONTINUE (*bs)
    140140    if (bits)
    … …  
    150150
    151151void
    152 BIO_Mem_Delta_Encode (unsigned long val, mem_bitio_state * bs,
    153               unsigned long *bits)
     152BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs,
     153              mg_u_long *bits)
    154154{
    155155  ENCODE_CONTINUE (*bs)
    … …  
    162162
    163163
    164 unsigned long
    165 BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsigned long *bits)
    166 {
    167   register unsigned long val;
     164mg_u_long
     165BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits)
     166{
     167  register mg_u_long val;
    168168  DECODE_CONTINUE (*bs)
    169169    if (bits)
    … …  
    176176
    177177void
    178 BIO_Mem_Elias_Encode (unsigned long val, unsigned long b, double s,
    179               mem_bitio_state * bs, unsigned long *bits)
     178BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     179              mem_bitio_state * bs, mg_u_long *bits)
    180180{
    181181  ENCODE_CONTINUE (*bs)
    … …  
    188188
    189189
    190 unsigned long
    191 BIO_Mem_Elias_Decode (unsigned long b, double s,
    192               mem_bitio_state * bs, unsigned long *bits)
    193 {
    194   register unsigned long val;
     190mg_u_long
     191BIO_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;
    195195  DECODE_CONTINUE (*bs)
    196196    if (bits)
    … …  
    203203
    204204void
    205 BIO_Mem_Bblock_Encode (unsigned long val, unsigned long b,
    206                mem_bitio_state * bs, unsigned long *bits)
     205BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b,
     206               mem_bitio_state * bs, mg_u_long *bits)
    207207{
    208208  ENCODE_CONTINUE (*bs)
    … …  
    215215
    216216
    217 unsigned long
    218 BIO_Mem_Bblock_Decode (unsigned long b, mem_bitio_state * bs,
    219                unsigned long *bits)
    220 {
    221   register unsigned long val;
     217mg_u_long
     218BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs,
     219               mg_u_long *bits)
     220{
     221  register mg_u_long val;
    222222  DECODE_CONTINUE (*bs)
    223223    if (bits)
    … …  
    230230
    231231void
    232 BIO_Mem_Decode_Seek (unsigned long pos, mem_bitio_state * bs)
     232BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs)
    233233{
    234234  DECODE_CONTINUE (*bs)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_mem.h

    r16583 r23508  
    6161
    6262
    63 void BIO_Mem_Unary_Encode (unsigned long val, mem_bitio_state * bs,
    64                unsigned long *bits);
    65 unsigned long BIO_Mem_Unary_Decode (mem_bitio_state * bs,
    66                     unsigned long *bits);
     63void BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs,
     64               mg_u_long *bits);
     65mg_u_long BIO_Mem_Unary_Decode (mem_bitio_state * bs,
     66                    mg_u_long *bits);
    6767
    6868
    6969
    70 void BIO_Mem_Binary_Encode (unsigned long val, unsigned long b,
    71                 mem_bitio_state * bs, unsigned long *bits);
    72 unsigned long BIO_Mem_Binary_Decode (unsigned long b, mem_bitio_state * bs,
    73                      unsigned long *bits);
     70void BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b,
     71                mem_bitio_state * bs, mg_u_long *bits);
     72mg_u_long BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs,
     73                     mg_u_long *bits);
    7474
    7575
    7676
    77 void BIO_Mem_Gamma_Encode (unsigned long val, mem_bitio_state * bs,
    78                unsigned long *bits);
    79 unsigned long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsigned long *bits);
     77void BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs,
     78               mg_u_long *bits);
     79mg_u_long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits);
    8080
    8181
    8282
    83 void BIO_Mem_Delta_Encode (unsigned long val, mem_bitio_state * bs,
    84                unsigned long *bits);
    85 unsigned long BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsigned long *bits);
     83void BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs,
     84               mg_u_long *bits);
     85mg_u_long BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits);
    8686
    8787
    88 void BIO_Mem_Elias_Encode (unsigned long val, unsigned long b, double s,
    89                mem_bitio_state * bs, unsigned long *bits);
    90 unsigned long BIO_Mem_Elias_Decode (unsigned long b, double s,
    91                  mem_bitio_state * bs, unsigned long *bits);
     88void BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     89               mem_bitio_state * bs, mg_u_long *bits);
     90mg_u_long BIO_Mem_Elias_Decode (mg_u_long b, double s,
     91                 mem_bitio_state * bs, mg_u_long *bits);
    9292
    9393
    94 void BIO_Mem_Bblock_Encode (unsigned long val, unsigned long b,
    95                 mem_bitio_state * bs, unsigned long *bits);
    96 unsigned long BIO_Mem_Bblock_Decode (unsigned long b, mem_bitio_state * bs,
    97                      unsigned long *bits);
     94void BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b,
     95                mem_bitio_state * bs, mg_u_long *bits);
     96mg_u_long BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs,
     97                     mg_u_long *bits);
    9898
    9999
    100 void BIO_Mem_Decode_Seek (unsigned long pos, mem_bitio_state * bs);
     100void BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs);
    101101
    102102

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_mems.c

    r16583 r23508  
    3030
    3131void
    32 BIO_Mems_Encode_Start (unsigned char *buf, unsigned long pos,
     32BIO_Mems_Encode_Start (unsigned char *buf, mg_u_long pos,
    3333               mems_bitio_state * bs)
    3434{
    … …  
    4646
    4747void
    48 BIO_Mems_Decode_Start (unsigned char *buf, unsigned long pos,
     48BIO_Mems_Decode_Start (unsigned char *buf, mg_u_long pos,
    4949               mems_bitio_state * bs)
    5050{
    … …  
    5757
    5858void
    59 BIO_Mems_Unary_Encode (unsigned long val, mems_bitio_state * bs,
    60                unsigned long *bits)
     59BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs,
     60               mg_u_long *bits)
    6161{
    6262  ENCODE_CONTINUE (*bs)
    … …  
    6969
    7070
    71 unsigned long
     71mg_u_long
    7272BIO_Mems_Unary_Decode (mems_bitio_state * bs,
    73                unsigned long *bits)
    74 {
    75   register unsigned long val;
     73               mg_u_long *bits)
     74{
     75  register mg_u_long val;
    7676  DECODE_CONTINUE (*bs)
    7777    if (bits)
    … …  
    9090
    9191void
    92 BIO_Mems_Binary_Encode (unsigned long val, unsigned long b,
    93             mems_bitio_state * bs, unsigned long *bits)
     92BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b,
     93            mems_bitio_state * bs, mg_u_long *bits)
    9494{
    9595  ENCODE_CONTINUE (*bs)
    … …  
    102102
    103103
    104 unsigned long
    105 BIO_Mems_Binary_Decode (unsigned long b, mems_bitio_state * bs,
    106             unsigned long *bits)
    107 {
    108   register unsigned long val;
     104mg_u_long
     105BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs,
     106            mg_u_long *bits)
     107{
     108  register mg_u_long val;
    109109  DECODE_CONTINUE (*bs)
    110110    if (bits)
    … …  
    123123
    124124void
    125 BIO_Mems_Gamma_Encode (unsigned long val, mems_bitio_state * bs,
    126                unsigned long *bits)
     125BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs,
     126               mg_u_long *bits)
    127127{
    128128  ENCODE_CONTINUE (*bs)
    … …  
    135135
    136136
    137 unsigned long
    138 BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsigned long *bits)
    139 {
    140   register unsigned long val;
     137mg_u_long
     138BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits)
     139{
     140  register mg_u_long val;
    141141  DECODE_CONTINUE (*bs)
    142142    if (bits)
    … …  
    152152
    153153void
    154 BIO_Mems_Delta_Encode (unsigned long val, mems_bitio_state * bs,
    155                unsigned long *bits)
     154BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs,
     155               mg_u_long *bits)
    156156{
    157157  ENCODE_CONTINUE (*bs)
    … …  
    164164
    165165
    166 unsigned long
    167 BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsigned long *bits)
    168 {
    169   register unsigned long val;
     166mg_u_long
     167BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits)
     168{
     169  register mg_u_long val;
    170170  DECODE_CONTINUE (*bs)
    171171    if (bits)
    … …  
    178178
    179179void
    180 BIO_Mems_Elias_Encode (unsigned long val, unsigned long b, double s,
    181                mems_bitio_state * bs, unsigned long *bits)
     180BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     181               mems_bitio_state * bs, mg_u_long *bits)
    182182{
    183183  ENCODE_CONTINUE (*bs)
    … …  
    190190
    191191
    192 unsigned long
    193 BIO_Mems_Elias_Decode (unsigned long b, double s,
    194                mems_bitio_state * bs, unsigned long *bits)
    195 {
    196   register unsigned long val;
     192mg_u_long
     193BIO_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;
    197197  DECODE_CONTINUE (*bs)
    198198    if (bits)
    … …  
    205205
    206206void
    207 BIO_Mems_Bblock_Encode (unsigned long val, unsigned long b,
    208             mems_bitio_state * bs, unsigned long *bits)
     207BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b,
     208            mems_bitio_state * bs, mg_u_long *bits)
    209209{
    210210  ENCODE_CONTINUE (*bs)
    … …  
    217217
    218218
    219 unsigned long
    220 BIO_Mems_Bblock_Decode (unsigned long b, mems_bitio_state * bs,
    221             unsigned long *bits)
    222 {
    223   register unsigned long val;
     219mg_u_long
     220BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs,
     221            mg_u_long *bits)
     222{
     223  register mg_u_long val;
    224224  DECODE_CONTINUE (*bs)
    225225    if (bits)
    … …  
    232232
    233233void
    234 BIO_Mems_Decode_Seek (unsigned long pos, mems_bitio_state * bs)
     234BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs)
    235235{
    236236  DECODE_CONTINUE (*bs)
    … …  
    240240
    241241void
    242 BIO_Mems_Encode_Seek (unsigned long pos, mems_bitio_state * bs)
     242BIO_Mems_Encode_Seek (mg_u_long pos, mems_bitio_state * bs)
    243243{
    244244  ENCODE_CONTINUE (*bs)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_mems.h

    r16583 r23508  
    3838  {
    3939    unsigned char *Base;
    40     unsigned long pos;
     40    mg_u_long pos;
    4141  }
    4242mems_bitio_state;
    … …  
    4646
    4747
    48 void BIO_Mems_Encode_Start (char *buf, unsigned long pos, mems_bitio_state * bs);
     48void BIO_Mems_Encode_Start (char *buf, mg_u_long pos, mems_bitio_state * bs);
    4949void BIO_Mems_Encode_Done (mems_bitio_state * bs);
    5050
    5151
    5252
    53 void BIO_Mems_Decode_Start (void *buf, unsigned long pos, mems_bitio_state * bs);
     53void BIO_Mems_Decode_Start (void *buf, mg_u_long pos, mems_bitio_state * bs);
    5454
    5555
    5656
    57 void BIO_Mems_Unary_Encode (unsigned long val, mems_bitio_state * bs,
    58                 unsigned long *bits);
    59 unsigned long BIO_Mems_Unary_Decode (mems_bitio_state * bs,
    60                      unsigned long *bits);
     57void BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs,
     58                mg_u_long *bits);
     59mg_u_long BIO_Mems_Unary_Decode (mems_bitio_state * bs,
     60                     mg_u_long *bits);
    6161
    6262
    6363
    64 void BIO_Mems_Binary_Encode (unsigned long val, unsigned long b,
    65                  mems_bitio_state * bs, unsigned long *bits);
    66 unsigned long BIO_Mems_Binary_Decode (unsigned long b, mems_bitio_state * bs,
    67                       unsigned long *bits);
     64void BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b,
     65                 mems_bitio_state * bs, mg_u_long *bits);
     66mg_u_long BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs,
     67                      mg_u_long *bits);
    6868
    6969
    7070
    71 void BIO_Mems_Gamma_Encode (unsigned long val, mems_bitio_state * bs,
    72                 unsigned long *bits);
    73 unsigned long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsigned long *bits);
     71void BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs,
     72                mg_u_long *bits);
     73mg_u_long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits);
    7474
    7575
    7676
    77 void BIO_Mems_Delta_Encode (unsigned long val, mems_bitio_state * bs,
    78                 unsigned long *bits);
    79 unsigned long BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsigned long *bits);
     77void BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs,
     78                mg_u_long *bits);
     79mg_u_long BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits);
    8080
    8181
    82 void BIO_Mems_Elias_Encode (unsigned long val, unsigned long b, double s,
    83                 mems_bitio_state * bs, unsigned long *bits);
    84 unsigned long BIO_Mems_Elias_Decode (unsigned long b, double s,
    85                 mems_bitio_state * bs, unsigned long *bits);
     82void BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     83                mems_bitio_state * bs, mg_u_long *bits);
     84mg_u_long BIO_Mems_Elias_Decode (mg_u_long b, double s,
     85                mems_bitio_state * bs, mg_u_long *bits);
    8686
    8787
    88 void BIO_Mems_Bblock_Encode (unsigned long val, unsigned long b,
    89                  mems_bitio_state * bs, unsigned long *bits);
    90 unsigned long BIO_Mems_Bblock_Decode (unsigned long b, mems_bitio_state * bs,
    91                       unsigned long *bits);
     88void BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b,
     89                 mems_bitio_state * bs, mg_u_long *bits);
     90mg_u_long BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs,
     91                      mg_u_long *bits);
    9292
    9393
    94 void BIO_Mems_Decode_Seek (unsigned long pos, mems_bitio_state * bs);
     94void BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs);
    9595
    9696

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_random.c

    r16583 r23508  
    3030
    3131void
    32 BIO_Random_Start (FILE * f, unsigned long len,
     32BIO_Random_Start (FILE * f, mg_u_long len,
    3333          random_bitio_state * bs)
    3434{
    … …  
    6464
    6565void
    66 BIO_Random_Unary_Encode (unsigned long val, random_bitio_state * bs,
    67              unsigned long *bits)
     66BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs,
     67             mg_u_long *bits)
    6868{
    6969  ENCODE_CONTINUE (*bs)
    … …  
    7676
    7777
    78 unsigned long
     78mg_u_long
    7979BIO_Random_Unary_Decode (random_bitio_state * bs,
    80              unsigned long *bits)
    81 {
    82   register unsigned long val;
     80             mg_u_long *bits)
     81{
     82  register mg_u_long val;
    8383  DECODE_CONTINUE (*bs)
    8484    if (bits)
    … …  
    9797
    9898void
    99 BIO_Random_Binary_Encode (unsigned long val, unsigned long b,
    100               random_bitio_state * bs, unsigned long *bits)
     99BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b,
     100              random_bitio_state * bs, mg_u_long *bits)
    101101{
    102102  ENCODE_CONTINUE (*bs)
    … …  
    109109
    110110
    111 unsigned long
    112 BIO_Random_Binary_Decode (unsigned long b,
     111mg_u_long
     112BIO_Random_Binary_Decode (mg_u_long b,
    113113              random_bitio_state * bs,
    114               unsigned long *bits)
    115 {
    116   register unsigned long val;
     114              mg_u_long *bits)
     115{
     116  register mg_u_long val;
    117117  DECODE_CONTINUE (*bs)
    118118    if (bits)
    … …  
    131131
    132132void
    133 BIO_Random_Gamma_Encode (unsigned long val, random_bitio_state * bs,
    134              unsigned long *bits)
     133BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs,
     134             mg_u_long *bits)
    135135{
    136136  ENCODE_CONTINUE (*bs)
    … …  
    143143
    144144
    145 unsigned long
     145mg_u_long
    146146BIO_Random_Gamma_Decode (random_bitio_state * bs,
    147              unsigned long *bits)
    148 {
    149   register unsigned long val;
     147             mg_u_long *bits)
     148{
     149  register mg_u_long val;
    150150  DECODE_CONTINUE (*bs)
    151151    if (bits)
    … …  
    161161
    162162void
    163 BIO_Random_Delta_Encode (unsigned long val, random_bitio_state * bs,
    164              unsigned long *bits)
     163BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs,
     164             mg_u_long *bits)
    165165{
    166166  ENCODE_CONTINUE (*bs)
    … …  
    173173
    174174
    175 unsigned long
     175mg_u_long
    176176BIO_Random_Delta_Decode (random_bitio_state * bs,
    177              unsigned long *bits)
    178 {
    179   register unsigned long val;
     177             mg_u_long *bits)
     178{
     179  register mg_u_long val;
    180180  DECODE_CONTINUE (*bs)
    181181    if (bits)
    … …  
    188188
    189189void
    190 BIO_Random_Elias_Encode (unsigned long val, unsigned long b, double s,
    191              random_bitio_state * bs, unsigned long *bits)
     190BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     191             random_bitio_state * bs, mg_u_long *bits)
    192192{
    193193  ENCODE_CONTINUE (*bs)
    … …  
    200200
    201201
    202 unsigned long
    203 BIO_Random_Elias_Decode (unsigned long b, double s,
     202mg_u_long
     203BIO_Random_Elias_Decode (mg_u_long b, double s,
    204204             random_bitio_state * bs,
    205              unsigned long *bits)
    206 {
    207   register unsigned long val;
     205             mg_u_long *bits)
     206{
     207  register mg_u_long val;
    208208  DECODE_CONTINUE (*bs)
    209209    if (bits)
    … …  
    216216
    217217void
    218 BIO_Random_Bblock_Encode (unsigned long val, unsigned long b,
    219               random_bitio_state * bs, unsigned long *bits)
     218BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b,
     219              random_bitio_state * bs, mg_u_long *bits)
    220220{
    221221  ENCODE_CONTINUE (*bs)
    … …  
    228228
    229229
    230 unsigned long
    231 BIO_Random_Bblock_Decode (unsigned long b,
     230mg_u_long
     231BIO_Random_Bblock_Decode (mg_u_long b,
    232232              random_bitio_state * bs,
    233               unsigned long *bits)
    234 {
    235   register unsigned long val;
     233              mg_u_long *bits)
     234{
     235  register mg_u_long val;
    236236  DECODE_CONTINUE (*bs)
    237237    if (bits)
    … …  
    244244
    245245void
    246 BIO_Random_Seek (unsigned long pos, random_bitio_state * bs)
     246BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs)
    247247{
    248248  ENCODE_CONTINUE (*bs)
    … …  
    258258}
    259259
    260 unsigned long
     260mg_u_long
    261261BIO_Random_Tell (random_bitio_state * bs)
    262262{
    263   register unsigned long t;
     263  register mg_u_long t;
    264264  ENCODE_CONTINUE (*bs)
    265265    t = ENCODE_TELL;
    … …  
    278278    ((((pos)+7) >> 3) < (mg_ullong)(__base + __len)))
    279279      {
    280     __pos = (long)((pos) - (mg_ullong)(__base << 3));
     280    __pos = (mg_s_long)((pos) - (mg_ullong)(__base << 3));
    281281      }
    282282    else
    283283      {
    284284        ENCODE_FLUSH;
    285     __base = (long)(((pos) >> (__sft+3)) << __sft);
     285    __base = (mg_s_long)(((pos) >> (__sft+3)) << __sft);
    286286   
    287287    fseek(__file,__base,0);
    288288    fread(__buf,1,__len,__file);
    289     __pos = (long)((pos) & ((8 << __sft)-1));
     289    __pos = (mg_s_long)((pos) & ((8 << __sft)-1));
    290290      }
    291291 

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_random.h

    r16583 r23508  
    4343    FILE *File;
    4444    unsigned char *Buf;
    45     unsigned long Base;
    46     unsigned long Used;
    47     unsigned long pos;
    48     unsigned long len;
    49     unsigned long 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;
    5050  }
    5151random_bitio_state;
    … …  
    5555
    5656
    57 void BIO_Random_Start (FILE * f, unsigned long len,
     57void BIO_Random_Start (FILE * f, mg_u_long len,
    5858               random_bitio_state * bs);
    5959void BIO_Random_Done (random_bitio_state * bs);
    … …  
    6161
    6262
    63 void BIO_Random_Decode_Start (void *buf, unsigned long pos,
     63void BIO_Random_Decode_Start (void *buf, mg_u_long pos,
    6464                  random_bitio_state * bs);
    6565
    … …  
    6969
    7070
    71 void BIO_Random_Unary_Encode (unsigned long val, random_bitio_state * bs,
    72                   unsigned long *bits);
    73 unsigned long BIO_Random_Unary_Decode (random_bitio_state * bs,
    74                        unsigned long *bits);
     71void BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs,
     72                  mg_u_long *bits);
     73mg_u_long BIO_Random_Unary_Decode (random_bitio_state * bs,
     74                       mg_u_long *bits);
    7575
    7676
    7777
    78 void BIO_Random_Binary_Encode (unsigned long val, unsigned long b,
    79                    random_bitio_state * bs, unsigned long *bits);
    80 unsigned long BIO_Random_Binary_Decode (unsigned long b, random_bitio_state * bs,
    81                     unsigned long *bits);
     78void BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b,
     79                   random_bitio_state * bs, mg_u_long *bits);
     80mg_u_long BIO_Random_Binary_Decode (mg_u_long b, random_bitio_state * bs,
     81                    mg_u_long *bits);
    8282
    8383
    8484
    85 void BIO_Random_Gamma_Encode (unsigned long val, random_bitio_state * bs,
    86                   unsigned long *bits);
    87 unsigned long BIO_Random_Gamma_Decode (random_bitio_state * bs,
    88                        unsigned long *bits);
     85void BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs,
     86                  mg_u_long *bits);
     87mg_u_long BIO_Random_Gamma_Decode (random_bitio_state * bs,
     88                       mg_u_long *bits);
    8989
    9090
    9191
    92 void BIO_Random_Delta_Encode (unsigned long val, random_bitio_state * bs,
    93                   unsigned long *bits);
    94 unsigned long BIO_Random_Delta_Decode (random_bitio_state * bs,
    95                        unsigned long *bits);
     92void BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs,
     93                  mg_u_long *bits);
     94mg_u_long BIO_Random_Delta_Decode (random_bitio_state * bs,
     95                       mg_u_long *bits);
    9696
    9797
    98 void BIO_Random_Elias_Encode (unsigned long val, unsigned long b, double s,
    99                   random_bitio_state * bs, unsigned long *bits);
    100 unsigned long BIO_Random_Elias_Decode (unsigned long b, double s,
     98void BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     99                  random_bitio_state * bs, mg_u_long *bits);
     100mg_u_long BIO_Random_Elias_Decode (mg_u_long b, double s,
    101101                       random_bitio_state * bs,
    102                        unsigned long *bits);
     102                       mg_u_long *bits);
    103103
    104104
    105 void BIO_Random_Bblock_Encode (unsigned long val, unsigned long b,
    106                    random_bitio_state * bs, unsigned long *bits);
    107 unsigned long BIO_Random_Bblock_Decode (unsigned long b,
     105void BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b,
     106                   random_bitio_state * bs, mg_u_long *bits);
     107mg_u_long BIO_Random_Bblock_Decode (mg_u_long b,
    108108                    random_bitio_state * bs,
    109                     unsigned long *bits);
     109                    mg_u_long *bits);
    110110
    111111
    112 void BIO_Random_Seek (unsigned long pos, random_bitio_state * bs);
     112void BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs);
    113113
    114114void BIO_Random_Flush (random_bitio_state * bs);
    115115
    116 unsigned long BIO_Random_Tell (random_bitio_state * bs);
     116mg_u_long BIO_Random_Tell (random_bitio_state * bs);
    117117
    118118#ifdef USE_LONG_LONG

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_stdio.c

    r16583 r23508  
    7272
    7373void
    74 BIO_Stdio_Unary_Encode (unsigned long val, stdio_bitio_state * bs,
    75             unsigned long *bits)
     74BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs,
     75            mg_u_long *bits)
    7676{
    7777  ENCODE_CONTINUE (*bs)
    … …  
    8484
    8585
    86 unsigned long
     86mg_u_long
    8787BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,
    88             unsigned long *bits)
    89 {
    90   register unsigned long val;
     88            mg_u_long *bits)
     89{
     90  register mg_u_long val;
    9191  DECODE_CONTINUE (*bs)
    9292    if (bits)
    … …  
    105105
    106106void
    107 BIO_Stdio_Binary_Encode (unsigned long val, unsigned long b,
    108              stdio_bitio_state * bs, unsigned long *bits)
     107BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b,
     108             stdio_bitio_state * bs, mg_u_long *bits)
    109109{
    110110  ENCODE_CONTINUE (*bs)
    … …  
    117117
    118118
    119 unsigned long
    120 BIO_Stdio_Binary_Decode (unsigned long b, stdio_bitio_state * bs,
    121              unsigned long *bits)
    122 {
    123   register unsigned long val;
     119mg_u_long
     120BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs,
     121             mg_u_long *bits)
     122{
     123  register mg_u_long val;
    124124  DECODE_CONTINUE (*bs)
    125125    if (bits)
    … …  
    138138
    139139void
    140 BIO_Stdio_Gamma_Encode (unsigned long val, stdio_bitio_state * bs,
    141             unsigned long *bits)
     140BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs,
     141            mg_u_long *bits)
    142142{
    143143  ENCODE_CONTINUE (*bs)
    … …  
    150150
    151151
    152 unsigned long
     152mg_u_long
    153153BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,
    154             unsigned long *bits)
    155 {
    156   register unsigned long val;
     154            mg_u_long *bits)
     155{
     156  register mg_u_long val;
    157157  DECODE_CONTINUE (*bs)
    158158    if (bits)
    … …  
    168168
    169169void
    170 BIO_Stdio_Delta_Encode (unsigned long val, stdio_bitio_state * bs,
    171             unsigned long *bits)
     170BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs,
     171            mg_u_long *bits)
    172172{
    173173  ENCODE_CONTINUE (*bs)
    … …  
    180180
    181181
    182 unsigned long
     182mg_u_long
    183183BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,
    184             unsigned long *bits)
    185 {
    186   register unsigned long val;
     184            mg_u_long *bits)
     185{
     186  register mg_u_long val;
    187187  DECODE_CONTINUE (*bs)
    188188    if (bits)
    … …  
    198198
    199199void
    200 BIO_Stdio_Elias_Encode (unsigned long val, unsigned long b, double s,
    201             stdio_bitio_state * bs, unsigned long *bits)
     200BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     201            stdio_bitio_state * bs, mg_u_long *bits)
    202202{
    203203  ENCODE_CONTINUE (*bs)
    … …  
    210210
    211211
    212 unsigned long
    213 BIO_Stdio_Elias_Decode (unsigned long b, double s,
     212mg_u_long
     213BIO_Stdio_Elias_Decode (mg_u_long b, double s,
    214214            stdio_bitio_state * bs,
    215             unsigned long *bits)
    216 {
    217   register unsigned long val;
     215            mg_u_long *bits)
     216{
     217  register mg_u_long val;
    218218  DECODE_CONTINUE (*bs)
    219219    if (bits)
    … …  
    228228
    229229void
    230 BIO_Stdio_Bblock_Encode (unsigned long val, unsigned long b,
    231              stdio_bitio_state * bs, unsigned long *bits)
     230BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b,
     231             stdio_bitio_state * bs, mg_u_long *bits)
    232232{
    233233  ENCODE_CONTINUE (*bs)
    … …  
    240240
    241241
    242 unsigned long
    243 BIO_Stdio_Bblock_Decode (unsigned long b, stdio_bitio_state * bs,
    244              unsigned long *bits)
    245 {
    246   register unsigned long val;
     242mg_u_long
     243BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs,
     244             mg_u_long *bits)
     245{
     246  register mg_u_long val;
    247247  DECODE_CONTINUE (*bs)
    248248    if (bits)
    … …  
    255255
    256256void
    257 BIO_Stdio_Decode_Seek (unsigned long pos, stdio_bitio_state * bs)
     257BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs)
    258258{
    259259  DECODE_CONTINUE (*bs)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/bitio_stdio.h

    r16583 r23508  
    5959
    6060
    61 void BIO_Stdio_Unary_Encode (unsigned long val, stdio_bitio_state * bs,
    62                  unsigned long *bits);
    63 unsigned long BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,
    64                       unsigned long *bits);
     61void BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs,
     62                 mg_u_long *bits);
     63mg_u_long BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,
     64                      mg_u_long *bits);
    6565
    6666
    6767
    68 void BIO_Stdio_Binary_Encode (unsigned long val, unsigned long b,
    69                   stdio_bitio_state * bs, unsigned long *bits);
    70 unsigned long BIO_Stdio_Binary_Decode (unsigned long b, stdio_bitio_state * bs,
    71                        unsigned long *bits);
     68void BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b,
     69                  stdio_bitio_state * bs, mg_u_long *bits);
     70mg_u_long BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs,
     71                       mg_u_long *bits);
    7272
    7373
    7474
    75 void BIO_Stdio_Gamma_Encode (unsigned long val, stdio_bitio_state * bs,
    76                  unsigned long *bits);
    77 unsigned long BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,
    78                       unsigned long *bits);
     75void BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs,
     76                 mg_u_long *bits);
     77mg_u_long BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,
     78                      mg_u_long *bits);
    7979
    8080
    8181
    82 void BIO_Stdio_Delta_Encode (unsigned long val, stdio_bitio_state * bs,
    83                  unsigned long *bits);
    84 unsigned long BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,
    85                       unsigned long *bits);
     82void BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs,
     83                 mg_u_long *bits);
     84mg_u_long BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,
     85                      mg_u_long *bits);
    8686
    8787
    8888
    89 void BIO_Stdio_Elias_Encode (unsigned long val, unsigned long b, double s,
    90                  stdio_bitio_state * bs, unsigned long *bits);
    91 unsigned long BIO_Stdio_Elias_Decode (unsigned long b, double s,
     89void BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     90                 stdio_bitio_state * bs, mg_u_long *bits);
     91mg_u_long BIO_Stdio_Elias_Decode (mg_u_long b, double s,
    9292                      stdio_bitio_state * bs,
    93                       unsigned long *bits);
     93                      mg_u_long *bits);
    9494
    9595
    96 void BIO_Stdio_Bblock_Encode (unsigned long val, unsigned long b,
    97                   stdio_bitio_state * bs, unsigned long *bits);
    98 unsigned long BIO_Stdio_Bblock_Decode (unsigned long b, stdio_bitio_state * bs,
    99                        unsigned long *bits);
     96void BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b,
     97                  stdio_bitio_state * bs, mg_u_long *bits);
     98mg_u_long BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs,
     99                       mg_u_long *bits);
    100100
    101101
    102 void BIO_Stdio_Decode_Seek (unsigned long pos, stdio_bitio_state * bs);
     102void BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs);
    103103
    104104#endif

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/filestats.c

    r16583 r23508  
    2828
    2929File *
    30 Fopen (char *name, char *mode, unsigned long magic)
     30Fopen (char *name, char *mode, mg_u_long magic)
    3131{
    3232  FILE *f;
    3333  File *F;
    34   unsigned long m;
     34  mg_u_long m;
    3535  if (!(f = fopen (name, mode)))
    3636    return (NULL);
    … …  
    9090
    9191int
    92 Fseek (File * F, long offset, int ptrname)
     92Fseek (File * F, mg_s_long offset, int ptrname)
    9393{
    9494  int num;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/filestats.h

    r16583 r23508  
    2626typedef struct FileStats
    2727  {
    28     unsigned long NumSeeks;
    29     unsigned long NumReads;
    30     unsigned long NumBytes;
     28    mg_u_long NumSeeks;
     29    mg_u_long NumReads;
     30    mg_u_long NumBytes;
    3131  }
    3232FileStats;
    … …  
    4545
    4646/* if magic is 0 no magic number is read or written */
    47 File *Fopen (char *name, char *mode, unsigned long magic);
     47File *Fopen (char *name, char *mode, mg_u_long magic);
    4848
    4949size_t Fread (void *ptr, size_t size, size_t nitems, File * F);
    5050
    51 int Fseek (File * F, long offset, int ptrname);
     51int Fseek (File * F, mg_s_long offset, int ptrname);
    5252
    5353void Rewind (File * F);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/gmalloc.c

    r16583 r23508  
    401401{
    402402  __ptr_t result;
    403   unsigned long int adj;
     403  mg_u_long adj;
    404404
    405405  result = (*__morecore) (size);
    406   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     406  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    407407                          (char *) NULL)) % BLOCKSIZE;
    408408  if (adj != 0)
    … …  
    549549      block = BLOCK (result);
    550550      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)
    553553           % BLOCKSIZE) >> log;
    554554
    … …  
    872872      prev = (struct list *) ptr;
    873873      _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)
    876876         % BLOCKSIZE >> type);
    877877      prev->next = _fraghead[type].next;
    … …  
    12841284{
    12851285  __ptr_t result;
    1286   unsigned long int adj;
     1286  mg_u_long int adj;
    12871287
    12881288  size = ((size + alignment - 1) / alignment) * alignment;
    … …  
    12911291  if (result == NULL)
    12921292    return NULL;
    1293   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     1293  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    12941294                          (char *) NULL)) % alignment;
    12951295  if (adj != 0)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman.c

    r16583 r23508  
    3030 */
    3131huff_data *
    32 Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    33                u_long * mem)
     32Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     33               mg_u_long * mem)
    3434{
    3535  int HNum, i, count;
    36   unsigned long *heap;
     36  mg_u_long *heap;
    3737  huff_data *hd = data;
    3838  if (!hd)
    … …  
    7373      if (heap[heap[curr - 1]] > heap[heap[child - 1]])
    7474        {
    75           register u_long temp;
     75          register mg_u_long temp;
    7676          temp = heap[child - 1];
    7777          heap[child - 1] = heap[curr - 1];
    … …  
    141141
    142142  /* Calculate the code lens */
    143   heap[0] = -1UL;
     143  heap[0] = -1;
    144144  heap[1] = 0;
    145145  for (i = 2; i < num * 2; i++)
    … …  
    154154  for (i = 0; i < num; i++)
    155155    {
    156       register u_long codelen = heap[i + num];
     156      register mg_u_long codelen = heap[i + num];
    157157      hd->clens[i] = (char) codelen;
    158158      if (!codelen)
    … …  
    190190}
    191191
    192 unsigned long *
    193 Generate_Huffman_Codes (huff_data * data, u_long * mem)
     192mg_u_long *
     193Generate_Huffman_Codes (huff_data * data, mg_u_long * mem)
    194194{
    195195  int i;
    196   unsigned long *codes;
    197   unsigned long mc[MAX_HUFFCODE_LEN + 1];
     196  mg_u_long *codes;
     197  mg_u_long mc[MAX_HUFFCODE_LEN + 1];
    198198
    199199  if (!data)
    … …  
    212212
    213213
    214 unsigned long **
    215 Generate_Huffman_Vals (huff_data * data, u_long * mem)
     214mg_u_long **
     215Generate_Huffman_Vals (huff_data * data, mg_u_long * mem)
    216216{
    217217  int i;
    218   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    219   unsigned long **values;
    220   unsigned long *vals;
     218  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     219  mg_u_long **values;
     220  mg_u_long *vals;
    221221
    222222  if (!data)
    … …  
    224224  if (!(vals = Xmalloc (data->num_codes * sizeof (*vals))))
    225225    return (NULL);
    226   if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *))))
     226  if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *))))
    227227    {
    228228      free (vals);
    … …  
    230230    }
    231231
    232   bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     232  bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *));
    233233
    234234  if (mem)
    235235    *mem += data->num_codes * sizeof (*vals) +
    236       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     236      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    237237
    238238  fcode[0] = values[0] = &vals[0];
    … …  
    249249
    250250double
    251 Calculate_Huffman_Size (int num, long *freqs, long *counts)
     251Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts)
    252252{
    253253  double size = 0;
    … …  
    321321static int
    322322General_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)
    324324{
    325325  if (rd (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1)
    … …  
    392392
    393393int
    394 Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk)
     394Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk)
    395395{
    396396  return General_Read_Huffman_Data (fread, f, hd, mem, disk);
    … …  
    401401
    402402int
    403 F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem, u_long * disk)
     403F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk)
    404404{
    405405  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  
    3737    int maxcodelen;
    3838    int lencount[MAX_HUFFCODE_LEN + 1];
    39     unsigned long min_code[MAX_HUFFCODE_LEN + 1];
     39    mg_u_long min_code[MAX_HUFFCODE_LEN + 1];
    4040    char *clens;
    4141  }
    … …  
    4343
    4444
    45 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    46                   u_long * mem);
     45huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     46                  mg_u_long * mem);
    4747
    48 unsigned long *Generate_Huffman_Codes (huff_data * data, u_long * mem);
     48mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem);
    4949
    50 unsigned long **Generate_Huffman_Vals (huff_data * data, u_long * mem);
     50mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem);
    5151
    5252int Write_Huffman_Data (FILE * f, huff_data * hd);
    5353
    54 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk);
     54int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk);
    5555
    56 int F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem, u_long * disk);
     56int F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk);
    5757
    5858/* Calculate the number of bits required to code the data with the
    5959   specified frequencies. Normally freqs and counts should point to
    6060   the same array. */
    61 double Calculate_Huffman_Size (int num, long *freqs, long *counts);
     61double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts);
    6262
    6363
    … …  
    6767    register int __i;                           \
    6868    register int __clen = (lens)[x];                    \
    69     register unsigned long __code = (codes)[x];             \
     69    register mg_u_long __code = (codes)[x];             \
    7070    for (__i=__clen-1; __i>=0; --__i)                   \
    7171      ENCODE_BIT((__code >> __i) & 1);                  \
    … …  
    8181#define HUFF_DECODE(x, mcodes, values)                  \
    8282  do {                                  \
    83     register unsigned long *__min_code = (mcodes);          \
    84     register unsigned long *__mclen = __min_code;           \
    85     register unsigned long **__values = (values);           \
    86     register unsigned long __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;                  \
    8787    do                                  \
    8888      {                                 \
    … …  
    9696#define HUFF_DECODE_L(x, mcodes, values, count)             \
    9797  do {                                  \
    98     register unsigned long *__min_code = (mcodes);          \
    99     register unsigned long *__mclen = __min_code;           \
    100     register unsigned long **__values = (values);           \
    101     register unsigned long __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;                  \
    102102    do                                  \
    103103      {                                 \

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_mem.c

    r16583 r23508  
    3030
    3131void
    32 BIO_Mem_Huff_Encode (unsigned long val, unsigned long *codes,
     32BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes,
    3333             char *clens, mem_bitio_state * bs)
    3434{
    … …  
    3838}
    3939
    40 unsigned long
    41 BIO_Mem_Huff_Decode (unsigned long *mincodes,
    42              unsigned long **values, mem_bitio_state * bs)
     40mg_u_long
     41BIO_Mem_Huff_Decode (mg_u_long *mincodes,
     42             mg_u_long **values, mem_bitio_state * bs)
    4343{
    44   unsigned long val;
     44  mg_u_long val;
    4545  DECODE_CONTINUE (*bs)
    4646    HUFF_DECODE (val, mincodes, values);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_mem.h

    r16583 r23508  
    2525
    2626
    27 void BIO_Mem_Huff_Encode (unsigned long val, unsigned long *codes,
     27void BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes,
    2828              char *clens, mem_bitio_state * bs);
    2929
    30 unsigned long BIO_Mem_Huff_Decode (unsigned long *mincodes,
    31                   unsigned long **values, mem_bitio_state * bs);
     30mg_u_long BIO_Mem_Huff_Decode (mg_u_long *mincodes,
     31                  mg_u_long **values, mem_bitio_state * bs);
    3232
    3333

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_stdio.c

    r16583 r23508  
    3333
    3434void
    35 BIO_Stdio_Huff_Encode (unsigned long val, unsigned long *codes,
     35BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes,
    3636               char *clens, stdio_bitio_state * bs)
    3737{
    … …  
    4141}
    4242
    43 unsigned long
    44 BIO_Stdio_Huff_Decode (unsigned long *mincodes,
    45                unsigned long **values,
     43mg_u_long
     44BIO_Stdio_Huff_Decode (mg_u_long *mincodes,
     45               mg_u_long **values,
    4646               stdio_bitio_state * bs)
    4747{
    48   unsigned long val;
     48  mg_u_long val;
    4949  DECODE_CONTINUE (*bs)
    5050    HUFF_DECODE (val, mincodes, values);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/huffman_stdio.h

    r16583 r23508  
    2525
    2626
    27 void BIO_Stdio_Huff_Encode (unsigned long val, unsigned long *codes,
     27void BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes,
    2828                char *clens, stdio_bitio_state * bs);
    2929
    3030
    31 unsigned long BIO_Stdio_Huff_Decode (unsigned long *mincodes,
    32                      unsigned long **values,
     31mg_u_long BIO_Stdio_Huff_Decode (mg_u_long *mincodes,
     32                     mg_u_long **values,
    3333                     stdio_bitio_state * bs);
    3434

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/longlong.h

    r16583 r23508  
    2222#ifndef H_LONGLONG
    2323#define H_LONGLONG
     24
     25#include "mglong.h"
    2426
    2527#ifndef __WIN32__
    … …  
    7173
    7274/* Not using GCC, so fall back on plain "long" (32-bit) types */
    73 typedef unsigned long int mg_ullong;
    74 typedef long int mg_llong;
     75typedef uint32_t mg_ullong;
     76typedef int32_t mg_llong;
    7577
    76 #define ULL_FS "lu"
    77 #define LL_FS "ld"
     78#define ULL_FS "u"
     79#define LL_FS "d"
    7880
    7981#endif /* __GNUC__ */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/messages.c

    r16583 r23508  
    2828
    2929
    30 void VOLATILE
     30void
    3131FatalError (int ExitCode, const char *fmt,...)
    3232{

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/messages.h

    r16583 r23508  
    3131extern char *msg_prefix;
    3232
    33 void VOLATILE FatalError (int ExitCode, const char *fmt,...);
     33void FatalError (int ExitCode, const char *fmt,...);
    3434
    3535void Message (const char *fmt,...);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/netorder.h

    r22257 r23508  
    1717#define HTOND(d)                                                                                  \
    1818        do {                                                                                      \
    19              unsigned long tmph, tmpl;                                                            \
     19             mg_u_long tmph, tmpl;                                                            \
    2020         bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1);                            \
    2121         bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);   \
    … …  
    2727#define NTOHD(d)                                                                                  \
    2828        do {                                                                                      \
    29              unsigned long tmph, tmpl;                                                            \
     29             mg_u_long tmph, tmpl;                                                            \
    3030         bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1);                            \
    3131         bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);   \
    … …  
    3737#define HTOND2(hd, nd)                                                                            \
    3838        do {                                                                                      \
    39              unsigned long tmph, tmpl;                                                            \
     39             mg_u_long tmph, tmpl;                                                            \
    4040         bcopy ((char *) &hd, (char *) &tmph, sizeof(double) >> 1);                           \
    4141         bcopy ((char *) &hd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);  \
    … …  
    4747#define NTOHD2(nd, hd)                                                                            \
    4848        do {                                                                                      \
    49              unsigned long tmph, tmpl;                                                            \
     49             mg_u_long tmph, tmpl;                                                            \
    5050         bcopy ((char *) &nd, (char *) &tmph, sizeof(double) >> 1);                           \
    5151         bcopy ((char *) &nd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);  \
    … …  
    5959#define HTONF(f)                                                                   \
    6060        do {                                                                       \
    61              unsigned long tmp;                                                    \
     61             mg_u_long tmp;                                                    \
    6262             bcopy ((char *) &(f), (char *) &tmp, sizeof (float));                 \
    6363             HTONUL (tmp);                                                         \
    … …  
    6666#define NTOHF(f)                                                                   \
    6767        do {                                                                       \
    68              unsigned long tmp;                                                    \
     68             mg_u_long tmp;                                                    \
    6969             bcopy ((char *) &(f), (char *) &tmp, sizeof (float));                 \
    7070         NTOHUL (tmp);                                                         \
    … …  
    7373#define HTONF2(hf, nf)                                                             \
    7474        do {                                                                       \
    75              unsigned long tmp;                                                    \
     75             mg_u_long tmp;                                                    \
    7676             bcopy ((char *) &(hf), (char *) &tmp, sizeof (float));                \
    7777             HTONUL (tmp);                                                         \
    … …  
    8080#define NTOHF2(nf, hf)                                                             \
    8181        do {                                                                       \
    82              unsigned long tmp;                                                    \
     82             mg_u_long tmp;                                                    \
    8383             bcopy ((char *) &(nf), (char *) &tmp, sizeof (float));                \
    8484         NTOHUL (tmp);                                                         \
    … …  
    115115
    116116/* pointers */
    117 #define HTONP(p)          ((p) = (void *) htonl ((unsigned long) p))
    118 #define NTOHP(p)          ((p) = (void *) ntohl ((unsigned long) p))
    119 #define HTONP2(hp, np)    ((np) = (void *) htonl ((unsigned long) hp))
    120 #define NTOHP2(np, hp)    ((hp) = (void *) ntohl ((unsigned long) 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))
    121121
    122122/* unsigned long */
    … …  
    127127
    128128/* signed long */
    129 #define HTONSL(l)         ((l) = (long) htonl ((unsigned long) (l)))
    130 #define NTOHSL(l)         ((l) = (long) ntohl ((unsigned long) (l)))
    131 #define HTONSL2(hl, nl)   ((nl) = (long) htonl ((unsigned long) (hl)))
    132 #define NTOHSL2(nl, hl)   ((hl) = (long) ntohl ((unsigned long) (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)))
    133133
    134134/* unsigned int */
    135 #define HTONUI(i)         ((i) = (unsigned int) htonl ((unsigned long) (i)))
    136 #define NTOHUI(i)         ((i) = (unsigned int) ntohl ((unsigned long) (i)))
    137 #define HTONUI2(hi, ni)   ((ni) = (unsigned int) htonl ((unsigned long) (hi)))
    138 #define NTOHUI2(ni, hi)   ((hi) = (unsigned int) ntohl ((unsigned long) (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)))
    139139
    140140/* signed int */
    141 #define HTONSI(i)         ((i) = (int) htonl ((unsigned long) (i)))
    142 #define NTOHSI(i)         ((i) = (int) ntohl ((unsigned long) (i)))
    143 #define HTONSI2(hi, ni)   ((ni) = (int) htonl ((unsigned long) (hi)))
    144 #define NTOHSI2(ni, hi)   ((hi) = (int) ntohl ((unsigned long) (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)))
    145145
    146146/* unsigned short */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/regex.c

    r16583 r23508  
    28962896  register char *fastmap = bufp->fastmap;
    28972897  unsigned char *pattern = bufp->buffer;
    2898   unsigned long size = bufp->used;
     2898  mg_u_long size = bufp->used;
    28992899  unsigned char *p = pattern;
    29002900  register unsigned char *pend = pattern + size;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/regex.h

    r16583 r23508  
    292292
    293293    /* Number of bytes to which `buffer' points.  */
    294   unsigned long allocated;
     294  mg_u_long allocated;
    295295
    296296    /* Number of bytes actually used in `buffer'.  */
    297   unsigned long used;   
     297  mg_u_long used;   
    298298
    299299        /* Syntax setting with which the pattern was compiled.  */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/rx.c

    r16583 r23508  
    615615
    616616#ifdef __STDC__
    617 RX_DECL unsigned long
     617RX_DECL mg_u_long
    618618rx_bitset_hash (int size, rx_Bitset b)
    619619#else
    620 RX_DECL unsigned long
     620RX_DECL mg_u_long
    621621rx_bitset_hash (size, b)
    622622     int size;
    … …  
    625625{
    626626  int x;
    627   unsigned long hash = (unsigned long)rx_bitset_hash;
     627  uintptr_t hash = (uintptr_t)rx_bitset_hash;
    628628
    629629  for (x = rx_bitset_numb_subsets(size) - 1; x >= 0; --x)
    … …  
    701701
    702702
    703 static unsigned long rx_hash_masks[4] =
     703static mg_u_long rx_hash_masks[4] =
    704704{
    705705  0x12488421,
    … …  
    714714RX_DECL struct rx_hash_item *
    715715rx_hash_find (struct rx_hash * table,
    716           unsigned long hash,
     716          mg_u_long hash,
    717717          void * value,
    718718          struct rx_hash_rules * rules)
    … …  
    721721rx_hash_find (table, hash, value, rules)
    722722     struct rx_hash * table;
    723      unsigned long hash;
     723     mg_u_long hash;
    724724     void * value;
    725725     struct rx_hash_rules * rules;
    … …  
    728728  rx_hash_eq eq = rules->eq;
    729729  int maskc = 0;
    730   long mask = rx_hash_masks [0];
     730  mg_s_long mask = rx_hash_masks [0];
    731731  int bucket = (hash & mask) % 13;
    732732
    … …  
    755755RX_DECL struct rx_hash_item *
    756756rx_hash_store (struct rx_hash * table,
    757            unsigned long hash,
     757           mg_u_long hash,
    758758           void * value,
    759759           struct rx_hash_rules * rules)
    … …  
    762762rx_hash_store (table, hash, value, rules)
    763763     struct rx_hash * table;
    764      unsigned long hash;
     764     mg_u_long hash;
    765765     void * value;
    766766     struct rx_hash_rules * rules;
    … …  
    769769  rx_hash_eq eq = rules->eq;
    770770  int maskc = 0;
    771   long mask = rx_hash_masks[0];
     771  mg_s_long mask = rx_hash_masks[0];
    772772  int bucket = (hash & mask) % 13;
    773773  int depth = 0;
    … …  
    803803    {
    804804      struct rx_hash_item * them = table->buckets[bucket];
    805       unsigned long newmask = rx_hash_masks[maskc + 1];
     805      mg_u_long newmask = rx_hash_masks[maskc + 1];
    806806      while (them)
    807807        {
    … …  
    855855    {
    856856      struct rx_hash * table = it->table;
    857       unsigned long hash = it->hash;
     857      mg_u_long hash = it->hash;
    858858      int depth = (table->parent
    859859           ? (table->parent->parent
    … …  
    17751775         : (!vb
    17761776        ? 1
    1777         : ((long)a->car < (long)b->car
     1777        : ((intptr_t)a->car < (intptr_t)b->car
    17781778           ? 1
    1779            : ((long)a->car > (long)b->car
     1779           : ((intptr_t)a->car > (intptr_t)b->car
    17801780              ? -1
    17811781              : se_list_cmp ((void *)a->cdr, (void *)b->cdr))))));
    … …  
    18421842#endif
    18431843{
    1844   long hash = (long)car ^ (long)cdr;
     1844  intptr_t hash = (intptr_t)car ^ (intptr_t)cdr;
    18451845  struct rx_se_list template;
    18461846
    … …  
    19551955  template.cdr = set;
    19561956  node = rx_hash_store (memo,
    1957             (((long)state) >> 8) ^ (long)set,
     1957            (((intptr_t)state) >> 8) ^ (intptr_t)set,
    19581958            &template, &nfa_set_hash_rules);
    19591959  if (!node)
    … …  
    22642264RX_DECL int
    22652265rx_compactify_nfa (struct rx *rx,
    2266            void **mem, unsigned long *size)
     2266           void **mem, mg_u_long *size)
    22672267#else
    22682268RX_DECL int
    … …  
    22702270     struct rx *rx;
    22712271     void **mem;
    2272      unsigned long *size;
     2272     mg_u_long *size;
    22732273#endif
    22742274{
    … …  
    22792279  int se_list_consc = count_hash_nodes (&rx->se_list_memo);
    22802280  int nfa_setc = count_hash_nodes (&rx->set_list_memo);
    2281   unsigned long total_size;
     2281  mg_u_long total_size;
    22822282
    22832283  /* This takes place in two stages.   First, the total size of the
    … …  
    24072407          {
    24082408        sp = rx_hash_find (&rx->se_list_memo,
    2409                    (long)sesrc->car ^ (long)sesrc->cdr,
     2409                   (intptr_t)sesrc->car ^ (intptr_t)sesrc->cdr,
    24102410                   sesrc, &se_list_hash_rules);
    24112411        if (sp->binding)
    … …  
    24252425          {
    24262426        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),
    24292429                   destlst, &nfa_set_hash_rules);
    24302430        if (sp->binding)
    … …  
    27982798    (rx_hash_find
    27992799     (&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,
    28012801      (void *)set,
    28022802      &cache->superset_hash_rules),
    … …  
    30563056    = ((struct rx_cache *)
    30573057       ((char *)rules
    3058     - (unsigned long)(&((struct rx_cache *)0)->superset_hash_rules)));
     3058    - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules)));
    30593059  struct rx_superset * template = (struct rx_superset *)val;
    30603060  struct rx_superset * newset
    … …  
    30883088    = ((struct rx_cache *)
    30893089       ((char *)rules
    3090     - (unsigned long)(&((struct rx_cache *)0)->superset_hash_rules)));
     3090    - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules)));
    30913091  return ((struct rx_hash *)
    30923092      rx_cache_malloc_or_get (cache,
    … …  
    31073107  struct rx_cache * cache
    31083108    = ((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));
    31103110  rx_cache_free (cache, &cache->free_hash, (char *)hash);
    31113111}
    … …  
    32643264    template.id = car->id;
    32653265    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,
    32673267             (void *)&template,
    32683268             &cache->superset_hash_rules);
    … …  
    43324332    return;
    43334333      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;
    43374337    return;
    43384338      }
    … …  
    45164516      case r_side_effect:
    45174517    {
    4518       int se = (long)rexp->params.side_effect;
     4518      int se = (intptr_t)rexp->params.side_effect;
    45194519      if (   (se >= 0)
    45204520          && (   ((enum re_side_effects)params[se].se == re_se_lparen)
    … …  
    45634563      return pointless_if_repeated (node->params.pair.left, params);
    45644564    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_effect
    4567           : (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))
    45684568    {
    45694569    case re_se_try:
    … …  
    45884588    case re_se_backref:
    45894589      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;
    45904598    }
    45914599    case r_data:
    … …  
    46374645      case r_side_effect:
    46384646    {
    4639       int se = (long)rexp->params.side_effect;
     4647      int se = (intptr_t)rexp->params.side_effect;
    46404648      if (   in_danger
    46414649          && (se >= 0)
    … …  
    47574765    case r_side_effect:
    47584766      return
    4759     !((long)rexp->params.side_effect > 0
    4760       ? 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]);
    47624770     
    47634771    case r_alternate:
    … …  
    48114819
    48124820    case r_side_effect:
    4813       return ((long)rexp->params.side_effect >= 0);
     4821      return ((intptr_t)rexp->params.side_effect >= 0);
    48144822     
    48154823    case r_alternate:
    … …  
    52045212          if (need_sync)
    52055213        {
    5206           int sync_se = paramc;
     5214          intptr_t sync_se = paramc;
    52075215          params = (params
    52085216                ? ((struct re_se_params *)
    … …  
    55525560            handle_close:
    55535561              /* 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){
    55565564                  goto normal_char;
    5557                 else
     5565        }
     5566                else{
    55585567                  return REG_ERPAREN;
     5568        }
     5569          }
    55595570
    55605571              /* Since we just checked for an empty stack above, this
    … …  
    55735584                this_group_regnum = COMPILE_STACK_TOP.regnum;
    55745585        {
    5575           int left_se = paramc;
    5576           int right_se = paramc + 1;
     5586          intptr_t left_se = paramc;
     5587          intptr_t right_se = paramc + 1;
    55775588
    55785589          params = (params
    … …  
    56255636        last_expression = &alt->params.pair.right;
    56265637        {
    5627           int sync_se = paramc;
     5638          intptr_t sync_se = paramc;
    56285639
    56295640          params = (params
    … …  
    57425753          /* Otherwise, we have a nontrivial interval. */
    57435754          {
    5744             int iter_se = paramc;
    5745             int end_se = paramc + 1;
     5755            intptr_t iter_se = paramc;
     5756            intptr_t end_se = paramc + 1;
    57465757            params = (params
    57475758                  ? ((struct re_se_params *)
    … …  
    59395950
    59405951          {
    5941         int backref_se = paramc;
     5952        intptr_t backref_se = paramc;
    59425953        params = (params
    59435954              ? ((struct re_se_params *)
    … …  
    60096020 
    60106021  {
    6011     int win_se = paramc;
     6022    intptr_t win_se = paramc;
    60126023    params = (params
    60136024          ? ((struct re_se_params *)
    … …  
    61496160      {
    61506161    void * mem = (void *)rxb->buffer;
    6151     unsigned long size = rxb->allocated;
     6162    mg_u_long size = rxb->allocated;
    61526163    int start_id;
    61536164    char * perm_mem;
    … …  
    67576768  while (list)
    67586769    {
    6759       if ((long)list->car >= 0)
     6770      if ((intptr_t)list->car >= 0)
    67606771    ++x;
    67616772      list = list->cdr;
    … …  
    68126823      for (ai = al - 1; ai >= 0; --ai)
    68136824    {
    6814       while ((long)ap->car < 0)
     6825      while ((intptr_t)ap->car < 0)
    68156826        ap = ap->cdr;
    68166827      av[ai] = ap->car;
    … …  
    68206831      for (bi = bl - 1; bi >= 0; --bi)
    68216832    {
    6822       while ((long)bp->car < 0)
     6833      while ((intptr_t)bp->car < 0)
    68236834        bp = bp->cdr;
    68246835      bv[bi] = bp->car;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/rx.h

    r16583 r23508  
    2222/*  t. lord Wed Sep 23 18:20:57 1992    */
    2323
    24 
    25 
    26 
    27 
    28 
    29 
    30 
     24#include "mglong.h"
    3125
    3226#ifndef RX_WANT_SE_DEFS
    … …  
    9185  struct rx_hash_item * next_same_hash;
    9286  struct rx_hash * table;
    93   unsigned long hash;
     87  mg_u_long hash;
    9488  void * data;
    9589  void * binding;
    … …  
    273267   */
    274268  void * buffer;
    275   unsigned long allocated;
     269  mg_u_long allocated;
    276270
    277271  /* Clients of RX can ask for some extra storage in the space pointed
    … …  
    280274   * at (buffer + allocated - reserved)
    281275   */
    282   unsigned long reserved;
     276  mg_u_long reserved;
    283277
    284278  /* --------- The remaining fields are for internal use only. --------- */
    … …  
    12741268
    12751269  void * buffer;        /* Malloced memory for the nfa. */
    1276   unsigned long allocated;  /* Size of that memory. */
     1270  mg_u_long allocated;  /* Size of that memory. */
    12771271
    12781272  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
    … …  
    15801574                      rx_Bitset a, rx_Bitset b);
    15811575RX_DECL void rx_bitset_xor (int size, rx_Bitset a, rx_Bitset b);
    1582 RX_DECL unsigned long rx_bitset_hash (int size, rx_Bitset b);
     1576RX_DECL mg_u_long rx_bitset_hash (int size, rx_Bitset b);
    15831577RX_DECL struct rx_hash_item * rx_hash_find (struct rx_hash * table,
    1584                         unsigned long hash,
     1578                        mg_u_long hash,
    15851579                        void * value,
    15861580                        struct rx_hash_rules * rules);
    15871581RX_DECL struct rx_hash_item * rx_hash_store (struct rx_hash * table,
    1588                          unsigned long hash,
     1582                         mg_u_long hash,
    15891583                         void * value,
    15901584                         struct rx_hash_rules * rules);
    … …  
    16371631RX_DECL void rx_delete_epsilon_transitions (struct rx *rx);
    16381632RX_DECL int rx_compactify_nfa (struct rx *rx,
    1639                    void **mem, unsigned long *size);
     1633                   void **mem, mg_u_long *size);
    16401634RX_DECL void rx_release_superset (struct rx *rx,
    16411635                  struct rx_superset *set);
    … …  
    16651659RX_DECL void rx_bitset_revdifference ();
    16661660RX_DECL void rx_bitset_xor ();
    1667 RX_DECL unsigned long rx_bitset_hash ();
     1661RX_DECL mg_u_long rx_bitset_hash ();
    16681662RX_DECL struct rx_hash_item * rx_hash_find ();
    16691663RX_DECL struct rx_hash_item * rx_hash_store ();
    … …  
    22302224
    22312225
    2232 
    22332226/* How many characters in the character set.  */
    22342227#define CHAR_SET_SIZE (1 << CHARBITS)
    … …  
    23442337RX_DECL __inline__ int
    23452338rx_search  (struct re_pattern_buffer * rxb,
    2346         int startpos,
     2339        intptr_t startpos,
    23472340        int range,
    23482341        int stop,
    … …  
    23612354        app_closure, regs, resume_state, save_state)
    23622355     struct re_pattern_buffer * rxb;
    2363      int startpos;
     2356     intptr_t startpos;
    23642357     int range;
    23652358     int stop;
    … …  
    27392732  {
    27402733    enum rx_test_match_entry test_pc;
    2741     int inx;
     2734    intptr_t inx;
    27422735    test_pc = search_state.test_match_resume_pt;
    27432736    if (test_pc == rx_test_start)
    … …  
    28392832            ((struct rx_superstate *)
    28402833             ((char *)this_tr_table
    2841               - ((unsigned long)
     2834              - ((mg_u_long)
    28422835             ((struct rx_superstate *)0)->transitions)));
    28432836         
    … …  
    29042897        ((struct rx_superstate *)
    29052898         ((char *)this_tr_table
    2906           - ((unsigned long)
     2899          - ((uintptr_t)
    29072900         ((struct rx_superstate *)0)->transitions)));
    29082901    }
    … …  
    29112904     * Dispatch that instruction:
    29122905     */
    2913     inx = (int)search_state.ifr->inx;
     2906    inx = (intptr_t)search_state.ifr->inx;
    29142907#ifdef RX_DEBUG_0
    29152908    if (rx_debug_trace)
    … …  
    29492942          while (el)
    29502943        {
    2951           long effect;
    2952           effect = (long)el->car;
     2944          intptr_t effect;
     2945          effect = (intptr_t)el->car;
    29532946          if (effect < 0)
    29542947            {
    … …  
    29902983                = ((struct rx_superstate *)
    29912984                   ((char *)search_state.ifr->data
    2992                 - (long)(((struct rx_superstate *)0)
     2985                - (intptr_t)(((struct rx_superstate *)0)
    29932986                     ->transitions)));
    29942987              goto top_of_cycle;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/sptree.c

    r16583 r23508  
    293293        q->par = p;             \
    294294        q->rght = p->left;          \
    295         if(q->rght)             \
    296             q->rght->par = q;       \
     295        if(q->rght){                \
     296          q->rght->par = q;         \
     297        }                                       \
    297298        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        }                                       \
    303307    }while(0)
    304308
    … …  
    308312        q->par = p;             \
    309313        q->left = p->rght;          \
    310         if(q->left)             \
    311             q->left->par = q;       \
     314        if(q->left){                \
     315          q->left->par = q;         \
     316        }                                       \
    312317        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        }                                       \
    318326    }while(0)
    319327
    … …  
    341349      if (p == q->left)
    342350    {
    343       if (g == NNULL)
     351      if (g == NNULL){
    344352        ROTATER (p, q);
     353      }
    345354      else if (q == g->left)
    346355        {
    … …  
    356365      else
    357366    {
    358       if (g == NNULL)
     367      if (g == NNULL){
    359368        ROTATEL (p, q);
     369      }
    360370      else if (q == g->rght)
    361371        {

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/sptree.h

    r16583 r23508  
    2929  {
    3030    int no_of_items;
    31     unsigned long mem_in_use;
     31    mg_u_long mem_in_use;
    3232    int (*cmp) (void *, void *);
    3333    void *root;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/unitool.c

    r23431 r23508  
    1515 * column
    1616 */
    17 unsigned long *unicode_cat_data=NULL;
     17mg_u_long *unicode_cat_data=NULL;
    1818
    1919
    … …  
    14641464 * column
    14651465 */
    1466 unsigned long *unicode_cat_data;
     1466mg_u_long *unicode_cat_data;
    14671467
    14681468void create_unicat_data () {
    … …  
    14701470  int min_start=0;
    14711471  int min_end=0;
    1472   register unsigned long min_value=0; /* filling the whole byte */
     1472  register mg_u_long min_value=0; /* filling the whole byte */
    14731473 
    14741474  const unirange *letter_here = letter_info;
    … …  
    15291529   
    15301530      } else {
    1531     register unsigned long mask = 3 << ((i % 16) * 2);
     1531    register mg_u_long mask = 3 << ((i % 16) * 2);
    15321532    unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) |
    15331533                  (min_value & mask);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/win32in.c

    r16583 r23508  
    44/* unix systems. */
    55
    6 unsigned long htonl(unsigned long x) {
     6mg_u_long htonl(mg_u_long x) {
    77#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    88    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    2525}
    2626
    27 unsigned long ntohl(unsigned long x) {
     27mg_u_long ntohl(mg_u_long x) {
    2828#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    2929    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    5151
    5252main () {
    53     long x;
     53    mg_s_long x;
    5454    short sx;
    5555

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/win32in.h

    r16583 r23508  
    44#include "longlong.h"
    55
    6 unsigned long htonl(unsigned long x);
    7 unsigned long ntohl(unsigned long x);
     6mg_u_long htonl(mg_u_long x);
     7mg_u_long ntohl(mg_u_long x);
    88mg_ullong ntohll(mg_ullong x);
    99unsigned short htons(unsigned short x);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/Makefile.in

    r16583 r23508  
    3636 
    3737CC = @CC@
    38 CFLAGS = @CFLAGS@  @COMPAT32BITFLAGS@
     38CFLAGS = @CFLAGS@
    3939CPPFLAGS = @CPPFLAGS@
    4040DEFS = @DEFS@
    … …  
    4242INSTALL_DATA = @INSTALL_DATA@
    4343INSTALL_PROGRAM = @INSTALL_PROGRAM@
    44 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     44LDFLAGS = @LDFLAGS@
    4545LIBS = ../../lib/libmglib.a @LIBS@
    4646TOUCH = echo timestamp >

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/Makefile.in

    r22070 r23508  
    3838AR = ar
    3939CC = @CC@
    40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic
     40CFLAGS = @CFLAGS@ -fpic
    4141DEFS = @DEFS@
    4242RANLIB = @RANLIB@
    … …  
    4444INSTALL_DATA = @INSTALL_DATA@
    4545INSTALL_PROGRAM = @INSTALL_PROGRAM@
    46 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     46LDFLAGS = @LDFLAGS@
    4747LIBS = ../../lib/libmglib.a @LIBS@
    4848TOUCH = echo timestamp >
    … …  
    5353# Uncomment for compiling for the nzdl project
    5454#
    55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM
     55CFLAGS = @CFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM
    5656##########################################
    5757

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/backend.c

    r16583 r23508  
    4747
    4848static File *
    49 OpenFile (char *base, char *suffix, unsigned long magic, int *ok)
     49OpenFile (char *base, char *suffix, mg_u_long magic, int *ok)
    5050{
    5151  char FileName[512];
    … …  
    6262  if (magic)
    6363    {
    64       unsigned long m;
     64      mg_u_long m;
    6565      if (fread ((char *) &m, sizeof (m), 1, F->f) == 0)
    6666    {
    … …  
    475475  if (qd->id->ifh.InvfLevel == 3)
    476476    {
    477       unsigned long magic;
     477      mg_u_long magic;
    478478      FILE *paragraph;
    479479      int i;
    … …  
    507507  {
    508508    extern char *trec_ids;
    509     extern long *trec_paras;
     509    extern mg_s_long *trec_paras;
    510510    int size;
    511511    char FileName[512];
    … …  
    533533      {
    534534    int i, d;
    535     unsigned long 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));
    537537    if (!trec_paras)
    538538      {
    … …  
    598598 */
    599599void
    600 ChangeMemInUse (query_data * qd, long delta)
     600ChangeMemInUse (query_data * qd, mg_s_long delta)
    601601{
    602602  qd->mem_in_use += delta;
    … …  
    775775}
    776776
    777 long
     777mg_s_long
    778778GetDocCompLength (query_data * qd)
    779779{
    … …  
    785785
    786786u_char *
    787 GetDocText (query_data * qd, unsigned long *len)
     787GetDocText (query_data * qd, mg_u_long *len)
    788788{
    789789  DocEntry *DE;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/backend.h

    r16583 r23508  
    4040  {
    4141    File *InvfFile;
    42     unsigned long N;
    43     unsigned long 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 */
    4444    struct invf_file_header ifh;
    4545  }
    … …  
    5151    File *TextIdxFile;
    5252    File *TextIdxWgtFile;
    53     long current_pos;
     53    mg_s_long current_pos;
    5454    struct
    5555      {
    56     unsigned long Start;
     56    mg_u_long Start;
    5757    float Weight;
    5858      }
    … …  
    7878    compression_dict_header cdh;
    7979    comp_frags_header *cfh[2];
    80     unsigned long MemForCompDict;
     80    mg_u_long MemForCompDict;
    8181    u_char ***values[2];
    8282    u_char *escape[2];
    8383    huff_data *chars_huff[2];
    84     u_long **chars_vals[2];
     84    mg_u_long **chars_vals[2];
    8585    huff_data *lens_huff[2];
    86     u_long **lens_vals[2];
     86    mg_u_long **lens_vals[2];
    8787    auxiliary_dict *ad;
    8888    int fast_loaded;
    … …  
    9696    struct stem_idx_header sih;
    9797    u_char **index;
    98     unsigned long *pos;
     98    mg_u_long *pos;
    9999    int active;
    100100    u_char *buffer;
    101     unsigned long MemForStemIdx;
     101    mg_u_long MemForStemIdx;
    102102  }
    103103stemmed_idx;
    … …  
    109109    struct stem_dict_header sdh;
    110110    u_char **index;
    111     unsigned long *pos;
     111    mg_u_long *pos;
    112112    int active;
    113113    u_char *buffer;
    114     unsigned long MemForStemDict;
     114    mg_u_long MemForStemDict;
    115115
    116116    /* [RPAP - Jan 97: Stem Index Change] */
    … …  
    126126    double L;
    127127    double B;
    128     unsigned long *DocWeights;
     128    mg_u_long *DocWeights;
    129129    char bits;
    130130    float *table;
    131     unsigned long mask;
    132     unsigned long MemForWeights;
    133     unsigned long num_of_docs;
     131    mg_u_long mask;
     132    mg_u_long MemForWeights;
     133    mg_u_long num_of_docs;
    134134  }
    135135approx_weights_data;
    … …  
    140140    int QueryFreqs;
    141141    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;
    144144    int Sort;       
    145145    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 */
    148148    int StopAtMaxAccum; /* Stop at maximum accumulator or not */
    149     long HashTblSize;
     149    mg_s_long HashTblSize;
    150150    char *skip_dump;
    151151  }
    … …  
    156156typedef struct BooleanQueryInfo
    157157  {
    158     long MaxDocsToRetrieve;
     158    mg_s_long MaxDocsToRetrieve;
    159159  }
    160160BooleanQueryInfo;
    … …  
    191191    File *File_invf;
    192192    File *File_weight_approx;
    193     unsigned long mem_in_use, max_mem_in_use;
    194     unsigned long num_of_ptrs, tot_num_of_ptrs;
    195     unsigned long num_of_terms, tot_num_of_terms;
    196     unsigned long num_of_accum, tot_num_of_accum;
    197     unsigned long num_of_ans, tot_num_of_ans;
    198     unsigned long hops_taken, tot_hops_taken;
    199     unsigned long text_idx_lookups, tot_text_idx_lookups;
    200     unsigned long 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;
    201201    unsigned doc_pos;
    202202    unsigned buf_in_use;
    … …  
    226226query_data *InitQuerySystem (char *dir, char *name, char *textname, InitQueryTimes * iqt);
    227227
    228 void ChangeMemInUse (query_data * qd, long delta);
     228void ChangeMemInUse (query_data * qd, mg_s_long delta);
    229229
    230230void FinishQuerySystem (query_data * qd);
    … …  
    251251float GetDocWeight (query_data * qd);
    252252
    253 long GetDocCompLength (query_data * qd);
    254 
    255 u_char *GetDocText (query_data * qd, unsigned long *len);
     253mg_s_long GetDocCompLength (query_data * qd);
     254
     255u_char *GetDocText (query_data * qd, mg_u_long *len);
    256256
    257257DocEntry *GetDocChain (query_data * qd);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_parser.c

    r16583 r23508  
    4444static QueryTermList **query_term_list;
    4545static 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;
     46static mg_u_long count;
     47static mg_u_long doc_count;
     48static mg_u_long invf_ptr;
     49static mg_u_long invf_len;
    5050
    5151#line 66 "bool_parser.y"

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_parser.y

    r16583 r23508  
    5757static QueryTermList **query_term_list;
    5858static 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;
     59static mg_u_long count;
     60static mg_u_long doc_count;
     61static mg_u_long invf_ptr;
     62static mg_u_long invf_len;
    6363%}
    6464 

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_tester.c

    r16583 r23508  
    151151          prompt (str);
    152152          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);
    154154        }           /*for */
    155155    }           /*if */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_tree.c

    r16583 r23508  
    5656bool_tree_node *
    5757CreateBoolTermNode (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] */
    5959            int stemmer_num)
    6060{

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/bool_tree.h

    r16583 r23508  
    102102bool_tree_node *CopyBoolTree (bool_tree_node * tree);
    103103bool_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);
    106106bool_tree_node *CreateBoolTreeNode (N_Tag tag,
    107107                 bool_tree_node * left, bool_tree_node * right);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/build.h

    r16583 r23508  
    111111
    112112
    113 extern unsigned long buf_size;
     113extern mg_u_long buf_size;
    114114/*
    115115 * The size of the document input buffer.
    116116 */
    117117
    118 extern unsigned long ChunkLimit;
     118extern mg_u_long ChunkLimit;
    119119/*
    120120 * The maximum number of chunks that can be written to disk.
    121121 */
    122122
    123 extern unsigned long invf_buffer_size;
     123extern mg_u_long invf_buffer_size;
    124124/*
    125125 * 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  
    6666huff_data char_huff[2];
    6767huff_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;
     68mg_u_long *char_codes[2], *lens_codes[2];
     69mg_u_long Words_disk = 0;
     70mg_u_long Chars_disk = 0;
    7171
    7272
    … …  
    7979  dict_hash_table *ht;
    8080  u_char **words;
    81   u_long ht_size;
     81  mg_u_long ht_size;
    8282
    8383  ht_size = prime (cfh->hd.num_codes * HASH_RATIO);
    … …  
    133133      register u_char **wptr;
    134134      register int tsize = ht->size;
    135       register unsigned long hashval, step;
     135      register mg_u_long hashval, step;
    136136
    137137      HASH (hashval, step, allwords, tsize);
    … …  
    163163    return COMPERROR;
    164164
    165   Words_disk = sizeof (u_long);
     165  Words_disk = sizeof (mg_u_long);
    166166
    167167  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  
    3232typedef struct dict_hash_table
    3333  {
    34     u_long size;
     34    mg_u_long size;
    3535    huff_data *hd;
    36     u_long *codes;
     36    mg_u_long *codes;
    3737    u_char **words;
    3838    u_char **table[1];
    … …  
    5151extern huff_data char_huff[2];
    5252extern 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;
     53extern mg_u_long *char_codes[2], *lens_codes[2];
     54extern mg_u_long Words_disk;
     55extern mg_u_long Chars_disk;
    5656
    5757

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/environment.c

    r16583 r23508  
    347347 * or default on a error
    348348 */
    349 long
    350 IntEnv (char *data, long def)
    351 {
    352   long val;
     349mg_s_long
     350IntEnv (char *data, mg_s_long def)
     351{
     352  mg_s_long val;
    353353  char *ptr;
    354354  if (!data)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/environment.h

    r16583 r23508  
    5454char *GetEnvName (int i);
    5555int BooleanEnv (char *data, int def);
    56 long IntEnv (char *data, long def);
     56mg_s_long IntEnv (char *data, mg_s_long def);
    5757
    5858void InitEnv (void);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/hash.h

    r16583 r23508  
    3131    do {                        \
    3232        register u_char *p=wd;          \
    33         register long len = *p++;       \
    34         register unsigned long hval;        \
     33        register mg_s_long len = *p++;      \
     34        register mg_u_long hval;        \
    3535        if (len>25) len = 25;           \
    3636        for (hval=0; len; --len)        \

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/invf.h

    r16583 r23508  
    3030struct invf_dict_header
    3131  {
    32     unsigned long lookback;
    33     unsigned long dict_size;
    34     unsigned long total_bytes;
    35     unsigned long 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;
    3636    double input_bytes; /* [RJM 07/97: 4G limit] */
    37     unsigned long num_of_docs;
    38     unsigned long static_num_of_docs;
    39     unsigned long num_of_words;
    40     unsigned long stemmer_num;
    41     unsigned long 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;
    4242  };
    4343
    4444struct stem_dict_header
    4545  {
    46     unsigned long lookback;
    47     unsigned long block_size;
    48     unsigned long num_blocks;
    49     unsigned long blocks_start;
    50     unsigned long index_chars;
    51     unsigned long num_of_docs;
    52     unsigned long static_num_of_docs;
    53     unsigned long num_of_words;
    54     unsigned long stemmer_num;
    55     unsigned long stem_method;
    56     unsigned long 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] */
    5757  };
    5858
    5959struct invf_file_header
    6060  {
    61     unsigned long no_of_words;
    62     unsigned long no_of_ptrs;
    63     unsigned long skip_mode;
    64     unsigned long params[16];
    65     unsigned long 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;
    6666  };
    6767
    … …  
    6969struct stem_idx_header
    7070  {
    71     unsigned long lookback;
    72     unsigned long block_size;
    73     unsigned long num_blocks;
    74     unsigned long blocks_start;
    75     unsigned long index_chars;
    76     unsigned long 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;
    7777  };
    7878

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/invf_get.c

    r16583 r23508  
    166166
    167167static void
    168 HT_Sup_Add (Hash_Table * HT, unsigned long DN, float Sum)
     168HT_Sup_Add (Hash_Table * HT, mg_u_long DN, float Sum)
    169169{
    170170  Invf_Doc_EntryH *IDEH;
    … …  
    176176
    177177Invf_Doc_Entry *
    178 HT_find (Hash_Table * HT, unsigned long DN)
     178HT_find (Hash_Table * HT, mg_u_long DN)
    179179{
    180180  Invf_Doc_EntryH *IDEH;
    … …  
    194194static int
    195195HT_insert (Hash_Table * HT,
    196        unsigned long DN, float Sum)
     196       mg_u_long DN, float Sum)
    197197{
    198198  Invf_Doc_EntryH **IDEH;
    … …  
    316316
    317317Invf_Doc_Entry *
    318 LT_find (List_Table * LT, unsigned long DN)
     318LT_find (List_Table * LT, mg_u_long DN)
    319319{
    320320  int l = 0;
    … …  
    337337static List_Table *
    338338LT_add (query_data * qd, List_Table * LT,
    339     unsigned long DN, float Sum)
     339    mg_u_long DN, float Sum)
    340340{
    341341  Invf_Doc_Entry *ide;
    … …  
    472472    case 1:
    473473      {
    474     unsigned long len;
     474    mg_u_long len;
    475475    if (*p <= qd->id->ifh.params[0])
    476476      *k = 0;
    … …  
    488488    case 2:
    489489      {
    490     unsigned long len;
     490    mg_u_long len;
    491491    if (*p <= qd->id->ifh.params[1])
    492492      *k = 0;
    … …  
    533533  DocEntry *src = NULL, *dest = NULL;
    534534  int i;            /* index counter into inverted list */
    535   unsigned long pos;
     535  mg_u_long pos;
    536536  int next_start, next_doc_num, next_i;
    537537  int block_counter;        /* within counter in block */
    … …  
    540540  int blk;          /* bblock control parameter */
    541541  int ft;           /* The number of documents the word occurs in */
    542   unsigned long CurrDoc = 0;    /* NOTE: Document numbers start at 1 */
     542  mg_u_long CurrDoc = 0;    /* NOTE: Document numbers start at 1 */
    543543  float Weight;
    544544
    … …  
    582582  while (i < ft && ((op == op_term) || src - L->DE < L->num))
    583583    {
    584       unsigned long diff, Temp;
     584      mg_u_long diff, Temp;
    585585
    586586      if (have_skipping)
    … …  
    754754      u_char *buffer;
    755755      int i, kd;
    756       unsigned long next_mjr_dn = 0;
    757       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    758       unsigned long LastDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */
    759       unsigned long 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] */
    760760      double Wqt, WordLog;
    761761      int dn_blk = 0, len_blk = 0, k;
    … …  
    787787      int Count;        /* The number of times the word occurs in a document */
    788788      double Wdt;
    789       unsigned long diff;
     789      mg_u_long diff;
    790790      if (kd == k)
    791791        {
    … …  
    919919      skip_header = 1;
    920920      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);
    922922      switch (qd->id->ifh.skip_mode)
    923923        {
    924924        case 1:
    925           fprintf (sk, "Skipping is every %ld docnums\n",
     925          fprintf (sk, "Skipping is every %d docnums\n",
    926926               qd->id->ifh.params[0]);
    927927          break;
    928928        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",
    930930               qd->id->ifh.params[0], qd->id->ifh.params[1]);
    931931          break;
    … …  
    958958      u_char *buffer;
    959959      int pos, i;
    960       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
     960      mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    961961      double Wqt, WordLog;
    962962      int dn_blk = 0, len_blk = 0, k, kd;
    … …  
    971971      if (sk)
    972972    {
    973       fprintf (sk, "%3d : %8ld %6ld \"%.*s\"%*s", j, we->count,
     973      fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count,
    974974         we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1,
    975975           indent - Terms->TE[j].Word[0], "");
    … …  
    10101010      int Count;        /* The number of times the occurs in a document */
    10111011      double Wdt;
    1012       unsigned long diff;
     1012      mg_u_long diff;
    10131013      Invf_Doc_Entry ent, *mem;
    10141014      if (k)
    … …  
    10261026        }
    10271027          if (kd == k - 1)
     1028        {
    10281029        if (i + k < p)
    10291030          {
    … …  
    10361037          }
    10371038        else
     1039          {
    10381040          next_doc_num = -1;
     1041          }
     1042        }
    10391043          if (Anding && i + k < p && next->DocNum > next_doc_num &&
    10401044          next_doc_num >= 0)
    … …  
    11491153      skip_header = 1;
    11501154      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);
    11521156      switch (qd->id->ifh.skip_mode)
    11531157        {
    11541158        case 1:
    1155           fprintf (sk, "Skipping is every %ld docnums\n",
     1159          fprintf (sk, "Skipping is every %d docnums\n",
    11561160               qd->id->ifh.params[0]);
    11571161          break;
    11581162        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",
    11601164               qd->id->ifh.params[0], qd->id->ifh.params[1]);
    11611165          break;
    … …  
    11881192      int pos;
    11891193      int i;
    1190       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
     1194      mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    11911195      double Wqt, WordLog;
    11921196      int dn_blk = 0, len_blk = 0, k, kd;
    … …  
    12011205      if (sk)
    12021206    {
    1203       fprintf (sk, "%3d : %8ld %6ld \"%.*s\"%*s", j, we->count,
     1207      fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count,
    12041208         we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1,
    12051209           indent - Terms->TE[j].Word[0], "");
    … …  
    12451249      int Count;        /* The number of times the occurs in a document */
    12461250      double Wdt;
    1247       unsigned long diff;
     1251      mg_u_long diff;
    12481252      Invf_Doc_Entry *mem;
    12491253      if (k)
    … …  
    13911395      skip_header = 1;
    13921396      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);
    13941398      switch (qd->id->ifh.skip_mode)
    13951399        {
    13961400        case 1:
    1397           fprintf (sk, "Skipping is every %ld docnums\n",
     1401          fprintf (sk, "Skipping is every %d docnums\n",
    13981402               qd->id->ifh.params[0]);
    13991403          break;
    14001404        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",
    14021406               qd->id->ifh.params[0], qd->id->ifh.params[1]);
    14031407          break;
    … …  
    14311435      int pos;
    14321436      int i, n = 0;
    1433       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    1434       unsigned long 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] */
    14351439      int this_item = 0; /* [RJM 07/97: Ranked Required Match] points to the next possible LT to delete */
    14361440      double Wqt, WordLog;
    … …  
    14481452      if (sk)
    14491453    {
    1450       fprintf (sk, "%3d : %8ld %6ld \"%.*s\"%*s", j, we->count,
     1454      fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count,
    14511455         we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1,
    14521456           indent - Terms->TE[j].Word[0], "");
    … …  
    15111515      int Count;        /* The number of times the occurs in a document */
    15121516      double Wdt;
    1513       unsigned long diff;
     1517      mg_u_long diff;
    15141518      Invf_Doc_Entry *mem;
    15151519
    … …  
    15301534        }
    15311535          if (kd == k - 1)
     1536        {
    15321537        if (i + k < p)
    15331538          {
    … …  
    15401545          }
    15411546        else
     1547          {
    15421548          next_doc_num = -1;
    1543 
     1549          }
     1550        }
    15441551          /* should we take another skip? */
    15451552          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  
    7575Op_types;
    7676
    77 /*Invf_Doc_Entry *HT_find(Hash_Table *HT, unsigned long DN); */
     77/*Invf_Doc_Entry *HT_find(Hash_Table *HT, mg_u_long DN); */
    7878void HT_free (query_data * qd, Hash_Table * HT);
    7979void 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  
    117117typedef struct hash_rec
    118118  {
    119     unsigned long fcnt;     /* fragment frequency */
    120     unsigned long lfcnt;    /* local fragment frequency */
    121     unsigned long fnum;     /* last fragment to use stem */
    122     unsigned long wcnt;     /* stem frequency */
    123     unsigned long 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 */
    124124    u_char *word;
    125125  }
    126126hash_rec;
    127127
    128 static unsigned long words_read = 0, words_diff = 0, bytes_diff = 0;
    129 static unsigned long outputbytes = 0;
    130 static unsigned long inputbytes = 0;
    131 static unsigned long MaxMemInUse = 0;
    132 static unsigned long MemInUse = 0;
    133 static unsigned long ChunksWritten = 0;
     128static mg_u_long words_read = 0, words_diff = 0, bytes_diff = 0;
     129static mg_u_long outputbytes = 0;
     130static mg_u_long inputbytes = 0;
     131static mg_u_long MaxMemInUse = 0;
     132static mg_u_long MemInUse = 0;
     133static mg_u_long ChunksWritten = 0;
    134134
    135135
    … …  
    138138
    139139static hash_rec **HashTable;
    140 static unsigned long HashSize=0;
    141 static unsigned long HashUsed=0;
     140static mg_u_long HashSize=0;
     141static mg_u_long HashUsed=0;
    142142static u_char *Pool;
    143143static int PoolLeft=0;
    … …  
    152152static mg_ullong L2_bits = 0;
    153153static mg_ullong L3_bits = 0;
    154 static unsigned long L1_ohead = 0;
    155 static unsigned long L2_ohead = 0;
    156 static unsigned long L3_ohead = 0;
    157 static unsigned long callnum = 0, lcallnum = 0, wordnum = 0, lwordnum = 0;
    158 static unsigned long ptrcnt = 0;
    159 static unsigned long checknum=0;
    160 static long max_mem = 0;
     154static mg_u_long L1_ohead = 0;
     155static mg_u_long L2_ohead = 0;
     156static mg_u_long L3_ohead = 0;
     157static mg_u_long callnum = 0, lcallnum = 0, wordnum = 0, lwordnum = 0;
     158static mg_u_long ptrcnt = 0;
     159static mg_u_long checknum=0;
     160static mg_s_long max_mem = 0;
    161161
    162162
    … …  
    211211              MG_MESSAGE)))  /* [RPAP - Feb 97: WIN32 Port] */
    212212    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 */
    214214  ENCODE_START (ic)
    215215    ENCODE_PAUSE (sbs)
    … …  
    256256
    257257
    258 static unsigned long
     258static mg_u_long
    259259mem_reqd (void)
    260260{
    261261  register int i;
    262   register unsigned long total = 0;
    263 /*  register unsigned long N = InvfLevel == 3 ? lwordnum : lcallnum; */
    264   register unsigned long 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;
    265265  for (i = 0; i < HashUsed; i++)
    266266    {
    267267      register hash_rec *ent = first_occr[i];
    268 /*      register unsigned long p = InvfLevel == 3 ? ent->lwcnt : ent->lfcnt; */
    269       register unsigned long p = ent->lfcnt;
     268/*      register mg_u_long p = InvfLevel == 3 ? ent->lwcnt : ent->lfcnt; */
     269      register mg_u_long p = ent->lfcnt;
    270270      if (p)
    271271    total += BIO_Bblock_Bound (N, p);
    … …  
    278278}
    279279
    280 static unsigned long
     280static mg_u_long
    281281max_mem_reqd (void)
    282282{
    283283  register int i;
    284   register unsigned long total = 0;
    285 /*  register unsigned long N = InvfLevel == 3 ? wordnum : callnum; */
    286   register unsigned long 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;
    287287  for (i = 0; i < HashUsed; i++)
    288288    {
    289289      register hash_rec *ent = first_occr[i];
    290 /*      register unsigned long p = InvfLevel == 3 ? ent->wcnt : ent->fcnt; */
    291       register unsigned long p = ent->fcnt;
     290/*      register mg_u_long p = InvfLevel == 3 ? ent->wcnt : ent->fcnt; */
     291      register mg_u_long p = ent->fcnt;
    292292      if (p)
    293293    total += BIO_Bblock_Bound (N, p);
    … …  
    302302
    303303static void
    304 dump_dict (unsigned long mem)
     304dump_dict (mg_u_long mem)
    305305{
    306306  int i;
    … …  
    367367      /* Search the hash table for Word */
    368368      {
    369     register unsigned long hashval, step;
     369    register mg_u_long hashval, step;
    370370    register int hsize = HashSize;
    371371    HASH (hashval, step, Word, hsize);
    … …  
    464464    {
    465465      hash_rec **ht;
    466       unsigned long size;
    467       unsigned long i;
     466      mg_u_long size;
     467      mg_u_long i;
    468468      size = prime (HashSize * 2);
    469469      if (!(ht = Xmalloc (sizeof (hash_rec *) * size)))
    … …  
    480480        register u_char *wptr;
    481481        hash_rec *ent;
    482         register unsigned long hashval, step;
     482        register mg_u_long hashval, step;
    483483
    484484        wptr = HashTable[i]->word;
    … …  
    504504  if (ptrcnt >= checknum)
    505505    {
    506       unsigned long mem;
     506      mg_u_long mem;
    507507      /*fprintf(stderr, "Checking at %u . . . ", ptrcnt); */
    508508      mem = mem_reqd ();
    … …  
    617617      /* check for overflow */
    618618      if (L1_bits + L2_bits < oldL12_bits) {
    619     fprintf(stderr, "ERROR: Inverted file size will probably overflow %d byte unsigned integer\n", sizeof (mg_ullong));
     619    fprintf(stderr, "ERROR: Inverted file size will probably overflow %lu byte unsigned integer\n", sizeof (mg_ullong));
    620620    fprintf(stderr, "       counter in pass 2.\n");
    621621    if (sizeof (mg_ullong) < 8) {
    … …  
    659659write_stem_file (char *file_name)
    660660{
    661   long j;
     661  mg_s_long j;
    662662  struct invf_dict_header idh;
    663   long lookback = (1 << LOGLOOKBACK);   /* ???? */
    664   long totalbytes = 0;      /* The sum of the length of all words, including
     663  mg_s_long lookback = (1 << LOGLOOKBACK);  /* ???? */
     664  mg_s_long totalbytes = 0;     /* The sum of the length of all words, including
    665665                   the length byte */
    666   long indexstringbytes = 0;    /* The amount of space required to store the
     666  mg_s_long indexstringbytes = 0;   /* The amount of space required to store the
    667667                   words in the diction, this takes into account
    668668                   the prefixes */
    … …  
    706706    {
    707707      int i;
    708       unsigned long wcnt, fcnt;  /* [RPAP - Jan 97: Endian Ordering] */
     708      mg_u_long wcnt, fcnt;  /* [RPAP - Jan 97: Endian Ordering] */
    709709      hash_rec *ent = HashTable[j];
    710710      if (lastword != NULL)
    … …  
    750750write_codes (char *file_name)
    751751{
    752   unsigned long dicts = 0;
     752  mg_u_long dicts = 0;
    753753  outputbytes = 0;
    754754  write_stem_file (file_name);
    … …  
    805805    {
    806806      /* [RPAP - Jan 97: Endian Ordering] */
    807       unsigned long fnum;
     807      mg_u_long fnum;
    808808      HTONUL2(first_occur[i]->fnum, fnum);
    809       fwrite ((char *) &fnum, sizeof (unsigned long), 1, f);
     809      fwrite ((char *) &fnum, sizeof (mg_u_long), 1, f);
    810810    }
    811811#endif
    … …  
    837837    GAMMA_ENCODE (1);
    838838  ENCODE_DONE
    839     fseek (ic, sizeof (long), 0);
     839    fseek (ic, sizeof (mg_s_long), 0);
    840840 
    841841  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  
    3939 * Revision 1.2  1997/08/02  05:01:57  wew
    4040 * changed literal values of 32 for the bit size of magic numbers of
    41  * files to sizeof (unsigned long) * 8, increased the gap at the start
     41 * files to sizeof (mg_u_long) * 8, increased the gap at the start
    4242 * of the invf during processing to 200 bytes
    4343
    … …  
    127127    struct stat file_state;\
    128128    fstat(fileno(invf_out), &file_state);\
    129     Message("len(invf) = %ld", file_state.st_size);\
     129    Message("len(invf) = %d", file_state.st_size);\
    130130  }while(0)
    131131
    132132typedef struct word_rec
    133133  {
    134     unsigned long ptr;
    135     unsigned long last;
     134    mg_u_long ptr;
     135    mg_u_long last;
    136136  }
    137137word_rec;
    … …  
    141141    mg_ullong Disk_Ptr;
    142142    mg_ullong Disk_Last;
    143     unsigned long Disk_B;
     143    mg_u_long Disk_B;
    144144  }
    145145invf_state_rec;
    … …  
    147147typedef struct chunk
    148148  {
    149     unsigned long start_doc;
    150     unsigned long params_pos;
    151     unsigned long disk_pos;
    152     unsigned long N;
     149    mg_u_long start_doc;
     150    mg_u_long params_pos;
     151    mg_u_long disk_pos;
     152    mg_u_long N;
    153153  }
    154154chunk;
    … …  
    175175
    176176static int docs_left = 0, next_docs_left = 0;
    177 static unsigned long N;
     177static mg_u_long N;
    178178
    179179static word_rec *WordRecs;
    … …  
    182182
    183183static char *MemoryBuffer = NULL;
    184 static unsigned long MemBufSize;
    185 static unsigned long BufToUse;
     184static mg_u_long MemBufSize;
     185static mg_u_long BufToUse;
    186186static struct invf_dict_header idh;
    187187
    188188static perf_hash_data *phd;
    189189
    190 static unsigned long *word_list = NULL;
    191 static unsigned long wl_size = 0;
    192 
    193 static unsigned long dict_size;
    194 static unsigned long no_of_ptrs = 0;
    195 static unsigned long chunks_read = 0;
    196 static unsigned long Disk_pos = 0;
    197 static unsigned long callnum = 0;
    198 static unsigned long wordnum = 0;
    199 
    200 static unsigned long totalIbytes = 0;
    201 static unsigned long totalDbytes = 0;
    202 static unsigned long totalHbytes = 0;
    203 
    204 static unsigned long MemInUse = 0;
    205 static unsigned long MaxMemInUse = 0;
    206 static unsigned long max_buffer_len;
     190static mg_u_long *word_list = NULL;
     191static mg_u_long wl_size = 0;
     192
     193static mg_u_long dict_size;
     194static mg_u_long no_of_ptrs = 0;
     195static mg_u_long chunks_read = 0;
     196static mg_u_long Disk_pos = 0;
     197static mg_u_long callnum = 0;
     198static mg_u_long wordnum = 0;
     199
     200static mg_u_long totalIbytes = 0;
     201static mg_u_long totalDbytes = 0;
     202static mg_u_long totalHbytes = 0;
     203
     204static mg_u_long MemInUse = 0;
     205static mg_u_long MaxMemInUse = 0;
     206static mg_u_long max_buffer_len;
    207207
    208208void
    … …  
    292292      return (COMPERROR);
    293293
    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] */
    296296  if (!(invf_state = fopen (FName, "w+b")))  /* [RPAP - Feb 97: WIN32 Port] */
    297297    {
    … …  
    301301  unlink (FName);
    302302
    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] */
    305305  if (!(chunk_state = fopen (FName, "w+b")))  /* [RPAP - Feb 97: WIN32 Port] */
    306306    {
    … …  
    312312  ChangeMemInUse (RND_BUF_SIZE);
    313313
    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] */
    316316  if (!(chunks = fopen (FName, "w+b")))  /* [RPAP - Feb 97: WIN32 Port] */
    317317    {
    … …  
    329329
    330330#define ISR_CACHE 1024
    331 #define ISR_ENTRY_SIZE (sizeof(mg_ullong)*2 + sizeof(unsigned long))
     331#define ISR_ENTRY_SIZE (sizeof(mg_ullong)*2 + sizeof(mg_u_long))
    332332
    333333invf_state_rec *
    … …  
    360360
    361361
    362 unsigned long
    363 occur_to_lexical (long occ, int clear_state)
    364 {
    365   static long pos = -1;
     362mg_u_long
     363occur_to_lexical (mg_s_long occ, int clear_state)
     364{
     365  static mg_s_long pos = -1;
    366366  static random_bitio_state rbs;
    367367  static int val = 0;
    … …  
    383383      return 0;
    384384    }
    385       BIO_Random_Seek_X (sizeof (unsigned long) * 8, &rbs);
     385      BIO_Random_Seek_X (sizeof (mg_u_long) * 8, &rbs);
    386386      pos = 0;
    387387    }
    … …  
    396396
    397397void
    398 add_chunk_state (unsigned long pos, unsigned long start_doc,
    399          unsigned long N)
     398add_chunk_state (mg_u_long pos, mg_u_long start_doc,
     399         mg_u_long N)
    400400{
    401401  chunk_data[chunks_read].params_pos = pos;
    … …  
    448448  totalHbytes = sizeof (perf_hash_data) + sizeof (u_char) * 256 +
    449449    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;
    451451
    452452  if (!(WordRecs = Xmalloc (sizeof (word_rec) * idh.dict_size)))
    … …  
    488488  totalDbytes += sizeof (chunk) * (ChunkLimit + 2);
    489489
    490   totalIbits = sizeof (unsigned long) * 8;      /* The magic number */
     490  totalIbits = sizeof (mg_u_long) * 8;      /* The magic number */
    491491  totalIbits += 8 * 200;    /* A 200 byte gap */
    492492
    … …  
    506506    {
    507507      invf_state_rec *isr;
    508       register unsigned long copy, suff, p;
    509       unsigned long fcnt, wcnt;
     508      register mg_u_long copy, suff, p;
     509      mg_u_long fcnt, wcnt;
    510510
    511511      lasttotalIbits = totalIbits;
    … …  
    551551
    552552      if (totalIbits < lasttotalIbits) {
    553     fprintf(stderr, "ERROR: The totalIbits counter (%d byte 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));
    554554    if (sizeof (mg_ullong) < 8) {
    555555      fprintf(stderr, "       Try compiling with GCC to enable use of 8 bytes for this counter.\n");
    … …  
    578578LoadCounts (void)
    579579{
    580   unsigned long numwords, i, last_total;
    581   static unsigned long local_N = 0;
    582   unsigned long 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;
    583583  word_rec *wr;
    584   unsigned long *counts;
     584  mg_u_long *counts;
    585585
    586586  if (MemoryBuffer == NULL)
    587587    {
    588       MemBufSize = sizeof (unsigned long) * dict_size;
     588      MemBufSize = sizeof (mg_u_long) * dict_size;
    589589      if (max_buffer_len > MemBufSize)
    590590    MemBufSize = max_buffer_len;
    … …  
    593593      ChangeMemInUse (MemBufSize);
    594594    }
    595   counts = (unsigned long *) MemoryBuffer;
    596 /*   bzero ((char *) counts, sizeof (unsigned long) * dict_size); */
     595  counts = (mg_u_long *) MemoryBuffer;
     596/*   bzero ((char *) counts, sizeof (mg_u_long) * dict_size); */
    597597  bzero ((char *) counts, MemBufSize);
    598598  docs_left = next_docs_left;
    … …  
    613613  for (i = 0; i < numwords; i++)
    614614    {
    615       unsigned long word_num, wcnt, fcnt, p;
     615      mg_u_long word_num, wcnt, fcnt, p;
    616616      word_num = occur_to_lexical (i,0);
    617617     
    … …  
    628628      if (wcnt)
    629629    {
    630       register unsigned long length;
     630      register mg_u_long length;
    631631      counts[word_num] = p;
    632632      length = BIO_Bblock_Bound (local_N, p);
    … …  
    644644  for (wr = WordRecs, i = 0; i < dict_size; i++, wr++)
    645645    {
    646       register unsigned long length;
     646      register mg_u_long length;
    647647      length = wr->ptr;
    648648      wr->last = callnum;
    … …  
    688688  random_bitio_state *rbsi;
    689689  random_bitio_state *chks = NULL;
    690   unsigned long *chunk_ptrs;
     690  mg_u_long *chunk_ptrs;
    691691  int i;
    692692
    693693  BIO_Random_Flush (&crbs);
    694694
    695   chunk_ptrs = Xmalloc (chunks_read * sizeof (unsigned long));
    696   ChangeMemInUse (chunks_read * sizeof (unsigned long));
    697   bzero ((char *) chunk_ptrs, chunks_read * sizeof (unsigned long));
     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));
    698698
    699699  rbsi = Xmalloc (chunks_read * sizeof (random_bitio_state));
    … …  
    752752          for (k = 0; k < p; k++)
    753753            {
    754               register unsigned long x, tf;
     754              register mg_u_long x, tf;
    755755              BBLOCK_DECODE (x, b);
    756756              if (k == 0)
    … …  
    775775          for (k = 0; k < p; k++)
    776776            {
    777               register unsigned long x, tf;
     777              register mg_u_long x, tf;
    778778              x = BIO_Random_Bblock_Decode (b, Chks, NULL);
    779779              if (k == 0)
    … …  
    816816/*   chunks_read = 0; */
    817817  Xfree (chunk_ptrs);
    818   ChangeMemInUse (-chunks_read * sizeof (unsigned long));
     818  ChangeMemInUse (-chunks_read * sizeof (mg_u_long));
    819819  chunks_read = 0;
    820820  Disk_pos = 0;
    … …  
    860860  int res;
    861861  u_char *end = s_in + l_in - 1;
    862   unsigned long tocode;
    863   unsigned long wl_pos = 0;
     862  mg_u_long tocode;
     863  mg_u_long wl_pos = 0;
    864864
    865865  if (!docs_left)
    … …  
    934934      if (wl_pos)
    935935    {
    936       unsigned long *wl = word_list;
    937       unsigned long i, count, val;
     936      mg_u_long *wl = word_list;
     937      mg_u_long i, count, val;
    938938      qsort (wl, wl_pos, sizeof (*wl), wl_comp);
    939939      count = 1;
    … …  
    999999
    10001000static void
    1001 stats (unsigned long len)
     1001stats (mg_u_long len)
    10021002{
    10031003#ifndef SILENT
    … …  
    10291029done_ivf_2 (char *FileName)
    10301030{
    1031   long i;
     1031  mg_s_long i;
    10321032  mg_ullong totalIbits;
    1033   unsigned long invf_len;
    1034   unsigned long bytes_output;
     1033  mg_u_long invf_len;
     1034  mg_u_long bytes_output;
    10351035  struct invf_file_header ifh;
    10361036
    … …  
    10541054  invf_len = ftell (invf);
    10551055
    1056   fseek (invf_out, sizeof (long), 0);
     1056  fseek (invf_out, sizeof (mg_s_long), 0);
    10571057  /* [RPAP - Jan 97: Endian Ordering] */
    10581058  HTONUL2(dict_size, ifh.no_of_words);
    … …  
    10651065  bytes_output = ftell (invf_out);
    10661066
    1067   totalIbits = sizeof (unsigned long) * 8;      /* The magic number */
     1067  totalIbits = sizeof (mg_u_long) * 8;      /* The magic number */
    10681068  totalIbits += 8 * 200;    /* A 200 byte gap */
    10691069
    10701070  /* find the right place in the file to start reading p values */
    1071   fseek (dict, sizeof (unsigned long) + sizeof (struct invf_dict_header), 0);
     1071  fseek (dict, sizeof (mg_u_long) + sizeof (struct invf_dict_header), 0);
    10721072  for (i = 0; i < dict_size; i++)
    10731073    {
    10741074      invf_state_rec *isr;
    1075       unsigned long fcnt, wcnt, s, e;
    1076       register unsigned long p;
     1075      mg_u_long fcnt, wcnt, s, e;
     1076      register mg_u_long p;
    10771077      u_char dummy1, dummy2[MAXSTEMLEN + 1];
    10781078
    … …  
    11471147  {
    11481148    char *temp_str = msg_prefix;
    1149     unsigned long total;
     1149    mg_u_long total;
    11501150    msg_prefix = "ivf.pass2";
    11511151    stats (invf_len);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/lists.h

    r16583 r23508  
    3232    float Weight;
    3333    int DocNum;
    34     unsigned long SeekPos;  /* position in the text file in bytes */
    35     unsigned long 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 */
    3636    char *CompTextBuffer;
    3737    struct DocEntry *Next;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/locallib.c

    r16583 r23508  
    100100
    101101int
    102 huffcodebits (unsigned long *A, int n)
     102huffcodebits (mg_u_long *A, int n)
    103103{
    104104  int i, j, tot = 0, bits = 0, v1, v2, *B;
    … …  
    136136
    137137int
    138 modelbits (unsigned long *A, int n)
     138modelbits (mg_u_long *A, int n)
    139139{
    140140  int i, bits = 0, last, N = 0;
    … …  
    185185
    186186int
    187 Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem,
    188       u_long * disk)
     187Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem,
     188      mg_u_long * disk)
    189189{
    190190  if (disk)
    … …  
    212212
    213213int
    214 F_Read_cdh (File * f, compression_dict_header * cdh, u_long * mem,
    215         u_long * disk)
     214F_Read_cdh (File * f, compression_dict_header * cdh, mg_u_long * mem,
     215        mg_u_long * disk)
    216216{
    217217  if (disk)
    … …  
    239239
    240240int
    241 Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk)
     241Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk)
    242242{
    243243  int i;  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    274274
    275275int
    276 F_Read_cfh (File * f, comp_frags_header * cfh, u_long * mem, u_long * disk)
     276F_Read_cfh (File * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk)
    277277{
    278278  int i;  /* [RPAP - Jan 97: Endian Ordering] */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/locallib.h

    r16583 r23508  
    3333int vecentropy (int *A, int n);
    3434
    35 int huffcodebits (unsigned long *A, int n);
     35int huffcodebits (mg_u_long *A, int n);
    3636
    37 int modelbits (unsigned long *A, int n);
     37int modelbits (mg_u_long *A, int n);
    3838
    3939int prime (int p);
    4040
    4141
    42 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem, u_long * disk);
     42int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, mg_u_long * disk);
    4343
    44 int Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk);
     44int Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk);
    4545
    46 int F_Read_cdh (File * f, compression_dict_header * cdh, u_long * mem,
    47         u_long * disk);
     46int F_Read_cdh (File * f, compression_dict_header * cdh, mg_u_long * mem,
     47        mg_u_long * disk);
    4848
    49 int F_Read_cfh (File * f, comp_frags_header * cfh, u_long * mem, u_long * disk);
     49int F_Read_cfh (File * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk);
    5050
    5151

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_compression_dict.c

    r16583 r23508  
    4141#include "mg.h"
    4242
    43 #define MAXBITS (sizeof(unsigned long) * 8)
     43#define MAXBITS (sizeof(mg_mg_u_long) * 8)
    4444
    4545/*
    … …  
    9898typedef struct WordData
    9999  {
    100     u_long freq, occur_num;
     100    mg_u_long freq, occur_num;
    101101    float saving;
    102102    float char_bit_cost;
    103     u_long num_trans;
     103    mg_u_long num_trans;
    104104    u_char *word;
    105105  }
    … …  
    107107
    108108static WordData *Words[2];
    109 static u_long Num[2];
    110 static u_long chars[2];
     109static mg_u_long Num[2];
     110static mg_u_long chars[2];
    111111
    112112#define KIND(p) (((p) >= Words[0] && (p) < Words[0] + Num[0]) ? 0 : 1)
    … …  
    118118  {
    119119    WordData **wd;
    120     u_long num_wds;
    121     u_long chars;
     120    mg_u_long num_wds;
     121    mg_u_long chars;
    122122  }
    123123DictData;
    … …  
    129129
    130130static char *file_name = "";
    131 static u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
     131static mg_u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
    132132
    133133
    … …  
    136136static void Method3 (int k);
    137137static void Select_all (void);
    138 static u_long WriteOutWords (char *, u_long, int);
     138static mg_u_long WriteOutWords (char *, mg_u_long, int);
    139139static int DecFreqIncWL (void *a, void *b);
    140140static int OccuranceOrder (void *a, void *b);
    … …  
    150150  int lookback = 2;
    151151  double k = 0;
    152   u_long mem_reqd;
     152  mg_u_long mem_reqd;
    153153  opterr = 0;
    154154  msg_prefix = argv[0];
    … …  
    264264{
    265265  FILE *f;
    266   unsigned long i;
     266  mg_u_long i;
    267267  f = open_file (filename, TEXT_STATS_DICT_SUFFIX, "rb",
    268268         MAGIC_STATS_DICT, MG_ABORT);  /* [RPAP - Feb 97: WIN32 Port] */
    … …  
    468468CalcCharCounts (WordData ** wd, int num,
    469469        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];
    474474  huff_data hd;
    475475  int i;
    … …  
    480480  for (i = 0; i < num; i++, wd++)
    481481    {
    482       u_long freq = (*wd)->freq;
     482      mg_u_long freq = (*wd)->freq;
    483483      u_char *buf = (*wd)->word;
    484484      int len = *buf++;
    … …  
    487487      escape[idx] += freq;
    488488      for (; len; len--, buf++)
    489     char_freqs[idx][(u_long) (*buf)] += freq;
     489    char_freqs[idx][(mg_u_long) (*buf)] += freq;
    490490    }
    491491  Generate_Huffman_Data (256, char_freqs[0], &hd, NULL);
    … …  
    511511CalcBitCost (WordData ** discard_word, int discard_num,
    512512         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)
    514514{
    515515  char *char_lens[2];
    … …  
    525525      u_char *buf = (*discard_word)->word;
    526526      int len = *buf++;
    527       u_long freq = (*discard_word)->freq;
     527      mg_u_long freq = (*discard_word)->freq;
    528528      int idx = KIND (*discard_word);
    529529
    530530      cbc = len_lens[idx][len];
    531531      for (; len; len--, buf++)
    532     cbc += char_lens[idx][(u_long) (*buf)];
     532    cbc += char_lens[idx][(mg_u_long) (*buf)];
    533533
    534534      (*discard_word)->char_bit_cost = (cbc + esc[idx]) * freq;
    … …  
    546546      u_char *buf = (*keep_word)->word;
    547547      int len = *buf++;
    548       u_long freq = (*keep_word)->freq;
     548      mg_u_long freq = (*keep_word)->freq;
    549549      int idx = KIND (*keep_word);
    550550
    551551      cbc = len_lens[idx][len];
    552552      for (; len; len--, buf++)
    553     cbc += char_lens[idx][(u_long) (*buf)];
     553    cbc += char_lens[idx][(mg_u_long) (*buf)];
    554554
    555555      (*keep_word)->char_bit_cost = (cbc + esc[idx]) * freq;
    … …  
    578578  int recalcs = 0;
    579579  double freqs_trans[2], total;
    580   u_long escape[2];
     580  mg_u_long escape[2];
    581581  WordData **keep_heap, **discard_heap;
    582582
    … …  
    831831
    832832
    833 static u_long
     833static mg_u_long
    834834Write_data (FILE * f, DictData * dd, int lookback)
    835835{
    836   u_long mem_reqd;
     836  mg_u_long mem_reqd;
    837837  huff_data *hd;
    838838  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];
    843843  u_char *lastword[MAX_HUFFCODE_LEN + 1];
    844844
    … …  
    932932{
    933933  int j;
    934   long freqs[256];
     934  mg_s_long freqs[256];
    935935  WordData **wd = dd->wd;
    936936  huff_data *hd;
    … …  
    943943      int len = *buf++;
    944944      for (; len; len--, buf++)
    945     freqs[(u_long) (*buf)] += (*wd)->freq;
     945    freqs[(mg_u_long) (*buf)] += (*wd)->freq;
    946946    }
    947947
    … …  
    968968{
    969969  int j;
    970   long freqs[16];
     970  mg_s_long freqs[16];
    971971  WordData **wd = dd->wd;
    972972  huff_data *hd;
    … …  
    995995
    996996
    997 static u_long
    998 WriteOutWords (char *file_name, u_long type, int lookback)
     997static mg_u_long
     998WriteOutWords (char *file_name, mg_u_long type, int lookback)
    999999{
    10001000  FILE *f;
    10011001  int i;
    1002   u_long mem_reqd = 0;
     1002  mg_u_long mem_reqd = 0;
    10031003
    10041004  compression_dict_header cdh;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_decompress_text.c

    r16583 r23508  
    3434
    3535  int ch;
    36   unsigned long start, finish, len;
    37   u_long total_chars = 0;
     36  mg_u_long start, finish, len;
     37  mg_u_long total_chars = 0;
    3838  u_char *c_buffer = 0;
    3939  int buf_len = -1;
    … …  
    4242  compression_dict *cd = NULL;
    4343  compressed_text_header cth;
    44   u_long doc;
     44  mg_u_long doc;
    4545  int count;
    4646  char *filename = "";
    … …  
    161161
    162162#if 0
    163   printf ("\n#Total chars output = %lu\n", total_chars);
     163  printf ("\n#Total chars output = %u\n", total_chars);
    164164#endif
    165165

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_fast_comp_dict.c

    r16583 r23508  
    9191
    9292
    93 static u_long mem_for_comp_dict (char *filename);
     93static mg_u_long mem_for_comp_dict (char *filename);
    9494static void load_comp_dict (char *filename);
    9595static void save_fast_dict (char *filename);
    … …  
    100100static void *cur;
    101101static u_char *fixup;
    102 static u_long mem, fixup_mem;
     102static uintptr_t mem, fixup_mem;
    103103
    104104int main (int argc, char **argv)
    … …  
    142142  Message ("Actual memory for fast_dict %u", (char *) cur - (char *) buffer);
    143143
    144   if ((u_long) cur > (u_long) buffer + mem)
     144  if ((uintptr_t) cur > (uintptr_t) buffer + mem)
    145145    FatalError (1, "The buffer was not big enough for the dictionary");
    146146
    … …  
    211211unfixup_buffer ()
    212212{
    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++)
    215215    {
    216216      if (IS_FIXUP (p))
    217     *p = *p - (u_long) buffer;
    218     }
    219 }
    220 
    221 
    222 
    223 
    224 static u_long
     217    *p = *p - (uintptr_t) buffer;
     218    }
     219}
     220
     221
     222
     223
     224static mg_u_long
    225225mem_for_aux_dict (compression_dict_header * cdh, char *filename)
    226226{
    227227  int i;
    228   u_long mem = sizeof (auxiliary_dict);
     228  mg_u_long mem = sizeof (auxiliary_dict);
    229229  FILE *aux;
    230230
    … …  
    249249
    250250
    251 static u_long
     251static mg_u_long
    252252mem_for_words (FILE * dict, compression_dict_header * cdh,
    253253           comp_frags_header * cfh)
    254254{
    255   u_long mem = 0;
    256   u_long i, lookback;
     255  mg_u_long mem = 0;
     256  mg_u_long i, lookback;
    257257  int ptrs_reqd = 0;
    258258  int mem_reqd = 0;
    … …  
    282282
    283283
    284 static u_long
     284static mg_u_long
    285285mem_for_comp_dict (char *filename)
    286286{
    287   u_long mem = sizeof (compression_dict);
     287  mg_u_long mem = sizeof (compression_dict);
    288288  compression_dict_header cdh;
    289289  comp_frags_header cfh;
    … …  
    343343      if (hd.clens)
    344344        Xfree (hd.clens);
    345       mem += hd.num_codes * sizeof (unsigned long);
    346       mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     345      mem += hd.num_codes * sizeof (mg_u_long);
     346      mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    347347
    348348      mem += sizeof (hd);
    … …  
    350350      if (hd.clens)
    351351        Xfree (hd.clens);
    352       mem += hd.num_codes * sizeof (unsigned long);
    353       mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     352      mem += hd.num_codes * sizeof (mg_u_long);
     353      mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    354354    }
    355355    break;
    … …  
    377377          if (hd.clens)
    378378        Xfree (hd.clens);
    379           mem += hd.num_codes * sizeof (unsigned long);
    380           mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     379          mem += hd.num_codes * sizeof (mg_u_long);
     380          mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    381381
    382382          mem += sizeof (hd);
    … …  
    384384          if (hd.clens)
    385385        Xfree (hd.clens);
    386           mem += hd.num_codes * sizeof (unsigned long);
    387           mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     386          mem += hd.num_codes * sizeof (mg_u_long);
     387          mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    388388          break;
    389389        case MG_NOVEL_BINARY:
    … …  
    413413
    414414void *
    415 getmem (u_long size, int align)
     415getmem (mg_u_long size, int align)
    416416{
    417417  void *res;
    418   cur = (void *) (((u_long) cur + (align - 1)) & (~(align - 1)));
     418  cur = (void *) (((uintptr_t) cur + (align - 1)) & (~(align - 1)));
    419419  res = cur;
    420420  cur = (char *) cur + size;
    421   if ((long) cur > (long) buffer + mem)
     421  if ((intptr_t) cur > (intptr_t) buffer + mem)
    422422    FatalError (1, "The buffer was not big enough for the dictionary");
    423423  return res;
    … …  
    592592
    593593
    594 static unsigned long **
    595 Generate_Fast_Huffman_Vals (huff_data * data, u_long * mem)
     594static mg_u_long **
     595Generate_Fast_Huffman_Vals (huff_data * data, mg_u_long * mem)
    596596{
    597597  int i;
    598   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    599   unsigned long **values;
    600   unsigned long *vals;
     598  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     599  mg_u_long **values;
     600  mg_u_long *vals;
    601601
    602602  if (!data)
    603603    return (NULL);
    604   vals = getmem (data->num_codes * sizeof (*vals), sizeof (long *));
    605   values = getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *),
    606            sizeof (long *));
    607 
    608   bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     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 *));
    609609
    610610  if (mem)
    611611    *mem += data->num_codes * sizeof (*vals) +
    612       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     612      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    613613
    614614  fcode[0] = values[0] = &vals[0];
    … …  
    661661    {
    662662      huff_data *hd;
    663       u_long **vals;
     663      mg_u_long **vals;
    664664      if (cd->cdh.num_words[which])
    665665        {
    … …  
    702702    {
    703703      huff_data *hd;
    704       u_long **vals;
     704      mg_u_long **vals;
    705705      if (cd->cdh.num_words[which])
    706706        {
    … …  
    776776
    777777  {
    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++)
    780780      {
    781781    if (IS_FIXUP (p))

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_files.c

    r16583 r23508  
    110110FILE *
    111111open_named_file (const char *name, const char *mode,
    112          u_long magic_num, int err_mode)
    113 {
    114   unsigned long magic;
     112         mg_u_long magic_num, int err_mode)
     113{
     114  mg_u_long magic;
    115115  FILE *f = NULL;
    116116  char *err;
    … …  
    172172FILE *
    173173open_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)
    175175{
    176176  char path[512];
    … …  
    200200FILE *
    201201create_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)
    203203{
    204204  FILE *f = NULL;
    … …  
    252252FILE *
    253253create_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)
    255255{
    256256  char path[512];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_files.h

    r16583 r23508  
    2929/* Magic numbers for the different types of files */
    3030
    31 #define GEN_MAGIC(a,b,c,d) ((unsigned long)(((a)<<24) + ((b)<<16) + \
     31#define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \
    3232                        ((c)<<8) + (d)))
    3333
    … …  
    5555#define MAGIC_STEM_3            GEN_MAGIC('M','G','s','3')
    5656
    57 #define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
     57#define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
    5858
    5959
    … …  
    268268   an error message.   */
    269269FILE *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);
    271271
    272272
    … …  
    286286   an error message.   */
    287287FILE *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);
    289289
    290290
    … …  
    305305   an error message.   */
    306306FILE *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);
    308308
    309309
    … …  
    322322   an error message.   */
    323323FILE *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  
    115115{
    116116  FILE *id, *idb, *tmp, *ii;
    117   unsigned long i, pos, num, First_word, invf_ptr, invf_len;
    118   unsigned long last_ptr = 0;
     117  mg_u_long i, pos, num, First_word, invf_ptr, invf_len;
     118  mg_u_long last_ptr = 0;
    119119  char *FName;
    120120  struct invf_dict_header idh;
    … …  
    179179  for (i = 0; i < idh.dict_size; i++)
    180180    {
    181       register unsigned long extra, copy, suff;
    182       unsigned long wcnt, fcnt;
     181      register mg_u_long extra, copy, suff;
     182      mg_u_long wcnt, fcnt;
    183183
    184184      /* build a new word on top of prev */
    … …  
    304304
    305305  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) +
    307307    sdh.num_blocks * sizeof (pos);
    308308  if (force)
    … …  
    323323
    324324  /* skip over the magic number */
    325   fseek (idb, sizeof (u_long), 0);
     325  fseek (idb, sizeof (mg_u_long), 0);
    326326
    327327  /* [RPAP - Jan 97: Endian Ordering] */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_invf_dump.c

    r16583 r23508  
    3636#include "invf.h"
    3737
    38 extern unsigned long S_btg;
     38extern mg_u_long S_btg;
    3939
    4040/*
    … …  
    124124process_files (char *name)
    125125{
    126   unsigned long N, Nstatic, k;
     126  mg_u_long N, Nstatic, k;
    127127  FILE *dict;
    128128  FILE *invf;
    … …  
    172172    }
    173173  else
    174     printf ("%ld %ld\n", N, ifh.no_of_words);
     174    printf ("%d %d\n", N, ifh.no_of_words);
    175175  for (k = 0; k < ifh.no_of_words; k++)
    176176    {
    177177      int i, blk, doc;
    178       register unsigned long suff, prefix;
    179       unsigned long fcnt, wcnt;
     178      register mg_u_long suff, prefix;
     179      mg_u_long fcnt, wcnt;
    180180      char term[MAXSTEMLEN + 1];
    181181
    … …  
    196196    {
    197197      if (term_dump)
    198         printf ("%ld    \"%s\"\n", fcnt, term);
     198        printf ("%d    \"%s\"\n", fcnt, term);
    199199      else
    200         printf ("%ld\n", fcnt);
     200        printf ("%d\n", fcnt);
    201201    }
    202202      blk = BIO_Bblock_Init (Nstatic, fcnt);
    … …  
    215215          GAMMA_DECODE (count);
    216216          if (word_counts)
     217        {
    217218        if (binary)
     219          {
    218220          fwrite ((char *) &count, sizeof (count), 1, stdout);
     221          }
    219222        else
     223          {
    220224          printf (" %d", count);
     225          }
     226        }
    221227        }
    222228      if (!binary)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_invf_merge.c

    r16583 r23508  
    5858    struct invf_dict_header idh;
    5959    struct invf_file_header ifh;
    60     u_long nDocs;
     60    mg_u_long nDocs;
    6161
    6262    /* Lexicon processing variables */
    63     u_long fcnt, wcnt;
     63    mg_u_long fcnt, wcnt;
    6464    int suff, pref;
    6565    unsigned char term[MAXSTEMLEN + 1];
    66     u_long term_count;
     66    mg_u_long term_count;
    6767    int done;
    6868
    6969    /* Variables used for merging */
    7070    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 */
    7272    int *fcntlist;      /* store fcnt values read in from the lexicons */
    7373
    … …  
    8181
    8282merge_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 */
     83mg_u_long magicsize;        /* how big is magic number? currently always 4 */
     84mg_u_long Nstatic;          /* static # of documents in file */
    8585
    8686float *DocWeightBuffer;
    … …  
    9797int fastMerge = 1;      /* True if fast merge selected. Default = true */
    9898
    99 u_long oldIdxValue;     /* stores last read value from m[OLD].idx
     99mg_u_long oldIdxValue;      /* stores last read value from m[OLD].idx
    100100                   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 with
     101mg_u_long bytes_output;     /* for writing .invf.idx file */
     102mg_u_long oldOnlyBits = 0;      /* entries in old only */
     103mg_u_long oldMergeBits = 0; /* entries in old that are merged with
    104104                   a new entry */
    105105
    … …  
    242242  m[OLD].idx = open_file (m[OLD].fname, INVF_IDX_SUFFIX, "rb",
    243243              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);
    245245  NTOHUL(oldIdxValue);  /* [RPAP - Jan 97: Endian Ordering] */
    246246
    … …  
    280280 *=======================================================================*/
    281281void
    282 procEntry_slow (int tnum, int type, u_long oldN, u_long newN, u_long mergeN)
     282procEntry_slow (int tnum, int type, mg_u_long oldN, mg_u_long newN, mg_u_long mergeN)
    283283/*
    284284 *  Process an invf entry.
    … …  
    295295  int fcntNEW = m[NEW].fcntlist[tnum];
    296296  int inblk, outblk;
    297   u_long inbits = 0, outbits = 0;
     297  mg_u_long inbits = 0, outbits = 0;
    298298
    299299  /* write .invf.idx pointer */
    300300  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);
    302302  NTOHUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    303303
    … …  
    383383 */
    384384{
    385   u_long newIdxValue, len = 0;
     385  mg_u_long newIdxValue, len = 0;
    386386
    387387  /* Calculate IFold entry length in bytes if not NEW type */
    388388  if (type != NEW)      /* read in an index number from m[OLD].idx */
    389389    {
    390       fread (&newIdxValue, sizeof (u_long), 1, m[OLD].idx);
     390      fread (&newIdxValue, sizeof (mg_u_long), 1, m[OLD].idx);
    391391      NTOHUL(newIdxValue);  /* [RPAP - Jan 97: Endian Ordering] */
    392392      len = newIdxValue - oldIdxValue;
    … …  
    400400      /* write .invf.idx pointer */
    401401      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);
    403403      NTOHUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    404404
    … …  
    468468  m[x].term_count = m[x].term_count + 1;
    469469
    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);
    472472
    473473  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    620620  /* print some results about terms */
    621621  {
    622     fprintf (stderr, "   Terms: OLD = %ld,  NEW = %ld,  MERGE = %ld\n",
     622    fprintf (stderr, "   Terms: OLD = %d,  NEW = %d,  MERGE = %d\n",
    623623         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",
    625625         (m[MERGE].nTerms - m[NEW].nTerms),
    626626         (m[MERGE].nTerms - m[OLD].nTerms),
    … …  
    645645    /* write final .invf.idx pointer */
    646646    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);
    648648    NTOHUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    649649
    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",
    651651         oldOnlyBits, oldMergeBits);
    652652  }
    … …  
    729729      if (weightfile)
    730730    {
    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);
    734734      fseek (weightfile, 0, 2); /* end of file */
    735735

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_invf_rebuild.c

    r16583 r23508  
    4343typedef struct invf_info
    4444  {
    45     unsigned long doc_num, count, bits_so_far, count_bits;
     45    mg_u_long doc_num, count, bits_so_far, count_bits;
    4646  }
    4747invf_info;
    … …  
    200200{
    201201  FILE *in, *out, *idx, *odx, *dict;
    202   unsigned long magic, outmode, N, in_k, out_k;
    203   unsigned long 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;
    204204  stdio_bitio_state out_buf, in_buf;
    205205  struct invf_dict_header idh;
    … …  
    351351  for (i = 0; i < ifh_in.no_of_words; i++)
    352352    {
    353       unsigned long blk, p;
    354       unsigned long odn_blk = 0, olen_blk = 0;
    355       unsigned long idn_blk = 0, ilen_blk = 0;
    356       register unsigned long suff;
    357       unsigned long fcnt, wcnt, doc_num, bits_so_far, last_major;
    358       unsigned long 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;
    359359      char dummy2[MAXSTEMLEN + 1];
    360360      invf_info *ii;
    … …  
    380380    case 1:
    381381      {
    382         unsigned long len;
     382        mg_u_long len;
    383383        if (p <= ifh_out.params[0])
    384384          out_k = 0;
    … …  
    396396    case 2:
    397397      {
    398         unsigned long len;
     398        mg_u_long len;
    399399        if (p <= mins)
    400400          out_k = 0;
    … …  
    421421    case 1:
    422422      {
    423         unsigned long len;
     423        mg_u_long len;
    424424        if (p <= ifh_in.params[0])
    425425          in_k = 0;
    … …  
    437437    case 2:
    438438      {
    439         unsigned long len;
     439        mg_u_long len;
    440440        if (p <= ifh_in.params[1])
    441441          {
    … …  
    469469    for (j = 0; j < p; j++, kd++)
    470470    {
    471       unsigned long doc_diff, count = 0;
     471      mg_u_long doc_diff, count = 0;
    472472      if (kd == in_k)
    473473        kd = 0;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_passes.c

    r16583 r23508  
    103103#define TERMRECORD  '\002'
    104104
    105 unsigned long buf_size = 3 * 1024 * 1024;   /* 3Mb */
    106 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    107 unsigned long ChunkLimit = 0;
     105mg_u_long buf_size = 3 * 1024 * 1024;   /* 3Mb */
     106mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     107mg_u_long ChunkLimit = 0;
    108108char InvfLevel = 2;
    109109char SkipSGML = 0;
    … …  
    117117
    118118static char Passes = 0;
    119 static unsigned long trace = 0;
     119static mg_u_long trace = 0;
    120120static int Dump = 0;
    121121static char **files = NULL;
    … …  
    181181#if 0
    182182static char *
    183 str_comma (unsigned long u)
     183str_comma (mg_u_long u)
    184184{
    185185  static char buf[20];
    186   unsigned long a, b, c, d;
     186  mg_u_long a, b, c, d;
    187187  a = u / 1000000000;
    188188  u -= a * 1000000000;
    … …  
    229229
    230230  char *buffer = Xmalloc (buf_size);
    231   unsigned long num_docs = 0;
    232   unsigned long block_bytes = 0;
     231  mg_u_long num_docs = 0;
     232  mg_u_long block_bytes = 0;
    233233  register int buf_left = buf_size;
    234234  register char *look_pos = buffer;
    … …  
    358358          }
    359359        if (Trace)
    360           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     360          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    361361               bytes_processed, num_docs,
    362362               ElapsedTime (&StartTime, NULL));
    … …  
    383383          mi = mallinfo ();
    384384          block_bytes -= trace;
    385           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     385          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    386386               bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    387387               ElapsedTime (&StartTime, NULL));
    388388#else
    389389          block_bytes -= trace;
    390           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     390          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    391391               bytes_processed, num_docs,
    392392               ElapsedTime (&StartTime, NULL));
    … …  
    439439      struct mallinfo mi;
    440440      mi = mallinfo ();
    441       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     441      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    442442           bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    443443           ElapsedTime (&StartTime, NULL));
    444444#else
    445       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     445      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    446446           bytes_processed, num_docs,
    447447           ElapsedTime (&StartTime, NULL));
    … …  
    563563      break;
    564564    case 't':
    565       trace = (unsigned long) (atof (optarg) * 1024 * 1024);
     565      trace = (mg_u_long) (atof (optarg) * 1024 * 1024);
    566566      break;
    567567    case 'M':

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_passes_4jni.c

    r16583 r23508  
    5757#define TERMRECORD  '\002'
    5858
    59 unsigned long buf_size = 3 * 1024 * 1024;   /* 3Mb */
    60 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    61 unsigned long ChunkLimit = 0;
     59mg_u_long buf_size = 3 * 1024 * 1024;   /* 3Mb */
     60mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     61mg_u_long ChunkLimit = 0;
    6262char InvfLevel = 2;
    6363char SkipSGML = 0;
    … …  
    7171FILE * Trace;
    7272char * filename;
    73 unsigned long num_docs = 0;
    74 unsigned long block_bytes = 0;
     73mg_u_long num_docs = 0;
     74mg_u_long block_bytes = 0;
    7575
    7676static char Passes = 0;
    77 static unsigned long trace = 0;
     77static mg_u_long trace = 0;
    7878static int Dump = 0;
    7979static char **files = NULL;
    … …  
    193193
    194194/* -b arg to mg_passes */
    195 void set_buffer_size(long size) {
     195void set_buffer_size(mg_s_long size) {
    196196  buf_size = size * 1024;
    197197  if (buf_size <  MIN_BUF) {
    … …  
    201201
    202202/* -c arg to mg_passes */
    203 void set_chunk_limit(long chunk_limit) {
     203void set_chunk_limit(mg_s_long chunk_limit) {
    204204  ChunkLimit = chunk_limit;
    205205}
    … …  
    259259/* -t arg to mg_passes */
    260260void set_trace_point(int tracepos) {
    261   trace = (unsigned long) (tracepos * 1024 * 1024);
     261  trace = (mg_u_long) (tracepos * 1024 * 1024);
    262262}
    263263
    … …  
    410410          }
    411411        if (Trace)
    412           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     412          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    413413               bytes_processed, num_docs,
    414414               ElapsedTime (&StartTime, NULL));
    … …  
    435435      mi = mallinfo ();
    436436      block_bytes -= trace;
    437       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     437      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    438438           bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    439439           ElapsedTime (&StartTime, NULL));
    440440#else
    441441      block_bytes -= trace;
    442       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     442      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    443443           bytes_processed, num_docs,
    444444           ElapsedTime (&StartTime, NULL));
    … …  
    492492      struct mallinfo mi;
    493493      mi = mallinfo ();
    494       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     494      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    495495           bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    496496           ElapsedTime (&StartTime, NULL));
    497497#else
    498       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     498      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    499499           bytes_processed, num_docs,
    500500           ElapsedTime (&StartTime, NULL));

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_passes_4jni.h

    r16583 r23508  
    4040
    4141/* -b arg to mg_passes */
    42 void set_buffer_size(long size);
     42void set_buffer_size(mg_s_long size);
    4343
    4444/* -c arg to mg_passes */
    45 void set_chunk_limit(long chunk_limit);
     45void set_chunk_limit(mg_s_long chunk_limit);
    4646
    4747/* -C arg to mg_passes */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_perf_hash_build.c

    r16583 r23508  
    116116{
    117117  FILE *dict, *hash;
    118   unsigned long i;
     118  mg_u_long i;
    119119  u_char prev[MAXSTEMLEN + 1];
    120120  struct invf_dict_header idh;
    … …  
    154154  for (i = 0; i < idh.dict_size; i++)
    155155    {
    156       register unsigned long copy, suff, l;
    157       unsigned long wcnt, fcnt;
     156      register mg_u_long copy, suff, l;
     157      mg_u_long wcnt, fcnt;
    158158
    159159      /* 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  
    6969
    7070
    71 static unsigned long MaxMemInUse = 0;
    72 static unsigned long MemInUse = 0;
     71static mg_u_long MaxMemInUse = 0;
     72static mg_u_long MemInUse = 0;
    7373
    7474static idx_hash_rec **IdxHashTable;
    75 static unsigned long IdxHashSize;
    76 static unsigned long IdxHashUsed;
     75static mg_u_long IdxHashSize;
     76static mg_u_long IdxHashUsed;
    7777static u_char *IdxPool;
    7878static int IdxPoolLeft;
    … …  
    8888int force = 0;
    8989
    90 static long lookback = 4;
     90static mg_s_long lookback = 4;
    9191
    9292static void
    … …  
    216216ReadStemDictBlk (File * stem_file)
    217217{
    218   unsigned long i;
     218  mg_u_long i;
    219219  stemmed_dict *sd;
    220220  u_char *buffer;
    … …  
    357357      register unsigned int res;
    358358      int num_indexes;
    359       unsigned long *first_word, *last_invf_len;
     359      mg_u_long *first_word, *last_invf_len;
    360360      unsigned short *num_words;
    361361      u_char *base;
    … …  
    368368
    369369      /* Move through block header */
    370       first_word = (unsigned long *) (sd->buffer);
     370      first_word = (mg_u_long *) (sd->buffer);
    371371      NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    372       last_invf_len = (unsigned long *) (first_word + 1);
     372      last_invf_len = (mg_u_long *) (first_word + 1);
    373373      NTOHUL(*last_invf_len);  /* [RPAP - Jan 97: Endian Ordering] */
    374374      num_words = (unsigned short *) (last_invf_len + 1);
    … …  
    404404
    405405      /* 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);
    409409
    410410      /* Stem word */
    … …  
    419419        {
    420420          /* Search the idx hash table for word */
    421           register unsigned long hashval, step;
     421          register mg_u_long hashval, step;
    422422          register int hsize = IdxHashSize;
    423423          HASH (hashval, step, word, hsize);
    … …  
    516516        {
    517517          idx_hash_rec **ht;
    518           unsigned long size;
    519           unsigned long i;
     518          mg_u_long size;
     519          mg_u_long i;
    520520          size = prime (IdxHashSize * 2);
    521521          if (!(ht = Xmalloc (sizeof (idx_hash_rec *) * size)))
    … …  
    529529            register u_char *wptr;
    530530            idx_hash_rec *ent;
    531             register unsigned long hashval, step;
     531            register mg_u_long hashval, step;
    532532           
    533533            wptr = IdxHashTable[i]->word;
    … …  
    568568{
    569569  char *FName;
    570   unsigned long i, j, pos, First_word, num;
     570  mg_u_long i, j, pos, First_word, num;
    571571  struct stem_idx_header sih;
    572572  u_char *buffer, *last_word = NULL;
    … …  
    636636  for (i = 0; i < IdxHashUsed; i++)
    637637    {
    638       register unsigned long extra, copy, suff;
     638      register mg_u_long extra, copy, suff;
    639639      register struct idx_hash_rec *ent = IdxHashTable[i];
    640640
    … …  
    765765
    766766  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) +
    768768    sih.num_blocks * sizeof (pos);
    769769  if (force)
    … …  
    784784
    785785  /* skip over the magic number */
    786   fseek (idbi, sizeof (u_long), 0);
     786  fseek (idbi, sizeof (mg_u_long), 0);
    787787
    788788  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    821821  sdh.indexed |= 1 << (stem_method - 1);
    822822  HTONUL(sdh.indexed);
    823   fseek (idb, sizeof (u_long), 0);
     823  fseek (idb, sizeof (mg_u_long), 0);
    824824  fwrite ((char *) &sdh, sizeof (sdh), 1, idb);
    825825  fclose (idb);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_text_estimate.c

    r16583 r23508  
    9191typedef struct stats_t
    9292  {
    93     u_long freq, occur;
    94     u_long len;
     93    mg_u_long freq, occur;
     94    mg_u_long len;
    9595  }
    9696stats_t;
    9797
    98 static u_long huff_count = 0;
    99 static u_long escape_count = 0;
     98static mg_u_long huff_count = 0;
     99static mg_u_long escape_count = 0;
    100100
    101101
    … …  
    106106static double ReadInWordsSpecial (char *name, double *num_bytes,
    107107                  double *num_extra_bytes,
    108                   u_long *aux_compressed);
     108                  mg_u_long *aux_compressed);
    109109
    110110
    … …  
    116116  ProgTime StartTime;
    117117  double num_bytes, num_extra_bytes = 0; /* [RJM 07/97: 4G limit] */
    118   u_long aux_compressed;
     118  mg_u_long aux_compressed;
    119119  int ch;
    120120  double bytes;
    … …  
    207207  compression_stats_header csh;
    208208  FILE *f;
    209   u_long which;
     209  mg_u_long which;
    210210  double bytes, bits = 0;
    211211
    … …  
    246246      if (ht[which])
    247247        {
    248           register unsigned long hashval, step;
     248          register mg_u_long hashval, step;
    249249          register int tsize = ht[which]->size;
    250250          register u_char **wptr;
    … …  
    335335  bits += 5.5 * csh.num_docs;
    336336
    337   bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (u_long);
     337  bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (mg_u_long);
    338338
    339339  *num_bytes = csh.num_bytes;
    … …  
    356356ReadInWordsSpecial (char *name, double *num_bytes,
    357357            double *num_extra_bytes,
    358             u_long *aux_compressed)
     358            mg_u_long *aux_compressed)
    359359{
    360360  compression_stats_header csh;
    361361  FILE *f;
    362   u_long magic, which;
     362  mg_u_long magic, which;
    363363  double bytes, bits = 0;
    364364  double size[2];
    … …  
    386386      frags_stats_header fsh;
    387387      int j, num = 0;
    388       long lens[16], chars[256];
     388      mg_s_long lens[16], chars[256];
    389389
    390390      bzero ((char *) lens, sizeof (lens));
    … …  
    420420      if (ht[which])
    421421        {
    422           register unsigned long hashval, step;
     422          register mg_u_long hashval, step;
    423423          register int tsize = ht[which]->size;
    424424          register u_char **wptr;
    … …  
    489489    int j, num_buckets = 0;
    490490    int start[10], end[10];
    491     long flens[16], fchars[256];
     491    mg_u_long flens[16], fchars[256];
    492492
    493493    for (j = 0; j < 256; j++)
    … …  
    577577  bits += 5.5 * csh.num_docs;
    578578
    579   bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (u_long);
     579  bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (mg_u_long);
    580580
    581581  *num_bytes = csh.num_bytes;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_text_merge.c

    r16583 r23508  
    4343FileName old_name, new_name, merge_name;
    4444
    45 long magicsize;         /* == where the header in a file begins */
     45mg_s_long magicsize;            /* == where the header in a file begins */
    4646
    4747compressed_text_header cth[3];
    … …  
    100100{
    101101  int i;
    102   u_long data, offset;
     102  mg_u_long data, offset;
    103103  byte c;
    104104
    … …  
    135135  for (i = 0; i < cth[OLD].num_of_docs; i++)
    136136    {
    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]);
    139139    }
    140140
    141141  /* 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]);
    143143  NTOHUL(offset);  /* [RPAP - Jan 97: Endian Ordering] */
    144144  offset -= (4 + sizeof (cth[OLD]));    /* 4 for the magic number */
    … …  
    146146  for (i = 0; i < cth[NEW].num_of_docs; i++)
    147147    {
    148       fread (&data, sizeof (u_long), 1, idx[NEW]);
     148      fread (&data, sizeof (mg_u_long), 1, idx[NEW]);
    149149      NTOHUL(data);  /* [RPAP - Jan 97: Endian Ordering] */
    150150      data += offset;
    151151      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]);
    153153    }
    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]);
    156156  NTOHUL(data);  /* [RPAP - Jan 97: Endian Ordering] */
    157157  data += offset;
    158158  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]);
    160160
    161161/******* update .text *******/
    … …  
    188188  fclose (idx[NEW]);
    189189
    190   fprintf (stderr, "mg_text_merge: %ld documents added to %s\n",
     190  fprintf (stderr, "mg_text_merge: %d documents added to %s\n",
    191191       cth[NEW].num_of_docs, merge_name);
    192192

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mg_weights_build.c

    r16583 r23508  
    3838#include "words.h"
    3939
    40 #define MAXBITS (sizeof(unsigned long) * 8)
     40#define MAXBITS (sizeof(mg_u_long) * 8)
    4141
    4242/*
    … …  
    8181static char *file_name = "";
    8282static char *text_file_name = "";
    83 static unsigned long NumPara = 0;
    84 static unsigned long StaticNumOfDocs = 0;
    85 
    86 unsigned long get_NumPara (void);
    87 unsigned long get_StaticNumOfDocs (void);
     83static mg_u_long NumPara = 0;
     84static mg_u_long StaticNumOfDocs = 0;
     85
     86mg_u_long get_NumPara (void);
     87mg_u_long get_StaticNumOfDocs (void);
    8888void GenerateWeights (void);
    8989void Make_weight_approx (void);
    … …  
    141141
    142142
    143 unsigned long
     143mg_u_long
    144144get_NumPara (void)
    145145{
    … …  
    158158
    159159
    160 unsigned long
     160mg_u_long
    161161get_StaticNumOfDocs (void)
    162162/* the static number of documents is the N parameter used to
    … …  
    253253    {
    254254      u_char dummy1, dummy2[MAXSTEMLEN + 1];
    255       unsigned long fcnt, wcnt, blk, CurrDoc, p, j;
     255      mg_u_long fcnt, wcnt, blk, CurrDoc, p, j;
    256256      float idf;
    257257
    … …  
    281281      /* check the inverted file index entry for this word */
    282282      {
    283     unsigned long loc;
     283    mg_u_long loc;
    284284    fread ((char *) &loc, sizeof (loc), 1, idx);
    285285    NTOHUL(loc);  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    292292      for (j = 0; j < p; j++)
    293293    {
    294       unsigned long x, tf;
     294      mg_u_long x, tf;
    295295      BBLOCK_DECODE (x, blk);
    296296      CurrDoc += x;
    … …  
    346346{
    347347  int i, pos, max;
    348   unsigned long buf;
     348  mg_u_long buf;
    349349  double U, L, B;
    350350  FILE *approx, *exact;
    … …  
    368368
    369369    }
    370   fseek (exact, sizeof (u_long), SEEK_SET);
     370  fseek (exact, sizeof (mg_u_long), SEEK_SET);
    371371
    372372  B = pow (U / L, pow (2.0, -(double) bits));
    … …  
    392392  for (buf = pos = i = 0; i < NumPara; i++)
    393393    {
    394       unsigned long fx;
     394      mg_u_long fx;
    395395      float wgt;
    396396      fread ((char *) &wgt, sizeof (wgt), 1, exact);
    … …  
    476476    struct
    477477      {
    478     unsigned long Start;
     478    mg_u_long Start;
    479479    float Weight;
    480480      }
    … …  
    483483      {
    484484    int count;
    485     fread ((char *) &data.Start, sizeof (unsigned long), 1, idx);
     485    fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx);
    486486    if (para && i < cth.num_of_docs)
    487487      {
    … …  
    502502      }
    503503    /* Write out the extra entry for the idx file */
    504     fread ((char *) &data.Start, sizeof (unsigned long), 1, idx);
     504    fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx);
    505505    data.Weight = 0;
    506506    fwrite((char*)&data, sizeof(data), 1, idx_wgt);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgdictlist.c

    r16583 r23508  
    7373int quick = 0;
    7474int no_of_words[2];
    75 u_long maxcodelen[2];
     75mg_u_long maxcodelen[2];
    7676
    7777char *dictname = "";
    … …  
    102102
    103103  if (quick)
    104     printf ("%ld\n", idh.dict_size);
     104    printf ("%d\n", idh.dict_size);
    105105  else
    106106    {
    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);
    111111      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);
    115115      printf ("#\n");
    116116    }
    … …  
    118118  for (i = 0; i < idh.dict_size; i++)
    119119    {
    120       register unsigned long copy, suff;
    121       unsigned long wcnt, fcnt;
     120      register mg_u_long copy, suff;
     121      mg_u_long wcnt, fcnt;
    122122
    123123      /* build a new word on top of prev */
    … …  
    137137      if (!quick)
    138138    {
    139       printf ("%d: %8ld ", i, wcnt);
    140       printf ("/ %5ld ", fcnt);
    141       printf ("%2d %2ld\t\"", *prev, copy);
     139      printf ("%d: %8d ", i, wcnt);
     140      printf ("/ %5d ", fcnt);
     141      printf ("%2d %2d\t\"", *prev, copy);
    142142    }
    143143      printf ("%s", word2str (prev));
    144144      if (quick)
    145     printf (" %ld %ld\n", wcnt, fcnt);
     145    printf (" %d %d\n", wcnt, fcnt);
    146146      else
    147147    {
    … …  
    159159{
    160160  comp_frags_header cfh;
    161   u_long *codes;
     161  mg_u_long *codes;
    162162  u_char prev[MAXSTEMLEN + 1];
    163163  int i;
    … …  
    168168  printf ("#\n");
    169169  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);
    171171  printf ("#\n");
    172172
    … …  
    202202  int i;
    203203  huff_data hd;
    204   u_long *codes;
     204  mg_u_long *codes;
    205205
    206206  if (Read_Huffman_Data (f, &hd, NULL, NULL) == -1)
    … …  
    232232  int i;
    233233  huff_data hd;
    234   u_long *codes;
     234  mg_u_long *codes;
    235235
    236236  if (Read_Huffman_Data (f, &hd, NULL, NULL) == -1)
    … …  
    280280      break;
    281281    }
    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);
    287287
    288288  for (which = 0; which < 2; which++)
    … …  
    338338
    339339      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",
    341341        fsh.num_frags);
    342342
    … …  
    344344    {
    345345      u_char Word[16];
    346       u_long freq, occur_num;
     346      mg_u_long freq, occur_num;
    347347
    348348      fread (&freq, sizeof (freq), 1, f);
    … …  
    355355      Word[0] = fgetc (f);
    356356      fread (Word + 1, Word[0], 1, f);
    357       printf ("%d: %7ld : %7ld : \"%s\"\n", j, freq,
     357      printf ("%d: %7d : %7d : \"%s\"\n", j, freq,
    358358          occur_num, word2str (Word));
    359359    }
    … …  
    365365{
    366366  FILE *fp;
    367   unsigned long magic = 0;
     367  mg_u_long magic = 0;
    368368
    369369  if (argc < 2)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgpass.c

    r16583 r23508  
    100100#define path_length 256
    101101
    102 unsigned long buf_size = 3 * 1024 * 1024;       /* 3Mb */
    103 unsigned long invf_buffer_size = 5 * 1024 * 1024;       /* 5Mb */
    104 unsigned long ChunkLimit = 0;
     102mg_u_long buf_size = 3 * 1024 * 1024;       /* 3Mb */
     103mg_u_long invf_buffer_size = 5 * 1024 * 1024;       /* 5Mb */
     104mg_u_long ChunkLimit = 0;
    105105char InvfLevel = 2;
    106106char SkipSGML = 0;
    … …  
    115115
    116116static char Passes = 0;
    117 static unsigned long trace = 0;
     117static mg_u_long trace = 0;
    118118static int Dump = 0;
    119119static char **files = NULL;
    … …  
    237237void search(char *dname, char *fname)
    238238{
    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;
    240240  char search_name[path_length], found_name[path_length];
    241241
    … …  
    433433      break;
    434434    case 't':
    435       trace = (unsigned long) (atof (optarg) * 1024 * 1024);
     435      trace = (mg_u_long) (atof (optarg) * 1024 * 1024);
    436436      break;
    437437    case 'h':

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgquery.c

    r16583 r23508  
    143143#ifdef TREC_MODE
    144144char *trec_ids = NULL;
    145 long *trec_paras = NULL;
     145mg_s_long *trec_paras = NULL;
    146146#endif
    147147
    … …  
    264264
    265265#ifdef USE_PROCESS_MEM
    266 static u_long
     266static mg_u_long
    267267process_mem (void)
    268268{
    … …  
    272272    {
    273273      char buf[128];
    274       sprintf (buf, "/proc/%ld", (long) getpid ());
     274      sprintf (buf, "/proc/%d", (mg_s_long) getpid ());
    275275      fd = open (buf, O_RDONLY);
    276276    }
    … …  
    347347StatFile (File * F)
    348348{
    349   static unsigned long NumBytes = 0, NumSeeks = 0, NumReads = 0;
     349  static mg_u_long NumBytes = 0, NumSeeks = 0, NumReads = 0;
    350350  if (F)
    351351    {
    352       if ((int) F != -1)
     352      if ((intptr_t) F != -1)
    353353    {
    354354      if (!BooleanEnv (GetEnv ("briefstats"), 0))
    … …  
    533533/* num should be greater than or equal to 1 */
    534534int
    535 RawDocOutput (query_data * qd, u_long num, FILE * Output)
    536 {
    537   static u_long last_pos = 0;
     535RawDocOutput (query_data * qd, mg_u_long num, FILE * Output)
     536{
     537  static mg_u_long last_pos = 0;
    538538  static u_char *c_buffer = 0;
    539539  static int buf_len = -1;
    540540  static u_char *uc_buffer = 0;
    541   u_long pos, len;
     541  mg_u_long pos, len;
    542542  int ULen;
    543543
    … …  
    570570void
    571571StringOut (FILE * Output, char *string,
    572        int intvalid, unsigned long intval,
     572       int intvalid, mg_u_long intval,
    573573       int floatvalid, double floatval)
    574574{
    … …  
    583583      case 'n':
    584584        if (intvalid)
    585           fprintf (Output, "%lu", intval);
     585          fprintf (Output, "%d", intval);
    586586        else
    587587          fprintf (Output, "%%n");
    … …  
    603603
    604604void
    605 HeaderOut (FILE * Output, u_char * UDoc, unsigned long ULen, int heads_length)
     605HeaderOut (FILE * Output, u_char * UDoc, mg_u_long ULen, int heads_length)
    606606{
    607607  int i, space = 1, num = 0;
    … …  
    688688    {
    689689      u_char *UDoc = NULL;
    690       unsigned long ULen;
     690      mg_u_long ULen;
    691691
    692692      if (need_text)
    … …  
    760760            }
    761761#else
    762         fprintf (Output, "%7d   %6.4f   %7lu\n", GetDocNum (qd),
     762        fprintf (Output, "%7d   %6.4f   %7u\n", GetDocNum (qd),
    763763             GetDocWeight (qd), GetDocCompLength (qd));
    764764#endif
    … …  
    776776          if (PagerRunning && trec_ids)
    777777        {
    778           long DN, PN = GetDocNum (qd) - 1;
     778          mg_s_long DN, PN = GetDocNum (qd) - 1;
    779779          if (trec_paras)
    780780            DN = trec_paras[PN];
    781781          else
    782782            DN = PN;
    783           fprintf (Output, "%-14.14s  %8ld  %10.5f\n",
     783          fprintf (Output, "%-14.14s  %8d  %10.5f\n",
    784784               &trec_ids[DN * 14], PN + 1, GetDocWeight (qd));
    785785        }
    … …  
    991991      return;
    992992    }
    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",
    994994           HILITE_PAGER,
    995995           GetEnv ("hilite_style"),

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgstat.c

    r16583 r23508  
    7070void ProcessDict (char *);
    7171void ProcessStem (char *);
    72 long ProcessStemBlk (char *name);  /* [RPAP - Jan 97: Stem Index Change] */
     72mg_s_long ProcessStemBlk (char *name);  /* [RPAP - Jan 97: Stem Index Change] */
    7373
    7474static mg_ullong inputbytes = 0;
    … …  
    8686  int ch;
    8787  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] */
    8989  opterr = 0;
    9090  while ((ch = getopt (argc, argv, "Ehf:d:")) != -1)
    … …  
    258258    {
    259259      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",
    261261          cth.num_of_bytes, (double) cth.num_of_bytes / 1024 / 1024);
    262       printf ("Documents                          : %10lu\n", cth.num_of_docs);
    263       printf ("Words in collection [dict]         : %10lu\n", cth.num_of_words);
    264       printf ("Longest doc in collection [dict]   : %10lu characters\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",
    265265          cth.length_of_longest_doc);
    266266      printf ("Maximum ratio                      : %10.2f\n", cth.ratio);
    … …  
    269269  if (have_cdh)
    270270    {
    271       printf ("Words in dict                      : %10lu\n", cdh.num_words[1]);
    272       printf ("Non-words in dict                  : %10lu\n", cdh.num_words[0]);
    273       printf ("Total chars of distinct words      : %10lu\n", cdh.num_word_chars[1]);
    274       printf ("Total chars of distinct non-words  : %10lu\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]);
    275275    }
    276276
    … …  
    294294    return;
    295295  fread ((char *) &idh, sizeof (idh), 1, f);
    296   printf ("Words in collection [stem]         : %10ld\n", NTOHUL(idh.num_of_words));  /* [RPAP - Jan 97: Endian Ordering] */
    297   printf ("Words in stem                      : %10ld\n", NTOHUL(idh.dict_size));  /* [RPAP - Jan 97: Endian Ordering] */
    298   printf ("Indexed fragments                  : %10ld\n", NTOHUL(idh.num_of_docs));  /* [RPAP - Jan 97: Endian Ordering] */
    299   printf ("Total chars of stem words          : %10ld\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] */
    300300  fclose (f);
    301301}
    … …  
    306306
    307307/* [RPAP - Jan 97: Stem Index Change] */
    308 long
     308mg_s_long
    309309ProcessStemBlk (char *name)
    310310{

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/mgstemidxlist.c

    r16583 r23508  
    3636read_3_in_4 (FILE * idbi)
    3737{
    38   unsigned long i;
     38  mg_u_long i;
    3939  stemmed_idx *si;
    4040  u_char *buffer;
    … …  
    106106    }
    107107
    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);
    114114
    115115  block = 0;
    116116  while (block < si->sih.num_blocks)
    117117    {
    118       unsigned long *first_word;
     118      mg_u_long *first_word;
    119119      unsigned short *num_words;
    120120      unsigned short *index;
    121       long res;
     121      mg_s_long res;
    122122      u_char *base;
    123123      int num_indexes;
    … …  
    128128      si->active = si->pos[block];
    129129
    130       first_word = (unsigned long *) (si->buffer);
     130      first_word = (mg_u_long *) (si->buffer);
    131131      NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    132132      num_words = (unsigned short *) (first_word + 1);
    … …  
    143143
    144144      printf ("\n# block      = %d\n", block);
    145       printf ("# first_word = %lu\n", *first_word);
     145      printf ("# first_word = %u\n", *first_word);
    146146      printf ("# num_words  = %u\n", *num_words);
    147147

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/query.docnums.c

    r16583 r23508  
    6464{
    6565  DocList *Docs = MakeDocList (0);
    66   unsigned long start = 0, finish;
     66  mg_u_long start = 0, finish;
    6767  int range = 0; /* is there a range or not ? */
    6868
    … …  
    7575      finish <= qd->sd->sdh.num_of_docs)
    7676    {
    77       unsigned long i;
     77      mg_u_long i;
    7878      if (!range)
    7979        start = finish;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/query.ranked.c

    r16583 r23508  
    8989    float *OrgWeight;
    9090    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 */
    9393  }
    9494HeapEntry;
    … …  
    290290    {
    291291      int j;
    292       long num_entries, word_num;
    293       unsigned long 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;
    294294      int weight_to_apply, stem_to_apply;
    295295      int method_using = -1;
    … …  
    408408        {
    409409          int i;
    410           u_long max_doc_count = 0;
     410          mg_u_long max_doc_count = 0;
    411411
    412412          /* get the maximum doc count */
    … …  
    748748        for (i = 0; i < ST->no_of_items; i++, ide = SP_get_next (ST))
    749749          {
    750         u_long SeekPos, Len;
     750        mg_u_long SeekPos, Len;
    751751        float Weight;
    752752        if (!ide->Sum)
    … …  
    777777        for (i = 0; i < qd->sd->sdh.num_of_docs; i++, fptr++)
    778778          {
    779         u_long SeekPos, Len;
     779        mg_u_long SeekPos, Len;
    780780        float Weight;
    781781        if (!*fptr)
    … …  
    803803        for (ideh = HT->Head; ideh; ideh = ideh->next)
    804804          {
    805         u_long SeekPos, Len;
     805        mg_u_long SeekPos, Len;
    806806        float Weight;
    807807        if (!ideh->IDE.Sum)
    … …  
    829829        for (i = 0; i < LT->num; i++, ide++)
    830830          {
    831         u_long SeekPos, Len;
     831        mg_u_long SeekPos, Len;
    832832        float Weight;
    833833        if (!ide->Sum)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/stem_search.c

    r16583 r23508  
    8383ReadStemDictBlk (File * stem_file)
    8484{
    85   unsigned long i;
     85  mg_u_long i;
    8686  stemmed_dict *sd;
    8787  u_char *buffer;
    … …  
    173173ReadStemIdxBlk (File * stem_idx_file)
    174174{
    175   unsigned long i;
     175  mg_u_long i;
    176176  stemmed_idx *si;
    177177  u_char *buffer;
    … …  
    300300 * This function looks up a word in the stemmed dictionary, it returns -1
    301301 * if the word cound not be found, and 0 if it successfully finds the word.
    302  * If count is non-null the ulong it is pointing to is set to the number of
     302 * If count is non-null the unsigned it is pointing to is set to the number of
    303303 * occurances of the stemmed word in the collection. i.e wcnt.
    304  * If doc_count is non-null the ulong it is pointing to is set to the number
     304 * If doc_count is non-null the unsigned it is pointing to is set to the number
    305305 * of documents that the word occurs in. i.e fcnt
    306  * If invf_ptr is non-null the ulong it is pointing to is set to the position
     306 * If invf_ptr is non-null the unsigned it is pointing to is set to the position
    307307 * of the inverted file where the entry for this word start.
    308308 */
    309309int
    310 FindWord (stemmed_dict * sd, u_char * Word, unsigned long *count,
    311       unsigned long *doc_count, unsigned long *invf_ptr,
    312       unsigned long *invf_len)
     310FindWord (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)
    313313{
    314314  register int lo, hi, mid, c;
    315315  register unsigned int res;
    316316  int block, num_indexes;
    317   unsigned long *first_word, *last_invf_len;
     317  mg_u_long *first_word, *last_invf_len;
    318318  unsigned short *num_words;
    319319  u_char *base;
    … …  
    332332
    333333      /* [RPAP - Jan 97: Endian Ordering] */
    334       first_word = (unsigned long *) (sd->buffer);
     334      first_word = (mg_u_long *) (sd->buffer);
    335335      NTOHUL(*first_word);
    336       last_invf_len = (unsigned long *) (first_word + 1);
     336      last_invf_len = (mg_u_long *) (first_word + 1);
    337337      NTOHUL(*last_invf_len);
    338338      num_words = (unsigned short *) (last_invf_len + 1);
    … …  
    346346  else
    347347    {
    348       first_word = (unsigned long *) (sd->buffer);
    349       last_invf_len = (unsigned long *) (first_word + 1);
     348      first_word = (mg_u_long *) (sd->buffer);
     349      last_invf_len = (mg_u_long *) (first_word + 1);
    350350      num_words = (unsigned short *) (last_invf_len + 1);
    351351      index = num_words + 1;
    … …  
    379379    {
    380380      unsigned copy, suff;
    381       unsigned long invfp;
     381      mg_u_long invfp;
    382382      if (res >= *num_words)
    383383    return (-1);
    … …  
    417417    {
    418418      /* Calculate invf_len is necessary */
    419       unsigned long next_invfp;
     419      mg_u_long next_invfp;
    420420      if (!invf_len)
    421421        return (*first_word + res);
    … …  
    432432      base++;
    433433      suff = *base++;
    434       base += suff + sizeof (unsigned long) * 2;
     434      base += suff + sizeof (mg_u_long) * 2;
    435435      bcopy ((char *) base, (char *) &next_invfp, sizeof (next_invfp));
    436436      NTOHUL(next_invfp);  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    453453
    454454  int block, num_indexes;
    455   unsigned long *first_word, *last_invf_len;
     455  mg_u_long *first_word, *last_invf_len;
    456456  unsigned short *num_words;
    457457  u_char *base;
    … …  
    460460
    461461  int idx_block, idx_num_indexes;
    462   unsigned long *idx_first_word;
     462  mg_u_long *idx_first_word;
    463463  unsigned short *idx_num_words;
    464464  u_char *idx_base;
    … …  
    512512      si->active = si->pos[idx_block];
    513513
    514       idx_first_word = (unsigned long *) (si->buffer);
     514      idx_first_word = (mg_u_long *) (si->buffer);
    515515      NTOHUL(*idx_first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    516516      idx_num_words = (unsigned short *) (idx_first_word + 1);
    … …  
    525525  else
    526526    {
    527       idx_first_word = (unsigned long *) (si->buffer);
     527      idx_first_word = (mg_u_long *) (si->buffer);
    528528      idx_num_words = (unsigned short *) (idx_first_word + 1);
    529529      idx_index = idx_num_words + 1;
    … …  
    591591    {
    592592      unsigned copy, suff;
    593       unsigned long invfp;
     593      mg_u_long invfp;
    594594      /* Read next stem index pos */
    595595      bcopy ((char *) idx_base, (char *) &num_cases, sizeof (num_cases));
    … …  
    613613      sd->active = sd->pos[block];
    614614
    615       first_word = (unsigned long *) (sd->buffer);
     615      first_word = (mg_u_long *) (sd->buffer);
    616616      NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    617       last_invf_len = (unsigned long *) (first_word + 1);
     617      last_invf_len = (mg_u_long *) (first_word + 1);
    618618      NTOHUL(*last_invf_len);  /* [RPAP - Jan 97: Endian Ordering] */
    619619      num_words = (unsigned short *) (last_invf_len + 1);
    … …  
    628628      else
    629629    {
    630       first_word = (unsigned long *) (sd->buffer);
    631       last_invf_len = (unsigned long *) (first_word + 1);
     630      first_word = (mg_u_long *) (sd->buffer);
     631      last_invf_len = (mg_u_long *) (first_word + 1);
    632632      num_words = (unsigned short *) (last_invf_len + 1);
    633633      index = num_words + 1;
    … …  
    646646      base += suff;
    647647      *prev = copy + suff;
    648       base += sizeof (unsigned long);   /* skip doc_count */
    649       base += sizeof (unsigned long);   /* skip count */
    650       base += sizeof (unsigned long);   /* 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 */
    651651      res++;
    652652    }
    … …  
    694694      else
    695695        {
    696           unsigned long next_invfp;
     696          mg_u_long next_invfp;
    697697          u_char *oldbase = base;
    698698         
    … …  
    700700          base++;
    701701          suff = *base++;
    702           base += suff + sizeof (unsigned long) * 2;
     702          base += suff + sizeof (mg_u_long) * 2;
    703703          bcopy ((char *) base, (char *) &next_invfp, sizeof (next_invfp));
    704704          NTOHUL(next_invfp);  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    720720          sd->active = sd->pos[block];
    721721
    722           first_word = (unsigned long *) (sd->buffer);
     722          first_word = (mg_u_long *) (sd->buffer);
    723723          NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    724           last_invf_len = (unsigned long *) (first_word + 1);
     724          last_invf_len = (mg_u_long *) (first_word + 1);
    725725          NTOHUL(*last_invf_len);  /* [RPAP - Jan 97: Endian Ordering] */
    726726          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  
    2929stemmed_idx *ReadStemIdxBlk (File * stem_idx_file);
    3030
    31 int FindWord (stemmed_dict * sd, u_char * Word, unsigned long *count,
    32           unsigned long *doc_count, unsigned long *invf_ptr,
    33           unsigned long *invf_len);
     31int 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);
    3434
    3535/* [RPAP - Jan 97: Stem Index Change] */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/term_lists.c

    r16583 r23508  
    200200int
    201201AddTerm (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] */
    203203{
    204204  int j;
    … …  
    283283{
    284284  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);
    290290}
    291291

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/term_lists.h

    r16583 r23508  
    5959  {
    6060    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 the 
     61    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 
    6565                   inverted file entry corresponding to the word */
    66     u_long invf_len;        /* This is the length of the inverted
     66    mg_u_long invf_len;     /* This is the length of the inverted
    6767                   file entry in bytes */
    6868  }
    … …  
    9393int AddTermEntry (TermList ** query_term_list, TermEntry * te);
    9494int 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] */
    9696         int stemmer_num); 
    9797void ResetTermList (TermList ** tl);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text.h

    r16583 r23508  
    117117typedef struct compression_dict_header
    118118  {
    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;
    125125  }
    126126compression_dict_header;
    … …  
    130130  {
    131131    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];
    134134  }
    135135comp_frags_header;
    … …  
    139139typedef struct compressed_text_header
    140140  {
    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 */
    143143    double num_of_bytes; /* [RJM 07/97: 4G limit] */
    144144    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 */
    147147  }
    148148compressed_text_header;
    … …  
    151151typedef struct compression_stats_header
    152152  {
    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 */
    155155    double num_bytes; /* [RJM 07/97: 4G limit] */
    156156  }
    … …  
    160160typedef struct frags_stats_header
    161161  {
    162     u_long num_frags;
    163     u_long mem_for_frags;
     162    mg_u_long num_frags;
     163    mg_u_long mem_for_frags;
    164164  }
    165165frags_stats_header;
    … …  
    168168typedef struct aux_frags_header
    169169  {
    170     u_long num_frags;
    171     u_long mem_for_frags;
     170    mg_u_long num_frags;
     171    mg_u_long mem_for_frags;
    172172  }
    173173aux_frags_header;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text.pass1.c

    r16583 r23508  
    5050typedef struct hash_rec
    5151  {
    52     unsigned long wcnt;     /* word frequency */
    53     unsigned long occurance_num;
     52    mg_u_long wcnt;     /* word frequency */
     53    mg_u_long occurance_num;
    5454    u_char *word;
    5555  }
    … …  
    5959  {
    6060    hash_rec *HashTable;
    61     unsigned long HashSize;
    62     unsigned long HashUsed;
    63     unsigned long wordnum;
    64     unsigned long words_read;
    65     unsigned long 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;
    6666    huff_data hd;
    6767  }
    … …  
    7070
    7171
    72 static unsigned long LongestDoc = 0;
    73 static unsigned long occurance_num = 0;
     72static mg_u_long LongestDoc = 0;
     73static mg_u_long occurance_num = 0;
    7474static dict_data DictData[2];
    7575
    … …  
    7777static int PoolLeft;
    7878static double inputbytes = 0; /* [RJM 07/97: 4G limit] */
    79 static unsigned long MaxMemInUse = 0;
    80 static unsigned long MemInUse = 0;
     79static mg_u_long MaxMemInUse = 0;
     80static mg_u_long MemInUse = 0;
    8181static compression_stats_header csh =
    8282{0, 0.0}; /* [RJM 07/97: 4G limit] */
    … …  
    131131    register u_char *wptr;
    132132    register int hsize = dd->HashSize;
    133     register unsigned long hashval, step;
     133    register mg_u_long hashval, step;
    134134
    135135    HASH (hashval, step, word, hsize);
    … …  
    189189      /* Search the hash table for Word */
    190190      {
    191     register unsigned long hashval, step;
     191    register mg_u_long hashval, step;
    192192    register int hsize = dd->HashSize;
    193193    HASH (hashval, step, Word, hsize);
    … …  
    248248    {
    249249      hash_rec *ht;
    250       unsigned long size;
    251       unsigned long i;
     250      mg_u_long size;
     251      mg_u_long i;
    252252      size = prime (dd->HashSize * 2);
    253253      if (!(ht = Xmalloc (sizeof (hash_rec) * size)))
    … …  
    263263          {
    264264        register u_char *wptr;
    265         register unsigned long hashval, step;
     265        register mg_u_long hashval, step;
    266266
    267267        wptr = dd->HashTable[i].word;
    … …  
    325325{
    326326  frags_stats_header fsh;
    327   u_long j = 0;
     327  mg_u_long j = 0;
    328328  u_char *curr;
    329329

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text.pass2.c

    r16583 r23508  
    8282  {
    8383    struct char_pool *next;
    84     u_long left;
     84    mg_u_long left;
    8585    u_char *ptr;
    8686    u_char pool[POOL_SIZE];
    … …  
    9090typedef struct novel_hash_rec
    9191  {
    92     u_long ordinal_num;
     92    mg_u_long ordinal_num;
    9393    u_char *word;
    9494  }
    … …  
    102102  {
    103103    novel_hash_rec *HashTable;
    104     u_long HashSize, HashUsed;
     104    mg_u_long HashSize, HashUsed;
    105105    char_pool *first_pool;
    106106    char_pool *pool;
    107     u_long next_num, binary_start;
     107    mg_u_long next_num, binary_start;
    108108    novel_hash_rec **code_to_nhr;
    109109  }
    … …  
    115115static u_char *comp_buffer;
    116116
    117 static u_long text_length;
     117static mg_u_long text_length;
    118118
    119119/* [RJM 07/97: 4G limit] */
    … …  
    125125static novel_hash_table nht[2];
    126126
    127 static u_long prefix_len = 0;
     127static mg_u_long prefix_len = 0;
    128128
    129129int blk_start[2][33], blk_end[2][33];
    … …  
    165165    return COMPERROR;
    166166
    167   text_length = sizeof (u_long) + sizeof (cth);
     167  text_length = sizeof (mg_u_long) + sizeof (cth);
    168168
    169169  if (!(text_idx = create_file (file_name, TEXT_IDX_SUFFIX, "w+b",
    … …  
    287287      if (ht[which])
    288288    {
    289       register unsigned long hashval, step;
     289      register mg_u_long hashval, step;
    290290      register int tsize = ht[which]->size;
    291291      register u_char **wptr;
    … …  
    336336      if (cdh.dict_type == MG_PARTIAL_DICTIONARY)
    337337        {
    338           u_long i;
     338          mg_u_long i;
    339339          if (ht[which])
    340340        {
    … …  
    358358        case MG_NOVEL_HUFFMAN_CHARS:
    359359          {
    360             u_long i;
     360            mg_u_long i;
    361361            HUFF_ENCODE (Word[0], lens_codes[which],
    362362                 lens_huff[which].clens);
    … …  
    371371        case MG_NOVEL_HYBRID_MTF:
    372372          {
    373             register unsigned long hashval, step;
     373            register mg_u_long hashval, step;
    374374            register novel_hash_table *h = &nht[which];
    375375            register int hsize = h->HashSize;
    … …  
    481481              {
    482482            novel_hash_rec *ht;
    483             unsigned long size;
    484             unsigned long i;
     483            mg_u_long size;
     484            mg_u_long i;
    485485            size = prime (h->HashSize * 2);
    486486            if (cdh.novel_method == MG_NOVEL_HYBRID_MTF)
    … …  
    501501                {
    502502                  register u_char *wptr;
    503                   register unsigned long hashval, step;
     503                  register mg_u_long hashval, step;
    504504
    505505                  wptr = h->HashTable[i].word;
    … …  
    674674{
    675675  int i;
    676   u_long aux_compressed = 0, total_uncomp = 0;
     676  mg_u_long aux_compressed = 0, total_uncomp = 0;
    677677  for (i = 0; i <= 1; i++)
    678678    {
    679679      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];
    682682      char_pool *cp;
    683683      bzero ((char *) chars, sizeof (chars));
    … …  
    743743  HTOND(cth.ratio);
    744744
    745   if (fseek (text_idx, sizeof (u_long), SEEK_SET) == -1 ||
     745  if (fseek (text_idx, sizeof (mg_u_long), SEEK_SET) == -1 ||
    746746      fwrite (&cth, sizeof (cth), 1, text_idx) != 1)
    747747    return COMPERROR;
    748748  fclose (text_idx);
    749749
    750   if (fseek (text, sizeof (u_long), SEEK_SET) == -1 ||
     750  if (fseek (text, sizeof (mg_u_long), SEEK_SET) == -1 ||
    751751      fwrite (&cth, sizeof (cth), 1, text) != 1)
    752752    return COMPERROR;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text_get.c

    r16583 r23508  
    8484
    8585static double
    86 FetchDocStartLev1 (text_data * td, u_long DN,
    87            u_long * seek_pos, u_long * len)
    88 {
    89   unsigned long data[2];
     86FetchDocStartLev1 (text_data * td, mg_u_long DN,
     87           mg_u_long * seek_pos, mg_u_long * len)
     88{
     89  mg_u_long data[2];
    9090  /* [TS:Sep/94] Fixed up the seek call to give the correct offset */
    9191  Fseek (td->TextIdxFile,
    92      sizeof (unsigned long) * (DN - 1) +    /* the doc offsets */
    93      sizeof (unsigned long) +   /* the magic number */
     92     sizeof (mg_u_long) * (DN - 1) +    /* the doc offsets */
     93     sizeof (mg_u_long) +   /* the magic number */
    9494     sizeof (compressed_text_header),   /* the header */
    9595     0);
    … …  
    108108
    109109static int
    110 LoadIdx (text_data * td, unsigned long DN)
     110LoadIdx (text_data * td, mg_u_long DN)
    111111{
    112112  if (!td->idx_data)
    … …  
    121121      int i, num;  /* [RPAP - Jan 97: Endian Ordering] */
    122122
    123       long rn = (long) DN - (MG_PAGE_SIZE >> 1);
     123      mg_s_long rn = (mg_s_long) DN - (MG_PAGE_SIZE >> 1);
    124124      if (rn < 1)
    125125    rn = 1;
    126       Fseek (td->TextIdxWgtFile, (sizeof (unsigned long) + sizeof (float)) *
    127            (rn - 1) + sizeof (unsigned long), 0);
     126      Fseek (td->TextIdxWgtFile, (sizeof (mg_u_long) + sizeof (float)) *
     127           (rn - 1) + sizeof (mg_u_long), 0);
    128128      num = Fread ((char *) td->idx_data, sizeof (*(td->idx_data)), MG_PAGE_SIZE, /* [RPAP - Jan 97: Endian Ordering] */
    129129           td->TextIdxWgtFile);
    … …  
    142142
    143143static double
    144 FDSL2 (text_data * td, unsigned long DN, unsigned long *Pos)
    145 {
    146   unsigned long pos = LoadIdx (td, DN);
     144FDSL2 (text_data * td, mg_u_long DN, mg_u_long *Pos)
     145{
     146  mg_u_long pos = LoadIdx (td, DN);
    147147  *Pos = td->idx_data[pos].Start;
    148148  return (td->idx_data[pos].Weight);
    … …  
    151151
    152152static double
    153 FetchDocStartLev2 (text_data * td, u_long DN,
    154            u_long * seek_pos, u_long * len)
     153FetchDocStartLev2 (text_data * td, mg_u_long DN,
     154           mg_u_long * seek_pos, mg_u_long * len)
    155155{
    156156  double Weight;
    157   unsigned long s1, s2;
     157  mg_u_long s1, s2;
    158158  Weight = FDSL2 (td, DN, &s1);
    159159  do
    … …  
    172172
    173173double
    174 FetchDocStart (query_data * qd, u_long DN, u_long * seek_pos, u_long * len)
     174FetchDocStart (query_data * qd, mg_u_long DN, mg_u_long * seek_pos, mg_u_long * len)
    175175{
    176176  qd->text_idx_lookups++;
    … …  
    181181}
    182182
    183 unsigned long
    184 FetchInitialParagraph (text_data * td, unsigned long ParaNum)
     183mg_u_long
     184FetchInitialParagraph (text_data * td, mg_u_long ParaNum)
    185185{
    186186  if (td->TextIdxWgtFile)
    187187    {
    188       unsigned long pos;
    189       unsigned long start;
     188      mg_u_long pos;
     189      mg_u_long start;
    190190      int PN = ParaNum - 1;
    191191      pos = LoadIdx (td, ParaNum);
    … …  
    583583    {
    584584      huff_data *hd;
    585       u_long **vals;
     585      mg_u_long **vals;
    586586      if (cd->cdh.num_words[which])
    587587        {
    … …  
    625625    {
    626626      huff_data *hd;
    627       u_long **vals;
     627      mg_u_long **vals;
    628628      if (cd->cdh.num_words[which])
    629629        {
    … …  
    716716{
    717717  compression_dict *cd;
    718   u_long *p, *end;
     718  uintptr_t *p, *end;
    719719  u_char *fixup;
    720   u_long mem;
    721   u_long fixup_mem;
     720  mg_u_long mem;
     721  mg_u_long fixup_mem;
    722722  int i;  /* [RPAP - Jan 97: Endian Ordering] */
    723723
    … …  
    732732    }
    733733
    734   end = (u_long *) (((u_char *) cd) + mem);
     734  end = (uintptr_t *) (((u_char *) cd) + mem);
    735735  Fread (cd, sizeof (u_char), mem, text_fast_comp_dict);
    736736
    … …  
    743743  Fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict);
    744744
    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++)
    746746    if (IS_FIXUP (p))
    747747      {
    748748    NTOHUL(*p);  /* [RPAP - Jan 97: Endian Ordering] */
    749     *p = *p + (u_long) cd;
     749    *p = *p + (uintptr_t) cd;
    750750      }
    751751
    … …  
    863863#define MY_HUFF_DECODE(len, code, mcodes)               \
    864864  do {                                  \
    865     register unsigned long *__min_code = (mcodes);          \
    866     register unsigned long *__mclen = __min_code;           \
    867     register unsigned long __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;                  \
    868868    do                                  \
    869869      {                                 \
    … …  
    886886  auxiliary_dict *ad = cd->ad;
    887887  int which;
    888   u_long num_bits, bits;
     888  mg_u_long num_bits, bits;
    889889  u_char *ptr = s_out;
    890890  static int num = 0;
    891   u_long binary_start[2];
     891  mg_u_long binary_start[2];
    892892  int novels_used[2];
    893893  int swaps[2][MAX_SWAPS];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/text_get.h

    r16583 r23508  
    3232 * It returns the true weight of the document.
    3333 */
    34 double FetchDocStart (query_data * qd, u_long DN, u_long * seek_pos, u_long * len);
     34double FetchDocStart (query_data * qd, mg_u_long DN, mg_u_long * seek_pos, mg_u_long * len);
    3535
    36 unsigned long FetchInitialParagraph (text_data * td, unsigned long ParaNum);
     36mg_u_long FetchInitialParagraph (text_data * td, mg_u_long ParaNum);
    3737
    3838

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/weights.c

    r16583 r23508  
    3939#include "mg_errors.h"
    4040
    41 #define MAXBITS (sizeof(unsigned long) * 8)
     41#define MAXBITS (sizeof(mg_u_long) * 8)
    4242
    4343/*
    … …  
    6363approx_weights_data *
    6464LoadDocWeights (File * weight_file,
    65         unsigned long num_of_docs)
     65        mg_u_long num_of_docs)
    6666{
    6767  approx_weights_data *awd;
    … …  
    7474    }
    7575
    76   Fseek (weight_file, sizeof (long), 0);
     76  Fseek (weight_file, sizeof (mg_s_long), 0);
    7777  Fread (&awd->bits, sizeof (awd->bits), 1, weight_file);
    7878  Fread (&awd->L, sizeof (awd->L), 1, weight_file);
    … …  
    8484
    8585  num = (num_of_docs * awd->bits + 31) / 32;
    86   if (!(awd->DocWeights = Xmalloc (sizeof (unsigned long) * num)))
     86  if (!(awd->DocWeights = Xmalloc (sizeof (mg_u_long) * num)))
    8787    {
    8888      Xfree (awd);
    … …  
    9191    }
    9292
    93   Fread (awd->DocWeights, sizeof (unsigned long), num, weight_file);
     93  Fread (awd->DocWeights, sizeof (mg_u_long), num, weight_file);
    9494  {
    9595    /* [RPAP - Jan 97: Endian Ordering] */
    96     unsigned long i;
     96    mg_u_long i;
    9797    for (i = 0; i < num; i++)
    9898      NTOHUL(awd->DocWeights[i]);
    9999  }
    100100
    101   awd->MemForWeights = num * sizeof (unsigned long);
     101  awd->MemForWeights = num * sizeof (mg_u_long);
    102102  awd->num_of_docs = num_of_docs;
    103103
    … …  
    129129GetLowerApproxDocWeight (approx_weights_data * awd, register int DocNum)
    130130{
    131   register unsigned long c, Pos;
    132   register unsigned long *dw;
     131  register mg_u_long c, Pos;
     132  register mg_u_long *dw;
    133133  if (awd == NULL)
    134134    return 1.0;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/text/weights.h

    r16583 r23508  
    2626
    2727approx_weights_data *LoadDocWeights (File * weight_file,
    28                      unsigned long num_of_docs);
     28                     mg_u_long num_of_docs);
    2929
    3030float GetLowerApproxDocWeight (approx_weights_data * awd, register int DocNum);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/sysfuncs.h

    r16583 r23508  
    351351#endif
    352352
    353 /* [RPAP - Feb 97: WIN32 Port] */
    354 #ifndef u_long
    355 # define u_long unsigned long
    356 #endif
     353#include "mglong.h"
     354
    357355#ifndef u_char
    358356# define u_char unsigned char
    359357#endif
    360358
    361 
    362359#endif /* SYSFUNCS_H */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/Makefile.in

    r16583 r23508  
    2929CC = @CC@
    3030CXX = @CXX@
    31 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi
     31CFLAGS = @CFLAGS@ -ansi
    3232INSTALL = @INSTALL@
    3333INSTALL_DATA = @INSTALL_DATA@
    3434INSTALL_PROGRAM = @INSTALL_PROGRAM@
    35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     35LDFLAGS = @LDFLAGS@
    3636LIBS = @LIBS@ 
    3737TOUCH = echo timestamp >

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/configure

    r23356 r23508  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    628628CXX
    629629ENABLE_ACCENTFOLD
    630 COMPAT32BITFLAGS
    631630ENABLE_JAVA
    632631VERSION
    … …  
    769768
    770769  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 ;;
    774772  esac
    775773
    … …  
    816814    # Reject names that are not valid shell variable names.
    817815    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"
    819817    ac_useropt_orig=$ac_useropt
    820818    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    842840    # Reject names that are not valid shell variable names.
    843841    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"
    845843    ac_useropt_orig=$ac_useropt
    846844    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10461044    # Reject names that are not valid shell variable names.
    10471045    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"
    10491047    ac_useropt_orig=$ac_useropt
    10501048    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10621060    # Reject names that are not valid shell variable names.
    10631061    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"
    10651063    ac_useropt_orig=$ac_useropt
    10661064    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10921090    x_libraries=$ac_optarg ;;
    10931091
    1094   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1095 Try \`$0 --help' for more information"
     1092  -*) as_fn_error "unrecognized option: \`$ac_option'
     1093Try \`$0 --help' for more information."
    10961094    ;;
    10971095
    … …  
    11011099    case $ac_envvar in #(
    11021100      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1103       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1101      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    11041102    esac
    11051103    eval $ac_envvar=\$ac_optarg
    … …  
    11191117if test -n "$ac_prev"; then
    11201118  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"
    11221120fi
    11231121
    … …  
    11251123  case $enable_option_checking in
    11261124    no) ;;
    1127     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1125    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11281126    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11291127  esac
    … …  
    11481146    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11491147  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"
    11511149done
    11521150
    … …  
    11621160  if test "x$build_alias" = x; then
    11631161    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" >&2
     1162    $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
    11661164  elif test "x$build_alias" != "x$host_alias"; then
    11671165    cross_compiling=yes
    … …  
    11781176ac_ls_di=`ls -di .` &&
    11791177ac_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"
    11811179test "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"
    11831181
    11841182
    … …  
    12191217if test ! -r "$srcdir/$ac_unique_file"; then
    12201218  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"
    12221220fi
    12231221ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12241222ac_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"
    12261224    pwd)`
    12271225# When building in place, set srcdir=.
    … …  
    12631261      --help=recursive    display the short help of all the included packages
    12641262  -V, --version           display version information and exit
    1265   -q, --quiet, --silent   do not print \`checking ...' messages
     1263  -q, --quiet, --silent   do not print \`checking...' messages
    12661264      --cache-file=FILE   cache test results in FILE [disabled]
    12671265  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14241422  cat <<\_ACEOF
    14251423configure
    1426 generated by GNU Autoconf 2.67
    1427 
    1428 Copyright (C) 2010 Free Software Foundation, Inc.
     1424generated by GNU Autoconf 2.65
     1425
     1426Copyright (C) 2009 Free Software Foundation, Inc.
    14291427This configure script is free software; the Free Software Foundation
    14301428gives unlimited permission to copy, distribute and modify it.
    … …  
    15341532  fi
    15351533  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1536   test $ac_status = 0; } > conftest.i && {
     1534  test $ac_status = 0; } >/dev/null && {
    15371535     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15381536     test ! -s conftest.err
    … …  
    15581556{
    15591557  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 :
    15611559  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15621560$as_echo_n "checking for $2... " >&6; }
    1563 if eval "test \"\${$3+set}\"" = set; then :
     1561if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15641562  $as_echo_n "(cached) " >&6
    15651563fi
    … …  
    15971595  ac_header_preproc=no
    15981596fi
    1599 rm -f conftest.err conftest.i conftest.$ac_ext
     1597rm -f conftest.err conftest.$ac_ext
    16001598{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    16011599$as_echo "$ac_header_preproc" >&6; }
    … …  
    16241622  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16251623$as_echo_n "checking for $2... " >&6; }
    1626 if eval "test \"\${$3+set}\"" = set; then :
     1624if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16271625  $as_echo_n "(cached) " >&6
    16281626else
    … …  
    16881686  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16891687$as_echo_n "checking for $2... " >&6; }
    1690 if eval "test \"\${$3+set}\"" = set; then :
     1688if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16911689  $as_echo_n "(cached) " >&6
    16921690else
    … …  
    17651763  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17661764$as_echo_n "checking for $2... " >&6; }
    1767 if eval "test \"\${$3+set}\"" = set; then :
     1765if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17681766  $as_echo_n "(cached) " >&6
    17691767else
    … …  
    18181816  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18191817$as_echo_n "checking for $2... " >&6; }
    1820 if eval "test \"\${$3+set}\"" = set; then :
     1818if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18211819  $as_echo_n "(cached) " >&6
    18221820else
    … …  
    20592057
    20602058It was created by $as_me, which was
    2061 generated by GNU Autoconf 2.67.  Invocation command line was
     2059generated by GNU Autoconf 2.65.  Invocation command line was
    20622060
    20632061  $ $0 $@
    … …  
    21692167    echo
    21702168
    2171     $as_echo "## ---------------- ##
     2169    cat <<\_ASBOX
     2170## ---------------- ##
    21722171## Cache variables. ##
    2173 ## ---------------- ##"
     2172## ---------------- ##
     2173_ASBOX
    21742174    echo
    21752175    # The following way of writing the cache mishandles newlines in values,
    … …  
    22052205    echo
    22062206
    2207     $as_echo "## ----------------- ##
     2207    cat <<\_ASBOX
     2208## ----------------- ##
    22082209## Output variables. ##
    2209 ## ----------------- ##"
     2210## ----------------- ##
     2211_ASBOX
    22102212    echo
    22112213    for ac_var in $ac_subst_vars
    … …  
    22202222
    22212223    if test -n "$ac_subst_files"; then
    2222       $as_echo "## ------------------- ##
     2224      cat <<\_ASBOX
     2225## ------------------- ##
    22232226## File substitutions. ##
    2224 ## ------------------- ##"
     2227## ------------------- ##
     2228_ASBOX
    22252229      echo
    22262230      for ac_var in $ac_subst_files
    … …  
    22362240
    22372241    if test -s confdefs.h; then
    2238       $as_echo "## ----------- ##
     2242      cat <<\_ASBOX
     2243## ----------- ##
    22392244## confdefs.h. ##
    2240 ## ----------- ##"
     2245## ----------- ##
     2246_ASBOX
    22412247      echo
    22422248      cat confdefs.h
    … …  
    22932299ac_site_file2=NONE
    22942300if 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
    23012302elif test "x$prefix" != xNONE; then
    23022303  ac_site_file1=$prefix/share/config.site
    … …  
    23132314$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    23142315    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"
    23202317  fi
    23212318done
    … …  
    23932390  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    23942391$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" 5
     2392  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    23962393fi
    23972394## -------------------- ##
    … …  
    24112408ac_aux_dir=
    24122409for 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
    24262417done
    24272418if test -z "$ac_aux_dir"; then
    2428   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     2419  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    24292420fi
    24302421
    … …  
    24402431# Make sure we can run config.sub.
    24412432$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    2442   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     2433  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    24432434
    24442435{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    24512442  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    24522443test "x$ac_build_alias" = x &&
    2453   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     2444  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    24542445ac_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" 5
     2446  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    24562447
    24572448fi
    … …  
    24602451case $ac_cv_build in
    24612452*-*-*) ;;
    2462 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     2453*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    24632454esac
    24642455build=$ac_cv_build
    … …  
    24852476else
    24862477  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" 5
     2478    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    24882479fi
    24892480
    … …  
    24932484case $ac_cv_host in
    24942485*-*-*) ;;
    2495 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     2486*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    24962487esac
    24972488host=$ac_cv_host
    … …  
    25182509else
    25192510  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" 5
     2511    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    25212512fi
    25222513
    … …  
    25262517case $ac_cv_target in
    25272518*-*-*) ;;
    2528 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     2519*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    25292520esac
    25302521target=$ac_cv_target
    … …  
    25932584fi
    25942585
    2595 
    2596 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    2597 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    2598 arch_64bit=no
    2599 case "$host_cpu" in
    2600 x86_64) arch_64bit=yes ;;
    2601 esac
    2602 
    2603 if test "$arch_64bit" = yes; then
    2604   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    2605 $as_echo "yes" >&6; }
    2606   if test -z "$COMPAT32BITFLAGS" ; then
    2607     COMPAT32BITFLAGS="-m32"
    2608   fi
    2609 else
    2610   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2611 $as_echo "no" >&6; }
    2612   if test -z "$COMPAT32BITFLAGS" ; then
    2613     COMPAT32BITFLAGS=
    2614   fi
    2615 fi
    26162586
    26172587
    … …  
    28562826{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28572827$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
     2829as_fn_error "C++ compiler cannot create executables
     2830See \`config.log' for more details." "$LINENO" 5; }; }
    28602831else
    28612832  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    28992870  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29002871$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2901 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    2902 See \`config.log' for more details" "$LINENO" 5 ; }
     2872as_fn_error "cannot compute suffix of executables: cannot compile and link
     2873See \`config.log' for more details." "$LINENO" 5; }
    29032874fi
    29042875rm -f conftest conftest$ac_cv_exeext
    … …  
    29572928    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29582929$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2959 as_fn_error $? "cannot run C++ compiled programs.
     2930as_fn_error "cannot run C++ compiled programs.
    29602931If you meant to cross compile, use \`--host'.
    2961 See \`config.log' for more details" "$LINENO" 5 ; }
     2932See \`config.log' for more details." "$LINENO" 5; }
    29622933    fi
    29632934  fi
    … …  
    30102981{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30112982$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3012 as_fn_error $? "cannot compute suffix of object files: cannot compile
    3013 See \`config.log' for more details" "$LINENO" 5 ; }
     2983as_fn_error "cannot compute suffix of object files: cannot compile
     2984See \`config.log' for more details." "$LINENO" 5; }
    30142985fi
    30152986rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    35253496test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    35263497$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3527 as_fn_error $? "no acceptable C compiler found in \$PATH
    3528 See \`config.log' for more details" "$LINENO" 5 ; }
     3498as_fn_error "no acceptable C compiler found in \$PATH
     3499See \`config.log' for more details." "$LINENO" 5; }
    35293500
    35303501# Provide some information about the compiler.
    … …  
    38733844set x ${MAKE-make}
    38743845ac_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 :
     3846if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    38763847  $as_echo_n "(cached) " >&6
    38773848else
    … …  
    38813852    @echo '@@@%%%=$(MAKE)=@@@%%%'
    38823853_ACEOF
    3883 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     3854# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    38843855case `${MAKE-make} -f conftest.make 2>/dev/null` in
    38853856  *@@@%%%=?*=@@@%%%*)
    … …  
    40844055
    40854056    fi
    4086     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     4057    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    40874058fi
    40884059
    … …  
    41464117        ac_cv_prog_uudecode_base64=yes
    41474118else
    4148         echo "configure: 4148: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     4119        echo "configure: 4119: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    41494120        echo "configure: failed file was:" >&5
    41504121        cat Test.uue >&5
    … …  
    41614132$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    41624133        if test x$ac_cv_prog_javac_works = xno; then
    4163                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     4134                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    41644135        fi
    41654136        if test x$ac_cv_prog_javac_works = x; then
    … …  
    42544225
    42554226  fi
    4256   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4227  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    42574228else
    42584229  echo "Checking for javac... $JAVAC"
    … …  
    42694240CLASS_TEST=Test.class
    42704241cat << \EOF > $JAVA_TEST
    4271 /* #line 4271 "configure" */
     4242/* #line 4242 "configure" */
    42724243public class Test {
    42734244}
    … …  
    42814252  ac_cv_prog_javac_works=yes
    42824253else
    4283   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4254  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    42844255  echo "configure: failed program was:" >&5
    42854256  cat $JAVA_TEST >&5
    … …  
    43084279TEST=Test
    43094280cat << \EOF > $JAVA_TEST
    4310 /* [#]line 4310 "configure" */
     4281/* [#]line 4281 "configure" */
    43114282public class Test {
    43124283public static void main (String args[]) {
    … …  
    43254296          echo "configure: failed program was:" >&5
    43264297          cat $JAVA_TEST >&5
    4327           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4298          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    43284299        fi
    43294300fi
    … …  
    43384309  echo "configure: failed program was:" >&5
    43394310  cat $JAVA_TEST >&5
    4340   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4311  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    43414312fi
    43424313rm -fr $JAVA_TEST $CLASS_TEST Test.uue
    … …  
    44384409
    44394410  fi
    4440   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4411  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    44414412else
    44424413  echo "Checking for javac... $JAVAC"
    … …  
    44534424CLASS_TEST=Test.class
    44544425cat << \EOF > $JAVA_TEST
    4455 /* #line 4455 "configure" */
     4426/* #line 4426 "configure" */
    44564427public class Test {
    44574428}
    … …  
    44654436  ac_cv_prog_javac_works=yes
    44664437else
    4467   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4438  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    44684439  echo "configure: failed program was:" >&5
    44694440  cat $JAVA_TEST >&5
    … …  
    45254496continue
    45264497fi
    4527 rm -f conftest.err conftest.i conftest.$ac_ext
     4498rm -f conftest.err conftest.$ac_ext
    45284499
    45294500  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    45414512break
    45424513fi
    4543 rm -f conftest.err conftest.i conftest.$ac_ext
     4514rm -f conftest.err conftest.$ac_ext
    45444515
    45454516done
    45464517# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4547 rm -f conftest.i conftest.err conftest.$ac_ext
     4518rm -f conftest.err conftest.$ac_ext
    45484519if $ac_preproc_ok; then :
    45494520  break
    … …  
    45844555continue
    45854556fi
    4586 rm -f conftest.err conftest.i conftest.$ac_ext
     4557rm -f conftest.err conftest.$ac_ext
    45874558
    45884559  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    46004571break
    46014572fi
    4602 rm -f conftest.err conftest.i conftest.$ac_ext
     4573rm -f conftest.err conftest.$ac_ext
    46034574
    46044575done
    46054576# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4606 rm -f conftest.i conftest.err conftest.$ac_ext
     4577rm -f conftest.err conftest.$ac_ext
    46074578if $ac_preproc_ok; then :
    46084579
    … …  
    46104581  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    46114582$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4612 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4613 See \`config.log' for more details" "$LINENO" 5 ; }
     4583as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4584See \`config.log' for more details." "$LINENO" 5; }
    46144585fi
    46154586
    … …  
    46724643IFS=$as_save_IFS
    46734644  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" 5
     4645    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    46754646  fi
    46764647else
    … …  
    47384709IFS=$as_save_IFS
    47394710  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" 5
     4711    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    47414712  fi
    47424713else
    … …  
    48704841ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    48714842"
    4872 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4843eval as_val=\$$as_ac_Header
     4844   if test "x$as_val" = x""yes; then :
    48734845  cat >>confdefs.h <<_ACEOF
    48744846#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    54425414{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    54435415$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5444 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     5416if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    54455417  $as_echo_n "(cached) " >&6
    54465418else
    … …  
    54695441           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    54705442$as_echo "$ac_res" >&6; }
    5471 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5443eval as_val=\$$as_ac_Header
     5444   if test "x$as_val" = x""yes; then :
    54725445  cat >>confdefs.h <<_ACEOF
    54735446#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    57115684  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    57125685ac_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 :
     5686eval as_val=\$$as_ac_Header
     5687   if test "x$as_val" = x""yes; then :
    57145688  cat >>confdefs.h <<_ACEOF
    57155689#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    58845858    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    58855859ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5886 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5860eval as_val=\$$as_ac_var
     5861   if test "x$as_val" = x""yes; then :
    58875862
    58885863cat >>confdefs.h <<_ACEOF
    … …  
    60446019  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    60456020ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    6046 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     6021eval as_val=\$$as_ac_var
     6022   if test "x$as_val" = x""yes; then :
    60476023  cat >>confdefs.h <<_ACEOF
    60486024#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    60526028done
    60536029
    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
     6030for ac_func in ftruncate strstr strcasecmp
     6031do :
     6032  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     6033ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     6034eval 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
    60576039
    60586040else
    60596041  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"
    60626044 ;;
    60636045esac
    60646046
    60656047fi
    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
     6048done
    60926049
    60936050
    … …  
    62286185     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    62296186$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
     6188as_fn_error "cannot compute sizeof (unsigned char *)
     6189See \`config.log' for more details." "$LINENO" 5; }; }
    62326190   else
    62336191     ac_cv_sizeof_unsigned_char_p=0
    … …  
    66156573     ;; #(
    66166574   *)
    6617      as_fn_error $? "unknown endianness
    6618  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 ;;
    66196577 esac
    66206578
    … …  
    67366694ac_libobjs=
    67376695ac_ltlibobjs=
    6738 U=
    67396696for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    67406697  # 1. Remove the extension, and $U if already installed.
    … …  
    68996856
    69006857
    6901 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6902 # ----------------------------------------
     6858# as_fn_error ERROR [LINENO LOG_FD]
     6859# ---------------------------------
    69036860# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    69046861# 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.
    69066863as_fn_error ()
    69076864{
    6908   as_status=$1; test $as_status -eq 0 && as_status=1
    6909   if test "$4"; then
    6910     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6911     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6865  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
    69126869  fi
    6913   $as_echo "$as_me: error: $2" >&2
     6870  $as_echo "$as_me: error: $1" >&2
    69146871  as_fn_exit $as_status
    69156872} # as_fn_error
    … …  
    71077064    done
    71087065    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"
    71107067
    71117068
    … …  
    71617118ac_log="
    71627119This file was extended by $as_me, which was
    7163 generated by GNU Autoconf 2.67.  Invocation command line was
     7120generated by GNU Autoconf 2.65.  Invocation command line was
    71647121
    71657122  CONFIG_FILES    = $CONFIG_FILES
    … …  
    72277184ac_cs_version="\\
    72287185config.status
    7229 configured by $0, generated by GNU Autoconf 2.67,
     7186configured by $0, generated by GNU Autoconf 2.65,
    72307187  with options \\"\$ac_cs_config\\"
    72317188
    7232 Copyright (C) 2010 Free Software Foundation, Inc.
     7189Copyright (C) 2009 Free Software Foundation, Inc.
    72337190This config.status script is free software; the Free Software Foundation
    72347191gives unlimited permission to copy, distribute and modify it."
    … …  
    72477204do
    72487205  case $1 in
    7249   --*=?*)
     7206  --*=*)
    72507207    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    72517208    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    7252     ac_shift=:
    7253     ;;
    7254   --*=)
    7255     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    7256     ac_optarg=
    72577209    ac_shift=:
    72587210    ;;
    … …  
    72787230    case $ac_optarg in
    72797231    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    7280     '') as_fn_error $? "missing file argument" ;;
    72817232    esac
    72827233    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    72917242  --he | --h)
    72927243    # Conflict between --help and --header
    7293     as_fn_error $? "ambiguous option: \`$1'
     7244    as_fn_error "ambiguous option: \`$1'
    72947245Try \`$0 --help' for more information.";;
    72957246  --help | --hel | -h )
    … …  
    73007251
    73017252  # This is an error.
    7302   -*) as_fn_error $? "unrecognized option: \`$1'
     7253  -*) as_fn_error "unrecognized option: \`$1'
    73037254Try \`$0 --help' for more information." ;;
    73047255
    … …  
    73577308    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    73587309
    7359   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     7310  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    73607311  esac
    73617312done
    … …  
    73957346  tmp=./conf$$-$RANDOM
    73967347  (umask 077 && mkdir "$tmp")
    7397 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     7348} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    73987349
    73997350# Set up the scripts for CONFIG_FILES section.
    … …  
    74127363ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    74137364if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    7414   ac_cs_awk_cr='\\r'
     7365  ac_cs_awk_cr='\r'
    74157366else
    74167367  ac_cs_awk_cr=$ac_cr
    … …  
    74267377  echo "_ACEOF"
    74277378} >conf$$subs.sh ||
    7428   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    7429 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     7379  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     7380ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    74307381ac_delim='%!_!# '
    74317382for ac_last_try in false false false false false :; do
    74327383  . ./conf$$subs.sh ||
    7433     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7384    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74347385
    74357386  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    74377388    break
    74387389  elif $ac_last_try; then
    7439     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7390    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74407391  else
    74417392    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    75267477  cat
    75277478fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    7528   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    7529 _ACEOF
    7530 
    7531 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7532 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     7479  || 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
    75337484# trailing colons and then remove the whole line if VPATH becomes empty
    75347485# (actually we leave an empty line to preserve line numbers).
    75357486if 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[    ]*=/{
     7488s/:*\$(srcdir):*/:/
     7489s/:*\${srcdir}:*/:/
     7490s/:*@srcdir@:*/:/
     7491s/^\([^=]*=[     ]*\):*/\1/
    75457492s/:*$//
    7546 x
    7547 s/\(=[   ]*\).*/\1/
    7548 G
    7549 s/\n//
    75507493s/^[^=]*=[   ]*$//
    75517494}'
    … …  
    75757518    break
    75767519  elif $ac_last_try; then
    7577     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     7520    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    75787521  else
    75797522    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    76607603_ACEOF
    76617604cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7662   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7605  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    76637606fi # test -n "$CONFIG_HEADERS"
    76647607
    … …  
    76737616  case $ac_mode$ac_tag in
    76747617  :[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;;
    76767619  :[FH]-) ac_tag=-:-;;
    76777620  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    77017644       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    77027645       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;;
    77047647      esac
    77057648      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    77287671    case $ac_tag in
    77297672    *:-:* | *:-) 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 ;;
    77317674    esac
    77327675    ;;
    … …  
    78597802"
    78607803eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7861   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7804  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78627805
    78637806test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    78657808  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    78667809  { $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" >&5
     7810which seems to be undefined.  Please make sure it is defined." >&5
    78687811$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;}
     7812which seems to be undefined.  Please make sure it is defined." >&2;}
    78707813
    78717814  rm -f "$tmp/stdin"
    … …  
    78747817  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    78757818  esac \
    7876   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7819  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78777820 ;;
    78787821  :H)
    … …  
    78857828      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    78867829    } >"$tmp/config.h" \
    7887       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7830      || as_fn_error "could not create $ac_file" "$LINENO" 5
    78887831    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    78897832      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    78927835      rm -f "$ac_file"
    78937836      mv "$tmp/config.h" "$ac_file" \
    7894     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7837    || as_fn_error "could not create $ac_file" "$LINENO" 5
    78957838    fi
    78967839  else
    78977840    $as_echo "/* $configure_input  */" \
    78987841      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7899       || as_fn_error $? "could not create -" "$LINENO" 5
     7842      || as_fn_error "could not create -" "$LINENO" 5
    79007843  fi
    79017844 ;;
    … …  
    79197862
    79207863test $ac_write_fail = 0 ||
    7921   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7864  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    79227865
    79237866
    … …  
    79407883  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    79417884  # would make configure fail if this is the last instruction.
    7942   $ac_cs_success || as_fn_exit 1
     7885  $ac_cs_success || as_fn_exit $?
    79437886fi
    79447887if 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  
    3434AC_SUBST(ENABLE_JAVA)
    3535
    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)
     36dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     37dnl arch_64bit=no
     38dnl case "$host_cpu" in
     39dnl x86_64) arch_64bit=yes ;;
     40dnl esac
    5441
    5542dnl

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in

    r23356 r23508  
    1717JAVAH = javah
    1818JAR = jar
    19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX
     19CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
     20CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX
    2121JAVACFLAGS = @JAVACFLAGS@
    2222DEFS = @DEFS@
    … …  
    2525INSTALL_DATA = @INSTALL_DATA@
    2626INSTALL_PROGRAM = @INSTALL_PROGRAM@
    27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     27LDFLAGS = @LDFLAGS@
    2828LIBS =  -lstdc++ @LIBS@
    2929TOUCH = echo timestamp >

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/jni/MGPPRetrieveWrapperImpl.cpp

    r16583 r23508  
    5656   
    5757  // does this work alright? j_docnum is a long (64 bit)
    58   unsigned long docnum = j_docnum;
     58  mg_u_long docnum = j_docnum;
    5959  TextData td;
    6060

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

    r22070 r23508  
    2626CC = @CC@
    2727CXX = @CXX@
    28 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX
    29 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX
     28CFLAGS = @CFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX
     29CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX
    3030DEFS = @DEFS@
    3131RANLIB = @RANLIB@
    … …  
    3333INSTALL_DATA = @INSTALL_DATA@
    3434INSTALL_PROGRAM = @INSTALL_PROGRAM@
    35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     35LDFLAGS = @LDFLAGS@
    3636#NOTE: libmgpptext.a needs to come before libmgpplib.a !!!
    3737QUERY_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  
    3636CXX = @CXX@
    3737ifneq ($(NZDL), 1)
    38 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC
     38CFLAGS = @CFLAGS@ -ansi -fPIC
    3939else
    40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC -DSILENT
     40CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT
    4141endif
    42 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC
     42CXXFLAGS = @CXXFLAGS@ -fPIC
    4343DEFS = @DEFS@
    4444RANLIB = @RANLIB@

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/alloca.c

    r16583 r23508  
    5959
    6060#if defined (CRAY) && defined (CRAY_STACKSEG_END)
    61 long i00afunc ();
     61mg_s_long i00afunc ();
    6262#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
    6363#else
    … …  
    237237struct stack_control_header
    238238  {
    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).  */
    243243  };
    244244
    … …  
    252252struct stack_segment_linkage
    253253  {
    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 previous
     254    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
    259259                   segment of stack.  */
    260     long:32;
    261     long sstcpt:32;     /* Pointer to task common address block.  */
    262     long sscsnm;        /* Private control structure number for
     260    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
    263263                   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;
    285285  };
    286286
    … …  
    290290struct stk_stat
    291291  {
    292     long now;           /* Current total stack size.  */
    293     long maxc;          /* Amount of contiguous space which would
     292    mg_s_long now;          /* Current total stack size.  */
     293    mg_s_long maxc;         /* Amount of contiguous space which would
    294294                   be required to satisfy the maximum
    295295                   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.  This
     296    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
    309309                   number is actually corrupted by STKSTAT to
    310310                   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.  */
    313313  };
    314314
    … …  
    319319struct stk_trailer
    320320  {
    321     long this_address;      /* Address of this block.  */
    322     long this_size;     /* Size of this block (does not include
     321    mg_s_long this_address;     /* Address of this block.  */
     322    mg_s_long this_size;        /* Size of this block (does not include
    323323                   this trailer).  */
    324     long unknown2;
    325     long unknown3;
    326     long link;          /* Address of trailer block of previous
     324    mg_s_long unknown2;
     325    mg_s_long unknown3;
     326    mg_s_long link;         /* Address of trailer block of previous
    327327                   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;
    338338  };
    339339
    … …  
    345345   I doubt that "lint" will like this much. */
    346346
    347 static long
    348 i00afunc (long *address)
     347static mg_s_long
     348i00afunc (mg_s_long *address)
    349349{
    350350  struct stk_stat status;
    351351  struct stk_trailer *trailer;
    352   long *block, size;
    353   long result = 0;
     352  mg_s_long *block, size;
     353  mg_s_long result = 0;
    354354
    355355  /* We want to iterate through all of the segments.  The first
    … …  
    376376  while (trailer != 0)
    377377    {
    378       block = (long *) trailer->this_address;
     378      block = (mg_s_long *) trailer->this_address;
    379379      size = trailer->this_size;
    380380      if (block == 0 || size == 0)
    … …  
    419419   for alloca.  */
    420420
    421 static long
    422 i00afunc (long address)
     421static mg_s_long
     422i00afunc (mg_s_long address)
    423423{
    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;
    428428
    429429  struct stack_segment_linkage *ssptr;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.cpp

    r16583 r23508  
    2525int fprintf (FILE *, const char *,...);
    2626
    27 unsigned long
    28 BIO_Unary_Length (unsigned long val)
     27mg_u_long
     28BIO_Unary_Length (mg_u_long val)
    2929{
    30   register unsigned long num;
     30  register mg_u_long num;
    3131  num = bitio_buffer::unary_length(val);
    3232  //  UNARY_LENGTH (val, num);
    … …  
    3535
    3636
    37 unsigned long
    38 BIO_Binary_Length (unsigned long val, unsigned long b)
     37mg_u_long
     38BIO_Binary_Length (mg_u_long val, mg_u_long b)
    3939{
    40   register unsigned long num;
     40  register mg_u_long num;
    4141  num = bitio_buffer::binary_length (val, b);
    4242  return (num);
    … …  
    4444
    4545
    46 unsigned long BIO_Gamma_Length (unsigned long val) {
    47   register unsigned long num;
     46mg_u_long BIO_Gamma_Length (mg_u_long val) {
     47  register mg_u_long num;
    4848  num = bitio_buffer::gamma_length(val);
    4949  return (num);
    … …  
    5151
    5252
    53 unsigned long
    54 BIO_Delta_Length (unsigned long val)
     53mg_u_long
     54BIO_Delta_Length (mg_u_long val)
    5555{
    56   register unsigned long num;
     56  register mg_u_long num;
    5757  num = bitio_buffer::delta_length(val);
    5858  return (num);
    … …  
    6060
    6161
    62 unsigned long
    63 BIO_Elias_Length (unsigned long val, unsigned long b, double s)
     62mg_u_long
     63BIO_Elias_Length (mg_u_long val, mg_u_long b, double s)
    6464{
    65   register unsigned long num;
     65  register mg_u_long num;
    6666  num = bitio_buffer::elias_length(val, b, s);
    6767  return (num);
    6868}
    6969
    70 unsigned long
    71 BIO_Bblock_Length (unsigned long val, unsigned long b)
     70mg_u_long
     71BIO_Bblock_Length (mg_u_long val, mg_u_long b)
    7272{
    73   register unsigned long num;
     73  register mg_u_long num;
    7474  num = bitio_buffer::bblock_length (val, b);
    7575  return (num);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.h

    r16583 r23508  
    3333#define H_BITIO_GEN
    3434
    35 unsigned long BIO_Unary_Length (unsigned long val);
     35mg_u_long BIO_Unary_Length (mg_u_long val);
    3636
    37 unsigned long BIO_Binary_Length (unsigned long val, unsigned long b);
     37mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b);
    3838
    39 unsigned long BIO_Gamma_Length (unsigned long val);
     39mg_u_long BIO_Gamma_Length (mg_u_long val);
    4040
    41 unsigned long BIO_Delta_Length (unsigned long val);
     41mg_u_long BIO_Delta_Length (mg_u_long val);
    4242
    43 unsigned long BIO_Elias_Length (unsigned long val, unsigned long b, double s);
     43mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s);
    4444
    45 unsigned long BIO_Bblock_Length (unsigned long val, unsigned long b);
     45mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b);
    4646
    4747int BIO_Bblock_Init (int N, int p);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_abstract.h

    r18716 r23508  
    11#ifndef H_BITIO_ABSTRACT
    22#define H_BITIO_ABSTRACT
     3#include "mglong.h"
    34#include <cstdlib>
    45class bitio_buffer {
    … …  
    67  virtual int bit() = 0;
    78  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) {
    1114    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);
    1316      exit(1);
    1417    }
    1518  }
    1619
    17   static inline int floor_log2(unsigned long x) {
    18     unsigned long  _B_x = x;
     20  static inline int floor_log2(mg_u_long x) {
     21    mg_u_long  _B_x = x;
    1922    int reply;
    2023   
    … …  
    2730  }
    2831 
    29   static inline int ceil_log2(unsigned long x) {
     32  static inline int ceil_log2(mg_u_long x) {
    3033    register int _B_x;
    31     unsigned long reply;
     34    mg_u_long reply;
    3235   
    3336    _B_x = x - 1;
    … …  
    4043  }
    4144
    42   inline unsigned long unary_decode(unsigned long *count) {
    43     unsigned long x;
     45  inline mg_u_long unary_decode(mg_u_long *count) {
     46    mg_u_long x;
    4447   
    4548    x = 1;
    … …  
    5154  }
    5255
    53   inline void unary_encode(unsigned long x, unsigned long *count) {
    54     register unsigned long _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);
    5659    if (count != NULL) {
    5760      *count += _B_x;
    … …  
    6366
    6467
    65   inline unsigned long binary_decode(unsigned long b, unsigned long *count) {
    66     register unsigned long _B_x = 0;
    67     register unsigned long _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;
    6871    register int _B_i, _B_logofb, _B_thresh;
    69     register unsigned long reply;
     72    register mg_u_long reply;
    7073   
    7174    if (_B_b != 1) {                   
    … …  
    9699  }
    97100
    98   inline void binary_encode(unsigned long x, unsigned long b, unsigned long *count) {
    99     register unsigned long _B_x = (x);
    100     register unsigned long _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);
    101104    register int _B_nbits, _B_logofb, _B_thresh;
    102105   
    103     check_positive("binary", _B_x);
     106    check_positive((char*)"binary", _B_x);
    104107    _B_logofb = ceil_log2(_B_b);
    105108   
    … …  
    117120  }
    118121
    119   inline unsigned long bblock_decode(unsigned long b, unsigned long *count) {
    120     register unsigned long _B_x1, _B_xx = 0;
    121     register unsigned long _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);
    122125    register int _B_xdivb;
    123126   
    … …  
    131134  }
    132135 
    133   inline void bblock_encode(unsigned long x, unsigned long b, unsigned long *count) {
    134     register unsigned long _B_xx = (x);
    135     register unsigned long _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);
    136139    register int _B_xdivb = 0;
    137     check_positive("bblock", _B_xx);
     140    check_positive((char*)"bblock", _B_xx);
    138141    --_B_xx;
    139142    while (_B_xx >= _B_bb) {
    … …  
    145148  }
    146149
    147   inline unsigned long elias_decode(unsigned long b, double s, unsigned long *count) {
    148     register unsigned long _B_xx;
    149     register unsigned long _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;
    150153    register double _B_s = s;
    151154    register int _B_lower=1, _B_upper=1;
    … …  
    162165    _B_xx = this->binary_decode(_B_upper-_B_lower+1, count);
    163166    --_B_xx;
    164     check_positive("gamma", _B_xx+_B_lower);
     167    check_positive((char*)"gamma", _B_xx+_B_lower);
    165168    return _B_xx+_B_lower;
    166169  }
    167170 
    168   inline void elias_encode(unsigned long x, unsigned long b, double s, unsigned long *count) {
    169     register unsigned long _B_xx = x;
    170     register unsigned long _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;
    171174    register double _B_s = s;
    172175    register int _B_lower=1, _B_upper=1;
    … …  
    174177    register double _B_pow=1.0;
    175178   
    176     check_positive("elias", _B_xx);
     179    check_positive((char*)"elias", _B_xx);
    177180   
    178181    while ((int)_B_xx>_B_upper) {
    … …  
    186189  }
    187190 
    188   inline unsigned long gamma_decode(unsigned long *count) {
    189     register unsigned long _B_xx = 1;
     191  inline mg_u_long gamma_decode(mg_u_long *count) {
     192    register mg_u_long _B_xx = 1;
    190193    register int _B_nbits = 0;
    191194   
    … …  
    199202  }
    200203
    201   inline void gamma_encode(unsigned long x, unsigned long *count) {
    202     register unsigned long _B_xx = x;
     204  inline void gamma_encode(mg_u_long x, mg_u_long *count) {
     205    register mg_u_long _B_xx = x;
    203206    register int _B_logofb;
    204207    register int _B_nbits;
    205208   
    206     check_positive("gamma", _B_xx);
     209    check_positive((char*)"gamma", _B_xx);
    207210    _B_logofb = floor_log2(_B_xx);
    208211    _B_nbits = _B_logofb+1;
    … …  
    215218  }
    216219 
    217   inline unsigned long delta_decode(unsigned long *count) {
    218     register unsigned long _B_xxx;
     220  inline mg_u_long delta_decode(mg_u_long *count) {
     221    register mg_u_long _B_xxx;
    219222    register int _B_logx;
    220223    _B_logx = gamma_decode(count);
    … …  
    225228  }
    226229
    227   inline void delta_encode(unsigned long x, unsigned long *count) {
    228     register unsigned long _B_xxx = x;
     230  inline void delta_encode(mg_u_long x, mg_u_long *count) {
     231    register mg_u_long _B_xxx = x;
    229232    register int _B_logx;
    230233    _B_logx = floor_log2(_B_xxx);
    … …  
    233236  }
    234237
    235   inline unsigned long huff_decode(unsigned long *mcodes, unsigned long **values,
    236                    unsigned long *count = NULL) {
    237     register unsigned long *__min_code = mcodes;
    238     register unsigned long *__mclen    = mcodes;
    239     register unsigned long **__values  = values;
    240     register unsigned long __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;
    241244    do {
    242245      __code += __code + bit();
    … …  
    247250  }
    248251
    249   inline void huff_encode(unsigned long x, unsigned long *codes, char *lens,
    250               unsigned long *count = NULL) {
     252  inline void huff_encode(mg_u_long x, mg_u_long *codes, char *lens,
     253              mg_u_long *count = NULL) {
    251254    register int __i;
    252255    register int __clen = lens[x];
    253     register unsigned long __code = codes[x];
     256    register mg_u_long __code = codes[x];
    254257    for (__i=__clen-1; __i>=0; --__i) {
    255258      encodeBit((__code >> __i) & 1);
    … …  
    260263  }
    261264
    262   static inline unsigned long unary_length(unsigned long x) {
    263     check_positive("unary", x);
     265  static inline mg_u_long unary_length(mg_u_long x) {
     266    check_positive((char*)"unary", x);
    264267    return x;
    265268  }
    266269
    267   static inline int binary_length(unsigned long x, unsigned long b) {
    268     register unsigned long _B_x = (x);
    269     register unsigned long _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);
    270273    register int _B_nbits, _B_logofb, _B_thresh;
    271274   
    272     check_positive("binary", _B_x);
     275    check_positive((char*)"binary", _B_x);
    273276    _B_logofb = ceil_log2(_B_b);
    274277    _B_thresh = (1<<_B_logofb) - _B_b;
    … …  
    278281  }
    279282
    280   static inline unsigned long bblock_length(unsigned long x, unsigned long b) {
    281     register unsigned long _B_bcount, count, _B_xx = (x);
    282     register unsigned long _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);
    283286    register int _B_xdivb = 0;
    284287   
    285     check_positive("bblock", _B_xx);
     288    check_positive((char*)"bblock", _B_xx);
    286289    --_B_xx;
    287290    while (_B_xx >= _B_bb) {
    … …  
    295298  }
    296299 
    297   static inline unsigned long elias_length(unsigned long x, unsigned long b,
     300  static inline mg_u_long elias_length(mg_u_long x, mg_u_long b,
    298301                       double s) {
    299     register unsigned long _B_xx = x;
    300     register unsigned long _B_b = b;
     302    register mg_u_long _B_xx = x;
     303    register mg_u_long _B_b = b;
    301304    register double _B_s = s;
    302305    register int _B_lower=1, _B_upper=1;
    303306    register int _B_k=0, _B_ecount;
    304307    register double _B_pow=1.0;
    305     register unsigned long count;
    306     check_positive("gamma", _B_xx);
     308    register mg_u_long count;
     309    check_positive((char*)"gamma", _B_xx);
    307310   
    308311    while ((int)(_B_xx)>_B_upper) {
    … …  
    318321  }
    319322 
    320   static inline unsigned long gamma_length(unsigned long x) {
    321     register unsigned long _B_xx = x;
     323  static inline mg_u_long gamma_length(mg_u_long x) {
     324    register mg_u_long _B_xx = x;
    322325    register int _B_logofb;
    323     check_positive("gamma", _B_xx);
     326    check_positive((char*)"gamma", _B_xx);
    324327    _B_logofb = floor_log2(_B_xx);
    325328    return _B_logofb*2+1;
    326329  }
    327330
    328   static inline unsigned long delta_length(unsigned long x) {
    329     register unsigned long _B_xxx = x;
     331  static inline mg_u_long delta_length(mg_u_long x) {
     332    register mg_u_long _B_xxx = x;
    330333    register int _B_logx, _B_dcount;
    331     register unsigned long count;
     334    register mg_u_long count;
    332335    _B_logx = floor_log2 (_B_xxx);
    333336    count = gamma_length(_B_logx+1);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.cpp

    r16583 r23508  
    2727
    2828
    29 void mem_bitio_buffer::seek(unsigned long toPos) {
    30   register long _newPos;
     29void mem_bitio_buffer::seek(mg_u_long toPos) {
     30  register mg_s_long _newPos;
    3131  do {
    3232    _newPos = toPos;
    … …  
    3838}
    3939
    40 long mem_bitio_buffer::addff(long b) {
     40mg_s_long mem_bitio_buffer::addff(mg_s_long b) {
    4141  do {
    4242    if (btg == 0) {
    … …  
    5555}
    5656
    57 long mem_bitio_buffer::add00(long b) {
     57mg_s_long mem_bitio_buffer::add00(mg_s_long b) {
    5858  do {
    5959    if (btg == 0) {

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.h

    r16583 r23508  
    3535
    3636#include "bitio_m_abstract.h"
     37#include "mglong.h"
    3738
    3839
    … …  
    4849  mem_bitio_buffer ();
    4950  mem_bitio_buffer (unsigned char *buffer, int size);
    50   void seek (unsigned long topos);
     51  void seek (mg_u_long topos);
    5152  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);
    5455  int  bit ();
    5556  void done ();

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.cpp

    r16583 r23508  
    1212}
    1313
    14 mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, long _pos)
     14mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos)
    1515{
    1616  base = readbuffer;
    … …  
    3131
    3232
    33 void mems_bitio_buffer::seek(unsigned long toPos)
     33void mems_bitio_buffer::seek(mg_u_long toPos)
    3434{
    3535  pos = toPos;
    3636}
    3737
    38 unsigned long mems_bitio_buffer::position()
     38mg_u_long mems_bitio_buffer::position()
    3939{
    4040  return pos;
    4141}
    4242
    43 long mems_bitio_buffer::addff(long b)
     43mg_s_long mems_bitio_buffer::addff(mg_s_long b)
    4444{
    4545  do
    … …  
    5353}
    5454
    55 long mems_bitio_buffer::add00(long b)
     55mg_s_long mems_bitio_buffer::add00(mg_s_long b)
    5656{
    5757  return addff(b);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.h

    r16583 r23508  
    3434
    3535#include "bitio_m_abstract.h"
    36 
     36#include "mglong.h"
    3737
    3838class mems_bitio_buffer : public bitio_buffer {
    3939protected:
    4040  unsigned char *base;
    41   unsigned long  pos;
     41  mg_u_long  pos;
    4242 
    4343public:
    4444  mems_bitio_buffer();
    45   mems_bitio_buffer(unsigned char *readbuffer, long _pos);
    46   void seek(unsigned long topos);
     45  mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos);
     46  void seek(mg_u_long topos);
    4747  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);
    5050  int  bit();
    5151  //  int  bitOffset();
    5252  void done();
    5353
    54   unsigned long position();
     54  mg_u_long position();
    5555
    5656  void encodeStart();

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.cpp

    r16583 r23508  
    99#include "bitio_m_random.h"
    1010
    11 random_bitio_buffer::random_bitio_buffer(FILE *f, unsigned long length)
     11random_bitio_buffer::random_bitio_buffer(FILE *f, mg_u_long length)
    1212{
    1313  buffer = NULL;
    … …  
    1919}
    2020
    21 void random_bitio_buffer::attachFile (FILE *f, unsigned long length) {
     21void random_bitio_buffer::attachFile (FILE *f, mg_u_long length) {
    2222  // delete the old buffer
    2323  if (buffer != NULL) {
    … …  
    4747  if (file != NULL) {
    4848    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    }
    5056  }
    5157}
    … …  
    8894      base += len;
    8995      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    }
    91103      pos = 0;
    92104      used = 0;
    … …  
    136148}
    137149
    138 unsigned long random_bitio_buffer::tell()
     150mg_u_long random_bitio_buffer::tell()
    139151{
    140152  return ((base << 3) + pos);
    141153}
    142154
    143 void random_bitio_buffer::seek(unsigned long toPos)
     155void random_bitio_buffer::seek(mg_u_long toPos)
    144156{
    145157  if (((toPos >> 3) >= base) && (((toPos+7) >> 3) < (base + len)))
    … …  
    153165      base = (toPos >> (shift + 3)) << shift;
    154166      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    }
    156174      pos = toPos & 0x07;
    157175      pos = toPos & ((8 << shift) - 1);
    … …  
    171189}
    172190
    173 long random_bitio_buffer::addff(long b)
     191mg_s_long random_bitio_buffer::addff(mg_s_long b)
    174192{
    175193  return b + b + bit();
    176194}
    177195
    178 long random_bitio_buffer::add00(long b)
     196mg_s_long random_bitio_buffer::add00(mg_s_long b)
    179197{
    180198  return addff(b);
    … …  
    198216      (((toPos + 7) >> 3) < (mg_ullong) (base + len)))
    199217    {
    200       pos = (long) (toPos - (mg_ullong) (base << 3));
     218      pos = (mg_s_long) (toPos - (mg_ullong) (base << 3));
    201219    }
    202220  else
    203221    {
    204222      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));
    210234    }
    211235}

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.h

    r16583 r23508  
    4242  FILE *file;
    4343  unsigned char *buffer;
    44   unsigned long  base;
    45   unsigned long  used;
    46   unsigned long  pos;
    47   unsigned long  len;
    48   unsigned long  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;
    4949  void writeRead();
    5050
    5151  random_bitio_buffer(FILE *f = 0,
    52               unsigned long length = 8*1024);
     52              mg_u_long length = 8*1024);
    5353  virtual ~random_bitio_buffer();
    5454 
    55   void attachFile (FILE *f, unsigned long length);
     55  void attachFile (FILE *f, mg_u_long length);
    5656
    5757  random_bitio_buffer &operator= (const random_bitio_buffer &_rbb);
    … …  
    6060  void encodeBit(int b);
    6161  void flush();
    62   unsigned long tell();
     62  mg_u_long tell();
    6363
    64   void seek(unsigned long topos);
     64  void seek(mg_u_long topos);
    6565  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);
    6868  int  bit();
    6969  int  bitOffset();

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.cpp

    r16583 r23508  
    2424}
    2525
    26 void stdio_bitio_buffer::seek (unsigned long byte, unsigned char bit) {
     26void stdio_bitio_buffer::seek (mg_u_long byte, unsigned char bit) {
    2727  if (fseek (file, byte, SEEK_SET) != 0) return;
    2828  buffer = getc(file);
    … …  
    3131}
    3232
    33 void stdio_bitio_buffer::seek(unsigned long topos) {
     33void stdio_bitio_buffer::seek(mg_u_long topos) {
    3434  if (fseek(file, topos >> 3, SEEK_SET) != 0) return;
    3535  buffer = getc(file);
    … …  
    3838}
    3939
    40 long stdio_bitio_buffer::addff(long b)
     40mg_s_long stdio_bitio_buffer::addff(mg_s_long b)
    4141{
    4242  if (!btg)
    … …  
    5959}
    6060
    61 long stdio_bitio_buffer::add00(long b)
     61mg_s_long stdio_bitio_buffer::add00(mg_s_long b)
    6262{
    6363  if (!btg)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.h

    r16583 r23508  
    3333
    3434#include "bitio_m_abstract.h"
    35 
     35#include "mglong.h"
    3636
    3737class stdio_bitio_buffer : public bitio_buffer {
    … …  
    4040  unsigned char buffer;
    4141  unsigned char btg;
    42   unsigned long bytesWritten;
     42  mg_u_long bytesWritten;
    4343 
    4444public:
    … …  
    4848
    4949  unsigned char GetBtg () { return btg; }
    50   unsigned long GetBytesWritten () { return bytesWritten; }
     50  mg_u_long GetBytesWritten () { return bytesWritten; }
    5151 
    52   void seek (unsigned long byte, unsigned char bit);
    53   void seek (unsigned long topos);
     52  void seek (u_int byte, unsigned char bit);
     53  void seek (mg_u_long topos);
    5454  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);
    5757  int  bit();
    5858  int  bitOffset() { return btg; }

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/gmalloc.c

    r16583 r23508  
    401401{
    402402  __ptr_t result;
    403   unsigned long int adj;
     403  mg_u_long adj;
    404404
    405405  result = (*__morecore) (size);
    406   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     406  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    407407                          (char *) NULL)) % BLOCKSIZE;
    408408  if (adj != 0)
    … …  
    549549      block = BLOCK (result);
    550550      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)
    553553           % BLOCKSIZE) >> log;
    554554
    … …  
    872872      prev = (struct list *) ptr;
    873873      _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)
    876876         % BLOCKSIZE >> type);
    877877      prev->next = _fraghead[type].next;
    … …  
    12841284{
    12851285  __ptr_t result;
    1286   unsigned long int adj;
     1286  mg_u_long adj;
    12871287
    12881288  size = ((size + alignment - 1) / alignment) * alignment;
    … …  
    12911291  if (result == NULL)
    12921292    return NULL;
    1293   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     1293  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    12941294                          (char *) NULL)) % alignment;
    12951295  if (adj != 0)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/huffman.cpp

    r16583 r23508  
    3030 */
    3131huff_data *
    32 Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    33                u_long * mem)
     32Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     33               mg_u_long * mem)
    3434{
    3535  int HNum, i, count;
    36   unsigned long *heap;
     36  mg_u_long *heap;
    3737  huff_data *hd = data;
    3838  if (!hd)
    … …  
    4141    goto error0;
    4242    }
    43   if (!(heap = new unsigned long[num * 2]))
     43  if (!(heap = new mg_u_long[num * 2]))
    4444    goto error1;
    4545  if (!(hd->clens = new char[num]))
    … …  
    7373      if (heap[heap[curr - 1]] > heap[heap[child - 1]])
    7474        {
    75           register u_long temp;
     75          register mg_u_long temp;
    7676          temp = heap[child - 1];
    7777          heap[child - 1] = heap[curr - 1];
    … …  
    141141
    142142  /* Calculate the code lens */
    143   heap[0] = -1UL;
     143  heap[0] = -1;
    144144  heap[1] = 0;
    145145  for (i = 2; i < num * 2; ++i)
    … …  
    154154  for (i = 0; i < num; ++i)
    155155    {
    156       register u_long codelen = heap[i + num];
     156      register mg_u_long codelen = heap[i + num];
    157157      hd->clens[i] = (char) codelen;
    158158      if (!codelen)
    … …  
    190190}
    191191
    192 unsigned long *
    193 Generate_Huffman_Codes (huff_data * data, u_long * mem)
     192mg_u_long *
     193Generate_Huffman_Codes (huff_data * data, mg_u_long * mem)
    194194{
    195195  int i;
    196   unsigned long *codes;
    197   unsigned long mc[MAX_HUFFCODE_LEN + 1];
     196  mg_u_long *codes;
     197  mg_u_long mc[MAX_HUFFCODE_LEN + 1];
    198198
    199199  if (!data)
    200200    return (NULL);
    201   if (!(codes = new unsigned long[data->num_codes]))
     201  if (!(codes = new mg_u_long[data->num_codes]))
    202202    return (NULL);
    203203  if (mem)
    … …  
    212212
    213213
    214 unsigned long **
    215 Generate_Huffman_Vals (huff_data * data, u_long * mem)
     214mg_u_long **
     215Generate_Huffman_Vals (huff_data * data, mg_u_long * mem)
    216216{
    217217  int i;
    218   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    219   unsigned long **values;
    220   unsigned long *vals;
     218  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     219  mg_u_long **values;
     220  mg_u_long *vals;
    221221
    222222  if (!data)
    223223    return (NULL);
    224   if (!(vals = new unsigned long[data->num_codes]))
     224  if (!(vals = new mg_u_long[data->num_codes]))
    225225    return (NULL);
    226   if (!(values = new unsigned long *[MAX_HUFFCODE_LEN + 1]))
     226  if (!(values = new mg_u_long *[MAX_HUFFCODE_LEN + 1]))
    227227    {
    228228      delete []vals;
    … …  
    230230    }
    231231
    232   memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     232  memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *));
    233233
    234234  if (mem)
    235235    *mem += data->num_codes * sizeof (*vals) +
    236       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     236      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    237237
    238238  fcode[0] = values[0] = &vals[0];
    … …  
    249249
    250250double
    251 Calculate_Huffman_Size (int num, long *freqs, long *counts)
     251Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts)
    252252{
    253253  double size = 0;
    … …  
    318318
    319319
    320 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk) {
     320int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) {
    321321  if (fread (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1)
    322322    return -1;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/huffman.h

    r16583 r23508  
    3535  int maxcodelen;
    3636  int lencount[MAX_HUFFCODE_LEN + 1];
    37   unsigned long min_code[MAX_HUFFCODE_LEN + 1];
     37  mg_u_long min_code[MAX_HUFFCODE_LEN + 1];
    3838  char *clens;
    3939};
    4040
    4141
    42 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    43                   u_long * mem);
     42huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     43                  mg_u_long * mem);
    4444
    45 unsigned long *Generate_Huffman_Codes (huff_data * data, u_long * mem);
     45mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem);
    4646
    47 unsigned long **Generate_Huffman_Vals (huff_data * data, u_long * mem);
     47mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem);
    4848
    4949int Write_Huffman_Data (FILE * f, huff_data * hd);
    5050
    51 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk);
     51int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk);
    5252
    5353/* Calculate the number of bits required to code the data with the
    5454   specified frequencies. Normally freqs and counts should point to
    5555   the same array. */
    56 double Calculate_Huffman_Size (int num, long *freqs, long *counts);
     56double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts);
    5757
    5858

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/local_strings.cpp

    r16583 r23508  
    5252  char *str_ptr = str;
    5353  char ch = '\0';
    54   long scale = 1;
     54  mg_s_long scale = 1;
    5555
    5656  /* find any scale letter immediately after digits */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/local_strings.h

    r16583 r23508  
    5454      copy = fgetc(dict);
    5555      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    }
    5763      *data = copy + suff;
    5864    }

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/longlong.h

    r16583 r23508  
    7474#else
    7575
     76#include <stdint.h>
    7677/* Not using GCC, so fall back on plain "long" (32-bit) types */
    77 typedef unsigned long int mg_ullong;
    78 typedef long int mg_llong;
     78typedef uint32_t mg_ullong;
     79typedef int32_t mg_llong;
    7980
    8081#define ULL_FS "lu"

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/lovinstem.cpp

    r16583 r23508  
    497497static Recode_Rules Rules[] =
    498498{
    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, 1
     499  {(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}
    540540};
    541541
    … …  
    560560static Last_Char_Node pr[] =
    561561{
    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},
    570570};
    571571
    … …  
    655655static Ending_List List[] =
    656656{
    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},
    10061006};
    10071007
    … …  
    10171017static First_Char_Node First[] =
    10181018{
    1019   '\'', NULL, NULL,
     1019  {'\'', NULL, NULL,
    10201020  {NULL,
    10211021   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,
    10251025  {List,
    10261026   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,
    10301030  {List + 91,
    10311031   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,
    10351035  {NULL,
    10361036   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,
    10401040  {NULL,
    10411041   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,
    10451045  {List + 150,
    10461046   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,
    10501050  {NULL,
    10511051   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,
    10551055  {NULL,
    10561056   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,
    10601060  {List + 269,
    10611061   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,
    10651065  {List + 283,
    10661066   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,
    10701070  {NULL,
    10711071   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,
    10751075  {NULL,
    10761076   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,
    10801080  {List + 289,
    10811081   List + 290, NULL, List + 291, NULL, NULL,
    1082    NULL, NULL, NULL, NULL, NULL},
     1082   NULL, NULL, NULL, NULL, NULL}},
    10831083};
    10841084

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/messages.cpp

    r16583 r23508  
    2525#include "messages.h"
    2626
    27 char *msg_prefix = "";
     27char *msg_prefix = (char*)"";
    2828
    2929

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/netorder.h

    r22257 r23508  
    1616#define HTOND(d)                                                              \
    1717        do {                                                                  \
    18              unsigned long tmph, tmpl;                                        \
     18             mg_u_long tmph, tmpl;                                        \
    1919         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);   \
    2121         tmph = htonl (tmph);                                             \
    2222         tmpl = htonl (tmpl);                                             \
    2323         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);   \
    2525    }while(0)
    2626#define NTOHD(d)                                                              \
    2727        do {                                                                  \
    28              unsigned long tmph, tmpl;                                        \
     28             mg_u_long tmph, tmpl;                                        \
    2929         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);   \
    3131         tmph = ntohl (tmph);                                             \
    3232         tmpl = ntohl (tmpl);                                             \
    3333         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);   \
    3535        }while(0)
    3636#define HTOND2(hd, nd)                                                        \
    3737        do {                                                                  \
    38              unsigned long tmph, tmpl;                                        \
     38             mg_u_long tmph, tmpl;                                        \
    3939         memcpy ((void *) &tmph, (const void *) &hd, sizeof(double) >> 1);\
    4040         memcpy ((void *) &tmpl, (const void *) ((unsigned int) &hd + (sizeof(double) >> 1)), sizeof (double) >> 1);  \
    … …  
    4646#define NTOHD2(nd, hd)                                                        \
    4747        do {                                                                  \
    48              unsigned long tmph, tmpl;                                        \
     48             mg_u_long tmph, tmpl;                                        \
    4949         memcpy ((void *) &nd, (void *) &tmph, sizeof(double) >> 1);      \
    5050         memcpy ((void *) &tmpl, (const void *) &nd + (sizeof(double) >> 1), sizeof (double) >> 1);  \
    … …  
    5858#define HTONF(f)                                                              \
    5959        do {                                                                  \
    60              unsigned long tmp;                                               \
     60             mg_u_long tmp;                                               \
    6161             memcpy ((void *) &tmp, (const void *) &(f), sizeof (float));     \
    6262             HTONUL (tmp);                                                    \
    … …  
    6565#define NTOHF(f)                                                              \
    6666        do {                                                                  \
    67              unsigned long tmp;                                               \
     67             mg_u_long tmp;                                               \
    6868             memcpy ((void *) &tmp, (const void *) &(f), sizeof (float));     \
    6969         NTOHUL (tmp);                                                    \
    … …  
    7272#define HTONF2(hf, nf)                                                        \
    7373        do {                                                                  \
    74              unsigned long tmp;                                               \
     74             mg_u_long tmp;                                               \
    7575             memcpy ((void *) &tmp, (const void *) &(hf), sizeof (float));    \
    7676             HTONUL (tmp);                                                    \
    … …  
    7979#define NTOHF2(nf, hf)                                                        \
    8080        do {                                                                  \
    81              unsigned long tmp;                                               \
     81             mg_u_long tmp;                                               \
    8282             memcpy ((void *) &tmp, (const void *) &(nf), sizeof (float));    \
    8383         NTOHUL (tmp);                                                    \
    … …  
    114114
    115115/* pointers */
    116 #define HTONP(p)          ((p) = (void *) htonl ((unsigned long) p))
    117 #define NTOHP(p)          ((p) = (void *) ntohl ((unsigned long) p))
    118 #define HTONP2(hp, np)    ((np) = (void *) htonl ((unsigned long) hp))
    119 #define NTOHP2(np, hp)    ((hp) = (void *) ntohl ((unsigned long) 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))
    120120
    121121/* unsigned long */
    … …  
    126126
    127127/* signed long */
    128 #define HTONSL(l)         ((l) = (long) htonl ((unsigned long) (l)))
    129 #define NTOHSL(l)         ((l) = (long) ntohl ((unsigned long) (l)))
    130 #define HTONSL2(hl, nl)   ((nl) = (long) htonl ((unsigned long) (hl)))
    131 #define NTOHSL2(nl, hl)   ((hl) = (long) ntohl ((unsigned long) (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)))
    132132
    133133/* unsigned int */
    134 #define HTONUI(i)         ((i) = (unsigned int) htonl ((unsigned long) (i)))
    135 #define NTOHUI(i)         ((i) = (unsigned int) ntohl ((unsigned long) (i)))
    136 #define HTONUI2(hi, ni)   ((ni) = (unsigned int) htonl ((unsigned long) (hi)))
    137 #define NTOHUI2(ni, hi)   ((hi) = (unsigned int) ntohl ((unsigned long) (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)))
    138138
    139139/* signed int */
    140 #define HTONSI(i)         ((i) = (int) htonl ((unsigned long) (i)))
    141 #define NTOHSI(i)         ((i) = (int) ntohl ((unsigned long) (i)))
    142 #define HTONSI2(hi, ni)   ((ni) = (int) htonl ((unsigned long) (hi)))
    143 #define NTOHSI2(ni, hi)   ((hi) = (int) ntohl ((unsigned long) (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)))
    144144
    145145/* unsigned short */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/non_ansi.h

    r16583 r23508  
    33
    44#include "config.h"
     5#include "mglong.h"
    56# if !defined(__STDC__)
    67
    … …  
    1112
    1213int fileno(FILE *);
    13 int ftruncate(int, long);
     14int ftruncate(int, mg_s_long);
    1415int pclose(FILE *);
    1516FILE *popen(const char *command, const char *type);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/perf_hash.cpp

    r16583 r23508  
    4444/* Random Number stuff */
    4545
    46 long irandm (long is[2]);  /* from random.c */
    47 
    48 static long seed[] = {0, 0};
     46mg_s_long irandm (mg_s_long is[2]);  /* from random.c */
     47
     48static mg_s_long seed[] = {0, 0};
    4949#define RANDOM() irandm(seed)
    5050#define SEED_RANDOM(the_seed) do{ seed[0] = the_seed; }while(0)
    … …  
    107107
    108108#ifndef STRUCT
    109 static long **tb0, **tb1, **tb2;
     109static mg_s_long **tb0, **tb1, **tb2;
    110110#else
    111111struct tb_entry **tb;
    … …  
    700700    {
    701701      if (tb0)
    702     if (!(tb0[i] = Xmalloc (sizeof (long) * MAX_L)))
     702    if (!(tb0[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    703703        ok = 0;
    704704      if (tb1)
    705     if (!(tb1[i] = Xmalloc (sizeof (long) * MAX_L)))
     705    if (!(tb1[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    706706        ok = 0;
    707707      if (tb2)
    708     if (!(tb2[i] = Xmalloc (sizeof (long) * MAX_L)))
     708    if (!(tb2[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    709709        ok = 0;
    710710    }
    … …  
    744744
    745745  if (r <= 0)
    746     SEED_RANDOM ((long) time ((time_t *) NULL));
     746    SEED_RANDOM ((mg_s_long) time ((time_t *) NULL));
    747747  else
    748748    SEED_RANDOM (r);
    … …  
    902902    {
    903903      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)))
    905905        ok = 0;
    906906      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)))
    908908        ok = 0;
    909909      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)))
    911911        ok = 0;
    912912    }
    … …  
    946946      int j;
    947947
    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) *
    949949        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) *
    951951        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) *
    953953        sizeof (int);
    954954

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/perf_hash.h

    r16583 r23508  
    2525struct tb_entry
    2626  {
    27     long tb0, tb1, tb2;
     27    mg_s_long tb0, tb1, tb2;
    2828  };
    2929

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/random.cpp

    r16583 r23508  
    3333 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i)
    3434 */
    35 
    36 #define MASK ((long) 593970775)
     35#include "random.h"
     36
     37#define MASK ((mg_s_long) 593970775)
    3738/*  or in hex, 23674657 */
    3839
    … …  
    4041/*  i.e. 2 to power -31 */
    4142
    42 static long mt [128] =   {
     43static mg_s_long mt [128] =   {
    4344      902906369,
    4445     2030498053,
    … …  
    172173
    173174double
    174 random (long is [2])
     175random (mg_s_long is [2])
    175176{
    176     long it, leh, nit;
     177    mg_s_long it, leh, nit;
    177178
    178179    it = is [0];
    … …  
    187188    is [0] = it;    is [1] = leh;
    188189    if (leh < 0) leh = ~leh;
    189     return (SCALE * ((long) (leh | 1)));
     190    return (SCALE * ((mg_s_long) (leh | 1)));
    190191}
    191192
    192193
    193194
    194 long
    195 irandm (long is [2])
     195mg_s_long
     196irandm (mg_s_long is [2])
    196197{
    197     long it, leh, nit;
     198    mg_s_long it, leh, nit;
    198199
    199200    it = is [0];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/random.h

    r16583 r23508  
    3636 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i)
    3737 */
     38#include "mglong.h"
    3839
    39 double random (long is [2]);
    40 long irandm (long is [2]);
     40double random (mg_s_long is [2]);
     41mg_s_long irandm (mg_s_long is [2]);
    4142
    4243#endif

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/sysfuncs.h

    r16583 r23508  
    377377#endif
    378378
    379 /* [RPAP - Feb 97: WIN32 Port] */
    380 #ifndef u_long
    381 # define u_long unsigned long
    382 #endif
     379#include "mglong.h"
     380
    383381#ifndef u_char
    384 # define u_char unsigned char
    385 #endif
    386 
     382# define u_char uint8_t
     383#endif
    387384
    388385#endif /* SYSFUNCS_H */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/unitool.cpp

    r23424 r23508  
    1515 * column
    1616 */
    17 static unsigned long *unicode_cat_data=NULL;
     17static mg_u_long *unicode_cat_data=NULL;
    1818
    1919
    … …  
    4040#define NUM_DECOMPOSE_INFO 1269
    4141static 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}}
    465465};
    466466
    … …  
    14641464 * column
    14651465 */
    1466 /*unsigned long *unicode_cat_data;*/
     1466/*mg_u_long *unicode_cat_data;*/
    14671467
    14681468void create_unicat_data () {
    … …  
    14701470  int min_start=0;
    14711471  int min_end=0;
    1472   register unsigned long min_value=0; /* filling the whole byte */
     1472  register mg_u_long min_value=0; /* filling the whole byte */
    14731473 
    14741474  const unirange *letter_here = letter_info;
    … …  
    14801480
    14811481  if (unicode_cat_data != NULL) return;
    1482   unicode_cat_data = (unsigned long *) malloc (0x10000/4);
     1482  unicode_cat_data = (mg_u_long *) malloc (0x10000/4);
    14831483  if (unicode_cat_data == NULL) return;
    14841484 
    … …  
    15291529   
    15301530      } else {
    1531     register unsigned long mask = 3 << ((i % 16) * 2);
     1531    register mg_u_long mask = 3 << ((i % 16) * 2);
    15321532    unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) |
    15331533                  (min_value & mask);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/win32in.c

    r16583 r23508  
    33#include "win32in.h"
    44
    5 unsigned long htonl(unsigned long x) {
     5mg_u_long htonl(mg_u_long x) {
    66#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    77    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    2424}
    2525
    26 unsigned long ntohl(unsigned long x) {
     26mg_u_long ntohl(mg_u_long x) {
    2727#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    2828    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    5050
    5151main () {
    52     long x;
     52    mg_s_long x;
    5353    short sx;
    5454

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/win32in.h

    r16583 r23508  
    1010#endif
    1111
    12 unsigned long htonl(unsigned long x);
    13 unsigned long ntohl(unsigned long x);
     12mg_u_long htonl(mg_u_long x);
     13mg_u_long ntohl(mg_u_long x);
    1414mg_ullong ntohll(mg_ullong x);
    1515unsigned short htons(unsigned short x);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.cpp

    r16583 r23508  
    7979 
    8080  // read in the array size
    81   unsigned long arrSize = 0;
     81  mg_u_long arrSize = 0;
    8282  if (!ReadVarLenUL (f, arrSize)) return false;
    8383 

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.h

    r16583 r23508  
    3131#endif
    3232
     33#include "mglong.h"
    3334#include <stdio.h>
    3435#include "UCArray.h"
    … …  
    3839public:
    3940  UCArray levelTag;
    40   unsigned long numEntries; // N for level
    41   unsigned long approxWeightsDiskPtr;
    42   unsigned long exactWeightsDiskPtr;
     41  mg_u_long numEntries; // N for level
     42  mg_u_long approxWeightsDiskPtr;
     43  mg_u_long exactWeightsDiskPtr;
    4344  bool workInLevel;  // this is just a working variable,
    4445                     // it is not saved or read from the file

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FText.cpp

    r16583 r23508  
    4141}
    4242
    43 #define BITADDRLEN (sizeof(unsigned long) + sizeof(unsigned char))
     43#define BITADDRLEN (sizeof(mg_u_long) + sizeof(unsigned char))
    4444
    4545 
    … …  
    8585bool FTextLevel::Read (FILE *f) {
    8686  // read in the array size
    87   unsigned long arrSize = 0;
     87  mg_u_long arrSize = 0;
    8888  if (!ReadVarLenUL (f, arrSize)) return false;
    8989
    … …  
    141141
    142142bool TextIdx::Read (FILE *f, const TextLevelInfo &levelInfo,
    143             unsigned long docNum) {
     143            mg_u_long docNum) {
    144144  if (!SeekTextIdx (f, levelInfo, docNum)) return false;
    145145  return Read (f);
    … …  
    166166
    167167bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo,
    168           unsigned long docNum) {
     168          mg_u_long docNum) {
    169169  if (docNum == 0 || docNum > levelInfo.numEntries) return false;
    170170 
    171   unsigned long seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN;
     171  mg_u_long seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN;
    172172  if (fseek (f, seekPos, SEEK_SET) != 0) return false;
    173173 
    … …  
    176176
    177177
    178 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsigned long arrSize) {
     178bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize) {
    179179  // clear the array
    180180  a.erase (a.begin(), a.end());
    … …  
    218218}
    219219 
    220 void CompressTextInfo::SetStart (unsigned long startPos,
     220void CompressTextInfo::SetStart (mg_u_long startPos,
    221221                 unsigned char startBit,
    222222                 unsigned char startWhich) {
    … …  
    232232}
    233233
    234 void CompressTextInfo::SetEnd (unsigned long endPos,
     234void CompressTextInfo::SetEnd (mg_u_long endPos,
    235235                   unsigned char endBit) {
    236236  if (inDoc) {

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FText.h

    r16583 r23508  
    3838class BitAddr {
    3939public:
    40   unsigned long byte;
     40  mg_u_long byte;
    4141  unsigned char bit;
    4242
    … …  
    5252public:
    5353  UCArray levelTag;
    54   unsigned long textIdxPtr;
    55   unsigned long numEntries;
     54  mg_u_long textIdxPtr;
     55  mg_u_long numEntries;
    5656
    5757  TextLevelInfo ();
    … …  
    9696  // does a seek and reads the appropriate record
    9797  bool Read (FILE *f, const TextLevelInfo &levelInfo,
    98          unsigned long docNum);
     98         mg_u_long docNum);
    9999
    100100  bool Read (FILE *f);
    … …  
    109109
    110110bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo,
    111           unsigned long docNum);
     111          mg_u_long docNum);
    112112
    113113
    … …  
    115115typedef vector<TextIdx> TextIdxArray;
    116116
    117 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsigned long arrSize);
     117bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize);
    118118bool WriteTextIdxArray (FILE *f, const TextIdxArray &a);
    119119
    … …  
    135135  // set the start of a level (closing off the last opening
    136136  // tag if needed)
    137   void SetStart (unsigned long startPos,
     137  void SetStart (mg_u_long startPos,
    138138         unsigned char startBit,
    139139         unsigned char startWhich);
    … …  
    141141  // if in a document, it will set the end, add the document to the
    142142  // list of document ptrs, and then call ResetStart
    143   void SetEnd (unsigned long endPos,
     143  void SetEnd (mg_u_long endPos,
    144144           unsigned char endBit);
    145145};

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.cpp

    r16583 r23508  
    3131
    3232bool FragLevelConvert::Read (FILE *invfFile,
    33                  unsigned long levelPtr,
    34                  unsigned long _numFrags,
    35                  unsigned long _numLevelDocs) {
     33                 mg_u_long levelPtr,
     34                 mg_u_long _numFrags,
     35                 mg_u_long _numLevelDocs) {
    3636  levelStarts.erase (levelStarts.begin(), levelStarts.end());
    3737  numFrags = _numFrags;
    … …  
    4343  stdio_bitio_buffer buffer(invfFile);
    4444 
    45   unsigned long pTag = numLevelDocs*2;
    46   unsigned long B = BIO_Bblock_Init (numFrags+pTag, pTag);
    47   unsigned long fragNum = 0;
    48   unsigned long 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;
    4949  for (i=0; i<numLevelDocs; ++i) {
    50     unsigned long delta = buffer.bblock_decode (B, NULL)-1;
     50    mg_u_long delta = buffer.bblock_decode (B, NULL)-1;
    5151    fragNum += delta;
    5252
    … …  
    7070}
    7171
    72 bool FragLevelConvert::FragToLevel (unsigned long fragNum,
    73                     unsigned long &levelDocNum) const {
     72bool FragLevelConvert::FragToLevel (mg_u_long fragNum,
     73                    mg_u_long &levelDocNum) const {
    7474  // do binary search for something containing this fragment number
    75   unsigned long low = 1, high = numLevelDocs;
    76   unsigned long mid;
     75  mg_u_long low = 1, high = numLevelDocs;
     76  mg_u_long mid;
    7777
    7878  while ((mid = (low+high)/2) >= 1 && low <= high) {
    … …  
    8989
    9090bool FragLevelConvert::LevelToLevel (FragLevelConvert sectionLevelConvert,
    91          unsigned long levelNum, unsigned long &DocNum) {
     91         mg_u_long levelNum, mg_u_long &DocNum) {
    9292 
    9393  if (levelNum==1) {
    … …  
    9595    return true;
    9696  }
    97   unsigned long levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1;
     97  mg_u_long levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1;
    9898
    9999  if (FragToLevel(levelfragnum, DocNum)) {

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.h

    r16583 r23508  
    2323#define FRAGLEVELCONVERT_H
    2424
     25#include "mglong.h"
    2526#include <stdio.h>
    2627#include "UCArray.h"
    27 
    2828
    2929/*Notes about levelStarts (kjm18) - this is my interpretation of
    … …  
    4545protected:
    4646  // note fragment start is one before before real start
    47   vector<unsigned long> levelStarts;
    48   unsigned long numFrags;
    49   unsigned long numLevelDocs;
     47  vector<mg_u_long> levelStarts;
     48  mg_u_long numFrags;
     49  mg_u_long numLevelDocs;
    5050 
    5151public:
    5252  FragLevelConvert ();
    5353
    54   bool Read (FILE *invfFile, unsigned long levelPtr,
    55          unsigned long _numFrags, unsigned long _numLevelDocs);
     54  bool Read (FILE *invfFile, mg_u_long levelPtr,
     55         mg_u_long _numFrags, mg_u_long _numLevelDocs);
    5656
    57   bool FragToLevel (unsigned long fragNum, unsigned long &levelDocNum) const;
     57  bool FragToLevel (mg_u_long fragNum, mg_u_long &levelDocNum) const;
    5858
    5959  // this function converts from one level number to another
    … …  
    6464  // coresponding level
    6565  bool LevelToLevel (FragLevelConvert sectionLevelConvert,
    66            unsigned long levelNum, unsigned long &DocNum);
     66           mg_u_long levelNum, mg_u_long &DocNum);
    6767};
    6868

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/GSDLQueryParser.cpp

    r16583 r23508  
    140140}
    141141
    142 static unsigned long GetStemMethod(LexEl &el, int defaultStemMethod) {
     142static u_long GetStemMethod(LexEl &el, int defaultStemMethod) {
    143143  // here expect el to contain some of c,s,i,u,f,a -- see mg_files.h CHAR_FLAG_STEM_* constants
    144   unsigned long stem = (unsigned long)defaultStemMethod;
     144  u_long stem = (u_long)defaultStemMethod;
    145145     
    146146  UCArray::const_iterator here = el.text.begin();
    … …  
    205205    if (termNode.stemMethod == STEM_INVALID) { // error so backtrack
    206206      here = oldHere;
    207       termNode.stemMethod = (unsigned long)defaultStemMethod;
     207      termNode.stemMethod = (u_long)defaultStemMethod;
    208208    }
    209209      } else here = oldHere; //ignore - wrong syntax

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/IndexData.cpp

    r16583 r23508  
    163163  // read in the information from the dictionary
    164164  block_dict_el tagEl;
    165   unsigned long tagElNum;
     165  mg_u_long tagElNum;
    166166  if (!SearchBlockDictEl (dictFile, biTags, bdh.entries_per_tblk,
    167167              bdh.tag_dict_size, level, tagEl, tagElNum))

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/IndexData.h

    r16583 r23508  
    5959  // level specific information
    6060  UCArray curLevel; // last level that was loaded
    61   unsigned long curLevelNum;
     61  mg_u_long curLevelNum;
    6262  FragLevelConvert levelConverter;
    6363  ApproxWeightsData weightData;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/MGQuery.cpp

    r16583 r23508  
    4040void PrintNode (ostream &s, QueryNode *node, int indent) {
    4141  if (node == NULL) {
    42     PrintIndentText (s, "NULL\n", indent);
     42    PrintIndentText (s, (char*)"NULL\n", indent);
    4343  } else {
    4444    node->Print (s, indent+2);
    … …  
    102102
    103103  // combine document numbers and corresponding ranks
    104   unsigned long leftI = 0;
    105   unsigned long rightI = 0;
    106   unsigned long outI = 0;
     104  mg_u_long leftI = 0;
     105  mg_u_long rightI = 0;
     106  mg_u_long outI = 0;
    107107  while (leftI < result.docs.size() &&
    108108     rightI < rightResult.docs.size()) {
    … …  
    146146
    147147void AndQueryNode::Print (ostream &s, int indent) const {
    148   PrintIndentText (s, "leftNode:\n", indent);
     148  PrintIndentText (s, (char*)"leftNode:\n", indent);
    149149  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);
    152152  PrintNode (s, rightNode, indent+2);
    153153}
    … …  
    187187
    188188  // combine document numbers and corresponding ranks
    189   unsigned long leftSize = leftResult.docs.size();
    190   unsigned long rightSize = rightResult.docs.size();
    191   unsigned long leftI = 0;
    192   unsigned long rightI = 0;
    193   unsigned long leftDocNum = 0;
    194   unsigned long 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;
    195195  while (leftI < leftSize || rightI < rightSize) {
    196196    // check leftI
    197197    if (leftI < leftResult.docs.size())
    198198      leftDocNum = leftResult.docs[leftI];
    199     else leftDocNum = ULONG_MAX;
     199    else leftDocNum = (mg_u_long)ULONG_MAX;
    200200   
    201201    // check rightI
    202202    if (rightI < rightResult.docs.size())
    203203      rightDocNum = rightResult.docs[rightI];
    204     else rightDocNum = ULONG_MAX;
     204    else rightDocNum = (mg_u_long)ULONG_MAX;
    205205   
    206206    // combine
    … …  
    250250
    251251void OrQueryNode::Print (ostream &s, int indent) const {
    252   PrintIndentText (s, "leftNode:\n", indent);
     252  PrintIndentText (s, (char*)"leftNode:\n", indent);
    253253  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);
    256256  PrintNode (s, rightNode, indent+2);
    257257}
    … …  
    297297
    298298  // combine document numbers and corresponding ranks
    299   unsigned long queryI = 0;
    300   unsigned long notI = 0;
    301   unsigned long outI = 0;
     299  mg_u_long queryI = 0;
     300  mg_u_long notI = 0;
     301  mg_u_long outI = 0;
    302302  while (queryI < result.docs.size() &&
    303303     notI < notResult.docs.size()) {
    … …  
    342342
    343343void NotQueryNode::Print (ostream &s, int indent) const {
    344   PrintIndentText (s, "queryNode:\n", indent);
     344  PrintIndentText (s, (char*)"queryNode:\n", indent);
    345345  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);
    348348  PrintNode (s, notNode, indent+2);
    349349}
    … …  
    361361  // get information about this tag
    362362  block_dict_el tagEl;
    363   unsigned long tagElNum;
     363  mg_u_long tagElNum;
    364364  if (!SearchBlockDictEl (indexData.dictFile, indexData.biTags,
    365365              indexData.bdh.entries_per_tblk,
    … …  
    373373  stdio_bitio_buffer buffer(indexData.invfFile);
    374374 
    375   unsigned long pTag = tagEl.frag_occur*2;
    376   unsigned long B = BIO_Bblock_Init (indexData.bdh.num_frags+pTag, pTag);
    377   unsigned long fragNum = 0;
    378   unsigned long 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;
    379379  FragRange thisFrag;
    380380  for (i=0; i<tagEl.frag_occur; ++i) {
    381381    // get start
    382     unsigned long delta = buffer.bblock_decode (B, NULL)-1;
     382    mg_u_long delta = buffer.bblock_decode (B, NULL)-1;
    383383    fragNum += delta;
    384384
    … …  
    427427
    428428  // get a list of term numbers
    429   vector<unsigned long> equivNums;
     429  vector<mg_u_long> equivNums;
    430430  FindWordNumbers (indexData, term, stemMethod, equivNums);
    431431
    … …  
    435435  FragData tempFragData2;
    436436  UCArray equivWord;
    437   vector<unsigned long>::iterator here = equivNums.begin();
    438   vector<unsigned long>::iterator end = equivNums.end();
     437  vector<mg_u_long>::iterator here = equivNums.begin();
     438  vector<mg_u_long>::iterator end = equivNums.end();
    439439  while (here != end) {
    440440    // get the information for this word
    … …  
    565565
    566566void ProxMatchQueryNode::Print (ostream &s, int indent) const {
    567   PrintIndentText (s, "PROXMATCH\n", indent);
     567  PrintIndentText (s, (char*)"PROXMATCH\n", indent);
    568568  if (tagNodePtr != NULL) tagNodePtr->Print (s, indent+2);
    569569 
    … …  
    583583void BrowseQueryNode::Calculate (IndexData &indexData, BrowseQueryResult &result) const {
    584584
    585   unsigned long number=0;
     585  mg_u_long number=0;
    586586  FindNearestWordNumber(indexData, term, number);
    587587  if (number + startPosition > 0 ) {
    … …  
    604604
    605605void BrowseQueryNode::Print (ostream &s, int indent) const {
    606   PrintIndentText(s, "BROWSEQUERYNODE\n", indent);
     606  PrintIndentText(s, (char*)"BROWSEQUERYNODE\n", indent);
    607607  PrintIndent (s, indent+2);
    608608  s << "TERM:"<<term<<"\n";
    … …  
    631631
    632632  // make weights into ranks if needed
    633   unsigned long i;
     633  mg_u_long i;
    634634  if (queryInfo.sortByRank || queryInfo.needRankInfo) {
    635635    for (i=0; i<result.ranks.size(); ++i) {
    … …  
    639639  }
    640640 
    641   unsigned long resultsSize = queryInfo.maxDocs;
     641  mg_u_long resultsSize = queryInfo.maxDocs;
    642642  if (resultsSize == 0 || resultsSize > result.docs.size())
    643643    resultsSize = result.docs.size();
    … …  
    655655           result.docs.begin()+resultsSize,
    656656           result.ranks.begin()+resultsSize,
    657            (unsigned long) result.ranks.size()-resultsSize,
     657           (mg_u_long) result.ranks.size()-resultsSize,
    658658           gtRank);
    659659
    … …  
    665665  if (queryInfo.exactWeights &&
    666666      (queryInfo.sortByRank || queryInfo.needRankInfo)) {
    667     unsigned long exactDiskPtr =
     667    mg_u_long exactDiskPtr =
    668668      indexData.levels.levelInfo[indexData.curLevel].exactWeightsDiskPtr;
    669669   
    … …  
    737737  }
    738738 
    739   unsigned long DocNum = 0;
    740  
    741   for (unsigned long 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) {
    742742
    743743    // do an if ! here????

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/MGQuery.h

    r16583 r23508  
    107107
    108108
    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)
    111111
    112112/* NOTE: range stuff - the range values are for the previous term relative
    … …  
    123123public:
    124124  UCArray term;
    125   unsigned long termWeight;
    126   unsigned long stemMethod;
    127   signed long startRange; // range relative to last term
    128   signed long 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;
    129129 
    130130  void Clear ();
    … …  
    161161 public:
    162162  UCArray term;
    163   signed long startPosition;
    164   unsigned long numTerms;
     163  mg_s_long startPosition;
     164  mg_u_long numTerms;
    165165
    166166  void Clear();

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Makefile.in

    r22070 r23508  
    5353CC = @CC@
    5454CXX = @CXX@
    55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
    56 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
     55CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
     56CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
    5757DEFS = @DEFS@
    5858RANLIB = @RANLIB@
    … …  
    6060INSTALL_DATA = @INSTALL_DATA@
    6161INSTALL_PROGRAM = @INSTALL_PROGRAM@
    62 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     62LDFLAGS = @LDFLAGS@
    6363LIBS = ../lib/libmgpplib.a $(AFLIBS) -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@
    6464TOUCH = echo timestamp >

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/QueryResultsSort.h

    r16583 r23508  
    4545void PushHeap (DocNumArray::iterator docNumHeap,
    4646           RandomAccessIterator parallelHeap,
    47            unsigned long heapSize,
     47           mg_u_long heapSize,
    4848           const Compare &comp) {
    49   unsigned long holeIndex = heapSize-1;
    50   unsigned long parent = (holeIndex - 1) / 2;
     49  mg_u_long holeIndex = heapSize-1;
     50  mg_u_long parent = (holeIndex - 1) / 2;
    5151  while (holeIndex > 0 && comp (*(parallelHeap+parent),
    5252                *(parallelHeap+holeIndex))) {
    … …  
    6363void AdjustHeap (DocNumArray::iterator docNumHeap,
    6464             RandomAccessIterator parallelHeap,
    65              unsigned long holeIndex,
    66              unsigned long heapSize,
     65             mg_u_long holeIndex,
     66             mg_u_long heapSize,
    6767             const Compare &comp) {
    68   unsigned long secondChild = 2 * holeIndex + 2;
     68  mg_u_long secondChild = 2 * holeIndex + 2;
    6969  while (secondChild < heapSize) {
    7070    if (comp(*(parallelHeap + secondChild),
    … …  
    8787void PopHeap (DocNumArray::iterator docNumHeap,
    8888          RandomAccessIterator parallelHeap,
    89           unsigned long heapSize,
     89          mg_u_long heapSize,
    9090          const Compare &comp) {
    9191  swap (*(parallelHeap), *(parallelHeap+heapSize-1));
    9292  swap (*(docNumHeap), *(docNumHeap+heapSize-1));
    93   AdjustHeap (docNumHeap, parallelHeap, (unsigned long)0, heapSize-1, comp);
     93  AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize-1, comp);
    9494}
    9595
    … …  
    9797void MakeHeap (DocNumArray::iterator docNumHeap,
    9898           RandomAccessIterator parallelHeap,
    99            unsigned long size,
     99           mg_u_long size,
    100100           const Compare &comp) {
    101101  if (size < 2) return;
    102102 
    103   unsigned long i = 0;
     103  mg_u_long i = 0;
    104104  for (i=1; i<=size; ++i)
    105105    PushHeap (docNumHeap, parallelHeap, i, comp);
    … …  
    110110void SortHeap (DocNumArray::iterator docNumHeap,
    111111           RandomAccessIterator parallelHeap,
    112            unsigned long size,
     112           mg_u_long size,
    113113           const Compare &comp) {
    114114  if (size < 2) return;
    115115
    116   unsigned long i;
     116  mg_u_long i;
    117117  for (i=size; i>1; --i)
    118118    PopHeap (docNumHeap, parallelHeap, i, comp);
    … …  
    123123void SelectAddHeap (DocNumArray::iterator docNumHeap,
    124124            RandomAccessIterator parallelHeap,
    125             unsigned long heapSize,
     125            mg_u_long heapSize,
    126126            DocNumArray::iterator docNumAdd,
    127127            RandomAccessIterator parallelAdd,
    128             unsigned long addSize,
     128            mg_u_long addSize,
    129129            const Compare &comp) {
    130   unsigned long i;
     130  mg_u_long i;
    131131  for (i=0; i<addSize; ++i) {
    132132    if (comp(*(parallelAdd+i), *(parallelHeap))) {
    133133      swap (*(docNumHeap), *(docNumAdd+i));
    134134      swap (*(parallelHeap), *(parallelAdd+i));
    135       AdjustHeap (docNumHeap, parallelHeap, (unsigned long)0, heapSize, comp);
     135      AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize, comp);
    136136    }
    137137  }

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Queryer.cpp

    r19822 r23508  
    6363int main (int argc, char **argv) {
    6464  int ch;
    65   char *textfilename = "";
    66   char *indexfilename = "";
    67   char *basePath = "";
     65  char *textfilename = (char*)"";
     66  char *indexfilename = (char*)"";
     67  char *basePath = (char*)"";
    6868 
    6969  opterr = 0;
    … …  
    186186    // print
    187187    UCArray docText;
    188     unsigned long docNum = 0;
     188    u_long docNum = 0;
    189189    cin >> docNum;
    190190    cin.getline(query, 2048, '\n'); // eat up return

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Terms.cpp

    r16583 r23508  
    5050    << t.stemMethod << ")equiv terms(";
    5151 
    52   unsigned long i;
     52  mg_u_long i;
    5353  for (i=0; i<t.equivTerms.size(); ++i) {
    5454    s << t.equivTerms[i] << ", ";
    … …  
    8383
    8484  s << "termFreqs: ";
    85   for (unsigned long i=0; i<termFreqs.size(); ++i)
     85  for (mg_u_long i=0; i<termFreqs.size(); ++i)
    8686    s << termFreqs[i] << ", ";
    8787 
    … …  
    9494ostream &operator<< (ostream &s, const QueryResult &r) {
    9595  s << "docs: ";
    96   unsigned long i;
     96  mg_u_long i;
    9797  for (i=0; i<r.docs.size(); ++i)
    9898    s << r.docs[i] << ", ";
    … …  
    136136ostream &operator<< (ostream &s, const ExtQueryResult &r) {
    137137  s << "docs: ";
    138   unsigned long i;
     138  mg_u_long i;
    139139  for (i=0; i<r.docs.size(); ++i)
    140140    s << r.docs[i] << ", ";
    … …  
    181181ostream &operator<< (ostream &s, const BrowseQueryResult &r) {
    182182  s << "terms: ";
    183   unsigned long i;
     183  mg_u_long i;
    184184  for (i=0; i<r.termFreqs.size(); ++i)
    185185    s << r.termFreqs[i] << ", ";
    … …  
    207207void FindWordNumbers (IndexData &indexData,
    208208              const UCArray &term,
    209               unsigned long stemMethod,
    210               vector<unsigned long> &equivWords) {
     209              mg_u_long stemMethod,
     210              vector<mg_u_long> &equivWords) {
    211211  equivWords.erase (equivWords.begin(), equivWords.end());
    212212
    … …  
    222222    // don't need to stem the word,
    223223    // find the word number(s) for this term
    224     unsigned long wordElNum = 0;
    225     unsigned long numLevels = indexData.bdh.num_levels;
     224    mg_u_long wordElNum = 0;
     225    mg_u_long numLevels = indexData.bdh.num_levels;
    226226    word_block_dict_el wordDictEl;
    227227    wordDictEl.SetNumLevels (numLevels);
    … …  
    245245  unsigned char mgWord[MAXSTEMLEN + 1];
    246246  UCArray stemTerm;
    247   unsigned long stemmerNum = 0;
     247  mg_u_long stemmerNum = 0;
    248248
    249249  /* [JFG - Mar 06: Accent folding patch] */
    … …  
    266266  // need to look up this term in the appropriate dictionary
    267267  stem_block_dict_el stemDictEl;
    268   unsigned long stemElNum;
     268  mg_u_long stemElNum;
    269269  bool result = false;
    270270 
    … …  
    287287void ReadTermFragData (IndexData &indexData,
    288288               bool needFragFreqs,
    289                unsigned long termNum,
     289               mg_u_long termNum,
    290290               FragData &fragData,
    291291               FragRangeArray *fragLimits,
    … …  
    294294
    295295  // look up the word in the dictionary
    296   unsigned long numLevels = indexData.bdh.num_levels;
     296  mg_u_long numLevels = indexData.bdh.num_levels;
    297297  word_block_dict_el wordDictEl;
    298298  wordDictEl.SetNumLevels (numLevels);
    … …  
    311311  stdio_bitio_buffer buffer (indexData.invfFile);
    312312   
    313   unsigned long B = BIO_Bblock_Init (indexData.bdh.num_frags,
     313  mg_u_long B = BIO_Bblock_Init (indexData.bdh.num_frags,
    314314                     wordDictEl.frag_occur);
    315   unsigned long fragNum = 0;
    316   unsigned long termFreq = 0;
    317 
    318   unsigned long fragLimitI = 0;
    319   unsigned long 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;
    320320  for (i=0; i<wordDictEl.frag_occur; ++i) {
    321321    fragNum += buffer.bblock_decode (B, NULL);
    … …  
    359359
    360360  // do or
    361   unsigned long f1I = 0, f1Size = f1.fragNums.size();
    362   unsigned long 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();
    363363  while (f1I < f1Size || f2I < f2Size) {
    364364    if (f2I < f2Size &&
    … …  
    395395             FragData &fragData,
    396396             const FragData &comFragData,
    397              signed long startRange,
    398              signed long endRange,
     397             mg_s_long startRange,
     398             mg_s_long endRange,
    399399             const FragRangeArray *fragLimits) {
    400400  // sanity check on range
    401401  if (startRange > endRange) {
    402     signed long temp = endRange;
     402    mg_s_long temp = endRange;
    403403    endRange = startRange;
    404404    startRange = temp;
    … …  
    409409    fragData.matchDocs = comFragData.matchDocs;
    410410 
    411   unsigned long fragDataI = 0;
    412   unsigned long fragDataSize = fragData.fragNums.size();
    413   unsigned long comFragDataI = 0;
    414   unsigned long comFragDataSize = comFragData.fragNums.size();
    415   unsigned long fragLimitI = 0;
    416   unsigned long fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size();
    417   unsigned long 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;
    418418
    419419  while (fragDataI < fragDataSize &&
    420420     comFragDataI < comFragDataSize) {
    421     signed long fragNum = (signed long)fragData.fragNums[fragDataI];
    422     signed long comFragNum = (signed long)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];
    423423   
    424424    // go to the right fragment limit (for the com frag)
    425425    if (fragLimits != NULL) {
    426426      while (fragLimitI+1 < fragLimitSize &&
    427          comFragNum > (signed long)(*fragLimits)[fragLimitI+1].rangeStart) {
     427         comFragNum > (mg_s_long)(*fragLimits)[fragLimitI+1].rangeStart) {
    428428    ++fragLimitI;
    429429      }
    … …  
    432432    if (fragNum <= comFragNum+startRange ||
    433433    (fragLimits!=NULL &&
    434      fragNum<=(signed long)(*fragLimits)[fragLimitI].rangeStart)) {
     434     fragNum<=(mg_s_long)(*fragLimits)[fragLimitI].rangeStart)) {
    435435      ++fragDataI;
    436436     
    437437    } else if (fragNum > comFragNum+endRange ||
    438438           (fragLimits!=NULL &&
    439         fragNum>(signed long)(*fragLimits)[fragLimitI].rangeEnd)) {
     439        fragNum>(mg_s_long)(*fragLimits)[fragLimitI].rangeEnd)) {
    440440      ++comFragDataI;
    441441     
    … …  
    471471             const UCArray &tag,
    472472             const UCArray &term,
    473              unsigned long stemMethod,
    474              unsigned long termWeight,
     473             mg_u_long stemMethod,
     474             mg_u_long termWeight,
    475475             UCArrayVector &equivTerms,
    476476             QueryResult &result) {
    … …  
    480480
    481481  // log (N / ft)
    482   unsigned long N = indexData.levels.levelInfo[indexData.curLevel].numEntries;
     482  mg_u_long N = indexData.levels.levelInfo[indexData.curLevel].numEntries;
    483483  float wordLog = log((double)N / (double)termData.matchDocs);
    484484
    … …  
    491491  float Wdt;
    492492 
    493   unsigned long termDataI = 0;
    494   unsigned long termDataSize = termData.fragNums.size();
    495   unsigned long levelDocNum = 0;
    496  
    497   unsigned long termDocFreq = 0;
    498   unsigned long lastLevelDocNum = 0;
    499   unsigned long 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;
    500500 
    501501  while (termDataI < termDataSize) {
    … …  
    552552                const UCArray &tag,
    553553                const UCArray &term,
    554                 unsigned long stemMethod,
    555                 unsigned long termWeight,
     554                mg_u_long stemMethod,
     555                mg_u_long termWeight,
    556556                UCArrayVector &equivTerms,
    557557                QueryResult &result) {
    … …  
    571571  float Wdt;
    572572 
    573   unsigned long termDataI = 0;
    574   unsigned long termDataSize = termData.fragNums.size();
    575   unsigned long levelDocNum = 0;
    576  
    577   unsigned long termDocFreq = 0;
    578   unsigned long lastLevelDocNum = 0;
    579   unsigned long overallwordfreq = 0;
    580   unsigned long resultI = 0;
    581   unsigned long resultSize = result.docs.size();
    582   unsigned long 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;
    583583 
    584584 
    … …  
    664664  bool needRanks = (queryInfo.sortByRank || queryInfo.needRankInfo);
    665665
    666   unsigned long termDataI = 0;
    667   unsigned long termDataSize = termData.fragNums.size();
    668   unsigned long levelDocNum = 0;
    669  
    670   unsigned long lastLevelDocNum = 0;
    671 
    672   unsigned long resultI = 0;
    673   unsigned long resultSize = result.docs.size();
    674   unsigned long 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;
    675675 
    676676  while (termDataI < termDataSize) {
    … …  
    732732void FindNearestWordNumber (IndexData &indexData,
    733733                const UCArray &term,
    734                 unsigned long &number) {
     734                mg_u_long &number) {
    735735
    736736    // find the word number for this term
    737     unsigned long wordElNum = 0;
    738     unsigned long numLevels = indexData.bdh.num_levels;
     737    mg_u_long wordElNum = 0;
     738    mg_u_long numLevels = indexData.bdh.num_levels;
    739739    word_block_dict_el wordDictEl;
    740740    wordDictEl.SetNumLevels (numLevels);
    … …  
    748748
    749749void GetTermList(IndexData &indexData,
    750          unsigned long startTerm,
    751          unsigned long numTerms,
     750         mg_u_long startTerm,
     751         mg_u_long numTerms,
    752752         TermFreqArray &terms) {
    753753
    … …  
    777777
    778778void GetTermList(IndexData &indexData,
    779          unsigned long startTerm,
    780          unsigned long numTerms,
     779         mg_u_long startTerm,
     780         mg_u_long numTerms,
    781781         UCArrayVector &terms) {
    782782

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Terms.h

    r16583 r23508  
    2424
    2525#include "IndexData.h"
     26#include "mglong.h"
    2627
    2728#if defined(GSDL_USE_OBJECTSPACE)
    … …  
    3839  // general query information
    3940  UCArray docLevel;
    40   unsigned long maxDocs; // 0 = all
     41  mg_u_long maxDocs; // 0 = all
    4142  bool sortByRank;
    4243  bool exactWeights;
    … …  
    5758  int stemMethod;
    5859  UCArrayVector equivTerms; // the stemmed and casefolded variants of the term
    59   unsigned long matchDocs; // tf for level - num levels
     60  mg_u_long matchDocs; // tf for level - num levels
    6061               // containing this term
    61   unsigned long termFreq;  // overall term freq - num words that
     62  mg_u_long termFreq;  // overall term freq - num words that
    6263                // are this term
    6364  void Clear ();
    … …  
    7273
    7374typedef vector<float> RankArray;
    74 typedef vector<unsigned long> DocNumArray;
     75typedef vector<mg_u_long> DocNumArray;
    7576
    7677class QueryResult {
    … …  
    8182  TermFreqArray termFreqs;
    8283
    83   unsigned long actualNumDocs;
     84  mg_u_long actualNumDocs;
    8485  void Clear ();
    8586  QueryResult ();
    … …  
    9091bool operator== (const QueryResult &r1, const QueryResult &r2);
    9192
    92 typedef vector<unsigned long> FragNumArray;
    93 typedef vector<unsigned long> FragFreqArray;
     93typedef vector<mg_u_long> FragNumArray;
     94typedef vector<mg_u_long> FragFreqArray;
    9495
    9596class FragData {
    9697public:
    97   unsigned long matchDocs;    // ft for level
     98  mg_u_long matchDocs;    // ft for level
    9899  FragNumArray fragNums;
    99100  FragFreqArray fragFreqs;
    … …  
    106107class FragRange {
    107108public:
    108   unsigned long rangeStart;
    109   unsigned long rangeEnd;
     109  mg_u_long rangeStart;
     110  mg_u_long rangeEnd;
    110111
    111112  void Clear () { rangeStart = rangeEnd = 0; }
    … …  
    119120void FindWordNumbers (IndexData &indexData,
    120121              const UCArray &term,
    121               unsigned long stemMethod,
    122               vector<unsigned long> &equivWords);
     122              mg_u_long stemMethod,
     123              vector<mg_u_long> &equivWords);
    123124
    124125void ReadTermFragData (IndexData &indexData,
    125126               bool needFragFreqs,
    126                unsigned long termNum,
     127               mg_u_long termNum,
    127128               FragData &fragData,
    128129               FragRangeArray *fragLimits,
    … …  
    138139             FragData &fragData,
    139140             const FragData &comFragData,
    140              signed long startRange,
    141              signed long endRange,
     141             mg_s_long startRange,
     142             mg_s_long endRange,
    142143             const FragRangeArray *fragLimits);
    143144
    … …  
    147148             const UCArray &tag,
    148149             const UCArray &term,
    149              unsigned long stemMethod,
    150              unsigned long termWeight,
     150             mg_u_long stemMethod,
     151             mg_u_long termWeight,
    151152             UCArrayVector &equivTerms,
    152153             QueryResult &result);
    … …  
    157158                const UCArray &tag,
    158159                const UCArray &term,
    159                 unsigned long stemMethod,
    160                 unsigned long termWeight,
     160                mg_u_long stemMethod,
     161                mg_u_long termWeight,
    161162                UCArrayVector &equivTerms,
    162163                QueryResult &result);
    … …  
    201202void FindNearestWordNumber (IndexData &indexData,
    202203                const UCArray &term,
    203                 unsigned long &number);
     204                mg_u_long &number);
    204205
    205206void GetTermList(IndexData &indexData,
    206          unsigned long startTerm,
    207          unsigned long numTerms,
     207         mg_u_long startTerm,
     208         mg_u_long numTerms,
    208209         TermFreqArray &terms);
    209210
    210211void GetTermList (IndexData &indexData,
    211          unsigned long startTerm,
    212          unsigned long numTerms,
     212         mg_u_long startTerm,
     213         mg_u_long numTerms,
    213214         UCArrayVector &terms);
    214215

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextEl.cpp

    r16583 r23508  
    246246}
    247247 
    248 static void AddTextEl (TextElArray &doc, unsigned long &docLen,
     248static void AddTextEl (TextElArray &doc, mg_u_long &docLen,
    249249               const TextEl &el) {
    250250  doc.push_back (el);
    … …  
    258258
    259259bool ReadDoc (FileBuf &buf, const UCArray &docTag,
    260           TextElArray &doc, unsigned long &docLen,
     260          TextElArray &doc, mg_u_long &docLen,
    261261          bool compatMode) {
    262262  bool compatInPara = false;
    … …  
    316316// copy of readdoc to get TextElArray from u_char buffer
    317317bool ReadDoc(u_char ** buffer, const UCArray &docTag,
    318          TextElArray &doc, unsigned long &docLen,
     318         TextElArray &doc, mg_u_long &docLen,
    319319         bool compatMode) {
    320320  bool compatInPara = false;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextEl.h

    r16583 r23508  
    6060// returns true if a document could be found
    6161bool ReadDoc (FileBuf &buf, const UCArray &docTag,
    62           TextElArray &doc, unsigned long &docLen,
     62          TextElArray &doc, mg_u_long &docLen,
    6363          bool compatMode=false);
    6464
    6565bool ReadDoc(u_char **buffer, const UCArray &docTag,
    66          TextElArray &doc, unsigned long &docLen,
     66         TextElArray &doc, mg_u_long &docLen,
    6767         bool compatMode=false);
    6868

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextGet.cpp

    r16583 r23508  
    187187                  huff_type type) {
    188188  huff_data * hd;
    189   u_long **   vals;
     189  mg_u_long **   vals;
    190190
    191191  if (!(hd = new huff_data))
    … …  
    326326  if (text_fast_comp_dict == NULL) return false;
    327327 
    328   u_long *p, *end;
     328  uintptr_t *p, *end;
    329329  u_char *fixup;
    330   u_long mem;
    331   u_long fixup_mem;
     330  mg_u_long mem;
     331  mg_u_long fixup_mem;
    332332  int i;  /* [RPAP - Jan 97: Endian Ordering] */
    333333
    … …  
    343343  }
    344344
    345   end = (u_long *) (((u_char *) cd) + mem);
     345  end = (uintptr_t *) (((u_char *) cd) + mem);
    346346  fread (cd, sizeof (u_char), mem, text_fast_comp_dict);
    347347
    … …  
    354354  fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict);
    355355
    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)
    357357    if (IS_FIXUP (p))
    358358      {
    359359    NTOHUL(*p);  /* [RPAP - Jan 97: Endian Ordering] */
    360     *p = *p + (u_long) cd;
     360    *p = *p + (uintptr_t) cd;
    361361      }
    362362
    … …  
    464464
    465465  // 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) &&
    467467          levels.Read (levelFile));
    468468
    … …  
    507507
    508508  // 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))
    510510    return false;
    511511
    … …  
    535535
    536536bool GetDocIdx (TextData &td, const UCArray &docLevel,
    537         unsigned long docNum, TextIdx &docIdx) {
     537        mg_u_long docNum, TextIdx &docIdx) {
    538538  // make sure the text index file was opened successfully
    539539  if (td.textIdxFile == NULL) return false;
    … …  
    551551#define MY_HUFF_DECODE(len, code, mcodes)               \
    552552  do {                                  \
    553     register unsigned long *__min_code = (mcodes);          \
    554     register unsigned long *__mclen = __min_code;           \
    555     register unsigned long __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;                  \
    556556    do                                  \
    557557      {                                 \
    … …  
    565565
    566566bool GetDocText (TextData &td, const UCArray &docLevel,
    567          unsigned long docNum, UCArray &docText) {
     567         mg_u_long docNum, UCArray &docText) {
    568568  // erase the current text
    569569  docText.erase (docText.begin(), docText.end());
    … …  
    581581  auxiliary_dict *ad = cd.ad;
    582582  int which = docIdx.which;
    583   unsigned long num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) -
     583  mg_u_long num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) -
    584584    (docIdx.start.byte*8+(8-docIdx.start.bit));
    585   unsigned long bits = 0;
     585  mg_u_long bits = 0;
    586586
    587587  if (docText.capacity() < docText.size() + num_bits + 1) {

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/TextGet.h

    r16583 r23508  
    4949// get information about where a document starts and finishes
    5050bool GetDocIdx (TextData &td, const UCArray &docLevel,
    51         unsigned long docNum, TextIdx &docIdx);
     51        mg_u_long docNum, TextIdx &docIdx);
    5252
    5353
    5454// decompress a document's text
    5555bool GetDocText (TextData &td, const UCArray &docLevel,
    56          unsigned long docNum, UCArray &docText);
     56         mg_u_long docNum, UCArray &docText);
    5757
    5858#endif

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/UCArray.cpp

    r16583 r23508  
    104104
    105105
    106 bool ReadVarLenUL (FILE *f, unsigned long &n) {
    107   register unsigned long temp = 0;
     106bool ReadVarLenUL (FILE *f, mg_u_long &n) {
     107  register mg_u_long temp = 0;
    108108  register unsigned int bitPos = 0;
    109109  unsigned char b = 0;
    … …  
    121121}
    122122
    123 bool WriteVarLenUL (FILE *f, unsigned long n) {
    124   register unsigned long temp = n;
     123bool WriteVarLenUL (FILE *f, mg_u_long n) {
     124  register mg_u_long temp = n;
    125125  register unsigned char b = 0;
    126126  do {
    … …  
    135135
    136136
    137 bool ReadUL (FILE *f, unsigned long &n) {
    138   if (fread (&n, sizeof (unsigned long), 1, f) <= 0) return false;
     137bool ReadUL (FILE *f, mg_u_long &n) {
     138  if (fread (&n, sizeof (mg_u_long), 1, f) <= 0) return false;
    139139  NTOHUL (n);
    140140  return true;
    … …  
    142142
    143143
    144 bool WriteUL (FILE *f, unsigned long n) {
     144bool WriteUL (FILE *f, mg_u_long n) {
    145145  HTONUL (n);
    146   return (fwrite (&n, sizeof (unsigned long), 1, f) > 0);
     146  return (fwrite (&n, sizeof (mg_u_long), 1, f) > 0);
    147147}
    148148
    … …  
    174174
    175175  // read in the array size
    176   unsigned long arraySize = 0;
     176  mg_u_long arraySize = 0;
    177177  if (!ReadVarLenUL (f, arraySize)) return false;
    178178
    … …  
    382382
    383383
    384 unsigned long PrefixLen (const UCArray &a1, const UCArray &a2) {
    385   unsigned long l = (a1.size() < a2.size()) ? a1.size() : a2.size();
    386   unsigned long i = 0;
     384mg_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;
    387387
    388388  UCArray::const_iterator a1Here = a1.begin();

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/UCArray.h

    r18717 r23508  
    2222#ifndef UCARRAY_H
    2323#define UCARRAY_H
     24
     25#include "mglong.h"
    2426
    2527#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
    … …  
    8183
    8284// used for reading and writing variable length unsigned longs
    83 bool ReadVarLenUL (FILE *f, unsigned long &n);
    84 bool WriteVarLenUL (FILE *f, unsigned long n);
     85bool ReadVarLenUL (FILE *f, mg_u_long &n);
     86bool WriteVarLenUL (FILE *f, mg_u_long n);
    8587
    86 // used for reading and writing unsigned longs
    87 bool ReadUL (FILE *f, unsigned long &n);
    88 bool WriteUL (FILE *f, unsigned long n);
     88// used for reading and writing unsigned longs 
     89bool ReadUL (FILE *f, mg_u_long &n);
     90bool WriteUL (FILE *f, mg_u_long n);
    8991
    9092// used for reading and writing floats
    … …  
    123125typedef vector<UCArray> UCArrayVector;
    124126
    125 unsigned long PrefixLen (const UCArray &a1, const UCArray &a2);
     127mg_u_long PrefixLen (const UCArray &a1, const UCArray &a2);
    126128
    127129// prev == NULL if no previous string

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Weights.cpp

    r16583 r23508  
    2424#include "sysfuncs.h"
    2525
    26 #define MAXBITS (sizeof(unsigned long) * 8)
     26#define MAXBITS (sizeof(mg_u_long) * 8)
    2727
    2828
    … …  
    5353}
    5454
    55 bool ApproxWeightsData::Read (FILE *approxWeightsFile, unsigned long diskPtr,
    56                   unsigned long _numLevelDocs) {
     55bool ApproxWeightsData::Read (FILE *approxWeightsFile, mg_u_long diskPtr,
     56                  mg_u_long _numLevelDocs) {
    5757  Free ();
    5858 
    … …  
    6969
    7070  // allocate buffer for the weights
    71   unsigned long arrSize = (bits*numLevelDocs+sizeof(unsigned long)-1) / 32;
    72   weightBuf = new unsigned long[arrSize];
     71  mg_u_long arrSize = (bits*numLevelDocs+sizeof(mg_u_long)-1) / 32;
     72  weightBuf = new mg_u_long[arrSize];
    7373
    7474  // read in the weights
    75   unsigned long i;
     75  mg_u_long i;
    7676  for (i=0; i<arrSize; ++i) {
    7777    ReadUL (approxWeightsFile, weightBuf[i]);
    … …  
    8181  // (if not small enough table == NULL
    8282  if (bits <= 12) {
    83     unsigned long i, tableSize = (1 << bits);
     83    mg_u_long i, tableSize = (1 << bits);
    8484    table = new float[tableSize];
    8585    table[0] = L;
    … …  
    9191}
    9292
    93 float ApproxWeightsData::GetLowerApproxDocWeight (unsigned long levelDocNum) {
     93float ApproxWeightsData::GetLowerApproxDocWeight (mg_u_long levelDocNum) {
    9494  // sanity check
    9595  if (bits == 0 || weightBuf == NULL) return 1.0;
    9696
    97   register unsigned long c, pos;
    98   register unsigned long *dw;
     97  register mg_u_long c, pos;
     98  register mg_u_long *dw;
    9999
    100100  // get the compressed version of the weight
    … …  
    114114
    115115
    116 float GetExactDocWeight (FILE *exactWeightsFile, unsigned long diskPtr,
    117              unsigned long levelDocNum) {
     116float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr,
     117             mg_u_long levelDocNum) {
    118118  // go to the appropriate place in the weights file
    119119  fseek (exactWeightsFile, diskPtr+sizeof(float)*levelDocNum, SEEK_SET);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/Weights.h

    r16583 r23508  
    2323#define WEIGHTS_H
    2424
     25#include "mglong.h"
    2526#include <stdio.h>
    2627
    … …  
    2930public:
    3031  unsigned char bits;
    31   unsigned long mask;
     32  mg_u_long mask;
    3233  double L;
    3334  double B;
    34   unsigned long numLevelDocs;
    35   unsigned long *weightBuf;
     35  mg_u_long numLevelDocs;
     36  mg_u_long *weightBuf;
    3637  float *table;   // precomputed translation table
    3738 
    … …  
    4142  void Free (); // frees any allocated memory
    4243 
    43   bool Read (FILE *approxWeightsFile, unsigned long diskPtr,
    44          unsigned long _numLevelDocs);
     44  bool Read (FILE *approxWeightsFile, mg_u_long diskPtr,
     45         mg_u_long _numLevelDocs);
    4546
    46   float GetLowerApproxDocWeight (unsigned long levelDocNum);
     47  float GetLowerApproxDocWeight (mg_u_long levelDocNum);
    4748};
    4849
    … …  
    5051// diskPtr points to the start of the exact document weights
    5152// for this level
    52 float GetExactDocWeight (FILE *exactWeightsFile, unsigned long diskPtr,
    53              unsigned long levelDocNum);
     53float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr,
     54             mg_u_long levelDocNum);
    5455
    5556

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/WordData.h

    r16583 r23508  
    2424
    2525 public:
    26   unsigned long docCount;
    27   unsigned long wordCount;
     26  mg_u_long docCount;
     27  mg_u_long wordCount;
    2828
    2929  inline void read(FILE *f)
    … …  
    3636    }
    3737
    38   inline unsigned long documents()
     38  inline mg_u_long documents()
    3939    {
    4040      return docCount;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/build.h

    r16583 r23508  
    7777
    7878
    79 extern unsigned long invf_buffer_size;
     79extern mg_u_long invf_buffer_size;
    8080/*
    8181 * 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  
    4242huff_data char_huff[2];
    4343huff_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;
     44mg_u_long *char_codes[2], *lens_codes[2];
     45mg_u_long Words_disk = 0;
     46mg_u_long Chars_disk = 0;
    4747
    4848
    … …  
    5555  dict_hash_table *ht;
    5656  u_char **words;
    57   u_long ht_size;
     57  mg_u_long ht_size;
    5858
    5959  ht_size = prime (cfh->hd.num_codes * HASH_RATIO);
    … …  
    9999
    100100      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    }
    102108      *allwords = val + copy;
    103109
    … …  
    108114    {
    109115      register u_char **wptr;
    110       register unsigned long tsize = ht->size;
    111       register unsigned long hashval, step;
     116      register mg_u_long tsize = ht->size;
     117      register mg_u_long hashval, step;
    112118
    113119      HASH (hashval, step, allwords, tsize);
    … …  
    166172    return COMPERROR;
    167173
    168   Words_disk = sizeof (u_long);
     174  Words_disk = sizeof (mg_u_long);
    169175
    170176  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  
    2424typedef struct dict_hash_table
    2525  {
    26     u_long size;
     26    mg_u_long size;
    2727    huff_data *hd;
    28     u_long *codes;
     28    mg_u_long *codes;
    2929    u_char **words;
    3030    u_char **table[1];
    … …  
    4040extern huff_data char_huff[2];
    4141extern 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;
     42extern mg_u_long *char_codes[2], *lens_codes[2];
     43extern mg_u_long Words_disk;
     44extern mg_u_long Chars_disk;
    4545
    4646

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/hash.h

    r16583 r23508  
    2626    do {                        \
    2727        register u_char *p=wd;          \
    28         register long len = *p++;       \
    29         register unsigned long hval;        \
     28        register mg_s_long len = *p++;      \
     29        register mg_u_long hval;        \
    3030        if (len>25) len = 25;           \
    3131        for (hval=0; len; --len)        \

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/invf.cpp

    r16583 r23508  
    104104}
    105105
    106 void word_dict_el::SetNumLevels (unsigned long numLevels) {
     106void word_dict_el::SetNumLevels (mg_u_long numLevels) {
    107107  if (levelFreqs != NULL) delete [] levelFreqs;
    108   levelFreqs = new unsigned long [numLevels];
    109 }
    110  
    111 bool word_dict_el::Read (FILE *f, unsigned long numLevels) {
     108  levelFreqs = new mg_u_long [numLevels];
     109}
     110 
     111bool word_dict_el::Read (FILE *f, mg_u_long numLevels) {
    112112  if (!dict_el::Read (f)) return false;
    113113
    114114  if (levelFreqs == NULL) return false;
    115115 
    116   unsigned long i;
     116  mg_u_long i;
    117117  for (i=0; i<numLevels; ++i) {
    118118    if (!ReadUL (f, levelFreqs[i])) return false;
    … …  
    123123
    124124bool word_dict_el::Write (FILE *f, const UCArray *lastEl,
    125               unsigned long numLevels) const {
     125              mg_u_long numLevels) const {
    126126  if (!dict_el::Write (f, lastEl)) return false;
    127127
    128128  if (levelFreqs == NULL) return false;
    129129
    130   unsigned long i;
     130  mg_u_long i;
    131131  for (i=0; i<numLevels; ++i) {
    132132    if (!WriteUL (f, levelFreqs[i])) return false;
    … …  
    229229}
    230230
    231 void word_block_dict_el::SetNumLevels (unsigned long numLevels) {
     231void word_block_dict_el::SetNumLevels (mg_u_long numLevels) {
    232232  if (levelFreqs != NULL) delete [] levelFreqs;
    233   levelFreqs = new unsigned long [numLevels];
    234 }
    235 
    236 bool word_block_dict_el::Read (FILE *f, unsigned long numLevels) {
     233  levelFreqs = new mg_u_long [numLevels];
     234}
     235
     236bool word_block_dict_el::Read (FILE *f, mg_u_long numLevels) {
    237237  if (!block_dict_el::Read (f)) return false;
    238238 
    239239  if (levelFreqs == NULL) return false;
    240240 
    241   unsigned long i;
     241  mg_u_long i;
    242242  for (i=0; i<numLevels; ++i) {
    243243    if (!ReadUL (f, levelFreqs[i])) return false;
    … …  
    248248
    249249bool word_block_dict_el::Write (FILE *f, const UCArray *lastEl,
    250                 unsigned long numLevels) const {
     250                mg_u_long numLevels) const {
    251251  if (!block_dict_el::Write (f, lastEl)) return false;
    252252 
    253253  if (levelFreqs == NULL) return false;
    254254 
    255   unsigned long i;
     255  mg_u_long i;
    256256  for (i=0; i<numLevels; ++i) {
    257257    if (!WriteUL (f, levelFreqs[i])) return false;
    … …  
    288288 
    289289  // read in the array size
    290   unsigned long arraySize = 0;
     290  mg_u_long arraySize = 0;
    291291  if (!ReadVarLenUL (f, arraySize)) return false;
    292292 
    … …  
    383383 
    384384  // read in the array size
    385   unsigned long arraySize = 0;
     385  mg_u_long arraySize = 0;
    386386  if (!ReadVarLenUL (f, arraySize)) return false;
    387387 
    388388  // read in the array
    389   unsigned long wordNum;
     389  mg_u_long wordNum;
    390390  while (arraySize > 0) {
    391391    if (!ReadUL (f, wordNum)) return false;
    … …  
    404404  if (!WriteVarLenUL (f, equivWords.size())) return false;
    405405
    406   vector<unsigned long>::const_iterator here = equivWords.begin();
    407   vector<unsigned long>::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();
    408408  while (here != end) {
    409409    if (!WriteUL (f, (*here))) return false;
    … …  
    464464
    465465bool SearchElNum (const block_idx &bIdx,
    466           unsigned long entriesPerBlock,
    467           unsigned long elNum,
    468           unsigned long &blockIdxNum,
    469           unsigned long &blockStartElNum) {
     466          mg_u_long entriesPerBlock,
     467          mg_u_long elNum,
     468          mg_u_long &blockIdxNum,
     469          mg_u_long &blockStartElNum) {
    470470  blockIdxNum = 0;
    471471  blockStartElNum = 0;
    … …  
    481481
    482482bool SearchEl (const block_idx &bIdx,
    483            unsigned long entriesPerBlock,
     483           mg_u_long entriesPerBlock,
    484484           const UCArray &el,
    485            unsigned long &blockIdxNum,
    486            unsigned long &blockStartElNum) {
     485           mg_u_long &blockIdxNum,
     486           mg_u_long &blockStartElNum) {
    487487  blockIdxNum = 0;
    488488  blockStartElNum = 0;
    489489
    490   unsigned long begin = 0;
    491   unsigned long bIdxEnd = bIdx.size();
    492   unsigned long end = bIdxEnd;
    493   unsigned long 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;
    494494  while (begin < end) {
    495495    mid = (begin+end)/2;
    … …  
    517517bool SearchBlockDictElNum (FILE *dictFile,
    518518               const block_idx &bIdx,
    519                unsigned long entriesPerBlock,
    520                unsigned long dictSize,
    521                unsigned long elNum,
     519               mg_u_long entriesPerBlock,
     520               mg_u_long dictSize,
     521               mg_u_long elNum,
    522522               block_dict_el &dictEl) {
    523523  UCArrayClear (dictEl.el);
    … …  
    525525
    526526  // find the block that contains the element
    527   unsigned long blockIdxNum, curElNum;
     527  mg_u_long blockIdxNum, curElNum;
    528528  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    529529            blockIdxNum, curElNum))
    … …  
    541541bool SearchBlockDictEl (FILE *dictFile,
    542542            const block_idx &bIdx,
    543             unsigned long entriesPerBlock,
    544             unsigned long dictSize,
     543            mg_u_long entriesPerBlock,
     544            mg_u_long dictSize,
    545545            const UCArray &el,
    546546            block_dict_el &dictEl,
    547             unsigned long &elNum) {
     547            mg_u_long &elNum) {
    548548  UCArrayClear (dictEl.el);
    549549
    550550  // find the block that contains the element
    551   unsigned long blockIdxNum;
     551  mg_u_long blockIdxNum;
    552552  if (!SearchEl (bIdx, entriesPerBlock, el,
    553553         blockIdxNum, elNum))
    554554    return false;
    555555
    556   unsigned long blockEndElNum = elNum + entriesPerBlock;
     556  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    557557  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    558558
    … …  
    576576bool SearchWordBlockDictElNum (FILE *dictFile,
    577577                   const block_idx &bIdx,
    578                    unsigned long entriesPerBlock,
    579                    unsigned long dictSize,
    580                    unsigned long numLevels,
    581                    unsigned long elNum,
     578                   mg_u_long entriesPerBlock,
     579                   mg_u_long dictSize,
     580                   mg_u_long numLevels,
     581                   mg_u_long elNum,
    582582                   word_block_dict_el &dictEl) {
    583583  UCArrayClear (dictEl.el);
    … …  
    585585
    586586  // find the block that contains the element
    587   unsigned long blockIdxNum, curElNum;
     587  mg_u_long blockIdxNum, curElNum;
    588588  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    589589            blockIdxNum, curElNum))
    … …  
    601601bool SearchWordBlockDictEl (FILE *dictFile,
    602602                const block_idx &bIdx,
    603                 unsigned long entriesPerBlock,
    604                 unsigned long dictSize,
    605                 unsigned long numLevels,
     603                mg_u_long entriesPerBlock,
     604                mg_u_long dictSize,
     605                mg_u_long numLevels,
    606606                const UCArray &el,
    607607                word_block_dict_el &dictEl,
    608                 unsigned long &elNum) {
     608                mg_u_long &elNum) {
    609609  UCArrayClear (dictEl.el);
    610610
    611611  // find the block that contains the element
    612   unsigned long blockIdxNum;
     612  mg_u_long blockIdxNum;
    613613  if (!SearchEl (bIdx, entriesPerBlock, el,
    614614         blockIdxNum, elNum))
    615615    return false;
    616616
    617   unsigned long blockEndElNum = elNum + entriesPerBlock;
     617  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    618618  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    619619
    … …  
    637637bool SearchStemBlockDictElNum (FILE *dictFile,
    638638                   const block_idx &bIdx,
    639                    unsigned long entriesPerBlock,
    640                    unsigned long dictSize,
    641                    unsigned long elNum,
     639                   mg_u_long entriesPerBlock,
     640                   mg_u_long dictSize,
     641                   mg_u_long elNum,
    642642                   stem_block_dict_el &dictEl) {
    643643  UCArrayClear (dictEl.el);
    … …  
    645645
    646646  // find the block that contains the element
    647   unsigned long blockIdxNum, curElNum;
     647  mg_u_long blockIdxNum, curElNum;
    648648  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    649649            blockIdxNum, curElNum))
    … …  
    661661bool SearchStemBlockDictEl (FILE *dictFile,
    662662                const block_idx &bIdx,
    663                 unsigned long entriesPerBlock,
    664                 unsigned long dictSize,
     663                mg_u_long entriesPerBlock,
     664                mg_u_long dictSize,
    665665                const UCArray &el,
    666666                stem_block_dict_el &dictEl,
    667                 unsigned long &elNum) {
     667                mg_u_long &elNum) {
    668668  UCArrayClear (dictEl.el);
    669669
    670670  // find the block that contains the element
    671   unsigned long blockIdxNum;
     671  mg_u_long blockIdxNum;
    672672  if (!SearchEl (bIdx, entriesPerBlock, el,
    673673         blockIdxNum, elNum))
    674674    return false;
    675675
    676   unsigned long blockEndElNum = elNum + entriesPerBlock;
     676  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    677677  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    678678
    … …  
    696696bool PartialMatchSearchWordBlockDictEl (FILE *dictFile,
    697697                 const block_idx &bIdx,
    698                  unsigned long entriesPerBlock,
    699                  unsigned long dictSize,
    700                  unsigned long numLevels,
     698                 mg_u_long entriesPerBlock,
     699                 mg_u_long dictSize,
     700                 mg_u_long numLevels,
    701701                 const UCArray &el,
    702702                 word_block_dict_el &dictEl,
    703                  vector<unsigned long> &elNumList,
     703                 vector<mg_u_long> &elNumList,
    704704                 bool casefold) {
    705705
    706706  UCArrayClear (dictEl.el);
    707707  elNumList.erase (elNumList.begin(), elNumList.end());
    708   unsigned long elNum;
     708  mg_u_long elNum;
    709709  // find the block that contains the element
    710   unsigned long blockIdxNum;
     710  mg_u_long blockIdxNum;
    711711  // will this work??
    712712  if (!SearchEl (bIdx, entriesPerBlock, el,
    … …  
    714714    return false;
    715715  }
    716   unsigned long blockEndElNum = elNum + entriesPerBlock;
     716  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    717717  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    718718 
    … …  
    770770bool NearestSearchWordBlockDictEl (FILE *dictFile,
    771771                   const block_idx &bIdx,
    772                    unsigned long entriesPerBlock,
    773                    unsigned long dictSize,
    774                    unsigned long numLevels,
     772                   mg_u_long entriesPerBlock,
     773                   mg_u_long dictSize,
     774                   mg_u_long numLevels,
    775775                   const UCArray &el,
    776776                   word_block_dict_el &dictEl,
    777                    unsigned long &elNum) {
     777                   mg_u_long &elNum) {
    778778
    779779  UCArrayClear (dictEl.el);
    780780
    781781  // find the block that contains the element
    782   unsigned long blockIdxNum;
     782  mg_u_long blockIdxNum;
    783783  if (!SearchEl (bIdx, entriesPerBlock, el,
    784784         blockIdxNum, elNum))
    785785    return false;
    786786
    787   unsigned long blockEndElNum = elNum + entriesPerBlock;
     787  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    788788  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    789789
    … …  
    809809bool SearchWordBlockDictElNumRange (FILE *dictFile,
    810810                    const block_idx &bIdx,
    811                     unsigned long entriesPerBlock,
    812                     unsigned long dictSize,
    813                     unsigned long numLevels,
    814                     unsigned long elNum,
    815                     unsigned long 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,
    816816                    UCArrayVector &terms) {
    817817
    … …  
    825825 
    826826  // find the block that contains the element
    827   unsigned long blockIdxNum, curElNum;
     827  mg_u_long blockIdxNum, curElNum;
    828828  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    829829            blockIdxNum, curElNum))
    830830    return false;
    831831
    832   unsigned long lastElNum = elNum + numWords - 1;
     832  mg_u_long lastElNum = elNum + numWords - 1;
    833833  if (lastElNum > dictSize) lastElNum = dictSize;
    834834
    … …  
    859859bool SearchWordBlockDictElNumRange (FILE *dictFile,
    860860                    const block_idx &bIdx,
    861                     unsigned long entriesPerBlock,
    862                     unsigned long dictSize,
    863                     unsigned long numLevels,
    864                     unsigned long elNum,
    865                     unsigned long 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,
    866866                    word_block_dict_el_array &terms) {
    867867
    … …  
    876876 
    877877  // find the block that contains the element
    878   unsigned long blockIdxNum, curElNum;
     878  mg_u_long blockIdxNum, curElNum;
    879879  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    880880            blockIdxNum, curElNum))
    881881    return false;
    882882
    883   unsigned long lastElNum = elNum + numWords - 1;
     883  mg_u_long lastElNum = elNum + numWords - 1;
    884884  if (lastElNum > dictSize) lastElNum = dictSize;
    885885

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/invf.h

    r16583 r23508  
    2525#define H_INVF
    2626
     27#include "mglong.h"
    2728#include <stdio.h>
    2829
    … …  
    3233// header info for .invf.dict file
    3334struct invf_dict_header {
    34   unsigned long lookback;
    35   unsigned long word_dict_start;
    36   unsigned long word_dict_size;
    37   unsigned long tag_dict_start;
    38   unsigned long tag_dict_size;
    39   unsigned long num_docs;
    40   unsigned long num_frags;
    41   unsigned long num_words;
    42   unsigned long total_bytes;
    43   unsigned long index_string_bytes;
    44   unsigned long 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;
    4546
    4647  invf_dict_header ();
    … …  
    5556struct dict_el {
    5657  UCArray el; // word or tag
    57   unsigned long frag_occur;
    58   unsigned long freq;
     58  mg_u_long frag_occur;
     59  mg_u_long freq;
    5960
    6061  virtual void Clear ();
    … …  
    6970
    7071struct word_dict_el : public dict_el {
    71   unsigned long *levelFreqs;
     72  mg_u_long *levelFreqs;
    7273
    7374  void Clear ();
    … …  
    7576  ~word_dict_el ();
    7677
    77   void SetNumLevels (unsigned long numLevels);
     78  void SetNumLevels (mg_u_long numLevels);
    7879
    7980  // SetNumLevels should be called before either
    … …  
    8182 
    8283  // Read assumes that the last word is in el
    83   bool Read (FILE *f, unsigned long numLevels);
     84  bool Read (FILE *f, mg_u_long numLevels);
    8485  bool Write (FILE *f, const UCArray *lastEl,
    85           unsigned long numLevels) const;
     86          mg_u_long numLevels) const;
    8687};
    8788
    … …  
    100101  // for blocked dictionaries
    101102
    102   unsigned long entries_per_wblk; // word blocks
    103   unsigned long num_wblks;
    104   unsigned long max_wblk_size;
    105   unsigned long wblk_start;
    106   unsigned long wblk_idx_start;
    107  
    108   unsigned long entries_per_tblk; // tag blocks
    109   unsigned long num_tblks;
    110   unsigned long max_tblk_size;
    111   unsigned long tblk_start;
    112   unsigned long 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;
    113114 
    114115  block_dict_header ();
    … …  
    122123struct block_dict_el {
    123124  UCArray el; // word or tag
    124   unsigned long frag_occur; // # entries in invf file - if have a
     125  mg_u_long frag_occur; // # entries in invf file - if have a
    125126  // word level index, this is the same as freq, otherwise, its the number
    126127  // of fragments containing this word
    127   unsigned long freq; // # of times this word occurs
    128   unsigned long invf_ptr; // pointer into inverted file
     128  mg_u_long freq; // # of times this word occurs
     129  mg_u_long invf_ptr; // pointer into inverted file
    129130
    130131  virtual void Clear ();
    … …  
    140141
    141142struct word_block_dict_el : public block_dict_el {
    142   unsigned long *levelFreqs; // freq of the word at each level
     143  mg_u_long *levelFreqs; // freq of the word at each level
    143144
    144145  void Clear ();
    … …  
    146147  ~word_block_dict_el ();
    147148
    148   void SetNumLevels (unsigned long numLevels);
     149  void SetNumLevels (mg_u_long numLevels);
    149150
    150151  // SetNumLevels should be called before either
    … …  
    152153 
    153154  // Read assumes that the last word is in el
    154   bool Read (FILE *f, unsigned long numLevels);
     155  bool Read (FILE *f, mg_u_long numLevels);
    155156  bool Write (FILE *f, const UCArray *lastEl,
    156           unsigned long numLevels) const;
     157          mg_u_long numLevels) const;
    157158};
    158159
    … …  
    161162struct block_idx_info {
    162163  UCArray el;
    163   unsigned long block_ptr;
     164  mg_u_long block_ptr;
    164165
    165166  block_idx_info ();
    … …  
    179180
    180181struct stem_idx_header {
    181   unsigned long lookback;
    182   unsigned long dict_size;
    183 
    184   unsigned long entries_per_block;
    185   unsigned long num_blocks;
    186   unsigned long max_block_size;
    187   unsigned long blocks_start;
    188   unsigned long block_idx_start;
    189  
    190   unsigned long stemmer_num;
    191   unsigned long 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;
    192193
    193194  stem_idx_header ();
    … …  
    200201struct stem_block_dict_el {
    201202  UCArray el; // word or tag
    202   vector<unsigned long> equivWords;
     203  vector<mg_u_long> equivWords;
    203204 
    204205  stem_block_dict_el ();
    … …  
    220221// with num entries, and a pointer into invf file
    221222struct invf_file_header {
    222   unsigned long no_of_words;
    223   unsigned long no_of_tags;
    224   unsigned long skip_mode;
    225   unsigned long word_level_index; // 1 if word level index
    226   unsigned long 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];
    227228
    228229  invf_file_header ();
    … …  
    242243// the block index is sorted by DictCompare (or DictLTUCArray)
    243244bool SearchElNum (const block_idx &bIdx,
    244           unsigned long entriesPerBlock,
    245           unsigned long elNum,
    246           unsigned long &blockIdxNum,
    247           unsigned long &blockStartElNum);
     245          mg_u_long entriesPerBlock,
     246          mg_u_long elNum,
     247          mg_u_long &blockIdxNum,
     248          mg_u_long &blockStartElNum);
    248249bool SearchEl (const block_idx &bIdx,
    249            unsigned long entriesPerBlock,
     250           mg_u_long entriesPerBlock,
    250251           const UCArray &el,
    251            unsigned long &blockIdxNum,
    252            unsigned long &blockStartElNum);
     252           mg_u_long &blockIdxNum,
     253           mg_u_long &blockStartElNum);
    253254
    254255
    … …  
    258259bool SearchBlockDictElNum (FILE *dictFile,
    259260               const block_idx &bIdx,
    260                unsigned long entriesPerBlock,
    261                unsigned long dictSize,
    262                unsigned long elNum,
     261               mg_u_long entriesPerBlock,
     262               mg_u_long dictSize,
     263               mg_u_long elNum,
    263264               block_dict_el &dictEl);
    264265bool SearchBlockDictEl (FILE *dictFile,
    265266            const block_idx &bIdx,
    266             unsigned long entriesPerBlock,
    267             unsigned long dictSize,
     267            mg_u_long entriesPerBlock,
     268            mg_u_long dictSize,
    268269            const UCArray &el,
    269270            block_dict_el &dictEl,
    270             unsigned long &elNum);
     271            mg_u_long &elNum);
    271272
    272273// assumes the numLevels has been set for dictEl
    273274bool SearchWordBlockDictElNum (FILE *dictFile,
    274275                   const block_idx &bIdx,
    275                    unsigned long entriesPerBlock,
    276                    unsigned long dictSize,
    277                    unsigned long numLevels,
    278                    unsigned long elNum,
     276                   mg_u_long entriesPerBlock,
     277                   mg_u_long dictSize,
     278                   mg_u_long numLevels,
     279                   mg_u_long elNum,
    279280                   word_block_dict_el &dictEl);
    280281bool SearchWordBlockDictEl (FILE *dictFile,
    281282                const block_idx &bIdx,
    282                 unsigned long entriesPerBlock,
    283                 unsigned long dictSize,
    284                 unsigned long numLevels,
     283                mg_u_long entriesPerBlock,
     284                mg_u_long dictSize,
     285                mg_u_long numLevels,
    285286                const UCArray &el,
    286287                word_block_dict_el &dictEl,
    287                 unsigned long &elNum);
     288                mg_u_long &elNum);
    288289
    289290bool SearchStemBlockDictElNum (FILE *dictFile,
    290291                   const block_idx &bIdx,
    291                    unsigned long entriesPerBlock,
    292                    unsigned long dictSize,
    293                    unsigned long elNum,
     292                   mg_u_long entriesPerBlock,
     293                   mg_u_long dictSize,
     294                   mg_u_long elNum,
    294295                   stem_block_dict_el &dictEl);
    295296bool SearchStemBlockDictEl (FILE *dictFile,
    296297                const block_idx &bIdx,
    297                 unsigned long entriesPerBlock,
    298                 unsigned long dictSize,
     298                mg_u_long entriesPerBlock,
     299                mg_u_long dictSize,
    299300                const UCArray &el,
    300301                stem_block_dict_el &dictEl,
    301                 unsigned long &elNum);
     302                mg_u_long &elNum);
    302303
    303304//-----------------------------------------------------
    … …  
    307308bool PartialMatchSearchWordBlockDictEl (FILE *dictFile,
    308309                 const block_idx &bIdx,
    309                  unsigned long entriesPerBlock,
    310                  unsigned long dictSize,
    311                  unsigned long numLevels,
     310                 mg_u_long entriesPerBlock,
     311                 mg_u_long dictSize,
     312                 mg_u_long numLevels,
    312313                 const UCArray &el,
    313314                 word_block_dict_el &dictEl,
    314                  vector<unsigned long> &elNumList,
     315                 vector<mg_u_long> &elNumList,
    315316                 bool casefold);
    316317//----------------------------------------------------------
    … …  
    320321bool NearestSearchWordBlockDictEl (FILE *dictFile,
    321322                const block_idx &bIdx,
    322                 unsigned long entriesPerBlock,
    323                 unsigned long dictSize,
    324                 unsigned long numLevels,
     323                mg_u_long entriesPerBlock,
     324                mg_u_long dictSize,
     325                mg_u_long numLevels,
    325326                const UCArray &el,
    326327                word_block_dict_el &dictEl,
    327                 unsigned long &elNum);
     328                mg_u_long &elNum);
    328329
    329330// returns a list of word_block_dict_el, with no levelfreqs
    330331bool SearchWordBlockDictElNumRange (FILE *dictFile,
    331332                    const block_idx &bIdx,
    332                     unsigned long entriesPerBlock,
    333                     unsigned long dictSize,
    334                     unsigned long numLevels,
    335                     unsigned long elNum,
    336                     unsigned long 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,
    337338                    word_block_dict_el_array &terms);
    338339                   
    … …  
    340341bool SearchWordBlockDictElNumRange (FILE *dictFile,
    341342                    const block_idx &bIdx,
    342                     unsigned long entriesPerBlock,
    343                     unsigned long dictSize,
    344                     unsigned long numLevels,
    345                     unsigned long elNum,
    346                     unsigned long 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,
    347348                    UCArrayVector &terms);
    348349                   

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/ivf.pass1.cpp

    r16583 r23508  
    5151// structure to determine level information
    5252struct LevelWorker {
    53   unsigned long lastLevelDocNum;
    54   unsigned long count;
     53  mg_u_long lastLevelDocNum;
     54  mg_u_long count;
    5555
    5656  LevelWorker () {
    … …  
    6262// note: the word is stored in the map
    6363struct IvfWordInfo {
    64   unsigned long wordCount;      // word frequency
    65   unsigned long fragCount;      // number of fragments that contain the word
    66   unsigned long lastFragNum;    // last fragment to contain the word
    67   unsigned long chunkWordCount; // word frequency within this chunk
    68   unsigned long chunkFragCount; // number of fragments within this chunk that
     64  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
    6969                                //   contain the word
    7070
    … …  
    8181// tags don't require as much information
    8282struct IvfTagInfo {
    83   unsigned long tagCount;       // tag frequency
    84   unsigned long fragCount;      // number of fragments that contain the tag
    85   unsigned long lastFragNum;    // last fragment to contain the tag
    86   unsigned long chunkFragCount; // number of fragments within this chunk that
     83  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
    8787                                //   contain the tag
    8888
    … …  
    109109IvfTagInfoItArray ivfTagInfoOccurOrder;
    110110
    111 static unsigned long chunksWritten;
    112 static unsigned long maxMemNeeded;
    113 
    114 static unsigned long numDocs;
    115 static unsigned long numChunkDocs;
    116 
    117 static unsigned long numFrags;
    118 static unsigned long numChunkFrags;
    119 
    120 static unsigned long numWords;
     111static mg_u_long chunksWritten;
     112static mg_u_long maxMemNeeded;
     113
     114static mg_u_long numDocs;
     115static mg_u_long numChunkDocs;
     116
     117static mg_u_long numFrags;
     118static mg_u_long numChunkFrags;
     119
     120static mg_u_long numWords;
    121121
    122122// the number of document numbers in the inverted file
    123 static unsigned long numChunkEntries;
     123static mg_u_long numChunkEntries;
    124124
    125125// next entry in the inverted file to check memory
    126126// requirements for the current chunk
    127 static unsigned long entryCheckPoint;
     127static mg_u_long entryCheckPoint;
    128128
    129129// information about all the different levels
    … …  
    173173              MAGIC_CHUNK, MG_MESSAGE)))
    174174    return COMPERROR;
    175   fwrite ("    ", sizeof (u_long), 1, ic);  // Space for the maxmem
     175  fwrite ("    ", sizeof (mg_u_long), 1, ic);   // Space for the maxmem
    176176  icb.attachFile (ic);
    177177  icb.encodeStart();
    … …  
    195195
    196196  numChunkEntries = 0;
    197   entryCheckPoint = (unsigned long) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);
     197  entryCheckPoint = (mg_u_long) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);
    198198
    199199  // init the level information
    … …  
    347347
    348348
    349 static unsigned long MemoryRequired (bool wordLevelIndex) {
    350   register unsigned long total = 0;
     349static mg_u_long MemoryRequired (bool wordLevelIndex) {
     350  register mg_u_long total = 0;
    351351
    352352  // add memory required for word entries
    … …  
    372372    if (info.chunkFragCount > 0) {
    373373      // two d entries for each frag entry
    374       unsigned long pTag = info.chunkFragCount*2;
     374      mg_u_long pTag = info.chunkFragCount*2;
    375375      total += BIO_Bblock_Bound (numChunkFrags+pTag, pTag);
    376376    }
    … …  
    385385
    386386/*
    387 static void PrintChunkInfo (unsigned long mem) {
     387static void PrintChunkInfo (mg_u_long mem) {
    388388  cout << "Chunk Number: " << chunksWritten << "\n";
    389389  cout << "numChunkDocs " << numChunkDocs << "\n";
    … …  
    396396  IvfTagInfoMap::iterator tagMapHere = ivfTagInfo.begin();
    397397  IvfTagInfoMap::iterator tagMapEnd = ivfTagInfo.end();
    398   unsigned long tagNum = 0;
     398  mg_u_long tagNum = 0;
    399399  while (tagMapHere != tagMapEnd) {
    400400    cout << (*tagMapHere).first << " " << tagNum
    … …  
    406406*/
    407407
    408 static void OutputChunkInfo (unsigned long mem, bool /*wordLevelIndex*/) {
     408static void OutputChunkInfo (mg_u_long mem, bool /*wordLevelIndex*/) {
    409409  ++chunksWritten;
    410410
    … …  
    493493  // check the amount of memory needed for this chunk
    494494  if (numChunkEntries >= entryCheckPoint) {
    495     unsigned long mem = MemoryRequired (wordLevelIndex);
     495    mg_u_long mem = MemoryRequired (wordLevelIndex);
    496496    if (mem >= invf_buffer_size * CHECK_CLOSE) {
    497497      if (mem > maxMemNeeded) maxMemNeeded = mem;
    498498      OutputChunkInfo (mem, wordLevelIndex);
    499       entryCheckPoint = (unsigned long)
     499      entryCheckPoint = (mg_u_long)
    500500    ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);
    501501     
    502502    } else {
    503       entryCheckPoint = (unsigned long)
     503      entryCheckPoint = (mg_u_long)
    504504    (entryCheckPoint * ((CHECK_FRAC * (invf_buffer_size - mem)) / mem) +
    505505     entryCheckPoint);
    … …  
    513513
    514514
    515 static void CalcInvfDictSize (unsigned long &totalBytes,
    516                   unsigned long &indexStringBytes) {
     515static void CalcInvfDictSize (mg_u_long &totalBytes,
     516                  mg_u_long &indexStringBytes) {
    517517  totalBytes = 0;   // The sum of the length of all words, including
    518518            // the length byte
    … …  
    526526  IvfWordInfoMap::iterator wordEnd = ivfWordInfo.end();
    527527  while (wordHere != wordEnd) {
    528     unsigned long wordSize = (*wordHere).first.size();
     528    mg_u_long wordSize = (*wordHere).first.size();
    529529    totalBytes += wordSize + 1;
    530530    indexStringBytes += wordSize + 2;
    … …  
    541541  IvfTagInfoMap::iterator tagEnd = ivfTagInfo.end();
    542542  while (tagHere != tagEnd) {
    543     unsigned long tagSize = (*tagHere).first.size();
     543    mg_u_long tagSize = (*tagHere).first.size();
    544544    totalBytes += tagSize + 1;
    545545    indexStringBytes += tagSize + 2;
    … …  
    642642
    643643  // write out the updated header
    644   fseek (sp, sizeof (u_long), SEEK_SET);
     644  fseek (sp, sizeof (mg_u_long), SEEK_SET);
    645645  if (!idh.Write (sp)) { fclose (sp); return; }
    646646 
    … …  
    691691
    692692  // write out the word translation table
    693   unsigned long wordDictSize = ivfWordInfoOccurOrder.size();
     693  mg_u_long wordDictSize = ivfWordInfoOccurOrder.size();
    694694  IvfWordInfoItArray::iterator wordItHere = ivfWordInfoOccurOrder.begin();
    695695  IvfWordInfoItArray::iterator wordItEnd = ivfWordInfoOccurOrder.end();
    696   unsigned long oN = 0;
     696  mg_u_long oN = 0;
    697697  while (wordItHere != wordItEnd) {
    698698    register IvfWordInfo &ivfWordInfo = (*(*wordItHere)).second;
    … …  
    703703
    704704  // write out the tag translation table
    705   unsigned long tagDictSize = ivfTagInfoOccurOrder.size();
     705  mg_u_long tagDictSize = ivfTagInfoOccurOrder.size();
    706706  IvfTagInfoItArray::iterator tagItHere = ivfTagInfoOccurOrder.begin();
    707707  IvfTagInfoItArray::iterator tagItEnd = ivfTagInfoOccurOrder.end();
    … …  
    737737
    738738  char *temp_str = msg_prefix;
    739   msg_prefix = "ivf.pass1";
     739  msg_prefix = (char*)"ivf.pass1";
    740740
    741741  // output the last chunk
    742742  if (numChunkDocs > 0) {
    743     unsigned long mem = MemoryRequired (wordLevelIndex);
     743    mg_u_long mem = MemoryRequired (wordLevelIndex);
    744744    OutputChunkInfo (mem, wordLevelIndex);
    745745    if (mem > maxMemNeeded) maxMemNeeded = mem;
    … …  
    751751
    752752  // write out the maximum memory required and close the file
    753   fseek (ic, sizeof (long), 0);
     753  fseek (ic, sizeof (mg_u_long), 0);
    754754  WriteUL (ic, maxMemNeeded);
    755755  fclose (ic);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/ivf.pass2.cpp

    r19822 r23508  
    7979
    8080
    81 static unsigned long numDocs = 0;
    82 static unsigned long numChunkDocs = 0;
    83 static unsigned long numDocsInChunk = 0;
    84 
    85 static unsigned long numFrags = 0;
    86 static unsigned long numFragsInChunk = 0;
    87 static unsigned long chunkStartFragNum = 0;
     81static mg_u_long numDocs = 0;
     82static mg_u_long numChunkDocs = 0;
     83static mg_u_long numDocsInChunk = 0;
     84
     85static mg_u_long numFrags = 0;
     86static mg_u_long numFragsInChunk = 0;
     87static mg_u_long chunkStartFragNum = 0;
    8888
    8989
    … …  
    9191
    9292struct BitPtr {
    93   unsigned long start;
    94   unsigned long here;
    95   unsigned long lastFragNum;
    96   unsigned long lgB;
     93  mg_u_long start;
     94  mg_u_long here;
     95  mg_u_long lastFragNum;
     96  mg_u_long lgB;
    9797 
    9898  void Clear () { start = here = lastFragNum = lgB = 0; }
    … …  
    102102class WordBitPtrs {
    103103protected:
    104   unsigned long numWords;
    105   unsigned long numTags;
    106   unsigned long size;
     104  mg_u_long numWords;
     105  mg_u_long numTags;
     106  mg_u_long size;
    107107  BitPtr *wordBitPtrs;
    108108
    109   void CheckBufOverrun (unsigned long num) {
     109  void CheckBufOverrun (mg_u_long num) {
    110110    if (wordBitPtrs[num].here > wordBitPtrs[num+1].start) {
    111111      cerr << "numDocs: " << numDocs << "\n";
    … …  
    127127  WordBitPtrs () { wordBitPtrs = NULL; Clear(); }
    128128  ~WordBitPtrs ();
    129   void SetSize (unsigned long _numWords,
    130         unsigned long _numTags);
     129  void SetSize (mg_u_long _numWords,
     130        mg_u_long _numTags);
    131131
    132132  void ResetPtrs () {
    133133    if (wordBitPtrs == NULL) return;
    134     unsigned long i;
     134    mg_u_long i;
    135135    for (i=0; i<size; ++i) wordBitPtrs[i].Clear();
    136136  }
    137137 
    138   BitPtr &GetWordBitPtr (unsigned long wordNum)
     138  BitPtr &GetWordBitPtr (mg_u_long wordNum)
    139139    { return wordBitPtrs[wordNum]; }
    140   unsigned long &GetWordStart (unsigned long wordNum)
     140  mg_u_long &GetWordStart (mg_u_long wordNum)
    141141    { return wordBitPtrs[wordNum].start; }
    142   unsigned long &GetWordHere (unsigned long wordNum)
     142  mg_u_long &GetWordHere (mg_u_long wordNum)
    143143    { return wordBitPtrs[wordNum].here; }
    144   void CheckWordBufOverrun (unsigned long wordNum)
     144  void CheckWordBufOverrun (mg_u_long wordNum)
    145145    { CheckBufOverrun (wordNum); }
    146146
    147   BitPtr &GetTagBitPtr (unsigned long tagNum)
     147  BitPtr &GetTagBitPtr (mg_u_long tagNum)
    148148    { return wordBitPtrs[tagNum + numWords]; }
    149   unsigned long &GetTagStart (unsigned long tagNum)
     149  mg_u_long &GetTagStart (mg_u_long tagNum)
    150150    { return wordBitPtrs[tagNum + numWords].start; }
    151   unsigned long &GetTagHere (unsigned long tagNum)
     151  mg_u_long &GetTagHere (mg_u_long tagNum)
    152152    { return wordBitPtrs[tagNum + numWords].here; }
    153   void CheckTagBufOverrun (unsigned long tagNum)
     153  void CheckTagBufOverrun (mg_u_long tagNum)
    154154    { CheckBufOverrun (tagNum + numWords); }
    155155
    156156  BitPtr &GetEndBitPtr ()
    157157    { return wordBitPtrs[size-1]; }
    158   unsigned long &GetEndStart ()
     158  mg_u_long &GetEndStart ()
    159159    { return wordBitPtrs[size-1].start; }
    160   unsigned long &GetEndHere ()
     160  mg_u_long &GetEndHere ()
    161161    { return wordBitPtrs[size-1].here; }
    162162};
    … …  
    165165struct IP2TagInfo {
    166166  bool inTag;
    167   unsigned long startFrag;
    168   unsigned long tagNum;
     167  mg_u_long startFrag;
     168  mg_u_long tagNum;
    169169
    170170  IP2TagInfo () {
    … …  
    183183class OccurToDictConverter {
    184184protected:
    185   unsigned long pos;
    186   unsigned long val;
     185  mg_u_long pos;
     186  mg_u_long val;
    187187  FILE *transFile;
    188188  random_bitio_buffer rbs;
    189189
    190   unsigned long wordDictSize;
    191   unsigned long tagDictSize;
     190  mg_u_long wordDictSize;
     191  mg_u_long tagDictSize;
    192192
    193193  void SeekStart ();
    194   unsigned long TranslateNum (unsigned long num);
     194  mg_u_long TranslateNum (mg_u_long num);
    195195 
    196196public:
    … …  
    198198  ~OccurToDictConverter ();
    199199
    200   void Open (char *filename, unsigned long _wordDictSize,
    201          unsigned long _tagDictSize);
     200  void Open (char *filename, mg_u_long _wordDictSize,
     201         mg_u_long _tagDictSize);
    202202
    203203  // Close frees all allocated memory
    204204  void Close ();
    205205
    206   unsigned long TranslateWord (unsigned long occurNum)
     206  mg_u_long TranslateWord (mg_u_long occurNum)
    207207    { return TranslateNum (occurNum); }
    208   unsigned long TranslateTag (unsigned long occurNum)
     208  mg_u_long TranslateTag (mg_u_long occurNum)
    209209    { return TranslateNum (occurNum+wordDictSize); }
    210210};
    … …  
    214214  mg_ullong start;
    215215  mg_ullong here;
    216   unsigned long lastFragNum;
    217   unsigned long B;
     216  mg_u_long lastFragNum;
     217  mg_u_long B;
    218218
    219219  void Clear () {
    … …  
    230230protected:
    231231  InvfStateRec recCache [ISR_SIZE];
    232   unsigned long startNum;
     232  mg_u_long startNum;
    233233
    234234  FILE *stateFile;
    … …  
    248248  // previous references to state records may be
    249249  // invalidated calling GetRec
    250   InvfStateRec &GetRec (unsigned long num);
     250  InvfStateRec &GetRec (mg_u_long num);
    251251};
    252252
    … …  
    258258static stdio_bitio_buffer chunkBuf;
    259259
    260 static unsigned long ivfMemBufSize = 0;
     260static mg_u_long ivfMemBufSize = 0;
    261261static char *ivfMemBuf = NULL;
    262262
    … …  
    290290}
    291291
    292 void WordBitPtrs::SetSize (unsigned long _numWords,
    293                unsigned long _numTags){
     292void WordBitPtrs::SetSize (mg_u_long _numWords,
     293               mg_u_long _numTags){
    294294  Clear();
    295295  numWords = _numWords;
    … …  
    302302void OccurToDictConverter::SeekStart () {
    303303  if (transFile == NULL) return;
    304   rbs.SEEK_X (sizeof (unsigned long) * 8);
     304  rbs.SEEK_X (sizeof (mg_u_long) * 8);
    305305  pos = 0;
    306306}
    307307
    308 unsigned long OccurToDictConverter::TranslateNum (unsigned long num) {
     308mg_u_long OccurToDictConverter::TranslateNum (mg_u_long num) {
    309309  if (num < pos) SeekStart ();
    310310  while (pos <= num) {
    … …  
    330330}
    331331
    332 void OccurToDictConverter::Open (char *filename, unsigned long _wordDictSize,
    333                  unsigned long _tagDictSize) {
     332void OccurToDictConverter::Open (char *filename, mg_u_long _wordDictSize,
     333                 mg_u_long _tagDictSize) {
    334334  if (transFile != NULL) Close ();
    335335
    … …  
    374374  // open the state file
    375375  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 ());
    378378  if (!(stateFile = fopen (path, "wb+"))) {
    379379    Message ("Unable to create \"%s\"", path);
    … …  
    393393}
    394394
    395 InvfStateRec &InvfStateCache::GetRec (unsigned long num) {
     395InvfStateRec &InvfStateCache::GetRec (mg_u_long num) {
    396396  // see if cached
    397397  if ((num >= startNum) && (num < startNum + ISR_SIZE))
    … …  
    406406  startNum = num - (num % ISR_SIZE);
    407407  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  }
    409414
    410415  return recCache[num-startNum];
    … …  
    413418
    414419
    415 static void ClearCharBuf (char *buf, unsigned long size) {
     420static void ClearCharBuf (char *buf, mg_u_long size) {
    416421  char *end = buf + size;
    417422  while (buf != end) *buf++ = 0;
    … …  
    436441  fseek (dictFile, _idh.tag_dict_start, SEEK_SET);
    437442 
    438   unsigned long tagNum;
     443  mg_u_long tagNum;
    439444  dict_el thisEl;
    440445  for (tagNum = 0; tagNum < _idh.tag_dict_size; ++tagNum) {
    … …  
    456461void CheckIntOverflow (mg_ullong totalIBits, mg_ullong lastTotalIBits) {
    457462  if (totalIBits < lastTotalIBits) {
    458     fprintf(stderr, "ERROR: The totalIBits counter (%d byte 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));
    459464    if (sizeof (mg_ullong) < 8) {
    460465      fprintf(stderr, "       Try compiling with GCC to enable use of 8 bytes for this counter.\n");
    … …  
    481486  word_dict_el wordEl;
    482487  wordEl.SetNumLevels (_idh.num_levels);
    483   unsigned long dictWordNum, p;
     488  mg_u_long dictWordNum, p;
    484489  mg_ullong lastTotalIBits;
    485   unsigned long N = _idh.num_frags;
     490  mg_u_long N = _idh.num_frags;
    486491  for (dictWordNum=0; dictWordNum<_idh.word_dict_size; ++dictWordNum) {
    487492    // lastTotalIBits is used to detect integer overflow
    … …  
    521526  // add the tag entries
    522527  dict_el tagEl;
    523   unsigned long dictTagNum;
     528  mg_u_long dictTagNum;
    524529  N = _idh.num_frags;
    525530  for (dictTagNum=0; dictTagNum<_idh.tag_dict_size; ++dictTagNum) {
    … …  
    556561/*
    557562// assumes the chunk tag information has been placed in .first
    558 static void PrintChunkInfo (unsigned long chunkMem,
    559                 unsigned long numChunkWords,
    560                 unsigned long numChunkTags) {
    561   static unsigned long chunksRead = 0;
     563static void PrintChunkInfo (mg_u_long chunkMem,
     564                mg_u_long numChunkWords,
     565                mg_u_long numChunkTags) {
     566  static mg_u_long chunksRead = 0;
    562567  ++chunksRead;
    563568  cout << "Chunk Number: " << chunksRead << "\n";
    … …  
    571576  TagMapDict::iterator tagMapEnd = tagMapDict.end();
    572577  while (tagMapHere != tagMapEnd) {
    573     unsigned long tagMapNum = (*tagMapHere).second.tagNum;
     578    mg_u_long tagMapNum = (*tagMapHere).second.tagNum;
    574579    cout << (*tagMapHere).first << " " << tagMapNum << " "
    575580     << bitPtrs.GetTagBitPtr(tagMapNum).here << "\n";
    … …  
    590595
    591596  numFragsInChunk = chunkBuf.gamma_decode (NULL) - 1;
    592   unsigned long chunkMem = chunkBuf.gamma_decode (NULL) - 1;
     597  mg_u_long chunkMem = chunkBuf.gamma_decode (NULL) - 1;
    593598
    594599  if (chunkMem > ivfMemBufSize)
    595600    FatalError (1, "Chunk memory size is greater than maximum");
    596601 
    597   unsigned long numChunkWords = chunkBuf.gamma_decode (NULL) - 1;
    598   unsigned long 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;
    599604
    600605 
    … …  
    606611  // "chunkWordCount" in "start" and the "chunkFragCount"
    607612  // in "here"
    608   unsigned long numOccur;
    609   unsigned long wordNum;
     613  mg_u_long numOccur;
     614  mg_u_long wordNum;
    610615  for (numOccur=0; numOccur<numChunkWords; ++numOccur) {
    611616    wordNum = occurConvert.TranslateWord (numOccur);
    … …  
    616621    else wordPtr.here = wordPtr.start;
    617622  }
    618   unsigned long tagNum;
     623  mg_u_long tagNum;
    619624  for (numOccur=0; numOccur<numChunkTags; ++numOccur) {
    620625    tagNum = occurConvert.TranslateTag (numOccur);
    … …  
    628633 
    629634  // create the bit ptrs in dictionary order
    630   unsigned long totalIBits = 0; // only dealing with memory
    631   unsigned long chunkWordCount, chunkFragCount;
     635  mg_u_long totalIBits = 0; // only dealing with memory
     636  mg_u_long chunkWordCount, chunkFragCount;
    632637  for (wordNum=0; wordNum<_idh.word_dict_size; ++wordNum) {
    633638    BitPtr &wordPtr = bitPtrs.GetWordBitPtr (wordNum);
    … …  
    656661    tagPtr.lgB = 0;
    657662    if (chunkFragCount > 0) {
    658       unsigned long pTag = chunkFragCount*2;
     663      mg_u_long pTag = chunkFragCount*2;
    659664      tagPtr.lgB = floorlog_2 (BIO_Bblock_Init_W (numFragsInChunk+pTag,
    660665                          pTag));
    661       unsigned long bLen = BIO_Bblock_Bound (numFragsInChunk+pTag,
     666      mg_u_long bLen = BIO_Bblock_Bound (numFragsInChunk+pTag,
    662667                         pTag);
    663668//        cout << tagNum + _idh.word_dict_size << " ";
    … …  
    732737  FILE *invfFile = create_file (filename, INVF_SUFFIX, "wb",
    733738                MAGIC_INVF, MG_ABORT);
    734   totalIBits += sizeof (unsigned long) * 8; // magic number
     739  totalIBits += sizeof (mg_u_long) * 8; // magic number
    735740  totalIBits += 8 * 200;                    // 200 byte gap -- why??????
    736741  fclose (invfFile);
    … …  
    748753    // add this tag to the inverted list
    749754  BitPtr &tagBitPtr = bitPtrs.GetTagBitPtr (tInfo.tagNum);
    750   unsigned long endFrag = numFrags;
     755  mg_u_long endFrag = numFrags;
    751756  int b = 1 << tagBitPtr.lgB;
    752757
    … …  
    822827      if (wordLevelIndex) ++numFrags;
    823828
    824       unsigned long wordNum = perf_hash (wordHashDict, mgWord);
     829      mg_u_long wordNum = perf_hash (wordHashDict, mgWord);
    825830
    826831      /*
    … …  
    832837      // add this word to the inverted list
    833838      BitPtr &wordBitPtr = bitPtrs.GetWordBitPtr (wordNum);
    834       unsigned long fragNum = numFrags;
     839      mg_u_long fragNum = numFrags;
    835840      int b = 1 << wordBitPtr.lgB;
    836841 
    … …  
    881886
    882887  // write out the word information
    883   unsigned long wordNum;
     888  mg_u_long wordNum;
    884889  int b;
    885   unsigned long currFragNum;
    886   unsigned long delta;
    887   unsigned long currFreq;
     890  mg_u_long currFragNum;
     891  mg_u_long delta;
     892  mg_u_long currFreq;
    888893  for (wordNum=0; wordNum<idh.word_dict_size; ++wordNum) {
    889894    // go to the end of the last inverted file entry
    … …  
    916921
    917922  // write out the tag information
    918   unsigned long tagNum;
    919   unsigned long currTagStart;
    920   unsigned long currTagEnd;
     923  mg_u_long tagNum;
     924  mg_u_long currTagStart;
     925  mg_u_long currTagEnd;
    921926  for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) {
    922927    // go to the end of the last inverted file entry
    … …  
    9981003
    9991004
    1000 static void CondenseInvfFile (char *filename, unsigned long &bytesOutput) {
     1005static void CondenseInvfFile (char *filename, mg_u_long &bytesOutput) {
    10011006  FILE *inInvfFile = open_file (filename, INVF_SUFFIX, "rb",
    10021007                MAGIC_INVF, MG_ABORT);
    … …  
    10051010
    10061011  // skip the magic number
    1007   fseek (outInvfFile, sizeof (unsigned long), SEEK_SET);
     1012  fseek (outInvfFile, sizeof (mg_u_long), SEEK_SET);
    10081013 
    10091014  // write the inverted file header -- use defaults for most things
    … …  
    10171022
    10181023  // process each meaningful byte in the file
    1019   unsigned long numEntries = ifh.no_of_words + ifh.no_of_tags;
    1020   unsigned long entryNum;
     1024  mg_u_long numEntries = ifh.no_of_words + ifh.no_of_tags;
     1025  mg_u_long entryNum;
    10211026  mg_ullong lastStart = 0;
    10221027  for (entryNum = 0; entryNum < numEntries; ++entryNum) {
    … …  
    10281033    lastStart = stateRec.start;
    10291034   
    1030     unsigned long oldEntryStart = stateRec.start >> 3;
    1031     unsigned long oldEntryStartOver = stateRec.start & 7; // should be 0
    1032     unsigned long oldEntryEnd = (stateRec.here + 7) >> 3;  // byte after end
    1033     unsigned long 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;
    10341039
    10351040    fseek (inInvfFile, oldEntryStart, SEEK_SET);
    … …  
    10571062    Message ("Could not truncate invf.");
    10581063#else
    1059   ftruncate (fileno (outInvfFile), bytesOutput);
     1064  if(ftruncate (fileno (outInvfFile), bytesOutput) != 0)
     1065    {
     1066      fprintf(stderr, "Could not truncate invf");
     1067    }
    10601068#endif
    10611069
    … …  
    10631071}
    10641072
    1065 static void OutputInvfIdx (char *filename, unsigned long invfNumBytes) {
     1073static void OutputInvfIdx (char *filename, mg_u_long invfNumBytes) {
    10661074  FILE *invfIdxFile = create_file (filename, INVF_IDX_SUFFIX, "wb",
    10671075                   MAGIC_INVI, MG_ABORT);
    10681076
    10691077  // process each meaningful byte in the file
    1070   unsigned long numEntries = idh.word_dict_size + idh.tag_dict_size;
    1071   unsigned long entryNum;
     1078  mg_u_long numEntries = idh.word_dict_size + idh.tag_dict_size;
     1079  mg_u_long entryNum;
    10721080  for (entryNum = 0; entryNum < numEntries; ++entryNum) {
    10731081    InvfStateRec &stateRec = invfState.GetRec (entryNum);
    … …  
    11011109  // condense the inverted file and truncate it
    11021110  // this function also writes out the inverted header
    1103   unsigned long invfNumBytes = 0;
     1111  mg_u_long invfNumBytes = 0;
    11041112  CondenseInvfFile (filename, invfNumBytes);
    11051113

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/locallib.cpp

    r16583 r23508  
    7575
    7676int
    77 huffcodebits (unsigned long *A, int n)
     77huffcodebits (mg_u_long *A, int n)
    7878{
    7979  int i, j, tot = 0, bits = 0, v1, v2, *B;
    … …  
    111111
    112112int
    113 modelbits (unsigned long *A, int n)
     113modelbits (mg_u_long *A, int n)
    114114{
    115115  int i, bits = 0, last, N = 0;
    … …  
    159159
    160160
    161 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * /*mem*/,
    162           u_long * disk) {
     161int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * /*mem*/,
     162          mg_u_long * disk) {
    163163  if (disk)
    164164    (*disk) += sizeof (*cdh);
    … …  
    185185
    186186int
    187 Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk)
     187Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk)
    188188{
    189189  int i;  /* [RPAP - Jan 97: Endian Ordering] */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/locallib.h

    r16583 r23508  
    3131int vecentropy (int *A, int n);
    3232
    33 int huffcodebits (unsigned long *A, int n);
     33int huffcodebits (mg_u_long *A, int n);
    3434
    35 int modelbits (unsigned long *A, int n);
     35int modelbits (mg_u_long *A, int n);
    3636
    3737int prime (int p);
    3838
    3939
    40 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem, u_long * disk);
     40int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, mg_u_long * disk);
    4141
    42 int Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk);
     42int Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk);
    4343
    4444

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mg_errors.cpp

    r19822 r23508  
    3333char *mg_errorstrs[] =
    3434{
    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"};
    4242
    4343

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mg_files.cpp

    r22291 r23508  
    125125FILE *
    126126open_named_file (const char *name, const char *mode,
    127          u_long magic_num, int err_mode)
    128 {
    129   unsigned long magic;
     127         mg_u_long magic_num, int err_mode)
     128{
     129  mg_u_long magic;
    130130  FILE *f = NULL;
    131131  char *err;
    … …  
    134134  if (!f)
    135135    {
    136       err = "Unable to open \"%s\"";
     136      err = (char*)"Unable to open \"%s\"";
    137137      goto error;
    138138    }
    … …  
    142142      if (fread (&magic, sizeof (magic), 1, f) != 1)
    143143    {
    144       err = "No magic number \"%s\"";
     144      err = (char*)"No magic number \"%s\"";
    145145      goto error;
    146146    }
    … …  
    150150      if (!IS_MAGIC (magic))
    151151    {
    152       err = "No MG magic number \"%s\"";
     152      err = (char*)"No MG magic number \"%s\"";
    153153      goto error;
    154154    }
    … …  
    156156      if (magic != magic_num)
    157157    {
    158       err = "Wrong MG magic number \"%s\"";
     158      err = (char*)"Wrong MG magic number \"%s\"";
    159159      goto error;
    160160    }
    … …  
    187187FILE *
    188188open_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)
    190190{
    191191  char path[512];
    … …  
    215215FILE *
    216216create_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)
    218218{
    219219  FILE *f = NULL;
    … …  
    223223  if (!f)
    224224    {
    225       err = "Unable to open \"%s\"";
     225      err = (char*)"Unable to open \"%s\"";
    226226      goto error;
    227227    }
    … …  
    231231    if (fwrite (&magic_num, sizeof (magic_num), 1, f) != 1)
    232232      {
    233     err = "Couldn't write magic number \"%s\"";
     233    err = (char*)"Couldn't write magic number \"%s\"";
    234234    goto error;
    235235      }
    … …  
    267267FILE *
    268268create_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)
    270270{
    271271  char path[512];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mg_files.h

    r16583 r23508  
    2727/* Magic numbers for the different types of files */
    2828
    29 #define GEN_MAGIC(a,b,c,d) ((unsigned long)(((a)<<24) + ((b)<<16) + \
     29#define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \
    3030                        ((c)<<8) + (d)))
    3131
    … …  
    5151#define MAGIC_PARAGRAPH     GEN_MAGIC('M','G','P', 0 )
    5252#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)
    5454
    5555
    … …  
    268268   an error message.   */
    269269FILE *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);
    271271
    272272
    … …  
    286286   an error message.   */
    287287FILE *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);
    289289
    290290
    … …  
    305305   an error message.   */
    306306FILE *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);
    308308
    309309
    … …  
    322322   an error message.   */
    323323FILE *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  
    5353#include "WordData.h"
    5454
    55 #define MAXBITS (sizeof(unsigned long) * 8)
     55#define MAXBITS (sizeof(mg_u_long) * 8)
    5656
    5757#define is_power_of_two(a) ((a) != 0 && (((a) & ((a)-1)) == 0))
    … …  
    6363    float saving;
    6464    float char_bit_cost;
    65     u_long num_trans;
     65    mg_u_long num_trans;
    6666    u_char *word;
    6767  }
    … …  
    6969
    7070static DictWordData *Words[2];
    71 static u_long Num[2];
    72 static u_long chars[2];
     71static mg_u_long Num[2];
     72static mg_u_long chars[2];
    7373
    7474#define KIND(p) (((p) >= Words[0] && (p) < Words[0] + Num[0]) ? 0 : 1)
    … …  
    8080  {
    8181    DictWordData **wd;
    82     u_long num_wds;
    83     u_long chars;
     82    mg_u_long num_wds;
     83    mg_u_long chars;
    8484  }
    8585DictData;
    … …  
    9090static compression_stats_header csh;
    9191
    92 static char *file_name = "";
    93 static u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
     92static char *file_name = (char*)"";
     93static mg_u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
    9494
    9595
    … …  
    9898static void Method3 (int k);
    9999static void Select_all (void);
    100 static u_long WriteOutWords (char *, u_long, int);
     100static mg_u_long WriteOutWords (char *, mg_u_long, int);
    101101static int DecFreqIncWL (void *a, void *b);
    102102static int OccuranceOrder (void *a, void *b);
    … …  
    111111  int lookback = 2;
    112112  double k = 0;
    113   u_long mem_reqd;
     113  mg_u_long mem_reqd;
    114114  opterr = 0;
    115115  msg_prefix = argv[0];
    … …  
    224224{
    225225  FILE *f;
    226   unsigned long i;
     226  mg_u_long i;
    227227  f = open_file (filename, TEXT_STATS_DICT_SUFFIX, "rb",
    228228         MAGIC_STATS_DICT, MG_ABORT);  /* [RPAP - Feb 97: WIN32 Port] */
    … …  
    429429CalcCharCounts (DictWordData ** wd, int num,
    430430        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];
    435435  huff_data hd;
    436436  int i;
    … …  
    441441  for (i = 0; i < num; ++i, ++wd)
    442442    {
    443       u_long freq = (*wd)->documents();
     443      mg_u_long freq = (*wd)->documents();
    444444      u_char *buf = (*wd)->word;
    445445      int len = *buf++;
    … …  
    448448      escape[idx] += freq;
    449449      for (; len; --len, ++buf)
    450     char_freqs[idx][(u_long) (*buf)] += freq;
     450    char_freqs[idx][(mg_u_long) (*buf)] += freq;
    451451    }
    452452  Generate_Huffman_Data (256, char_freqs[0], &hd, NULL);
    … …  
    466466
    467467inline 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],
    469469                   char * char_lens[2], char *len_lens[2],
    470470                   double esc[2], int num_trans)
    … …  
    477477      u_char *buf = (*word)->word;
    478478      int     len = *buf++;
    479       u_long  freq = (*word)->documents();
     479      mg_u_long  freq = (*word)->documents();
    480480      int     idx = KIND (*word);
    481481
    482482      cbc = len_lens[idx][len];
    483483      for (; len; --len, ++buf)
    484     cbc += char_lens[idx][(u_long) (*buf)];
     484    cbc += char_lens[idx][(mg_u_long) (*buf)];
    485485
    486486      (*word)->char_bit_cost = (cbc + esc[idx]) * freq;
    … …  
    500500CalcBitCost (DictWordData ** discard_word, int discard_num,
    501501         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)
    503503{
    504504  char *char_lens[2];
    … …  
    544544
    545545inline 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)
    547547{
    548548  DictWordData *word = wordHeap[0];
    … …  
    573573  int recalcs = 0;
    574574  double freqs_trans[2], total;
    575   u_long escape[2];
     575  mg_u_long escape[2];
    576576  DictWordData **keep_heap, **discard_heap;
    577577
    … …  
    769769
    770770
    771 static u_long
     771static mg_u_long
    772772Write_data (FILE * f, DictData * dd, int lookback)
    773773{
    774   u_long mem_reqd;
     774  mg_u_long mem_reqd;
    775775  huff_data *hd;
    776776  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];
    781781  u_char *lastword[MAX_HUFFCODE_LEN + 1];
    782782
    783   if (!(freqs = new long [dd->num_wds]))
     783  if (!(freqs = new mg_s_long [dd->num_wds]))
    784784    FatalError (1, "Unable to allocate memory for freqs");
    785785
    … …  
    871871{
    872872  unsigned int j;
    873   long freqs[256];
     873  mg_s_long freqs[256];
    874874  DictWordData **wd = dd->wd;
    875875  huff_data *hd;
    … …  
    882882      int len = *buf++;
    883883      for (; len; --len, ++buf)
    884     freqs[(u_long) (*buf)] += (*wd)->documents();
     884    freqs[(mg_u_long) (*buf)] += (*wd)->documents();
    885885    }
    886886
    … …  
    907907{
    908908  unsigned int j;
    909   long freqs[16];
     909  mg_s_long freqs[16];
    910910  DictWordData **wd = dd->wd;
    911911  huff_data *hd;
    … …  
    934934
    935935
    936 static u_long
    937 WriteOutWords (char *file_name, u_long type, int lookback)
     936static mg_u_long
     937WriteOutWords (char *file_name, mg_u_long type, int lookback)
    938938{
    939939  FILE *f;
    940940  int i;
    941   u_long mem_reqd = 0;
     941  mg_u_long mem_reqd = 0;
    942942
    943943  compression_dict_header cdh;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_decompress_text.cpp

    r19822 r23508  
    3939int main (int argc, char **argv) {
    4040  int ch;
    41   char *filename = "";
    42   char *basePath = "";
     41  char *filename = (char*)"";
     42  char *basePath = (char*)"";
    4343  UCArray level;
    4444  SetCStr (level, "Document", 8);
    … …  
    7878 
    7979  TextLevelInfo levelInfo = td.levels.levelInfo[level];
    80   unsigned long docNum = 1;
     80  u_long docNum = 1;
    8181  UCArray docText;
    8282  while (docNum <= levelInfo.numEntries) {

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_fast_comp_dict.cpp

    r19822 r23508  
    6767
    6868
    69 static u_long mem_for_comp_dict (char *filename);
     69static mg_u_long mem_for_comp_dict (char *filename);
    7070static void load_comp_dict (char *filename);
    7171static void save_fast_dict (char *filename);
    … …  
    7676static void *cur;
    7777static u_char *fixup;
    78 static u_long mem, fixup_mem;
     78static mg_u_long mem, fixup_mem;
    7979
    8080int main (int argc, char **argv)
    8181{
    8282  int ch;
    83   char *filename = "";
     83  char *filename = (char*)"";
    8484  opterr = 0;
    8585  msg_prefix = argv[0];
    … …  
    120120#endif
    121121
    122   if ((u_long) cur > (u_long) buffer + mem)
     122  if ((uintptr_t) cur > (uintptr_t) buffer + mem)
    123123    FatalError (1, "The buffer was not big enough for the dictionary");
    124124
    … …  
    186186unfixup_buffer ()
    187187{
    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)
    190190    {
    191191      if (IS_FIXUP (p))
    192     *p = *p - (u_long) buffer;
    193     }
    194 }
    195 
    196 
    197 
    198 
    199 static u_long
     192    *p = *p - (uintptr_t) buffer;
     193    }
     194}
     195
     196
     197
     198
     199static mg_u_long
    200200mem_for_aux_dict (compression_dict_header * /*cdh*/, char *filename)
    201201{
    202202  int i;
    203   u_long mem = sizeof (auxiliary_dict);
     203  mg_u_long mem = sizeof (auxiliary_dict);
    204204  FILE *aux;
    205205
    … …  
    224224
    225225
    226 static u_long
     226static mg_u_long
    227227mem_for_words (FILE * dict, compression_dict_header * cdh,
    228228           comp_frags_header * cfh)
    229229{
    230   u_long mem = 0;
    231   long i, lookback;
     230  mg_u_long mem = 0;
     231  mg_s_long i, lookback;
    232232  int ptrs_reqd = 0;
    233233  int mem_reqd = 0;
    … …  
    254254}
    255255
    256 static u_long mem_skip_hd(FILE *dict, u_long mem)
     256static mg_u_long mem_skip_hd(FILE *dict, mg_u_long mem)
    257257{ huff_data hd;
    258258
    … …  
    261261  if (hd.clens)
    262262    delete []hd.clens;
    263   mem += hd.num_codes * sizeof (unsigned long);
    264   mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     263  mem += hd.num_codes * sizeof (mg_u_long);
     264  mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    265265  return mem;
    266266}
    267267
    268 static u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh,
    269                u_long mem)
     268static mg_u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh,
     269               mg_u_long mem)
    270270{
    271271  mem += sizeof (comp_frags_header);
    … …  
    282282
    283283
    284 static u_long
     284static mg_u_long
    285285mem_for_comp_dict (char *filename)
    286286{
    287   u_long mem = sizeof (compression_dict);
     287  mg_u_long mem = sizeof (compression_dict);
    288288  compression_dict_header cdh;
    289289  comp_frags_header cfh;
    … …  
    360360
    361361void *
    362 getmem (u_long size, int align)
     362getmem (mg_u_long size, int align)
    363363{
    364364  void *res;
    365   cur = (void *) (((u_long) cur + (align - 1)) & (~(align - 1)));
     365  cur = (void *) (((uintptr_t) cur + (align - 1)) & (~(align - 1)));
    366366  res = cur;
    367367  cur = (char *) cur + size;
    368   if ((u_long) cur > (u_long)buffer + mem)
     368  if ((uintptr_t) cur > (uintptr_t)buffer + mem)
    369369    FatalError (1, "The buffer was not big enough for the dictionary");
    370370  return res;
    … …  
    538538
    539539
    540 static unsigned long **
    541 Generate_Fast_Huffman_Vals (huff_data * data, u_long * mem)
     540static mg_u_long **
     541Generate_Fast_Huffman_Vals (huff_data * data, mg_u_long * mem)
    542542{
    543543  int i;
    544   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    545   unsigned long **values;
    546   unsigned long *vals;
     544  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     545  mg_u_long **values;
     546  mg_u_long *vals;
    547547
    548548  if (!data)
    549549    return (NULL);
    550   vals = (unsigned long *) getmem (data->num_codes * sizeof (*vals), sizeof (long *));
    551   values = (unsigned long **) getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *),
    552            sizeof (long *));
    553 
    554   memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     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 *));
    555555
    556556  if (mem)
    557557    *mem += data->num_codes * sizeof (*vals) +
    558       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     558      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    559559
    560560  fcode[0] = values[0] = &vals[0];
    … …  
    576576{
    577577  huff_data *hd;
    578   u_long   **vals;
     578  mg_u_long   **vals;
    579579
    580580  hd = (huff_data *) getmem (sizeof (huff_data), sizeof (char *));
    … …  
    683683
    684684  {
    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)
    687687      {
    688688    if (IS_FIXUP (p))

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict.cpp

    r19822 r23508  
    4141#include "invf.h"
    4242
    43 static void process_files (char *filename, unsigned long entriesPerBlock) {
     43static void process_files (char *filename, mg_u_long entriesPerBlock) {
    4444  // open the dictionary
    4545  FILE *dictFile = open_file (filename, INVF_DICT_SUFFIX, "rb",
    … …  
    8383 
    8484 
    85   unsigned long wordNum;
    86   unsigned long wordInvfPtr;
     85  mg_u_long wordNum;
     86  mg_u_long wordInvfPtr;
    8787  UCArray lastEl;
    8888  word_dict_el wordEl;
    … …  
    102102      // see if this block is the longest so far
    103103      if (wordIdx.size() > 0) {
    104     unsigned long blockLen = elIdx.block_ptr -
     104    mg_u_long blockLen = elIdx.block_ptr -
    105105      (*(wordIdx.end()-1)).block_ptr;
    106106    if (blockLen > bdh.max_wblk_size) bdh.max_wblk_size = blockLen;
    … …  
    116116    wordBlockEl.freq = wordEl.freq;
    117117    wordBlockEl.invf_ptr = wordInvfPtr;
    118     unsigned long tempI;
     118    mg_u_long tempI;
    119119    for (tempI=0; tempI<idh.num_levels; ++tempI)
    120120      wordBlockEl.levelFreqs[tempI] = wordEl.levelFreqs[tempI];
    … …  
    138138  block_dict_el tagBlockEl;
    139139 
    140   unsigned long tagNum;
    141   unsigned long tagInvfPtr;
     140  mg_u_long tagNum;
     141  mg_u_long tagInvfPtr;
    142142  dict_el tagEl;
    143143  lastEl.erase (lastEl.begin(), lastEl.end());
    … …  
    156156      // see if this block is the longest so far
    157157      if (tagIdx.size() > 0) {
    158     unsigned long blockLen = elIdx.block_ptr -
     158    mg_u_long blockLen = elIdx.block_ptr -
    159159      (*(tagIdx.end()-1)).block_ptr;
    160160    if (blockLen > bdh.max_tblk_size) bdh.max_tblk_size = blockLen;
    … …  
    188188
    189189  // write out the blocked dictionary header
    190   fseek (blockDictFile, sizeof(unsigned long), SEEK_SET);
     190  fseek (blockDictFile, sizeof(mg_u_long), SEEK_SET);
    191191  bdh.Write (blockDictFile);
    192192
    … …  
    208208
    209209int main (int argc, char **argv) {
    210   unsigned long entriesPerBlock = 16;
    211   char *filename = "";
     210  mg_u_long entriesPerBlock = 16;
     211  char *filename = (char*)"";
    212212  int ch;
    213213  msg_prefix = argv[0];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict_dump.cpp

    r19822 r23508  
    7272    fseek (dictFile, idh.word_dict_start, SEEK_SET);
    7373   
    74     unsigned long wordNum;
     74    mg_u_long wordNum;
    7575    word_dict_el wordEl;
    7676    wordEl.SetNumLevels (idh.num_levels);
    … …  
    8787    fseek (dictFile, idh.tag_dict_start, SEEK_SET);
    8888   
    89     unsigned long tagNum;
     89    mg_u_long tagNum;
    9090    dict_el tagEl;
    9191    for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) {
    … …  
    103103
    104104int main (int argc, char **argv) {
    105   char *filename = "";
     105  char *filename = (char*)"";
    106106  int ch;
    107107  msg_prefix = argv[0];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dump.cpp

    r19822 r23508  
    5252               invf_file_header &ifh,
    5353               word_dict_el &wordEl,
    54                unsigned long wordStart,
     54               mg_u_long wordStart,
    5555               bool printFrags) {
    5656  cout << wordEl.frag_occur << " \"" << wordEl.el << "\"\n";
    … …  
    6262    stdio_bitio_buffer buffer(invfFile);
    6363   
    64     unsigned long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);
    65     unsigned long fragNum = 0;
    66     unsigned long 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;
    6767    for (i=0; i<wordEl.frag_occur; ++i) {
    68       unsigned long delta = buffer.bblock_decode (B, NULL);
     68      mg_u_long delta = buffer.bblock_decode (B, NULL);
    6969      fragNum += delta;
    7070      cout << " " << fragNum;
    7171     
    7272      if (!ifh.word_level_index ) {
    73     unsigned long count = buffer.gamma_decode (NULL);
     73    mg_u_long count = buffer.gamma_decode (NULL);
    7474    cout << "(" << count << ")";
    7575      } else {
    … …  
    8888              invf_file_header &/*ifh*/,
    8989              dict_el &tagEl,
    90               unsigned long tagStart,
     90              mg_u_long tagStart,
    9191              bool printFrags) {
    9292  cout << tagEl.frag_occur << " \"<" << tagEl.el << ">\"\n";
    … …  
    9898    stdio_bitio_buffer buffer(invfFile);
    9999   
    100     unsigned long pTag = tagEl.frag_occur*2;
    101     unsigned long B = BIO_Bblock_Init (idh.num_frags+pTag, pTag);
    102     unsigned long fragNum = 0;
    103     unsigned long 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;
    104104    for (i=0; i<tagEl.frag_occur; ++i) {
    105       unsigned long delta = buffer.bblock_decode (B, NULL)-1;
     105      mg_u_long delta = buffer.bblock_decode (B, NULL)-1;
    106106      fragNum += delta;
    107107      cout << " " << fragNum;
    … …  
    169169  // process all the words
    170170  if (printWords) {
    171     unsigned long wordNum;
    172     unsigned long wordStart;
     171    mg_u_long wordNum;
     172    mg_u_long wordStart;
    173173    word_dict_el wordEl;
    174174    wordEl.SetNumLevels (idh.num_levels);
    … …  
    182182  // process all the tags
    183183  if (printTags) {
    184     unsigned long tagNum;
    185     unsigned long tagStart;
     184    mg_u_long tagNum;
     185    mg_u_long tagStart;
    186186    dict_el tagEl;
    187187    for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) {
    … …  
    199199
    200200int main (int argc, char **argv) {
    201   char *dir_name, *filename = "";
     201  char *dir_name, *filename = (char*)"";
    202202  int ch;
    203203  msg_prefix = argv[0];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_passes.cpp

    r19822 r23508  
    7474
    7575
    76 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     76mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    7777
    7878static char Passes = 0;
    … …  
    9090
    9191static 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},
    9797};
    9898
    99 static char *usage_str = "\nUSAGE:\n"
     99static char *usage_str = (char*)"\nUSAGE:\n"
    100100"  %s [-J doc-tag] [-K level-tag] [-L index-level]\n"
    101101"  %*s [-m invf-memory] [-T1] [-T2] [-I1] [-I2] [-S]\n"
    … …  
    131131  int pass;
    132132
    133   unsigned long numBytes = 0;
    134   unsigned long numDocs = 0;
     133  mg_u_long numBytes = 0;
     134  mg_u_long numDocs = 0;
    135135
    136136  // initialise all the passes
    … …  
    146146  FileBuf buf;
    147147  TextElArray doc;
    148   unsigned long docLen = 0;
     148  mg_u_long docLen = 0;
    149149
    150150  // read and process each file (start with an open file)
    … …  
    222222    Passes |= IVF_PASS_2;
    223223      else
    224     Usage ("Invalid pass number");
     224    Usage ((char*)"Invalid pass number");
    225225      break;
    226226    case 'T':
    … …  
    230230    Passes |= TEXT_PASS_2;
    231231      else
    232     Usage ("Invalid pass number");
     232    Usage ((char*)"Invalid pass number");
    233233      break;
    234234    case 'S':

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_passes_4jni.cpp

    r19822 r23508  
    7676
    7777
    78 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     78mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    7979
    8080static char Passes = 0;
    … …  
    8585char *filename = NULL;
    8686
    87 unsigned long numBytes = 0;
    88 unsigned long numDocs = 0;
     87mg_u_long numBytes = 0;
     88mg_u_long numDocs = 0;
    8989int mgpp_passes_exit_value = 0;
    9090
    … …  
    9898
    9999static 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},
    105105};
    106106
    … …  
    223223 
    224224  TextElArray doc;
    225   unsigned long doc_len =  0;
     225  mg_u_long doc_len =  0;
    226226
    227227  while(ReadDoc(&buffer, tagInfo.docTag, doc, doc_len, false)) {
    … …  
    266266  int pass;
    267267
    268   unsigned long numBytes = 0;
    269   unsigned long numDocs = 0;
     268  mg_u_long numBytes = 0;
     269  mg_u_long numDocs = 0;
    270270
    271271  // initialise all the passes
    … …  
    281281  FileBuf buf;
    282282  TextElArray doc;
    283   unsigned long docLen = 0;
     283  mg_u_long docLen = 0;
    284284
    285285  // 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  
    5353static void ProcessFiles (char *filename, int r) {
    5454  FILE *dictFile, *hashFile;
    55   unsigned long i;
     55  mg_u_long i;
    5656  invf_dict_header idh;
    5757  perf_hash_data *phd;
    5858  u_char *pool;
    59   unsigned long pool_left;
     59  mg_u_long pool_left;
    6060  u_char **starts;
    6161
    … …  
    8686
    8787    // push string onto pool data
    88     register unsigned long l;
     88    register mg_u_long l;
    8989    l = wordEl.el.size() + 1;
    9090    if (pool_left < l) {
    … …  
    119119int main (int argc, char **argv) {
    120120  int r = -1;
    121   char *filename = "";
     121  char *filename = (char*)"";
    122122  int ch;
    123123  msg_prefix = argv[0];

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_stem_idx.cpp

    r19822 r23508  
    5050#endif
    5151
    52 typedef vector<unsigned long> WordNumList;
     52typedef vector<mg_u_long> WordNumList;
    5353typedef map<UCArray, WordNumList, DictLTUCArray> StemMapDict;
    5454
    … …  
    6767  fseek (dictFile, idh.word_dict_start, SEEK_SET);
    6868
    69   unsigned long wordNum;
     69  mg_u_long wordNum;
    7070  u_char mgWord[MAXSTEMLEN + 1];
    7171  word_dict_el wordEl;
    … …  
    101101            int stemMethod,
    102102            int stemmerNum,
    103             unsigned long entriesPerBlock) {
     103            mg_u_long entriesPerBlock) {
    104104 
    105105  /* [JFG - Mar 06: Accent folding patch] */
    … …  
    130130
    131131  block_idx stemIdx;
    132   unsigned long stemNum = 0;
     132  mg_u_long stemNum = 0;
    133133  stem_block_dict_el stemEl;
    134134  UCArray lastEl;
    … …  
    146146      // see if this block is the longest so far
    147147      if (stemIdx.size() > 0) {
    148     unsigned long blockLen = elIdx.block_ptr -
     148    mg_u_long blockLen = elIdx.block_ptr -
    149149      (*(stemIdx.end()-1)).block_ptr;
    150150    if (blockLen > sih.max_block_size) sih.max_block_size = blockLen;
    … …  
    172172 
    173173  // write out the stem dictionary header
    174   fseek (stemDictFile, sizeof(unsigned long), SEEK_SET);
     174  fseek (stemDictFile, sizeof(mg_u_long), SEEK_SET);
    175175  sih.Write (stemDictFile);
    176176
    … …  
    189189
    190190int main (int argc, char **argv) {
    191   unsigned long entriesPerBlock = 16;
    192   char *filename = "";
     191  mg_u_long entriesPerBlock = 16;
     192  char *filename = (char*)"";
    193193  int ch;
    194194  int stemMethod = 0; // illegal value (no translation)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/mgpp_weights_build.cpp

    r19822 r23508  
    5252#endif
    5353
    54 #define MAXBITS (sizeof(unsigned long) * 8)
     54#define MAXBITS (sizeof(mg_u_long) * 8)
    5555
    5656struct WBTagPtr {
    57   unsigned long tagNum;
    58   unsigned long tagPtr;
    59   unsigned long fragOccur;
     57  mg_u_long tagNum;
     58  mg_u_long tagPtr;
     59  mg_u_long fragOccur;
    6060 
    6161  WBTagPtr () {
    … …  
    8080  // seek to the start of the tag information
    8181  fseek (dictFile, idh.tag_dict_start, SEEK_SET);
    82   fseek (invfIdxFile, sizeof(unsigned long) +
    83      idh.word_dict_size*sizeof(unsigned long), SEEK_SET);
    84  
    85   unsigned long tagNum;
    86   unsigned long 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;
    8787  dict_el thisEl;
    8888  for (tagNum = 0; tagNum < idh.tag_dict_size; ++tagNum) {
    … …  
    9696
    9797static void AddWeight (Weights &w,
    98                unsigned long levelDocNum,
    99                unsigned long termFreq,
     98               mg_u_long levelDocNum,
     99               mg_u_long termFreq,
    100100               float idf) {
    101101  double weight = termFreq * idf;
    … …  
    105105static void GenerateLevelWeights (const invf_dict_header &idh,
    106106                  const invf_file_header &ifh,
    107                   unsigned long numLevelDocs,
    108                   unsigned long levelNum,
     107                  mg_u_long numLevelDocs,
     108                  mg_u_long levelNum,
    109109                  FILE *dictFile,
    110110                  FILE *invfFile,
    … …  
    120120  // reset the files
    121121  fseek (dictFile, idh.word_dict_start, SEEK_SET);
    122   fseek (invfIdxFile, sizeof (unsigned long), SEEK_SET);
     122  fseek (invfIdxFile, sizeof (mg_u_long), SEEK_SET);
    123123 
    124124  // process each word adding its contributions to the document weights
    125   unsigned long wordNum;
    126   unsigned long wordStart;
     125  mg_u_long wordNum;
     126  mg_u_long wordStart;
    127127  word_dict_el wordEl;
    128128  wordEl.SetNumLevels (idh.num_levels);
    … …  
    142142    stdio_bitio_buffer buffer (invfFile);
    143143   
    144     unsigned long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);
    145     unsigned long fragNum = 0;
    146     unsigned long levelDocNum = 0;
    147     unsigned long lastLevelDocNum = 0;
    148     unsigned long termFreq = 0;
    149     unsigned long checkLevelFreq = 0;
    150    
    151     unsigned long 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;
    152152    for (i=0; i<wordEl.frag_occur; ++i) {
    153153      fragNum += buffer.bblock_decode (B, NULL);
    … …  
    201201
    202202static void WriteExactWeights (FILE *weightsFile,
    203                    unsigned long &diskPtr,
     203                   mg_u_long &diskPtr,
    204204                   const Weights &w) {
    205205  diskPtr = ftell(weightsFile);
    … …  
    215215
    216216static void WriteApproxWeights (FILE *approxWeightsFile,
    217                 unsigned long &diskPtr,
     217                mg_u_long &diskPtr,
    218218                const Weights &w,
    219219                unsigned char bits) {
    … …  
    246246 
    247247
    248   unsigned long max = (bits == 32) ? 0xffffffff : (1 << bits) - 1;;
    249   unsigned long 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;
    250250  here = w.begin();
    251251  end = w.end();
    252252  while (here != end) {
    253     unsigned long fx;
     253    mg_u_long fx;
    254254    wgt = sqrt (*here);
    255255    if (wgt == 0) {
    … …  
    259259#endif
    260260    }
    261     fx = (unsigned long) floor (log (wgt / L) / log (B));
     261    fx = (mg_u_long) floor (log (wgt / L) / log (B));
    262262
    263263    if (fx > max) fx = max;
    … …  
    281281int main (int argc, char **argv) {
    282282  unsigned char bits = 8;
    283   char *filename = "";
     283  char *filename = (char*)"";
    284284  int ch;
    285285  opterr = 0;
    … …  
    354354  IvfLevelInfoMap::iterator levelHere = ivfLevel.levelInfo.begin();
    355355  IvfLevelInfoMap::iterator levelEnd = ivfLevel.levelInfo.end();
    356   unsigned long levelNum = 0;
     356  mg_u_long levelNum = 0;
    357357  while (levelHere != levelEnd) {
    358358    const UCArray &levelName = (*levelHere).first;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/text.h

    r16583 r23508  
    109109
    110110struct 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;
    117117};
    118118
    … …  
    120120struct comp_frags_header {
    121121  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];
    124124};
    125125
    … …  
    130130
    131131struct compressed_text_header {
    132   u_long num_of_docs;
    133   u_long num_of_words; // number of words in collection
     132  mg_u_long num_of_docs;
     133  mg_u_long num_of_words; // number of words in collection
    134134  double num_of_bytes;
    135135
    … …  
    145145
    146146struct compression_stats_header {
    147   u_long num_docs;
    148   u_long dummy;     // alignment
     147  mg_u_long num_docs;
     148  mg_u_long dummy;     // alignment
    149149  double num_bytes;
    150150};
    … …  
    152152
    153153struct 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;
    156156};
    157157
    158158
    159159struct 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;
    162162};
    163163
    … …  
    180180  compression_dict_header cdh;
    181181  comp_frags_header *cfh[2];
    182   unsigned long MemForCompDict;
     182  mg_u_long MemForCompDict;
    183183  u_char ***values[2];
    184184  u_char *escape[2];
    185185  huff_data *chars_huff[2];
    186   u_long **chars_vals[2];
     186  mg_u_long **chars_vals[2];
    187187  huff_data *lens_huff[2];
    188   u_long **lens_vals[2];
     188  mg_u_long **lens_vals[2];
    189189  auxiliary_dict *ad;
    190190  int fast_loaded;

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/text.pass1.cpp

    r16583 r23508  
    5454typedef struct hash_rec
    5555  {
    56     unsigned long wcnt;     /* word frequency */
    57     unsigned long occurance_num;
     56    mg_u_long wcnt;     /* word frequency */
     57    mg_u_long occurance_num;
    5858    u_char *word;
    5959  }
    … …  
    6363  {
    6464    hash_rec *HashTable;
    65     unsigned long HashSize;
    66     unsigned long HashUsed;
    67     unsigned long wordnum;
    68     unsigned long words_read;
    69     unsigned long 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;
    7070    huff_data hd;
    7171  }
    … …  
    7474
    7575
    76 static unsigned long longestDoc = 0;
    77 static unsigned long occurance_num = 0;
     76static mg_u_long longestDoc = 0;
     77static mg_u_long occurance_num = 0;
    7878static dict_data DictData[2];
    7979
    … …  
    8181static int PoolLeft;
    8282static double inputbytes = 0; /* [RJM 07/97: 4G limit] */
    83 static unsigned long MaxMemInUse = 0;
    84 static unsigned long MemInUse = 0;
     83static mg_u_long MaxMemInUse = 0;
     84static mg_u_long MemInUse = 0;
    8585static compression_stats_header csh = {0, 0, 0.0}; /* [RJM 07/97: 4G limit] */
    8686
    … …  
    126126      register u_char *wptr;
    127127      register int hsize = dd->HashSize;
    128       register unsigned long hashval, step;
     128      register mg_u_long hashval, step;
    129129     
    130130      HASH (hashval, step, word, hsize);
    … …  
    132132      while (wptr) {
    133133    hashval += step;
    134     if (hashval >= (unsigned long)hsize)
     134    if (hashval >= (mg_u_long)hsize)
    135135      hashval -= hsize;
    136136    wptr = (dd->HashTable + hashval)->word;
    … …  
    171171    /* Search the hash table for Word */
    172172    {
    173       register unsigned long hashval, step;
     173      register mg_u_long hashval, step;
    174174      register int hsize = dd->HashSize;
    175175      HASH (hashval, step, Word, hsize);
    … …  
    210210    if (len) {
    211211      hashval = (hashval + step);
    212       if (hashval >= (unsigned long)hsize) hashval -= hsize;
     212      if (hashval >= (mg_u_long)hsize) hashval -= hsize;
    213213    } else {
    214214      ++ent->wcnt;
    … …  
    221221    if (dd->HashUsed >= dd->HashSize >> 1) {
    222222      hash_rec *ht;
    223       unsigned long size;
    224       unsigned long i;
     223      mg_u_long size;
     224      mg_u_long i;
    225225      size = prime (dd->HashSize * 2);
    226226      if (!(ht = (hash_rec *) Xmalloc (sizeof (hash_rec) * size))) {
    … …  
    234234    if (dd->HashTable[i].word) {
    235235      register u_char *wptr;
    236       register unsigned long hashval, step;
     236      register mg_u_long hashval, step;
    237237     
    238238      wptr = dd->HashTable[i].word;
    … …  
    258258
    259259int process_text_1 (const TagInfo &/*tagInfo*/, const TextElArray &doc) {
    260   unsigned long textLen = 0;
    261   unsigned long docLen = 0;
     260  mg_u_long textLen = 0;
     261  mg_u_long docLen = 0;
    262262  int retValue;
    263263
    … …  
    312312static void WriteHashTable (FILE * fp, dict_data * dd) {
    313313  frags_stats_header fsh;
    314   u_long j = 0;
     314  mg_u_long j = 0;
    315315  u_char *curr;
    316316
    … …  
    369369
    370370  temp_str = msg_prefix;
    371   msg_prefix = "text.pass1";
     371  msg_prefix = (char*)"text.pass1";
    372372 
    373373  /* [RPAP - Jan 97: Endian Ordering] */

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/text.pass2.cpp

    r16583 r23508  
    5757struct char_pool {
    5858  struct char_pool *next;
    59   u_long left;
     59  mg_u_long left;
    6060  u_char *ptr;
    6161  u_char pool[POOL_SIZE];
    … …  
    6363
    6464struct novel_hash_rec {
    65   u_long ordinal_num;
     65  mg_u_long ordinal_num;
    6666  u_char *word;
    6767};
    … …  
    7272struct novel_hash_table {
    7373  novel_hash_rec *HashTable;
    74   u_long HashSize, HashUsed;
     74  mg_u_long HashSize, HashUsed;
    7575  char_pool *first_pool;
    7676  char_pool *pool;
    77   u_long next_num, binary_start;
     77  mg_u_long next_num, binary_start;
    7878  novel_hash_rec **code_to_nhr;
    7979};
    … …  
    8282static FILE *text;
    8383static stdio_bitio_buffer textOutBuf;
    84 static u_long headLen;
     84static mg_u_long headLen;
    8585
    8686static novel_hash_table nht[2];
    … …  
    128128  // the length of the compressed header is the size of the
    129129  // 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);
    131131
    132132  // start off with non-word
    … …  
    173173static int compress_text (bitio_buffer &buffer, const u_char *s_in,
    174174              int l_in, unsigned char &which,
    175               unsigned long &numWords) {
     175              mg_u_long &numWords) {
    176176  const u_char *end = s_in + l_in - 1;
    177177
    … …  
    188188    /* Search the hash table for Word */
    189189    if (ht[which]) {
    190       register unsigned long hashval, step;
     190      register mg_u_long hashval, step;
    191191      register int tsize = ht[which]->size;
    192192      register u_char **wptr;
    … …  
    211211    if (len) {
    212212      hashval += step;
    213       if (hashval >= (unsigned long)tsize) hashval -= tsize;
     213      if (hashval >= (mg_u_long)tsize) hashval -= tsize;
    214214     
    215215    } else {
    … …  
    231231    if (cdh.dict_type == MG_PARTIAL_DICTIONARY)
    232232      {
    233         u_long i;
     233        mg_u_long i;
    234234        if (ht[which])
    235235          {
    … …  
    253253          case MG_NOVEL_HUFFMAN_CHARS:
    254254        {
    255           u_long i;
     255          mg_u_long i;
    256256          buffer.huff_encode (Word[0], lens_codes[which],
    257257                      lens_huff[which].clens, NULL);
    … …  
    264264          case MG_NOVEL_HYBRID:
    265265        {
    266           register unsigned long hashval, step;
     266          register mg_u_long hashval, step;
    267267          register novel_hash_table *h = &nht[which];
    268268          register int hsize = h->HashSize;
    … …  
    325325            {
    326326              novel_hash_rec *ht;
    327               unsigned long size;
    328               unsigned long i;
     327              mg_u_long size;
     328              mg_u_long i;
    329329              size = prime (h->HashSize * 2);
    330330              if (!(ht = (novel_hash_rec *) Xmalloc (sizeof (novel_hash_rec) * size)))
    … …  
    339339              {
    340340                register u_char *wptr;
    341                 register unsigned long hashval, step;
     341                register mg_u_long hashval, step;
    342342               
    343343                wptr = h->HashTable[i].word;
    … …  
    375375  // we need to remember where the last text element ends
    376376  unsigned char endBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit
    377   unsigned long endPos = textOutBuf.GetBytesWritten () + headLen;
     377  mg_u_long endPos = textOutBuf.GetBytesWritten () + headLen;
    378378
    379379  // process each text element
    … …  
    384384    unsigned char startWhich = whichWordType;
    385385    unsigned char startBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit
    386     unsigned long startPos = textOutBuf.GetBytesWritten () + headLen;
     386    mg_u_long startPos = textOutBuf.GetBytesWritten () + headLen;
    387387
    388388    // compress the text
    … …  
    464464static void estimate_compressed_aux_dict (void) {
    465465  int i;
    466   u_long aux_compressed = 0, total_uncomp = 0;
     466  mg_u_long aux_compressed = 0, total_uncomp = 0;
    467467  for (i = 0; i <= 1; ++i)
    468468    {
    469469      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];
    472472      char_pool *cp;
    473473      memset (chars, '\0', sizeof (chars));
    … …  
    496496      flens[j] = lens[j];
    497497     
    498       aux_compressed += (long unsigned int) ((Calculate_Huffman_Size (16, flens, lens) +
     498      aux_compressed += (mg_u_long) ((Calculate_Huffman_Size (16, flens, lens) +
    499499                          Calculate_Huffman_Size (256, fchars, chars)) / 8);
    500500     
    … …  
    560560
    561561  // 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))
    563563    return COMPERROR;
    564564  fclose (text);

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/packages/unac/Makefile.in

    r20840 r23508  
    3232DEFS = @DEFS@ -DUNAC_VERSION=\"$(VERSION)\"
    3333INCLUDES = -I../../../packages/iconv/include
    34 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
     34CFLAGS = @CFLAGS@
    3535
    3636COMPILE = $(CC) -c $(DEFS) $(INCLUDES)  $(CFLAGS)

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/packages/unac/configure

    r16583 r23508  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59.
     3# Generated by GNU Autoconf 2.65.
    44#
    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#
    611# This configure script is free software; the Free Software Foundation
    712# 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
     18DUALCASE=1; export DUALCASE # for MKS sh
     19if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
    1420  emulate sh
    1521  NULLCMD=:
    16   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
     22  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
    1723  # is contrary to our usage.  Disable this feature.
    1824  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
     26else
     27  case `(set -o) 2>/dev/null` in #(
     28  *posix*) :
     29    set -o posix ;; #(
     30  *) :
     31     ;;
     32esac
     33fi
     34
     35
     36as_nl='
     37'
     38export as_nl
     39# Printing a long string crashes Solaris 7 /usr/bin/printf.
     40as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
     41as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
     42as_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.
     45if 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 --'
     49elif (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'
     52else
     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'
     72fi
     73
     74# The user is always right.
     75if 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  }
     81fi
     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.)
     89IFS=" ""    $as_nl"
     90
     91# Find who we are.  Look in the path if we contain no directory separator.
     92case $0 in #((
     93  *[\\/]* ) as_myself=$0 ;;
     94  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     95for as_dir in $PATH
     96do
     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
     101IFS=$as_save_IFS
     102
     103     ;;
     104esac
     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.
     107if test "x$as_myself" = x; then
     108  as_myself=$0
     109fi
     110if test ! -f "$as_myself"; then
     111  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
     112  exit 1
     113fi
     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.
     119for as_var in BASH_ENV ENV MAIL MAILPATH
     120do eval test x\${$as_var+set} = xset \
     121  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
     122done
    34123PS1='$ '
    35124PS2='> '
    … …  
    37126
    38127# 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
     128LC_ALL=C
     129export LC_ALL
     130LANGUAGE=C
     131export LANGUAGE
     132
     133# CDPATH.
     134(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
     135
     136if 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
     144else
     145  case \`(set -o) 2>/dev/null\` in #(
     146  *posix*) :
     147    set -o posix ;; #(
     148  *) :
     149     ;;
     150esac
     151fi
     152"
     153  as_required="as_fn_return () { (exit \$1); }
     154as_fn_success () { as_fn_return 0; }
     155as_fn_failure () { as_fn_return 1; }
     156as_fn_ret_success () { return 0; }
     157as_fn_ret_failure () { return 1; }
     158
     159exitcode=0
     160as_fn_success || { exitcode=1; echo as_fn_success failed.; }
     161as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
     162as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
     163as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
     164if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
     165
     166else
     167  exitcode=1; echo positional parameters were not saved.
     168fi
     169test 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
     174test \$(( 1 + 1 )) = 2 || exit 1"
     175  if (eval "$as_required") 2>/dev/null; then :
     176  as_have_required=yes
     177else
     178  as_have_required=no
     179fi
     180  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
     181
     182else
     183  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     184as_found=false
     185for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
    43186do
    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
     200fi
     201fi
     202       done;;
     203       esac
     204  as_found=false
     205done
     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
     209fi; }
     210IFS=$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+"$@"}
     222fi
     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."
    46230  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."
    48235  fi
    49 done
    50 
    51 # Required to use basename.
    52 if expr a : '\(a\)' >/dev/null 2>&1; then
     236  exit 1
     237fi
     238fi
     239fi
     240SHELL=${CONFIG_SHELL-/bin/sh}
     241export SHELL
     242# Unset more variables known to interfere with behavior of common tools.
     243CLICOLOR_FORCE= GREP_OPTIONS=
     244unset CLICOLOR_FORCE GREP_OPTIONS
     245
     246## --------------------- ##
     247## M4sh Shell Functions. ##
     248## --------------------- ##
     249# as_fn_unset VAR
     250# ---------------
     251# Portably unset VAR.
     252as_fn_unset ()
     253{
     254  { eval $1=; unset $1;}
     255}
     256as_unset=as_fn_unset
     257
     258# as_fn_set_status STATUS
     259# -----------------------
     260# Set $? to STATUS, without forking.
     261as_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.
     269as_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.
     279as_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.
     329if (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  }'
     334else
     335  as_fn_append ()
     336  {
     337    eval $1=\$$1\$2
     338  }
     339fi # 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.
     346if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
     347  eval 'as_fn_arith ()
     348  {
     349    as_val=$(( $* ))
     350  }'
     351else
     352  as_fn_arith ()
     353  {
     354    as_val=`expr "$@" || test $? -eq 1`
     355  }
     356fi # 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.
     364as_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
     375if expr a : '\(a\)' >/dev/null 2>&1 &&
     376   test "X`expr 00001 : '.*\(...\)'`" = X001; then
    53377  as_expr=expr
    54378else
    … …  
    56380fi
    57381
    58 if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
     382if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
    59383  as_basename=basename
    60384else
    … …  
    62386fi
    63387
    64 
    65 # Name of the executable.
    66 as_me=`$as_basename "$0" ||
     388if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
     389  as_dirname=dirname
     390else
     391  as_dirname=false
     392fi
     393
     394as_me=`$as_basename -- "$0" ||
    67395$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
    68396     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
    79413# Avoid depending upon Character Ranges.
    80414as_cr_letters='abcdefghijklmnopqrstuvwxyz'
    … …  
    84418as_cr_alnum=$as_cr_Letters$as_cr_digits
    85419
    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 |
    165430    sed '
     431      s/[$]LINENO.*/&-/
     432      t lineno
     433      b
     434      :lineno
    166435      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/
    170438      t loop
    171       s,-$,,
    172       s,^['$as_cr_digits']*\n,,
     439      s/-\n.*//
    173440    ' >$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; }
    177443
    178444  # Don't try to exec as it changes $[0], causing all sort of problems
    179445  # (the dirname of $[0] is not the place where we might find the
    180   # original and so on.  Autoconf is especially sensible to this).
    181   . ./$as_me.lineno
     446  # original and so on.  Autoconf is especially sensitive to this).
     447  . "./$as_me.lineno"
    182448  # Exit status is that of the last command.
    183449  exit
    184450}
    185451
    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= ;;
     452ECHO_C= ECHO_N= ECHO_T=
     453case `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';;
    192463esac
    193464
    194 if expr a : '\(a\)' >/dev/null 2>&1; then
    195   as_expr=expr
    196 else
    197   as_expr=false
    198 fi
    199 
    200465rm -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
     466if test -d conf$$.dir; then
     467  rm -f conf$$.dir/conf$$.file
     468else
     469  rm -f conf$$.dir
     470  mkdir conf$$.dir 2>/dev/null
     471fi
     472if (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
    207484    as_ln_s='cp -p'
    208   else
    209     as_ln_s='ln -s'
    210485  fi
    211 elif ln conf$$.file conf$$ 2>/dev/null; then
    212   as_ln_s=ln
    213486else
    214487  as_ln_s='cp -p'
    215488fi
    216 rm -f conf$$ conf$$.exe conf$$.file
     489rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
     490rmdir conf$$.dir 2>/dev/null
    217491
    218492if mkdir -p . 2>/dev/null; then
    219   as_mkdir_p=:
     493  as_mkdir_p='mkdir -p "$as_dir"'
    220494else
    221495  test -d ./-p && rmdir ./-p
    … …  
    223497fi
    224498
    225 as_executable_p="test -f"
     499if test -x / >/dev/null 2>&1; then
     500  as_test_x='test -x'
     501else
     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  '
     519fi
     520as_executable_p=$as_test_x
    226521
    227522# Sed expression to map a string onto a valid CPP name.
    … …  
    230525# Sed expression to map a string onto a valid variable name.
    231526as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
    232 
    233 
    234 # IFS
    235 # 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 CDPATH
    242527
    243528
    … …  
    401686
    402687
     688test -n "$DJDIR" || exec 7<&0 </dev/null
     689exec 6>&1
     690
    403691# Name of the host.
    404692# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
    … …  
    406694ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    407695
    408 exec 6>&1
    409 
    410696#
    411697# Initializations.
    412698#
    413699ac_default_prefix=/usr/local
     700ac_clean_files=
    414701ac_config_libobj_dir=.
     702LIBOBJS=
    415703cross_compiling=no
    416704subdirs=
    417705MFLAGS=
    418706MAKEFLAGS=
    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, and
    423 # only ac_max_sed_lines should be used.
    424 : ${ac_max_here_lines=38}
    425707
    426708# Identity of this package.
    … …  
    430712PACKAGE_STRING=
    431713PACKAGE_BUGREPORT=
     714PACKAGE_URL=
    432715
    433716ac_unique_file="config.h.in"
    … …  
    435718ac_includes_default="\
    436719#include <stdio.h>
    437 #if HAVE_SYS_TYPES_H
     720#ifdef HAVE_SYS_TYPES_H
    438721# include <sys/types.h>
    439722#endif
    440 #if HAVE_SYS_STAT_H
     723#ifdef HAVE_SYS_STAT_H
    441724# include <sys/stat.h>
    442725#endif
    443 #if STDC_HEADERS
     726#ifdef STDC_HEADERS
    444727# include <stdlib.h>
    445728# include <stddef.h>
    446729#else
    447 # if HAVE_STDLIB_H
     730# ifdef HAVE_STDLIB_H
    448731#  include <stdlib.h>
    449732# endif
    450733#endif
    451 #if HAVE_STRING_H
    452 # if !STDC_HEADERS && HAVE_MEMORY_H
     734#ifdef HAVE_STRING_H
     735# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
    453736#  include <memory.h>
    454737# endif
    455738# include <string.h>
    456739#endif
    457 #if HAVE_STRINGS_H
     740#ifdef HAVE_STRINGS_H
    458741# include <strings.h>
    459742#endif
    460 #if HAVE_INTTYPES_H
     743#ifdef HAVE_INTTYPES_H
    461744# include <inttypes.h>
    462 #else
    463 # if HAVE_STDINT_H
    464 #  include <stdint.h>
    465 # endif
    466745#endif
    467 #if HAVE_UNISTD_H
     746#ifdef HAVE_STDINT_H
     747# include <stdint.h>
     748#endif
     749#ifdef HAVE_UNISTD_H
    468750# include <unistd.h>
    469751#endif"
    470752
    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'
     753ac_subst_vars='LTLIBOBJS
     754LIBOBJS
     755LTLIBICONV
     756LIBICONV
     757MAINT
     758MAINTAINER_MODE_FALSE
     759MAINTAINER_MODE_TRUE
     760SH
     761PERL
     762LIBTOOL
     763STRIP
     764RANLIB
     765ECHO
     766LN_S
     767EGREP
     768GREP
     769CPP
     770OBJEXT
     771EXEEXT
     772ac_ct_CC
     773CPPFLAGS
     774LDFLAGS
     775CFLAGS
     776CC
     777UNICODE_VERSION
     778SET_MAKE
     779target_os
     780target_vendor
     781target_cpu
     782target
     783host_os
     784host_vendor
     785host_cpu
     786host
     787build_os
     788build_vendor
     789build_cpu
     790build
     791VERSION
     792target_alias
     793host_alias
     794build_alias
     795LIBS
     796ECHO_T
     797ECHO_N
     798ECHO_C
     799DEFS
     800mandir
     801localedir
     802libdir
     803psdir
     804pdfdir
     805dvidir
     806htmldir
     807infodir
     808docdir
     809oldincludedir
     810includedir
     811localstatedir
     812sharedstatedir
     813sysconfdir
     814datadir
     815datarootdir
     816libexecdir
     817sbindir
     818bindir
     819program_transform_name
     820prefix
     821exec_prefix
     822PACKAGE_URL
     823PACKAGE_BUGREPORT
     824PACKAGE_STRING
     825PACKAGE_VERSION
     826PACKAGE_TARNAME
     827PACKAGE_NAME
     828PATH_SEPARATOR
     829SHELL'
    472830ac_subst_files=''
     831ac_user_opts='
     832enable_option_checking
     833enable_shared
     834enable_static
     835enable_fast_install
     836with_gnu_ld
     837enable_libtool_lock
     838with_pic
     839enable_maintainer_mode
     840enable_rpath
     841with_libiconv_prefix
     842'
     843      ac_precious_vars='build_alias
     844host_alias
     845target_alias
     846CC
     847CFLAGS
     848LDFLAGS
     849LIBS
     850CPPFLAGS
     851CPP'
     852
    473853
    474854# Initialize some variables set by options.
    475855ac_init_help=
    476856ac_init_version=false
     857ac_unrecognized_opts=
     858ac_unrecognized_sep=
    477859# The variables have the same names as the options, with
    478860# dashes changed to underlines.
    … …  
    497879# by default will actually change.
    498880# Use braces instead of parens because sh, perl, etc. also accept them.
     881# (The list follows the same order as the GNU Coding Standards.)
    499882bindir='${exec_prefix}/bin'
    500883sbindir='${exec_prefix}/sbin'
    501884libexecdir='${exec_prefix}/libexec'
    502 datadir='${prefix}/share'
     885datarootdir='${prefix}/share'
     886datadir='${datarootdir}'
    503887sysconfdir='${prefix}/etc'
    504888sharedstatedir='${prefix}/com'
    505889localstatedir='${prefix}/var'
    506 libdir='${exec_prefix}/lib'
    507890includedir='${prefix}/include'
    508891oldincludedir='/usr/include'
    509 infodir='${prefix}/info'
    510 mandir='${prefix}/man'
     892docdir='${datarootdir}/doc/${PACKAGE}'
     893infodir='${datarootdir}/info'
     894htmldir='${docdir}'
     895dvidir='${docdir}'
     896pdfdir='${docdir}'
     897psdir='${docdir}'
     898libdir='${exec_prefix}/lib'
     899localedir='${datarootdir}/locale'
     900mandir='${datarootdir}/man'
    511901
    512902ac_prev=
     903ac_dashdash=
    513904for ac_option
    514905do
    515906  # If the previous option needs an argument, assign it.
    516907  if test -n "$ac_prev"; then
    517     eval "$ac_prev=\$ac_option"
     908    eval $ac_prev=\$ac_option
    518909    ac_prev=
    519910    continue
    520911  fi
    521912
    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
    523917
    524918  # Accept the important Cygnus configure options, so we can diagnose typos.
    525919
    526   case $ac_option in
     920  case $ac_dashdash$ac_option in
     921  --)
     922    ac_dashdash=yes ;;
    527923
    528924  -bindir | --bindir | --bindi | --bind | --bin | --bi)
    … …  
    546942    cache_file=config.cache ;;
    547943
    548   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     944  -datadir | --datadir | --datadi | --datad)
    549945    ac_prev=datadir ;;
    550   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
    551   | --da=*)
     946  -datadir=* | --datadir=* | --datadi=* | --datad=*)
    552947    datadir=$ac_optarg ;;
    553948
     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
    554956  -disable-* | --disable-*)
    555     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     957    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
    556958    # 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 ;;
    562981
    563982  -enable-* | --enable-*)
    564     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     983    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
    565984    # 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=', ';;
    573995    esac
    574     eval "enable_$ac_feature='$ac_optarg'" ;;
     996    eval enable_$ac_useropt=\$ac_optarg ;;
    575997
    576998  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    … …  
    5991021    host_alias=$ac_optarg ;;
    6001022
     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
    6011029  -includedir | --includedir | --includedi | --included | --include \
    6021030  | --includ | --inclu | --incl | --inc)
    … …  
    6231051    libexecdir=$ac_optarg ;;
    6241052
     1053  -localedir | --localedir | --localedi | --localed | --locale)
     1054    ac_prev=localedir ;;
     1055  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
     1056    localedir=$ac_optarg ;;
     1057
    6251058  -localstatedir | --localstatedir | --localstatedi | --localstated \
    626   | --localstate | --localstat | --localsta | --localst \
    627   | --locals | --local | --loca | --loc | --lo)
     1059  | --localstate | --localstat | --localsta | --localst | --locals)
    6281060    ac_prev=localstatedir ;;
    6291061  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
    630   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
    631   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
     1062  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
    6321063    localstatedir=$ac_optarg ;;
    6331064
    … …  
    6941125    program_transform_name=$ac_optarg ;;
    6951126
     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
    6961137  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    6971138  | -silent | --silent | --silen | --sile | --sil)
    … …  
    7441185
    7451186  -with-* | --with-*)
    746     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     1187    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
    7471188    # 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=', ';;
    7551199    esac
    756     eval "with_$ac_package='$ac_optarg'" ;;
     1200    eval with_$ac_useropt=\$ac_optarg ;;
    7571201
    7581202  -without-* | --without-*)
    759     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     1203    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
    7601204    # 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 ;;
    7661217
    7671218  --x)
    … …  
    7831234    x_libraries=$ac_optarg ;;
    7841235
    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'
     1237Try \`$0 --help' for more information."
    7881238    ;;
    7891239
    … …  
    7911241    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
    7921242    # 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" >&2
    795    { (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
    7981248    export $ac_envvar ;;
    7991249
    8001250  *)
    8011251    # FIXME: should be removed in autoconf 3.0.
    802     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     1252    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    8031253    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    804       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     1254      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    8051255    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
    8061256    ;;
    … …  
    8111261if test -n "$ac_prev"; then
    8121262  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"
     1264fi
     1265
     1266if 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
     1272fi
     1273
     1274# Check all directory arguments for consistency.
     1275for 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
    8191279do
    820   eval ac_val=$`echo $ac_var`
     1280  eval ac_val=\$$ac_var
     1281  # Remove trailing slashes.
    8211282  case $ac_val in
    822     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
    823     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    824    { (exit 1); exit 1; }; };;
     1283    */ )
     1284      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
     1285      eval $ac_var=\$ac_val;;
    8251286  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.
    8331288  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;;
    8371291  esac
     1292  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
    8381293done
    8391294
    … …  
    8491304  if test "x$build_alias" = x; then
    8501305    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.
    8521307    If a cross compiler is detected then cross compile mode will be used." >&2
    8531308  elif test "x$build_alias" != "x$host_alias"; then
    … …  
    8621317
    8631318
     1319ac_pwd=`pwd` && test -n "$ac_pwd" &&
     1320ac_ls_di=`ls -di .` &&
     1321ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
     1322  as_fn_error "working directory cannot be determined"
     1323test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
     1324  as_fn_error "pwd does not report name of working directory"
     1325
     1326
    8641327# Find the source files, if location was not specified.
    8651328if test -z "$srcdir"; then
    8661329  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'`
    8801354  srcdir=$ac_confdir
    881   if test ! -r $srcdir/$ac_unique_file; then
     1355  if test ! -r "$srcdir/$ac_unique_file"; then
    8821356    srcdir=..
    8831357  fi
    … …  
    8851359  ac_srcdir_defaulted=no
    8861360fi
    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
     1361if 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"
     1364fi
     1365ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
     1366ac_abs_confdir=`(
     1367    cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
     1368    pwd)`
     1369# When building in place, set srcdir=.
     1370if test "$ac_abs_confdir" = "$ac_pwd"; then
     1371  srcdir=.
     1372fi
     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.
     1376case $srcdir in
     1377*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
     1378esac
     1379for 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}
     1384done
    9321385
    9331386#
    … …  
    9581411      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
    9591412
    960 _ACEOF
    961 
    962   cat <<_ACEOF
    9631413Installation directories:
    9641414  --prefix=PREFIX         install architecture-independent files in PREFIX
    965               [$ac_default_prefix]
     1415                          [$ac_default_prefix]
    9661416  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
    967               [PREFIX]
     1417                          [PREFIX]
    9681418
    9691419By default, \`make install' will install all the files in
    … …  
    9751425
    9761426Fine 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]
    9891446_ACEOF
    9901447
    … …  
    10031460
    10041461Optional Features:
     1462  --disable-option-checking  ignore unrecognized --enable/--with options
    10051463  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    10061464  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    … …  
    10261484  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
    10271485              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>
    10301489  CPP         C preprocessor
    10311490
    … …  
    10331492it to find libraries and programs with nonstandard names/locations.
    10341493
     1494Report bugs to the package provider.
    10351495_ACEOF
     1496ac_status=$?
    10361497fi
    10371498
    10381499if test "$ac_init_help" = "recursive"; then
    10391500  # If there are subdirs, report their specific --help.
    1040   ac_popdir=`pwd`
    10411501  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
    10431505    ac_builddir=.
    10441506
    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
     1507case "$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 ;;
     1517esac
     1518ac_abs_top_builddir=$ac_pwd
     1519ac_abs_builddir=$ac_pwd$ac_dir_suffix
     1520# for backward compatibility:
     1521ac_top_builddir=$ac_top_build_prefix
    10521522
    10531523case $srcdir in
    1054   .)  # No --srcdir option.  We are building in place.
     1524  .)  # We are building in place.
    10551525    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 ;;
     1536esac
     1537ac_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
    10581547    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; }
    11241551  done
    11251552fi
    11261553
    1127 test -n "$ac_init_help" && exit 0
     1554test -n "$ac_init_help" && exit $ac_status
    11281555if $ac_init_version; then
    11291556  cat <<\_ACEOF
    1130 
    1131 Copyright (C) 2003 Free Software Foundation, Inc.
     1557configure
     1558generated by GNU Autoconf 2.65
     1559
     1560Copyright (C) 2009 Free Software Foundation, Inc.
    11321561This configure script is free software; the Free Software Foundation
    11331562gives unlimited permission to copy, distribute and modify it.
    11341563_ACEOF
    1135   exit 0
    1136 fi
    1137 exec 5>config.log
    1138 cat >&5 <<_ACEOF
     1564  exit
     1565fi
     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.
     1574ac_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"
     1579case "(($ac_try" in
     1580  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1581  *) ac_try_echo=$ac_try;;
     1582esac
     1583eval 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
     1598else
     1599  $as_echo "$as_me: failed program was:" >&5
     1600sed 's/^/| /' conftest.$ac_ext >&5
     1601
     1602    ac_retval=1
     1603fi
     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.
     1612ac_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"
     1616case "(($ac_try" in
     1617  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1618  *) ac_try_echo=$ac_try;;
     1619esac
     1620eval 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
     1635else
     1636  $as_echo "$as_me: failed program was:" >&5
     1637sed 's/^/| /' conftest.$ac_ext >&5
     1638
     1639    ac_retval=1
     1640fi
     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.
     1651ac_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; }
     1657if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1658  $as_echo_n "(cached) " >&6
     1659fi
     1660eval ac_res=\$$3
     1661           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     1662$as_echo "$ac_res" >&6; }
     1663else
     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; }
     1667cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1668/* end confdefs.h.  */
     1669$4
     1670#include <$2>
     1671_ACEOF
     1672if ac_fn_c_try_compile "$LINENO"; then :
     1673  ac_header_compiler=yes
     1674else
     1675  ac_header_compiler=no
     1676fi
     1677rm -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; }
     1684cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1685/* end confdefs.h.  */
     1686#include <$2>
     1687_ACEOF
     1688if ac_fn_c_try_cpp "$LINENO"; then :
     1689  ac_header_preproc=yes
     1690else
     1691  ac_header_preproc=no
     1692fi
     1693rm -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?
     1698case $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    ;;
     1717esac
     1718  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     1719$as_echo_n "checking for $2... " >&6; }
     1720if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1721  $as_echo_n "(cached) " >&6
     1722else
     1723  eval "$3=\$ac_header_compiler"
     1724fi
     1725eval ac_res=\$$3
     1726           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     1727$as_echo "$ac_res" >&6; }
     1728fi
     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.
     1737ac_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"
     1741case "(($ac_try" in
     1742  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1743  *) ac_try_echo=$ac_try;;
     1744esac
     1745eval 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;;
     1754esac
     1755eval 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
     1762else
     1763  $as_echo "$as_me: program exited with status $ac_status" >&5
     1764       $as_echo "$as_me: failed program was:" >&5
     1765sed 's/^/| /' conftest.$ac_ext >&5
     1766
     1767       ac_retval=$ac_status
     1768fi
     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.
     1779ac_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; }
     1784if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1785  $as_echo_n "(cached) " >&6
     1786else
     1787  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1788/* end confdefs.h.  */
     1789$4
     1790#include <$2>
     1791_ACEOF
     1792if ac_fn_c_try_compile "$LINENO"; then :
     1793  eval "$3=yes"
     1794else
     1795  eval "$3=no"
     1796fi
     1797rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     1798fi
     1799eval 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.
     1809ac_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"
     1814case "(($ac_try" in
     1815  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1816  *) ac_try_echo=$ac_try;;
     1817esac
     1818eval 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
     1836else
     1837  $as_echo "$as_me: failed program was:" >&5
     1838sed 's/^/| /' conftest.$ac_ext >&5
     1839
     1840    ac_retval=1
     1841fi
     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
     1855ac_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; }
     1860if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1861  $as_echo_n "(cached) " >&6
     1862else
     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
     1886extern "C"
     1887#endif
     1888char $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
     1893choke me
     1894#endif
     1895
     1896int
     1897main ()
     1898{
     1899return $2 ();
     1900  ;
     1901  return 0;
     1902}
     1903_ACEOF
     1904if ac_fn_c_try_link "$LINENO"; then :
     1905  eval "$3=yes"
     1906else
     1907  eval "$3=no"
     1908fi
     1909rm -f core conftest.err conftest.$ac_objext \
     1910    conftest$ac_exeext conftest.$ac_ext
     1911fi
     1912eval 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
     1918cat >config.log <<_ACEOF
    11391919This file contains any messages produced by compilers while
    11401920running configure, to aid debugging if configure makes a mistake.
    11411921
    11421922It was created by $as_me, which was
    1143 generated by GNU Autoconf 2.59.  Invocation command line was
     1923generated by GNU Autoconf 2.65.  Invocation command line was
    11441924
    11451925  $ $0 $@
    11461926
    11471927_ACEOF
     1928exec 5>>config.log
    11481929{
    11491930cat <<_ASUNAME
    … …  
    11641945/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
    11651946/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`
    11671948/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
    11681949/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
    … …  
    11761957  IFS=$as_save_IFS
    11771958  test -z "$as_dir" && as_dir=.
    1178   echo "PATH: $as_dir"
    1179 done
     1959    $as_echo "PATH: $as_dir"
     1960  done
     1961IFS=$as_save_IFS
    11801962
    11811963} >&5
    … …  
    11991981ac_configure_args0=
    12001982ac_configure_args1=
    1201 ac_sep=
    12021983ac_must_keep_next=false
    12031984for ac_pass in 1 2
    … …  
    12101991    | -silent | --silent | --silen | --sile | --sil)
    12111992      continue ;;
    1212     *" "*|*"    "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
    1213       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     1993    *\'*)
     1994      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
    12141995    esac
    12151996    case $ac_pass in
    1216     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
     1997    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
    12171998    2)
    1218       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
     1999      as_fn_append ac_configure_args1 " '$ac_arg'"
    12192000      if test $ac_must_keep_next = true; then
    12202001    ac_must_keep_next=false # Got value, back to normal.
    … …  
    12322013    esac
    12332014      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'"
    12372016      ;;
    12382017    esac
    12392018  done
    12402019done
    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;}
    12432022
    12442023# When interrupted or exit'd, cleanup temporary files, and complete
    12452024# config.log.  We remove comments because anyway the quotes in there
    12462025# 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.
    12492028trap 'exit_status=$?
    12502029  # Save into config.log some information that might help in debugging.
    … …  
    12592038    echo
    12602039    # 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
    12622056  (set) 2>&1 |
    1263     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
    1264     *ac_space=\ *)
     2057    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
     2058    *${as_nl}ac_space=\ *)
    12652059      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"
    12682065      ;;
    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)
    12752069    echo
    12762070
    … …  
    12832077    for ac_var in $ac_subst_vars
    12842078    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'\''"
    12872084    done | sort
    12882085    echo
    … …  
    12902087    if test -n "$ac_subst_files"; then
    12912088      cat <<\_ASBOX
    1292 ## ------------- ##
    1293 ## Output files. ##
    1294 ## ------------- ##
     2089## ------------------- ##
     2090## File substitutions. ##
     2091## ------------------- ##
    12952092_ASBOX
    12962093      echo
    12972094      for ac_var in $ac_subst_files
    12982095      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'\''"
    13012101      done | sort
    13022102      echo
    … …  
    13102110_ASBOX
    13112111      echo
    1312       sed "/^$/d" confdefs.h | sort
     2112      cat confdefs.h
    13132113      echo
    13142114    fi
    13152115    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"
    13182118  } >&5
    1319   rm -f core *.core &&
    1320   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     2119  rm -f core *.core core.conftest.* &&
     2120    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
    13212121    exit $exit_status
    1322      ' 0
     2122' 0
    13232123for ac_signal in 1 2 13 15; do
    1324   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
     2124  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
    13252125done
    13262126ac_signal=0
    13272127
    13282128# confdefs.h avoids OS command line length limits that DEFS can exceed.
    1329 rm -rf conftest* confdefs.h
    1330 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
    1331 echo >confdefs.h
     2129rm -f -r conftest* confdefs.h
     2130
     2131$as_echo "/* confdefs.h */" > confdefs.h
    13322132
    13332133# Predefined preprocessor variables.
    … …  
    13372137_ACEOF
    13382138
    1339 
    13402139cat >>confdefs.h <<_ACEOF
    13412140#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
    13422141_ACEOF
    13432142
    1344 
    13452143cat >>confdefs.h <<_ACEOF
    13462144#define PACKAGE_VERSION "$PACKAGE_VERSION"
    13472145_ACEOF
    13482146
    1349 
    13502147cat >>confdefs.h <<_ACEOF
    13512148#define PACKAGE_STRING "$PACKAGE_STRING"
    13522149_ACEOF
    13532150
    1354 
    13552151cat >>confdefs.h <<_ACEOF
    13562152#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
    13572153_ACEOF
    13582154
     2155cat >>confdefs.h <<_ACEOF
     2156#define PACKAGE_URL "$PACKAGE_URL"
     2157_ACEOF
     2158
    13592159
    13602160# 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.
     2162ac_site_file1=NONE
     2163ac_site_file2=NONE
     2164if test -n "$CONFIG_SITE"; then
     2165  ac_site_file1=$CONFIG_SITE
     2166elif test "x$prefix" != xNONE; then
     2167  ac_site_file1=$prefix/share/config.site
     2168  ac_site_file2=$prefix/etc/config.site
     2169else
     2170  ac_site_file1=$ac_default_prefix/share/config.site
     2171  ac_site_file2=$ac_default_prefix/etc/config.site
     2172fi
     2173for ac_site_file in "$ac_site_file1" "$ac_site_file2"
     2174do
     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;}
    13732179    sed 's/^/| /' "$ac_site_file" >&5
    13742180    . "$ac_site_file"
    … …  
    13772183
    13782184if 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"; then
    1382     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
    1383 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;}
    13842190    case $cache_file in
    1385       [\\/]* | ?:[\\/]* ) . $cache_file;;
    1386       *)                      . ./$cache_file;;
     2191      [\\/]* | ?:[\\/]* ) . "$cache_file";;
     2192      *)                      . "./$cache_file";;
    13872193    esac
    13882194  fi
    13892195else
    1390   { echo "$as_me:$LINENO: creating cache $cache_file" >&5
    1391 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;}
    13922198  >$cache_file
    13932199fi
    … …  
    13962202# value.
    13972203ac_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
     2204for ac_var in $ac_precious_vars; do
    14002205  eval ac_old_set=\$ac_cv_env_${ac_var}_set
    14012206  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
    14042209  case $ac_old_set,$ac_new_set in
    14052210    set,)
    1406       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    1407 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;}
    14082213      ac_cache_corrupted=: ;;
    14092214    ,set)
    1410       { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
    1411 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;}
    14122217      ac_cache_corrupted=: ;;
    14132218    ,);;
    14142219    *)
    14152220      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;}
    14232237      fi;;
    14242238  esac
    … …  
    14262240  if test "$ac_new_set" = set; then
    14272241    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"` ;;
    14302243    *) ac_arg=$ac_var=$ac_new_val ;;
    14312244    esac
    14322245    case " $ac_configure_args " in
    14332246      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
    1434       *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     2247      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
    14352248    esac
    14362249  fi
    14372250done
    14382251if $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
     2257fi
     2258## -------------------- ##
     2259## Main body of script. ##
     2260## -------------------- ##
    14452261
    14462262ac_ext=c
    … …  
    14512267
    14522268
    1453 
    1454 
    1455 
    1456 
    1457 
    1458 
    1459 
    1460 
    1461 
    1462 
    1463 
    1464 
    1465 
    1466 
    1467 
    1468 
    1469 
    14702269VERSION=`cat .version`
    14712270
    … …  
    14742273
    14752274ac_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
     2275for 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
    14902283done
    14912284if 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
     2286fi
     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.
     2292ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
     2293ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
     2294ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
     2295
    14992296
    15002297# 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; }
     2303if test "${ac_cv_build+set}" = set; then :
     2304  $as_echo_n "(cached) " >&6
     2305else
     2306  ac_build_alias=$build_alias
     2307test "x$ac_build_alias" = x &&
     2308  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
     2309test "x$ac_build_alias" = x &&
     2310  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
     2311ac_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
     2314fi
     2315{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
     2316$as_echo "$ac_cv_build" >&6; }
     2317case $ac_cv_build in
     2318*-*-*) ;;
     2319*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
     2320esac
    15262321build=$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
     2322ac_save_IFS=$IFS; IFS='-'
     2323set x $ac_cv_build
     2324shift
     2325build_cpu=$1
     2326build_vendor=$2
     2327shift; shift
     2328# Remember, the first character of IFS is used to create $*,
     2329# except with old shells:
     2330build_os=$*
     2331IFS=$ac_save_IFS
     2332case $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; }
     2337if test "${ac_cv_host+set}" = set; then :
     2338  $as_echo_n "(cached) " >&6
     2339else
     2340  if test "x$host_alias" = x; then
     2341  ac_cv_host=$ac_cv_build
     2342else
     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
     2345fi
     2346
     2347fi
     2348{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
     2349$as_echo "$ac_cv_host" >&6; }
     2350case $ac_cv_host in
     2351*-*-*) ;;
     2352*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
     2353esac
    15482354host=$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
     2355ac_save_IFS=$IFS; IFS='-'
     2356set x $ac_cv_host
     2357shift
     2358host_cpu=$1
     2359host_vendor=$2
     2360shift; shift
     2361# Remember, the first character of IFS is used to create $*,
     2362# except with old shells:
     2363host_os=$*
     2364IFS=$ac_save_IFS
     2365case $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; }
     2370if test "${ac_cv_target+set}" = set; then :
     2371  $as_echo_n "(cached) " >&6
     2372else
     2373  if test "x$target_alias" = x; then
     2374  ac_cv_target=$ac_cv_host
     2375else
     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
     2378fi
     2379
     2380fi
     2381{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
     2382$as_echo "$ac_cv_target" >&6; }
     2383case $ac_cv_target in
     2384*-*-*) ;;
     2385*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
     2386esac
    15702387target=$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/'`
     2388ac_save_IFS=$IFS; IFS='-'
     2389set x $ac_cv_target
     2390shift
     2391target_cpu=$1
     2392target_vendor=$2
     2393shift; shift
     2394# Remember, the first character of IFS is used to create $*,
     2395# except with old shells:
     2396target_os=$*
     2397IFS=$ac_save_IFS
     2398case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
    15742399
    15752400
    … …  
    15812406  program_prefix=${target_alias}-
    15822407
    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
     2409ac_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; }
     2414set x ${MAKE-make}
     2415ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
     2416if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
     2417  $as_echo_n "(cached) " >&6
    15912418else
    15922419  cat >conftest.make <<\_ACEOF
     2420SHELL = /bin/sh
    15932421all:
    1594     @echo 'ac_maketemp="$(MAKE)"'
     2422    @echo '@@@%%%=$(MAKE)=@@@%%%'
    15952423_ACEOF
    15962424# 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=yes
    1600 else
    1601   eval ac_cv_prog_make_${ac_make}_set=no
    1602 fi
     2425case `${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;;
     2430esac
    16032431rm -f conftest.make
    16042432fi
    1605 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    1606   echo "$as_me:$LINENO: result: yes" >&5
    1607 echo "${ECHO_T}yes" >&6
     2433if 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; }
    16082436  SET_MAKE=
    16092437else
    1610   echo "$as_me:$LINENO: result: no" >&5
    1611 echo "${ECHO_T}no" >&6
     2438  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2439$as_echo "no" >&6; }
    16122440  SET_MAKE="MAKE=${MAKE-make}"
    16132441fi
    16142442
    1615 
    1616 echo "$as_me:$LINENO: checking to see if architecture is 64-bit" >&5
    1617 echo $ECHO_N "checking to see if architecture is 64-bit... $ECHO_C" >&6
    1618 arch_64bit=no
    1619 case "$host_cpu" in
    1620 x86_64) arch_64bit=yes ;;
    1621 esac
    1622 
    1623 if test "$arch_64bit" = yes; then
    1624   echo "$as_me:$LINENO: result: yes" >&5
    1625 echo "${ECHO_T}yes" >&6
    1626   if test -z "$COMPAT32BITFLAGS" ; then
    1627     COMPAT32BITFLAGS="-m32"
    1628   fi
    1629 else
    1630   echo "$as_me:$LINENO: result: no" >&5
    1631 echo "${ECHO_T}no" >&6
    1632   if test -z "$COMPAT32BITFLAGS" ; then
    1633     COMPAT32BITFLAGS=
    1634   fi
    1635 fi
    16362443
    16372444
    … …  
    16472454  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
    16482455set dummy ${ac_tool_prefix}gcc; ac_word=$2
    1649 echo "$as_me:$LINENO: checking for $ac_word" >&5
    1650 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" >&6
     2456{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2457$as_echo_n "checking for $ac_word... " >&6; }
     2458if test "${ac_cv_prog_CC+set}" = set; then :
     2459  $as_echo_n "(cached) " >&6
    16532460else
    16542461  if test -n "$CC"; then
    … …  
    16602467  IFS=$as_save_IFS
    16612468  test -z "$as_dir" && as_dir=.
    1662   for ac_exec_ext in '' $ac_executable_extensions; do
    1663   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2469    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
    16642471    ac_cv_prog_CC="${ac_tool_prefix}gcc"
    1665     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2472    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    16662473    break 2
    16672474  fi
    16682475done
    1669 done
     2476  done
     2477IFS=$as_save_IFS
    16702478
    16712479fi
    … …  
    16732481CC=$ac_cv_prog_CC
    16742482if 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; }
     2485else
     2486  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2487$as_echo "no" >&6; }
     2488fi
     2489
    16812490
    16822491fi
    … …  
    16852494  # Extract the first word of "gcc", so it can be a program name with args.
    16862495set dummy gcc; ac_word=$2
    1687 echo "$as_me:$LINENO: checking for $ac_word" >&5
    1688 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" >&6
     2496{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2497$as_echo_n "checking for $ac_word... " >&6; }
     2498if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     2499  $as_echo_n "(cached) " >&6
    16912500else
    16922501  if test -n "$ac_ct_CC"; then
    … …  
    16982507  IFS=$as_save_IFS
    16992508  test -z "$as_dir" && as_dir=.
    1700   for ac_exec_ext in '' $ac_executable_extensions; do
    1701   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2509    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
    17022511    ac_cv_prog_ac_ct_CC="gcc"
    1703     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2512    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    17042513    break 2
    17052514  fi
    17062515done
    1707 done
     2516  done
     2517IFS=$as_save_IFS
    17082518
    17092519fi
    … …  
    17112521ac_ct_CC=$ac_cv_prog_ac_ct_CC
    17122522if 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; }
     2525else
     2526  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2527$as_echo "no" >&6; }
     2528fi
     2529
     2530  if test "x$ac_ct_CC" = x; then
     2531    CC=""
     2532  else
     2533    case $cross_compiling:$ac_tool_warned in
     2534yes:)
     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;}
     2537ac_tool_warned=yes ;;
     2538esac
     2539    CC=$ac_ct_CC
     2540  fi
    17212541else
    17222542  CC="$ac_cv_prog_CC"
    … …  
    17242544
    17252545if test -z "$CC"; then
    1726   if test -n "$ac_tool_prefix"; then
    1727   # 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.
    17282548set dummy ${ac_tool_prefix}cc; ac_word=$2
    1729 echo "$as_me:$LINENO: checking for $ac_word" >&5
    1730 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" >&6
     2549{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2550$as_echo_n "checking for $ac_word... " >&6; }
     2551if test "${ac_cv_prog_CC+set}" = set; then :
     2552  $as_echo_n "(cached) " >&6
    17332553else
    17342554  if test -n "$CC"; then
    … …  
    17402560  IFS=$as_save_IFS
    17412561  test -z "$as_dir" && as_dir=.
    1742   for ac_exec_ext in '' $ac_executable_extensions; do
    1743   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2562    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
    17442564    ac_cv_prog_CC="${ac_tool_prefix}cc"
    1745     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2565    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    17462566    break 2
    17472567  fi
    17482568done
    1749 done
     2569  done
     2570IFS=$as_save_IFS
    17502571
    17512572fi
    … …  
    17532574CC=$ac_cv_prog_CC
    17542575if 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; }
     2578else
     2579  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2580$as_echo "no" >&6; }
     2581fi
     2582
     2583
    17852584  fi
    1786 done
    1787 done
    1788 
    1789 fi
    1790 fi
    1791 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    1792 if test -n "$ac_ct_CC"; then
    1793   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
    1794 echo "${ECHO_T}$ac_ct_CC" >&6
    1795 else
    1796   echo "$as_me:$LINENO: result: no" >&5
    1797 echo "${ECHO_T}no" >&6
    1798 fi
    1799 
    1800   CC=$ac_ct_CC
    1801 else
    1802   CC="$ac_cv_prog_CC"
    1803 fi
    1804 
    18052585fi
    18062586if test -z "$CC"; then
    18072587  # Extract the first word of "cc", so it can be a program name with args.
    18082588set dummy cc; ac_word=$2
    1809 echo "$as_me:$LINENO: checking for $ac_word" >&5
    1810 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" >&6
     2589{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2590$as_echo_n "checking for $ac_word... " >&6; }
     2591if test "${ac_cv_prog_CC+set}" = set; then :
     2592  $as_echo_n "(cached) " >&6
    18132593else
    18142594  if test -n "$CC"; then
    … …  
    18212601  IFS=$as_save_IFS
    18222602  test -z "$as_dir" && as_dir=.
    1823   for ac_exec_ext in '' $ac_executable_extensions; do
    1824   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2603    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
    18252605    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
    18262606       ac_prog_rejected=yes
    … …  
    18282608     fi
    18292609    ac_cv_prog_CC="cc"
    1830     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2610    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    18312611    break 2
    18322612  fi
    18332613done
    1834 done
     2614  done
     2615IFS=$as_save_IFS
    18352616
    18362617if test $ac_prog_rejected = yes; then
    … …  
    18502631CC=$ac_cv_prog_CC
    18512632if 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; }
     2635else
     2636  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2637$as_echo "no" >&6; }
     2638fi
     2639
    18582640
    18592641fi
    18602642if test -z "$CC"; then
    18612643  if test -n "$ac_tool_prefix"; then
    1862   for ac_prog in cl
     2644  for ac_prog in cl.exe
    18632645  do
    18642646    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    18652647set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    1866 echo "$as_me:$LINENO: checking for $ac_word" >&5
    1867 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" >&6
     2648{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2649$as_echo_n "checking for $ac_word... " >&6; }
     2650if test "${ac_cv_prog_CC+set}" = set; then :
     2651  $as_echo_n "(cached) " >&6
    18702652else
    18712653  if test -n "$CC"; then
    … …  
    18772659  IFS=$as_save_IFS
    18782660  test -z "$as_dir" && as_dir=.
    1879   for ac_exec_ext in '' $ac_executable_extensions; do
    1880   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2661    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
    18812663    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    1882     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2664    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    18832665    break 2
    18842666  fi
    18852667done
    1886 done
     2668  done
     2669IFS=$as_save_IFS
    18872670
    18882671fi
    … …  
    18902673CC=$ac_cv_prog_CC
    18912674if 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; }
     2677else
     2678  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2679$as_echo "no" >&6; }
     2680fi
     2681
    18982682
    18992683    test -n "$CC" && break
    … …  
    19022686if test -z "$CC"; then
    19032687  ac_ct_CC=$CC
    1904   for ac_prog in cl
     2688  for ac_prog in cl.exe
    19052689do
    19062690  # Extract the first word of "$ac_prog", so it can be a program name with args.
    19072691set dummy $ac_prog; ac_word=$2
    1908 echo "$as_me:$LINENO: checking for $ac_word" >&5
    1909 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" >&6
     2692{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2693$as_echo_n "checking for $ac_word... " >&6; }
     2694if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     2695  $as_echo_n "(cached) " >&6
    19122696else
    19132697  if test -n "$ac_ct_CC"; then
    … …  
    19192703  IFS=$as_save_IFS
    19202704  test -z "$as_dir" && as_dir=.
    1921   for ac_exec_ext in '' $ac_executable_extensions; do
    1922   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2705    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
    19232707    ac_cv_prog_ac_ct_CC="$ac_prog"
    1924     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2708    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    19252709    break 2
    19262710  fi
    19272711done
    1928 done
     2712  done
     2713IFS=$as_save_IFS
    19292714
    19302715fi
    … …  
    19322717ac_ct_CC=$ac_cv_prog_ac_ct_CC
    19332718if 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; }
     2721else
     2722  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2723$as_echo "no" >&6; }
     2724fi
     2725
    19402726
    19412727  test -n "$ac_ct_CC" && break
    19422728done
    19432729
    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
     2734yes:)
     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;}
     2737ac_tool_warned=yes ;;
     2738esac
     2739    CC=$ac_ct_CC
     2740  fi
     2741fi
     2742
     2743fi
     2744
     2745
     2746test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     2747$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     2748as_fn_error "no acceptable C compiler found in \$PATH
     2749See \`config.log' for more details." "$LINENO" 5; }
    19552750
    19562751# 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
     2753set X $ac_compile
     2754ac_compiler=$2
     2755for ac_option in --version -v -V -qversion; do
     2756  { { ac_try="$ac_compiler $ac_option >&5"
     2757case "(($ac_try" in
     2758  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2759  *) ac_try_echo=$ac_try;;
     2760esac
     2761eval 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
    19622764  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; }
     2774done
     2775
     2776cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    19812777/* end confdefs.h.  */
    19822778
    … …  
    19902786_ACEOF
    19912787ac_clean_files_save=$ac_clean_files
    1992 ac_clean_files="$ac_clean_files a.out a.exe b.out"
     2788ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
    19932789# Try to create an executable without -o first, disregard a.out.
    19942790# It will help us diagnose broken compilers, and finding out an intuition
    19952791# 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; }
     2794ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
     2795
     2796# The possible output files:
     2797ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
     2798
     2799ac_rmfiles=
     2800for ac_file in $ac_files
     2801do
     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
     2806done
     2807rm -f $ac_rmfiles
     2808
     2809if { { ac_try="$ac_link_default"
     2810case "(($ac_try" in
     2811  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2812  *) ac_try_echo=$ac_try;;
     2813esac
     2814eval 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
    20012817  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.
     2825for ac_file in $ac_files ''
    20132826do
    20142827  test -f "$ac_file" || continue
    20152828  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 )
    20202830    ;;
    20212831    [ab].out )
    … …  
    20242834    break;;
    20252835    *.* )
    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.
    20312845    break;;
    20322846    * )
    … …  
    20342848  esac
    20352849done
    2036 else
    2037   echo "$as_me: failed program was:" >&5
     2850test "$ac_cv_exeext" = no && ac_cv_exeext=
     2851
     2852else
     2853  ac_file=''
     2854fi
     2855if 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
    20382859sed 's/^/| /' conftest.$ac_ext >&5
    20392860
    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
     2864as_fn_error "C compiler cannot create executables
     2865See \`config.log' for more details." "$LINENO" 5; }; }
     2866else
     2867  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     2868$as_echo "yes" >&6; }
     2869fi
     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; }
    20472874ac_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\"") >&5
    2060   (eval $ac_try) 2>&5
     2875
     2876rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
     2877ac_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; }
     2880if { { ac_try="$ac_link"
     2881case "(($ac_try" in
     2882  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2883  *) ac_try_echo=$ac_try;;
     2884esac
     2885eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     2886$as_echo "$ac_try_echo"; } >&5
     2887  (eval "$ac_link") 2>&5
    20612888  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 :
    20982891  # If both `conftest.exe' and `conftest' are `present' (well, observable)
    20992892# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    … …  
    21032896  test -f "$ac_file" || continue
    21042897  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 ) ;;
    21062899    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
    2107       export ac_cv_exeext
    21082900      break;;
    21092901    * ) break;;
    … …  
    21112903done
    21122904else
    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;}
     2907as_fn_error "cannot compute suffix of executables: cannot compile and link
     2908See \`config.log' for more details." "$LINENO" 5; }
     2909fi
     2910rm -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; }
    21232913
    21242914rm -f conftest.$ac_ext
    21252915EXEEXT=$ac_cv_exeext
    21262916ac_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.  */
     2917cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2918/* end confdefs.h.  */
     2919#include <stdio.h>
     2920int
     2921main ()
     2922{
     2923FILE *f = fopen ("conftest.out", "w");
     2924 return ferror (f) || fclose (f) != 0;
     2925
     2926  ;
     2927  return 0;
     2928}
    21342929_ACEOF
    2135 cat confdefs.h >>conftest.$ac_ext
    2136 cat >>conftest.$ac_ext <<_ACEOF
     2930ac_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; }
     2935if test "$cross_compiling" != yes; then
     2936  { { ac_try="$ac_link"
     2937case "(($ac_try" in
     2938  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2939  *) ac_try_echo=$ac_try;;
     2940esac
     2941eval 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;;
     2951esac
     2952eval 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;}
     2965as_fn_error "cannot run C compiled programs.
     2966If you meant to cross compile, use \`--host'.
     2967See \`config.log' for more details." "$LINENO" 5; }
     2968    fi
     2969  fi
     2970fi
     2971{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     2972$as_echo "$cross_compiling" >&6; }
     2973
     2974rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
     2975ac_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; }
     2978if test "${ac_cv_objext+set}" = set; then :
     2979  $as_echo_n "(cached) " >&6
     2980else
     2981  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    21372982/* end confdefs.h.  */
    21382983
    … …  
    21462991_ACEOF
    21472992rm -f conftest.o conftest.obj
    2148 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    2149   (eval $ac_compile) 2>&5
     2993if { { ac_try="$ac_compile"
     2994case "(($ac_try" in
     2995  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     2996  *) ac_try_echo=$ac_try;;
     2997esac
     2998eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     2999$as_echo "$ac_try_echo"; } >&5
     3000  (eval "$ac_compile") 2>&5
    21503001  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;
    21543006  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 ) ;;
    21563008    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
    21573009       break;;
    … …  
    21593011done
    21603012else
    2161   echo "$as_me: failed program was:" >&5
     3013  $as_echo "$as_me: failed program was:" >&5
    21623014sed 's/^/| /' conftest.$ac_ext >&5
    21633015
    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;}
     3018as_fn_error "cannot compute suffix of object files: cannot compile
     3019See \`config.log' for more details." "$LINENO" 5; }
     3020fi
    21713021rm -f conftest.$ac_cv_objext conftest.$ac_ext
    21723022fi
    2173 echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
    2174 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; }
    21753025OBJEXT=$ac_cv_objext
    21763026ac_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; }
     3029if test "${ac_cv_c_compiler_gnu+set}" = set; then :
     3030  $as_echo_n "(cached) " >&6
     3031else
     3032  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    21873033/* end confdefs.h.  */
    21883034
    … …  
    21983044}
    21993045_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
     3046if ac_fn_c_try_compile "$LINENO"; then :
    22223047  ac_compiler_gnu=yes
    22233048else
    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
     3050fi
     3051rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    22303052ac_cv_c_compiler_gnu=$ac_compiler_gnu
    22313053
    22323054fi
    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; }
     3057if test $ac_compiler_gnu = yes; then
     3058  GCC=yes
     3059else
     3060  GCC=
     3061fi
    22363062ac_test_CFLAGS=${CFLAGS+set}
    22373063ac_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; }
     3066if test "${ac_cv_prog_cc_g+set}" = set; then :
     3067  $as_echo_n "(cached) " >&6
     3068else
     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
    22493074/* end confdefs.h.  */
    22503075
    … …  
    22573082}
    22583083_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
     3084if ac_fn_c_try_compile "$LINENO"; then :
    22813085  ac_cv_prog_cc_g=yes
    22823086else
    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
     3091int
     3092main ()
     3093{
     3094
     3095  ;
     3096  return 0;
     3097}
     3098_ACEOF
     3099if ac_fn_c_try_compile "$LINENO"; then :
     3100
     3101else
     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
     3107int
     3108main ()
     3109{
     3110
     3111  ;
     3112  return 0;
     3113}
     3114_ACEOF
     3115if ac_fn_c_try_compile "$LINENO"; then :
     3116  ac_cv_prog_cc_g=yes
     3117fi
     3118rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3119fi
     3120rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3121fi
     3122rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3123   ac_c_werror_flag=$ac_save_c_werror_flag
     3124fi
     3125{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
     3126$as_echo "$ac_cv_prog_cc_g" >&6; }
    22923127if test "$ac_test_CFLAGS" = set; then
    22933128  CFLAGS=$ac_save_CFLAGS
    … …  
    23053140  fi
    23063141fi
    2307 echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
    2308 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
    2309 if test "${ac_cv_prog_cc_stdc+set}" = set; then
    2310   echo $ECHO_N "(cached) $ECHO_C" >&6
    2311 else
    2312   ac_cv_prog_cc_stdc=no
     3142{ $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; }
     3144if test "${ac_cv_prog_cc_c89+set}" = set; then :
     3145  $as_echo_n "(cached) " >&6
     3146else
     3147  ac_cv_prog_cc_c89=no
    23133148ac_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
     3149cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    23193150/* end confdefs.h.  */
    23203151#include <stdarg.h>
    … …  
    23443175   function prototypes and stuff, but not '\xHH' hex character constants.
    23453176   These don't provoke an error unfortunately, instead are silently treated
    2346    as 'x'.  The following induces an error, until -std1 is added to get
     3177   as 'x'.  The following induces an error, until -std is added to get
    23473178   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    23483179   array size at least.  It's necessary to write '\x00'==0 to get something
    2349    that's true only with -std1.  */
     3180   that's true only with -std.  */
    23503181int 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'
     3186int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
    23513187
    23523188int test (int i, double x);
    … …  
    23643200}
    23653201_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__"
     3202for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
     3203    -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
    23743204do
    23753205  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
     3208fi
     3209rm -f core conftest.err conftest.$ac_objext
     3210  test "x$ac_cv_prog_cc_c89" != "xno" && break
    24063211done
    2407 rm -f conftest.$ac_ext conftest.$ac_objext
     3212rm -f conftest.$ac_ext
    24083213CC=$ac_save_CC
    24093214
    24103215fi
    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
     3217case "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; } ;;
    24163224  *)
    2417     echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
    2418 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; } ;;
    24203228esac
    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
     3229if test "x$ac_cv_prog_cc_c89" != xno; then :
     3230
     3231fi
     3232
    25653233ac_ext=c
    25663234ac_cpp='$CPP $CPPFLAGS'
    … …  
    25753243ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    25763244ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2577 echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
    2578 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; }
    25793247# On Suns, sometimes $CPP names a directory.
    25803248if test -n "$CPP" && test -d "$CPP"; then
    … …  
    25823250fi
    25833251if test -z "$CPP"; then
    2584   if test "${ac_cv_prog_CPP+set}" = set; then
    2585   echo $ECHO_N "(cached) $ECHO_C" >&6
     3252  if test "${ac_cv_prog_CPP+set}" = set; then :
     3253  $as_echo_n "(cached) " >&6
    25863254else
    25873255      # Double quotes because CPP needs to be expanded
    … …  
    25973265  # On the NeXT, cc -E runs the code through the compiler's parser,
    25983266  # 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
    26043268/* end confdefs.h.  */
    26053269#ifdef __STDC__
    … …  
    26103274             Syntax error
    26113275_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 
     3276if ac_fn_c_try_cpp "$LINENO"; then :
     3277
     3278else
    26353279  # Broken: fails on valid input.
    26363280continue
    … …  
    26383282rm -f conftest.err conftest.$ac_ext
    26393283
    2640   # OK, works on sane cases.  Now check whether non-existent headers
     3284  # OK, works on sane cases.  Now check whether nonexistent headers
    26413285  # 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
    26473287/* end confdefs.h.  */
    26483288#include <ac_nonexistent.h>
    26493289_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
     3290if ac_fn_c_try_cpp "$LINENO"; then :
    26683291  # Broken: success on invalid input.
    26693292continue
    26703293else
    2671   echo "$as_me: failed program was:" >&5
    2672 sed 's/^/| /' conftest.$ac_ext >&5
    2673 
    26743294  # Passes both tests.
    26753295ac_preproc_ok=:
    … …  
    26813301# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    26823302rm -f conftest.err conftest.$ac_ext
    2683 if $ac_preproc_ok; then
     3303if $ac_preproc_ok; then :
    26843304  break
    26853305fi
    … …  
    26933313  ac_cv_prog_CPP=$CPP
    26943314fi
    2695 echo "$as_me:$LINENO: result: $CPP" >&5
    2696 echo "${ECHO_T}$CPP" >&6
     3315{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
     3316$as_echo "$CPP" >&6; }
    26973317ac_preproc_ok=false
    26983318for ac_c_preproc_warn_flag in '' yes
    … …  
    27043324  # On the NeXT, cc -E runs the code through the compiler's parser,
    27053325  # 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
    27113327/* end confdefs.h.  */
    27123328#ifdef __STDC__
    … …  
    27173333             Syntax error
    27183334_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 
     3335if ac_fn_c_try_cpp "$LINENO"; then :
     3336
     3337else
    27423338  # Broken: fails on valid input.
    27433339continue
    … …  
    27453341rm -f conftest.err conftest.$ac_ext
    27463342
    2747   # OK, works on sane cases.  Now check whether non-existent headers
     3343  # OK, works on sane cases.  Now check whether nonexistent headers
    27483344  # 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
    27543346/* end confdefs.h.  */
    27553347#include <ac_nonexistent.h>
    27563348_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
     3349if ac_fn_c_try_cpp "$LINENO"; then :
    27753350  # Broken: success on invalid input.
    27763351continue
    27773352else
    2778   echo "$as_me: failed program was:" >&5
    2779 sed 's/^/| /' conftest.$ac_ext >&5
    2780 
    27813353  # Passes both tests.
    27823354ac_preproc_ok=:
    … …  
    27883360# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    27893361rm -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; }; }
     3362if $ac_preproc_ok; then :
     3363
     3364else
     3365  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     3366$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     3367as_fn_error "C preprocessor \"$CPP\" fails sanity check
     3368See \`config.log' for more details." "$LINENO" 5; }
    27983369fi
    27993370
    … …  
    28053376
    28063377
    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; }
     3380if test "${ac_cv_path_GREP+set}" = set; then :
     3381  $as_echo_n "(cached) " >&6
     3382else
     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
     3387for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
     3388do
     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
     3397case `"$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
    28153416    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;;
     3421esac
     3422
     3423      $ac_path_GREP_found && break 3
     3424    done
     3425  done
     3426  done
     3427IFS=$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
     3431else
     3432  ac_cv_path_GREP=$GREP
     3433fi
     3434
     3435fi
     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; }
     3443if test "${ac_cv_path_EGREP+set}" = set; then :
     3444  $as_echo_n "(cached) " >&6
     3445else
     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
     3453for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
     3454do
     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
     3463case `"$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;;
     3487esac
     3488
     3489      $ac_path_EGREP_found && break 3
     3490    done
     3491  done
     3492  done
     3493IFS=$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
     3497else
     3498  ac_cv_path_EGREP=$EGREP
     3499fi
     3500
     3501   fi
     3502fi
     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; }
     3510if test "${ac_cv_header_stdc+set}" = set; then :
     3511  $as_echo_n "(cached) " >&6
     3512else
     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
     3520int
     3521main ()
     3522{
     3523
     3524  ;
     3525  return 0;
     3526}
    28273527_ACEOF
    2828 cat confdefs.h >>conftest.$ac_ext
    2829 cat >>conftest.$ac_ext <<_ACEOF
     3528if ac_fn_c_try_compile "$LINENO"; then :
     3529  ac_cv_header_stdc=yes
     3530else
     3531  ac_cv_header_stdc=no
     3532fi
     3533rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3534
     3535if 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
    28303538/* end confdefs.h.  */
    2831 #ifdef _AIX
    2832   yes
    2833 #endif
     3539#include <string.h>
    28343540
    28353541_ACEOF
    28363542if (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
     3545else
     3546  ac_cv_header_stdc=no
     3547fi
     3548rm -f conftest*
     3549
     3550fi
     3551
     3552if 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
    28423558_ACEOF
    2843 
    2844 else
    2845   echo "$as_me:$LINENO: result: no" >&5
    2846 echo "${ECHO_T}no" >&6
     3559if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     3560  $EGREP "free" >/dev/null 2>&1; then :
     3561
     3562else
     3563  ac_cv_header_stdc=no
    28473564fi
    28483565rm -f conftest*
    28493566
    2850 
    2851 echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5
    2852 echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6
     3567fi
     3568
     3569if 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  :
     3573else
     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)))
     3590int
     3591main ()
     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
     3601if ac_fn_c_try_run "$LINENO"; then :
     3602
     3603else
     3604  ac_cv_header_stdc=no
     3605fi
     3606rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
     3607  conftest.$ac_objext conftest.beam conftest.$ac_ext
     3608fi
     3609
     3610fi
     3611fi
     3612{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
     3613$as_echo "$ac_cv_header_stdc" >&6; }
     3614if test $ac_cv_header_stdc = yes; then
     3615
     3616$as_echo "#define STDC_HEADERS 1" >>confdefs.h
     3617
     3618fi
     3619
     3620# On IRIX 5.3, sys/types and inttypes.h are conflicting.
     3621for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
     3622          inttypes.h stdint.h unistd.h
     3623do :
     3624  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     3625ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
     3626"
     3627eval 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
     3633fi
     3634
     3635done
     3636
     3637
     3638
     3639  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
     3640if test "x$ac_cv_header_minix_config_h" = x""yes; then :
     3641  MINIX=yes
     3642else
     3643  MINIX=
     3644fi
     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; }
     3662if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
     3663  $as_echo_n "(cached) " >&6
     3664else
     3665  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3666/* end confdefs.h.  */
     3667
     3668#     define __EXTENSIONS__ 1
     3669      $ac_includes_default
     3670int
     3671main ()
     3672{
     3673
     3674  ;
     3675  return 0;
     3676}
     3677_ACEOF
     3678if ac_fn_c_try_compile "$LINENO"; then :
     3679  ac_cv_safe_to_define___extensions__=yes
     3680else
     3681  ac_cv_safe_to_define___extensions__=no
     3682fi
     3683rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3684fi
     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; }
    28533702if test -n "$CXX"
    28543703then
    … …  
    28703719  ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
    28713720fi
    2872 echo "$as_me:$LINENO: result: $ac_compile_warnings_msg" >&5
    2873 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; }
    28743723unset ac_compile_warnings_msg
    28753724unset ac_compile_warnings_opt
    28763725
    28773726
    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.
     3728if test "${enable_shared+set}" = set; then :
     3729  enableval=$enable_shared; p=${PACKAGE-default}
    28823730case $enableval in
    28833731yes) enable_shared=yes ;;
    … …  
    28973745else
    28983746  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}
     3747fi
     3748
     3749# Check whether --enable-static was given.
     3750if test "${enable_static+set}" = set; then :
     3751  enableval=$enable_static; p=${PACKAGE-default}
    29043752case $enableval in
    29053753yes) enable_static=yes ;;
    … …  
    29193767else
    29203768  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}
     3769fi
     3770
     3771# Check whether --enable-fast-install was given.
     3772if test "${enable_fast_install+set}" = set; then :
     3773  enableval=$enable_fast_install; p=${PACKAGE-default}
    29263774case $enableval in
    29273775yes) enable_fast_install=yes ;;
    … …  
    29413789else
    29423790  enable_fast_install=yes
    2943 fi;
     3791fi
     3792
    29443793# Find the correct PATH separator.  Usually this is `:', but
    29453794# DJGPP uses `;' like DOS.
    … …  
    29543803
    29553804
    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.
     3806if test "${with_gnu_ld+set}" = set; then :
     3807  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
    29603808else
    29613809  with_gnu_ld=no
    2962 fi;
     3810fi
     3811
    29633812ac_prog=ld
    29643813if test "$GCC" = yes; then
    29653814  # Check if gcc -print-prog-name=ld gives a path.
    2966   echo "$as_me:$LINENO: checking for ld used by GCC" >&5
    2967 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; }
    29683817  case $host in
    29693818  *-*-mingw*)
    … …  
    29943843  esac
    29953844elif test "$with_gnu_ld" = yes; then
    2996   echo "$as_me:$LINENO: checking for GNU ld" >&5
    2997 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
    2998 else
    2999   echo "$as_me:$LINENO: checking for non-GNU ld" >&5
    3000 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" >&6
     3845  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
     3846$as_echo_n "checking for GNU ld... " >&6; }
     3847else
     3848  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
     3849$as_echo_n "checking for non-GNU ld... " >&6; }
     3850fi
     3851if test "${lt_cv_path_LD+set}" = set; then :
     3852  $as_echo_n "(cached) " >&6
    30043853else
    30053854  if test -z "$LD"; then
    … …  
    30273876LD="$lt_cv_path_LD"
    30283877if 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; }
     3880else
     3881  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3882$as_echo "no" >&6; }
     3883fi
     3884test -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; }
     3887if test "${lt_cv_prog_gnu_ld+set}" = set; then :
     3888  $as_echo_n "(cached) " >&6
    30423889else
    30433890  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
    … …  
    30483895fi
    30493896fi
    3050 echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
    3051 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; }
    30523899with_gnu_ld=$lt_cv_prog_gnu_ld
    30533900
    30543901
    3055 echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
    3056 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" >&6
     3902{ $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; }
     3904if test "${lt_cv_ld_reload_flag+set}" = set; then :
     3905  $as_echo_n "(cached) " >&6
    30593906else
    30603907  lt_cv_ld_reload_flag='-r'
    30613908fi
    3062 echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
    3063 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; }
    30643911reload_flag=$lt_cv_ld_reload_flag
    30653912test -n "$reload_flag" && reload_flag=" $reload_flag"
    30663913
    3067 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
    3068 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" >&6
     3914{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
     3915$as_echo_n "checking for BSD-compatible nm... " >&6; }
     3916if test "${lt_cv_path_NM+set}" = set; then :
     3917  $as_echo_n "(cached) " >&6
    30713918else
    30723919  if test -n "$NM"; then
    … …  
    31013948
    31023949NM="$lt_cv_path_NM"
    3103 echo "$as_me:$LINENO: result: $NM" >&5
    3104 echo "${ECHO_T}$NM" >&6
    3105 
    3106 echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
    3107 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" >&6
     3950{ $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; }
     3955if test "${lt_cv_path_SED+set}" = set; then :
     3956  $as_echo_n "(cached) " >&6
    31103957else
    31113958  # Loop through the user's path and test for sed and gsed.
    … …  
    31864033  SED=$lt_cv_path_SED
    31874034fi
    3188 echo "$as_me:$LINENO: result: $SED" >&5
    3189 echo "${ECHO_T}$SED" >&6
    3190 
    3191 echo "$as_me:$LINENO: checking whether ln -s works" >&5
    3192 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; }
    31934040LN_S=$as_ln_s
    31944041if test "$LN_S" = "ln -s"; then
    3195   echo "$as_me:$LINENO: result: yes" >&5
    3196 echo "${ECHO_T}yes" >&6
    3197 else
    3198   echo "$as_me:$LINENO: result: no, using $LN_S" >&5
    3199 echo "${ECHO_T}no, using $LN_S" >&6
    3200 fi
    3201 
    3202 echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
    3203 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" >&6
     4042  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     4043$as_echo "yes" >&6; }
     4044else
     4045  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
     4046$as_echo "no, using $LN_S" >&6; }
     4047fi
     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; }
     4051if test "${lt_cv_deplibs_check_method+set}" = set; then :
     4052  $as_echo_n "(cached) " >&6
    32064053else
    32074054  lt_cv_file_magic_cmd='$MAGIC_CMD'
    … …  
    33814228
    33824229fi
    3383 echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
    3384 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; }
    33854232file_magic_cmd=$lt_cv_file_magic_cmd
    33864233deplibs_check_method=$lt_cv_deplibs_check_method
    … …  
    33934240
    33944241# 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" >&5
    3396 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" >&6
     4242{ $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; }
     4244if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
     4245  $as_echo_n "(cached) " >&6
    33994246else
    34004247
    … …  
    34744321EOF
    34754322
    3476   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     4323  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    34774324  (eval $ac_compile) 2>&5
    34784325  ac_status=$?
    3479   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    3480   (exit $ac_status); }; then
     4326  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     4327  test $ac_status = 0; }; then
    34814328    # Now try to grab the symbols.
    34824329    nlist=conftest.nm
    3483     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
     4330    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
    34844331  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
    34854332  ac_status=$?
    3486   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    3487   (exit $ac_status); } && test -s "$nlist"; then
     4333  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     4334  test $ac_status = 0; } && test -s "$nlist"; then
    34884335      # Try sorting and uniquifying the output.
    34894336      if sort "$nlist" | uniq > "$nlist"T; then
    … …  
    35364383      LIBS="conftstm.$ac_objext"
    35374384      CFLAGS="$CFLAGS$no_builtin_flag"
    3538       if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     4385      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    35394386  (eval $ac_link) 2>&5
    35404387  ac_status=$?
    3541   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    3542   (exit $ac_status); } && test -s conftest; then
     4388  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     4389  test $ac_status = 0; } && test -s conftest; then
    35434390        pipe_works=yes
    35444391      fi
    … …  
    35804427if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
    35814428then
    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; }
     4431else
     4432  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
     4433$as_echo "ok" >&6; }
     4434fi
     4435
     4436for ac_header in dlfcn.h
     4437do :
     4438  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
     4439if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
    38184440  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
    39714442_ACEOF
    39724443
    … …  
    39844455file_magic*)
    39854456  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
    3986     echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
    3987 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" >&6
     4457    { $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; }
     4459if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
     4460  $as_echo_n "(cached) " >&6
    39904461else
    39914462  case $MAGIC_CMD in
    … …  
    40394510MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
    40404511if test -n "$MAGIC_CMD"; then
    4041   echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
    4042 echo "${ECHO_T}$MAGIC_CMD" >&6
    4043 else
    4044   echo "$as_me:$LINENO: result: no" >&5
    4045 echo "${ECHO_T}no" >&6
     4512  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
     4513$as_echo "$MAGIC_CMD" >&6; }
     4514else
     4515  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4516$as_echo "no" >&6; }
    40464517fi
    40474518
    40484519if test -z "$lt_cv_path_MAGIC_CMD"; then
    40494520  if test -n "$ac_tool_prefix"; then
    4050     echo "$as_me:$LINENO: checking for file" >&5
    4051 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" >&6
     4521    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
     4522$as_echo_n "checking for file... " >&6; }
     4523if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
     4524  $as_echo_n "(cached) " >&6
    40544525else
    40554526  case $MAGIC_CMD in
    … …  
    41034574MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
    41044575if test -n "$MAGIC_CMD"; then
    4105   echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
    4106 echo "${ECHO_T}$MAGIC_CMD" >&6
    4107 else
    4108   echo "$as_me:$LINENO: result: no" >&5
    4109 echo "${ECHO_T}no" >&6
     4576  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
     4577$as_echo "$MAGIC_CMD" >&6; }
     4578else
     4579  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4580$as_echo "no" >&6; }
    41104581fi
    41114582
    … …  
    41224593  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
    41234594set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    4124 echo "$as_me:$LINENO: checking for $ac_word" >&5
    4125 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" >&6
     4595{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4596$as_echo_n "checking for $ac_word... " >&6; }
     4597if test "${ac_cv_prog_RANLIB+set}" = set; then :
     4598  $as_echo_n "(cached) " >&6
    41284599else
    41294600  if test -n "$RANLIB"; then
    … …  
    41354606  IFS=$as_save_IFS
    41364607  test -z "$as_dir" && as_dir=.
    4137   for ac_exec_ext in '' $ac_executable_extensions; do
    4138   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4608    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
    41394610    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    4140     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     4611    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    41414612    break 2
    41424613  fi
    41434614done
    4144 done
     4615  done
     4616IFS=$as_save_IFS
    41454617
    41464618fi
    … …  
    41484620RANLIB=$ac_cv_prog_RANLIB
    41494621if 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; }
     4624else
     4625  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4626$as_echo "no" >&6; }
     4627fi
     4628
    41564629
    41574630fi
    … …  
    41604633  # Extract the first word of "ranlib", so it can be a program name with args.
    41614634set dummy ranlib; ac_word=$2
    4162 echo "$as_me:$LINENO: checking for $ac_word" >&5
    4163 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" >&6
     4635{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4636$as_echo_n "checking for $ac_word... " >&6; }
     4637if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
     4638  $as_echo_n "(cached) " >&6
    41664639else
    41674640  if test -n "$ac_ct_RANLIB"; then
    … …  
    41734646  IFS=$as_save_IFS
    41744647  test -z "$as_dir" && as_dir=.
    4175   for ac_exec_ext in '' $ac_executable_extensions; do
    4176   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4648    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
    41774650    ac_cv_prog_ac_ct_RANLIB="ranlib"
    4178     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     4651    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    41794652    break 2
    41804653  fi
    41814654done
    4182 done
    4183 
    4184   test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
     4655  done
     4656IFS=$as_save_IFS
     4657
    41854658fi
    41864659fi
    41874660ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    41884661if 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; }
     4664else
     4665  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4666$as_echo "no" >&6; }
     4667fi
     4668
     4669  if test "x$ac_ct_RANLIB" = x; then
     4670    RANLIB=":"
     4671  else
     4672    case $cross_compiling:$ac_tool_warned in
     4673yes:)
     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;}
     4676ac_tool_warned=yes ;;
     4677esac
     4678    RANLIB=$ac_ct_RANLIB
     4679  fi
    41974680else
    41984681  RANLIB="$ac_cv_prog_RANLIB"
    … …  
    42024685  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
    42034686set dummy ${ac_tool_prefix}strip; ac_word=$2
    4204 echo "$as_me:$LINENO: checking for $ac_word" >&5
    4205 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" >&6
     4687{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4688$as_echo_n "checking for $ac_word... " >&6; }
     4689if test "${ac_cv_prog_STRIP+set}" = set; then :
     4690  $as_echo_n "(cached) " >&6
    42084691else
    42094692  if test -n "$STRIP"; then
    … …  
    42154698  IFS=$as_save_IFS
    42164699  test -z "$as_dir" && as_dir=.
    4217   for ac_exec_ext in '' $ac_executable_extensions; do
    4218   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4700    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
    42194702    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
    4220     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     4703    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    42214704    break 2
    42224705  fi
    42234706done
    4224 done
     4707  done
     4708IFS=$as_save_IFS
    42254709
    42264710fi
    … …  
    42284712STRIP=$ac_cv_prog_STRIP
    42294713if 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; }
     4716else
     4717  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4718$as_echo "no" >&6; }
     4719fi
     4720
    42364721
    42374722fi
    … …  
    42404725  # Extract the first word of "strip", so it can be a program name with args.
    42414726set dummy strip; ac_word=$2
    4242 echo "$as_me:$LINENO: checking for $ac_word" >&5
    4243 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" >&6
     4727{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4728$as_echo_n "checking for $ac_word... " >&6; }
     4729if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
     4730  $as_echo_n "(cached) " >&6
    42464731else
    42474732  if test -n "$ac_ct_STRIP"; then
    … …  
    42534738  IFS=$as_save_IFS
    42544739  test -z "$as_dir" && as_dir=.
    4255   for ac_exec_ext in '' $ac_executable_extensions; do
    4256   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4740    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
    42574742    ac_cv_prog_ac_ct_STRIP="strip"
    4258     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     4743    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    42594744    break 2
    42604745  fi
    42614746done
    4262 done
    4263 
    4264   test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
     4747  done
     4748IFS=$as_save_IFS
     4749
    42654750fi
    42664751fi
    42674752ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
    42684753if 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; }
     4756else
     4757  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4758$as_echo "no" >&6; }
     4759fi
     4760
     4761  if test "x$ac_ct_STRIP" = x; then
     4762    STRIP=":"
     4763  else
     4764    case $cross_compiling:$ac_tool_warned in
     4765yes:)
     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;}
     4768ac_tool_warned=yes ;;
     4769esac
     4770    STRIP=$ac_ct_STRIP
     4771  fi
    42774772else
    42784773  STRIP="$ac_cv_prog_STRIP"
    … …  
    42834778enable_win32_dll=no
    42844779
    4285 # Check whether --enable-libtool-lock or --disable-libtool-lock was 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.
     4781if test "${enable_libtool_lock+set}" = set; then :
     4782  enableval=$enable_libtool_lock;
     4783fi
     4784
    42904785test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
    42914786
    … …  
    42954790*-*-irix6*)
    42964791  # Find out which ABI we are using.
    4297   echo '#line 4297 "configure"' > conftest.$ac_ext
    4298   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     4792  echo '#line 4792 "configure"' > conftest.$ac_ext
     4793  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    42994794  (eval $ac_compile) 2>&5
    43004795  ac_status=$?
    4301   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    4302   (exit $ac_status); }; then
     4796  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     4797  test $ac_status = 0; }; then
    43034798    case `/usr/bin/file conftest.$ac_objext` in
    43044799    *32-bit*)
    … …  
    43204815  SAVE_CFLAGS="$CFLAGS"
    43214816  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; }
     4819if test "${lt_cv_cc_needs_belf+set}" = set; then :
     4820  $as_echo_n "(cached) " >&6
     4821else
    43284822
    43294823     ac_ext=c
    … …  
    43334827ac_compiler_gnu=$ac_cv_c_compiler_gnu
    43344828
    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
    43404830/* end confdefs.h.  */
    43414831
    … …  
    43484838}
    43494839_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
     4840if ac_fn_c_try_link "$LINENO"; then :
    43724841  lt_cv_cc_needs_belf=yes
    43734842else
    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
     4844fi
     4845rm -f core conftest.err conftest.$ac_objext \
     4846    conftest$ac_exeext conftest.$ac_ext
    43814847     ac_ext=c
    43824848ac_cpp='$CPP $CPPFLAGS'
    … …  
    43864852
    43874853fi
    4388 echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
    4389 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; }
    43904856  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
    43914857    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
    … …  
    44874953compiler="$2"
    44884954
    4489 echo "$as_me:$LINENO: checking for objdir" >&5
    4490 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; }
    44914957rm -f .libs 2>/dev/null
    44924958mkdir .libs 2>/dev/null
    … …  
    44984964fi
    44994965rmdir .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.
     4972if test "${with_pic+set}" = set; then :
     4973  withval=$with_pic; pic_mode="$withval"
    45094974else
    45104975  pic_mode=default
    4511 fi;
     4976fi
     4977
    45124978test -z "$pic_mode" && pic_mode=default
    45134979
    … …  
    45154981# in isolation, and that seeing it set (from the cache) indicates that
    45164982# the associated values are set (in the cache) correctly too.
    4517 echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
    4518 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" >&6
     4983{ $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; }
     4985if test "${lt_cv_prog_cc_pic+set}" = set; then :
     4986  $as_echo_n "(cached) " >&6
    45214987else
    45224988   lt_cv_prog_cc_pic=
    … …  
    46585124
    46595125if test -z "$lt_cv_prog_cc_pic"; then
    4660   echo "$as_me:$LINENO: result: none" >&5
    4661 echo "${ECHO_T}none" >&6
    4662 else
    4663   echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5
    4664 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; }
     5128else
     5129  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_pic" >&5
     5130$as_echo "$lt_cv_prog_cc_pic" >&6; }
    46655131
    46665132  # 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" >&5
    4668 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" >&6
     5133  { $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
    46715137else
    46725138      save_CFLAGS="$CFLAGS"
    46735139    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
    46795141/* end confdefs.h.  */
    46805142
    … …  
    46875149}
    46885150_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
     5151if ac_fn_c_try_compile "$LINENO"; then :
    47115152        case $host_os in
    47125153      hpux9* | hpux10* | hpux11*)
    … …  
    47265167
    47275168else
    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
     5171fi
     5172rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    47355173    CFLAGS="$save_CFLAGS"
    47365174
    … …  
    47455183  fi
    47465184
    4747   echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5
    4748 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; }
    47495187fi
    47505188
    47515189# Check for any special shared library compilation flags.
    47525190if 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" >&5
    4754 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;}
    47555193  if echo "$old_CC $old_CFLAGS " | egrep -e "[  ]$lt_cv_prog_cc_shlib[  ]" >/dev/null; then :
    47565194  else
    4757    { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
    4758 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;}
    47595197    lt_cv_prog_cc_can_build_shared=no
    47605198  fi
    47615199fi
    47625200
    4763 echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
    4764 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" >&6
     5201{ $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; }
     5203if test "${lt_cv_prog_cc_static_works+set}" = set; then :
     5204  $as_echo_n "(cached) " >&6
    47675205else
    47685206    lt_cv_prog_cc_static_works=no
    47695207  save_LDFLAGS="$LDFLAGS"
    47705208  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
    47765210/* end confdefs.h.  */
    47775211
    … …  
    47845218}
    47855219_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
     5220if ac_fn_c_try_link "$LINENO"; then :
    48085221  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
     5222fi
     5223rm -f core conftest.err conftest.$ac_objext \
     5224    conftest$ac_exeext conftest.$ac_ext
    48165225  LDFLAGS="$save_LDFLAGS"
    48175226
    … …  
    48215230# Belt *and* braces to stop my trousers falling down:
    48225231test "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" >&5
    4824 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; }
    48255234
    48265235pic_flag="$lt_cv_prog_cc_pic"
    … …  
    48335242
    48345243# 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" >&5
    4836 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" >&6
     5244{ $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; }
     5246if test "${lt_cv_compiler_c_o+set}" = set; then :
     5247  $as_echo_n "(cached) " >&6
    48395248else
    48405249
    … …  
    48535262CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
    48545263compiler_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; then
     5264if { (eval echo configure:5264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    48565265  # The compiler can only warn and ignore the option if not recognized
    48575266  # So say no if there are warnings
    … …  
    48775286
    48785287compiler_c_o=$lt_cv_compiler_c_o
    4879 echo "$as_me:$LINENO: result: $compiler_c_o" >&5
    4880 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; }
    48815290
    48825291if test x"$compiler_c_o" = x"yes"; then
    48835292  # Check to see if we can write to a .lo
    4884   echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5
    4885 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" >&6
     5293  { $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
    48885297else
    48895298
    … …  
    48935302  save_objext="$ac_objext"
    48945303  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
    49005305/* end confdefs.h.  */
    49015306
    … …  
    49085313}
    49095314_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
     5315if ac_fn_c_try_compile "$LINENO"; then :
    49325316      # The compiler can only warn and ignore the option if not recognized
    49335317    # So say no if there are warnings
    … …  
    49385322    fi
    49395323
    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
     5324fi
     5325rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    49465326  ac_objext="$save_objext"
    49475327  CFLAGS="$save_CFLAGS"
    … …  
    49505330
    49515331  compiler_o_lo=$lt_cv_compiler_o_lo
    4952   echo "$as_me:$LINENO: result: $compiler_o_lo" >&5
    4953 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; }
    49545334else
    49555335  compiler_o_lo=no
    … …  
    49605340if test "$compiler_c_o" = no && test "$need_locks" != no; then
    49615341  # 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" >&5
    4963 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; }
    49645344  hard_links=yes
    49655345  $rm conftest*
    … …  
    49685348  ln conftest.a conftest.b 2>&5 || hard_links=no
    49695349  ln conftest.a conftest.b 2>/dev/null && hard_links=no
    4970   echo "$as_me:$LINENO: result: $hard_links" >&5
    4971 echo "${ECHO_T}$hard_links" >&6
     5350  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
     5351$as_echo "$hard_links" >&6; }
    49725352  if test "$hard_links" = no; then
    4973     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
    4974 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;}
    49755355    need_locks=warn
    49765356  fi
    … …  
    49815361if test "$GCC" = yes; then
    49825362  # 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" >&5
    4984 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; }
    49855365  echo "int some_variable = 0;" > conftest.$ac_ext
    49865366  save_CFLAGS="$CFLAGS"
    49875367  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
    49885368  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
    49945370/* end confdefs.h.  */
    49955371
    … …  
    50025378}
    50035379_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
     5380if ac_fn_c_try_compile "$LINENO"; then :
    50265381      # The compiler can only warn and ignore the option if not recognized
    50275382    # So say no if there are warnings
    … …  
    50325387    fi
    50335388
    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
     5389fi
     5390rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    50405391  CFLAGS="$save_CFLAGS"
    5041   echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5
    5042 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; }
    50435394
    50445395  if test "$compiler_rtti_exceptions" = "yes"; then
    … …  
    50505401
    50515402# See if the linker supports building shared libraries.
    5052 echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5
    5053 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; }
    50545405
    50555406allow_undefined_flag=
    … …  
    57426093  esac
    57436094fi
    5744 echo "$as_me:$LINENO: result: $ld_shlibs" >&5
    5745 echo "${ECHO_T}$ld_shlibs" >&6
     6095{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
     6096$as_echo "$ld_shlibs" >&6; }
    57466097test "$ld_shlibs" = no && can_build_shared=no
    57476098
    57486099# Check hardcoding attributes.
    5749 echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
    5750 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; }
    57516102hardcode_action=
    57526103if test -n "$hardcode_libdir_flag_spec" || \
    … …  
    57716122  hardcode_action=unsupported
    57726123fi
    5773 echo "$as_me:$LINENO: result: $hardcode_action" >&5
    5774 echo "${ECHO_T}$hardcode_action" >&6
     6124{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
     6125$as_echo "$hardcode_action" >&6; }
    57756126
    57766127striplib=
    57776128old_striplib=
    5778 echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
    5779 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; }
    57806131if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
    57816132  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
    57826133  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
    5783   echo "$as_me:$LINENO: result: yes" >&5
    5784 echo "${ECHO_T}yes" >&6
    5785 else
    5786   echo "$as_me:$LINENO: result: no" >&5
    5787 echo "${ECHO_T}no" >&6
     6134  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     6135$as_echo "yes" >&6; }
     6136else
     6137  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     6138$as_echo "no" >&6; }
    57886139fi
    57896140
    … …  
    57926143
    57936144# PORTME Fill in your ld.so characteristics
    5794 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
    5795 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; }
    57966147library_names_spec=
    57976148libname_spec='lib$name'
    … …  
    61946545  ;;
    61956546esac
    6196 echo "$as_me:$LINENO: result: $dynamic_linker" >&5
    6197 echo "${ECHO_T}$dynamic_linker" >&6
     6547{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
     6548$as_echo "$dynamic_linker" >&6; }
    61986549test "$dynamic_linker" = no && can_build_shared=no
    61996550
    62006551# Report the final consequences.
    6201 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
    6202 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
    6203 echo "$as_me:$LINENO: result: $can_build_shared" >&5
    6204 echo "${ECHO_T}$can_build_shared" >&6
    6205 
    6206 echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
    6207 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; }
    62086559test "$can_build_shared" = "no" && enable_shared=no
    62096560
    … …  
    62256576  ;;
    62266577esac
    6227 echo "$as_me:$LINENO: result: $enable_shared" >&5
    6228 echo "${ECHO_T}$enable_shared" >&6
    6229 
    6230 echo "$as_me:$LINENO: checking whether to build static libraries" >&5
    6231 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; }
    62326583# Make sure either enable_shared or enable_static is yes.
    62336584test "$enable_shared" = yes || enable_static=yes
    6234 echo "$as_me:$LINENO: result: $enable_static" >&5
    6235 echo "${ECHO_T}$enable_static" >&6
     6585{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
     6586$as_echo "$enable_static" >&6; }
    62366587
    62376588if test "$hardcode_action" = relink; then
    … …  
    62706621
    62716622  *)
    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"
     6624if test "x$ac_cv_func_shl_load" = x""yes; then :
     6625  lt_cv_dlopen="shl_load"
     6626else
     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; }
     6629if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
     6630  $as_echo_n "(cached) " >&6
     6631else
     6632  ac_check_lib_save_LIBS=$LIBS
     6633LIBS="-ldld  $LIBS"
     6634cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    62826635/* 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.  */
    63016640#ifdef __cplusplus
    63026641extern "C"
    6303 {
    63046642#endif
    6305 /* We use char because int might match the return type of a gcc2
    6306    builtin and then its argument prototype would still apply.  */
    63076643char shl_load ();
    6308 /* The GNU C library defines this for functions which it implements
    6309     to always fail with ENOSYS.  Some functions are actually named
    6310     something starting with __ and the normal name is an alias.  */
    6311 #if defined (__stub_shl_load) || defined (__stub___shl_load)
    6312 choke me
    6313 #else
    6314 char (*f) () = shl_load;
    6315 #endif
    6316 #ifdef __cplusplus
    6317 }
    6318 #endif
    6319 
    63206644int
    63216645main ()
    63226646{
    6323 return f != shl_load;
     6647return shl_load ();
    63246648  ;
    63256649  return 0;
    63266650}
    63276651_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
     6652if ac_fn_c_try_link "$LINENO"; then :
     6653  ac_cv_lib_dld_shl_load=yes
     6654else
     6655  ac_cv_lib_dld_shl_load=no
     6656fi
     6657rm -f core conftest.err conftest.$ac_objext \
     6658    conftest$ac_exeext conftest.$ac_ext
     6659LIBS=$ac_check_lib_save_LIBS
     6660fi
     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; }
     6663if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
     6664  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
     6665else
     6666  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
     6667if test "x$ac_cv_func_dlopen" = x""yes; then :
     6668  lt_cv_dlopen="dlopen"
     6669else
     6670  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
     6671$as_echo_n "checking for dlopen in -ldl... " >&6; }
     6672if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
     6673  $as_echo_n "(cached) " >&6
    63696674else
    63706675  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
     6676LIBS="-ldl  $LIBS"
     6677cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    63776678/* end confdefs.h.  */
    63786679
    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.  */
    63806683#ifdef __cplusplus
    63816684extern "C"
    63826685#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 ();
     6686char dlopen ();
    63866687int
    63876688main ()
    63886689{
    6389 shl_load ();
     6690return dlopen ();
    63906691  ;
    63916692  return 0;
    63926693}
    63936694_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
     6695if ac_fn_c_try_link "$LINENO"; then :
     6696  ac_cv_lib_dl_dlopen=yes
     6697else
     6698  ac_cv_lib_dl_dlopen=no
     6699fi
     6700rm -f core conftest.err conftest.$ac_objext \
     6701    conftest$ac_exeext conftest.$ac_ext
    64256702LIBS=$ac_check_lib_save_LIBS
    64266703fi
    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; }
     6706if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
     6707  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
     6708else
     6709  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
     6710$as_echo_n "checking for dlopen in -lsvld... " >&6; }
     6711if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
     6712  $as_echo_n "(cached) " >&6
     6713else
     6714  ac_check_lib_save_LIBS=$LIBS
     6715LIBS="-lsvld  $LIBS"
     6716cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    64426717/* 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.  */
    64616722#ifdef __cplusplus
    64626723extern "C"
    6463 {
    64646724#endif
    6465 /* We use char because int might match the return type of a gcc2
    6466    builtin and then its argument prototype would still apply.  */
    64676725char dlopen ();
    6468 /* The GNU C library defines this for functions which it implements
    6469     to always fail with ENOSYS.  Some functions are actually named
    6470     something starting with __ and the normal name is an alias.  */
    6471 #if defined (__stub_dlopen) || defined (__stub___dlopen)
    6472 choke me
    6473 #else
    6474 char (*f) () = dlopen;
    6475 #endif
    6476 #ifdef __cplusplus
    6477 }
    6478 #endif
    6479 
    64806726int
    64816727main ()
    64826728{
    6483 return f != dlopen;
     6729return dlopen ();
    64846730  ;
    64856731  return 0;
    64866732}
    64876733_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
     6734if ac_fn_c_try_link "$LINENO"; then :
     6735  ac_cv_lib_svld_dlopen=yes
     6736else
     6737  ac_cv_lib_svld_dlopen=no
     6738fi
     6739rm -f core conftest.err conftest.$ac_objext \
     6740    conftest$ac_exeext conftest.$ac_ext
     6741LIBS=$ac_check_lib_save_LIBS
     6742fi
     6743{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
     6744$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
     6745if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
     6746  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
     6747else
     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; }
     6750if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
     6751  $as_echo_n "(cached) " >&6
    65296752else
    65306753  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
     6754LIBS="-ldld  $LIBS"
     6755cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    65376756/* end confdefs.h.  */
    65386757
    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.  */
    65406761#ifdef __cplusplus
    65416762extern "C"
    65426763#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 ();
     6764char dld_link ();
    65466765int
    65476766main ()
    65486767{
    6549 dlopen ();
     6768return dld_link ();
    65506769  ;
    65516770  return 0;
    65526771}
    65536772_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
     6773if ac_fn_c_try_link "$LINENO"; then :
     6774  ac_cv_lib_dld_dld_link=yes
     6775else
     6776  ac_cv_lib_dld_dld_link=no
     6777fi
     6778rm -f core conftest.err conftest.$ac_objext \
     6779    conftest$ac_exeext conftest.$ac_ext
    65856780LIBS=$ac_check_lib_save_LIBS
    65866781fi
    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; }
     6784if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
    67246785  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
    67256786fi
    … …  
    67606821    LIBS="$lt_cv_dlopen_libs $LIBS"
    67616822
    6762     echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
    6763 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" >&6
     6823    { $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; }
     6825if test "${lt_cv_dlopen_self+set}" = set; then :
     6826  $as_echo_n "(cached) " >&6
    67666827else
    67676828      if test "$cross_compiling" = yes; then :
    … …  
    67716832  lt_status=$lt_dlunknown
    67726833  cat > conftest.$ac_ext <<EOF
    6773 #line 6773 "configure"
     6834#line 6834 "configure"
    67746835#include "confdefs.h"
    67756836
    … …  
    68326893}
    68336894EOF
    6834   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     6895  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    68356896  (eval $ac_link) 2>&5
    68366897  ac_status=$?
    6837   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    6838   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     6898  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     6899  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
    68396900    (./conftest; exit; ) 2>/dev/null
    68406901    lt_status=$?
    … …  
    68536914
    68546915fi
    6855 echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
    6856 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; }
    68576918
    68586919    if test "x$lt_cv_dlopen_self" = xyes; then
    68596920      LDFLAGS="$LDFLAGS $link_static_flag"
    6860       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
    6861 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" >&6
     6921      { $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; }
     6923if test "${lt_cv_dlopen_self_static+set}" = set; then :
     6924  $as_echo_n "(cached) " >&6
    68646925else
    68656926      if test "$cross_compiling" = yes; then :
    … …  
    68696930  lt_status=$lt_dlunknown
    68706931  cat > conftest.$ac_ext <<EOF
    6871 #line 6871 "configure"
     6932#line 6932 "configure"
    68726933#include "confdefs.h"
    68736934
    … …  
    69306991}
    69316992EOF
    6932   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     6993  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    69336994  (eval $ac_link) 2>&5
    69346995  ac_status=$?
    6935   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    6936   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     6996  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     6997  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
    69376998    (./conftest; exit; ) 2>/dev/null
    69386999    lt_status=$?
    … …  
    69517012
    69527013fi
    6953 echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
    6954 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; }
    69557016    fi
    69567017
    … …  
    69827043    # systems, -lgcc has to come before -lc. If gcc already passes -lc
    69837044    # to ld, don't add -lc before -lgcc.
    6984     echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
    6985 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" >&6
     7045    { $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
    69887049else
    69897050  $rm conftest*
    69907051    echo 'static int dummy;' > conftest.$ac_ext
    69917052
    6992     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7053    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    69937054  (eval $ac_compile) 2>&5
    69947055  ac_status=$?
    6995   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    6996   (exit $ac_status); }; then
     7056  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     7057  test $ac_status = 0; }; then
    69977058      soname=conftest
    69987059      lib=conftest
    … …  
    70077068      save_allow_undefined_flag=$allow_undefined_flag
    70087069      allow_undefined_flag=
    7009       if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
     7070      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
    70107071  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
    70117072  ac_status=$?
    7012   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7013   (exit $ac_status); }
     7073  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     7074  test $ac_status = 0; }
    70147075      then
    70157076    lt_cv_archive_cmds_need_lc=no
    … …  
    70237084fi
    70247085
    7025     echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
    7026 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; }
    70277088    ;;
    70287089  esac
    … …  
    75997660# Extract the first word of "perl", so it can be a program name with args.
    76007661set dummy perl; ac_word=$2
    7601 echo "$as_me:$LINENO: checking for $ac_word" >&5
    7602 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" >&6
     7662{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7663$as_echo_n "checking for $ac_word... " >&6; }
     7664if test "${ac_cv_path_PERL+set}" = set; then :
     7665  $as_echo_n "(cached) " >&6
    76057666else
    76067667  case $PERL in
    … …  
    76147675  IFS=$as_save_IFS
    76157676  test -z "$as_dir" && as_dir=.
    7616   for ac_exec_ext in '' $ac_executable_extensions; do
    7617   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7677    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
    76187679    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
    7619     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     7680    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    76207681    break 2
    76217682  fi
    76227683done
    7623 done
     7684  done
     7685IFS=$as_save_IFS
    76247686
    76257687  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl"
    … …  
    76287690fi
    76297691PERL=$ac_cv_path_PERL
    7630 
    76317692if 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; }
     7695else
     7696  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7697$as_echo "no" >&6; }
     7698fi
     7699
    76387700
    76397701# Extract the first word of "sh", so it can be a program name with args.
    76407702set dummy sh; ac_word=$2
    7641 echo "$as_me:$LINENO: checking for $ac_word" >&5
    7642 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" >&6
     7703{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7704$as_echo_n "checking for $ac_word... " >&6; }
     7705if test "${ac_cv_path_SH+set}" = set; then :
     7706  $as_echo_n "(cached) " >&6
    76457707else
    76467708  case $SH in
    … …  
    76547716  IFS=$as_save_IFS
    76557717  test -z "$as_dir" && as_dir=.
    7656   for ac_exec_ext in '' $ac_executable_extensions; do
    7657   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7718    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
    76587720    ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
    7659     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     7721    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    76607722    break 2
    76617723  fi
    76627724done
    7663 done
     7725  done
     7726IFS=$as_save_IFS
    76647727
    76657728  test -z "$ac_cv_path_SH" && ac_cv_path_SH="/bin/sh"
    … …  
    76687731fi
    76697732SH=$ac_cv_path_SH
    7670 
    76717733if test -n "$SH"; then
    7672   echo "$as_me:$LINENO: result: $SH" >&5
    7673 echo "${ECHO_T}$SH" >&6
    7674 else
    7675   echo "$as_me:$LINENO: result: no" >&5
    7676 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=$enableval
     7734  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5
     7735$as_echo "$SH" >&6; }
     7736else
     7737  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7738$as_echo "no" >&6; }
     7739fi
     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.
     7746if test "${enable_maintainer_mode+set}" = set; then :
     7747  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
    76867748else
    76877749  USE_MAINTAINER_MODE=no
    7688 fi;
    7689   echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
    7690 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
     7750fi
     7751
     7752  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
     7753$as_echo "$USE_MAINTAINER_MODE" >&6; }
    76917754
    76927755
    … …  
    77197782
    77207783
    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.
     7785if test "${with_gnu_ld+set}" = set; then :
     7786  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
    77257787else
    77267788  with_gnu_ld=no
    7727 fi;
     7789fi
     7790
    77287791ac_prog=ld
    77297792if test "$GCC" = yes; then
    77307793  # Check if gcc -print-prog-name=ld gives a path.
    7731   echo "$as_me:$LINENO: checking for ld used by GCC" >&5
    7732 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; }
    77337796  case $host in
    77347797  *-*-mingw*)
    … …  
    77597822  esac
    77607823elif test "$with_gnu_ld" = yes; then
    7761   echo "$as_me:$LINENO: checking for GNU ld" >&5
    7762 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
    7763 else
    7764   echo "$as_me:$LINENO: checking for non-GNU ld" >&5
    7765 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" >&6
     7824  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
     7825$as_echo_n "checking for GNU ld... " >&6; }
     7826else
     7827  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
     7828$as_echo_n "checking for non-GNU ld... " >&6; }
     7829fi
     7830if test "${acl_cv_path_LD+set}" = set; then :
     7831  $as_echo_n "(cached) " >&6
    77697832else
    77707833  if test -z "$LD"; then
    … …  
    77927855LD="$acl_cv_path_LD"
    77937856if 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; }
     7859else
     7860  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7861$as_echo "no" >&6; }
     7862fi
     7863test -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; }
     7866if test "${acl_cv_prog_gnu_ld+set}" = set; then :
     7867  $as_echo_n "(cached) " >&6
    78077868else
    78087869  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
    … …  
    78137874fi
    78147875fi
    7815 echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
    7816 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; }
    78177878with_gnu_ld=$acl_cv_prog_gnu_ld
    78187879
    78197880
    78207881
    7821                                                 echo "$as_me:$LINENO: checking for shared library run path origin" >&5
    7822 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" >&6
     7882                                                { $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; }
     7884if test "${acl_cv_rpath+set}" = set; then :
     7885  $as_echo_n "(cached) " >&6
    78257886else
    78267887
    … …  
    78327893
    78337894fi
    7834 echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
    7835 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; }
    78367897  wl="$acl_cv_wl"
    78377898  libext="$acl_cv_libext"
    … …  
    78437904  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
    78447905  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.
     7907if test "${enable_rpath+set}" = set; then :
     7908  enableval=$enable_rpath; :
    78497909else
    78507910  enable_rpath=yes
    7851 fi;
     7911fi
     7912
    78527913
    78537914
    … …  
    78717932
    78727933
    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.
     7935if test "${with_libiconv_prefix+set}" = set; then :
     7936  withval=$with_libiconv_prefix;
    78777937    if test "X$withval" = "Xno"; then
    78787938      use_additional=no
    … …  
    78977957    fi
    78987958
    7899 fi;
     7959fi
     7960
    79007961      LIBICONV=
    79017962  LTLIBICONV=
    … …  
    82648325
    82658326
    8266   echo "$as_me:$LINENO: checking for iconv" >&5
    8267 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" >&6
     8327  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
     8328$as_echo_n "checking for iconv... " >&6; }
     8329if test "${am_cv_func_iconv+set}" = set; then :
     8330  $as_echo_n "(cached) " >&6
    82708331else
    82718332
    82728333    am_cv_func_iconv="no, consider installing GNU libiconv"
    82738334    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
    82798336/* end confdefs.h.  */
    82808337#include <stdlib.h>
    … …  
    82908347}
    82918348_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
     8349if ac_fn_c_try_link "$LINENO"; then :
    83148350  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
     8351fi
     8352rm -f core conftest.err conftest.$ac_objext \
     8353    conftest$ac_exeext conftest.$ac_ext
    83228354    if test "$am_cv_func_iconv" != yes; then
    83238355      am_save_LIBS="$LIBS"
    83248356      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
    83308358/* end confdefs.h.  */
    83318359#include <stdlib.h>
    … …  
    83418369}
    83428370_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
     8371if ac_fn_c_try_link "$LINENO"; then :
    83658372  am_cv_lib_iconv=yes
    83668373        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
     8374fi
     8375rm -f core conftest.err conftest.$ac_objext \
     8376    conftest$ac_exeext conftest.$ac_ext
    83748377      LIBS="$am_save_LIBS"
    83758378    fi
    83768379
    83778380fi
    8378 echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
    8379 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; }
    83808383  if test "$am_cv_func_iconv" = yes; then
    83818384
    8382 cat >>confdefs.h <<\_ACEOF
    8383 #define HAVE_ICONV 1
    8384 _ACEOF
     8385$as_echo "#define HAVE_ICONV 1" >>confdefs.h
    83858386
    83868387  fi
    83878388  if test "$am_cv_lib_iconv" = yes; then
    8388     echo "$as_me:$LINENO: checking how to link with libiconv" >&5
    8389 echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
    8390     echo "$as_me:$LINENO: result: $LIBICONV" >&5
    8391 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; }
    83928393  else
    83938394            CPPFLAGS="$am_save_CPPFLAGS"
    … …  
    83998400
    84008401  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
     8406else
     8407
     8408      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    84128409/* end confdefs.h.  */
    84138410
    … …  
    84328429}
    84338430_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
     8431if ac_fn_c_try_compile "$LINENO"; then :
    84568432  am_cv_proto_iconv_arg1=""
    84578433else
    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"
     8435fi
     8436rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    84648437      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);"
    84658438fi
    84668439
    84678440    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:-
    84698442         }$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; }
    84728445
    84738446cat >>confdefs.h <<_ACEOF
    … …  
    84838456#ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.8.tar.gz]))
    84848457
    8485 
    84868458for 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.  */
     8459do :
     8460  ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
     8461if test "x$ac_cv_func_vsnprintf" = x""yes; then :
     8462  cat >>confdefs.h <<_ACEOF
     8463#define HAVE_VSNPRINTF 1
    84968464_ACEOF
    8497 cat confdefs.h >>conftest.$ac_ext
    8498 cat >>conftest.$ac_ext <<_ACEOF
    8499 /* 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_func
    8503 
    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, since
    8507     <limits.h> exists even on freestanding compilers.  */
    8508 
    8509 #ifdef __STDC__
    8510 # include <limits.h>
    8511 #else
    8512 # include <assert.h>
    8513 #endif
    8514 
    8515 #undef $ac_func
    8516 
    8517 /* Override any gcc2 internal prototype to avoid an error.  */
    8518 #ifdef __cplusplus
    8519 extern "C"
    8520 {
    8521 #endif
    8522 /* We use char because int might match the return type of a gcc2
    8523    builtin and then its argument prototype would still apply.  */
    8524 char $ac_func ();
    8525 /* The GNU C library defines this for functions which it implements
    8526     to always fail with ENOSYS.  Some functions are actually named
    8527     something starting with __ and the normal name is an alias.  */
    8528 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
    8529 choke me
    8530 #else
    8531 char (*f) () = $ac_func;
    8532 #endif
    8533 #ifdef __cplusplus
    8534 }
    8535 #endif
    8536 
    8537 int
    8538 main ()
    8539 {
    8540 return f != $ac_func;
    8541   ;
    8542   return 0;
    8543 }
    8544 _ACEOF
    8545 rm -f conftest.$ac_objext conftest$ac_exeext
    8546 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    8547   (eval $ac_link) 2>conftest.er1
    8548   ac_status=$?
    8549   grep -v '^ *+' conftest.er1 >conftest.err
    8550   rm -f conftest.er1
    8551   cat conftest.err >&5
    8552   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    8553   (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\"") >&5
    8557   (eval $ac_try) 2>&5
    8558   ac_status=$?
    8559   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    8560   (exit $ac_status); }; } &&
    8561      { ac_try='test -s conftest$ac_exeext'
    8562   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    8563   (eval $ac_try) 2>&5
    8564   ac_status=$?
    8565   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    8566   (exit $ac_status); }; }; then
    8567   eval "$as_ac_var=yes"
    8568 else
    8569   echo "$as_me: failed program was:" >&5
    8570 sed 's/^/| /' conftest.$ac_ext >&5
    8571 
    8572 eval "$as_ac_var=no"
    8573 fi
    8574 rm -f conftest.err conftest.$ac_objext \
    8575       conftest$ac_exeext conftest.$ac_ext
    8576 fi
    8577 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
    8578 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    8579 if test `eval echo '${'$as_ac_var'}'` = yes; then
    8580   cat >>confdefs.h <<_ACEOF
    8581 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
    8582 _ACEOF
    85838465
    85848466fi
    … …  
    85868468
    85878469
    8588           ac_config_files="$ac_config_files Makefile"
     8470ac_config_files="$ac_config_files Makefile"
     8471
    85898472cat >confcache <<\_ACEOF
    85908473# This file is a shell script that caches the results of configure
    … …  
    86058488# The following way of writing the cache mishandles newlines in values,
    86068489# 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.
    86088491# Ultrix sh set writes to stderr and can't be redirected directly,
    86098492# 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
    86118510  (set) 2>&1 |
    8612     case `(ac_space=' '; set | grep ac_space) 2>&1` in
    8613     *ac_space=\ *)
    8614       # `set' does not quote correctly, so add quotes (double-quote
    8615       # 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 \.
    86168515      sed -n \
    86178516    "s/'/'\\\\''/g;
    86188517      s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
    8619       ;;
     8518      ;; #(
    86208519    *)
    86218520      # `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"
    86248522      ;;
    8625     esac;
    8626 } |
     8523    esac |
     8524    sort
     8525) |
    86278526  sed '
     8527     /^ac_cv_env_/b end
    86288528     t clear
    8629      : clear
     8529     :clear
    86308530     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
    86318531     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
     8534if 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;}
    86378539    cat confcache >$cache_file
    86388540  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;}
    86408543  fi
    86418544fi
    … …  
    86458548# Let make expand exec_prefix.
    86468549test "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 and
    8650 # trailing colons and then remove the whole line if VPATH becomes empty
    8651 # (actually we leave an empty line to preserve line numbers).
    8652 if test "x$srcdir" = x.; then
    8653   ac_vpsub='/^[  ]*VPATH[    ]*=/{
    8654 s/:*\$(srcdir):*/:/;
    8655 s/:*\${srcdir}:*/:/;
    8656 s/:*@srcdir@:*/:/;
    8657 s/^\([^=]*=[     ]*\):*/\1/;
    8658 s/:*$//;
    8659 s/^[^=]*=[   ]*$//;
    8660 }'
    8661 fi
    86628550
    86638551DEFS=-DHAVE_CONFIG_H
    … …  
    86678555for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    86688556  # 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'
    86748563done
    86758564LIBOBJS=$ac_libobjs
    … …  
    86808569
    86818570: ${CONFIG_STATUS=./config.status}
     8571ac_write_fail=0
    86828572ac_clean_files_save=$ac_clean_files
    86838573ac_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;}
     8576as_write_fail=0
     8577cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
    86878578#! $SHELL
    86888579# Generated by $as_me.
    … …  
    86948585ac_cs_recheck=false
    86958586ac_cs_silent=false
     8587
    86968588SHELL=\${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
     8589export SHELL
     8590_ASEOF
     8591cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
     8592## -------------------- ##
     8593## M4sh Initialization. ##
     8594## -------------------- ##
     8595
     8596# Be more Bourne compatible
     8597DUALCASE=1; export DUALCASE # for MKS sh
     8598if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
    87068599  emulate sh
    87078600  NULLCMD=:
    8708   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
     8601  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
    87098602  # is contrary to our usage.  Disable this feature.
    87108603  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
     8605else
     8606  case `(set -o) 2>/dev/null` in #(
     8607  *posix*) :
     8608    set -o posix ;; #(
     8609  *) :
     8610     ;;
     8611esac
     8612fi
     8613
     8614
     8615as_nl='
     8616'
     8617export as_nl
     8618# Printing a long string crashes Solaris 7 /usr/bin/printf.
     8619as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
     8620as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
     8621as_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.
     8624if 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 --'
     8628elif (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'
     8631else
     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'
     8651fi
     8652
     8653# The user is always right.
     8654if 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  }
     8660fi
     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.)
     8668IFS=" ""    $as_nl"
     8669
     8670# Find who we are.  Look in the path if we contain no directory separator.
     8671case $0 in #((
     8672  *[\\/]* ) as_myself=$0 ;;
     8673  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8674for as_dir in $PATH
     8675do
     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
     8680IFS=$as_save_IFS
     8681
     8682     ;;
     8683esac
     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.
     8686if test "x$as_myself" = x; then
     8687  as_myself=$0
     8688fi
     8689if test ! -f "$as_myself"; then
     8690  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
     8691  exit 1
     8692fi
     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.
     8698for as_var in BASH_ENV ENV MAIL MAILPATH
     8699do eval test x\${$as_var+set} = xset \
     8700  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
     8701done
    87268702PS1='$ '
    87278703PS2='> '
    … …  
    87298705
    87308706# 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
     8707LC_ALL=C
     8708export LC_ALL
     8709LANGUAGE=C
     8710export 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.
     8721as_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
    87408727  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.
     8736as_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.
     8744as_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.
     8754as_fn_unset ()
     8755{
     8756  { eval $1=; unset $1;}
     8757}
     8758as_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.
     8765if (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  }'
     8770else
     8771  as_fn_append ()
     8772  {
     8773    eval $1=\$$1\$2
     8774  }
     8775fi # 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.
     8782if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
     8783  eval 'as_fn_arith ()
     8784  {
     8785    as_val=$(( $* ))
     8786  }'
     8787else
     8788  as_fn_arith ()
     8789  {
     8790    as_val=`expr "$@" || test $? -eq 1`
     8791  }
     8792fi # as_fn_arith
     8793
     8794
     8795if expr a : '\(a\)' >/dev/null 2>&1 &&
     8796   test "X`expr 00001 : '.*\(...\)'`" = X001; then
    87458797  as_expr=expr
    87468798else
    … …  
    87488800fi
    87498801
    8750 if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
     8802if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
    87518803  as_basename=basename
    87528804else
    … …  
    87548806fi
    87558807
    8756 
    8757 # Name of the executable.
    8758 as_me=`$as_basename "$0" ||
     8808if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
     8809  as_dirname=dirname
     8810else
     8811  as_dirname=false
     8812fi
     8813
     8814as_me=`$as_basename -- "$0" ||
    87598815$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
    87608816     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
    87718833# Avoid depending upon Character Ranges.
    87728834as_cr_letters='abcdefghijklmnopqrstuvwxyz'
    … …  
    87768838as_cr_alnum=$as_cr_Letters$as_cr_digits
    87778839
    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=';'
     8840ECHO_C= ECHO_N= ECHO_T=
     8841case `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';;
     8851esac
     8852
     8853rm -f conf$$ conf$$.exe conf$$.file
     8854if test -d conf$$.dir; then
     8855  rm -f conf$$.dir/conf$$.file
     8856else
     8857  rm -f conf$$.dir
     8858  mkdir conf$$.dir 2>/dev/null
     8859fi
     8860if (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
    87858871  else
    8786     PATH_SEPARATOR=:
     8872    as_ln_s='cp -p'
    87878873  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        ;;
     8874else
     8875  as_ln_s='cp -p'
     8876fi
     8877rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
     8878rmdir conf$$.dir 2>/dev/null
     8879
     8880
     8881# as_fn_mkdir_p
     8882# -------------
     8883# Create "$as_dir" as a directory, including parents if necessary.
     8884as_fn_mkdir_p ()
     8885{
     8886
     8887  case $as_dir in #(
     8888  -*) as_dir=./$as_dir;;
    88108889  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
    89128928if mkdir -p . 2>/dev/null; then
    8913   as_mkdir_p=:
     8929  as_mkdir_p='mkdir -p "$as_dir"'
    89148930else
    89158931  test -d ./-p && rmdir ./-p
    … …  
    89178933fi
    89188934
    8919 as_executable_p="test -f"
     8935if test -x / >/dev/null 2>&1; then
     8936  as_test_x='test -x'
     8937else
     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  '
     8955fi
     8956as_executable_p=$as_test_x
    89208957
    89218958# Sed expression to map a string onto a valid CPP name.
    … …  
    89268963
    89278964
    8928 # IFS
    8929 # 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 CDPATH
    8936 
    89378965exec 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
     8970test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
     8971
     8972cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     8973# Save the log message, to keep $0 and so on meaningful, and to
    89408974# 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.
     8976ac_log="
     8977This file was extended by $as_me, which was
     8978generated 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
     8986on `(hostname || uname -n) 2>/dev/null | sed 1q`
     8987"
     8988
     8989_ACEOF
     8990
     8991case $ac_config_files in *"
     8992"*) set x $ac_config_files; shift; ac_config_files=$*;;
     8993esac
     8994
     8995case $ac_config_headers in *"
     8996"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
     8997esac
     8998
     8999
     9000cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     9001# Files that config.status was made for.
     9002config_files="$ac_config_files"
     9003config_headers="$ac_config_headers"
     9004
     9005_ACEOF
     9006
     9007cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     9008ac_cs_usage="\
     9009\`$as_me' instantiates files and other configuration actions
     9010from templates according to the current configuration.  Unless the files
     9011and actions are specified as TAGs, all are instantiated by default.
     9012
     9013Usage: $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
     9027Configuration files:
     9028$config_files
     9029
     9030Configuration headers:
     9031$config_headers
     9032
     9033Report bugs to the package provider."
     9034
     9035_ACEOF
     9036cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     9037ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
     9038ac_cs_version="\\
     9039config.status
     9040configured by $0, generated by GNU Autoconf 2.65,
     9041  with options \\"\$ac_cs_config\\"
     9042
     9043Copyright (C) 2009 Free Software Foundation, Inc.
     9044This config.status script is free software; the Free Software Foundation
     9045gives unlimited permission to copy, distribute and modify it."
     9046
     9047ac_pwd='$ac_pwd'
     9048srcdir='$srcdir'
     9049test -n "\$AWK" || AWK=awk
     9050_ACEOF
     9051
     9052cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     9053# The default lists apply if the user does not specify any file.
     9054ac_need_defaults=:
     9055while test $# != 0
     9056do
     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'
     9097Try \`$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'
     9106Try \`$0 --help' for more information." ;;
     9107
     9108  *) as_fn_append ac_config_targets " $1"
     9109     ac_need_defaults=false ;;
     9110
     9111  esac
     9112  shift
     9113done
     9114
     9115ac_configure_extra_args=
     9116
     9117if $ac_cs_silent; then
     9118  exec 6>/dev/null
     9119  ac_configure_extra_args="$ac_configure_extra_args --silent"
     9120fi
     9121
     9122_ACEOF
     9123cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     9124if \$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 "\$@"
     9131fi
     9132
     9133_ACEOF
     9134cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    89429135exec 5>>config.log
    89439136{
    … …  
    89469139## Running $as_me. ##
    89479140_ASBOX
     9141  $as_echo "$ac_log"
    89489142} >&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
    89639144_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]>."
     9145cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    90079146_ACEOF
    90089147
    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
     9148cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     9149
     9150# Handling of arguments.
    91099151for ac_config_target in $ac_config_targets
    91109152do
    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;;
    91189158  esac
    91199159done
     9160
    91209161
    91219162# If the user did not use the arguments to specify the items to instantiate,
    … …  
    91299170
    91309171# Have a temporary directory for convenience.  Make it in the build tree
    9131 # simply because there is no reason to put it here, and in addition,
     9172# simply because there is no reason against having it here, and in addition,
    91329173# 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'.
    91349177$debug ||
    91359178{
    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
    91389184}
    9139 
    91409185# Create a (secure) tmp directory for tmp files.
    91419186
    91429187{
    9143   tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
     9188  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
    91449189  test -n "$tmp" && test -d "$tmp"
    91459190}  ||
    91469191{
    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'.
     9199if test -n "$CONFIG_FILES"; then
     9200
     9201
     9202ac_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.
     9206if test "x$ac_cr" = x; then
     9207  eval ac_cr=\$\'\\r\'
     9208fi
     9209ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
     9210if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
     9211  ac_cs_awk_cr='\r'
     9212else
     9213  ac_cs_awk_cr=$ac_cr
     9214fi
     9215
     9216echo 'BEGIN {' >"$tmp/subs1.awk" &&
     9217_ACEOF
     9218
     9219
    91509220{
    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
     9226ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
     9227ac_delim='%!_!# '
     9228for 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
     9240done
     9241rm -f conf$$subs.sh
     9242
     9243cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     9244cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
     9245_ACEOF
     9246sed -n '
     9247h
     9248s/^/S["/; s/!.*/"]=/
     9249p
     9250g
     9251s/^[^!]*!//
     9252:repl
     9253t repl
     9254s/'"$ac_delim"'$//
     9255t delim
     9256:nl
     9257h
     9258s/\(.\{148\}\)..*/\1/
     9259t more1
     9260s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
     9261p
     9262n
     9263b repl
     9264:more1
     9265s/["\\]/\\&/g; s/^/"/; s/$/"\\/
     9266p
     9267g
     9268s/.\{148\}//
     9269t nl
     9270:delim
     9271h
     9272s/\(.\{148\}\)..*/\1/
     9273t more2
     9274s/["\\]/\\&/g; s/^/"/; s/$/"/
     9275p
     9276b
     9277:more2
     9278s/["\\]/\\&/g; s/^/"/; s/$/"\\/
     9279p
     9280g
     9281s/.\{148\}//
     9282t delim
     9283' <conf$$subs.awk | sed '
     9284/^[^""]/{
     9285  N
     9286  s/\n//
    91539287}
    9154 
     9288' >>$CONFIG_STATUS || ac_write_fail=1
     9289rm -f conf$$subs.awk
     9290cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     9291_ACAWK
     9292cat >>"\$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
    91559318_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 
     9319cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     9320if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
     9321  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
     9322else
     9323  cat
     9324fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
     9325  || as_fn_error "could not setup config files machinery" "$LINENO" 5
    92429326_ACEOF
    92439327
    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).
     9332if test "x$srcdir" = x.; then
     9333  ac_vpsub='/^[  ]*VPATH[    ]*=/{
     9334s/:*\$(srcdir):*/:/
     9335s/:*\${srcdir}:*/:/
     9336s/:*@srcdir@:*/:/
     9337s/^\([^=]*=[     ]*\):*/\1/
     9338s/:*$//
     9339s/^[^=]*=[   ]*$//
     9340}'
     9341fi
     9342
     9343cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     9344fi # 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'.
     9349if test -n "$CONFIG_HEADERS"; then
     9350cat >"$tmp/defines.awk" <<\_ACAWK ||
     9351BEGIN {
     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.
     9360ac_delim='%!_!# '
     9361for 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
     9370done
     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
     9376ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
     9377sed -n '
     9378s/.\{148\}/&'"$ac_delim"'/g
     9379t rset
     9380:rset
     9381s/^[     ]*#[    ]*define[   ][  ]*/ /
     9382t def
     9383d
     9384:def
     9385s/\\$//
     9386t bsnl
     9387s/["\\]/\\&/g
     9388s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
     9389D["\1"]=" \3"/p
     9390s/^ \('"$ac_word_re"'\)[     ]*\(.*\)/D["\1"]=" \2"/p
     9391d
     9392:bsnl
     9393s/["\\]/\\&/g
     9394s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
     9395D["\1"]=" \3\\\\\\n"\\/p
     9396t cont
     9397s/^ \('"$ac_word_re"'\)[     ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
     9398t cont
     9399d
     9400:cont
     9401n
     9402s/.\{148\}/&'"$ac_delim"'/g
     9403t clear
     9404:clear
     9405s/\\$//
     9406t bsnlc
     9407s/["\\]/\\&/g; s/^/"/; s/$/"/p
     9408d
     9409:bsnlc
     9410s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
     9411b cont
     9412' <confdefs.h | sed '
     9413s/'"$ac_delim"'/"\\\
     9414"/g' >>$CONFIG_STATUS || ac_write_fail=1
     9415
     9416cat >>$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
     9450cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     9451  as_fn_error "could not setup config headers machinery" "$LINENO" 5
     9452fi # test -n "$CONFIG_HEADERS"
     9453
     9454
     9455eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
     9456shift
     9457for ac_tag
     9458do
     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;}
    92589508    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    ;;
    92959522  esac
    92969523
    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" ||
    92999525$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    93009526     X"$ac_file" : 'X\(//\)[^/]' \| \
    93019527     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
    93359548  ac_builddir=.
    93369549
    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
     9550case "$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 ;;
     9560esac
     9561ac_abs_top_builddir=$ac_pwd
     9562ac_abs_builddir=$ac_pwd$ac_dir_suffix
     9563# for backward compatibility:
     9564ac_top_builddir=$ac_top_build_prefix
    93449565
    93459566case $srcdir in
    9346   .)  # No --srcdir option.  We are building in place.
     9567  .)  # We are building in place.
    93479568    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.
    93549572    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 ;;
    93599579esac
    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;;
     9580ac_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
     9591cat >>$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.
     9594ac_datarootdir_hack=; ac_datarootdir_seen=
     9595ac_sed_dataroot='
     9596/datarootdir/ {
     9597  p
     9598  q
     9599}
     9600/@datadir@/p
     9601/@docdir@/p
     9602/@infodir@/p
     9603/@localedir@/p
     9604/@mandir@/p'
     9605case `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
     9611cat >>$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' ;;
    93719619esac
    9372 case $ac_abs_builddir in
    9373 .) ac_abs_top_builddir=${ac_top_builddir}.;;
    9374 *)
    9375   case ${ac_top_builddir}. in
    9376   .) 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 esac
    9381 case $ac_abs_builddir in
    9382 .) ac_abs_srcdir=$ac_srcdir;;
    9383 *)
    9384   case $ac_srcdir in
    9385   .) ac_abs_srcdir=$ac_abs_builddir;;
    9386   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
    9387   *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
    9388   esac;;
    9389 esac
    9390 case $ac_abs_builddir in
    9391 .) ac_abs_top_srcdir=$ac_top_srcdir;;
    9392 *)
    9393   case $ac_top_srcdir in
    9394   .) 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 esac
    9399 
    9400 
    9401 
    9402   if test x"$ac_file" != x-; then
    9403     { echo "$as_me:$LINENO: creating $ac_file" >&5
    9404 echo "$as_me: creating $ac_file" >&6;}
    9405     rm -f "$ac_file"
    9406   fi
    9407   # Let's still pretend it is `configure' which instantiates (i.e., don't
    9408   # use $as_me), people would be surprised to read:
    9409   #    /* config.h.  Generated by config.status.  */
    9410   if test x"$ac_file" = x-; then
    9411     configure_input=
    9412   else
    9413     configure_input="$ac_file.  "
    9414   fi
    9415   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 the
    9419   # src tree.
    9420   ac_file_inputs=`IFS=:
    9421     for f in $ac_file_in; do
    9422       case $f in
    9423       -) 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" >&5
    9427 echo "$as_me: error: cannot find input file: $f" >&2;}
    9428    { (exit 1); exit 1; }; }
    9429      echo "$f";;
    9430       *) # Relative
    9431      if test -f "$f"; then
    9432        # Build tree
    9433        echo "$f"
    9434      elif test -f "$srcdir/$f"; then
    9435        # Source tree
    9436        echo "$srcdir/$f"
    9437      else
    9438        # /dev/null tree
    9439        { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
    9440 echo "$as_me: error: cannot find input file: $f" >&2;}
    9441    { (exit 1); exit 1; }; }
    9442      fi;;
    9443       esac
    9444     done` || { (exit 1); exit 1; }
    94459620_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?
     9625cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     9626ac_sed_extra="$ac_vpsub
    94489627$extrasub
    94499628_ACEOF
    9450 cat >>$CONFIG_STATUS <<\_ACEOF
     9629cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    94519630:t
    94529631/@[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
     9632s|@configure_input@|$ac_sed_conf_input|;t t
     9633s&@top_builddir@&$ac_top_builddir_sub&;t t
     9634s&@top_build_prefix@&$ac_top_build_prefix&;t t
     9635s&@srcdir@&$ac_srcdir&;t t
     9636s&@abs_srcdir@&$ac_abs_srcdir&;t t
     9637s&@top_srcdir@&$ac_top_srcdir&;t t
     9638s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
     9639s&@builddir@&$ac_builddir&;t t
     9640s&@abs_builddir@&$ac_abs_builddir&;t t
     9641s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
     9642$ac_datarootdir_hack
     9643"
     9644eval 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
     9647test -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'
     9651which 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'
     9653which 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  #
    94649666  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;}
    96499675    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
    96899679    fi
    96909680  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
    96939684  fi
    9694 done
     9685 ;;
     9686
     9687
     9688  esac
     9689
     9690done # for ac_tag
     9691
     9692
     9693as_fn_exit 0
    96959694_ACEOF
    9696 
    9697 cat >>$CONFIG_STATUS <<\_ACEOF
    9698 
    9699 { (exit 0); exit 0; }
    9700 _ACEOF
    9701 chmod +x $CONFIG_STATUS
    97029695ac_clean_files=$ac_clean_files_save
     9696
     9697test $ac_write_fail = 0 ||
     9698  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    97039699
    97049700
    … …  
    97219717  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    97229718  # 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 $?
     9720fi
     9721if 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;}
     9724fi
     9725

  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/packages/unac/configure.ac

    r16583 r23508  
    3030AC_PROG_MAKE_SET
    3131
    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)
     32dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     33dnl arch_64bit=no
     34dnl case "$host_cpu" in
     35dnl x86_64) arch_64bit=yes ;;
     36dnl esac
    5037
    5138dnl

  • main/branches/64_bit_Greenstone/greenstone2/common-src/packages/configure

    r23356 r23508  
    146146fi
    147147
    148 cd "$PACKAGES/expat/expat-1.95.8"
    149 
    150 if test -e Makefile ; then
    151   echo make distclean && \
    152   make distclean
    153 fi
    154 
    155148#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
     149echo ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
     150
     151cd "$PACKAGES/expat/expat-1.95.8" && \
     152./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
     153
     154echo make $ENVIRONMENT
     155make $ENVIRONMENT
     156
     157echo make install $ENVIRONMENT
     158make install $ENVIRONMENT
    183159
    184160# configure and compile libiconv during configuration stage
    … …  
    192168fi
    193169
    194 cd "$PACKAGES/iconv/libiconv-1.13.1"
    195 
    196 if test -e Makefile ; then
    197   echo make distclean && \
    198   make distclean
    199 fi
    200 
    201170# 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
     171echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
     172
     173cd "$PACKAGES/iconv/libiconv-1.13.1" && \
     174./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
    204175
    205176# make
    206 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $ENVIRONMENT
    207 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make $ENVIRONMENT
     177echo make $ENVIRONMENT
     178make $ENVIRONMENT
    208179
    209180# 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
     181echo make install $ENVIRONMENT
     182make install $ENVIRONMENT
    236183
    237184#./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&&
    … …  
    296243  fi
    297244
    298   echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
     245  echo ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
    299246
    300247  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 $ENVIRONMENT
     248  ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
    302249else
    303250  echo "SQLite support disabled."
    … …  
    312259cd "$PACKAGES/search4j"
    313260
    314 #echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure --bindir="$GSDLHOME/bin/$GSDLOS" $CACHE_FILE $HOSTTARGETFLAGS $ENVIRONMENT
     261
    315262echo ./configure --bindir="$GSDLHOME/bin/$GSDLOS" $CACHE_FILE $HOSTTARGETFLAGS $ENVIRONMENT
    316263
    317264cd "$PACKAGES/search4j" && \
    318265 ./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  
    2727LIBS = @LIBS@ -lc
    2828
    29 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
    30 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     29CFLAGS = @CFLAGS@
     30LDFLAGS = @LDFLAGS@
    3131
    3232ifeq ($(GSDLOS), "windows")

  • main/branches/64_bit_Greenstone/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/configure.in

    r21432 r23508  
    2121dnl x86_64) arch_64bit=yes ;;
    2222dnl esac
    23 dnl
    24 dnl if test "$arch_64bit" = yes; then
    25 dnl   AC_MSG_RESULT(yes)
    26 dnl   if test -z "$COMPAT32BITFLAGS" ; then
    27 dnl     COMPAT32BITFLAGS="-m32"
    28 dnl     LIBTOOLCOMPAT32BITFLAGS="-Wl,-m32"
    29 dnl   fi
    30 dnl else
    31 dnl   AC_MSG_RESULT(no)
    32 dnl   if test -z "$COMPAT32BITFLAGS" ; then
    33 dnl     COMPAT32BITFLAGS=
    34 dnl     LIBTOOLCOMPAT32BITFLAGS=
    35 dnl   fi
    36 dnl fi
    37 dnl export COMPAT32BITFLAGS
    38 dnl AC_SUBST(COMPAT32BITFLAGS)
    39 
    40 
    41 AC_DEFINE_UNQUOTED(COMPAT32BITFLAGS, $COMPAT32BITFLAGS)
    42 AC_SUBST(COMPAT32BITFLAGS)
    43 
    4423
    4524AC_C_CONST

  • main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/db2txt/Makefile.in

    r22077 r23508  
    3131
    3232CXX = @CXX@
    33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     33CXXFLAGS = @CXXFLAGS@
    3434DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3535GSDLOS = @gsdlos@
    3636INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3737INSTALL = @INSTALL@
    38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     38LDFLAGS = @LDFLAGS@
    3939LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    4040

  • main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/gdbmdel/Makefile.in

    r22077 r23508  
    3131
    3232CXX = @CXX@
    33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     33CXXFLAGS = @CXXFLAGS@
    3434DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3535GSDLOS = @gsdlos@
    3636INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3737INSTALL = @INSTALL@
    38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     38LDFLAGS = @LDFLAGS@
    3939LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    4040

  • main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/gdbmkeys/Makefile.in

    r22077 r23508  
    3131
    3232CXX = @CXX@
    33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     33CXXFLAGS = @CXXFLAGS@
    3434DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3535GSDLOS = @gsdlos@
    3636INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3737INSTALL = @INSTALL@
    38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     38LDFLAGS = @LDFLAGS@
    3939LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    4040

  • main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/gdbmset/Makefile.in

    r22077 r23508  
    3131
    3232CXX = @CXX@
    33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     33CXXFLAGS = @CXXFLAGS@
    3434DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3535GSDLOS = @gsdlos@
    3636INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3737INSTALL = @INSTALL@
    38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     38LDFLAGS = @LDFLAGS@
    3939LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    4040

  • main/branches/64_bit_Greenstone/greenstone2/common-src/src/gdbmedit/txt2db/Makefile.in

    r22077 r23508  
    3131
    3232CXX = @CXX@
    33 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     33CXXFLAGS = @CXXFLAGS@
    3434DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3535GSDLOS = @gsdlos@
    3636INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3737INSTALL = @INSTALL@
    38 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     38LDFLAGS = @LDFLAGS@
    3939LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    4040

  • main/branches/64_bit_Greenstone/greenstone2/common-src/src/getpw/Makefile.in

    r19875 r23508  
    2828
    2929CXX = @CXX@
    30 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     30CXXFLAGS = @CXXFLAGS@
    3131DEFS = @DEFS@
    3232GSDLOS = @gsdlos@
    3333INCLUDES = -I$(COMMON_DIR) -I$(COMMON_DIR)/src/lib
    3434INSTALL = @INSTALL@
    35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     35LDFLAGS = @LDFLAGS@
    3636LIBS = @LIBS@
    3737

  • main/branches/64_bit_Greenstone/greenstone2/common-src/src/lib/Makefile.in

    r22793 r23508  
    7171AR = ar
    7272CXX = @CXX@
    73 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     73CXXFLAGS = @CXXFLAGS@
    7474DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    7575INCLUDES = -I. -I$(COMMON_DIR) $(GDBM_INCLUDES) $(SQLITE_INCLUDES)

  • main/branches/64_bit_Greenstone/greenstone2/configure

    r23356 r23508  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    605605CPP
    606606MICO_VER
    607 COMPAT32BITFLAGS
    608607RANLIB
    609608SET_MAKE
    … …  
    791790
    792791  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 ;;
    796794  esac
    797795
    … …  
    838836    # Reject names that are not valid shell variable names.
    839837    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"
    841839    ac_useropt_orig=$ac_useropt
    842840    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    864862    # Reject names that are not valid shell variable names.
    865863    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"
    867865    ac_useropt_orig=$ac_useropt
    868866    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10681066    # Reject names that are not valid shell variable names.
    10691067    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"
    10711069    ac_useropt_orig=$ac_useropt
    10721070    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10841082    # Reject names that are not valid shell variable names.
    10851083    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"
    10871085    ac_useropt_orig=$ac_useropt
    10881086    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    11141112    x_libraries=$ac_optarg ;;
    11151113
    1116   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1117 Try \`$0 --help' for more information"
     1114  -*) as_fn_error "unrecognized option: \`$ac_option'
     1115Try \`$0 --help' for more information."
    11181116    ;;
    11191117
    … …  
    11231121    case $ac_envvar in #(
    11241122      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1125       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1123      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    11261124    esac
    11271125    eval $ac_envvar=\$ac_optarg
    … …  
    11411139if test -n "$ac_prev"; then
    11421140  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"
    11441142fi
    11451143
    … …  
    11471145  case $enable_option_checking in
    11481146    no) ;;
    1149     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1147    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11501148    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11511149  esac
    … …  
    11701168    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11711169  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"
    11731171done
    11741172
    … …  
    11841182  if test "x$build_alias" = x; then
    11851183    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" >&2
     1184    $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
    11881186  elif test "x$build_alias" != "x$host_alias"; then
    11891187    cross_compiling=yes
    … …  
    12001198ac_ls_di=`ls -di .` &&
    12011199ac_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"
    12031201test "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"
    12051203
    12061204
    … …  
    12411239if test ! -r "$srcdir/$ac_unique_file"; then
    12421240  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"
    12441242fi
    12451243ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12461244ac_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"
    12481246    pwd)`
    12491247# When building in place, set srcdir=.
    … …  
    12851283      --help=recursive    display the short help of all the included packages
    12861284  -V, --version           display version information and exit
    1287   -q, --quiet, --silent   do not print \`checking ...' messages
     1285  -q, --quiet, --silent   do not print \`checking...' messages
    12881286      --cache-file=FILE   cache test results in FILE [disabled]
    12891287  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14491447  cat <<\_ACEOF
    14501448configure
    1451 generated by GNU Autoconf 2.67
    1452 
    1453 Copyright (C) 2010 Free Software Foundation, Inc.
     1449generated by GNU Autoconf 2.65
     1450
     1451Copyright (C) 2009 Free Software Foundation, Inc.
    14541452This configure script is free software; the Free Software Foundation
    14551453gives unlimited permission to copy, distribute and modify it.
    … …  
    15591557  fi
    15601558  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1561   test $ac_status = 0; } > conftest.i && {
     1559  test $ac_status = 0; } >/dev/null && {
    15621560     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15631561     test ! -s conftest.err
    … …  
    15831581{
    15841582  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 :
    15861584  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15871585$as_echo_n "checking for $2... " >&6; }
    1588 if eval "test \"\${$3+set}\"" = set; then :
     1586if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15891587  $as_echo_n "(cached) " >&6
    15901588fi
    … …  
    16221620  ac_header_preproc=no
    16231621fi
    1624 rm -f conftest.err conftest.i conftest.$ac_ext
     1622rm -f conftest.err conftest.$ac_ext
    16251623{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    16261624$as_echo "$ac_header_preproc" >&6; }
    … …  
    16491647  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16501648$as_echo_n "checking for $2... " >&6; }
    1651 if eval "test \"\${$3+set}\"" = set; then :
     1649if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16521650  $as_echo_n "(cached) " >&6
    16531651else
    … …  
    17131711  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17141712$as_echo_n "checking for $2... " >&6; }
    1715 if eval "test \"\${$3+set}\"" = set; then :
     1713if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17161714  $as_echo_n "(cached) " >&6
    17171715else
    … …  
    17901788  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17911789$as_echo_n "checking for $2... " >&6; }
    1792 if eval "test \"\${$3+set}\"" = set; then :
     1790if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17931791  $as_echo_n "(cached) " >&6
    17941792else
    … …  
    18431841  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18441842$as_echo_n "checking for $2... " >&6; }
    1845 if eval "test \"\${$3+set}\"" = set; then :
     1843if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18461844  $as_echo_n "(cached) " >&6
    18471845else
    … …  
    19481946
    19491947It was created by $as_me, which was
    1950 generated by GNU Autoconf 2.67.  Invocation command line was
     1948generated by GNU Autoconf 2.65.  Invocation command line was
    19511949
    19521950  $ $0 $@
    … …  
    20582056    echo
    20592057
    2060     $as_echo "## ---------------- ##
     2058    cat <<\_ASBOX
     2059## ---------------- ##
    20612060## Cache variables. ##
    2062 ## ---------------- ##"
     2061## ---------------- ##
     2062_ASBOX
    20632063    echo
    20642064    # The following way of writing the cache mishandles newlines in values,
    … …  
    20942094    echo
    20952095
    2096     $as_echo "## ----------------- ##
     2096    cat <<\_ASBOX
     2097## ----------------- ##
    20972098## Output variables. ##
    2098 ## ----------------- ##"
     2099## ----------------- ##
     2100_ASBOX
    20992101    echo
    21002102    for ac_var in $ac_subst_vars
    … …  
    21092111
    21102112    if test -n "$ac_subst_files"; then
    2111       $as_echo "## ------------------- ##
     2113      cat <<\_ASBOX
     2114## ------------------- ##
    21122115## File substitutions. ##
    2113 ## ------------------- ##"
     2116## ------------------- ##
     2117_ASBOX
    21142118      echo
    21152119      for ac_var in $ac_subst_files
    … …  
    21252129
    21262130    if test -s confdefs.h; then
    2127       $as_echo "## ----------- ##
     2131      cat <<\_ASBOX
     2132## ----------- ##
    21282133## confdefs.h. ##
    2129 ## ----------- ##"
     2134## ----------- ##
     2135_ASBOX
    21302136      echo
    21312137      cat confdefs.h
    … …  
    21822188ac_site_file2=NONE
    21832189if 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
    21902191elif test "x$prefix" != xNONE; then
    21912192  ac_site_file1=$prefix/share/config.site
    … …  
    22022203$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    22032204    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"
    22092206  fi
    22102207done
    … …  
    22822279  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    22832280$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" 5
     2281  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    22852282fi
    22862283## -------------------- ##
    … …  
    28632860test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28642861$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2865 as_fn_error $? "no acceptable C compiler found in \$PATH
    2866 See \`config.log' for more details" "$LINENO" 5 ; }
     2862as_fn_error "no acceptable C compiler found in \$PATH
     2863See \`config.log' for more details." "$LINENO" 5; }
    28672864
    28682865# Provide some information about the compiler.
    … …  
    29782975{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29792976$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
     2978as_fn_error "C compiler cannot create executables
     2979See \`config.log' for more details." "$LINENO" 5; }; }
    29822980else
    29832981  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    30213019  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30223020$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3023 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    3024 See \`config.log' for more details" "$LINENO" 5 ; }
     3021as_fn_error "cannot compute suffix of executables: cannot compile and link
     3022See \`config.log' for more details." "$LINENO" 5; }
    30253023fi
    30263024rm -f conftest conftest$ac_cv_exeext
    … …  
    30793077    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30803078$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3081 as_fn_error $? "cannot run C compiled programs.
     3079as_fn_error "cannot run C compiled programs.
    30823080If you meant to cross compile, use \`--host'.
    3083 See \`config.log' for more details" "$LINENO" 5 ; }
     3081See \`config.log' for more details." "$LINENO" 5; }
    30843082    fi
    30853083  fi
    … …  
    31323130{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    31333131$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3134 as_fn_error $? "cannot compute suffix of object files: cannot compile
    3135 See \`config.log' for more details" "$LINENO" 5 ; }
     3132as_fn_error "cannot compute suffix of object files: cannot compile
     3133See \`config.log' for more details." "$LINENO" 5; }
    31363134fi
    31373135rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    36973695ac_aux_dir=
    36983696for 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
    37123704done
    37133705if test -z "$ac_aux_dir"; then
    3714   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     3706  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    37153707fi
    37163708
    … …  
    37263718# Make sure we can run config.sub.
    37273719$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    3728   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     3720  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    37293721
    37303722{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    37373729  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    37383730test "x$ac_build_alias" = x &&
    3739   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     3731  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    37403732ac_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" 5
     3733  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    37423734
    37433735fi
    … …  
    37463738case $ac_cv_build in
    37473739*-*-*) ;;
    3748 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     3740*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    37493741esac
    37503742build=$ac_cv_build
    … …  
    37713763else
    37723764  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" 5
     3765    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    37743766fi
    37753767
    … …  
    37793771case $ac_cv_host in
    37803772*-*-*) ;;
    3781 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     3773*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    37823774esac
    37833775host=$ac_cv_host
    … …  
    38043796else
    38053797  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" 5
     3798    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    38073799fi
    38083800
    … …  
    38123804case $ac_cv_target in
    38133805*-*-*) ;;
    3814 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     3806*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    38153807esac
    38163808target=$ac_cv_target
    … …  
    39433935set x ${MAKE-make}
    39443936ac_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 :
     3937if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    39463938  $as_echo_n "(cached) " >&6
    39473939else
    … …  
    39513943    @echo '@@@%%%=$(MAKE)=@@@%%%'
    39523944_ACEOF
    3953 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     3945# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    39543946case `${MAKE-make} -f conftest.make 2>/dev/null` in
    39553947  *@@@%%%=?*=@@@%%%*)
    … …  
    40614053  RANLIB="$ac_cv_prog_RANLIB"
    40624054fi
    4063 
    4064 
    4065 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    4066 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    4067 arch_64bit=no
    4068 case "$host_cpu" in
    4069 x86_64) arch_64bit=yes ;;
    4070 esac
    4071 
    4072 if test "$arch_64bit" = yes; then
    4073   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    4074 $as_echo "yes" >&6; }
    4075   if test -z "$COMPAT32BITFLAGS" ; then
    4076     if test "$ENABLE_MG" = "1" -o "$ENABLE_MGPP" = "1" ; then
    4077       COMPAT32BITFLAGS="-m32"
    4078     fi
    4079   fi
    4080 else
    4081   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    4082 $as_echo "no" >&6; }
    4083   if test -z "$COMPAT32BITFLAGS" ; then
    4084     COMPAT32BITFLAGS=
    4085   fi
    4086 fi
    4087 
    4088 export COMPAT32BITFLAGS
    40894055
    40904056
    … …  
    41634129continue
    41644130fi
    4165 rm -f conftest.err conftest.i conftest.$ac_ext
     4131rm -f conftest.err conftest.$ac_ext
    41664132
    41674133  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    41794145break
    41804146fi
    4181 rm -f conftest.err conftest.i conftest.$ac_ext
     4147rm -f conftest.err conftest.$ac_ext
    41824148
    41834149done
    41844150# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4185 rm -f conftest.i conftest.err conftest.$ac_ext
     4151rm -f conftest.err conftest.$ac_ext
    41864152if $ac_preproc_ok; then :
    41874153  break
    … …  
    42224188continue
    42234189fi
    4224 rm -f conftest.err conftest.i conftest.$ac_ext
     4190rm -f conftest.err conftest.$ac_ext
    42254191
    42264192  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    42384204break
    42394205fi
    4240 rm -f conftest.err conftest.i conftest.$ac_ext
     4206rm -f conftest.err conftest.$ac_ext
    42414207
    42424208done
    42434209# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4244 rm -f conftest.i conftest.err conftest.$ac_ext
     4210rm -f conftest.err conftest.$ac_ext
    42454211if $ac_preproc_ok; then :
    42464212
    … …  
    42484214  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    42494215$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4250 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4251 See \`config.log' for more details" "$LINENO" 5 ; }
     4216as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4217See \`config.log' for more details." "$LINENO" 5; }
    42524218fi
    42534219
    … …  
    43104276IFS=$as_save_IFS
    43114277  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" 5
     4278    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    43134279  fi
    43144280else
    … …  
    43764342IFS=$as_save_IFS
    43774343  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" 5
     4344    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    43794345  fi
    43804346else
    … …  
    45084474ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    45094475"
    4510 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4476eval as_val=\$$as_ac_Header
     4477   if test "x$as_val" = x""yes; then :
    45114478  cat >>confdefs.h <<_ACEOF
    45124479#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    50244991{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    50254992$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5026 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     4993if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    50274994  $as_echo_n "(cached) " >&6
    50284995else
    … …  
    50515018           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    50525019$as_echo "$ac_res" >&6; }
    5053 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5020eval as_val=\$$as_ac_Header
     5021   if test "x$as_val" = x""yes; then :
    50545022  cat >>confdefs.h <<_ACEOF
    50555023#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    52935261  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    52945262ac_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 :
     5263eval as_val=\$$as_ac_Header
     5264   if test "x$as_val" = x""yes; then :
    52965265  cat >>confdefs.h <<_ACEOF
    52975266#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    54665435    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    54675436ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5468 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5437eval as_val=\$$as_ac_var
     5438   if test "x$as_val" = x""yes; then :
    54695439
    54705440cat >>confdefs.h <<_ACEOF
    … …  
    56265596  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    56275597ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5628 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5598eval as_val=\$$as_ac_var
     5599   if test "x$as_val" = x""yes; then :
    56295600  cat >>confdefs.h <<_ACEOF
    56305601#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    56345605done
    56355606
    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
     5607for ac_func in ftruncate strstr strcasecmp
     5608do :
     5609  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     5610ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     5611eval 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
    56395616
    56405617else
    56415618  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"
    56445621 ;;
    56455622esac
    56465623
    56475624fi
    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
     5625done
    56745626
    56755627
    … …  
    58415793{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5
    58425794$as_echo "\"no\"" >&6; }
    5843 as_fn_error $? "\"Perl 5 not available - cannot install\"" "$LINENO" 5
     5795as_fn_error "\"Perl 5 not available - cannot install\"" "$LINENO" 5
    58445796fi
    58455797
    … …  
    59105862{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5
    59115863$as_echo "\"yes\"" >&6; }
    5912 as_fn_error $? "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
     5864as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
    59135865fi
    59145866
    … …  
    61426094     ;; #(
    61436095   *)
    6144      as_fn_error $? "unknown endianness
    6145  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 ;;
    61466098 esac
    61476099
    … …  
    62896241ac_libobjs=
    62906242ac_ltlibobjs=
    6291 U=
    62926243for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    62936244  # 1. Remove the extension, and $U if already installed.
    … …  
    64526403
    64536404
    6454 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6455 # ----------------------------------------
     6405# as_fn_error ERROR [LINENO LOG_FD]
     6406# ---------------------------------
    64566407# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    64576408# 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.
    64596410as_fn_error ()
    64606411{
    6461   as_status=$1; test $as_status -eq 0 && as_status=1
    6462   if test "$4"; then
    6463     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6464     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6412  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
    64656416  fi
    6466   $as_echo "$as_me: error: $2" >&2
     6417  $as_echo "$as_me: error: $1" >&2
    64676418  as_fn_exit $as_status
    64686419} # as_fn_error
    … …  
    66606611    done
    66616612    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"
    66636614
    66646615
    … …  
    67146665ac_log="
    67156666This file was extended by $as_me, which was
    6716 generated by GNU Autoconf 2.67.  Invocation command line was
     6667generated by GNU Autoconf 2.65.  Invocation command line was
    67176668
    67186669  CONFIG_FILES    = $CONFIG_FILES
    … …  
    67766727ac_cs_version="\\
    67776728config.status
    6778 configured by $0, generated by GNU Autoconf 2.67,
     6729configured by $0, generated by GNU Autoconf 2.65,
    67796730  with options \\"\$ac_cs_config\\"
    67806731
    6781 Copyright (C) 2010 Free Software Foundation, Inc.
     6732Copyright (C) 2009 Free Software Foundation, Inc.
    67826733This config.status script is free software; the Free Software Foundation
    67836734gives unlimited permission to copy, distribute and modify it."
    … …  
    67966747do
    67976748  case $1 in
    6798   --*=?*)
     6749  --*=*)
    67996750    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    68006751    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    6801     ac_shift=:
    6802     ;;
    6803   --*=)
    6804     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    6805     ac_optarg=
    68066752    ac_shift=:
    68076753    ;;
    … …  
    68276773    case $ac_optarg in
    68286774    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    6829     '') as_fn_error $? "missing file argument" ;;
    68306775    esac
    68316776    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    68406785  --he | --h)
    68416786    # Conflict between --help and --header
    6842     as_fn_error $? "ambiguous option: \`$1'
     6787    as_fn_error "ambiguous option: \`$1'
    68436788Try \`$0 --help' for more information.";;
    68446789  --help | --hel | -h )
    … …  
    68496794
    68506795  # This is an error.
    6851   -*) as_fn_error $? "unrecognized option: \`$1'
     6796  -*) as_fn_error "unrecognized option: \`$1'
    68526797Try \`$0 --help' for more information." ;;
    68536798
    … …  
    69036848    "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;;
    69046849
    6905   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     6850  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    69066851  esac
    69076852done
    … …  
    69406885  tmp=./conf$$-$RANDOM
    69416886  (umask 077 && mkdir "$tmp")
    6942 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     6887} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    69436888
    69446889# Set up the scripts for CONFIG_FILES section.
    … …  
    69576902ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    69586903if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    6959   ac_cs_awk_cr='\\r'
     6904  ac_cs_awk_cr='\r'
    69606905else
    69616906  ac_cs_awk_cr=$ac_cr
    … …  
    69716916  echo "_ACEOF"
    69726917} >conf$$subs.sh ||
    6973   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    6974 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     6918  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     6919ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    69756920ac_delim='%!_!# '
    69766921for ac_last_try in false false false false false :; do
    69776922  . ./conf$$subs.sh ||
    6978     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     6923    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    69796924
    69806925  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    69826927    break
    69836928  elif $ac_last_try; then
    6984     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     6929    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    69856930  else
    69866931    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    70717016  cat
    70727017fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    7073   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    7074 _ACEOF
    7075 
    7076 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7077 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     7018  || 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
    70787023# trailing colons and then remove the whole line if VPATH becomes empty
    70797024# (actually we leave an empty line to preserve line numbers).
    70807025if 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[    ]*=/{
     7027s/:*\$(srcdir):*/:/
     7028s/:*\${srcdir}:*/:/
     7029s/:*@srcdir@:*/:/
     7030s/^\([^=]*=[     ]*\):*/\1/
    70907031s/:*$//
    7091 x
    7092 s/\(=[   ]*\).*/\1/
    7093 G
    7094 s/\n//
    70957032s/^[^=]*=[   ]*$//
    70967033}'
    … …  
    71207057    break
    71217058  elif $ac_last_try; then
    7122     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     7059    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    71237060  else
    71247061    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    72057142_ACEOF
    72067143cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7207   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7144  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    72087145fi # test -n "$CONFIG_HEADERS"
    72097146
    … …  
    72187155  case $ac_mode$ac_tag in
    72197156  :[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;;
    72217158  :[FH]-) ac_tag=-:-;;
    72227159  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    72467183       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    72477184       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;;
    72497186      esac
    72507187      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    72737210    case $ac_tag in
    72747211    *:-:* | *:-) 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 ;;
    72767213    esac
    72777214    ;;
    … …  
    74047341"
    74057342eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7406   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7343  || as_fn_error "could not create $ac_file" "$LINENO" 5
    74077344
    74087345test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    74107347  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    74117348  { $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" >&5
     7349which seems to be undefined.  Please make sure it is defined." >&5
    74137350$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;}
     7351which seems to be undefined.  Please make sure it is defined." >&2;}
    74157352
    74167353  rm -f "$tmp/stdin"
    … …  
    74197356  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    74207357  esac \
    7421   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7358  || as_fn_error "could not create $ac_file" "$LINENO" 5
    74227359 ;;
    74237360  :H)
    … …  
    74307367      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    74317368    } >"$tmp/config.h" \
    7432       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7369      || as_fn_error "could not create $ac_file" "$LINENO" 5
    74337370    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    74347371      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    74377374      rm -f "$ac_file"
    74387375      mv "$tmp/config.h" "$ac_file" \
    7439     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7376    || as_fn_error "could not create $ac_file" "$LINENO" 5
    74407377    fi
    74417378  else
    74427379    $as_echo "/* $configure_input  */" \
    74437380      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7444       || as_fn_error $? "could not create -" "$LINENO" 5
     7381      || as_fn_error "could not create -" "$LINENO" 5
    74457382  fi
    74467383 ;;
    … …  
    74577394
    74587395test $ac_write_fail = 0 ||
    7459   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7396  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    74607397
    74617398
    … …  
    74787415  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    74797416  # would make configure fail if this is the last instruction.
    7480   $ac_cs_success || as_fn_exit 1
     7417  $ac_cs_success || as_fn_exit $?
    74817418fi
    74827419
    … …  
    76197556      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
    76207557       --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
    7621     as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     7558    as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
    76227559    fi
    76237560

  • main/branches/64_bit_Greenstone/greenstone2/configure.in

    r23356 r23508  
    224224AC_PROG_RANLIB
    225225
    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 
     226dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     227dnl arch_64bit=no
     228dnl case "$host_cpu" in
     229dnl x86_64) arch_64bit=yes ;;
     230dnl esac
    249231
    250232#moved CORBA MICO directory test to get version of MICO

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/configure

    r23356 r23508  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    605605CPP
    606606MICO_VER
    607 COMPAT32BITFLAGS
    608607RANLIB
    609608SET_MAKE
    … …  
    791790
    792791  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 ;;
    796794  esac
    797795
    … …  
    838836    # Reject names that are not valid shell variable names.
    839837    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"
    841839    ac_useropt_orig=$ac_useropt
    842840    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    864862    # Reject names that are not valid shell variable names.
    865863    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"
    867865    ac_useropt_orig=$ac_useropt
    868866    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10681066    # Reject names that are not valid shell variable names.
    10691067    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"
    10711069    ac_useropt_orig=$ac_useropt
    10721070    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10841082    # Reject names that are not valid shell variable names.
    10851083    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"
    10871085    ac_useropt_orig=$ac_useropt
    10881086    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    11141112    x_libraries=$ac_optarg ;;
    11151113
    1116   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1117 Try \`$0 --help' for more information"
     1114  -*) as_fn_error "unrecognized option: \`$ac_option'
     1115Try \`$0 --help' for more information."
    11181116    ;;
    11191117
    … …  
    11231121    case $ac_envvar in #(
    11241122      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1125       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1123      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    11261124    esac
    11271125    eval $ac_envvar=\$ac_optarg
    … …  
    11411139if test -n "$ac_prev"; then
    11421140  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"
    11441142fi
    11451143
    … …  
    11471145  case $enable_option_checking in
    11481146    no) ;;
    1149     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1147    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11501148    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11511149  esac
    … …  
    11701168    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11711169  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"
    11731171done
    11741172
    … …  
    11841182  if test "x$build_alias" = x; then
    11851183    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" >&2
     1184    $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
    11881186  elif test "x$build_alias" != "x$host_alias"; then
    11891187    cross_compiling=yes
    … …  
    12001198ac_ls_di=`ls -di .` &&
    12011199ac_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"
    12031201test "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"
    12051203
    12061204
    … …  
    12411239if test ! -r "$srcdir/$ac_unique_file"; then
    12421240  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"
    12441242fi
    12451243ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12461244ac_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"
    12481246    pwd)`
    12491247# When building in place, set srcdir=.
    … …  
    12851283      --help=recursive    display the short help of all the included packages
    12861284  -V, --version           display version information and exit
    1287   -q, --quiet, --silent   do not print \`checking ...' messages
     1285  -q, --quiet, --silent   do not print \`checking...' messages
    12881286      --cache-file=FILE   cache test results in FILE [disabled]
    12891287  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14481446  cat <<\_ACEOF
    14491447configure
    1450 generated by GNU Autoconf 2.67
    1451 
    1452 Copyright (C) 2010 Free Software Foundation, Inc.
     1448generated by GNU Autoconf 2.65
     1449
     1450Copyright (C) 2009 Free Software Foundation, Inc.
    14531451This configure script is free software; the Free Software Foundation
    14541452gives unlimited permission to copy, distribute and modify it.
    … …  
    15581556  fi
    15591557  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1560   test $ac_status = 0; } > conftest.i && {
     1558  test $ac_status = 0; } >/dev/null && {
    15611559     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15621560     test ! -s conftest.err
    … …  
    15821580{
    15831581  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 :
    15851583  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15861584$as_echo_n "checking for $2... " >&6; }
    1587 if eval "test \"\${$3+set}\"" = set; then :
     1585if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15881586  $as_echo_n "(cached) " >&6
    15891587fi
    … …  
    16211619  ac_header_preproc=no
    16221620fi
    1623 rm -f conftest.err conftest.i conftest.$ac_ext
     1621rm -f conftest.err conftest.$ac_ext
    16241622{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    16251623$as_echo "$ac_header_preproc" >&6; }
    … …  
    16481646  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16491647$as_echo_n "checking for $2... " >&6; }
    1650 if eval "test \"\${$3+set}\"" = set; then :
     1648if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16511649  $as_echo_n "(cached) " >&6
    16521650else
    … …  
    17121710  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17131711$as_echo_n "checking for $2... " >&6; }
    1714 if eval "test \"\${$3+set}\"" = set; then :
     1712if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17151713  $as_echo_n "(cached) " >&6
    17161714else
    … …  
    17891787  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17901788$as_echo_n "checking for $2... " >&6; }
    1791 if eval "test \"\${$3+set}\"" = set; then :
     1789if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17921790  $as_echo_n "(cached) " >&6
    17931791else
    … …  
    18421840  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18431841$as_echo_n "checking for $2... " >&6; }
    1844 if eval "test \"\${$3+set}\"" = set; then :
     1842if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18451843  $as_echo_n "(cached) " >&6
    18461844else
    … …  
    19471945
    19481946It was created by $as_me, which was
    1949 generated by GNU Autoconf 2.67.  Invocation command line was
     1947generated by GNU Autoconf 2.65.  Invocation command line was
    19501948
    19511949  $ $0 $@
    … …  
    20572055    echo
    20582056
    2059     $as_echo "## ---------------- ##
     2057    cat <<\_ASBOX
     2058## ---------------- ##
    20602059## Cache variables. ##
    2061 ## ---------------- ##"
     2060## ---------------- ##
     2061_ASBOX
    20622062    echo
    20632063    # The following way of writing the cache mishandles newlines in values,
    … …  
    20932093    echo
    20942094
    2095     $as_echo "## ----------------- ##
     2095    cat <<\_ASBOX
     2096## ----------------- ##
    20962097## Output variables. ##
    2097 ## ----------------- ##"
     2098## ----------------- ##
     2099_ASBOX
    20982100    echo
    20992101    for ac_var in $ac_subst_vars
    … …  
    21082110
    21092111    if test -n "$ac_subst_files"; then
    2110       $as_echo "## ------------------- ##
     2112      cat <<\_ASBOX
     2113## ------------------- ##
    21112114## File substitutions. ##
    2112 ## ------------------- ##"
     2115## ------------------- ##
     2116_ASBOX
    21132117      echo
    21142118      for ac_var in $ac_subst_files
    … …  
    21242128
    21252129    if test -s confdefs.h; then
    2126       $as_echo "## ----------- ##
     2130      cat <<\_ASBOX
     2131## ----------- ##
    21272132## confdefs.h. ##
    2128 ## ----------- ##"
     2133## ----------- ##
     2134_ASBOX
    21292135      echo
    21302136      cat confdefs.h
    … …  
    21812187ac_site_file2=NONE
    21822188if 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
    21892190elif test "x$prefix" != xNONE; then
    21902191  ac_site_file1=$prefix/share/config.site
    … …  
    22012202$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    22022203    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"
    22082205  fi
    22092206done
    … …  
    22812278  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    22822279$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" 5
     2280  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    22842281fi
    22852282## -------------------- ##
    … …  
    28442841test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28452842$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2846 as_fn_error $? "no acceptable C compiler found in \$PATH
    2847 See \`config.log' for more details" "$LINENO" 5 ; }
     2843as_fn_error "no acceptable C compiler found in \$PATH
     2844See \`config.log' for more details." "$LINENO" 5; }
    28482845
    28492846# Provide some information about the compiler.
    … …  
    29592956{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29602957$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
     2959as_fn_error "C compiler cannot create executables
     2960See \`config.log' for more details." "$LINENO" 5; }; }
    29632961else
    29642962  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    30023000  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30033001$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3004 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    3005 See \`config.log' for more details" "$LINENO" 5 ; }
     3002as_fn_error "cannot compute suffix of executables: cannot compile and link
     3003See \`config.log' for more details." "$LINENO" 5; }
    30063004fi
    30073005rm -f conftest conftest$ac_cv_exeext
    … …  
    30603058    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30613059$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3062 as_fn_error $? "cannot run C compiled programs.
     3060as_fn_error "cannot run C compiled programs.
    30633061If you meant to cross compile, use \`--host'.
    3064 See \`config.log' for more details" "$LINENO" 5 ; }
     3062See \`config.log' for more details." "$LINENO" 5; }
    30653063    fi
    30663064  fi
    … …  
    31133111{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    31143112$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3115 as_fn_error $? "cannot compute suffix of object files: cannot compile
    3116 See \`config.log' for more details" "$LINENO" 5 ; }
     3113as_fn_error "cannot compute suffix of object files: cannot compile
     3114See \`config.log' for more details." "$LINENO" 5; }
    31173115fi
    31183116rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    36833681
    36843682  fi
    3685   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     3683  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    36863684else
    36873685  echo "Checking for javac... $JAVAC"
    … …  
    36993697CLASS_TEST=Test.class
    37003698cat << \EOF > $JAVA_TEST
    3701 /* #line 3701 "configure" */
     3699/* #line 3699 "configure" */
    37023700public class Test {
    37033701}
    … …  
    37113709  ac_cv_prog_javac_works=yes
    37123710else
    3713   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     3711  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    37143712  echo "configure: failed program was:" >&5
    37153713  cat $JAVA_TEST >&5
    … …  
    38163814
    38173815    fi
    3818     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     3816    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    38193817fi
    38203818
    … …  
    38783876        ac_cv_prog_uudecode_base64=yes
    38793877else
    3880         echo "configure: 3880: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     3878        echo "configure: 3878: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    38813879        echo "configure: failed file was:" >&5
    38823880        cat Test.uue >&5
    … …  
    38933891$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    38943892        if test x$ac_cv_prog_javac_works = xno; then
    3895                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     3893                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    38963894        fi
    38973895        if test x$ac_cv_prog_javac_works = x; then
    … …  
    39863984
    39873985  fi
    3988   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     3986  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    39893987else
    39903988  echo "Checking for javac... $JAVAC"
    … …  
    40024000CLASS_TEST=Test.class
    40034001cat << \EOF > $JAVA_TEST
    4004 /* #line 4004 "configure" */
     4002/* #line 4002 "configure" */
    40054003public class Test {
    40064004}
    … …  
    40144012  ac_cv_prog_javac_works=yes
    40154013else
    4016   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4014  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    40174015  echo "configure: failed program was:" >&5
    40184016  cat $JAVA_TEST >&5
    … …  
    40414039TEST=Test
    40424040cat << \EOF > $JAVA_TEST
    4043 /* [#]line 4043 "configure" */
     4041/* [#]line 4041 "configure" */
    40444042public class Test {
    40454043public static void main (String args[]) {
    … …  
    40584056          echo "configure: failed program was:" >&5
    40594057          cat $JAVA_TEST >&5
    4060           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4058          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    40614059        fi
    40624060fi
    … …  
    40714069  echo "configure: failed program was:" >&5
    40724070  cat $JAVA_TEST >&5
    4073   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4071  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    40744072fi
    40754073rm -fr $JAVA_TEST $CLASS_TEST Test.uue
    … …  
    41694167ac_aux_dir=
    41704168for 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
    41844176done
    41854177if test -z "$ac_aux_dir"; then
    4186   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     4178  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    41874179fi
    41884180
    … …  
    41984190# Make sure we can run config.sub.
    41994191$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    4200   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     4192  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    42014193
    42024194{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    42094201  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    42104202test "x$ac_build_alias" = x &&
    4211   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     4203  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    42124204ac_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" 5
     4205  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    42144206
    42154207fi
    … …  
    42184210case $ac_cv_build in
    42194211*-*-*) ;;
    4220 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     4212*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    42214213esac
    42224214build=$ac_cv_build
    … …  
    42434235else
    42444236  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" 5
     4237    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    42464238fi
    42474239
    … …  
    42514243case $ac_cv_host in
    42524244*-*-*) ;;
    4253 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     4245*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    42544246esac
    42554247host=$ac_cv_host
    … …  
    42764268else
    42774269  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" 5
     4270    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    42794271fi
    42804272
    … …  
    42844276case $ac_cv_target in
    42854277*-*-*) ;;
    4286 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     4278*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    42874279esac
    42884280target=$ac_cv_target
    … …  
    44154407set x ${MAKE-make}
    44164408ac_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 :
     4409if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    44184410  $as_echo_n "(cached) " >&6
    44194411else
    … …  
    44234415    @echo '@@@%%%=$(MAKE)=@@@%%%'
    44244416_ACEOF
    4425 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     4417# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    44264418case `${MAKE-make} -f conftest.make 2>/dev/null` in
    44274419  *@@@%%%=?*=@@@%%%*)
    … …  
    45334525  RANLIB="$ac_cv_prog_RANLIB"
    45344526fi
    4535 
    4536 
    4537 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    4538 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    4539 arch_64bit=no
    4540 case "$host_cpu" in
    4541 x86_64) arch_64bit=yes ;;
    4542 esac
    4543 
    4544 if test "$arch_64bit" = yes; then
    4545   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    4546 $as_echo "yes" >&6; }
    4547   if test -z "$COMPAT32BITFLAGS" ; then
    4548     COMPAT32BITFLAGS="-m32"
    4549   fi
    4550 else
    4551   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    4552 $as_echo "no" >&6; }
    4553   if test -z "$COMPAT32BITFLAGS" ; then
    4554     COMPAT32BITFLAGS=
    4555   fi
    4556 fi
    4557 
    4558 # Only need compat32bitflag if using MG or MGPP
    4559 if test "$ENABLE_MG" = "0" ; then
    4560   COMPAT32BITFLAGS=
    4561 else
    4562   if test "$ENABLE_MGPP" = "0" ; then
    4563     COMPAT32BITFLAGS=
    4564   fi
    4565 fi
    4566 
    4567 export COMPAT32BITFLAGS
    45684527
    45694528
    … …  
    46424601continue
    46434602fi
    4644 rm -f conftest.err conftest.i conftest.$ac_ext
     4603rm -f conftest.err conftest.$ac_ext
    46454604
    46464605  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    46584617break
    46594618fi
    4660 rm -f conftest.err conftest.i conftest.$ac_ext
     4619rm -f conftest.err conftest.$ac_ext
    46614620
    46624621done
    46634622# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4664 rm -f conftest.i conftest.err conftest.$ac_ext
     4623rm -f conftest.err conftest.$ac_ext
    46654624if $ac_preproc_ok; then :
    46664625  break
    … …  
    47014660continue
    47024661fi
    4703 rm -f conftest.err conftest.i conftest.$ac_ext
     4662rm -f conftest.err conftest.$ac_ext
    47044663
    47054664  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    47174676break
    47184677fi
    4719 rm -f conftest.err conftest.i conftest.$ac_ext
     4678rm -f conftest.err conftest.$ac_ext
    47204679
    47214680done
    47224681# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4723 rm -f conftest.i conftest.err conftest.$ac_ext
     4682rm -f conftest.err conftest.$ac_ext
    47244683if $ac_preproc_ok; then :
    47254684
    … …  
    47274686  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    47284687$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4729 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4730 See \`config.log' for more details" "$LINENO" 5 ; }
     4688as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4689See \`config.log' for more details." "$LINENO" 5; }
    47314690fi
    47324691
    … …  
    47894748IFS=$as_save_IFS
    47904749  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" 5
     4750    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    47924751  fi
    47934752else
    … …  
    48554814IFS=$as_save_IFS
    48564815  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" 5
     4816    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    48584817  fi
    48594818else
    … …  
    49874946ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    49884947"
    4989 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4948eval as_val=\$$as_ac_Header
     4949   if test "x$as_val" = x""yes; then :
    49904950  cat >>confdefs.h <<_ACEOF
    49914951#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    55035463{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    55045464$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5505 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     5465if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    55065466  $as_echo_n "(cached) " >&6
    55075467else
    … …  
    55305490           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    55315491$as_echo "$ac_res" >&6; }
    5532 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5492eval as_val=\$$as_ac_Header
     5493   if test "x$as_val" = x""yes; then :
    55335494  cat >>confdefs.h <<_ACEOF
    55345495#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    57725733  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    57735734ac_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 :
     5735eval as_val=\$$as_ac_Header
     5736   if test "x$as_val" = x""yes; then :
    57755737  cat >>confdefs.h <<_ACEOF
    57765738#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    59455907    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    59465908ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5947 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5909eval as_val=\$$as_ac_var
     5910   if test "x$as_val" = x""yes; then :
    59485911
    59495912cat >>confdefs.h <<_ACEOF
    … …  
    61056068  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    61066069ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    6107 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     6070eval as_val=\$$as_ac_var
     6071   if test "x$as_val" = x""yes; then :
    61086072  cat >>confdefs.h <<_ACEOF
    61096073#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    61136077done
    61146078
    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
     6079for ac_func in ftruncate strstr strcasecmp
     6080do :
     6081  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     6082ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     6083eval 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
    61186088
    61196089else
    61206090  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"
    61236093 ;;
    61246094esac
    61256095
    61266096fi
    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
     6097done
    61536098
    61546099
    … …  
    63726317{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5
    63736318$as_echo "\"yes\"" >&6; }
    6374 as_fn_error $? "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
     6319as_fn_error "\"STL Broken - Obtain newer version of GNU C Compiler\"" "$LINENO" 5
    63756320fi
    63766321
    … …  
    66046549     ;; #(
    66056550   *)
    6606      as_fn_error $? "unknown endianness
    6607  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 ;;
    66086553 esac
    66096554
    … …  
    66566601         src/oaiservr/Makefile \
    66576602         src/z3950/Makefile \
    6658     src/java/org/nzdl/gsdl/GsdlCollageApplet/Makefile \
    6659     src/java/org/nzdl/gsdl/Phind/Makefile"
     6603        src/java/org/nzdl/gsdl/GsdlCollageApplet/Makefile \
     6604        src/java/org/nzdl/gsdl/Phind/Makefile"
    66606605
    66616606ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs"
    … …  
    67446689ac_libobjs=
    67456690ac_ltlibobjs=
    6746 U=
    67476691for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    67486692  # 1. Remove the extension, and $U if already installed.
    … …  
    69076851
    69086852
    6909 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6910 # ----------------------------------------
     6853# as_fn_error ERROR [LINENO LOG_FD]
     6854# ---------------------------------
    69116855# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    69126856# 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.
    69146858as_fn_error ()
    69156859{
    6916   as_status=$1; test $as_status -eq 0 && as_status=1
    6917   if test "$4"; then
    6918     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6919     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6860  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
    69206864  fi
    6921   $as_echo "$as_me: error: $2" >&2
     6865  $as_echo "$as_me: error: $1" >&2
    69226866  as_fn_exit $as_status
    69236867} # as_fn_error
    … …  
    71157059    done
    71167060    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"
    71187062
    71197063
    … …  
    71697113ac_log="
    71707114This file was extended by $as_me, which was
    7171 generated by GNU Autoconf 2.67.  Invocation command line was
     7115generated by GNU Autoconf 2.65.  Invocation command line was
    71727116
    71737117  CONFIG_FILES    = $CONFIG_FILES
    … …  
    72317175ac_cs_version="\\
    72327176config.status
    7233 configured by $0, generated by GNU Autoconf 2.67,
     7177configured by $0, generated by GNU Autoconf 2.65,
    72347178  with options \\"\$ac_cs_config\\"
    72357179
    7236 Copyright (C) 2010 Free Software Foundation, Inc.
     7180Copyright (C) 2009 Free Software Foundation, Inc.
    72377181This config.status script is free software; the Free Software Foundation
    72387182gives unlimited permission to copy, distribute and modify it."
    … …  
    72517195do
    72527196  case $1 in
    7253   --*=?*)
     7197  --*=*)
    72547198    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    72557199    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    7256     ac_shift=:
    7257     ;;
    7258   --*=)
    7259     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    7260     ac_optarg=
    72617200    ac_shift=:
    72627201    ;;
    … …  
    72827221    case $ac_optarg in
    72837222    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    7284     '') as_fn_error $? "missing file argument" ;;
    72857223    esac
    72867224    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    72957233  --he | --h)
    72967234    # Conflict between --help and --header
    7297     as_fn_error $? "ambiguous option: \`$1'
     7235    as_fn_error "ambiguous option: \`$1'
    72987236Try \`$0 --help' for more information.";;
    72997237  --help | --hel | -h )
    … …  
    73047242
    73057243  # This is an error.
    7306   -*) as_fn_error $? "unrecognized option: \`$1'
     7244  -*) as_fn_error "unrecognized option: \`$1'
    73077245Try \`$0 --help' for more information." ;;
    73087246
    … …  
    73597297    "$moduleDirs") CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;;
    73607298
    7361   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     7299  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    73627300  esac
    73637301done
    … …  
    73967334  tmp=./conf$$-$RANDOM
    73977335  (umask 077 && mkdir "$tmp")
    7398 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     7336} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    73997337
    74007338# Set up the scripts for CONFIG_FILES section.
    … …  
    74137351ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    74147352if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    7415   ac_cs_awk_cr='\\r'
     7353  ac_cs_awk_cr='\r'
    74167354else
    74177355  ac_cs_awk_cr=$ac_cr
    … …  
    74277365  echo "_ACEOF"
    74287366} >conf$$subs.sh ||
    7429   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    7430 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     7367  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     7368ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    74317369ac_delim='%!_!# '
    74327370for ac_last_try in false false false false false :; do
    74337371  . ./conf$$subs.sh ||
    7434     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7372    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74357373
    74367374  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    74387376    break
    74397377  elif $ac_last_try; then
    7440     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7378    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74417379  else
    74427380    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    75277465  cat
    75287466fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    7529   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    7530 _ACEOF
    7531 
    7532 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7533 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     7467  || 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
    75347472# trailing colons and then remove the whole line if VPATH becomes empty
    75357473# (actually we leave an empty line to preserve line numbers).
    75367474if 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[    ]*=/{
     7476s/:*\$(srcdir):*/:/
     7477s/:*\${srcdir}:*/:/
     7478s/:*@srcdir@:*/:/
     7479s/^\([^=]*=[     ]*\):*/\1/
    75467480s/:*$//
    7547 x
    7548 s/\(=[   ]*\).*/\1/
    7549 G
    7550 s/\n//
    75517481s/^[^=]*=[   ]*$//
    75527482}'
    … …  
    75767506    break
    75777507  elif $ac_last_try; then
    7578     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     7508    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    75797509  else
    75807510    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    76617591_ACEOF
    76627592cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7663   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7593  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    76647594fi # test -n "$CONFIG_HEADERS"
    76657595
    … …  
    76747604  case $ac_mode$ac_tag in
    76757605  :[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;;
    76777607  :[FH]-) ac_tag=-:-;;
    76787608  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    77027632       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    77037633       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;;
    77057635      esac
    77067636      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    77297659    case $ac_tag in
    77307660    *:-:* | *:-) 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 ;;
    77327662    esac
    77337663    ;;
    … …  
    78607790"
    78617791eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7862   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7792  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78637793
    78647794test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    78667796  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    78677797  { $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" >&5
     7798which seems to be undefined.  Please make sure it is defined." >&5
    78697799$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;}
     7800which seems to be undefined.  Please make sure it is defined." >&2;}
    78717801
    78727802  rm -f "$tmp/stdin"
    … …  
    78757805  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    78767806  esac \
    7877   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7807  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78787808 ;;
    78797809  :H)
    … …  
    78867816      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    78877817    } >"$tmp/config.h" \
    7888       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7818      || as_fn_error "could not create $ac_file" "$LINENO" 5
    78897819    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    78907820      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    78937823      rm -f "$ac_file"
    78947824      mv "$tmp/config.h" "$ac_file" \
    7895     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7825    || as_fn_error "could not create $ac_file" "$LINENO" 5
    78967826    fi
    78977827  else
    78987828    $as_echo "/* $configure_input  */" \
    78997829      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7900       || as_fn_error $? "could not create -" "$LINENO" 5
     7830      || as_fn_error "could not create -" "$LINENO" 5
    79017831  fi
    79027832 ;;
    … …  
    79137843
    79147844test $ac_write_fail = 0 ||
    7915   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7845  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    79167846
    79177847
    … …  
    79347864  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    79357865  # would make configure fail if this is the last instruction.
    7936   $ac_cs_success || as_fn_exit 1
     7866  $ac_cs_success || as_fn_exit $?
    79377867fi
    79387868
    … …  
    80758005      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
    80768006       --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
    8077     as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     8007    as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
    80788008    fi
    80798009

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/configure.in

    r23356 r23508  
    214214AC_PROG_RANLIB
    215215
    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 
     216dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     217dnl arch_64bit=no
     218dnl case "$host_cpu" in
     219dnl x86_64) arch_64bit=yes ;;
     220dnl esac
    246221
    247222#moved CORBA MICO directory test to get version of MICO

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/packages/configure

    r22378 r23508  
    210210  cd "$PACKAGES/apache-httpd"
    211211  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 && \
     213CFLAGS="$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
    219214
    220215else

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/colservr/Makefile.in

    r22058 r23508  
    112112CC = @CC@
    113113CXX = @CXX@
    114 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
    115 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     114CFLAGS = @CFLAGS@
     115CXXFLAGS = @CXXFLAGS@
    116116DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    117117# 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  
    3838ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
    3939ifeq ($(ENABLE_ACCENTFOLD), 1)
    40 ifeq ($(COMPAT32BITFLAGS),)
    4140ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a
    42 else
    43 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib64/libiconv.a
    44 endif
    4541else
    4642ACCENTFOLD_LIBS =
    … …  
    9389
    9490CC = @CC@
    95 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
     91CFLAGS = @CFLAGS@
    9692CXX = @CXX@
    97 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     93CXXFLAGS = @CXXFLAGS@
    9894DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    9995INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES)
    100 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     96LDFLAGS = @LDFLAGS@
    10197LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
    10298    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/oaiservr/oaiargs.cpp

    r22739 r23508  
    2525 *********************************************************************/
    2626
     27#include "mglong.h"
    2728#include "oaiargs.h"
    2829#include "cgiutils.h"
    … …  
    7778    text_t label, value;
    7879    if (equals == NULL) {
    79       label.setcarr((char *) start, (long) here - (long) start);
     80      label.setcarr((char *) start, (uintptr_t) here - (uintptr_t) start);
    8081      value = label;
    8182    }
    8283    else {
    83       label.setcarr((char *) start, (long) equals - (long) start);
     84      label.setcarr((char *) start, (uintptr_t) equals - (uintptr_t) start);
    8485      ++equals;
    85       value.setcarr((char *) equals, (long) here - (long) equals);
     86      value.setcarr((char *) equals, (uintptr_t) here - (uintptr_t) equals);
    8687    }
    8788

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/protocol/Makefile.in

    r22078 r23508  
    3535ENABLE_MGPP = @ENABLE_MGPP@
    3636ifeq ($(ENABLE_MGPP), 1)
    37 MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text
     37MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib
    3838else
    3939MGPP_INCLUDES =
    … …  
    6666AR = ar
    6767CXX = @CXX@
    68 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     68CXXFLAGS = @CXXFLAGS@
    6969DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    7070# 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  
    4141ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
    4242ifeq ($(ENABLE_ACCENTFOLD), 1)
    43 ifeq ($(COMPAT32BITFLAGS),)
    4443ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a
    45 else
    46 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(INDEXERS_DIR)/packages/iconv/lib64/libiconv.a
    47 endif
    4844else
    4945ACCENTFOLD_LIBS =
    … …  
    151147AR = ar
    152148CC = @CC@
    153 CFLAGS=@CFLAGS@ @COMPAT32BITFLAGS@
     149CFLAGS=@CFLAGS@
    154150CXX = @CXX@
    155 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
     151CXXFLAGS = @CXXFLAGS@
    156152DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)
    157153INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
    … …  
    160156        -I$(COMMON_PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(GDBM_INCLUDES) $(Z3950_INCLUDES)
    161157INSTALL = @INSTALL@
    162 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     158LDFLAGS = @LDFLAGS@
    163159LIBS = @LIBS@ $(GDBM_LIBS) \
    164160    $(COMMON_PACKAGES_DIR)/expat/lib/libexpat.a \

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/cgiwrapper.cpp

    r23389 r23508  
    3030#endif
    3131
     32#include "mglong.h"
    3233#include "gsdlconf.h"
    3334#include "cgiwrapper.h"
    … …  
    730731    content_length_str != NULL)  {
    731732      // 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);
    733734      if (content_length > 0) {
    734735#ifdef __WIN32__
    … …  
    744745#endif
    745746
    746     long length = content_length;
     747    mg_s_long length = content_length;
    747748    unsigned char * buffer = new unsigned char[content_length];
    748749

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/mod_gsdl.cpp

    r22925 r23508  
    6161#endif
    6262
     63#include "mglong.h"
    6364#include "maincfg.h"
    6465#include "string_pool.h"
    … …  
    408409      content_length_str != NULL)  {
    409410    // 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);
    411412    if (content_length > 0) {
    412413#ifdef __WIN32__
    … …  
    422423#endif
    423424     
    424       long length = content_length;
     425      mg_s_long length = content_length;
    425426      unsigned char * buffer = new unsigned char[content_length];
    426427     

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/pageaction.cpp

    r23058 r23508  
    3232//   do the work for us, either images or pulldown.
    3333
    34 
     34#include "mglong.h"
    3535#include "pageaction.h"
    3636#include "receptionist.h"
    … …  
    726726    disp.setmacro ("numsections", displayclass::defaultpackage, cinfo->numSections);
    727727    disp.setmacro ("numwords", displayclass::defaultpackage, cinfo->numWords);
    728     unsigned long current_time = time(NULL);
    729     unsigned long builddate = (current_time - cinfo->buildDate) / 86400;
     728    mg_u_long current_time = time(NULL);
     729    mg_u_long builddate = (current_time - cinfo->buildDate) / 86400;
    730730    disp.setmacro ("builddate", displayclass::defaultpackage, builddate);
    731731   

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/phindaction.cpp

    r22984 r23508  
    151151                 ostream &logout) {
    152152
    153   unsigned long count_l, count_e, count_d;
    154   unsigned long phrase = args["ppnum"].getulong();
     153  mg_u_long count_l, count_e, count_d;
     154  mg_u_long phrase = args["ppnum"].getulong();
    155155  text_t &word = args["pptext"];
    156   unsigned long first_e = args["pfe"].getulong();
    157   unsigned long last_e = args["ple"].getulong();
    158   unsigned long first_l = args["pfl"].getulong();
    159   unsigned long last_l = args["pll"].getulong();
    160   unsigned long first_d = args["pfd"].getulong();
    161   unsigned long 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();
    162162  bool XMLmode = false;
    163163  if (args["pxml"] == "1") XMLmode = true;
    … …  
    172172
    173173  // the frequency and occurances of the phrase
    174   unsigned long tf;
    175   vector <unsigned long> el, linkdest, docNums, docfreq;
     174  mg_u_long tf;
     175  vector <mg_u_long> el, linkdest, docNums, docfreq;
    176176  vector <UCArray> linktype;
    177177
    178178  // the number of occurances to display
    179   unsigned long ef, lf, df;
     179  mg_u_long ef, lf, df;
    180180 
    181181  text_t basepath = filename_cat(collecthome, args["c"],
    … …  
    567567//   ll - the list of phrases that are thesaurus links
    568568//   dl - the list of documents that contain phrase
    569 bool phindaction::get_phrase_all_data(TextData &textdata, unsigned long phrase,
    570                       text_t &word, unsigned long &tf, unsigned long &ef,
    571                       unsigned long &lf, unsigned long &df,
    572                       vector <unsigned long> &el,
    573                       vector <unsigned long> &linkdest,
     569bool 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,
    574574                      vector <UCArray> &linktype,
    575                       vector <unsigned long> &docnum,
    576                       vector <unsigned long> &docfrq) {
     575                      vector <mg_u_long> &docnum,
     576                      vector <mg_u_long> &docfrq) {
    577577  UCArray text;
    578578  UCArray docLevel;
    … …  
    624624  // Get expansion list
    625625  el.clear();
    626   unsigned long e = 0;
     626  mg_u_long e = 0;
    627627  for (++next; *next != ':'; ++next) {
    628628    if (*next == ',') {
    … …  
    639639  docfrq.clear();
    640640  bool readnum = false;
    641   unsigned long d = 0;
     641  mg_u_long d = 0;
    642642  for (++next; *next != ':'; ++next) {
    643643    if (*next == ',') {
    … …  
    678678  thistype.clear();
    679679  bool typedone = false;
    680   unsigned long l = 0;
     680  mg_u_long l = 0;
    681681  for (++next; *next != ':'; ++next) {
    682682   
    … …  
    711711
    712712bool phindaction::print_thesaurus_links(const text_t &collection, bool XMLmode,
    713                     TextData &textdata, vector <unsigned long> &linkdest,
    714                     vector <UCArray> &linktype, unsigned long first,
    715                     unsigned long 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,
    716716                    outconvertclass &outconvert, ostream &textout) {
    717717
    718718  // information describing each link in the list
    719   unsigned long phrase, tf, ef, df;
     719  mg_u_long phrase, tf, ef, df;
    720720  UCArray type, text;
    721721 
    722   for (unsigned long l = first; l < last; ++l) {
     722  for (mg_u_long l = first; l < last; ++l) {
    723723
    724724    // get the phrase data
    … …  
    764764 *     false if the method suffered a fatal error, true otherwise
    765765 */
    766 bool phindaction::get_phrase_freq_data(TextData &textdata, unsigned long phrase,
    767                        UCArray &word, unsigned long &tf,
    768                        unsigned long &ef, unsigned long &df) {
     766bool 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) {
    769769 
    770770  UCArray text;
    … …  
    821821void phindaction::print_expansions(const text_t &collection, bool XMLmode,
    822822                   const text_t &body, TextData &textdata,
    823                    const vector <unsigned long> &elist,
    824                    unsigned long first, unsigned long last,
     823                   const vector <mg_u_long> &elist,
     824                   mg_u_long first, mg_u_long last,
    825825                   displayclass &disp, outconvertclass &outconvert,
    826826                   ostream &textout) {
    827827 
    828828  UCArray word;
    829   unsigned long phrase, tf, df, ef;
     829  mg_u_long phrase, tf, df, ef;
    830830
    831831  UCArray suffix, prefix, ucbody;
    … …  
    833833  toUCArray(body, ucbody);
    834834
    835   for (unsigned long e = first; e < last; ++e) {
     835  for (mg_u_long e = first; e < last; ++e) {
    836836
    837837    phrase = elist[e];
    … …  
    940940bool phindaction::print_documents(bool XMLmode, const text_t &basepath,
    941941                  const text_t &collection,
    942                   const vector <unsigned long> &docNums,
    943                   const vector <unsigned long> &docFreq,
    944                   unsigned long first, unsigned long last,
     942                  const vector <mg_u_long> &docNums,
     943                  const vector <mg_u_long> &docFreq,
     944                  mg_u_long first, mg_u_long last,
    945945                  displayclass &disp, outconvertclass &outconvert,
    946946                  ostream &textout) {
    … …  
    967967
    968968  UCArray title, hash;
    969   unsigned long freq, doc;
    970 
    971   for (unsigned long d = first; d < last; ++d) {
     969  mg_u_long freq, doc;
     970
     971  for (mg_u_long d = first; d < last; ++d) {
    972972    doc = docNums[d];
    973973    freq = docFreq[d];
    … …  
    10081008 *  DLConsulting 12-07-2004
    10091009 */
    1010 bool phindaction::get_document_all_data(TextData &docdata, unsigned long docNum,
     1010bool phindaction::get_document_all_data(TextData &docdata, mg_u_long docNum,
    10111011                    UCArray &title, UCArray &hash) {
    10121012

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/recpt/phindaction.h

    r7734 r23508  
    3232#define PHINDACTION_H
    3333
     34#include "mglong.h"
    3435#include "action.h"
    3536
    … …  
    4950                    DocNumArray &result);
    5051
    51   bool get_phrase_all_data(TextData &textdata, unsigned long phrase,
    52                text_t &word, unsigned long &tf, unsigned long &ef,
    53                unsigned long &lf, unsigned long &df,
    54                vector <unsigned long> &el,
    55                vector <unsigned long> &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,
    5657               vector <UCArray> &linktype,
    57                vector <unsigned long> &docnum,
    58                vector <unsigned long> &docfrq);
     58               vector <mg_u_long> &docnum,
     59               vector <mg_u_long> &docfrq);
    5960
    6061  bool print_thesaurus_links(const text_t &collection, bool XMLmode,
    61                  TextData &textdata, vector <unsigned long> &linkdest,
    62                  vector <UCArray> &linktype, unsigned long first,
    63                  unsigned long 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,
    6465                 outconvertclass &outconvert, ostream &textout);
    6566
    66   bool get_phrase_freq_data(TextData &textdata, unsigned long phrase,
    67                 UCArray &word, unsigned long &tf,
    68                 unsigned long &ef, unsigned long &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);
    6970
    7071  void print_expansions(const text_t &collection, bool XMLmode,
    7172            const text_t &body, TextData &textdata,
    72             const vector <unsigned long> &elist,
    73             unsigned long first, unsigned long last,
     73            const vector <mg_u_long> &elist,
     74            mg_u_long first, mg_u_long last,
    7475            displayclass &disp, outconvertclass &outconvert,
    7576            ostream &textout);
    … …  
    8384  bool print_documents(bool XMLmode, const text_t &basepath,
    8485               const text_t &collection,
    85                const vector <unsigned long> &docNums,
    86                const vector <unsigned long> &docFreq,
    87                unsigned long first, unsigned long last,
     86               const vector <mg_u_long> &docNums,
     87               const vector <mg_u_long> &docFreq,
     88               mg_u_long first, mg_u_long last,
    8889               displayclass &disp, outconvertclass &outconvert,
    8990               ostream &textout);
    9091
    91   bool get_document_all_data(TextData &docdata, unsigned long docNum,
     92  bool get_document_all_data(TextData &docdata, mg_u_long docNum,
    9293                 UCArray &title, UCArray &hash);
    9394

  • main/branches/64_bit_Greenstone/greenstone2/runtime-src/src/z3950/Makefile.in

    r22378 r23508  
    102102INSTALL = @INSTALL@
    103103LDFLAGS = @LDFLAGS@
    104 ifeq ($(COMPAT32BITFLAGS),)
     104
    105105LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
    106106    $(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
    113110RANLIB = @RANLIB@
    114111
Note: See TracChangeset for help on using the changeset viewer.