Ignore:
Timestamp:
2021-08-18T11:07:13+12:00 (3 years ago)
Author:
davidb
Message:

Making javac default now source/target 1.6, rather than 1.4. This change was in response to 'javah' being deprecated. JNI is now down with 'javac -h' and to do that, you need to have at least a JDK 1.6 installed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/mg/configure

    r26675 r35306  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.68.
     3# Generated by GNU Autoconf 2.69.
    44#
    55#
    6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
    97#
    108#
     
    135133(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
    136134
     135# Use a proper internal environment variable to ensure we don't fall
     136  # into an infinite loop, continuously re-executing ourselves.
     137  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
     138    _as_can_reexec=no; export _as_can_reexec;
     139    # We cannot yet assume a decent shell, so we have to provide a
     140# neutralization value for shells without unset; and this also
     141# works around shells that cannot unset nonexistent variables.
     142# Preserve -v and -x to the replacement shell.
     143BASH_ENV=/dev/null
     144ENV=/dev/null
     145(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     146case $- in # ((((
     147  *v*x* | *x*v* ) as_opts=-vx ;;
     148  *v* ) as_opts=-v ;;
     149  *x* ) as_opts=-x ;;
     150  * ) as_opts= ;;
     151esac
     152exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
     153# Admittedly, this is quite paranoid, since all the known shells bail
     154# out after a failed `exec'.
     155$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
     156as_fn_exit 255
     157  fi
     158  # We don't want this to propagate to other subprocesses.
     159          { _as_can_reexec=; unset _as_can_reexec;}
    137160if test "x$CONFIG_SHELL" = x; then
    138161  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
     
    168191  exitcode=1; echo positional parameters were not saved.
    169192fi
    170 test x\$exitcode = x0 || exit 1"
     193test x\$exitcode = x0 || exit 1
     194test -x / || exit 1"
    171195  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
    172196  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
     
    213237
    214238      if test "x$CONFIG_SHELL" != x; then :
    215   # We cannot yet assume a decent shell, so we have to provide a
    216     # neutralization value for shells without unset; and this also
    217     # works around shells that cannot unset nonexistent variables.
    218     # Preserve -v and -x to the replacement shell.
    219     BASH_ENV=/dev/null
    220     ENV=/dev/null
    221     (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    222     export CONFIG_SHELL
    223     case $- in # ((((
    224       *v*x* | *x*v* ) as_opts=-vx ;;
    225       *v* ) as_opts=-v ;;
    226       *x* ) as_opts=-x ;;
    227       * ) as_opts= ;;
    228     esac
    229     exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
     239  export CONFIG_SHELL
     240             # We cannot yet assume a decent shell, so we have to provide a
     241# neutralization value for shells without unset; and this also
     242# works around shells that cannot unset nonexistent variables.
     243# Preserve -v and -x to the replacement shell.
     244BASH_ENV=/dev/null
     245ENV=/dev/null
     246(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     247case $- in # ((((
     248  *v*x* | *x*v* ) as_opts=-vx ;;
     249  *v* ) as_opts=-v ;;
     250  *x* ) as_opts=-x ;;
     251  * ) as_opts= ;;
     252esac
     253exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
     254# Admittedly, this is quite paranoid, since all the known shells bail
     255# out after a failed `exec'.
     256$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
     257exit 255
    230258fi
    231259
     
    329357
    330358} # as_fn_mkdir_p
     359
     360# as_fn_executable_p FILE
     361# -----------------------
     362# Test if FILE is an executable regular file.
     363as_fn_executable_p ()
     364{
     365  test -f "$1" && test -x "$1"
     366} # as_fn_executable_p
    331367# as_fn_append VAR VALUE
    332368# ----------------------
     
    450486    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
    451487
     488  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
     489  # already done that, so ensure we don't try to do so again and fall
     490  # in an infinite loop.  This has already happened in practice.
     491  _as_can_reexec=no; export _as_can_reexec
    452492  # Don't try to exec as it changes $[0], causing all sort of problems
    453493  # (the dirname of $[0] is not the place where we might find the
     
    484524    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
    485525    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
    486     # In both cases, we have to default to `cp -p'.
     526    # In both cases, we have to default to `cp -pR'.
    487527    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
    488       as_ln_s='cp -p'
     528      as_ln_s='cp -pR'
    489529  elif ln conf$$.file conf$$ 2>/dev/null; then
    490530    as_ln_s=ln
    491531  else
    492     as_ln_s='cp -p'
     532    as_ln_s='cp -pR'
    493533  fi
    494534else
    495   as_ln_s='cp -p'
     535  as_ln_s='cp -pR'
    496536fi
    497537rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
     
    505545fi
    506546
    507 if test -x / >/dev/null 2>&1; then
    508   as_test_x='test -x'
    509 else
    510   if ls -dL / >/dev/null 2>&1; then
    511     as_ls_L_option=L
    512   else
    513     as_ls_L_option=
    514   fi
    515   as_test_x='
    516     eval sh -c '\''
    517       if test -d "$1"; then
    518     test -d "$1/.";
    519       else
    520     case $1 in #(
    521     -*)set "./$1";;
    522     esac;
    523     case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
    524     ???[sx]*):;;*)false;;esac;fi
    525     '\'' sh
    526   '
    527 fi
    528 as_executable_p=$as_test_x
     547as_test_x='test -x'
     548as_executable_p=as_fn_executable_p
    529549
    530550# Sed expression to map a string onto a valid CPP name.
     
    671691oldincludedir
    672692includedir
     693runstatedir
    673694localstatedir
    674695sharedstatedir
     
    749770sharedstatedir='${prefix}/com'
    750771localstatedir='${prefix}/var'
     772runstatedir='${localstatedir}/run'
    751773includedir='${prefix}/include'
    752774oldincludedir='/usr/include'
     
    10011023    silent=yes ;;
    10021024
     1025  -runstatedir | --runstatedir | --runstatedi | --runstated \
     1026  | --runstate | --runstat | --runsta | --runst | --runs \
     1027  | --run | --ru | --r)
     1028    ac_prev=runstatedir ;;
     1029  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
     1030  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
     1031  | --run=* | --ru=* | --r=*)
     1032    runstatedir=$ac_optarg ;;
     1033
    10031034  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    10041035    ac_prev=sbindir ;;
     
    11381169        datadir sysconfdir sharedstatedir localstatedir includedir \
    11391170        oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
    1140         libdir localedir mandir
     1171        libdir localedir mandir runstatedir
    11411172do
    11421173  eval ac_val=\$$ac_var
     
    11661197  if test "x$build_alias" = x; then
    11671198    cross_compiling=maybe
    1168     $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
    1169     If a cross compiler is detected then cross compile mode will be used" >&2
    11701199  elif test "x$build_alias" != "x$host_alias"; then
    11711200    cross_compiling=yes
     
    12931322  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    12941323  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
     1324  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
    12951325  --libdir=DIR            object code libraries [EPREFIX/lib]
    12961326  --includedir=DIR        C header files [PREFIX/include]
     
    14241454  cat <<\_ACEOF
    14251455configure
    1426 generated by GNU Autoconf 2.68
    1427 
    1428 Copyright (C) 2010 Free Software Foundation, Inc.
     1456generated by GNU Autoconf 2.69
     1457
     1458Copyright (C) 2012 Free Software Foundation, Inc.
    14291459This configure script is free software; the Free Software Foundation
    14301460gives unlimited permission to copy, distribute and modify it.
     
    17371767       } && test -s conftest$ac_exeext && {
    17381768     test "$cross_compiling" = yes ||
    1739      $as_test_x conftest$ac_exeext
     1769     test -x conftest$ac_exeext
    17401770       }; then :
    17411771  ac_retval=0
     
    18811911
    18821912It was created by $as_me, which was
    1883 generated by GNU Autoconf 2.68.  Invocation command line was
     1913generated by GNU Autoconf 2.69.  Invocation command line was
    18841914
    18851915  $ $0 $@
     
    24512481  test -z "$as_dir" && as_dir=.
    24522482    for ac_exec_ext in '' $ac_executable_extensions; do
    2453   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2483  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    24542484    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    24552485    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    24952525  test -z "$as_dir" && as_dir=.
    24962526    for ac_exec_ext in '' $ac_executable_extensions; do
    2497   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2527  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    24982528    ac_cv_prog_ac_ct_CXX="$ac_prog"
    24992529    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    29482978  test -z "$as_dir" && as_dir=.
    29492979    for ac_exec_ext in '' $ac_executable_extensions; do
    2950   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2980  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    29512981    ac_cv_prog_AWK="$ac_prog"
    29522982    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    29903020  test -z "$as_dir" && as_dir=.
    29913021    for ac_exec_ext in '' $ac_executable_extensions; do
    2992   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3022  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    29933023    ac_cv_prog_YACC="$ac_prog"
    29943024    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    30373067  test -z "$as_dir" && as_dir=.
    30383068    for ac_exec_ext in '' $ac_executable_extensions; do
    3039   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3069  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    30403070    ac_cv_prog_CC="${ac_tool_prefix}gcc"
    30413071    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    30773107  test -z "$as_dir" && as_dir=.
    30783108    for ac_exec_ext in '' $ac_executable_extensions; do
    3079   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3109  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    30803110    ac_cv_prog_ac_ct_CC="gcc"
    30813111    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    31303160  test -z "$as_dir" && as_dir=.
    31313161    for ac_exec_ext in '' $ac_executable_extensions; do
    3132   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3162  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    31333163    ac_cv_prog_CC="${ac_tool_prefix}cc"
    31343164    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    31713201  test -z "$as_dir" && as_dir=.
    31723202    for ac_exec_ext in '' $ac_executable_extensions; do
    3173   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3203  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    31743204    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
    31753205       ac_prog_rejected=yes
     
    32293259  test -z "$as_dir" && as_dir=.
    32303260    for ac_exec_ext in '' $ac_executable_extensions; do
    3231   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3261  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    32323262    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    32333263    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    32733303  test -z "$as_dir" && as_dir=.
    32743304    for ac_exec_ext in '' $ac_executable_extensions; do
    3275   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3305  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    32763306    ac_cv_prog_ac_ct_CC="$ac_prog"
    32773307    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    34693499#include <stdarg.h>
    34703500#include <stdio.h>
    3471 #include <sys/types.h>
    3472 #include <sys/stat.h>
     3501struct stat;
    34733502/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
    34743503struct buf { int x; };
     
    35923621    for ac_prog in ginstall scoinst install; do
    35933622      for ac_exec_ext in '' $ac_executable_extensions; do
    3594     if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
     3623    if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
    35953624      if test $ac_prog = install &&
    35963625        grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
     
    37073736  test -z "$as_dir" && as_dir=.
    37083737    for ac_exec_ext in '' $ac_executable_extensions; do
    3709   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3738  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    37103739    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    37113740    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    37473776  test -z "$as_dir" && as_dir=.
    37483777    for ac_exec_ext in '' $ac_executable_extensions; do
    3749   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3778  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    37503779    ac_cv_prog_ac_ct_RANLIB="ranlib"
    37513780    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    38053834  test -z "$as_dir" && as_dir=.
    38063835    for ac_exec_ext in '' $ac_executable_extensions; do
    3807   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3836  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    38083837    ac_cv_prog_JAVA="$ac_prog"
    38093838    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    38483877  test -z "$as_dir" && as_dir=.
    38493878    for ac_exec_ext in '' $ac_executable_extensions; do
    3850   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3879  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    38513880    ac_cv_prog_JAVA="$ac_prog"
    38523881    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    38943923  test -z "$as_dir" && as_dir=.
    38953924    for ac_exec_ext in '' $ac_executable_extensions; do
    3896   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     3925  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    38973926    ac_cv_prog_uudecode="yes"
    38983927    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    39363965        ac_cv_prog_uudecode_base64=yes
    39373966else
    3938         echo "configure: 3938: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     3967        echo "configure: 3967: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    39393968        echo "configure: failed file was:" >&5
    39403969        cat Test.uue >&5
     
    39754004  test -z "$as_dir" && as_dir=.
    39764005    for ac_exec_ext in '' $ac_executable_extensions; do
    3977   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     4006  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    39784007    ac_cv_prog_JAVAC="$ac_prog"
    39794008    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    40184047  test -z "$as_dir" && as_dir=.
    40194048    for ac_exec_ext in '' $ac_executable_extensions; do
    4020   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     4049  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    40214050    ac_cv_prog_JAVAC="$ac_prog"
    40224051    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    40594088CLASS_TEST=Test.class
    40604089cat << \EOF > $JAVA_TEST
    4061 /* #line 4061 "configure" */
     4090/* #line 4090 "configure" */
    40624091public class Test {
    40634092}
     
    40814110$as_echo "$ac_cv_prog_javac_works" >&6; }
    40824111if test "x$JAVACFLAGS" = x ; then
    4083   JAVACFLAGS="-source 1.4 -target 1.4"
     4112  JAVACFLAGS="-source 1.6 -target 1.6"
    40844113fi
    40854114
     
    40984127TEST=Test
    40994128cat << \EOF > $JAVA_TEST
    4100 /* [#]line 4100 "configure" */
     4129/* [#]line 4129 "configure" */
    41014130public class Test {
    41024131public static void main (String args[]) {
     
    41594188  test -z "$as_dir" && as_dir=.
    41604189    for ac_exec_ext in '' $ac_executable_extensions; do
    4161   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     4190  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    41624191    ac_cv_prog_JAVAC="$ac_prog"
    41634192    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    42024231  test -z "$as_dir" && as_dir=.
    42034232    for ac_exec_ext in '' $ac_executable_extensions; do
    4204   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     4233  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    42054234    ac_cv_prog_JAVAC="$ac_prog"
    42064235    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     
    42434272CLASS_TEST=Test.class
    42444273cat << \EOF > $JAVA_TEST
    4245 /* #line 4245 "configure" */
     4274/* #line 4274 "configure" */
    42464275public class Test {
    42474276}
     
    42654294$as_echo "$ac_cv_prog_javac_works" >&6; }
    42664295if test "x$JAVACFLAGS" = x ; then
    4267   JAVACFLAGS="-source 1.4 -target 1.4"
     4296  JAVACFLAGS="-source 1.6 -target 1.6"
    42684297fi
    42694298
     
    44274456    for ac_exec_ext in '' $ac_executable_extensions; do
    44284457      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
    4429       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
     4458      as_fn_executable_p "$ac_path_GREP" || continue
    44304459# Check for GNU ac_path_GREP and select it if it is found.
    44314460  # Check for GNU $ac_path_GREP
     
    44934522    for ac_exec_ext in '' $ac_executable_extensions; do
    44944523      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
    4495       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
     4524      as_fn_executable_p "$ac_path_EGREP" || continue
    44964525# Check for GNU ac_path_EGREP and select it if it is found.
    44974526  # Check for GNU $ac_path_EGREP
     
    47004729/* end confdefs.h.  */
    47014730
    4702 #     define __EXTENSIONS__ 1
    4703       $ac_includes_default
     4731#         define __EXTENSIONS__ 1
     4732          $ac_includes_default
    47044733int
    47054734main ()
     
    48634892main ()
    48644893{
    4865 /* FIXME: Include the comments suggested by Paul. */
     4894
    48664895#ifndef __cplusplus
    4867   /* Ultrix mips cc rejects this.  */
     4896  /* Ultrix mips cc rejects this sort of thing.  */
    48684897  typedef int charset[2];
    4869   const charset cs;
     4898  const charset cs = { 0, 0 };
    48704899  /* SunOS 4.1.1 cc rejects this.  */
    48714900  char const *const *pcpcc;
     
    48844913  ppc = (char**) pcpcc;
    48854914  pcpcc = (char const *const *) ppc;
    4886   { /* SCO 3.2v4 cc rejects this.  */
    4887     char *t;
     4915  { /* SCO 3.2v4 cc rejects this sort of thing.  */
     4916    char tx;
     4917    char *t = &tx;
    48884918    char const *s = 0 ? (char *) 0 : (char const *) 0;
    48894919
     
    49014931    ++p;
    49024932  }
    4903   { /* AIX XL C 1.02.0.0 rejects this saying
     4933  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
    49044934       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
    4905     struct s { int j; const int *ap[3]; };
    4906     struct s *b; b->j = 5;
     4935    struct s { int j; const int *ap[3]; } bx;
     4936    struct s *b = &bx; b->j = 5;
    49074937  }
    49084938  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     
    55585588$ac_includes_default
    55595589int
    5560 find_stack_direction ()
     5590find_stack_direction (int *addr, int depth)
    55615591{
    5562   static char *addr = 0;
    5563   auto char dummy;
    5564   if (addr == 0)
    5565     {
    5566       addr = &dummy;
    5567       return find_stack_direction ();
    5568     }
    5569   else
    5570     return (&dummy > addr) ? 1 : -1;
     5592  int dir, dummy = 0;
     5593  if (! addr)
     5594    addr = &dummy;
     5595  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
     5596  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
     5597  return dir + dummy;
    55715598}
    55725599
    55735600int
    5574 main ()
     5601main (int argc, char **argv)
    55755602{
    5576   return find_stack_direction () < 0;
     5603  return find_stack_direction (0, argc + !argv + 20) < 0;
    55775604}
    55785605_ACEOF
     
    65376564    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
    65386565    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
    6539     # In both cases, we have to default to `cp -p'.
     6566    # In both cases, we have to default to `cp -pR'.
    65406567    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
    6541       as_ln_s='cp -p'
     6568      as_ln_s='cp -pR'
    65426569  elif ln conf$$.file conf$$ 2>/dev/null; then
    65436570    as_ln_s=ln
    65446571  else
    6545     as_ln_s='cp -p'
     6572    as_ln_s='cp -pR'
    65466573  fi
    65476574else
    6548   as_ln_s='cp -p'
     6575  as_ln_s='cp -pR'
    65496576fi
    65506577rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
     
    66066633fi
    66076634
    6608 if test -x / >/dev/null 2>&1; then
    6609   as_test_x='test -x'
    6610 else
    6611   if ls -dL / >/dev/null 2>&1; then
    6612     as_ls_L_option=L
    6613   else
    6614     as_ls_L_option=
    6615   fi
    6616   as_test_x='
    6617     eval sh -c '\''
    6618       if test -d "$1"; then
    6619     test -d "$1/.";
    6620       else
    6621     case $1 in #(
    6622     -*)set "./$1";;
    6623     esac;
    6624     case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
    6625     ???[sx]*):;;*)false;;esac;fi
    6626     '\'' sh
    6627   '
    6628 fi
    6629 as_executable_p=$as_test_x
     6635
     6636# as_fn_executable_p FILE
     6637# -----------------------
     6638# Test if FILE is an executable regular file.
     6639as_fn_executable_p ()
     6640{
     6641  test -f "$1" && test -x "$1"
     6642} # as_fn_executable_p
     6643as_test_x='test -x'
     6644as_executable_p=as_fn_executable_p
    66306645
    66316646# Sed expression to map a string onto a valid CPP name.
     
    66496664ac_log="
    66506665This file was extended by $as_me, which was
    6651 generated by GNU Autoconf 2.68.  Invocation command line was
     6666generated by GNU Autoconf 2.69.  Invocation command line was
    66526667
    66536668  CONFIG_FILES    = $CONFIG_FILES
     
    67156730ac_cs_version="\\
    67166731config.status
    6717 configured by $0, generated by GNU Autoconf 2.68,
     6732configured by $0, generated by GNU Autoconf 2.69,
    67186733  with options \\"\$ac_cs_config\\"
    67196734
    6720 Copyright (C) 2010 Free Software Foundation, Inc.
     6735Copyright (C) 2012 Free Software Foundation, Inc.
    67216736This config.status script is free software; the Free Software Foundation
    67226737gives unlimited permission to copy, distribute and modify it."
     
    68086823cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    68096824if \$ac_cs_recheck; then
    6810   set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
     6825  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
    68116826  shift
    68126827  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
Note: See TracChangeset for help on using the changeset viewer.