X11 1.5.0.0 → 1.5.0.1

raw patch · 6 files changed

+357/−290 lines, 6 filesdep ~basenew-uploaderPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• Graphics/X11/Xlib.hs +1/−1
• Graphics/X11/Xlib/Event.hsc +3/−3
• Graphics/X11/Xlib/Extras.hsc +2/−2
• Graphics/X11/Xlib/Types.hsc +1/−1
• X11.cabal +3/−3
• configure +347/−280

@@ -26,7 +26,7 @@ 	  -- * Types 	  module Graphics.X11.Types,           -- module Graphics.X11.Xlib.Types,-	  Display, Screen, Visual, GC, SetWindowAttributes,+	  Display(..), Screen, Visual, GC, SetWindowAttributes, 	  Point(..), Rectangle(..), Arc(..), Segment(..), Color(..), 	  Pixel, Position, Dimension, Angle, ScreenNumber, Buffer, 

@@ -141,11 +141,11 @@         y               <- #{peek XKeyEvent,y} p         x_root          <- #{peek XKeyEvent,x_root} p         y_root          <- #{peek XKeyEvent,y_root} p-        state           <- #{peek XKeyEvent,state} p-        keycode         <- #{peek XKeyEvent,keycode} p+        state           <- (#{peek XKeyEvent,state} p) :: IO CUInt+        keycode         <- (#{peek XKeyEvent,keycode} p) :: IO CUInt         same_screen     <- #{peek XKeyEvent,same_screen} p         return (root, subwindow, time, x, y, x_root, y_root,-                state, keycode, same_screen)+                fromIntegral state, fromIntegral keycode, same_screen)  get_KeyEvent :: XEventPtr -> IO XKeyEvent get_KeyEvent p = peekXKeyEvent (castPtr p)

@@ -378,7 +378,7 @@             x_root      <- #{peek XKeyEvent, x_root     } p             y_root      <- #{peek XKeyEvent, y_root     } p             state       <- (#{peek XKeyEvent, state     } p) :: IO CUInt-            keycode     <- #{peek XKeyEvent, keycode    } p+            keycode     <- (#{peek XKeyEvent, keycode   } p) :: IO CUInt             same_screen <- #{peek XKeyEvent, same_screen} p             return $ KeyEvent                         { ev_event_type    = type_@@ -394,7 +394,7 @@                         , ev_x_root        = x_root                         , ev_y_root        = y_root                         , ev_state         = fromIntegral state-                        , ev_keycode       = keycode+                        , ev_keycode       = fromIntegral keycode                         , ev_same_screen   = same_screen                         } 

@@ -15,7 +15,7 @@  -- #hide module Graphics.X11.Xlib.Types(-        Display(..), Screen(..), Visual, GC, GCValues, SetWindowAttributes,+        Display(..), Screen(..), Visual(..), GC(..), GCValues, SetWindowAttributes,         Image(..), Point(..), Rectangle(..), Arc(..), Segment(..), Color(..),         Pixel, Position, Dimension, Angle, ScreenNumber, Buffer         ) where

@@ -1,10 +1,10 @@ name:               X11-version:            1.5.0.0+version:            1.5.0.1 license:            BSD3 license-file:       LICENSE copyright:          Alastair Reid, 1999-2003, libraries@haskell.org 2003-2007, Don Stewart 2007-2009, Spencer Janssen 2007-2009.-maintainer:         Spencer Janssen <spencerjanssen@gmail.com>-homepage:           http://code.haskell.org/X11+maintainer:         Daniel Wagner <daniel@wagner-home.com>+homepage:           https://github.com/haskell-pkg-janitors/X11 category:           Graphics synopsis:           A binding to the X11 graphics library description:        A Haskell binding to the X11 graphics library.

@@ -1,13 +1,15 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles.-# Generated by GNU Autoconf 2.64 for Haskell X11 package 1.4.6.+# Generated by GNU Autoconf 2.68 for Haskell X11 package 1.4.6. # # Report bugs to <dons@galois.com>. #+# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software+# 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. ## -------------------- ##@@ -89,6 +91,7 @@ IFS=" ""	$as_nl"  # Find who we are.  Look in the path if we contain no directory separator.+as_myself= case $0 in #((   *[\\/]* ) as_myself=$0 ;;   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR@@ -214,11 +217,18 @@   # 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.+	# Preserve -v and -x to the replacement shell. 	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+"$@"}+	case $- in # ((((+	  *v*x* | *x*v* ) as_opts=-vx ;;+	  *v* ) as_opts=-v ;;+	  *x* ) as_opts=-x ;;+	  * ) as_opts= ;;+	esac+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi      if test x$as_have_required = xno; then :@@ -317,7 +327,7 @@       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@@ -357,19 +367,19 @@ 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 @@ -527,10 +537,11 @@ 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` @@ -729,8 +740,9 @@   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.@@ -775,7 +787,7 @@     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@@ -801,7 +813,7 @@     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@@ -1005,7 +1017,7 @@     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@@ -1021,7 +1033,7 @@     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@@ -1051,8 +1063,8 @@   | --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"     ;;    *=*)@@ -1060,7 +1072,7 @@     # 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 ;;@@ -1070,7 +1082,7 @@     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"     ;;    esac@@ -1078,13 +1090,13 @@  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@@ -1107,7 +1119,7 @@     [\\/$]* | ?:[\\/]* )  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'@@ -1121,8 +1133,8 @@ 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@@ -1137,9 +1149,9 @@ 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.@@ -1178,11 +1190,11 @@ 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@@ -1222,7 +1234,7 @@       --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@@ -1298,7 +1310,7 @@   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a               nonstandard directory <lib dir>   LIBS        libraries to pass to the linker, e.g. -l<library>-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if               you have headers in a nonstandard directory <include dir>   CPP         C preprocessor @@ -1369,9 +1381,9 @@ if $ac_init_version; then   cat <<\_ACEOF Haskell X11 package configure 1.4.6-generated by GNU Autoconf 2.64+generated by GNU Autoconf 2.68 -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@@ -1415,8 +1427,8 @@  	ac_retval=1 fi-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}-  return $ac_retval+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno+  as_fn_set_status $ac_retval  } # ac_fn_c_try_compile @@ -1441,7 +1453,7 @@     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 :@@ -1452,8 +1464,8 @@      ac_retval=1 fi-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}-  return $ac_retval+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno+  as_fn_set_status $ac_retval  } # ac_fn_c_try_cpp @@ -1498,8 +1510,8 @@   # interfere with the next link command; also delete a directory that is   # left behind by Apple's compiler.  We do this before executing the actions.   rm -rf conftest.dSYM conftest_ipa8_conftest.oo-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}-  return $ac_retval+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno+  as_fn_set_status $ac_retval  } # ac_fn_c_try_link @@ -1511,7 +1523,7 @@   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 \${$3+:} false; then :   $as_echo_n "(cached) " >&6 else   cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -1566,7 +1578,7 @@ eval ac_res=\$$3 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; }-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno  } # ac_fn_c_check_func @@ -1578,10 +1590,10 @@ 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 \${$3+:} false; 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 \${$3+:} false; then :   $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3@@ -1617,7 +1629,7 @@ 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; } @@ -1640,17 +1652,15 @@ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}-( cat <<\_ASBOX-## ------------------------------ ##+( $as_echo "## ------------------------------ ## ## Report this to dons@galois.com ##-## ------------------------------ ##-_ASBOX+## ------------------------------ ##"      ) | sed "s/^/$as_me: WARNING:     /" >&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 \${$3+:} false; then :   $as_echo_n "(cached) " >&6 else   eval "$3=\$ac_header_compiler"@@ -1659,7 +1669,7 @@ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno  } # ac_fn_c_check_header_mongrel @@ -1700,8 +1710,8 @@        ac_retval=$ac_status fi   rm -rf conftest.dSYM conftest_ipa8_conftest.oo-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}-  return $ac_retval+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno+  as_fn_set_status $ac_retval  } # ac_fn_c_try_run @@ -1714,7 +1724,7 @@   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 \${$3+:} false; then :   $as_echo_n "(cached) " >&6 else   cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -1732,7 +1742,7 @@ eval ac_res=\$$3 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; }-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno  } # ac_fn_c_check_header_compile cat >config.log <<_ACEOF@@ -1740,7 +1750,7 @@ running configure, to aid debugging if configure makes a mistake.  It was created by Haskell X11 package $as_me 1.4.6, which was-generated by GNU Autoconf 2.64.  Invocation command line was+generated by GNU Autoconf 2.68.  Invocation command line was    $ $0 $@ @@ -1850,11 +1860,9 @@   {     echo -    cat <<\_ASBOX-## ---------------- ##+    $as_echo "## ---------------- ## ## Cache variables. ##-## ---------------- ##-_ASBOX+## ---------------- ##"     echo     # The following way of writing the cache mishandles newlines in values, (@@ -1888,11 +1896,9 @@ )     echo -    cat <<\_ASBOX-## ----------------- ##+    $as_echo "## ----------------- ## ## Output variables. ##-## ----------------- ##-_ASBOX+## ----------------- ##"     echo     for ac_var in $ac_subst_vars     do@@ -1905,11 +1911,9 @@     echo      if test -n "$ac_subst_files"; then-      cat <<\_ASBOX-## ------------------- ##+      $as_echo "## ------------------- ## ## File substitutions. ##-## ------------------- ##-_ASBOX+## ------------------- ##"       echo       for ac_var in $ac_subst_files       do@@ -1923,11 +1927,9 @@     fi      if test -s confdefs.h; then-      cat <<\_ASBOX-## ----------- ##+      $as_echo "## ----------- ## ## confdefs.h. ##-## ----------- ##-_ASBOX+## ----------- ##"       echo       cat confdefs.h       echo@@ -1982,7 +1984,12 @@ 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@@ -1993,18 +2000,22 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do   test "x$ac_site_file" = xNONE && continue-  if test -r "$ac_site_file"; then+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then     { $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  if test -r "$cache_file"; then-  # Some versions of bash will fail to source /dev/null (special-  # files actually), so we avoid doing that.-  if test -f "$cache_file"; then+  # Some versions of bash will fail to source /dev/null (special files+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;}     case $cache_file in@@ -2073,7 +2084,7 @@ $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. ##@@ -2117,7 +2128,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; }-if test "${ac_cv_prog_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then :   $as_echo_n "(cached) " >&6 else   if test -n "$CC"; then@@ -2157,7 +2168,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; }-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :+if ${ac_cv_prog_ac_ct_CC+:} false; then :   $as_echo_n "(cached) " >&6 else   if test -n "$ac_ct_CC"; then@@ -2210,7 +2221,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; }-if test "${ac_cv_prog_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then :   $as_echo_n "(cached) " >&6 else   if test -n "$CC"; then@@ -2250,7 +2261,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; }-if test "${ac_cv_prog_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then :   $as_echo_n "(cached) " >&6 else   if test -n "$CC"; then@@ -2309,7 +2320,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; }-if test "${ac_cv_prog_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then :   $as_echo_n "(cached) " >&6 else   if test -n "$CC"; then@@ -2353,7 +2364,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; }-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :+if ${ac_cv_prog_ac_ct_CC+:} false; then :   $as_echo_n "(cached) " >&6 else   if test -n "$ac_ct_CC"; then@@ -2407,8 +2418,8 @@  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@@ -2429,32 +2440,30 @@ ... rest of stderr output deleted ...          10q' conftest.err >conftest.er1     cat conftest.er1 >&5-    rm -f conftest.er1 conftest.err   fi+  rm -f conftest.er1 conftest.err   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5   test $ac_status = 0; } done  cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h.  */-#include <stdio.h>+ int main () {-FILE *f = fopen ("conftest.out", "w");- return ferror (f) || fclose (f) != 0;    ;   return 0; } _ACEOF ac_clean_files_save=$ac_clean_files-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext.-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5-$as_echo_n "checking for C compiler default output file name... " >&6; }+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5+$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`  # The possible output files:@@ -2516,62 +2525,28 @@ else   ac_file='' fi-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5-$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then :-  $as_echo "$as_me: failed program was:" >&5+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5+$as_echo "no" >&6; }+$as_echo "$as_me: failed program was:" >&5 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; } fi+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5+$as_echo_n "checking for C compiler default output file name... " >&6; }+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5+$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run.  If not, either-# the compiler is broken, or we cross compile.-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5-$as_echo_n "checking whether the C compiler works... " >&6; }-# If not cross compiling, check that we can run a simple program.-if test "$cross_compiling" != yes; then-  if { ac_try='./$ac_file'-  { { case "(($ac_try" in-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;-  *) ac_try_echo=$ac_try;;-esac-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""-$as_echo "$ac_try_echo"; } >&5-  (eval "$ac_try") 2>&5-  ac_status=$?-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5-  test $ac_status = 0; }; }; then-    cross_compiling=no-  else-    if test "$cross_compiling" = maybe; then-	cross_compiling=yes-    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.-If you meant to cross compile, use \`--host'.-See \`config.log' for more details." "$LINENO" 5; }-    fi-  fi-fi-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5-$as_echo "yes" >&6; }--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save-# Check that the compiler produces executables we can run.  If not, either-# the compiler is broken, or we cross compile.-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5-$as_echo_n "checking whether we are cross compiling... " >&6; }-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5-$as_echo "$cross_compiling" >&6; }- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link"@@ -2601,19 +2576,78 @@ 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$ac_cv_exeext+rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; }  rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT+cat confdefs.h - <<_ACEOF >conftest.$ac_ext+/* end confdefs.h.  */+#include <stdio.h>+int+main ()+{+FILE *f = fopen ("conftest.out", "w");+ return ferror (f) || fclose (f) != 0;++  ;+  return 0;+}+_ACEOF+ac_clean_files="$ac_clean_files conftest.out"+# Check that the compiler produces executables we can run.  If not, either+# the compiler is broken, or we cross compile.+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5+$as_echo_n "checking whether we are cross compiling... " >&6; }+if test "$cross_compiling" != yes; then+  { { ac_try="$ac_link"+case "(($ac_try" in+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;+  *) ac_try_echo=$ac_try;;+esac+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""+$as_echo "$ac_try_echo"; } >&5+  (eval "$ac_link") 2>&5+  ac_status=$?+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5+  test $ac_status = 0; }+  if { ac_try='./conftest$ac_cv_exeext'+  { { case "(($ac_try" in+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;+  *) ac_try_echo=$ac_try;;+esac+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""+$as_echo "$ac_try_echo"; } >&5+  (eval "$ac_try") 2>&5+  ac_status=$?+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5+  test $ac_status = 0; }; }; then+    cross_compiling=no+  else+    if test "$cross_compiling" = maybe; then+	cross_compiling=yes+    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.+If you meant to cross compile, use \`--host'.+See \`config.log' for more details" "$LINENO" 5; }+    fi+  fi+fi+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5+$as_echo "$cross_compiling" >&6; }++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out+ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; }-if test "${ac_cv_objext+set}" = set; then :+if ${ac_cv_objext+:} false; then :   $as_echo_n "(cached) " >&6 else   cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -2653,8 +2687,8 @@  { { $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@@ -2664,7 +2698,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }-if test "${ac_cv_c_compiler_gnu+set}" = set; then :+if ${ac_cv_c_compiler_gnu+:} false; then :   $as_echo_n "(cached) " >&6 else   cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -2701,7 +2735,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; }-if test "${ac_cv_prog_cc_g+set}" = set; then :+if ${ac_cv_prog_cc_g+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_save_c_werror_flag=$ac_c_werror_flag@@ -2779,7 +2813,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }-if test "${ac_cv_prog_cc_c89+set}" = set; then :+if ${ac_cv_prog_cc_c89+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_cv_prog_cc_c89=no@@ -2887,7 +2921,7 @@   CPP= fi if test -z "$CPP"; then-  if test "${ac_cv_prog_CPP+set}" = set; then :+  if ${ac_cv_prog_CPP+:} false; then :   $as_echo_n "(cached) " >&6 else       # Double quotes because CPP needs to be expanded@@ -2917,7 +2951,7 @@   # 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.@@ -2933,11 +2967,11 @@ 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@@ -2976,7 +3010,7 @@   # 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.@@ -2992,18 +3026,18 @@ 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@@ -3028,8 +3062,8 @@   have_x=disabled else   case $x_includes,$x_libraries in #(-    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(+    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :   $as_echo_n "(cached) " >&6 else   # One or both of the vars are not set, and there is no cached value.@@ -3046,7 +3080,7 @@ 	@echo libdir='${LIBDIR}' _ACEOF   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.     for ac_var in incroot usrlibdir libdir; do       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"     done@@ -3132,7 +3166,7 @@   fi done fi-rm -f conftest.err conftest.$ac_ext+rm -f conftest.err conftest.i conftest.$ac_ext fi # $ac_x_includes = no  if test "$ac_x_libraries" = no; then@@ -3306,7 +3340,7 @@ else   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3340,14 +3374,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi      if test $ac_cv_lib_dnet_dnet_ntoa = no; then       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3381,7 +3415,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi @@ -3400,14 +3434,14 @@     # The functions gethostbyname, getservbyname, and inet_addr are     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.     ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"-if test "x$ac_cv_func_gethostbyname" = x""yes; then :+if test "x$ac_cv_func_gethostbyname" = xyes; then :  fi      if test $ac_cv_func_gethostbyname = no; then       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3441,14 +3475,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi        if test $ac_cv_lib_nsl_gethostbyname = no; then 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3482,7 +3516,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -3497,14 +3531,14 @@     # must be given before -lnsl if both are needed.  We assume that     # if connect needs -lnsl, so does gethostbyname.     ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"-if test "x$ac_cv_func_connect" = x""yes; then :+if test "x$ac_cv_func_connect" = xyes; then :  fi      if test $ac_cv_func_connect = no; then       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 $as_echo_n "checking for connect in -lsocket... " >&6; }-if test "${ac_cv_lib_socket_connect+set}" = set; then :+if ${ac_cv_lib_socket_connect+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3538,7 +3572,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 $as_echo "$ac_cv_lib_socket_connect" >&6; }-if test "x$ac_cv_lib_socket_connect" = x""yes; then :+if test "x$ac_cv_lib_socket_connect" = xyes; then :   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -3546,14 +3580,14 @@      # Guillermo Gomez says -lposix is necessary on A/UX.     ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"-if test "x$ac_cv_func_remove" = x""yes; then :+if test "x$ac_cv_func_remove" = xyes; then :  fi      if test $ac_cv_func_remove = no; then       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 $as_echo_n "checking for remove in -lposix... " >&6; }-if test "${ac_cv_lib_posix_remove+set}" = set; then :+if ${ac_cv_lib_posix_remove+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3587,7 +3621,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 $as_echo "$ac_cv_lib_posix_remove" >&6; }-if test "x$ac_cv_lib_posix_remove" = x""yes; then :+if test "x$ac_cv_lib_posix_remove" = xyes; then :   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -3595,14 +3629,14 @@      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.     ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"-if test "x$ac_cv_func_shmat" = x""yes; then :+if test "x$ac_cv_func_shmat" = xyes; then :  fi      if test $ac_cv_func_shmat = no; then       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 $as_echo_n "checking for shmat in -lipc... " >&6; }-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :+if ${ac_cv_lib_ipc_shmat+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3636,7 +3670,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :+if test "x$ac_cv_lib_ipc_shmat" = xyes; then :   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -3654,7 +3688,7 @@   # John Interrante, Karl Berry   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :   $as_echo_n "(cached) " >&6 else   ac_check_lib_save_LIBS=$LIBS@@ -3688,7 +3722,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -3712,7 +3746,7 @@ else   no_x=yes fi-rm -f conftest.err conftest.$ac_ext+rm -f conftest.err conftest.i conftest.$ac_ext  # If there's some oddball X11 include path, we need it to check there for # Xinerama headers.@@ -3724,8 +3758,8 @@ if test "$no_x" = yes; then   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-as_fn_error "X11 libraries not found, so X11 package cannot be built-See \`config.log' for more details." "$LINENO" 5; }+as_fn_error $? "X11 libraries not found, so X11 package cannot be built+See \`config.log' for more details" "$LINENO" 5; } else   X11_BUILD_PACKAGE=yes   BUILD_PACKAGE_BOOL=True@@ -3768,7 +3802,7 @@ if test "$with_xinerama" = yes; then     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }-if test "${ac_cv_path_GREP+set}" = set; then :+if ${ac_cv_path_GREP+:} false; then :   $as_echo_n "(cached) " >&6 else   if test -z "$GREP"; then@@ -3817,7 +3851,7 @@   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@@ -3831,7 +3865,7 @@  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; }-if test "${ac_cv_path_EGREP+set}" = set; then :+if ${ac_cv_path_EGREP+:} false; then :   $as_echo_n "(cached) " >&6 else   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1@@ -3883,7 +3917,7 @@   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@@ -3898,7 +3932,7 @@  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; }-if test "${ac_cv_header_stdc+set}" = set; then :+if ${ac_cv_header_stdc+:} false; then :   $as_echo_n "(cached) " >&6 else   cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -4015,8 +4049,7 @@   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@@ -4029,7 +4062,7 @@ for ac_header in X11/extensions/Xinerama.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then :+if test "x$ac_cv_header_X11_extensions_Xinerama_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_EXTENSIONS_XINERAMA_H 1 _ACEOF@@ -4066,7 +4099,7 @@     for ac_header in X11/keysym.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/keysym.h" "ac_cv_header_X11_keysym_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_keysym_h" = x""yes; then :+if test "x$ac_cv_header_X11_keysym_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_KEYSYM_H 1 _ACEOF@@ -4082,7 +4115,7 @@     for ac_header in X11/DECkeysym.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/DECkeysym.h" "ac_cv_header_X11_DECkeysym_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_DECkeysym_h" = x""yes; then :+if test "x$ac_cv_header_X11_DECkeysym_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_DECKEYSYM_H 1 _ACEOF@@ -4098,7 +4131,7 @@     for ac_header in X11/Sunkeysym.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/Sunkeysym.h" "ac_cv_header_X11_Sunkeysym_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_Sunkeysym_h" = x""yes; then :+if test "x$ac_cv_header_X11_Sunkeysym_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_SUNKEYSYM_H 1 _ACEOF@@ -4114,7 +4147,7 @@     for ac_header in X11/ap_keysym.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/ap_keysym.h" "ac_cv_header_X11_ap_keysym_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_ap_keysym_h" = x""yes; then :+if test "x$ac_cv_header_X11_ap_keysym_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_AP_KEYSYM_H 1 _ACEOF@@ -4130,7 +4163,7 @@     for ac_header in X11/HPkeysym.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/HPkeysym.h" "ac_cv_header_X11_HPkeysym_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_HPkeysym_h" = x""yes; then :+if test "x$ac_cv_header_X11_HPkeysym_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_HPKEYSYM_H 1 _ACEOF@@ -4146,7 +4179,7 @@     for ac_header in X11/XF86keysym.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/XF86keysym.h" "ac_cv_header_X11_XF86keysym_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_XF86keysym_h" = x""yes; then :+if test "x$ac_cv_header_X11_XF86keysym_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_XF86KEYSYM_H 1 _ACEOF@@ -4162,7 +4195,7 @@     for ac_header in X11/keysymdef.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/keysymdef.h" "ac_cv_header_X11_keysymdef_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_keysymdef_h" = x""yes; then :+if test "x$ac_cv_header_X11_keysymdef_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_KEYSYMDEF_H 1 _ACEOF@@ -4178,7 +4211,7 @@     for ac_header in X11/cursorfont.h do :   ac_fn_c_check_header_mongrel "$LINENO" "X11/cursorfont.h" "ac_cv_header_X11_cursorfont_h" "$ac_includes_default"-if test "x$ac_cv_header_X11_cursorfont_h" = x""yes; then :+if test "x$ac_cv_header_X11_cursorfont_h" = xyes; then :   cat >>confdefs.h <<_ACEOF #define HAVE_X11_CURSORFONT_H 1 _ACEOF@@ -4188,7 +4221,7 @@ done      if ! test "$have_cursorfont" = yes; then-        as_fn_error "X11/cursorfont.h (from libx11) is required" "$LINENO" 5+        as_fn_error $? "X11/cursorfont.h (from libx11) is required" "$LINENO" 5     fi fi @@ -4262,10 +4295,21 @@      :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else   if test -w "$cache_file"; then-    test "x$cache_file" != "x/dev/null" &&+    if test "x$cache_file" != "x/dev/null"; then       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;}-    cat confcache >$cache_file+      if test ! -f "$cache_file" || test -h "$cache_file"; then+	cat confcache >"$cache_file"+      else+        case $cache_file in #(+        */* | ?:*)+	  mv -f confcache "$cache_file"$$ &&+	  mv -f "$cache_file"$$ "$cache_file" ;; #(+        *)+	  mv -f confcache "$cache_file" ;;+	esac+      fi+    fi   else     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}@@ -4281,6 +4325,7 @@  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$//'@@ -4296,7 +4341,7 @@   -: ${CONFIG_STATUS=./config.status}+: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS"@@ -4397,6 +4442,7 @@ IFS=" ""	$as_nl"  # Find who we are.  Look in the path if we contain no directory separator.+as_myself= case $0 in #((   *[\\/]* ) as_myself=$0 ;;   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR@@ -4442,19 +4488,19 @@ (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 @@ -4650,7 +4696,7 @@       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@@ -4704,7 +4750,7 @@ # values after options handling. ac_log=" This file was extended by Haskell X11 package $as_me 1.4.6, which was-generated by GNU Autoconf 2.64.  Invocation command line was+generated by GNU Autoconf 2.68.  Invocation command line was    CONFIG_FILES    = $CONFIG_FILES   CONFIG_HEADERS  = $CONFIG_HEADERS@@ -4743,6 +4789,7 @@    -h, --help       print this help, then exit   -V, --version    print version number and configuration settings, then exit+      --config     print configuration, then exit   -q, --quiet, --silent                    do not print progress messages   -d, --debug      don't remove temporary files@@ -4762,12 +4809,13 @@  _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Haskell X11 package config.status 1.4.6-configured by $0, generated by GNU Autoconf 2.64,-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"+configured by $0, generated by GNU Autoconf 2.68,+  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." @@ -4782,11 +4830,16 @@ 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@@ -4800,12 +4853,15 @@     ac_cs_recheck=: ;;   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )     $as_echo "$ac_cs_version"; exit ;;+  --config | --confi | --conf | --con | --co | --c )+    $as_echo "$ac_cs_config"; exit ;;   --debug | --debu | --deb | --de | --d | -d )     debug=: ;;   --file | --fil | --fi | --f )     $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;;@@ -4818,7 +4874,7 @@     ac_need_defaults=false;;   --he | --h)     # Conflict between --help and --header-    as_fn_error "ambiguous option: \`$1'+    as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";;   --help | --hel | -h )     $as_echo "$ac_cs_usage"; exit ;;@@ -4827,7 +4883,7 @@     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"@@ -4881,7 +4937,7 @@     "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;;     "X11.buildinfo") CONFIG_FILES="$CONFIG_FILES X11.buildinfo" ;; -  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;   esac done @@ -4903,9 +4959,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || {-  tmp=+  tmp= ac_tmp=   trap 'exit_status=$?-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status+  : "${ac_tmp:=$tmp}"+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0   trap 'as_fn_exit 1' 1 2 13 15 }@@ -4913,12 +4970,13 @@  {   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&-  test -n "$tmp" && test -d "$tmp"+  test -d "$tmp" }  || {   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+ac_tmp=$tmp  # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES.@@ -4935,12 +4993,12 @@ 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 -echo 'BEGIN {' >"$tmp/subs1.awk" &&+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF  @@ -4949,18 +5007,18 @@   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@@ -4968,7 +5026,7 @@ rm -f conf$$subs.sh  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h@@ -4982,7 +5040,7 @@ t delim :nl h-s/\(.\{148\}\).*/\1/+s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p@@ -4996,7 +5054,7 @@ t nl :delim h-s/\(.\{148\}\).*/\1/+s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p@@ -5016,7 +5074,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK-cat >>"\$tmp/subs1.awk" <<_ACAWK &&+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&   for (key in S) S_is_set[key] = 1   FS = "" @@ -5048,21 +5106,29 @@   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else   cat-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \-  || as_fn_error "could not setup config files machinery" "$LINENO" 5+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \+  || 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@@ -5074,7 +5140,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then-cat >"$tmp/defines.awk" <<\_ACAWK ||+cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -5086,11 +5152,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`-  if test -z "$ac_t"; then+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`+  if test -z "$ac_tt"; then     break   elif $ac_last_try; then-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5   else     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "   fi@@ -5175,7 +5241,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1-  as_fn_error "could not setup config headers machinery" "$LINENO" 5+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS"  @@ -5188,7 +5254,7 @@   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@@ -5207,7 +5273,7 @@     for ac_f     do       case $ac_f in-      -) ac_f="$tmp/stdin";;+      -) ac_f="$ac_tmp/stdin";;       *) # Look for the file first in the build tree, then in the source tree 	 # (if the path is not absolute).  The absolute path cannot be DOS-style, 	 # because $ac_f cannot contain `:'.@@ -5216,7 +5282,7 @@ 	   [\\/$]*) 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'"@@ -5242,8 +5308,8 @@     esac      case $ac_tag in-    *:-:* | *:-) cat >"$tmp/stdin" \-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;+    *:-:* | *:-) cat >"$ac_tmp/stdin" \+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;     esac     ;;   esac@@ -5368,23 +5434,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;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+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \+  >$ac_tmp/out || 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"; } &&+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \+      "$ac_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"+  rm -f "$ac_tmp/stdin"   case $ac_file in-  -) cat "$tmp/out" && rm -f "$tmp/out";;-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;+  *) rm -f "$ac_file" && mv "$ac_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  ;;   :H)   #@@ -5393,21 +5460,21 @@   if test x"$ac_file" != x-; then     {       $as_echo "/* $configure_input  */" \-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"-    } >"$tmp/config.h" \-      || as_fn_error "could not create $ac_file" "$LINENO" 5-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"+    } >"$ac_tmp/config.h" \+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;}     else       rm -f "$ac_file"-      mv "$tmp/config.h" "$ac_file" \-	|| as_fn_error "could not create $ac_file" "$LINENO" 5+      mv "$ac_tmp/config.h" "$ac_file" \+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5     fi   else     $as_echo "/* $configure_input  */" \-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \-      || as_fn_error "could not create -" "$LINENO" 5+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \+      || as_fn_error $? "could not create -" "$LINENO" 5   fi  ;; @@ -5422,7 +5489,7 @@ 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.@@ -5443,7 +5510,7 @@   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