Ignore:
Timestamp:
2010-12-17T15:00:27+13:00 (13 years ago)
Author:
sjm84
Message:

Adding a few changes that we missed from the previous commit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/configure

    r23356 r23509  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
     
    316316    done
    317317    test -z "$as_dirs" || eval "mkdir $as_dirs"
    318   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
     318  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
    319319
    320320
     
    356356
    357357
    358 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    359 # ----------------------------------------
     358# as_fn_error ERROR [LINENO LOG_FD]
     359# ---------------------------------
    360360# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    361361# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    362 # script with STATUS, using 1 if that was 0.
     362# script with status $?, using 1 if that was 0.
    363363as_fn_error ()
    364364{
    365   as_status=$1; test $as_status -eq 0 && as_status=1
    366   if test "$4"; then
    367     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    368     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     365  as_status=$?; test $as_status -eq 0 && as_status=1
     366  if test "$3"; then
     367    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     368    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
    369369  fi
    370   $as_echo "$as_me: error: $2" >&2
     370  $as_echo "$as_me: error: $1" >&2
    371371  as_fn_exit $as_status
    372372} # as_fn_error
     
    530530
    531531# Name of the host.
    532 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
     532# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
    533533# so uname gets run too.
    534534ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
     
    562562JAVACFLAGS
    563563JAVAC
    564 COMPAT32BITFLAGS
    565564ENABLE_LUCENE
    566565ENABLE_MGPP
     
    686685
    687686  case $ac_option in
    688   *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
    689   *=)   ac_optarg= ;;
    690   *)    ac_optarg=yes ;;
     687  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     688  *)    ac_optarg=yes ;;
    691689  esac
    692690
     
    733731    # Reject names that are not valid shell variable names.
    734732    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    735       as_fn_error $? "invalid feature name: $ac_useropt"
     733      as_fn_error "invalid feature name: $ac_useropt"
    736734    ac_useropt_orig=$ac_useropt
    737735    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     
    759757    # Reject names that are not valid shell variable names.
    760758    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    761       as_fn_error $? "invalid feature name: $ac_useropt"
     759      as_fn_error "invalid feature name: $ac_useropt"
    762760    ac_useropt_orig=$ac_useropt
    763761    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     
    963961    # Reject names that are not valid shell variable names.
    964962    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    965       as_fn_error $? "invalid package name: $ac_useropt"
     963      as_fn_error "invalid package name: $ac_useropt"
    966964    ac_useropt_orig=$ac_useropt
    967965    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     
    979977    # Reject names that are not valid shell variable names.
    980978    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    981       as_fn_error $? "invalid package name: $ac_useropt"
     979      as_fn_error "invalid package name: $ac_useropt"
    982980    ac_useropt_orig=$ac_useropt
    983981    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     
    10091007    x_libraries=$ac_optarg ;;
    10101008
    1011   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1012 Try \`$0 --help' for more information"
     1009  -*) as_fn_error "unrecognized option: \`$ac_option'
     1010Try \`$0 --help' for more information."
    10131011    ;;
    10141012
     
    10181016    case $ac_envvar in #(
    10191017      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1020       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1018      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    10211019    esac
    10221020    eval $ac_envvar=\$ac_optarg
     
    10361034if test -n "$ac_prev"; then
    10371035  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
    1038   as_fn_error $? "missing argument to $ac_option"
     1036  as_fn_error "missing argument to $ac_option"
    10391037fi
    10401038
     
    10421040  case $enable_option_checking in
    10431041    no) ;;
    1044     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1042    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    10451043    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    10461044  esac
     
    10651063    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    10661064  esac
    1067   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
     1065  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
    10681066done
    10691067
     
    10791077  if test "x$build_alias" = x; then
    10801078    cross_compiling=maybe
    1081     $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
    1082     If a cross compiler is detected then cross compile mode will be used" >&2
     1079    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     1080    If a cross compiler is detected then cross compile mode will be used." >&2
    10831081  elif test "x$build_alias" != "x$host_alias"; then
    10841082    cross_compiling=yes
     
    10951093ac_ls_di=`ls -di .` &&
    10961094ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
    1097   as_fn_error $? "working directory cannot be determined"
     1095  as_fn_error "working directory cannot be determined"
    10981096test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    1099   as_fn_error $? "pwd does not report name of working directory"
     1097  as_fn_error "pwd does not report name of working directory"
    11001098
    11011099
     
    11361134if test ! -r "$srcdir/$ac_unique_file"; then
    11371135  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
    1138   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
     1136  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
    11391137fi
    11401138ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    11411139ac_abs_confdir=`(
    1142     cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
     1140    cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
    11431141    pwd)`
    11441142# When building in place, set srcdir=.
     
    11801178      --help=recursive    display the short help of all the included packages
    11811179  -V, --version           display version information and exit
    1182   -q, --quiet, --silent   do not print \`checking ...' messages
     1180  -q, --quiet, --silent   do not print \`checking...' messages
    11831181      --cache-file=FILE   cache test results in FILE [disabled]
    11841182  -C, --config-cache      alias for \`--cache-file=config.cache'
     
    13101308  cat <<\_ACEOF
    13111309configure
    1312 generated by GNU Autoconf 2.67
    1313 
    1314 Copyright (C) 2010 Free Software Foundation, Inc.
     1310generated by GNU Autoconf 2.65
     1311
     1312Copyright (C) 2009 Free Software Foundation, Inc.
    13151313This configure script is free software; the Free Software Foundation
    13161314gives unlimited permission to copy, distribute and modify it.
     
    13271325
    13281326It was created by $as_me, which was
    1329 generated by GNU Autoconf 2.67.  Invocation command line was
     1327generated by GNU Autoconf 2.65.  Invocation command line was
    13301328
    13311329  $ $0 $@
     
    14371435    echo
    14381436
    1439     $as_echo "## ---------------- ##
     1437    cat <<\_ASBOX
     1438## ---------------- ##
    14401439## Cache variables. ##
    1441 ## ---------------- ##"
     1440## ---------------- ##
     1441_ASBOX
    14421442    echo
    14431443    # The following way of writing the cache mishandles newlines in values,
     
    14731473    echo
    14741474
    1475     $as_echo "## ----------------- ##
     1475    cat <<\_ASBOX
     1476## ----------------- ##
    14761477## Output variables. ##
    1477 ## ----------------- ##"
     1478## ----------------- ##
     1479_ASBOX
    14781480    echo
    14791481    for ac_var in $ac_subst_vars
     
    14881490
    14891491    if test -n "$ac_subst_files"; then
    1490       $as_echo "## ------------------- ##
     1492      cat <<\_ASBOX
     1493## ------------------- ##
    14911494## File substitutions. ##
    1492 ## ------------------- ##"
     1495## ------------------- ##
     1496_ASBOX
    14931497      echo
    14941498      for ac_var in $ac_subst_files
     
    15041508
    15051509    if test -s confdefs.h; then
    1506       $as_echo "## ----------- ##
     1510      cat <<\_ASBOX
     1511## ----------- ##
    15071512## confdefs.h. ##
    1508 ## ----------- ##"
     1513## ----------- ##
     1514_ASBOX
    15091515      echo
    15101516      cat confdefs.h
     
    15611567ac_site_file2=NONE
    15621568if test -n "$CONFIG_SITE"; then
    1563   # We do not want a PATH search for config.site.
    1564   case $CONFIG_SITE in #((
    1565     -*)  ac_site_file1=./$CONFIG_SITE;;
    1566     */*) ac_site_file1=$CONFIG_SITE;;
    1567     *)   ac_site_file1=./$CONFIG_SITE;;
    1568   esac
     1569  ac_site_file1=$CONFIG_SITE
    15691570elif test "x$prefix" != xNONE; then
    15701571  ac_site_file1=$prefix/share/config.site
     
    15811582$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    15821583    sed 's/^/| /' "$ac_site_file" >&5
    1583     . "$ac_site_file" \
    1584       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1585 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1586 as_fn_error $? "failed to load site script $ac_site_file
    1587 See \`config.log' for more details" "$LINENO" 5 ; }
     1584    . "$ac_site_file"
    15881585  fi
    15891586done
     
    16611658  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    16621659$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    1663   as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
     1660  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    16641661fi
    16651662## -------------------- ##
     
    17761773  ENABLE_LUCENE=0
    17771774fi
    1778 
    1779 
    1780 
    1781 cat >>confdefs.h <<_ACEOF
    1782 #define COMPAT32BITFLAGS $COMPAT32BITFLAGS
    1783 _ACEOF
    1784 
    17851775
    17861776
     
    18771867
    18781868  fi
    1879   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     1869  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    18801870else
    18811871  echo "Checking for javac... $JAVAC"
     
    18921882CLASS_TEST=Test.class
    18931883cat << \EOF > $JAVA_TEST
    1894 /* #line 1894 "configure" */
     1884/* #line 1884 "configure" */
    18951885public class Test {
    18961886}
     
    19041894  ac_cv_prog_javac_works=yes
    19051895else
    1906   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     1896  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    19071897  echo "configure: failed program was:" >&5
    19081898  cat $JAVA_TEST >&5
     
    20091999
    20102000    fi
    2011     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     2001    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    20122002fi
    20132003
     
    20712061        ac_cv_prog_uudecode_base64=yes
    20722062else
    2073         echo "configure: 2073: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     2063        echo "configure: 2063: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    20742064        echo "configure: failed file was:" >&5
    20752065        cat Test.uue >&5
     
    20862076$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    20872077        if test x$ac_cv_prog_javac_works = xno; then
    2088                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     2078                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    20892079        fi
    20902080        if test x$ac_cv_prog_javac_works = x; then
     
    21792169
    21802170  fi
    2181   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     2171  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    21822172else
    21832173  echo "Checking for javac... $JAVAC"
     
    21942184CLASS_TEST=Test.class
    21952185cat << \EOF > $JAVA_TEST
    2196 /* #line 2196 "configure" */
     2186/* #line 2186 "configure" */
    21972187public class Test {
    21982188}
     
    22062196  ac_cv_prog_javac_works=yes
    22072197else
    2208   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     2198  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    22092199  echo "configure: failed program was:" >&5
    22102200  cat $JAVA_TEST >&5
     
    22332223TEST=Test
    22342224cat << \EOF > $JAVA_TEST
    2235 /* [#]line 2235 "configure" */
     2225/* [#]line 2225 "configure" */
    22362226public class Test {
    22372227public static void main (String args[]) {
     
    22502240          echo "configure: failed program was:" >&5
    22512241          cat $JAVA_TEST >&5
    2252           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     2242          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    22532243        fi
    22542244fi
     
    22632253  echo "configure: failed program was:" >&5
    22642254  cat $JAVA_TEST >&5
    2265   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     2255  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    22662256fi
    22672257rm -fr $JAVA_TEST $CLASS_TEST Test.uue
     
    22922282ac_aux_dir=
    22932283for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
    2294   if test -f "$ac_dir/install-sh"; then
    2295     ac_aux_dir=$ac_dir
    2296     ac_install_sh="$ac_aux_dir/install-sh -c"
    2297     break
    2298   elif test -f "$ac_dir/install.sh"; then
    2299     ac_aux_dir=$ac_dir
    2300     ac_install_sh="$ac_aux_dir/install.sh -c"
    2301     break
    2302   elif test -f "$ac_dir/shtool"; then
    2303     ac_aux_dir=$ac_dir
    2304     ac_install_sh="$ac_aux_dir/shtool install -c"
    2305     break
    2306   fi
     2284  for ac_t in install-sh install.sh shtool; do
     2285    if test -f "$ac_dir/$ac_t"; then
     2286      ac_aux_dir=$ac_dir
     2287      ac_install_sh="$ac_aux_dir/$ac_t -c"
     2288      break 2
     2289    fi
     2290  done
    23072291done
    23082292if test -z "$ac_aux_dir"; then
    2309   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     2293  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    23102294fi
    23112295
     
    24742458ac_libobjs=
    24752459ac_ltlibobjs=
    2476 U=
    24772460for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    24782461  # 1. Remove the extension, and $U if already installed.
     
    26362619
    26372620
    2638 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    2639 # ----------------------------------------
     2621# as_fn_error ERROR [LINENO LOG_FD]
     2622# ---------------------------------
    26402623# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    26412624# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    2642 # script with STATUS, using 1 if that was 0.
     2625# script with status $?, using 1 if that was 0.
    26432626as_fn_error ()
    26442627{
    2645   as_status=$1; test $as_status -eq 0 && as_status=1
    2646   if test "$4"; then
    2647     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    2648     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     2628  as_status=$?; test $as_status -eq 0 && as_status=1
     2629  if test "$3"; then
     2630    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2631    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
    26492632  fi
    2650   $as_echo "$as_me: error: $2" >&2
     2633  $as_echo "$as_me: error: $1" >&2
    26512634  as_fn_exit $as_status
    26522635} # as_fn_error
     
    28442827    done
    28452828    test -z "$as_dirs" || eval "mkdir $as_dirs"
    2846   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
     2829  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
    28472830
    28482831
     
    28982881ac_log="
    28992882This file was extended by $as_me, which was
    2900 generated by GNU Autoconf 2.67.  Invocation command line was
     2883generated by GNU Autoconf 2.65.  Invocation command line was
    29012884
    29022885  CONFIG_FILES    = $CONFIG_FILES
     
    29512934ac_cs_version="\\
    29522935config.status
    2953 configured by $0, generated by GNU Autoconf 2.67,
     2936configured by $0, generated by GNU Autoconf 2.65,
    29542937  with options \\"\$ac_cs_config\\"
    29552938
    2956 Copyright (C) 2010 Free Software Foundation, Inc.
     2939Copyright (C) 2009 Free Software Foundation, Inc.
    29572940This config.status script is free software; the Free Software Foundation
    29582941gives unlimited permission to copy, distribute and modify it."
     
    29692952do
    29702953  case $1 in
    2971   --*=?*)
     2954  --*=*)
    29722955    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    29732956    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    2974     ac_shift=:
    2975     ;;
    2976   --*=)
    2977     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    2978     ac_optarg=
    29792957    ac_shift=:
    29802958    ;;
     
    30002978    case $ac_optarg in
    30012979    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    3002     '') as_fn_error $? "missing file argument" ;;
    30032980    esac
    30042981    as_fn_append CONFIG_FILES " '$ac_optarg'"
     
    30112988
    30122989  # This is an error.
    3013   -*) as_fn_error $? "unrecognized option: \`$1'
     2990  -*) as_fn_error "unrecognized option: \`$1'
    30142991Try \`$0 --help' for more information." ;;
    30152992
     
    30633040    "$srclist") CONFIG_FILES="$CONFIG_FILES $srclist" ;;
    30643041
    3065   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     3042  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    30663043  esac
    30673044done
     
    30993076  tmp=./conf$$-$RANDOM
    31003077  (umask 077 && mkdir "$tmp")
    3101 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     3078} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    31023079
    31033080# Set up the scripts for CONFIG_FILES section.
     
    31163093ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    31173094if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    3118   ac_cs_awk_cr='\\r'
     3095  ac_cs_awk_cr='\r'
    31193096else
    31203097  ac_cs_awk_cr=$ac_cr
     
    31303107  echo "_ACEOF"
    31313108} >conf$$subs.sh ||
    3132   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    3133 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     3109  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     3110ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    31343111ac_delim='%!_!# '
    31353112for ac_last_try in false false false false false :; do
    31363113  . ./conf$$subs.sh ||
    3137     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     3114    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    31383115
    31393116  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
     
    31413118    break
    31423119  elif $ac_last_try; then
    3143     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     3120    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    31443121  else
    31453122    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
     
    32303207  cat
    32313208fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    3232   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
     3209  || as_fn_error "could not setup config files machinery" "$LINENO" 5
    32333210_ACEOF
    32343211
    3235 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    3236 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     3212# VPATH may cause trouble with some makes, so we remove $(srcdir),
     3213# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
    32373214# trailing colons and then remove the whole line if VPATH becomes empty
    32383215# (actually we leave an empty line to preserve line numbers).
    32393216if test "x$srcdir" = x.; then
    3240   ac_vpsub='/^[  ]*VPATH[    ]*=[    ]*/{
    3241 h
    3242 s///
    3243 s/^/:/
    3244 s/[  ]*$/:/
    3245 s/:\$(srcdir):/:/g
    3246 s/:\${srcdir}:/:/g
    3247 s/:@srcdir@:/:/g
    3248 s/^:*//
     3217  ac_vpsub='/^[  ]*VPATH[    ]*=/{
     3218s/:*\$(srcdir):*/:/
     3219s/:*\${srcdir}:*/:/
     3220s/:*@srcdir@:*/:/
     3221s/^\([^=]*=[     ]*\):*/\1/
    32493222s/:*$//
    3250 x
    3251 s/\(=[   ]*\).*/\1/
    3252 G
    3253 s/\n//
    32543223s/^[^=]*=[   ]*$//
    32553224}'
     
    32693238  case $ac_mode$ac_tag in
    32703239  :[FHL]*:*);;
    3271   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
     3240  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
    32723241  :[FH]-) ac_tag=-:-;;
    32733242  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
     
    32973266       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    32983267       esac ||
    3299        as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
     3268       as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
    33003269      esac
    33013270      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
     
    33243293    case $ac_tag in
    33253294    *:-:* | *:-) cat >"$tmp/stdin" \
    3326       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     3295      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
    33273296    esac
    33283297    ;;
     
    34503419"
    34513420eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    3452   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     3421  || as_fn_error "could not create $ac_file" "$LINENO" 5
    34533422
    34543423test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
     
    34563425  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    34573426  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    3458 which seems to be undefined.  Please make sure it is defined" >&5
     3427which seems to be undefined.  Please make sure it is defined." >&5
    34593428$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    3460 which seems to be undefined.  Please make sure it is defined" >&2;}
     3429which seems to be undefined.  Please make sure it is defined." >&2;}
    34613430
    34623431  rm -f "$tmp/stdin"
     
    34653434  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    34663435  esac \
    3467   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     3436  || as_fn_error "could not create $ac_file" "$LINENO" 5
    34683437 ;;
    34693438
     
    34803449
    34813450test $ac_write_fail = 0 ||
    3482   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     3451  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    34833452
    34843453
     
    35013470  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    35023471  # would make configure fail if this is the last instruction.
    3503   $ac_cs_success || as_fn_exit 1
     3472  $ac_cs_success || as_fn_exit $?
    35043473fi
    35053474
     
    36423611      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
    36433612       --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
    3644     as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     3613    as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
    36453614    fi
    36463615
Note: See TracChangeset for help on using the changeset viewer.