Changeset 23508


Ignore:
Timestamp:
12/17/10 14:04:10 (10 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 -</