Changes in / [30:20]


Ignore:
Location:
/trunk/gsdl
Files:
33 added
5 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • /trunk/gsdl/packages/mg-1.3d/config.h.in

    r30 r20  
    5252   direction of stack growth for your system; otherwise it will be
    5353   automatically deduced at run-time.
    54  STACK_DIRECTION > 0 => grows toward higher addresses
    55  STACK_DIRECTION < 0 => grows toward lower addresses
    56  STACK_DIRECTION = 0 => direction of growth unknown
     54    STACK_DIRECTION > 0 => grows toward higher addresses
     55    STACK_DIRECTION < 0 => grows toward lower addresses
     56    STACK_DIRECTION = 0 => direction of growth unknown
    5757 */
    5858#undef STACK_DIRECTION
    … …  
    9999#undef HAVE_FTIME
    100100
    101 /* Define if you have the ftruncate function.  */
    102 #undef HAVE_FTRUNCATE
    103 
    104101/* Define if you have the getpagesize function.  */
    105102#undef HAVE_GETPAGESIZE
    … …  
    117114#undef HAVE_SETBUFFER
    118115
    119 /* Define if you have the strcasecmp function.  */
    120 #undef HAVE_STRCASECMP
    121 
    122116/* Define if you have the strftime function.  */
    123117#undef HAVE_STRFTIME
    124 
    125 /* Define if you have the strstr function.  */
    126 #undef HAVE_STRSTR
    127118
    128119/* Define if you have the strtol function.  */

  • /trunk/gsdl/packages/mg-1.3d/configure

    r30 r20  
    22
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated automatically using autoconf version 2.12
    5 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
     4# Generated automatically using autoconf version 2.4
     5# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
    66#
    77# This configure script is free software; the Free Software Foundation
    … …  
    3939x_includes=NONE
    4040x_libraries=NONE
    41 bindir='${exec_prefix}/bin'
    42 sbindir='${exec_prefix}/sbin'
    43 libexecdir='${exec_prefix}/libexec'
    44 datadir='${prefix}/share'
    45 sysconfdir='${prefix}/etc'
    46 sharedstatedir='${prefix}/com'
    47 localstatedir='${prefix}/var'
    48 libdir='${exec_prefix}/lib'
    49 includedir='${prefix}/include'
    50 oldincludedir='/usr/include'
    51 infodir='${prefix}/info'
    52 mandir='${prefix}/man'
    5341
    5442# Initialize some other variables.
    5543subdirs=
    56 MFLAGS= MAKEFLAGS=
    57 # Maximum number of lines to put in a shell here document.
    58 ac_max_here_lines=12
    5944
    6045ac_prev=
    … …  
    7863  case "$ac_option" in
    7964
    80   -bindir | --bindir | --bindi | --bind | --bin | --bi)
    81     ac_prev=bindir ;;
    82   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
    83     bindir="$ac_optarg" ;;
    84 
    85   -build | --build | --buil | --bui | --bu)
     65  -build | --build | --buil | --bui | --bu | --b)
    8666    ac_prev=build ;;
    87   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
     67  -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
    8868    build="$ac_optarg" ;;
    8969
    … …  
    9474  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
    9575    cache_file="$ac_optarg" ;;
    96 
    97   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
    98     ac_prev=datadir ;;
    99   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
    100   | --da=*)
    101     datadir="$ac_optarg" ;;
    10276
    10377  -disable-* | --disable-*)
    … …  
    151125  --prefix=PREFIX         install architecture-independent files in PREFIX
    152126                          [$ac_default_prefix]
    153   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
     127  --exec-prefix=PREFIX    install architecture-dependent files in PREFIX
    154128                          [same as prefix]
    155   --bindir=DIR            user executables in DIR [EPREFIX/bin]
    156   --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
    157   --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
    158   --datadir=DIR           read-only architecture-independent data in DIR
    159                           [PREFIX/share]
    160   --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
    161   --sharedstatedir=DIR    modifiable architecture-independent data in DIR
    162                           [PREFIX/com]
    163   --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
    164   --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
    165   --includedir=DIR        C header files in DIR [PREFIX/include]
    166   --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
    167   --infodir=DIR           info documentation in DIR [PREFIX/info]
    168   --mandir=DIR            man documentation in DIR [PREFIX/man]
    169129  --srcdir=DIR            find the sources in DIR [configure dir or ..]
    170130  --program-prefix=PREFIX prepend PREFIX to installed program names
    171131  --program-suffix=SUFFIX append SUFFIX to installed program names
    172   --program-transform-name=PROGRAM
    173                           run sed PROGRAM on installed program names
    174 EOF
    175     cat << EOF
     132  --program-transform-name=PROGRAM run sed PROGRAM on installed program names
    176133Host type:
    177134  --build=BUILD           configure for building on BUILD [BUILD=HOST]
    … …  
    185142  --x-includes=DIR        X include files are in DIR
    186143  --x-libraries=DIR       X library files are in DIR
    187 EOF
    188     if test -n "$ac_help"; then
    189       echo "--enable and --with options recognized:$ac_help"
    190     fi
     144--enable and --with options recognized:$ac_help
     145EOF
    191146    exit 0 ;;
    192147
    … …  
    196151    host="$ac_optarg" ;;
    197152
    198   -includedir | --includedir | --includedi | --included | --include \
    199   | --includ | --inclu | --incl | --inc)
    200     ac_prev=includedir ;;
    201   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
    202   | --includ=* | --inclu=* | --incl=* | --inc=*)
    203     includedir="$ac_optarg" ;;
    204 
    205   -infodir | --infodir | --infodi | --infod | --info | --inf)
    206     ac_prev=infodir ;;
    207   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
    208     infodir="$ac_optarg" ;;
    209 
    210   -libdir | --libdir | --libdi | --libd)
    211     ac_prev=libdir ;;
    212   -libdir=* | --libdir=* | --libdi=* | --libd=*)
    213     libdir="$ac_optarg" ;;
    214 
    215   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
    216   | --libexe | --libex | --libe)
    217     ac_prev=libexecdir ;;
    218   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
    219   | --libexe=* | --libex=* | --libe=*)
    220     libexecdir="$ac_optarg" ;;
    221 
    222   -localstatedir | --localstatedir | --localstatedi | --localstated \
    223   | --localstate | --localstat | --localsta | --localst \
    224   | --locals | --local | --loca | --loc | --lo)
    225     ac_prev=localstatedir ;;
    226   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
    227   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
    228   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
    229     localstatedir="$ac_optarg" ;;
    230 
    231   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
    232     ac_prev=mandir ;;
    233   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
    234     mandir="$ac_optarg" ;;
    235 
    236153  -nfp | --nfp | --nf)
    237154    # Obsolete; use --without-fp.
    … …  
    245162  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
    246163    no_recursion=yes ;;
    247 
    248   -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
    249   | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
    250   | --oldin | --oldi | --old | --ol | --o)
    251     ac_prev=oldincludedir ;;
    252   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
    253   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
    254   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
    255     oldincludedir="$ac_optarg" ;;
    256164
    257165  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
    … …  
    295203    silent=yes ;;
    296204
    297   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    298     ac_prev=sbindir ;;
    299   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
    300   | --sbi=* | --sb=*)
    301     sbindir="$ac_optarg" ;;
    302 
    303   -sharedstatedir | --sharedstatedir | --sharedstatedi \
    304   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
    305   | --sharedst | --shareds | --shared | --share | --shar \
    306   | --sha | --sh)
    307     ac_prev=sharedstatedir ;;
    308   -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
    309   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
    310   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
    311   | --sha=* | --sh=*)
    312     sharedstatedir="$ac_optarg" ;;
    313 
    314205  -site | --site | --sit)
    315206    ac_prev=site ;;
    … …  
    322213    srcdir="$ac_optarg" ;;
    323214
    324   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
    325   | --syscon | --sysco | --sysc | --sys | --sy)
    326     ac_prev=sysconfdir ;;
    327   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
    328   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
    329     sysconfdir="$ac_optarg" ;;
    330 
    331215  -target | --target | --targe | --targ | --tar | --ta | --t)
    332216    ac_prev=target ;;
    … …  
    338222
    339223  -version | --version | --versio | --versi | --vers)
    340     echo "configure generated by autoconf version 2.12"
     224    echo "configure generated by autoconf version 2.4"
    341225    exit 0 ;;
    342226
    … …  
    384268    ;;
    385269
    386   *)
     270  *) 
    387271    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
    388272      echo "configure: warning: $ac_option: invalid host type" 1>&2
    … …  
    440324
    441325# NLS nuisances.
    442 # Only set these to C if already set.  These must not be set unconditionally
    443 # because not all systems understand e.g. LANG=C (notably SCO).
    444 # Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
    445 # Non-C LC_CTYPE values break the ctype check.
     326# Only set LANG and LC_ALL to C if already set.
     327# These must not be set unconditionally because not all systems understand
     328# e.g. LANG=C (notably SCO).
     329if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
    446330if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
    447 if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
    448 if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
    449 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
    450331
    451332# confdefs.h avoids OS command line length limits that DEFS can exceed.
    … …  
    507388# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
    508389ac_cpp='$CPP $CPPFLAGS'
    509 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
    510 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
    511 cross_compiling=$ac_cv_prog_cc_cross
     390ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
     391ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
    512392
    513393if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    … …  
    528408  program_transform_name=
    529409else
    530   # Double any \ or $.  echo might interpret backslashes.
    531   cat <<\EOF_SED > conftestsed
    532 s,\\,\\\\,g; s,\$,$$,g
    533 EOF_SED
     410  # Double any \ or $.
     411  echo 's,\\,\\\\,g; s,\$,$$,g' > conftestsed
    534412  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
    535413  rm -f conftestsed
    … …  
    559437
    560438
    561 for ac_prog in $CCC c++ g++ gcc CC cxx cc++
     439for ac_prog in $CCC c++ g++ gcc CC cxx
    562440do
    563441# Extract the first word of "$ac_prog", so it can be a program name with args.
    564442set dummy $ac_prog; ac_word=$2
    565443echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    566 echo "configure:567: checking for $ac_word" >&5
    567444if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    568445  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    594471
    595472
    596 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    597 echo "configure:598: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
    598 
    599 ac_ext=C
    600 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
    601 ac_cpp='$CXXCPP $CPPFLAGS'
    602 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
    603 ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
    604 cross_compiling=$ac_cv_prog_cxx_cross
    605 
    606 cat > conftest.$ac_ext <<EOF
    607 #line 608 "configure"
    608 #include "confdefs.h"
    609 main(){return(0);}
    610 EOF
    611 if { (eval echo configure:612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    612   ac_cv_prog_cxx_works=yes
    613   # If we can't run a trivial program, we are probably using a cross compiler.
    614   if (./conftest; exit) 2>/dev/null; then
    615     ac_cv_prog_cxx_cross=no
    616   else
    617     ac_cv_prog_cxx_cross=yes
    618   fi
    619 else
    620   echo "configure: failed program was:" >&5
    621   cat conftest.$ac_ext >&5
    622   ac_cv_prog_cxx_works=no
    623 fi
    624 rm -fr conftest*
    625 ac_ext=c
    626 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
    627 ac_cpp='$CPP $CPPFLAGS'
    628 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
    629 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
    630 cross_compiling=$ac_cv_prog_cc_cross
    631 
    632 echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
    633 if test $ac_cv_prog_cxx_works = no; then
    634   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
    635 fi
    636 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    637 echo "configure:638: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
    638 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
    639 cross_compiling=$ac_cv_prog_cxx_cross
    640 
    641473echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
    642 echo "configure:643: checking whether we are using GNU C++" >&5
    643474if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    644475  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    649480#endif
    650481EOF
    651 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     482if ${CXX-g++} -E conftest.C 2>&5 | egrep yes >/dev/null 2>&1; then
    652483  ac_cv_prog_gxx=yes
    653484else
    … …  
    655486fi
    656487fi
    657 
    658488echo "$ac_t""$ac_cv_prog_gxx" 1>&6
    659 
    660489if test $ac_cv_prog_gxx = yes; then
    661490  GXX=yes
    662   ac_test_CXXFLAGS="${CXXFLAGS+set}"
    663   ac_save_CXXFLAGS="$CXXFLAGS"
    664   CXXFLAGS=
    665   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
    666 echo "configure:667: checking whether ${CXX-g++} accepts -g" >&5
    667 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
     491  if test "${CXXFLAGS+set}" != set; then
     492    echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
     493if eval "test \"`echo '$''{'ac_cv_prog_gxx_g'+set}'`\" = set"; then
    668494  echo $ac_n "(cached) $ac_c" 1>&6
    669495else
    670496  echo 'void f(){}' > conftest.cc
    671497if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
    672   ac_cv_prog_cxx_g=yes
    673 else
    674   ac_cv_prog_cxx_g=no
    675 fi
    676 rm -f conftest*
    677 
    678 fi
    679 
    680 echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
    681   if test "$ac_test_CXXFLAGS" = set; then
    682     CXXFLAGS="$ac_save_CXXFLAGS"
    683   elif test $ac_cv_prog_cxx_g = yes; then
    684     CXXFLAGS="-g -O2"
    685   else
    686     CXXFLAGS="-O2"
     498  ac_cv_prog_gxx_g=yes
     499else
     500  ac_cv_prog_gxx_g=no
     501fi
     502rm -f conftest*
     503
     504fi
     505    echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6
     506    if test $ac_cv_prog_gxx_g = yes; then
     507      CXXFLAGS="-g -O"
     508    else
     509      CXXFLAGS="-O"
     510    fi
    687511  fi
    688512else
    … …  
    696520set dummy $ac_prog; ac_word=$2
    697521echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    698 echo "configure:699: checking for $ac_word" >&5
    699522if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
    700523  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    729552set dummy $ac_prog; ac_word=$2
    730553echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    731 echo "configure:732: checking for $ac_word" >&5
    732554if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    733555  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    761583set dummy gcc; ac_word=$2
    762584echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    763 echo "configure:764: checking for $ac_word" >&5
    764585if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    765586  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    777598  done
    778599  IFS="$ac_save_ifs"
     600  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
    779601fi
    780602fi
    … …  
    786608fi
    787609
    788 if test -z "$CC"; then
    789   # Extract the first word of "cc", so it can be a program name with args.
    790 set dummy cc; ac_word=$2
    791 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    792 echo "configure:793: checking for $ac_word" >&5
    793 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    794   echo $ac_n "(cached) $ac_c" 1>&6
    795 else
    796   if test -n "$CC"; then
    797   ac_cv_prog_CC="$CC" # Let the user override the test.
    798 else
    799   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    800   ac_prog_rejected=no
    801   for ac_dir in $PATH; do
    802     test -z "$ac_dir" && ac_dir=.
    803     if test -f $ac_dir/$ac_word; then
    804       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
    805         ac_prog_rejected=yes
    806     continue
    807       fi
    808       ac_cv_prog_CC="cc"
    809       break
    810     fi
    811   done
    812   IFS="$ac_save_ifs"
    813 if test $ac_prog_rejected = yes; then
    814   # We found a bogon in the path, so make sure we never use it.
    815   set dummy $ac_cv_prog_CC
    816   shift
    817   if test $# -gt 0; then
    818     # We chose a different compiler from the bogus one.
    819     # However, it has the same basename, so the bogon will be chosen
    820     # first if we set CC to just the basename; use the full file name.
    821     shift
    822     set dummy "$ac_dir/$ac_word" "$@"
    823     shift
    824     ac_cv_prog_CC="$@"
    825   fi
    826 fi
    827 fi
    828 fi
    829 CC="$ac_cv_prog_CC"
    830 if test -n "$CC"; then
    831   echo "$ac_t""$CC" 1>&6
    832 else
    833   echo "$ac_t""no" 1>&6
    834 fi
    835 
    836   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
    837 fi
    838 
    839 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    840 echo "configure:841: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    841 
    842 ac_ext=c
    843 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
    844 ac_cpp='$CPP $CPPFLAGS'
    845 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
    846 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
    847 cross_compiling=$ac_cv_prog_cc_cross
    848 
    849 cat > conftest.$ac_ext <<EOF
    850 #line 851 "configure"
    851 #include "confdefs.h"
    852 main(){return(0);}
    853 EOF
    854 if { (eval echo configure:855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    855   ac_cv_prog_cc_works=yes
    856   # If we can't run a trivial program, we are probably using a cross compiler.
    857   if (./conftest; exit) 2>/dev/null; then
    858     ac_cv_prog_cc_cross=no
    859   else
    860     ac_cv_prog_cc_cross=yes
    861   fi
    862 else
    863   echo "configure: failed program was:" >&5
    864   cat conftest.$ac_ext >&5
    865   ac_cv_prog_cc_works=no
    866 fi
    867 rm -fr conftest*
    868 
    869 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
    870 if test $ac_cv_prog_cc_works = no; then
    871   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
    872 fi
    873 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    874 echo "configure:875: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    875 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    876 cross_compiling=$ac_cv_prog_cc_cross
    877610
    878611echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    879 echo "configure:880: checking whether we are using GNU C" >&5
    880612if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    881613  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    886618#endif
    887619EOF
    888 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     620if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
    889621  ac_cv_prog_gcc=yes
    890622else
    … …  
    892624fi
    893625fi
    894 
    895626echo "$ac_t""$ac_cv_prog_gcc" 1>&6
    896 
    897627if test $ac_cv_prog_gcc = yes; then
    898628  GCC=yes
    899   ac_test_CFLAGS="${CFLAGS+set}"
    900   ac_save_CFLAGS="$CFLAGS"
    901   CFLAGS=
    902   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    903 echo "configure:904: checking whether ${CC-cc} accepts -g" >&5
    904 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
     629  if test "${CFLAGS+set}" != set; then
     630    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
     631if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
    905632  echo $ac_n "(cached) $ac_c" 1>&6
    906633else
    907634  echo 'void f(){}' > conftest.c
    908635if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
    909   ac_cv_prog_cc_g=yes
    910 else
    911   ac_cv_prog_cc_g=no
    912 fi
    913 rm -f conftest*
    914 
    915 fi
    916 
    917 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
    918   if test "$ac_test_CFLAGS" = set; then
    919     CFLAGS="$ac_save_CFLAGS"
    920   elif test $ac_cv_prog_cc_g = yes; then
    921     CFLAGS="-g -O2"
    922   else
    923     CFLAGS="-O2"
     636  ac_cv_prog_gcc_g=yes
     637else
     638  ac_cv_prog_gcc_g=no
     639fi
     640rm -f conftest*
     641
     642fi
     643    echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
     644    if test $ac_cv_prog_gcc_g = yes; then
     645      CFLAGS="-g -O"
     646    else
     647      CFLAGS="-O"
     648    fi
    924649  fi
    925650else
    … …  
    958683# ./install, which can be erroneously created by make from ./install.sh.
    959684echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    960 echo "configure:961: checking for a BSD compatible install" >&5
    961685if test -z "$INSTALL"; then
    962686if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    963687  echo $ac_n "(cached) $ac_c" 1>&6
    964688else
    965     IFS="${IFS=     }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
     689    IFS="${IFS=     }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    966690  for ac_dir in $PATH; do
    967691    # Account for people who put trailing slashes in PATH elements.
    … …  
    986710    esac
    987711  done
    988   IFS="$ac_save_IFS"
    989 
    990 fi
    991   if test "${ac_cv_path_install+set}" = set; then
    992     INSTALL="$ac_cv_path_install"
    993   else
    994     # As a last resort, use the slow shell script.  We don't cache a
    995     # path for INSTALL within a source directory, because that will
    996     # break other packages using the cache if that directory is
    997     # removed, or if the path is relative.
    998     INSTALL="$ac_install_sh"
    999   fi
     712  IFS="$ac_save_ifs"
     713  # As a last resort, use the slow shell script.
     714  test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
     715fi
     716  INSTALL="$ac_cv_path_install"
    1000717fi
    1001718echo "$ac_t""$INSTALL" 1>&6
    … …  
    1008725
    1009726echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
    1010 echo "configure:1011: checking whether ln -s works" >&5
    1011727if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    1012728  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    1029745
    1030746echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    1031 echo "configure:1032: checking whether ${MAKE-make} sets \${MAKE}" >&5
    1032 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
     747set dummy ${MAKE-make}; ac_make=$2
    1033748if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    1034749  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    1058773set dummy ranlib; ac_word=$2
    1059774echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1060 echo "configure:1061: checking for $ac_word" >&5
    1061775if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    1062776  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    1086800
    1087801echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1088 echo "configure:1089: checking how to run the C preprocessor" >&5
    1089802# On Suns, sometimes $CPP names a directory.
    1090803if test -n "$CPP" && test -d "$CPP"; then
    … …  
    1101814  # not just through cpp.
    1102815  cat > conftest.$ac_ext <<EOF
    1103 #line 1104 "configure"
     816#line 817 "configure"
    1104817#include "confdefs.h"
    1105818#include <assert.h>
    1106819Syntax Error
    1107820EOF
    1108 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1109 { (eval echo configure:1110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     821eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1110822ac_err=`grep -v '^ *+' conftest.out`
    1111823if test -z "$ac_err"; then
    … …  
    1113825else
    1114826  echo "$ac_err" >&5
    1115   echo "configure: failed program was:" >&5
    1116   cat conftest.$ac_ext >&5
    1117827  rm -rf conftest*
    1118828  CPP="${CC-cc} -E -traditional-cpp"
    1119829  cat > conftest.$ac_ext <<EOF
    1120 #line 1121 "configure"
     830#line 831 "configure"
    1121831#include "confdefs.h"
    1122832#include <assert.h>
    1123833Syntax Error
    1124834EOF
    1125 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1126 { (eval echo configure:1127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     835eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1127836ac_err=`grep -v '^ *+' conftest.out`
    1128837if test -z "$ac_err"; then
    … …  
    1130839else
    1131840  echo "$ac_err" >&5
    1132   echo "configure: failed program was:" >&5
    1133   cat conftest.$ac_ext >&5
    1134841  rm -rf conftest*
    1135842  CPP=/lib/cpp
    … …  
    1147854
    1148855echo $ac_n "checking for AIX""... $ac_c" 1>&6
    1149 echo "configure:1150: checking for AIX" >&5
    1150856cat > conftest.$ac_ext <<EOF
    1151 #line 1152 "configure"
     857#line 858 "configure"
    1152858#include "confdefs.h"
    1153859#ifdef _AIX
    … …  
    1171877
    1172878echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
    1173 echo "configure:1174: checking for POSIXized ISC" >&5
    1174879if test -d /etc/conf/kconfig.d &&
    1175880  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
    … …  
    1191896fi
    1192897
    1193 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
     898ac_safe=`echo "minix/config.h" | tr './\055' '___'`
    1194899echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
    1195 echo "configure:1196: checking for minix/config.h" >&5
    1196900if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    1197901  echo $ac_n "(cached) $ac_c" 1>&6
    1198902else
    1199903  cat > conftest.$ac_ext <<EOF
    1200 #line 1201 "configure"
     904#line 905 "configure"
    1201905#include "confdefs.h"
    1202906#include <minix/config.h>
    1203907EOF
    1204 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1205 { (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     908eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1206909ac_err=`grep -v '^ *+' conftest.out`
    1207910if test -z "$ac_err"; then
    … …  
    1210913else
    1211914  echo "$ac_err" >&5
    1212   echo "configure: failed program was:" >&5
    1213   cat conftest.$ac_ext >&5
    1214915  rm -rf conftest*
    1215916  eval "ac_cv_header_$ac_safe=no"
    … …  
    1241942
    1242943echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
    1243 echo "configure:1244: checking for ${CC-cc} option to accept ANSI C" >&5
    1244944if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
    1245945  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    1257957  CFLAGS="$ac_save_CFLAGS $ac_arg"
    1258958  cat > conftest.$ac_ext <<EOF
    1259 #line 1260 "configure"
     959#line 960 "configure"
    1260960#include "confdefs.h"
    1261961#if !defined(__STDC__) || __STDC__ != 1
    … …  
    1263963#endif 
    1264964
    1265 int main() {
     965int main() { return 0; }
     966int t() {
    1266967int test (int i, double x);
    1267968struct s1 {int (*f) (int a);};
    … …  
    1269970; return 0; }
    1270971EOF
    1271 if { (eval echo configure:1272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     972if eval $ac_compile; then
    1272973  rm -rf conftest*
    1273974  ac_cv_prog_cc_stdc="$ac_arg"; break
    1274 else
    1275   echo "configure: failed program was:" >&5
    1276   cat conftest.$ac_ext >&5
    1277 fi
    1278 rm -f conftest*
     975fi
     976rm -f conftest*
     977
    1279978done
    1280979CFLAGS="$ac_save_CFLAGS"
    … …  
    1290989
    1291990echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
    1292 echo "configure:1293: checking for function prototypes" >&5
    1293991if test "$ac_cv_prog_cc_stdc" != no; then
    1294992  echo "$ac_t""yes" 1>&6
    … …  
    13041002
    13051003echo $ac_n "checking for working const""... $ac_c" 1>&6
    1306 echo "configure:1307: checking for working const" >&5
    13071004if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    13081005  echo $ac_n "(cached) $ac_c" 1>&6
    13091006else
    13101007  cat > conftest.$ac_ext <<EOF
    1311 #line 1312 "configure"
    1312 #include "confdefs.h"
    1313 
    1314 int main() {
     1008#line 1009 "configure"
     1009#include "confdefs.h"
     1010
     1011int main() { return 0; }
     1012int t() {
    13151013
    13161014/* Ultrix mips cc rejects this.  */
    … …  
    13211019/* NEC SVR4.0.2 mips cc rejects this.  */
    13221020struct point {int x, y;};
    1323 static struct point const zero = {0,0};
     1021static struct point const zero;
    13241022/* AIX XL C 1.02.0.0 rejects this.
    13251023   It does not let you subtract one const X* pointer from another in an arm
    … …  
    13581056; return 0; }
    13591057EOF
    1360 if { (eval echo configure:1361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1058if eval $ac_compile; then
    13611059  rm -rf conftest*
    13621060  ac_cv_c_const=yes
    13631061else
    1364   echo "configure: failed program was:" >&5
    1365   cat conftest.$ac_ext >&5
    13661062  rm -rf conftest*
    13671063  ac_cv_c_const=no
    13681064fi
    13691065rm -f conftest*
    1370 fi
    1371 
     1066
     1067fi
    13721068echo "$ac_t""$ac_cv_c_const" 1>&6
    13731069if test $ac_cv_c_const = no; then
    … …  
    13781074fi
    13791075
     1076# If we cannot run a trivial program, we must be cross compiling.
     1077echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
     1078if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
     1079  echo $ac_n "(cached) $ac_c" 1>&6
     1080else
     1081  if test "$cross_compiling" = yes; then
     1082  ac_cv_c_cross=yes
     1083else
     1084cat > conftest.$ac_ext <<EOF
     1085#line 1086 "configure"
     1086#include "confdefs.h"
     1087main(){return(0);}
     1088EOF
     1089eval $ac_link
     1090if test -s conftest && (./conftest; exit) 2>/dev/null; then
     1091  ac_cv_c_cross=no
     1092else
     1093  ac_cv_c_cross=yes
     1094fi
     1095fi
     1096rm -fr conftest*
     1097fi
     1098cross_compiling=$ac_cv_c_cross
     1099echo "$ac_t""$ac_cv_c_cross" 1>&6
     1100
    13801101echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1381 echo "configure:1382: checking for ANSI C header files" >&5
    13821102if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    13831103  echo $ac_n "(cached) $ac_c" 1>&6
    13841104else
    13851105  cat > conftest.$ac_ext <<EOF
    1386 #line 1387 "configure"
     1106#line 1107 "configure"
    13871107#include "confdefs.h"
    13881108#include <stdlib.h>
    … …  
    13911111#include <float.h>
    13921112EOF
    1393 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1394 { (eval echo configure:1395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1113eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    13951114ac_err=`grep -v '^ *+' conftest.out`
    13961115if test -z "$ac_err"; then
    … …  
    13991118else
    14001119  echo "$ac_err" >&5
    1401   echo "configure: failed program was:" >&5
    1402   cat conftest.$ac_ext >&5
    14031120  rm -rf conftest*
    14041121  ac_cv_header_stdc=no
    … …  
    14091126  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    14101127cat > conftest.$ac_ext <<EOF
    1411 #line 1412 "configure"
     1128#line 1129 "configure"
    14121129#include "confdefs.h"
    14131130#include <string.h>
    … …  
    14271144  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    14281145cat > conftest.$ac_ext <<EOF
    1429 #line 1430 "configure"
     1146#line 1147 "configure"
    14301147#include "confdefs.h"
    14311148#include <stdlib.h>
    … …  
    14451162  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
    14461163if test "$cross_compiling" = yes; then
    1447   :
    1448 else
    1449   cat > conftest.$ac_ext <<EOF
    1450 #line 1451 "configure"
     1164  ac_cv_header_stdc=no
     1165else
     1166cat > conftest.$ac_ext <<EOF
     1167#line 1168 "configure"
    14511168#include "confdefs.h"
    14521169#include <ctype.h>
    … …  
    14591176
    14601177EOF
    1461 if { (eval echo configure:1462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    1462 then
     1178eval $ac_link
     1179if test -s conftest && (./conftest; exit) 2>/dev/null; then
    14631180  :
    14641181else
    1465   echo "configure: failed program was:" >&5
    1466   cat conftest.$ac_ext >&5
    1467   rm -fr conftest*
    14681182  ac_cv_header_stdc=no
    14691183fi
     1184fi
    14701185rm -fr conftest*
    14711186fi
    1472 
    1473 fi
    1474 fi
    1475 
     1187fi
    14761188echo "$ac_t""$ac_cv_header_stdc" 1>&6
    14771189if test $ac_cv_header_stdc = yes; then
    … …  
    14831195
    14841196echo $ac_n "checking for off_t""... $ac_c" 1>&6
    1485 echo "configure:1486: checking for off_t" >&5
    14861197if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    14871198  echo $ac_n "(cached) $ac_c" 1>&6
    14881199else
    14891200  cat > conftest.$ac_ext <<EOF
    1490 #line 1491 "configure"
     1201#line 1202 "configure"
    14911202#include "confdefs.h"
    14921203#include <sys/types.h>
    14931204#if STDC_HEADERS
    14941205#include <stdlib.h>
    1495 #include <stddef.h>
    14961206#endif
    14971207EOF
    14981208if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    1499   egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     1209  egrep "off_t" >/dev/null 2>&1; then
    15001210  rm -rf conftest*
    15011211  ac_cv_type_off_t=yes
    … …  
    15161226
    15171227echo $ac_n "checking for size_t""... $ac_c" 1>&6
    1518 echo "configure:1519: checking for size_t" >&5
    15191228if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    15201229  echo $ac_n "(cached) $ac_c" 1>&6
    15211230else
    15221231  cat > conftest.$ac_ext <<EOF
    1523 #line 1524 "configure"
     1232#line 1233 "configure"
    15241233#include "confdefs.h"
    15251234#include <sys/types.h>
    15261235#if STDC_HEADERS
    15271236#include <stdlib.h>
    1528 #include <stddef.h>
    15291237#endif
    15301238EOF
    15311239if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    1532   egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     1240  egrep "size_t" >/dev/null 2>&1; then
    15331241  rm -rf conftest*
    15341242  ac_cv_type_size_t=yes
    … …  
    15491257
    15501258echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
    1551 echo "configure:1552: checking whether time.h and sys/time.h may both be included" >&5
    15521259if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    15531260  echo $ac_n "(cached) $ac_c" 1>&6
    15541261else
    15551262  cat > conftest.$ac_ext <<EOF
    1556 #line 1557 "configure"
     1263#line 1264 "configure"
    15571264#include "confdefs.h"
    15581265#include <sys/types.h>
    15591266#include <sys/time.h>
    15601267#include <time.h>
    1561 int main() {
     1268int main() { return 0; }
     1269int t() {
    15621270struct tm *tp;
    15631271; return 0; }
    15641272EOF
    1565 if { (eval echo configure:1566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1273if eval $ac_compile; then
    15661274  rm -rf conftest*
    15671275  ac_cv_header_time=yes
    15681276else
    1569   echo "configure: failed program was:" >&5
    1570   cat conftest.$ac_ext >&5
    15711277  rm -rf conftest*
    15721278  ac_cv_header_time=no
    15731279fi
    15741280rm -f conftest*
    1575 fi
    1576 
     1281
     1282fi
    15771283echo "$ac_t""$ac_cv_header_time" 1>&6
    15781284if test $ac_cv_header_time = yes; then
    … …  
    15841290
    15851291echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
    1586 echo "configure:1587: checking whether struct tm is in sys/time.h or time.h" >&5
    15871292if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    15881293  echo $ac_n "(cached) $ac_c" 1>&6
    15891294else
    15901295  cat > conftest.$ac_ext <<EOF
    1591 #line 1592 "configure"
     1296#line 1297 "configure"
    15921297#include "confdefs.h"
    15931298#include <sys/types.h>
    15941299#include <time.h>
    1595 int main() {
     1300int main() { return 0; }
     1301int t() {
    15961302struct tm *tp; tp->tm_sec;
    15971303; return 0; }
    15981304EOF
    1599 if { (eval echo configure:1600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1305if eval $ac_compile; then
    16001306  rm -rf conftest*
    16011307  ac_cv_struct_tm=time.h
    16021308else
    1603   echo "configure: failed program was:" >&5
    1604   cat conftest.$ac_ext >&5
    16051309  rm -rf conftest*
    16061310  ac_cv_struct_tm=sys/time.h
    16071311fi
    16081312rm -f conftest*
    1609 fi
    1610 
     1313
     1314fi
    16111315echo "$ac_t""$ac_cv_struct_tm" 1>&6
    16121316if test $ac_cv_struct_tm = sys/time.h; then
    … …  
    16201324if test "$ac_cv_prog_cc_stdc" = '-Xc'; then
    16211325cat > conftest.$ac_ext <<EOF
    1622 #line 1623 "configure"
     1326#line 1327 "configure"
    16231327#include "confdefs.h"
    16241328#include <stdio.h>
    16251329
    1626 int main() {
     1330int main() { return 0; }
     1331int t() {
    16271332 FILE *rubbish = popen("yes", "r");
    16281333; return 0; }
    16291334EOF
    1630 if { (eval echo configure:1631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1335if eval $ac_compile; then
    16311336  :
    16321337else
    1633   echo "configure: failed program was:" >&5
    1634   cat conftest.$ac_ext >&5
    16351338  rm -rf conftest*
    16361339  CC="`echo $CC | sed 's/-Xc/-Xa/'`"    ac_cv_prog_cc_stdc='-Xa'
    16371340fi
    16381341rm -f conftest*
    1639 fi
    1640 
    1641 
    1642 echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
    1643 echo "configure:1644: checking for main in -lm" >&5
    1644 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
    1645 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     1342
     1343fi
     1344
     1345
     1346echo $ac_n "checking for -lm""... $ac_c" 1>&6
     1347if eval "test \"`echo '$''{'ac_cv_lib_m'+set}'`\" = set"; then
    16461348  echo $ac_n "(cached) $ac_c" 1>&6
    16471349else
    … …  
    16491351LIBS="-lm  $LIBS"
    16501352cat > conftest.$ac_ext <<EOF
    1651 #line 1652 "configure"
    1652 #include "confdefs.h"
    1653 
    1654 int main() {
     1353#line 1354 "configure"
     1354#include "confdefs.h"
     1355
     1356int main() { return 0; }
     1357int t() {
    16551358main()
    16561359; return 0; }
    16571360EOF
    1658 if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    1659   rm -rf conftest*
    1660   eval "ac_cv_lib_$ac_lib_var=yes"
    1661 else
    1662   echo "configure: failed program was:" >&5
    1663   cat conftest.$ac_ext >&5
    1664   rm -rf conftest*
    1665   eval "ac_cv_lib_$ac_lib_var=no"
     1361if eval $ac_link; then
     1362  rm -rf conftest*
     1363  eval "ac_cv_lib_m=yes"
     1364else
     1365  rm -rf conftest*
     1366  eval "ac_cv_lib_m=no"
    16661367fi
    16671368rm -f conftest*
    … …  
    16691370
    16701371fi
    1671 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
     1372if eval "test \"`echo '$ac_cv_lib_'m`\" = yes"; then
    16721373  echo "$ac_t""yes" 1>&6
    1673     ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
    1674     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
     1374    ac_tr_lib=HAVE_LIB`echo m | tr '[a-z]' '[A-Z]'`
    16751375  cat >> confdefs.h <<EOF
    16761376#define $ac_tr_lib 1
    … …  
    16871387for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
    16881388do
    1689 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
     1389ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
    16901390echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
    1691 echo "configure:1692: checking for $ac_hdr that defines DIR" >&5
    16921391if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    16931392  echo $ac_n "(cached) $ac_c" 1>&6
    16941393else
    16951394  cat > conftest.$ac_ext <<EOF
    1696 #line 1697 "configure"
     1395#line 1396 "configure"
    16971396#include "confdefs.h"
    16981397#include <sys/types.h>
    16991398#include <$ac_hdr>
    1700 int main() {
     1399int main() { return 0; }
     1400int t() {
    17011401DIR *dirp = 0;
    17021402; return 0; }
    17031403EOF
    1704 if { (eval echo configure:1705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1404if eval $ac_compile; then
    17051405  rm -rf conftest*
    17061406  eval "ac_cv_header_dirent_$ac_safe=yes"
    17071407else
    1708   echo "configure: failed program was:" >&5
    1709   cat conftest.$ac_ext >&5
    17101408  rm -rf conftest*
    17111409  eval "ac_cv_header_dirent_$ac_safe=no"
    17121410fi
    17131411rm -f conftest*
     1412
    17141413fi
    17151414if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
    17161415  echo "$ac_t""yes" 1>&6
    1717     ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
     1416    ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    17181417  cat >> confdefs.h <<EOF
    17191418#define $ac_tr_hdr 1
    … …  
    17261425# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
    17271426if test $ac_header_dirent = dirent.h; then
    1728 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
    1729 echo "configure:1730: checking for opendir in -ldir" >&5
    1730 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
    1731 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     1427echo $ac_n "checking for -ldir""... $ac_c" 1>&6
     1428if eval "test \"`echo '$''{'ac_cv_lib_dir'+set}'`\" = set"; then
    17321429  echo $ac_n "(cached) $ac_c" 1>&6
    17331430else
    … …  
    17351432LIBS="-ldir  $LIBS"
    17361433cat > conftest.$ac_ext <<EOF
    1737 #line 1738 "configure"
    1738 #include "confdefs.h"
    1739 /* Override any gcc2 internal prototype to avoid an error.  */
    1740 /* We use char because int might match the return type of a gcc2
    1741     builtin and then its argument prototype would still apply.  */
    1742 char opendir();
    1743 
    1744 int main() {
     1434#line 1435 "configure"
     1435#include "confdefs.h"
     1436
     1437int main() { return 0; }
     1438int t() {
    17451439opendir()
    17461440; return 0; }
    17471441EOF
    1748 if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    1749   rm -rf conftest*
    1750   eval "ac_cv_lib_$ac_lib_var=yes"
    1751 else
    1752   echo "configure: failed program was:" >&5
    1753   cat conftest.$ac_ext >&5
    1754   rm -rf conftest*
    1755   eval "ac_cv_lib_$ac_lib_var=no"
     1442if eval $ac_link; then
     1443  rm -rf conftest*
     1444  eval "ac_cv_lib_dir=yes"
     1445else
     1446  rm -rf conftest*
     1447  eval "ac_cv_lib_dir=no"
    17561448fi
    17571449rm -f conftest*
    … …  
    17591451
    17601452fi
    1761 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
     1453if eval "test \"`echo '$ac_cv_lib_'dir`\" = yes"; then
    17621454  echo "$ac_t""yes" 1>&6
    17631455  LIBS="$LIBS -ldir"
    … …  
    17671459
    17681460else
    1769 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
    1770 echo "configure:1771: checking for opendir in -lx" >&5
    1771 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
    1772 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     1461echo $ac_n "checking for -lx""... $ac_c" 1>&6
     1462if eval "test \"`echo '$''{'ac_cv_lib_x'+set}'`\" = set"; then
    17731463  echo $ac_n "(cached) $ac_c" 1>&6
    17741464else
    … …  
    17761466LIBS="-lx  $LIBS"
    17771467cat > conftest.$ac_ext <<EOF
    1778 #line 1779 "configure"
    1779 #include "confdefs.h"
    1780 /* Override any gcc2 internal prototype to avoid an error.  */
    1781 /* We use char because int might match the return type of a gcc2
    1782     builtin and then its argument prototype would still apply.  */
    1783 char opendir();
    1784 
    1785 int main() {
     1468#line 1469 "configure"
     1469#include "confdefs.h"
     1470
     1471int main() { return 0; }
     1472int t() {
    17861473opendir()
    17871474; return 0; }
    17881475EOF
    1789 if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    1790   rm -rf conftest*
    1791   eval "ac_cv_lib_$ac_lib_var=yes"
    1792 else
    1793   echo "configure: failed program was:" >&5
    1794   cat conftest.$ac_ext >&5
    1795   rm -rf conftest*
    1796   eval "ac_cv_lib_$ac_lib_var=no"
     1476if eval $ac_link; then
     1477  rm -rf conftest*
     1478  eval "ac_cv_lib_x=yes"
     1479else
     1480  rm -rf conftest*
     1481  eval "ac_cv_lib_x=no"
    17971482fi
    17981483rm -f conftest*
    … …  
    18001485
    18011486fi
    1802 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
     1487if eval "test \"`echo '$ac_cv_lib_'x`\" = yes"; then
    18031488  echo "$ac_t""yes" 1>&6
    18041489  LIBS="$LIBS -lx"
    … …  
    18101495
    18111496echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1812 echo "configure:1813: checking for ANSI C header files" >&5
    18131497if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    18141498  echo $ac_n "(cached) $ac_c" 1>&6
    18151499else
    18161500  cat > conftest.$ac_ext <<EOF
    1817 #line 1818 "configure"
     1501#line 1502 "configure"
    18181502#include "confdefs.h"
    18191503#include <stdlib.h>
    … …  
    18221506#include <float.h>
    18231507EOF
    1824 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1825 { (eval echo configure:1826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1508eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    18261509ac_err=`grep -v '^ *+' conftest.out`
    18271510if test -z "$ac_err"; then
    … …  
    18301513else
    18311514  echo "$ac_err" >&5
    1832   echo "configure: failed program was:" >&5
    1833   cat conftest.$ac_ext >&5
    18341515  rm -rf conftest*
    18351516  ac_cv_header_stdc=no
    … …  
    18401521  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    18411522cat > conftest.$ac_ext <<EOF
    1842 #line 1843 "configure"
     1523#line 1524 "configure"
    18431524#include "confdefs.h"
    18441525#include <string.h>
    … …  
    18581539  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    18591540cat > conftest.$ac_ext <<EOF
    1860 #line 1861 "configure"
     1541#line 1542 "configure"
    18611542#include "confdefs.h"
    18621543#include <stdlib.h>
    … …  
    18761557  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
    18771558if test "$cross_compiling" = yes; then
    1878   :
    1879 else
    1880   cat > conftest.$ac_ext <<EOF
    1881 #line 1882 "configure"
     1559  ac_cv_header_stdc=no
     1560else
     1561cat > conftest.$ac_ext <<EOF
     1562#line 1563 "configure"
    18821563#include "confdefs.h"
    18831564#include <ctype.h>
    … …  
    18901571
    18911572EOF
    1892 if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    1893 then
     1573eval $ac_link
     1574if test -s conftest && (./conftest; exit) 2>/dev/null; then
    18941575  :
    18951576else
    1896   echo "configure: failed program was:" >&5
    1897   cat conftest.$ac_ext >&5
    1898   rm -fr conftest*
    18991577  ac_cv_header_stdc=no
    19001578fi
     1579fi
    19011580rm -fr conftest*
    19021581fi
    1903 
    1904 fi
    1905 fi
    1906 
     1582fi
    19071583echo "$ac_t""$ac_cv_header_stdc" 1>&6
    19081584if test $ac_cv_header_stdc = yes; then
    … …  
    19151591for ac_hdr in fcntl.h limits.h sys/time.h unistd.h string.h memory.h sys/procfs.h
    19161592do
    1917 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
     1593ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
    19181594echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1919 echo "configure:1920: checking for $ac_hdr" >&5
    19201595if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    19211596  echo $ac_n "(cached) $ac_c" 1>&6
    19221597else
    19231598  cat > conftest.$ac_ext <<EOF
    1924 #line 1925 "configure"
     1599#line 1600 "configure"
    19251600#include "confdefs.h"
    19261601#include <$ac_hdr>
    19271602EOF
    1928 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1929 { (eval echo configure:1930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1603eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    19301604ac_err=`grep -v '^ *+' conftest.out`
    19311605if test -z "$ac_err"; then
    … …  
    19341608else
    19351609  echo "$ac_err" >&5
    1936   echo "configure: failed program was:" >&5
    1937   cat conftest.$ac_ext >&5
    19381610  rm -rf conftest*
    19391611  eval "ac_cv_header_$ac_safe=no"
    … …  
    19431615if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    19441616  echo "$ac_t""yes" 1>&6
    1945     ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
     1617    ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
    19461618  cat >> confdefs.h <<EOF
    19471619#define $ac_tr_hdr 1
    … …  
    19541626
    19551627cat > conftest.$ac_ext <<EOF
    1956 #line 1957 "configure"
     1628#line 1629 "configure"
    19571629#include "confdefs.h"
    19581630#include <stdio.h>
    … …  
    19691641
    19701642cat > conftest.$ac_ext <<EOF
    1971 #line 1972 "configure"
     1643#line 1644 "configure"
    19721644#include "confdefs.h"
    19731645#include <stdio.h>
    … …  
    19841656
    19851657cat > conftest.$ac_ext <<EOF
    1986 #line 1987 "configure"
     1658#line 1659 "configure"
    19871659#include "confdefs.h"
    19881660#include <sys/procfs.h>
    … …  
    20021674# for constant arguments.  Useless!
    20031675echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
    2004 echo "configure:2005: checking for working alloca.h" >&5
    20051676if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    20061677  echo $ac_n "(cached) $ac_c" 1>&6
    20071678else
    20081679  cat > conftest.$ac_ext <<EOF
    2009 #line 2010 "configure"
     1680#line 1681 "configure"
    20101681#include "confdefs.h"
    20111682#include <alloca.h>
    2012 int main() {
     1683int main() { return 0; }
     1684int t() {
    20131685char *p = alloca(2 * sizeof(int));
    20141686; return 0; }
    20151687EOF
    2016 if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1688if eval $ac_link; then
    20171689  rm -rf conftest*
    20181690  ac_cv_header_alloca_h=yes
    20191691else
    2020   echo "configure: failed program was:" >&5
    2021   cat conftest.$ac_ext >&5
    20221692  rm -rf conftest*
    20231693  ac_cv_header_alloca_h=no
    20241694fi
    20251695rm -f conftest*
    2026 fi
    2027 
     1696
     1697fi
    20281698echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
    20291699if test $ac_cv_header_alloca_h = yes; then
    … …  
    20351705
    20361706echo $ac_n "checking for alloca""... $ac_c" 1>&6
    2037 echo "configure:2038: checking for alloca" >&5
    2038 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
     1707if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
    20391708  echo $ac_n "(cached) $ac_c" 1>&6
    20401709else
    20411710  cat > conftest.$ac_ext <<EOF
    2042 #line 2043 "configure"
     1711#line 1712 "configure"
    20431712#include "confdefs.h"
    20441713
    … …  
    20591728#endif
    20601729
    2061 int main() {
     1730int main() { return 0; }
     1731int t() {
    20621732char *p = (char *) alloca(1);
    20631733; return 0; }
    20641734EOF
    2065 if { (eval echo configure:2066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    2066   rm -rf conftest*
    2067   ac_cv_func_alloca_works=yes
    2068 else
    2069   echo "configure: failed program was:" >&5
    2070   cat conftest.$ac_ext >&5
    2071   rm -rf conftest*
    2072   ac_cv_func_alloca_works=no
    2073 fi
    2074 rm -f conftest*
    2075 fi
    2076 
    2077 echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
    2078 if test $ac_cv_func_alloca_works = yes; then
     1735if eval $ac_link; then
     1736  rm -rf conftest*
     1737  ac_cv_func_alloca=yes
     1738else
     1739  rm -rf conftest*
     1740  ac_cv_func_alloca=no
     1741fi
     1742rm -f conftest*
     1743
     1744fi
     1745echo "$ac_t""$ac_cv_func_alloca" 1>&6
     1746if test $ac_cv_func_alloca = yes; then
    20791747  cat >> confdefs.h <<\EOF
    20801748#define HAVE_ALLOCA 1
    … …  
    20831751fi
    20841752
    2085 if test $ac_cv_func_alloca_works = no; then
     1753if test $ac_cv_func_alloca = no; then
    20861754  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
    20871755  # that cause trouble.  Some versions do not even contain alloca or
    … …  
    20951763
    20961764echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
    2097 echo "configure:2098: checking whether alloca needs Cray hooks" >&5
    20981765if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    20991766  echo $ac_n "(cached) $ac_c" 1>&6
    21001767else
    21011768  cat > conftest.$ac_ext <<EOF
    2102 #line 2103 "configure"
     1769#line 1770 "configure"
    21031770#include "confdefs.h"
    21041771#if defined(CRAY) && ! defined(CRAY2)
    … …  
    21201787
    21211788fi
    2122 
    21231789echo "$ac_t""$ac_cv_os_cray" 1>&6
    21241790if test $ac_cv_os_cray = yes; then
    21251791for ac_func in _getb67 GETB67 getb67; do
    21261792  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2127 echo "configure:2128: checking for $ac_func" >&5
    21281793if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    21291794  echo $ac_n "(cached) $ac_c" 1>&6
    21301795else
    21311796  cat > conftest.$ac_ext <<EOF
    2132 #line 2133 "configure"
     1797#line 1798 "configure"
    21331798#include "confdefs.h"
    21341799/* System header to define __stub macros and hopefully few prototypes,
    … …  
    21361801#include <assert.h>
    21371802/* Override any gcc2 internal prototype to avoid an error.  */
    2138 /* We use char because int might match the return type of a gcc2
    2139     builtin and then its argument prototype would still apply.  */
    2140 char $ac_func();
    2141 
    2142 int main() {
     1803char $ac_func();
     1804
     1805int main() { return 0; }
     1806int t() {
    21431807
    21441808/* The GNU C library defines this for functions which it implements
    … …  
    21531817; return 0; }
    21541818EOF
    2155 if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1819if eval $ac_link; then
    21561820  rm -rf conftest*
    21571821  eval "ac_cv_func_$ac_func=yes"
    21581822else
    2159   echo "configure: failed program was:" >&5
    2160   cat conftest.$ac_ext >&5
    21611823  rm -rf conftest*
    21621824  eval "ac_cv_func_$ac_func=no"
    21631825fi
    21641826rm -f conftest*
    2165 fi
    2166 
     1827
     1828fi
    21671829if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
    21681830  echo "$ac_t""yes" 1>&6
    … …  
    21801842
    21811843echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
    2182 echo "configure:2183: checking stack direction for C alloca" >&5
    21831844if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    21841845  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    21871848  ac_cv_c_stack_direction=0
    21881849else
    2189   cat > conftest.$ac_ext <<EOF
    2190 #line 2191 "configure"
     1850cat > conftest.$ac_ext <<EOF
     1851#line 1852 "configure"
    21911852#include "confdefs.h"
    21921853find_stack_direction ()
    … …  
    22071868}
    22081869EOF
    2209 if { (eval echo configure:2210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    2210 then
     1870eval $ac_link
     1871if test -s conftest && (./conftest; exit) 2>/dev/null; then
    22111872  ac_cv_c_stack_direction=1
    22121873else
    2213   echo "configure: failed program was:" >&5
    2214   cat conftest.$ac_ext >&5
    2215   rm -fr conftest*
    22161874  ac_cv_c_stack_direction=-1
    22171875fi
     1876fi
    22181877rm -fr conftest*
    22191878fi
    2220 
    2221 fi
    2222 
    22231879echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
    22241880cat >> confdefs.h <<EOF
    … …  
    22291885
    22301886if test $ac_cv_prog_gcc = yes; then
    2231     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
    2232 echo "configure:2233: checking whether ${CC-cc} needs -traditional" >&5
     1887  echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
    22331888if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    22341889  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    22361891    ac_pattern="Autoconf.*'x'"
    22371892  cat > conftest.$ac_ext <<EOF
    2238 #line 2239 "configure"
     1893#line 1894 "configure"
    22391894#include "confdefs.h"
    22401895#include <sgtty.h>
    … …  
    22541909  if test $ac_cv_prog_gcc_traditional = no; then
    22551910    cat > conftest.$ac_ext <<EOF
    2256 #line 2257 "configure"
     1911#line 1912 "configure"
    22571912#include "confdefs.h"
    22581913#include <termio.h>
    … …  
    22681923  fi
    22691924fi
    2270 
    2271 echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
     1925  echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
    22721926  if test $ac_cv_prog_gcc_traditional = yes; then
    22731927    CC="$CC -traditional"
    … …  
    22761930
    22771931echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
    2278 echo "configure:2279: checking return type of signal handlers" >&5
    22791932if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    22801933  echo $ac_n "(cached) $ac_c" 1>&6
    22811934else
    22821935  cat > conftest.$ac_ext <<EOF
    2283 #line 2284 "configure"
     1936#line 1937 "configure"
    22841937#include "confdefs.h"
    22851938#include <sys/types.h>
    … …  
    22891942#endif
    22901943#ifdef __cplusplus
    2291 extern "C" void (*signal (int, void (*)(int)))(int);
    2292 #else
     1944extern "C"
     1945#endif
    22931946void (*signal ()) ();
    2294 #endif
    2295 
    2296 int main() {
     1947int main() { return 0; }
     1948int t() {
    22971949int i;
    22981950; return 0; }
    22991951EOF
    2300 if { (eval echo configure:2301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1952if eval $ac_compile; then
    23011953  rm -rf conftest*
    23021954  ac_cv_type_signal=void
    23031955else
    2304   echo "configure: failed program was:" >&5
    2305   cat conftest.$ac_ext >&5
    23061956  rm -rf conftest*
    23071957  ac_cv_type_signal=int
    23081958fi
    23091959rm -f conftest*
    2310 fi
    2311 
     1960
     1961fi
    23121962echo "$ac_t""$ac_cv_type_signal" 1>&6
    23131963cat >> confdefs.h <<EOF
    … …  
    23171967
    23181968echo $ac_n "checking for vprintf""... $ac_c" 1>&6
    2319 echo "configure:2320: checking for vprintf" >&5
    23201969if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    23211970  echo $ac_n "(cached) $ac_c" 1>&6
    23221971else
    23231972  cat > conftest.$ac_ext <<EOF
    2324 #line 2325 "configure"
     1973#line 1974 "configure"
    23251974#include "confdefs.h"
    23261975/* System header to define __stub macros and hopefully few prototypes,
    … …  
    23281977#include <assert.h>
    23291978/* Override any gcc2 internal prototype to avoid an error.  */
    2330 /* We use char because int might match the return type of a gcc2
    2331     builtin and then its argument prototype would still apply.  */
    2332 char vprintf();
    2333 
    2334 int main() {
     1979char vprintf();
     1980
     1981int main() { return 0; }
     1982int t() {
    23351983
    23361984/* The GNU C library defines this for functions which it implements
    … …  
    23451993; return 0; }
    23461994EOF
    2347 if { (eval echo configure:2348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1995if eval $ac_link; then
    23481996  rm -rf conftest*
    23491997  eval "ac_cv_func_vprintf=yes"
    23501998else
    2351   echo "configure: failed program was:" >&5
    2352   cat conftest.$ac_ext >&5
    23531999  rm -rf conftest*
    23542000  eval "ac_cv_func_vprintf=no"
    23552001fi
    23562002rm -f conftest*
    2357 fi
    2358 
     2003
     2004fi
    23592005if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
    23602006  echo "$ac_t""yes" 1>&6
    … …  
    23692015if test "$ac_cv_func_vprintf" != yes; then
    23702016echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
    2371 echo "configure:2372: checking for _doprnt" >&5
    23722017if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    23732018  echo $ac_n "(cached) $ac_c" 1>&6
    23742019else
    23752020  cat > conftest.$ac_ext <<EOF
    2376 #line 2377 "configure"
     2021#line 2022 "configure"
    23772022#include "confdefs.h"
    23782023/* System header to define __stub macros and hopefully few prototypes,
    … …  
    23802025#include <assert.h>
    23812026/* Override any gcc2 internal prototype to avoid an error.  */
    2382 /* We use char because int might match the return type of a gcc2
    2383     builtin and then its argument prototype would still apply.  */
    2384 char _doprnt();
    2385 
    2386 int main() {
     2027char _doprnt();
     2028
     2029int main() { return 0; }
     2030int t() {
    23872031
    23882032/* The GNU C library defines this for functions which it implements
    … …  
    23972041; return 0; }
    23982042EOF
    2399 if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2043if eval $ac_link; then
    24002044  rm -rf conftest*
    24012045  eval "ac_cv_func__doprnt=yes"
    24022046else
    2403   echo "configure: failed program was:" >&5
    2404   cat conftest.$ac_ext >&5
    24052047  rm -rf conftest*
    24062048  eval "ac_cv_func__doprnt=no"
    24072049fi
    24082050rm -f conftest*
    2409 fi
    2410 
     2051
     2052fi
    24112053if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
    24122054  echo "$ac_t""yes" 1>&6
    … …  
    24242066do
    24252067echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2426 echo "configure:2427: checking for $ac_func" >&5
    24272068if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    24282069  echo $ac_n "(cached) $ac_c" 1>&6
    24292070else
    24302071  cat > conftest.$ac_ext <<EOF
    2431 #line 2432 "configure"
     2072#line 2073 "configure"
    24322073#include "confdefs.h"
    24332074/* System header to define __stub macros and hopefully few prototypes,
    … …  
    24352076#include <assert.h>
    24362077/* Override any gcc2 internal prototype to avoid an error.  */
    2437 /* We use char because int might match the return type of a gcc2
    2438     builtin and then its argument prototype would still apply.  */
    2439 char $ac_func();
    2440 
    2441 int main() {
     2078char $ac_func();
     2079
     2080int main() { return 0; }
     2081int t() {
    24422082
    24432083/* The GNU C library defines this for functions which it implements
    … …  
    24522092; return 0; }
    24532093EOF
    2454 if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2094if eval $ac_link; then
    24552095  rm -rf conftest*
    24562096  eval "ac_cv_func_$ac_func=yes"
    24572097else
    2458   echo "configure: failed program was:" >&5
    2459   cat conftest.$ac_ext >&5
    24602098  rm -rf conftest*
    24612099  eval "ac_cv_func_$ac_func=no"
    24622100fi
    24632101rm -f conftest*
    2464 fi
    2465 
     2102
     2103fi
    24662104if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
    24672105  echo "$ac_t""yes" 1>&6
    2468     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
     2106    ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
    24692107  cat >> confdefs.h <<EOF
    24702108#define $ac_tr_func 1
    … …  
    24792117do
    24802118echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2481 echo "configure:2482: checking for $ac_func" >&5
    24822119if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    24832120  echo $ac_n "(cached) $ac_c" 1>&6
    24842121else
    24852122  cat > conftest.$ac_ext <<EOF
    2486 #line 2487 "configure"
     2123#line 2124 "configure"
    24872124#include "confdefs.h"
    24882125/* System header to define __stub macros and hopefully few prototypes,
    … …  
    24902127#include <assert.h>
    24912128/* Override any gcc2 internal prototype to avoid an error.  */
    2492 /* We use char because int might match the return type of a gcc2
    2493     builtin and then its argument prototype would still apply.  */
    2494 char $ac_func();
    2495 
    2496 int main() {
     2129char $ac_func();
     2130
     2131int main() { return 0; }
     2132int t() {
    24972133
    24982134/* The GNU C library defines this for functions which it implements
    … …  
    25072143; return 0; }
    25082144EOF
    2509 if { (eval echo configure:2510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2145if eval $ac_link; then
    25102146  rm -rf conftest*
    25112147  eval "ac_cv_func_$ac_func=yes"
    25122148else
    2513   echo "configure: failed program was:" >&5
    2514   cat conftest.$ac_ext >&5
    25152149  rm -rf conftest*
    25162150  eval "ac_cv_func_$ac_func=no"
    25172151fi
    25182152rm -f conftest*
    2519 fi
    2520 
     2153
     2154fi
    25212155if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
    25222156  echo "$ac_t""yes" 1>&6
    2523     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
    2524   cat >> confdefs.h <<EOF
    2525 #define $ac_tr_func 1
    2526 EOF
    2527  
     2157  :
    25282158else
    25292159  echo "$ac_t""no" 1>&6
    25302160LIBOBJS="$LIBOBJS ${ac_func}.o"
    25312161fi
     2162
    25322163done
    2533 
    25342164
    25352165
    … …  
    25382168# ---------------------------------------------------------------------------
    25392169echo $ac_n "checking for HP-UX needing gmalloc""... $ac_c" 1>&6
    2540 echo "configure:2541: checking for HP-UX needing gmalloc" >&5
    25412170if test "`(uname -s) 2> /dev/null`" = 'HP-UX'; then
    25422171  echo "$ac_t""yes" 1>&6
    … …  
    25512180do
    25522181echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2553 echo "configure:2554: checking for $ac_func" >&5
    25542182if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    25552183  echo $ac_n "(cached) $ac_c" 1>&6
    25562184else
    25572185  cat > conftest.$ac_ext <<EOF
    2558 #line 2559 "configure"
     2186#line 2187 "configure"
    25592187#include "confdefs.h"
    25602188/* System header to define __stub macros and hopefully few prototypes,
    … …  
    25622190#include <assert.h>
    25632191/* Override any gcc2 internal prototype to avoid an error.  */
    2564 /* We use char because int might match the return type of a gcc2
    2565     builtin and then its argument prototype would still apply.  */
    2566 char $ac_func();
    2567 
    2568 int main() {
     2192char $ac_func();
     2193
     2194int main() { return 0; }
     2195int t() {
    25692196
    25702197/* The GNU C library defines this for functions which it implements
    … …  
    25792206; return 0; }
    25802207EOF
    2581 if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2208if eval $ac_link; then
    25822209  rm -rf conftest*
    25832210  eval "ac_cv_func_$ac_func=yes"
    25842211else
    2585   echo "configure: failed program was:" >&5
    2586   cat conftest.$ac_ext >&5
    25872212  rm -rf conftest*
    25882213  eval "ac_cv_func_$ac_func=no"
    25892214fi
    25902215rm -f conftest*
    2591 fi
    2592 
     2216
     2217fi
    25932218if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
    25942219  echo "$ac_t""yes" 1>&6
    2595     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
     2220    ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
    25962221  cat >> confdefs.h <<EOF
    25972222#define $ac_tr_func 1
    … …  
    26062231
    26072232echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6
    2608 echo "configure:2609: checking if malloc debugging is wanted" >&5
    26092233# Check whether --with-dmalloc or --without-dmalloc was given.
    2610 if test "${with_dmalloc+set}" = set; then
    2611   withval="$with_dmalloc"
     2234withval="$with_dmalloc"
     2235if test -n "$withval"; then
    26122236  if test "$withval" = yes; then
    26132237  echo "$ac_t""yes" 1>&6
    … …  
    26272251
    26282252echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6
    2629 echo "configure:2630: checking which of rx or regex is wanted" >&5
    26302253# Check whether --with-regex or --without-regex was given.
    2631 if test "${with_regex+set}" = set; then
    2632   withval="$with_regex"
     2254withval="$with_regex"
     2255if test -n "$withval"; then
    26332256  if test "$withval" = yes; then
    26342257  ac_with_regex=1
    … …  
    26452268  echo "$ac_t""rx" 1>&6
    26462269  echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6
    2647 echo "configure:2648: checking for re_rx_search" >&5
    26482270if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then
    26492271  echo $ac_n "(cached) $ac_c" 1>&6
    26502272else
    26512273  cat > conftest.$ac_ext <<EOF
    2652 #line 2653 "configure"
     2274#line 2275 "configure"
    26532275#include "confdefs.h"
    26542276/* System header to define __stub macros and hopefully few prototypes,
    … …  
    26562278#include <assert.h>
    26572279/* Override any gcc2 internal prototype to avoid an error.  */
    2658 /* We use char because int might match the return type of a gcc2
    2659     builtin and then its argument prototype would still apply.  */
    2660 char re_rx_search();
    2661 
    2662 int main() {
     2280char re_rx_search();
     2281
     2282int main() { return 0; }
     2283int t() {
    26632284
    26642285/* The GNU C library defines this for functions which it implements
    … …  
    26732294; return 0; }
    26742295EOF
    2675 if { (eval echo configure:2676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2296if eval $ac_link; then
    26762297  rm -rf conftest*
    26772298  eval "ac_cv_func_re_rx_search=yes"
    26782299else
    2679   echo "configure: failed program was:" >&5
    2680   cat conftest.$ac_ext >&5
    26812300  rm -rf conftest*
    26822301  eval "ac_cv_func_re_rx_search=no"
    26832302fi
    26842303rm -f conftest*
    2685 fi
    2686 
     2304
     2305fi
    26872306if eval "test \"`echo '$ac_cv_func_'re_rx_search`\" = yes"; then
    26882307  echo "$ac_t""yes" 1>&6
    … …  
    27212340#
    27222341EOF
    2723 # The following way of writing the cache mishandles newlines in values,
    2724 # but we know of no workaround that is simple, portable, and efficient.
    2725 # So, don't put newlines in cache variables' values.
    27262342# Ultrix sh set writes to stderr and can't be redirected directly,
    27272343# and sets the high bit in the cache file unless we assign to the vars.
    27282344(set) 2>&1 |
    2729   case `(ac_space=' '; set) 2>&1` in
    2730   *ac_space=\ *)
    2731     # `set' does not quote correctly, so add quotes (double-quote substitution
    2732     # turns \\\\ into \\, and sed turns \\ into \).
    2733     sed -n \
    2734       -e "s/'/'\\\\''/g" \
    2735       -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
    2736     ;;
    2737   *)
    2738     # `set' quotes correctly as required by POSIX, so do not add quotes.
    2739     sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
    2740     ;;
    2741   esac >> confcache
     2345  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
     2346  >> confcache
    27422347if cmp -s $cache_file confcache; then
    27432348  :
    … …  
    27942399    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    27952400  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
    2796     echo "$CONFIG_STATUS generated by autoconf version 2.12"
     2401    echo "$CONFIG_STATUS generated by autoconf version 2.4"
    27972402    exit 0 ;;
    27982403  -help | --help | --hel | --he | --h)
    … …  
    28072412trap 'rm -fr `echo "Makefile src/text/Makefile src/images/Makefile
    28082413          src/scripts/Makefile lib/Makefile  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
    2809 EOF
    2810 cat >> $CONFIG_STATUS <<EOF
    2811 
    2812 # Protect against being on the right side of a sed subst in config.status.
    2813 sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
    2814  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
     2414
     2415# Protect against being on the right side of a sed subst in config.status.
     2416sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
     2417 s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
    28152418$ac_vpsub
    28162419$extrasub
    … …  
    28242427s%@prefix@%$prefix%g
    28252428s%@program_transform_name@%$program_transform_name%g
    2826 s%@bindir@%$bindir%g
    2827 s%@sbindir@%$sbindir%g
    2828 s%@libexecdir@%$libexecdir%g
    2829 s%@datadir@%$datadir%g
    2830 s%@sysconfdir@%$sysconfdir%g
    2831 s%@sharedstatedir@%$sharedstatedir%g
    2832 s%@localstatedir@%$localstatedir%g
    2833 s%@libdir@%$libdir%g
    2834 s%@includedir@%$includedir%g
    2835 s%@oldincludedir@%$oldincludedir%g
    2836 s%@infodir@%$infodir%g
    2837 s%@mandir@%$mandir%g
    28382429s%@PACKAGE@%$PACKAGE%g
    28392430s%@VERSION@%$VERSION%g
    … …  
    28552446CEOF
    28562447EOF
    2857 
    2858 cat >> $CONFIG_STATUS <<\EOF
    2859 
    2860 # Split the substitutions into bite-sized pieces for seds with
    2861 # small command number limits, like on Digital OSF/1 and HP-UX.
    2862 ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
    2863 ac_file=1 # Number of current file.
    2864 ac_beg=1 # First line for current file.
    2865 ac_end=$ac_max_sed_cmds # Line after last line for current file.
    2866 ac_more_lines=:
    2867 ac_sed_cmds=""
    2868 while $ac_more_lines; do
    2869   if test $ac_beg -gt 1; then
    2870     sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
    2871   else
    2872     sed "${ac_end}q" conftest.subs > conftest.s$ac_file
    2873   fi
    2874   if test ! -s conftest.s$ac_file; then
    2875     ac_more_lines=false
    2876     rm -f conftest.s$ac_file
    2877   else
    2878     if test -z "$ac_sed_cmds"; then
    2879       ac_sed_cmds="sed -f conftest.s$ac_file"
    2880     else
    2881       ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
    2882     fi
    2883     ac_file=`expr $ac_file + 1`
    2884     ac_beg=$ac_end
    2885     ac_end=`expr $ac_end + $ac_max_sed_cmds`
    2886   fi
    2887 done
    2888 if test -z "$ac_sed_cmds"; then
    2889   ac_sed_cmds=cat
    2890 fi
    2891 EOF
    2892 
    28932448cat >> $CONFIG_STATUS <<EOF
    28942449
    … …  
    28982453cat >> $CONFIG_STATUS <<\EOF
    28992454for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
    2900   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
     2455  # Support "outfile[:infile]", defaulting infile="outfile.in".
    29012456  case "$ac_file" in
    2902   *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
     2457  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
    29032458       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
    29042459  *) ac_file_in="${ac_file}.in" ;;
    29052460  esac
    29062461
    2907   # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
     2462  # Adjust relative srcdir, etc. for subdirectories.
    29082463
    29092464  # Remove last slash and all that follows it.  Not all systems have dirname.
    … …  
    29332488  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    29342489  esac
    2935 
    29362490  echo creating "$ac_file"
    29372491  rm -f "$ac_file"
    … …  
    29422496  *) ac_comsub= ;;
    29432497  esac
    2944 
    2945   ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
    29462498  sed -e "$ac_comsub
    29472499s%@configure_input@%$configure_input%g
    … …  
    29492501s%@top_srcdir@%$top_srcdir%g
    29502502s%@INSTALL@%$INSTALL%g
    2951 " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
     2503" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
    29522504fi; done
    2953 rm -f conftest.s*
     2505rm -f conftest.subs
    29542506
    29552507# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
    … …  
    29722524ac_eD='%g'
    29732525
    2974 if test "${CONFIG_HEADERS+set}" != set; then
    2975 EOF
    2976 cat >> $CONFIG_STATUS <<EOF
    2977   CONFIG_HEADERS="config.h"
    2978 EOF
    2979 cat >> $CONFIG_STATUS <<\EOF
    2980 fi
     2526CONFIG_HEADERS=${CONFIG_HEADERS-"config.h"}
    29812527for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
    2982   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
     2528  # Support "outfile[:infile]", defaulting infile="outfile.in".
    29832529  case "$ac_file" in
    2984   *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
     2530  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
    29852531       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
    29862532  *) ac_file_in="${ac_file}.in" ;;
    … …  
    29902536
    29912537  rm -f conftest.frag conftest.in conftest.out
    2992   ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
    2993   cat $ac_file_inputs > conftest.in
     2538  cp $ac_given_srcdir/$ac_file_in conftest.in
    29942539
    29952540EOF
    … …  
    29972542# Transform confdefs.h into a sed script conftest.vals that substitutes
    29982543# the proper values into config.h.in to produce config.h.  And first:
    2999 # Protect against being on the right side of a sed subst in config.status.
     2544# Protect against being on the right side of a sed subst in config.status. 
    30002545# Protect against being in an unquoted here document in config.status.
    30012546rm -f conftest.vals
    … …  
    30032548s/[\\&%]/\\&/g
    30042549s%[\\$`]%\\&%g
    3005 s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
     2550s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
    30062551s%ac_d%ac_u%gp
    30072552s%ac_u%ac_e%gp
    … …  
    30192564# Break up conftest.vals because some shells have a limit on
    30202565# the size of here documents, and old seds have small limits too.
     2566# Maximum number of lines to put in a single here document.
     2567ac_max_here_lines=12
    30212568
    30222569rm -f conftest.tail
    … …  
    30492596    rm -f conftest.h
    30502597  else
    3051     # Remove last slash and all that follows it.  Not all systems have dirname.
    3052       ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
    3053       if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
    3054       # The file is in a subdirectory.
    3055       test ! -d "$ac_dir" && mkdir "$ac_dir"
    3056     fi
    30572598    rm -f $ac_file
    30582599    mv conftest.h $ac_file
    … …  
    30602601fi; done
    30612602
    3062 EOF
    3063 cat >> $CONFIG_STATUS <<EOF
    3064 
    3065 EOF
    3066 cat >> $CONFIG_STATUS <<\EOF
     2603
    30672604test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
    30682605exit 0

  • /trunk/gsdl/packages/mg-1.3d/lib/Makefile.in

    r30 r20  
    3737DEFS = @DEFS@
    3838RANLIB = @RANLIB@
    39 
    40 ##########################################
    41 # Uncomment for compiling for the nzdl project
    42 #
    43 CFLAGS = @CFLAGS@ -DQUIET
    44 ##########################################
    45 
    4639 
    4740prefix = @prefix@
    … …  
    8376    bitio_m_mems.h     bitio_stdio.h      huffman_stdio.h    sptree.h \
    8477    regex.h            rx.h               pathmax.h          getpagesize.h \
    85     random.h           frenchstem.h
     78    random.h
    8679
    8780SOURCES = \
    … …  
    9386    timing.c          regex.c           rx.c              \
    9487    alloca.c          error.c           xmalloc.c         strstr.c \
    95     gmalloc.c         ftruncate.c       strcasecmp.c      random.c \
    96     frenchstem.c
     88    gmalloc.c         ftruncate.c       strcasecmp.c      random.c         
    9789
    9890OBJECTS = @ALLOCA@ @LIBOBJS@ \
    … …  
    10496    timing$o          regex$o       rx$o \
    10597    error$o           xmalloc$o \
    106     gmalloc$o         random$o          frenchstem$o
     98    gmalloc$o         random$o
    10799 
    108100DISTFILES = Makefile.in $(HEADERS) $(SOURCES)

  • /trunk/gsdl/packages/mg-1.3d/lib/WIN32.MAK

    r30 r20  
    3131#CFLAGS = -g -O
    3232CPPFLAGS =
    33 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
     33DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
    3434 
    3535COMPILE = $(CC) -c $(DEFS) -I. -I..
    … …  
    5353    bitio_m_mem.h      bitio_random.h     huffman_mem.h      perf_hash.h \
    5454    bitio_m_mems.h     bitio_stdio.h      huffman_stdio.h    sptree.h \
    55                        rx.h               pathmax.h          getpagesize.h \
    56     random.h           win32in.h          frenchstem.h
     55    regex.h            rx.h               pathmax.h          getpagesize.h \
     56    random.h
    5757
    5858SOURCES = \
    … …  
    6262    bitio_mem.c       getopt.c          huffman_stdio.c   sptree.c \
    6363    bitio_mems.c      getopt1.c         local_strings.c   stem.c \
    64     timing.c                            rx.c              \
     64    timing.c          regex.c           rx.c              \
    6565    alloca.c          error.c           xmalloc.c         strstr.c \
    66     ftruncate.c       strcasecmp.c      random.c          win32in.c \
    67     frenchstem.c
     66    ftruncate.c       strcasecmp.c      random.c         
    6867
    69 OBJECTS =   rx$o \
     68OBJECTS =   rx.obj \
    7069    bitio_random$o    heap$o            memlib$o \
    7170    bitio_stdio$o     huffman$o         messages$o \
    … …  
    7372    bitio_mem$o       getopt$o          huffman_stdio$o   sptree$o \
    7473    bitio_mems$o      getopt1$o         local_strings$o   stem$o \
    75     timing$o          \
     74    timing$o          regex$o \
    7675    error$o           xmalloc$o \
    77     random$o          win32in$o         frenchstem$o
     76    random$o
    7877 
    7978DISTFILES = Makefile.in $(HEADERS) $(SOURCES)
    … …  
    102101
    103102mostlyclean:
    104     del *.obj
     103    rm -f *.o *_.o
    105104 
    106105clean: mostlyclean
    107     del libmg.lib
     106    rm -f libmg.lib
    108107 
    109108distclean: clean

  • /trunk/gsdl/packages/mg-1.3d/lib/alloca.c

    r30 r20  
    2626#  include <win32cfg.h>
    2727# else
    28 #  include <sysfuncs.h>
     28#  include <config.h>
    2929# endif
    3030#endif

  • /trunk/gsdl/packages/mg-1.3d/lib/error.c

    r30 r20  
    2222#  include <win32cfg.h>
    2323# else
    24 #  include <sysfuncs.h>
     24#  include <config.h>
    2525# endif
    2626#endif

  • /trunk/gsdl/packages/mg-1.3d/lib/frenchstem.c

    r30 r20  
    1 /**************************************************************************
    2  *
    3  * frenchstem.c -- a simple french stemmer
    4  *
    5  * This program is free software; you can redistribute it and/or modify
    6  * it under the terms of the GNU General Public License as published by
    7  * the Free Software Foundation; either version 2 of the License, or
    8  * (at your option) any later version.
    9  *
    10  * This program is distributed in the hope that it will be useful,
    11  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    12  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    13  * GNU General Public License for more details.
    14  *
    15  * You should have received a copy of the GNU General Public License
    16  * along with this program; if not, write to the Free Software
    17  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    18  *
    19  * $Id$
    20  *
    21  **************************************************************************/
    221
    23 #include "frenchstem.h"
    24 
    25 
    26 
    27 /* =========================================================================
    28  * Function: frenchstem
    29  * Description: a simple french stemmer
    30  * Input: a word string with the length in the first byte
    31  * Output: the stemmed word
    32  * ========================================================================= */
    33 
    34 void frenchstem (unsigned char *word) {     
    35   unsigned char *wordstart = word + 1; /* points to first letter of word */
    36   int last = (int)word[0]-1;           /* last points to the last character */
    37 
    38   if (last > 4) {
    39     if (wordstart[last]=='x') {
    40       if (wordstart[last-1]=='u' && wordstart[last-2]=='a') {
    41     wordstart[last-1]='l';
     2static char * frenchstem (word)
     3char *word;
     4{     
     5  int len = strlen(word)-1;
     6  if (len > 4) {
     7    if (word[len]=='x') {
     8      if (word[len-1]=='u' && word[len-2]=='a') {
     9    word[len-1]='l';
    4210      }
    43       wordstart[last]='\0';
    44       last--;
    45 
    46     } else {
    47       if (wordstart[last]=='s' && last>=0)
    48     {wordstart[last]='\0'; last--;}
    49       if (wordstart[last]=='r' && last>=0)
    50     {wordstart[last]='\0'; last--;}
    51       if (wordstart[last]=='e' && last>=0)
    52     {wordstart[last]='\0'; last--;}
    53       if (wordstart[last]=='é' && last>=0) /* letter with accent e + ' */
    54     {wordstart[last]='\0'; last--;}
    55       if (wordstart[last]==wordstart[last-1] && last>=1)
    56     {wordstart[last]='\0'; last--;}
     11      word[len]='\0';
     12      return(word);
     13    }
     14    else {
     15      if (word[len]=='s')
     16    {word[len]='\0';len--;}
     17      if (word[len]=='r')
     18    {word[len]='\0';len--;}
     19      if (word[len]=='e')
     20    {word[len]='\0';len--;}
     21      if (word[len]=='é')    /* letter with accent e + ' */
     22    {word[len]='\0';len--;}
     23      if (word[len] == word[len-1])
     24    word[len]='\0';
    5725    }  /* end else */
    58 
    59     word[0] = (unsigned char)(last+1);
    6026  } /* end if (len > 4) */
     27  return(word);
    6128}

  • /trunk/gsdl/packages/mg-1.3d/lib/ftruncate.c

    r30 r20  
    66#  include <win32cfg.h>
    77# else
    8 #  include <sysfuncs.h>
     8#  include <config.h>
    99# endif
    1010#endif

  • /trunk/gsdl/packages/mg-1.3d/lib/getopt.c

    r30 r20  
    2323
    2424#ifdef HAVE_CONFIG_H
    25 #include "sysfuncs.h"
     25#include "config.h"
    2626#endif
    2727

  • /trunk/gsdl/packages/mg-1.3d/lib/getopt1.c

    r30 r20  
    1919
    2020#ifdef HAVE_CONFIG_H
    21 #include "sysfuncs.h"
     21#include "config.h"
    2222#endif
    2323

  • /trunk/gsdl/packages/mg-1.3d/lib/gmalloc.c

    r30 r20  
    3434
    3535#ifdef  HAVE_CONFIG_H
    36 #include <sysfuncs.h>
     36#include <config.h>
    3737#endif
    3838

  • /trunk/gsdl/packages/mg-1.3d/lib/messages.c

    r30 r20  
    2424/*
    2525   $Log$
    26    Revision 1.2  1998/11/23 03:38:06  rjmcnab
    27 
    28    combined unix and windows versions of mg
    29 
    30    Revision 1.1  1998/11/19 03:00:32  sjboddie
    31    Added windows gdbm and mg versions
     26   Revision 1.1  1998/11/17 09:32:14  rjmcnab
     27   *** empty log message ***
    3228
    3329   * Revision 1.1  1994/08/22  00:24:48  tes
    … …  
    7672  char *s, *pfx;
    7773  va_list args;
    78 
    79 #ifdef QUIET
    80   return; /* stop those messages!!!! */
    81 #endif 
    82 
    8374  va_start (args, fmt);
    8475  vsprintf (buf, fmt, args);

  • /trunk/gsdl/packages/mg-1.3d/lib/regex.c

    r30 r20  
    3131#  include <win32cfg.h>
    3232# else
    33 #  include <sysfuncs.h>
     33#  include <config.h>
    3434# endif
    3535#endif
    … …  
    5757/* If we are not linking with Emacs proper,
    5858   we can't use the relocating allocator
    59    even if sysfuncs.h says that we can.  */
     59   even if config.h says that we can.  */
    6060#undef REL_ALLOC
    6161
    … …  
    160160   eliminate the && through constant folding."  */
    161161
    162 #ifndef ISASCII
    163 #  if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
    164 #    define ISASCII(c) 1
    165 #  else
    166 #    define ISASCII(c) isascii(c)
    167 #  endif
     162#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
     163#define ISASCII(c) 1
     164#else
     165#define ISASCII(c) isascii(c)
    168166#endif
    169167
    … …  
    968966
    969967/* When using GNU C, we are not REALLY using the C alloca, no matter
    970    what sysfuncs.h may say.  So don't take precautions for it.  */
     968   what config.h may say.  So don't take precautions for it.  */
    971969#ifdef __GNUC__
    972970#undef C_ALLOCA

  • /trunk/gsdl/packages/mg-1.3d/lib/rx.c

    r30 r20  
    3636#  include <malloc.h>
    3737# else
    38 #  include <sysfuncs.h>
     38#  include <config.h>
    3939# endif
    4040#endif

  • /trunk/gsdl/packages/mg-1.3d/lib/rx.h

    r30 r20  
    21852185 * that make sense only in Emacs.
    21862186 */
    2187 #include "sysfuncs.h"
     2187#include "config.h"
    21882188#include "lisp.h"
    21892189#include "buffer.h"

  • /trunk/gsdl/packages/mg-1.3d/lib/xmalloc.c

    r30 r20  
    2020#  include <win32cfg.h>
    2121# else
    22 #  include <sysfuncs.h>
     22#  include <config.h>
    2323# endif
    2424#endif

  • /trunk/gsdl/packages/mg-1.3d/src/text/MGPASS.C

    r30 r20  
    4949/*
    5050   $Log$
    51    Revision 1.3  1998/11/24 03:39:23  rjmcnab
    52 
    53    Fixed a small error in the windows compilation
    54 
    55    Revision 1.2  1998/11/24 01:29:39  rjmcnab
    56 
    57    Fixed a few problems with the windows build
    58 
    5951   Revision 1.1  1998/11/17 09:34:12  rjmcnab
    6052   *** empty log message ***
    … …  
    9082FILE *Comp_Stats = NULL;
    9183int comp_stat_point = 0;
    92 double bytes_processed = 0;
     84u_long bytes_processed = 0;
    9385int num_docs = 0;
    94 double bytes_received = 0;
     86u_long bytes_received = 0;
    9587int stem_method = 0;
    9688

  • /trunk/gsdl/packages/mg-1.3d/src/text/WIN32.MAK

    r30 r20  
    1414#CFLAGS = -g -O
    1515CPPFLAGS =
    16 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
     16DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
    1717#INSTALL = /usr/local/gnu/bin/install -c
    1818#INSTALL_DATA = ${INSTALL} -m 644
    … …  
    7878  ivf.pass2.c             mg_text_estimate.c      text_get.c           \
    7979  lists.c                 mg_text_merge.c         weights.c            \
    80   mgpass.c                query_term_list.c       
     80  query_term_list.c       mgpass.c                builder.cpp
    8181
    8282HEADERS = \
    … …  
    105105        mg_hilite_words$e     mg_invf_merge$e \
    106106        mg_text_merge$e     bool_tester$e  mgpass$e \
    107         mg_stem_idx$e  mgstemidxlist$e \
    108                 mg_decompress_text$e
     107        mg_stem_idx$e  mgstemidxlist$e  mg_decompress_text$e \
     108        builder$e
    109109
    110110MAN           = mgquery.1 mg_weights_build.1 mgstat.1 mg_invf_dump.1 mg_invf_dict.1 \
    … …  
    117117
    118118
    119 all:    $(EXEC) libtextin.lib
     119all:    $(EXEC)
    120120
    121121
    … …  
    253253    $(LINK) $(PERF_HASH_OBJS) $(LIBS)
    254254
    255 STEM_IDX_OBJS = mg_stem_idx$o mg_files$o stemmer$o locallib$o \
     255STEM_IDX_OBJS = \
     256                mg_stem_idx$o mg_files$o stemmer$o locallib$o \
    256257                mg_errors$o term_lists$o
    257258
    … …  
    264265    $(LINK) $(STEM_IDX_LIST_OBJS) $(LIBS)
    265266
    266 DECOMPRESS_TEXT_OBJS = mg_decompress_text$o query_term_list$o mg_files$o mg_errors$o \
    267                        text_get$o locallib$o backend$o stem_search$o \
    268                        term_lists$o stemmer$o weights$o invf_get$o lists$o
     267DECOMPRESS_TEXT_OBJS = \
     268                mg_decompress_text$o mg_files$o mg_errors$o \
     269                text_get$o locallib$o backend$o stem_search$o \
     270                term_lists$o stemmer$o weights$o invf_get$o lists$o
    269271
    270272mg_decompress_text$e: $(DECOMPRESS_TEXT_OBJS)
    … …  
    315317
    316318
    317 LIB_OBJS = \
    318     query_term_list$o \
    319     locallib$o lists$o \
    320     query.ranked$o query.docnums$o stem_search$o \
    321     environment$o commands$o weights$o text_get$o stemmer$o \
    322     read_line$o mg_errors$o backend$o invf_get$o \
    323     term_lists$o bool_tree$o bool_parser$o bool_optimiser$o bool_query$o
    324 
    325 libtextin.lib: $(LIB_OBJS)
    326     del libtextin.lib
    327     lib /out:libtextin.lib $(LIB_OBJS)
    328 
    329 
    330319mostlyclean:
    331320    rm -f *$o _*.c _*.o *._c *._o core core.*

  • /trunk/gsdl/packages/mg-1.3d/src/text/bool_parser.c

    r30 r20  
    11#ifndef lint
    2 static char yysccsid[] = "@(#)yaccpar   1.9 (Berkeley) 02/21/93";
     2static char yysccsid[] = "@(#)yaccpar   1.8 (Berkeley) 01/20/90";
    33#endif
    44#define YYBYACC 1
    5 #define YYMAJOR 1
    6 #define YYMINOR 9
    7 #define yyclearin (yychar=(-1))
    8 #define yyerrok (yyerrflag=0)
    9 #define YYRECOVERING (yyerrflag!=0)
    10 #define YYPREFIX "yy"
    115#line 25 "bool_parser.y"
    126 
    … …  
    5246  bool_tree_node *node;
    5347} YYSTYPE;
    54 #line 55 "y.tab.c"
     48#line 49 "y.tab.c"
    5549#define TERM 257
    5650#define YYERRCODE 256
    … …  
    164158};
    165159#endif
     160#define yyclearin (yychar=(-1))
     161#define yyerrok (yyerrflag=0)
    166162#ifdef YYSTACKSIZE
    167 #undef YYMAXDEPTH
     163#ifndef YYMAXDEPTH
    168164#define YYMAXDEPTH YYSTACKSIZE
     165#endif
    169166#else
    170167#ifdef YYMAXDEPTH
    … …  
    404401 
    405402
    406 #line 407 "y.tab.c"
     403#line 404 "y.tab.c"
    407404#define YYABORT goto yyabort
    408 #define YYREJECT goto yyabort
    409405#define YYACCEPT goto yyaccept
    410406#define YYERROR goto yyerrlab
    … …  
    444440            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
    445441            if (!yys) yys = "illegal-symbol";
    446             printf("%sdebug: state %d, reading %d (%s)\n",
    447                     YYPREFIX, yystate, yychar, yys);
     442            printf("yydebug: state %d, reading %d (%s)\n", yystate,
     443                    yychar, yys);
    448444        }
    449445#endif
    … …  
    454450#if YYDEBUG
    455451        if (yydebug)
    456             printf("%sdebug: state %d, shifting to state %d\n",
    457                     YYPREFIX, yystate, yytable[yyn]);
     452            printf("yydebug: state %d, shifting to state %d\n",
     453                    yystate, yytable[yyn]);
    458454#endif
    459455        if (yyssp >= yyss + yystacksize - 1)
    … …  
    495491#if YYDEBUG
    496492                if (yydebug)
    497                     printf("%sdebug: state %d, error recovery shifting\
    498  to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
     493                    printf("yydebug: state %d, error recovery shifting\
     494 to state %d\n", *yyssp, yytable[yyn]);
    499495#endif
    500496                if (yyssp >= yyss + yystacksize - 1)
    … …  
    510506#if YYDEBUG
    511507                if (yydebug)
    512                     printf("%sdebug: error recovery discarding state %d\n",
    513                             YYPREFIX, *yyssp);
     508                    printf("yydebug: error recovery discarding state %d\n",
     509                            *yyssp);
    514510#endif
    515511                if (yyssp <= yyss) goto yyabort;
    … …  
    528524            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
    529525            if (!yys) yys = "illegal-symbol";
    530             printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
    531                     YYPREFIX, yystate, yychar, yys);
     526            printf("yydebug: state %d, error recovery discards token %d (%s)\n",
     527                    yystate, yychar, yys);
    532528        }
    533529#endif
    … …  
    538534#if YYDEBUG
    539535    if (yydebug)
    540         printf("%sdebug: state %d, reducing by rule %d (%s)\n",
    541                 YYPREFIX, yystate, yyn, yyrule[yyn]);
     536        printf("yydebug: state %d, reducing by rule %d (%s)\n",
     537                yystate, yyn, yyrule[yyn]);
    542538#endif
    543539    yym = yylen[yyn];
    … …  
    581577{ yyval.node = CreateBoolTreeNode(N_or, yyvsp[-2].node, yyvsp[0].node); }
    582578break;
    583 #line 584 "y.tab.c"
     579#line 580 "y.tab.c"
    584580    }
    585581    yyssp -= yym;
    … …  
    591587#if YYDEBUG
    592588        if (yydebug)
    593             printf("%sdebug: after reduction, shifting from state 0 to\
    594  state %d\n", YYPREFIX, YYFINAL);
     589            printf("yydebug: after reduction, shifting from state 0 to\
     590 state %d\n", YYFINAL);
    595591#endif
    596592        yystate = YYFINAL;
    … …  
    606602                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
    607603                if (!yys) yys = "illegal-symbol";
    608                 printf("%sdebug: state %d, reading %d (%s)\n",
    609                         YYPREFIX, YYFINAL, yychar, yys);
     604                printf("yydebug: state %d, reading %d (%s)\n",
     605                        YYFINAL, yychar, yys);
    610606            }
    611607#endif
    … …  
    621617#if YYDEBUG
    622618    if (yydebug)
    623         printf("%sdebug: after reduction, shifting from state %d \
    624 to state %d\n", YYPREFIX, *yyssp, yystate);
     619        printf("yydebug: after reduction, shifting from state %d \
     620to state %d\n", *yyssp, yystate);
    625621#endif
    626622    if (yyssp >= yyss + yystacksize - 1)

  • /trunk/gsdl/packages/mg-1.3d/src/text/mg_hilite_words.c

    r30 r20  
    628628 * ========================================================================= */
    629629
    630 int
     630void
    631631main (int argc, char *argv[])
    632632{
    … …  
    684684#endif
    685685
    686   return 0;
    687 }
     686}

  • /trunk/gsdl/packages/mg-1.3d/src/text/stemmer.h

    r30 r20  
    4444
    4545#endif
     46
     47
     48
     49
     50

  • /trunk/gsdl/src/library/gdbmclass.cpp

    r30 r20  
    574574  return 1;
    575575}
    576 
    577 // functions related to sorting
    578 
    579 // returns whatever comes after ':#:' in str
    580 // -- this is a nasty hack that I'm sure Rodger will want to change ;-)
    581 text_t get_section_str(const text_t &str) {
    582 
    583   text_t ret;
    584   int found = 0;
    585 
    586   text_t::const_iterator here = str.begin();
    587   text_t::const_iterator end = str.end();
    588 
    589   while (here != end) {
    590     if (found) {
    591       ret.push_back(*here);
    592     } else {
    593       here = findchar (here, end, ':');
    594       if ((*(here+1) == '#') && (*(here+2) == ':')) {
    595     found = 1;
    596     here = here+2;
    597       }
    598     }
    599     here ++;
    600   }
    601   return ret;
    602 }
    603 
    604 // removes leading spaces and leading 'the' 'a' and 'an'
    605 // from string
    606 void alphabetize_string_english (text_t &text) {
    607  
    608   if (text.empty()) return;
    609 
    610   text_t firstword;
    611   char *word;
    612 
    613   text_t::iterator here = text.begin();
    614   text_t::const_iterator end = text.end();
    615 
    616   if ((*here != ' ') && (*here != 'a') && (*here != 'A') &&
    617       (*here != 't') && (*here != 'T')) return;
    618 
    619   int foundchar = 0;
    620   while (here != end) {
    621     if (*here == ' ' && !foundchar) {here ++; continue;}
    622     if (*here == ' ' && foundchar) {
    623       text.erase(text.begin(), (here+1));
    624       break;
    625     }
    626     foundchar ++;
    627     if (foundchar == 1) {
    628       getdelimitstr (here, end, ' ', firstword);
    629       word = firstword.getcstr();
    630       if ((_stricmp(word, "the") != 0) && (_stricmp(word, "a") != 0) &&
    631       (_stricmp(word, "an") != 0)) break;
    632     }
    633     here ++;
    634   }
    635   delete word;
    636 }
    637 
    638 // removes leading space, puts last name before
    639 // any preceeding names
    640 void alphabetize_string_name (text_t &text) {
    641  
    642   if (text.empty()) return;
    643  
    644   text_t lastname;
    645   char *lname;
    646   vector<text_t> words;
    647   splitchar (text.begin(), text.end(), ' ', words);
    648   lastname = words.back();
    649   words.pop_back();
    650   lname = lastname.getcstr();
    651  
    652   while ((_stricmp(lname, "jnr") == 0) || (_stricmp(lname, "snr") == 0) ||
    653      (_stricmp(lname, "esq") == 0)) {
    654     lastname = words.back();
    655     words.pop_back();
    656     lname = lastname.getcstr();
    657   }
    658 
    659   text.clear();
    660   joinchar (words, ' ', text);
    661   text = lastname + text;
    662 }
    663 
    664 char ** string_add (char **array, int *len, char *str) {
    665   char **ret;
    666 
    667   ret = (char**)realloc(array, (*len+1)*sizeof(char*));
    668   ret[*len] = (char*)strdup(str);
    669   (*len) ++;
    670 
    671   return ret;
    672 }
    673 
    674 void string_sort (char **array, int len) {
    675   qsort((void*)array, (unsigned int)(len), sizeof(char*), compare_str);
    676 }
    677 
    678 static int compare_str (const void *e1, const void *e2) {
    679   return _stricmp(*((char**)e1), *((char**)e2));
    680 }
    681 
    682 void string_free(char **array, int len) {
    683   for (int i = 0; i < len; i++)
    684     free (array[i]);
    685   free (array);
    686 }

  • /trunk/gsdl/src/library/gdbmclass.h

    r30 r20  
    8282void get_first_section(const text_t &instring, text_t &returnstring);
    8383int is_number (text_t &text);
    84 text_t get_section_str(const text_t &str);
    85 void alphabetize_string_english (text_t &text);
    86 void alphabetize_string_name (text_t &text);
    87 char ** string_add (char **array, int *len, char *str);
    88 void string_sort (char **array, int len);
    89 static int compare_str (const void *e1, const void *e2);
    90 void string_free(char **array, int len);
    9184#endif
Note: See TracChangeset for help on using the changeset viewer.