@@ -1,5 +1,5 @@

 Package: preprocessCore

-Version: 1.13.2

+Version: 1.13.3

 Title: A collection of pre-processing functions

 Author: Benjamin Milo Bolstad <bmb@bmbolstad.com>

 Maintainer: Benjamin Milo Bolstad <bmb@bmbolstad.com>

@@ -1,18 +1,22 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.63.

+# Generated by GNU Autoconf 2.66.

+#

 #

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 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

 # gives unlimited permission to copy, distribute and modify it.

-## --------------------- ##

-## M4sh Initialization.  ##

-## --------------------- ##

+## -------------------- ##

+## M4sh Initialization. ##

+## -------------------- ##

 # Be more Bourne compatible

 DUALCASE=1; export DUALCASE # for MKS sh

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

   emulate sh

   NULLCMD=:

   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

@@ -20,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   alias -g '${1+"$@"}'='"$@"'

   setopt NO_GLOB_SUBST

 else

-  case `(set -o) 2>/dev/null` in

-  *posix*) set -o posix ;;

+  case `(set -o) 2>/dev/null` in #(

+  *posix*) :

+    set -o posix ;; #(

+  *) :

+     ;;

 esac

-

 fi

-

-

-# PATH needs CR

-# Avoid depending upon Character Ranges.

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

-as_cr_digits='0123456789'

-as_cr_alnum=$as_cr_Letters$as_cr_digits

-

 as_nl='

 '

 export as_nl

@@ -44,7 +40,13 @@ export as_nl

 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

+# Prefer a ksh shell builtin over an external printf program on Solaris,

+# but without wasting forks for bash or zsh.

+if test -z "$BASH_VERSION$ZSH_VERSION" \

+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

+  as_echo='print -r --'

+  as_echo_n='print -rn --'

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

   as_echo='printf %s\n'

   as_echo_n='printf %s'

 else

@@ -55,7 +57,7 @@ else

     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'

     as_echo_n_body='eval

       arg=$1;

-      case $arg in

+      case $arg in #(

       *"$as_nl"*)

 	expr "X$arg" : "X\\(.*\\)$as_nl";

 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;

@@ -78,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; then

   }

 fi

-# Support unset when possible.

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

-  as_unset=unset

-else

-  as_unset=false

-fi

-

 # IFS

 # We need space, tab and new line, in precisely that order.  Quoting is

@@ -94,15 +89,15 @@ fi

 IFS=" ""	$as_nl"

 # Find who we are.  Look in the path if we contain no directory separator.

-case $0 in

+case $0 in #((

   *[\\/]* ) as_myself=$0 ;;

   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

 for as_dir in $PATH

 do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

-done

+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

+  done

 IFS=$as_save_IFS

      ;;

@@ -114,12 +109,16 @@ if test "x$as_myself" = x; then

 fi

 if test ! -f "$as_myself"; then

   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

-  { (exit 1); exit 1; }

+  exit 1

 fi

-# Work around bugs in pre-3.0 UWIN ksh.

-for as_var in ENV MAIL MAILPATH

-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

+# Unset variables that we do not need and which cause bugs (e.g. in

+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"

+# suppresses any "Segmentation fault" message there.  '((' could

+# trigger a bug in pdksh 5.2.14.

+for as_var in BASH_ENV ENV MAIL MAILPATH

+do eval test x\${$as_var+set} = xset \

+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

 done

 PS1='$ '

 PS2='> '

@@ -131,330 +130,299 @@ export LC_ALL

 LANGUAGE=C

 export LANGUAGE

-# Required to use basename.

-if expr a : '\(a\)' >/dev/null 2>&1 &&

-   test "X`expr 00001 : '.*\(...\)'`" = X001; then

-  as_expr=expr

-else

-  as_expr=false

-fi

-

-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

-  as_basename=basename

-else

-  as_basename=false

-fi

-

-

-# Name of the executable.

-as_me=`$as_basename -- "$0" ||

-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \

-	 X"$0" : 'X\(//\)$' \| \

-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||

-$as_echo X/"$0" |

-    sed '/^.*\/\([^/][^/]*\)\/*$/{

-	    s//\1/

-	    q

-	  }

-	  /^X\/\(\/\/\)$/{

-	    s//\1/

-	    q

-	  }

-	  /^X\/\(\/\).*/{

-	    s//\1/

-	    q

-	  }

-	  s/.*/./; q'`

-

 # CDPATH.

-$as_unset CDPATH

-

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

 if test "x$CONFIG_SHELL" = x; then

-  if (eval ":") 2>/dev/null; then

-  as_have_required=yes

+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :

+  emulate sh

+  NULLCMD=:

+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which

+  # is contrary to our usage.  Disable this feature.

+  alias -g '\${1+\"\$@\"}'='\"\$@\"'

+  setopt NO_GLOB_SUBST

 else

-  as_have_required=no

+  case \`(set -o) 2>/dev/null\` in #(

+  *posix*) :

+    set -o posix ;; #(

+  *) :

+     ;;

+esac

 fi

-

-  if test $as_have_required = yes &&	 (eval ":

-(as_func_return () {

-  (exit \$1)

-}

-as_func_success () {

-  as_func_return 0

-}

-as_func_failure () {

-  as_func_return 1

-}

-as_func_ret_success () {

-  return 0

-}

-as_func_ret_failure () {

-  return 1

-}

+"

+  as_required="as_fn_return () { (exit \$1); }

+as_fn_success () { as_fn_return 0; }

+as_fn_failure () { as_fn_return 1; }

+as_fn_ret_success () { return 0; }

+as_fn_ret_failure () { return 1; }

 exitcode=0

-if as_func_success; then

-  :

-else

-  exitcode=1

-  echo as_func_success failed.

-fi

-

-if as_func_failure; then

-  exitcode=1

-  echo as_func_failure succeeded.

-fi

+as_fn_success || { exitcode=1; echo as_fn_success failed.; }

+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }

+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }

+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }

+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :

-if as_func_ret_success; then

-  :

 else

-  exitcode=1

-  echo as_func_ret_success failed.

+  exitcode=1; echo positional parameters were not saved.

 fi

-

-if as_func_ret_failure; then

-  exitcode=1

-  echo as_func_ret_failure succeeded.

-fi

-

-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

-  :

+test x\$exitcode = x0 || exit 1"

+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO

+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1

+test \$(( 1 + 1 )) = 2 || exit 1"

+  if (eval "$as_required") 2>/dev/null; then :

+  as_have_required=yes

 else

-  exitcode=1

-  echo positional parameters were not saved.

+  as_have_required=no

 fi

+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :

-test \$exitcode = 0) || { (exit 1); exit 1; }

-

-(

-  as_lineno_1=\$LINENO

-  as_lineno_2=\$LINENO

-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&

-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }

-") 2> /dev/null; then

-  :

 else

-  as_candidate_shells=

-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+as_found=false

 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

 do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

-  case $as_dir in

+  as_found=:

+  case $as_dir in #(

 	 /*)

 	   for as_base in sh bash ksh sh5; do

-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"

+	     # Try only shells that exist, to save several forks.

+	     as_shell=$as_dir/$as_base

+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :

+  CONFIG_SHELL=$as_shell as_have_required=yes

+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :

+  break 2

+fi

+fi

 	   done;;

        esac

+  as_found=false

 done

+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&

+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :

+  CONFIG_SHELL=$SHELL as_have_required=yes

+fi; }

 IFS=$as_save_IFS

-      for as_shell in $as_candidate_shells $SHELL; do

-	 # Try only shells that exist, to save several forks.

-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

-		{ ("$as_shell") 2> /dev/null <<\_ASEOF

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

-  emulate sh

-  NULLCMD=:

-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

-  # is contrary to our usage.  Disable this feature.

-  alias -g '${1+"$@"}'='"$@"'

-  setopt NO_GLOB_SUBST

-else

-  case `(set -o) 2>/dev/null` in

-  *posix*) set -o posix ;;

-esac

-

-fi

-

-

-:

-_ASEOF

-}; then

-  CONFIG_SHELL=$as_shell

-	       as_have_required=yes

-	       if { "$as_shell" 2> /dev/null <<\_ASEOF

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

-  emulate sh

-  NULLCMD=:

-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

-  # is contrary to our usage.  Disable this feature.

-  alias -g '${1+"$@"}'='"$@"'

-  setopt NO_GLOB_SUBST

-else

-  case `(set -o) 2>/dev/null` in

-  *posix*) set -o posix ;;

-esac

-

-fi

-

-

-:

-(as_func_return () {

-  (exit $1)

-}

-as_func_success () {

-  as_func_return 0

-}

-as_func_failure () {

-  as_func_return 1

-}

-as_func_ret_success () {

-  return 0

-}

-as_func_ret_failure () {

-  return 1

-}

-

-exitcode=0

-if as_func_success; then

-  :

-else

-  exitcode=1

-  echo as_func_success failed.

-fi

-

-if as_func_failure; then

-  exitcode=1

-  echo as_func_failure succeeded.

-fi

-

-if as_func_ret_success; then

-  :

-else

-  exitcode=1

-  echo as_func_ret_success failed.

-fi

-

-if as_func_ret_failure; then

-  exitcode=1

-  echo as_func_ret_failure succeeded.

-fi

-

-if ( set x; as_func_ret_success y && test x = "$1" ); then

-  :

-else

-  exitcode=1

-  echo positional parameters were not saved.

-fi

-

-test $exitcode = 0) || { (exit 1); exit 1; }

-

-(

-  as_lineno_1=$LINENO

-  as_lineno_2=$LINENO

-  test "x$as_lineno_1" != "x$as_lineno_2" &&

-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }

-

-_ASEOF

-}; then

-  break

-fi

-

-fi

-

-      done

-

-      if test "x$CONFIG_SHELL" != x; then

-  for as_var in BASH_ENV ENV

-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

-	done

+      if test "x$CONFIG_SHELL" != x; then :

+  # We cannot yet assume a decent shell, so we have to provide a

+	# neutralization value for shells without unset; and this also

+	# works around shells that cannot unset nonexistent variables.

+	BASH_ENV=/dev/null

+	ENV=/dev/null

+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

 	export CONFIG_SHELL

 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

 fi

-

-    if test $as_have_required = no; then

-  echo This script requires a shell more modern than all the

-      echo shells that I found on your system.  Please install a

-      echo modern shell, or manually run the script under such a

-      echo shell if you do have one.

-      { (exit 1); exit 1; }

+    if test x$as_have_required = xno; then :

+  $as_echo "$0: This script requires a shell more modern than all"

+  $as_echo "$0: the shells that I found on your system."

+  if test x${ZSH_VERSION+set} = xset ; then

+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"

+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."

+  else

+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,

+$0: including any error possibly output before this

+$0: message. Then install a modern shell, or manually run

+$0: the script under such a shell if you do have one."

+  fi

+  exit 1

 fi

-

-

 fi

-

 fi

+SHELL=${CONFIG_SHELL-/bin/sh}

+export SHELL

+# Unset more variables known to interfere with behavior of common tools.

+CLICOLOR_FORCE= GREP_OPTIONS=

+unset CLICOLOR_FORCE GREP_OPTIONS

+## --------------------- ##

+## M4sh Shell Functions. ##

+## --------------------- ##

+# as_fn_unset VAR

+# ---------------

+# Portably unset VAR.

+as_fn_unset ()

+{

+  { eval $1=; unset $1;}

+}

+as_unset=as_fn_unset

+# as_fn_set_status STATUS

+# -----------------------

+# Set $? to STATUS, without forking.

+as_fn_set_status ()

+{

+  return $1

+} # as_fn_set_status

-(eval "as_func_return () {

-  (exit \$1)

-}

-as_func_success () {

-  as_func_return 0

-}

-as_func_failure () {

-  as_func_return 1

-}

-as_func_ret_success () {

-  return 0

-}

-as_func_ret_failure () {

-  return 1

-}

+# as_fn_exit STATUS

+# -----------------

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

+as_fn_exit ()

+{

+  set +e

+  as_fn_set_status $1

+  exit $1

+} # as_fn_exit

+

+# as_fn_mkdir_p

+# -------------

+# Create "$as_dir" as a directory, including parents if necessary.

+as_fn_mkdir_p ()

+{

-exitcode=0

-if as_func_success; then

-  :

+  case $as_dir in #(

+  -*) as_dir=./$as_dir;;

+  esac

+  test -d "$as_dir" || eval $as_mkdir_p || {

+    as_dirs=

+    while :; do

+      case $as_dir in #(

+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

+      *) as_qdir=$as_dir;;

+      esac

+      as_dirs="'$as_qdir' $as_dirs"

+      as_dir=`$as_dirname -- "$as_dir" ||

+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

+	 X"$as_dir" : 'X\(//\)[^/]' \| \

+	 X"$as_dir" : 'X\(//\)$' \| \

+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||

+$as_echo X"$as_dir" |

+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{

+	    s//\1/

+	    q

+	  }

+	  /^X\(\/\/\)[^/].*/{

+	    s//\1/

+	    q

+	  }

+	  /^X\(\/\/\)$/{

+	    s//\1/

+	    q

+	  }

+	  /^X\(\/\).*/{

+	    s//\1/

+	    q

+	  }

+	  s/.*/./; q'`

+      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"

+

+

+} # as_fn_mkdir_p

+# as_fn_append VAR VALUE

+# ----------------------

+# Append the text in VALUE to the end of the definition contained in VAR. Take

+# advantage of any shell optimizations that allow amortized linear growth over

+# repeated appends, instead of the typical quadratic growth present in naive

+# implementations.

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

+  eval 'as_fn_append ()

+  {

+    eval $1+=\$2

+  }'

 else

-  exitcode=1

-  echo as_func_success failed.

-fi

+  as_fn_append ()

+  {

+    eval $1=\$$1\$2

+  }

+fi # as_fn_append

+

+# as_fn_arith ARG...

+# ------------------

+# Perform arithmetic evaluation on the ARGs, and store the result in the

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

+# must be portable across $(()) and expr.

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

+  eval 'as_fn_arith ()

+  {

+    as_val=$(( $* ))

+  }'

+else

+  as_fn_arith ()

+  {

+    as_val=`expr "$@" || test $? -eq 1`

+  }

+fi # as_fn_arith

-if as_func_failure; then

-  exitcode=1

-  echo as_func_failure succeeded.

-fi

-if as_func_ret_success; then

-  :

+# 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.

+as_fn_error ()

+{

+  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: $2" >&2

+  as_fn_exit $as_status

+} # as_fn_error

+

+if expr a : '\(a\)' >/dev/null 2>&1 &&

+   test "X`expr 00001 : '.*\(...\)'`" = X001; then

+  as_expr=expr

 else

-  exitcode=1

-  echo as_func_ret_success failed.

+  as_expr=false

 fi

-if as_func_ret_failure; then

-  exitcode=1

-  echo as_func_ret_failure succeeded.

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

+  as_basename=basename

+else

+  as_basename=false

 fi

-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

-  :

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

+  as_dirname=dirname

 else

-  exitcode=1

-  echo positional parameters were not saved.

+  as_dirname=false

 fi

-test \$exitcode = 0") || {

-  echo No shell found that supports shell functions.

-  echo Please tell bug-autoconf@gnu.org about your system,

-  echo including any error possibly output before this message.

-  echo This can help us improve future autoconf versions.

-  echo Configuration will now proceed without shell functions.

-}

-

+as_me=`$as_basename -- "$0" ||

+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \

+	 X"$0" : 'X\(//\)$' \| \

+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||

+$as_echo X/"$0" |

+    sed '/^.*\/\([^/][^/]*\)\/*$/{

+	    s//\1/

+	    q

+	  }

+	  /^X\/\(\/\/\)$/{

+	    s//\1/

+	    q

+	  }

+	  /^X\/\(\/\).*/{

+	    s//\1/

+	    q

+	  }

+	  s/.*/./; q'`

+# Avoid depending upon Character Ranges.

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

+as_cr_digits='0123456789'

+as_cr_alnum=$as_cr_Letters$as_cr_digits

-  as_lineno_1=$LINENO

-  as_lineno_2=$LINENO

-  test "x$as_lineno_1" != "x$as_lineno_2" &&

-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO

-  # uniformly replaced by the line number.  The first 'sed' inserts a

-  # line-number line after each line using $LINENO; the second 'sed'

-  # does the real work.  The second script uses 'N' to pair each

-  # line-number line with the line containing $LINENO, and appends

-  # trailing '-' during substitution so that $LINENO is not a special

-  # case at line end.

-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

-  # scripts with optimization help from Paolo Bonzini.  Blame Lee

-  # E. McMahon (1931-1989) for sed's syntax.  :-)

+  as_lineno_1=$LINENO as_lineno_1a=$LINENO

+  as_lineno_2=$LINENO as_lineno_2a=$LINENO

+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&

+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {

+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)

   sed -n '

     p

     /[$]LINENO/=

@@ -471,8 +439,7 @@ test \$exitcode = 0") || {

       s/-\n.*//

     ' >$as_me.lineno &&

   chmod +x "$as_me.lineno" ||

-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

-   { (exit 1); exit 1; }; }

+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

   # Don't try to exec as it changes $[0], causing all sort of problems

   # (the dirname of $[0] is not the place where we might find the

@@ -482,29 +449,18 @@ test \$exitcode = 0") || {

   exit

 }

-

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

-  as_dirname=dirname

-else

-  as_dirname=false

-fi

-

 ECHO_C= ECHO_N= ECHO_T=

-case `echo -n x` in

+case `echo -n x` in #(((((

 -n*)

-  case `echo 'x\c'` in

+  case `echo 'xy\c'` in

   *c*) ECHO_T='	';;	# ECHO_T is single tab character.

-  *)   ECHO_C='\c';;

+  xy)  ECHO_C='\c';;

+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null

+       ECHO_T='	';;

   esac;;

 *)

   ECHO_N='-n';;

 esac

-if expr a : '\(a\)' >/dev/null 2>&1 &&

-   test "X`expr 00001 : '.*\(...\)'`" = X001; then

-  as_expr=expr

-else

-  as_expr=false

-fi

 rm -f conf$$ conf$$.exe conf$$.file

 if test -d conf$$.dir; then

@@ -534,7 +490,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

 rmdir conf$$.dir 2>/dev/null

 if mkdir -p . 2>/dev/null; then

-  as_mkdir_p=:

+  as_mkdir_p='mkdir -p "$as_dir"'

 else

   test -d ./-p && rmdir ./-p

   as_mkdir_p=false

@@ -553,10 +509,10 @@ else

       if test -d "$1"; then

 	test -d "$1/.";

       else

-	case $1 in

+	case $1 in #(

 	-*)set "./$1";;

 	esac;

-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

 	???[sx]*):;;*)false;;esac;fi

     '\'' sh

   '

@@ -570,11 +526,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

-

-exec 7<&0 </dev/null 6>&1

+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`

@@ -589,7 +545,6 @@ cross_compiling=no

 subdirs=

 MFLAGS=

 MAKEFLAGS=

-SHELL=${CONFIG_SHELL-/bin/sh}

 # Identity of this package.

 PACKAGE_NAME=

@@ -597,10 +552,49 @@ PACKAGE_TARNAME=

 PACKAGE_VERSION=

 PACKAGE_STRING=

 PACKAGE_BUGREPORT=

+PACKAGE_URL=

+

+# Factoring default headers for most tests.

+ac_includes_default="\

+#include <stdio.h>

+#ifdef HAVE_SYS_TYPES_H

+# include <sys/types.h>

+#endif

+#ifdef HAVE_SYS_STAT_H

+# include <sys/stat.h>

+#endif

+#ifdef STDC_HEADERS

+# include <stdlib.h>

+# include <stddef.h>

+#else

+# ifdef HAVE_STDLIB_H

+#  include <stdlib.h>

+# endif

+#endif

+#ifdef HAVE_STRING_H

+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

+#  include <memory.h>

+# endif

+# include <string.h>

+#endif

+#ifdef HAVE_STRINGS_H

+# include <strings.h>

+#endif

+#ifdef HAVE_INTTYPES_H

+# include <inttypes.h>

+#endif

+#ifdef HAVE_STDINT_H

+# include <stdint.h>

+#endif

+#ifdef HAVE_UNISTD_H

+# include <unistd.h>

+#endif"

-ac_unique_file=""DESCRIPTION""

 ac_subst_vars='LTLIBOBJS

 LIBOBJS

+EGREP

+GREP

+CPP

 OBJEXT

 EXEEXT

 ac_ct_CC

@@ -638,6 +632,7 @@ bindir

 program_transform_name

 prefix

 exec_prefix

+PACKAGE_URL

 PACKAGE_BUGREPORT

 PACKAGE_STRING

 PACKAGE_VERSION

@@ -656,7 +651,8 @@ CC

 CFLAGS

 LDFLAGS

 LIBS

-CPPFLAGS'

+CPPFLAGS

+CPP'

 # Initialize some variables set by options.

@@ -765,8 +761,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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

-   { (exit 1); exit 1; }; }

+      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

@@ -792,8 +787,7 @@ do

     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`

     # Reject names that are not valid shell variable names.