diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 353 | 
1 files changed, 187 insertions, 166 deletions
| @@ -1,11 +1,11 @@  #! /bin/sh  # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.67.  #  #  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc.  #  #  # This configure script is free software; the Free Software Foundation @@ -316,7 +316,7 @@ $as_echo X"$as_dir" |        test -d "$as_dir" && break      done      test -z "$as_dirs" || eval "mkdir $as_dirs" -  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"  } # as_fn_mkdir_p @@ -356,19 +356,19 @@ else  fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ----------------------------------------  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0.  as_fn_error ()  { -  as_status=$?; test $as_status -eq 0 && as_status=1 -  if test "$3"; then -    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 +  as_status=$1; test $as_status -eq 0 && as_status=1 +  if test "$4"; then +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4    fi -  $as_echo "$as_me: error: $1" >&2 +  $as_echo "$as_me: error: $2" >&2    as_fn_exit $as_status  } # as_fn_error @@ -530,7 +530,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null  exec 6>&1  # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,  # so uname gets run too.  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -835,8 +835,9 @@ do    fi    case $ac_option in -  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -  *)	ac_optarg=yes ;; +  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +  *=)   ac_optarg= ;; +  *)    ac_optarg=yes ;;    esac    # Accept the important Cygnus configure options, so we can diagnose typos. @@ -881,7 +882,7 @@ do      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`      # Reject names that are not valid shell variable names.      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -      as_fn_error "invalid feature name: $ac_useropt" +      as_fn_error $? "invalid feature name: $ac_useropt"      ac_useropt_orig=$ac_useropt      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`      case $ac_user_opts in @@ -907,7 +908,7 @@ do      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`      # Reject names that are not valid shell variable names.      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -      as_fn_error "invalid feature name: $ac_useropt" +      as_fn_error $? "invalid feature name: $ac_useropt"      ac_useropt_orig=$ac_useropt      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`      case $ac_user_opts in @@ -1111,7 +1112,7 @@ do      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`      # Reject names that are not valid shell variable names.      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -      as_fn_error "invalid package name: $ac_useropt" +      as_fn_error $? "invalid package name: $ac_useropt"      ac_useropt_orig=$ac_useropt      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`      case $ac_user_opts in @@ -1127,7 +1128,7 @@ do      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`      # Reject names that are not valid shell variable names.      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -      as_fn_error "invalid package name: $ac_useropt" +      as_fn_error $? "invalid package name: $ac_useropt"      ac_useropt_orig=$ac_useropt      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`      case $ac_user_opts in @@ -1157,8 +1158,8 @@ do    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)      x_libraries=$ac_optarg ;; -  -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." +  -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information"      ;;    *=*) @@ -1166,7 +1167,7 @@ Try \`$0 --help' for more information."      # Reject names that are not valid shell variable names.      case $ac_envvar in #(        '' | [0-9]* | *[!_$as_cr_alnum]* ) -      as_fn_error "invalid variable name: \`$ac_envvar'" ;; +      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;      esac      eval $ac_envvar=\$ac_optarg      export $ac_envvar ;; @@ -1184,13 +1185,13 @@ done  if test -n "$ac_prev"; then    ac_option=--`echo $ac_prev | sed 's/_/-/g'` -  as_fn_error "missing argument to $ac_option" +  as_fn_error $? "missing argument to $ac_option"  fi  if test -n "$ac_unrecognized_opts"; then    case $enable_option_checking in      no) ;; -    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; +    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;    esac  fi @@ -1213,7 +1214,7 @@ do      [\\/$]* | ?:[\\/]* )  continue;;      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;    esac -  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" +  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"  done  # There might be people who depend on the old broken behavior: `$host' @@ -1227,8 +1228,8 @@ target=$target_alias  if test "x$host_alias" != x; then    if test "x$build_alias" = x; then      cross_compiling=maybe -    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -    If a cross compiler is detected then cross compile mode will be used." >&2 +    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. +    If a cross compiler is detected then cross compile mode will be used" >&2    elif test "x$build_alias" != "x$host_alias"; then      cross_compiling=yes    fi @@ -1243,9 +1244,9 @@ test "$silent" = yes && exec 6>/dev/null  ac_pwd=`pwd` && test -n "$ac_pwd" &&  ac_ls_di=`ls -di .` &&  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -  as_fn_error "working directory cannot be determined" +  as_fn_error $? "working directory cannot be determined"  test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -  as_fn_error "pwd does not report name of working directory" +  as_fn_error $? "pwd does not report name of working directory"  # Find the source files, if location was not specified. @@ -1284,11 +1285,11 @@ else  fi  if test ! -r "$srcdir/$ac_unique_file"; then    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" +  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"  fi  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"  ac_abs_confdir=`( -	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" +	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"  	pwd)`  # When building in place, set srcdir=.  if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1328,7 +1329,7 @@ Configuration:        --help=short        display options specific to this package        --help=recursive    display the short help of all the included packages    -V, --version           display version information and exit -  -q, --quiet, --silent   do not print \`checking...' messages +  -q, --quiet, --silent   do not print \`checking ...' messages        --cache-file=FILE   cache test results in FILE [disabled]    -C, --config-cache      alias for \`--cache-file=config.cache'    -n, --no-create         do not create output files @@ -1498,9 +1499,9 @@ test -n "$ac_init_help" && exit $ac_status  if $ac_init_version; then    cat <<\_ACEOF  configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc.  This configure script is free software; the Free Software Foundation  gives unlimited permission to copy, distribute and modify it.  _ACEOF @@ -1616,7 +1617,7 @@ $as_echo "$ac_try_echo"; } >&5      mv -f conftest.er1 conftest.err    fi    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -  test $ac_status = 0; } >/dev/null && { +  test $ac_status = 0; } > conftest.i && {  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||  	 test ! -s conftest.err         }; then : @@ -1682,10 +1683,10 @@ fi  ac_fn_c_check_header_mongrel ()  {    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +  if eval "test \"\${$3+set}\"" = set; then :    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5  $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then :    $as_echo_n "(cached) " >&6  fi  eval ac_res=\$$3 @@ -1721,7 +1722,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :  else    ac_header_preproc=no  fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5  $as_echo "$ac_header_preproc" >&6; } @@ -1748,7 +1749,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}  esac    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5  $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then :    $as_echo_n "(cached) " >&6  else    eval "$3=\$ac_header_compiler" @@ -1770,7 +1771,7 @@ ac_fn_c_check_header_compile ()    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5  $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then :    $as_echo_n "(cached) " >&6  else    cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1800,7 +1801,7 @@ ac_fn_c_check_func ()    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5  $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then :    $as_echo_n "(cached) " >&6  else    cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1863,7 +1864,7 @@ This file contains any messages produced by compilers while  running configure, to aid debugging if configure makes a mistake.  It was created by $as_me, which was -generated by GNU Autoconf 2.65.  Invocation command line was +generated by GNU Autoconf 2.67.  Invocation command line was    $ $0 $@ @@ -1973,11 +1974,9 @@ trap 'exit_status=$?    {      echo -    cat <<\_ASBOX -## ---------------- ## +    $as_echo "## ---------------- ##  ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##"      echo      # The following way of writing the cache mishandles newlines in values,  ( @@ -2011,11 +2010,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;  )      echo -    cat <<\_ASBOX -## ----------------- ## +    $as_echo "## ----------------- ##  ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##"      echo      for ac_var in $ac_subst_vars      do @@ -2028,11 +2025,9 @@ _ASBOX      echo      if test -n "$ac_subst_files"; then -      cat <<\_ASBOX -## ------------------- ## +      $as_echo "## ------------------- ##  ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##"        echo        for ac_var in $ac_subst_files        do @@ -2046,11 +2041,9 @@ _ASBOX      fi      if test -s confdefs.h; then -      cat <<\_ASBOX -## ----------- ## +      $as_echo "## ----------- ##  ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##"        echo        cat confdefs.h        echo @@ -2105,7 +2098,12 @@ _ACEOF  ac_site_file1=NONE  ac_site_file2=NONE  if test -n "$CONFIG_SITE"; then -  ac_site_file1=$CONFIG_SITE +  # We do not want a PATH search for config.site. +  case $CONFIG_SITE in #(( +    -*)  ac_site_file1=./$CONFIG_SITE;; +    */*) ac_site_file1=$CONFIG_SITE;; +    *)   ac_site_file1=./$CONFIG_SITE;; +  esac  elif test "x$prefix" != xNONE; then    ac_site_file1=$prefix/share/config.site    ac_site_file2=$prefix/etc/config.site @@ -2120,7 +2118,11 @@ do      { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5  $as_echo "$as_me: loading site script $ac_site_file" >&6;}      sed 's/^/| /' "$ac_site_file" >&5 -    . "$ac_site_file" +    . "$ac_site_file" \ +      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; }    fi  done @@ -2196,7 +2198,7 @@ if $ac_cache_corrupted; then  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}    { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5  fi  ## -------------------- ##  ## Main body of script. ## @@ -2213,16 +2215,22 @@ am__api_version='1.11'  ac_aux_dir=  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -  for ac_t in install-sh install.sh shtool; do -    if test -f "$ac_dir/$ac_t"; then -      ac_aux_dir=$ac_dir -      ac_install_sh="$ac_aux_dir/$ac_t -c" -      break 2 -    fi -  done +  if test -f "$ac_dir/install-sh"; then +    ac_aux_dir=$ac_dir +    ac_install_sh="$ac_aux_dir/install-sh -c" +    break +  elif test -f "$ac_dir/install.sh"; then +    ac_aux_dir=$ac_dir +    ac_install_sh="$ac_aux_dir/install.sh -c" +    break +  elif test -f "$ac_dir/shtool"; then +    ac_aux_dir=$ac_dir +    ac_install_sh="$ac_aux_dir/shtool install -c" +    break +  fi  done  if test -z "$ac_aux_dir"; then -  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5  fi  # These three variables are undocumented and unsupported, @@ -2338,11 +2346,11 @@ am_lf='  '  case `pwd` in    *[\\\"\#\$\&\'\`$am_lf]*) -    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;  esac  case $srcdir in    *[\\\"\#\$\&\'\`$am_lf\ \	]*) -    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;  esac  # Do `set' in a subshell so we don't clobber the current shell's @@ -2364,7 +2372,7 @@ if (        # if, for instance, CONFIG_SHELL is bash and it inherits a        # broken ls alias from the environment.  This has actually        # happened.  Such a system could not be considered "sane". -      as_fn_error "ls -t appears to fail.  Make sure there is not a broken +      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken  alias in your environment" "$LINENO" 5     fi @@ -2374,7 +2382,7 @@ then     # Ok.     :  else -   as_fn_error "newly created file is older than distributed files! +   as_fn_error $? "newly created file is older than distributed files!  Check your system clock" "$LINENO" 5  fi  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2612,7 +2620,7 @@ done  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }  set x ${MAKE-make}  ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :    $as_echo_n "(cached) " >&6  else    cat >conftest.make <<\_ACEOF @@ -2620,7 +2628,7 @@ SHELL = /bin/sh  all:  	@echo '@@@%%%=$(MAKE)=@@@%%%'  _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.  case `${MAKE-make} -f conftest.make 2>/dev/null` in    *@@@%%%=?*=@@@%%%*)      eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2654,7 +2662,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then    am__isrc=' -I$(srcdir)'    # test to see if srcdir already configured    if test -f $srcdir/config.status; then -    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 +    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5    fi  fi @@ -2670,7 +2678,7 @@ fi  # Define the identity of the package.   PACKAGE=simple-scan - VERSION=2.31.5 + VERSION=2.31.90.1  cat >>confdefs.h <<_ACEOF @@ -3121,8 +3129,8 @@ fi  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; }  # Provide some information about the compiler.  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3236,9 +3244,8 @@ sed 's/^/| /' conftest.$ac_ext >&5  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; }  else    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5  $as_echo "yes" >&6; } @@ -3280,8 +3287,8 @@ done  else    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; }  fi  rm -f conftest conftest$ac_cv_exeext  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3338,9 +3345,9 @@ $as_echo "$ac_try_echo"; } >&5      else  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs.  If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; }      fi    fi  fi @@ -3391,8 +3398,8 @@ sed 's/^/| /' conftest.$ac_ext >&5  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; }  fi  rm -f conftest.$ac_cv_objext conftest.$ac_ext  fi @@ -3805,7 +3812,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }  fi  set dummy $CC; ac_cc=`$as_echo "$2" |  		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :    $as_echo_n "(cached) " >&6  else    cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4207,8 +4214,8 @@ fi  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; }  # Provide some information about the compiler.  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4619,7 +4626,7 @@ else    # Broken: fails on valid input.  continue  fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext    # OK, works on sane cases.  Now check whether nonexistent headers    # can be detected and how. @@ -4635,11 +4642,11 @@ else  ac_preproc_ok=:  break  fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext  done  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext  if $ac_preproc_ok; then :    break  fi @@ -4678,7 +4685,7 @@ else    # Broken: fails on valid input.  continue  fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext    # OK, works on sane cases.  Now check whether nonexistent headers    # can be detected and how. @@ -4694,18 +4701,18 @@ else  ac_preproc_ok=:  break  fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext  done  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext  if $ac_preproc_ok; then :  else    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; }  fi  ac_ext=c @@ -4766,7 +4773,7 @@ esac    done  IFS=$as_save_IFS    if test -z "$ac_cv_path_GREP"; then -    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5    fi  else    ac_cv_path_GREP=$GREP @@ -4832,7 +4839,7 @@ esac    done  IFS=$as_save_IFS    if test -z "$ac_cv_path_EGREP"; then -    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5    fi  else    ac_cv_path_EGREP=$EGREP @@ -4995,7 +5002,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&  if test "${enable_schemas_install+set}" = set; then :    enableval=$enable_schemas_install; case ${enableval} in         yes|no) ;; -       *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; +       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5  ;;        esac  fi @@ -5077,7 +5084,7 @@ $as_echo "$has_option" >&6; }  	fi  	;;      *) -	as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 +	as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5  	;;      esac      CFLAGS="$realsave_CFLAGS" @@ -5384,7 +5391,7 @@ fi  	# Put the nasty error message in config.log where it belongs  	echo "$SIMPLE_SCAN_PKG_ERRORS" >&5 -	as_fn_error "Package requirements ( +	as_fn_error $? "Package requirements (      gtk+-2.0 >= $GTK_REQUIRED      gconf-2.0      gmodule-export-2.0 @@ -5410,7 +5417,7 @@ elif test $pkg_failed = untried; then  $as_echo "no" >&6; }  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old.  Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it  is in your PATH or set the PKG_CONFIG environment variable to the full  path to pkg-config. @@ -5419,7 +5426,7 @@ and SIMPLE_SCAN_LIBS to avoid the need to call pkg-config.  See the pkg-config man page for more details.  To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; }  else  	SIMPLE_SCAN_CFLAGS=$pkg_cv_SIMPLE_SCAN_CFLAGS  	SIMPLE_SCAN_LIBS=$pkg_cv_SIMPLE_SCAN_LIBS @@ -5435,8 +5442,7 @@ do :    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default  " -eval as_val=\$$as_ac_Header -   if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :    cat >>confdefs.h <<_ACEOF  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1  _ACEOF @@ -5455,7 +5461,7 @@ if test "x$ac_cv_header_sane_sane_h" = x""yes; then :  _ACEOF  else -  as_fn_error "SANE not found" "$LINENO" 5 +  as_fn_error $? "SANE not found" "$LINENO" 5  fi  done @@ -5469,7 +5475,7 @@ if test "x$ac_cv_header_sane_saneopts_h" = x""yes; then :  _ACEOF  else -  as_fn_error "SANE not found" "$LINENO" 5 +  as_fn_error $? "SANE not found" "$LINENO" 5  fi  done @@ -5483,7 +5489,7 @@ if test "x$ac_cv_header_jpeglib_h" = x""yes; then :  _ACEOF  else -  as_fn_error "libjpeg not found" "$LINENO" 5 +  as_fn_error $? "libjpeg not found" "$LINENO" 5  fi  done @@ -5524,7 +5530,7 @@ $as_echo "yes" >&6; }  else  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5  $as_echo "no" >&6; } -	as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 +	as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5  fi @@ -5610,7 +5616,7 @@ $as_echo "$USE_NLS" >&6; }  case "$am__api_version" in      1.01234) -	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 +	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5      ;;      *)      ;; @@ -5627,7 +5633,7 @@ $as_echo_n "checking for intltool >= 0.35.0... " >&6; }      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5  $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }      test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -	as_fn_error "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5 +	as_fn_error $? "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5  fi  # Extract the first word of "intltool-update", so it can be a program name with args. @@ -5751,7 +5757,7 @@ fi  if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then -    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 +    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5  fi    INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -6033,13 +6039,13 @@ fi  if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then -    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 +    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5  fi  xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"  mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"  mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"  if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then -    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 +    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5  fi  # Extract the first word of "perl", so it can be a program name with args. @@ -6083,13 +6089,13 @@ fi  if test -z "$INTLTOOL_PERL"; then -   as_fn_error "perl not found" "$LINENO" 5 +   as_fn_error $? "perl not found" "$LINENO" 5  fi  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5  $as_echo_n "checking for perl >= 5.8.1... " >&6; }  $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1  if test $? -ne 0; then -   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 +   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5  else     IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -6102,7 +6108,7 @@ $as_echo_n "checking for XML::Parser... " >&6; }         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5  $as_echo "ok" >&6; }     else -       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 +       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5     fi  fi @@ -6979,6 +6985,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`  ac_libobjs=  ac_ltlibobjs= +U=  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue    # 1. Remove the extension, and $U if already installed.    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -7002,31 +7009,31 @@ else  fi  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. +  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.  Usually this means the macro was only invoked conditionally." "$LINENO" 5  fi  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -  as_fn_error "conditional \"AMDEP\" was never defined. +  as_fn_error $? "conditional \"AMDEP\" was never defined.  Usually this means the macro was only invoked conditionally." "$LINENO" 5  fi  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -  as_fn_error "conditional \"am__fastdepCC\" was never defined. +  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.  Usually this means the macro was only invoked conditionally." "$LINENO" 5  fi  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -  as_fn_error "conditional \"am__fastdepCC\" was never defined. +  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.  Usually this means the macro was only invoked conditionally." "$LINENO" 5  fi  if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then -  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.  Usually this means the macro was only invoked conditionally." "$LINENO" 5  fi  if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then -  as_fn_error "conditional \"ENABLE_SK\" was never defined. +  as_fn_error $? "conditional \"ENABLE_SK\" was never defined.  Usually this means the macro was only invoked conditionally." "$LINENO" 5  fi  if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then -  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +  as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.  Usually this means the macro was only invoked conditionally." "$LINENO" 5  fi @@ -7180,19 +7187,19 @@ export LANGUAGE  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ----------------------------------------  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0.  as_fn_error ()  { -  as_status=$?; test $as_status -eq 0 && as_status=1 -  if test "$3"; then -    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 +  as_status=$1; test $as_status -eq 0 && as_status=1 +  if test "$4"; then +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4    fi -  $as_echo "$as_me: error: $1" >&2 +  $as_echo "$as_me: error: $2" >&2    as_fn_exit $as_status  } # as_fn_error @@ -7388,7 +7395,7 @@ $as_echo X"$as_dir" |        test -d "$as_dir" && break      done      test -z "$as_dirs" || eval "mkdir $as_dirs" -  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"  } # as_fn_mkdir_p @@ -7442,7 +7449,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1  # values after options handling.  ac_log="  This file was extended by $as_me, which was -generated by GNU Autoconf 2.65.  Invocation command line was +generated by GNU Autoconf 2.67.  Invocation command line was    CONFIG_FILES    = $CONFIG_FILES    CONFIG_HEADERS  = $CONFIG_HEADERS @@ -7499,10 +7506,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"  ac_cs_version="\\  config.status -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.67,    with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc.  This config.status script is free software; the Free Software Foundation  gives unlimited permission to copy, distribute and modify it." @@ -7520,11 +7527,16 @@ ac_need_defaults=:  while test $# != 0  do    case $1 in -  --*=*) +  --*=?*)      ac_option=`expr "X$1" : 'X\([^=]*\)='`      ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`      ac_shift=:      ;; +  --*=) +    ac_option=`expr "X$1" : 'X\([^=]*\)='` +    ac_optarg= +    ac_shift=: +    ;;    *)      ac_option=$1      ac_optarg=$2 @@ -7546,6 +7558,7 @@ do      $ac_shift      case $ac_optarg in      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +    '') as_fn_error $? "missing file argument" ;;      esac      as_fn_append CONFIG_FILES " '$ac_optarg'"      ac_need_defaults=false;; @@ -7556,7 +7569,7 @@ do      ac_cs_silent=: ;;    # This is an error. -  -*) as_fn_error "unrecognized option: \`$1' +  -*) as_fn_error $? "unrecognized option: \`$1'  Try \`$0 --help' for more information." ;;    *) as_fn_append ac_config_targets " $1" @@ -7621,7 +7634,7 @@ do      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; -  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;    esac  done @@ -7658,7 +7671,7 @@ $debug ||  {    tmp=./conf$$-$RANDOM    (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5  # Set up the scripts for CONFIG_FILES section.  # No need to generate them if there are no CONFIG_FILES. @@ -7675,7 +7688,7 @@ if test "x$ac_cr" = x; then  fi  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -  ac_cs_awk_cr='\r' +  ac_cs_awk_cr='\\r'  else    ac_cs_awk_cr=$ac_cr  fi @@ -7689,18 +7702,18 @@ _ACEOF    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&    echo "_ACEOF"  } >conf$$subs.sh || -  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` +  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`  ac_delim='%!_!# '  for ac_last_try in false false false false false :; do    . ./conf$$subs.sh || -    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5    ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`    if test $ac_delim_n = $ac_delim_num; then      break    elif $ac_last_try; then -    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5    else      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "    fi @@ -7789,20 +7802,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then  else    cat  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -  || as_fn_error "could not setup config files machinery" "$LINENO" 5 +  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5  _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and  # trailing colons and then remove the whole line if VPATH becomes empty  # (actually we leave an empty line to preserve line numbers).  if test "x$srcdir" = x.; then -  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[	 ]*\):*/\1/ +  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{ +h +s/// +s/^/:/ +s/[	 ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*//  s/:*$// +x +s/\(=[	 ]*\).*/\1/ +G +s/\n//  s/^[^=]*=[	 ]*$//  }'  fi @@ -7820,7 +7841,7 @@ do    esac    case $ac_mode$ac_tag in    :[FHL]*:*);; -  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;    :[FH]-) ac_tag=-:-;;    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;    esac @@ -7848,7 +7869,7 @@ do  	   [\\/$]*) false;;  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;  	   esac || -	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;        esac        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac        as_fn_append ac_file_inputs " '$ac_f'" @@ -7875,7 +7896,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}      case $ac_tag in      *:-:* | *:-) cat >"$tmp/stdin" \ -      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;      esac      ;;    esac @@ -8012,22 +8033,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t  $ac_datarootdir_hack  "  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -  || as_fn_error "could not create $ac_file" "$LINENO" 5 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&    { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&    { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined.  Please make sure it is defined." >&5 +which seems to be undefined.  Please make sure it is defined" >&5  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined.  Please make sure it is defined." >&2;} +which seems to be undefined.  Please make sure it is defined" >&2;}    rm -f "$tmp/stdin"    case $ac_file in    -) cat "$tmp/out" && rm -f "$tmp/out";;    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;    esac \ -  || as_fn_error "could not create $ac_file" "$LINENO" 5 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5   ;; @@ -8138,7 +8159,7 @@ $as_echo X"$file" |        esac ;;      "po/stamp-it":C)      if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then -       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 +       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5      fi      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"      >"po/stamp-it.tmp" @@ -8166,7 +8187,7 @@ _ACEOF  ac_clean_files=$ac_clean_files_save  test $ac_write_fail = 0 || -  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 +  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5  # configure is writing to config.log, and then calls config.status. @@ -8187,7 +8208,7 @@ if test "$no_create" != yes; then    exec 5>>config.log    # Use ||, not &&, to avoid exiting from the if with $? = 1, which    # would make configure fail if this is the last instruction. -  $ac_cs_success || as_fn_exit $? +  $ac_cs_success || as_fn_exit 1  fi  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | 
