Merge tag 'upstream/3.9.73+dfsg.1'

Upstream version 3.9.73+dfsg.1

1 files changed, 967 insertions, 781 deletions

diff --git a/configure b/configure
index c740413..a672b55 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || 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'\" &&
@@ -212,21 +236,25 @@ IFS=$as_save_IFS
 
 
       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.
-	# 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
-	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+"$@"}
+  export CONFIG_SHELL
+             # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # 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
   # original and so on.  Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -609,11 +629,11 @@ ALL_TARGET
 HAVE_LGF
 INTERPRETER
 LD
-SHLIB_CFLAGS
 XCIRCUIT_TARGET
 WRAPPER_SCRIPT
 INTERP_PATH
 STARTUP_FILE
+GS_LIBS
 STDLIBS
 SUBLIB
 SUBDIRS
@@ -630,6 +650,13 @@ SHLIB_LIB_SPECS
 LDDL_FLAGS
 SHLIB_LD
 SHDLIB_EXT
+fontconfig_LIBS
+fontconfig_CFLAGS
+cairo_LIBS
+cairo_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -643,6 +670,7 @@ RANLIB
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -657,6 +685,10 @@ LDFLAGS
 CFLAGS
 CC
 REVISION
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -733,13 +765,13 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_dependency_tracking
 with_x
-with_opengl
-enable_double_buffer
 enable_optimize
 with_xpm
 with_gnu_ld
+with_cairo
 with_tcl
 with_tk
 with_tclincls
@@ -763,7 +795,14 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-XMKMF'
+XMKMF
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+cairo_CFLAGS
+cairo_LIBS
+fontconfig_CFLAGS
+fontconfig_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1219,8 +1258,6 @@ 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
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1387,9 +1424,12 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-double-buffer disable graphics double-buffering
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-optimize enable compile-time optimizer flag -O2
  --enable-asg		enable support for Automatic Schematic Generation
   --disable-lgf           disable support for reading Caltech tools
@@ -1401,9 +1441,9 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-x                use the X Window System
-  --with-opengl=DIR          use OpenGL include files in DIR
   --with-xpm=DIR          use Xpm include/library files in DIR
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-cairo            Use cairo graphics library [default=yes]
   --with-tcl=DIR          Find tclConfig.sh in DIR
   --with-tk=DIR           Find tkConfig.sh in DIR
   --with-tclincls=DIR     Find tcl.h in DIR
@@ -1424,6 +1464,18 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   XMKMF       Path to xmkmf, Makefile generator for X Window System
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  cairo_CFLAGS
+              C compiler flags for cairo, overriding pkg-config
+  cairo_LIBS  linker flags for cairo, overriding pkg-config
+  fontconfig_CFLAGS
+              C compiler flags for fontconfig, overriding pkg-config
+  fontconfig_LIBS
+              linker flags for fontconfig, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1492,9 +1544,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1570,7 +1622,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1648,7 +1700,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1664,7 +1717,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1690,7 +1744,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1706,7 +1761,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1740,7 +1796,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2035,7 +2092,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.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2529,7 +2586,7 @@ test -n "$target_alias" &&
 PACKAGE=xcircuit
 
 VERSION=`cat ./VERSION | cut -d. -f1-2`
-am__api_version='1.11'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2568,7 +2625,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2626,9 +2683,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2639,32 +2693,40 @@ case `pwd` in
 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
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # 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
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# 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
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2676,6 +2738,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2698,12 +2770,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2715,10 +2787,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2737,7 +2809,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2777,7 +2849,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2828,7 +2900,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2857,12 +2929,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2881,7 +2947,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2945,6 +3011,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2966,6 +3071,7 @@ fi
 
 
 # Define the identity of the package.
+
  PACKAGE=${PACKAGE}
  VERSION=${VERSION}
 
@@ -2995,18 +3101,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
 
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
 
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 SUBDIRS=
 SUBLIB=
@@ -3017,11 +3175,10 @@ INSTALL_TARGET="undefined-install-target"
 REVISION=`cat ./VERSION | cut -d. -f3`
 INTERPRETER=NOINTERP
 HAVE_LGF=NOFORMATS
-xc_with_GL=
 
-SHLIB_CFLAGS=""
 LIB_SPECS=""
 WISH_EXE=""
+SHLIB_CFLAGS=""
 
 
 
@@ -3082,7 +3239,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3122,7 +3279,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3175,7 +3332,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3216,7 +3373,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3274,7 +3431,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3318,7 +3475,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3764,8 +3921,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3849,6 +4005,65 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3868,7 +4083,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3901,6 +4116,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3923,8 +4139,9 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3958,16 +4175,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -3976,16 +4193,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4117,7 +4334,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4157,7 +4374,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4213,7 +4430,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_M4="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4445,7 +4662,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4511,7 +4728,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5946,38 +6163,6 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-
-# Check whether --with-opengl was given.
-if test "${with_opengl+set}" = set; then :
-  withval=$with_opengl;
-  if test "$withval" = "no" -o "$withval" = "NO" ; then
-    xc_with_GL=
-  else
-    xc_with_GL=1
-    if test "$withval" != "no" -a "$withval" != "yes"; then
-      OGL_INCLUDE_DIR=${withval}
-    fi
-  fi
-
-fi
-
-
-# Check whether --enable-double-buffer was given.
-if test "${enable_double_buffer+set}" = set; then :
-  enableval=$enable_double_buffer;
-else
-
-  if test "x$xc_with_GL" == "x" ; then
-    $as_echo "#define DOUBLEBUFFER 1" >>confdefs.h
-
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Double-buffering option not applicable to OpenGL version." >&5
-$as_echo "$as_me: WARNING: Double-buffering option not applicable to OpenGL version." >&2;}
-  fi
-
-fi
-
-
 # Check whether --enable-optimize was given.
 if test "${enable_optimize+set}" = set; then :
   enableval=$enable_optimize;
@@ -6178,156 +6363,367 @@ xc_with_tcl_includes=""
 xc_with_tk_includes=""
 xc_with_tcl_libraries=""
 xc_with_tk_libraries=""
+xc_with_cairo="yes"
 
 
-# Check whether --with-tcl was given.
-if test "${with_tcl+set}" = set; then :
-  withval=$with_tcl;
-  xc_with_tcl=$withval
-  if test "$withval" == "no" -o "$withval" == "NO"; then
-      xc_with_tcl=""
-  fi
+
+# Check whether --with-cairo was given.
+if test "${with_cairo+set}" = set; then :
+  withval=$with_cairo;
+    xc_with_cairo=$withval
+    if test "$withval" == "no" -o "$withval" == "NO"; then
+        xc_with_cairo=""
+    fi
 
 fi
 
 
+if test "x$xc_with_cairo" != "x" ; then
+  $as_echo "#define HAVE_CAIRO 1" >>confdefs.h
+
 
-if test $xc_with_GL ; then
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    if test $OGL_INCLUDE_DIR ; then
-        CPPFLAGS="$CPPFLAGS -I$OGL_INCLUDE_DIR"
-    fi
-    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
-if test "x$ac_cv_header_GL_gl_h" = xyes; then :
 
-else
 
-        echo "GL header files not found; disabling OpenGL"
-        xc_with_GL=
 
-fi
 
 
-    CPPFLAGS="$ac_save_CPPFLAGS"
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-if test $xc_with_GL ; then
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
-$as_echo_n "checking for glXCreateContext in -lGL... " >&6; }
-if ${ac_cv_lib_GL_glXCreateContext+:} false; then :
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char glXCreateContext ();
-int
-main ()
-{
-return glXCreateContext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GL_glXCreateContext=yes
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  ac_cv_lib_GL_glXCreateContext=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glXCreateContext" >&5
-$as_echo "$ac_cv_lib_GL_glXCreateContext" >&6; }
-if test "x$ac_cv_lib_GL_glXCreateContext" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGL 1
-_ACEOF
 
-  LIBS="-lGL $LIBS"
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo" >&5
+$as_echo_n "checking for cairo... " >&6; }
 
+if test -n "$cairo_CFLAGS"; then
+    pkg_cv_cairo_CFLAGS="$cairo_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_cairo_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$cairo_LIBS"; then
+    pkg_cv_cairo_LIBS="$cairo_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_cairo_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
 
-        echo "GL library files not found; disabling OpenGL"
-        xc_with_GL=
 
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        cairo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo" 2>&1`
+        else
+	        cairo_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$cairo_PKG_ERRORS" >&5
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluNewTess in -lGLU" >&5
-$as_echo_n "checking for gluNewTess in -lGLU... " >&6; }
-if ${ac_cv_lib_GLU_gluNewTess+:} false; then :
-  $as_echo_n "(cached) " >&6
+	as_fn_error $? "Package requirements (cairo) were not met:
+
+$cairo_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables cairo_CFLAGS
+and cairo_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$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
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables cairo_CFLAGS
+and cairo_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; }
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGLU  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+	cairo_CFLAGS=$pkg_cv_cairo_CFLAGS
+	cairo_LIBS=$pkg_cv_cairo_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gluNewTess ();
-int
-main ()
-{
-return gluNewTess ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GLU_gluNewTess=yes
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig" >&5
+$as_echo_n "checking for fontconfig... " >&6; }
+
+if test -n "$fontconfig_CFLAGS"; then
+    pkg_cv_fontconfig_CFLAGS="$fontconfig_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_fontconfig_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  ac_cv_lib_GLU_gluNewTess=no
+  pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+    pkg_failed=untried
+fi
+if test -n "$fontconfig_LIBS"; then
+    pkg_cv_fontconfig_LIBS="$fontconfig_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_fontconfig_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluNewTess" >&5
-$as_echo "$ac_cv_lib_GLU_gluNewTess" >&6; }
-if test "x$ac_cv_lib_GLU_gluNewTess" = xyes; then :
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        fontconfig_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig" 2>&1`
+        else
+	        fontconfig_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$fontconfig_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (fontconfig) were not met:
+
+$fontconfig_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables fontconfig_CFLAGS
+and fontconfig_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$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
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables fontconfig_CFLAGS
+and fontconfig_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; }
+else
+	fontconfig_CFLAGS=$pkg_cv_fontconfig_CFLAGS
+	fontconfig_LIBS=$pkg_cv_fontconfig_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+  for ac_header in ghostscript/gdevdsp.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ghostscript/gdevdsp.h" "ac_cv_header_ghostscript_gdevdsp_h" "$ac_includes_default"
+if test "x$ac_cv_header_ghostscript_gdevdsp_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGLU 1
+#define HAVE_GHOSTSCRIPT_GDEVDSP_H 1
 _ACEOF
 
-  LIBS="-lGLU $LIBS"
+	GS_LIBS=-lgs
+	$as_echo "#define HAVE_GS 1" >>confdefs.h
+
 
 else
 
-        echo "GLU library files not found; disabling OpenGL"
-        xc_with_GL=
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building xcircuit without ghostscript rendering" >&5
+$as_echo "$as_me: WARNING: Building xcircuit without ghostscript rendering" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Install the ghostscript-devel package to solve this" >&5
+$as_echo "$as_me: WARNING: Install the ghostscript-devel package to solve this" >&2;}
+
 
 fi
 
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LDFLAGS="$ac_save_LDFLAGS"
+done
+
 fi
 
-if test $xc_with_GL ; then
-    $as_echo "#define OPENGL 1" >>confdefs.h
 
-    LIB_SPECS="${LIB_SPECS} -lGLU -lGL -lXi -lXmu -lXext"
+
+# Check whether --with-tcl was given.
+if test "${with_tcl+set}" = set; then :
+  withval=$with_tcl;
+  xc_with_tcl=$withval
+  if test "$withval" == "no" -o "$withval" == "NO"; then
+      xc_with_tcl=""
+  fi
+
 fi
 
 
 
+
 # Check whether --with-tk was given.
 if test "${with_tk+set}" = set; then :
   withval=$with_tk; xc_with_tk=$withval
@@ -6369,7 +6765,6 @@ if test "x$xc_with_tcl" != "x" ; then
   TCL_INC_DIR="."
   TK_INC_DIR="."
 
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclConfig.sh" >&5
 $as_echo_n "checking for tclConfig.sh... " >&6; }
   tcl_config_sh=""
@@ -6390,9 +6785,6 @@ $as_echo_n "checking for tclConfig.sh... " >&6; }
       elif test -r "$dir/lib/tclConfig.sh" ; then
         tcl_config_sh="$dir/lib/tclConfig.sh"
         break
-      elif test -r "$dir/unix/tclConfig.sh" ; then
-        tcl_config_sh="$dir/unix/tclConfig.sh"
-        break
       fi
     done
   else
@@ -6412,9 +6804,6 @@ $as_echo_n "checking for tclConfig.sh... " >&6; }
       elif test -r "$dir/lib/tclConfig.sh" ; then
         tcl_config_sh="$dir/lib/tclConfig.sh"
         break
-      elif test -r "$dir/unix/tclConfig.sh" ; then
-        tcl_config_sh="$dir/unix/tclConfig.sh"
-        break
       fi
     done
 
@@ -6478,9 +6867,6 @@ $as_echo_n "checking for tkConfig.sh... " >&6; }
       elif test -r "$dir/lib/tkConfig.sh" ; then
         tk_config_sh="$dir/lib/tkConfig.sh"
         break
-      elif test -r "$dir/unix/tkConfig.sh" ; then
-        tk_config_sh="$dir/unix/tkConfig.sh"
-        break
       fi
     done
   else
@@ -6501,9 +6887,6 @@ $as_echo_n "checking for tkConfig.sh... " >&6; }
       elif test -r "$dir/lib/tkConfig.sh" ; then
         tk_config_sh="$dir/lib/tkConfig.sh"
         break
-      elif test -r "$dir/unix/tkConfig.sh" ; then
-        tk_config_sh="$dir/unix/tkConfig.sh"
-        break
       fi
     done
     #
@@ -6551,29 +6934,37 @@ fi
 #
 #	Source in the Tcl/Tk configuration scripts.
 #
-#	BTW: Does anyone actually use the tclConfig.sh and tkConfig.sh
-#	scripts? They seem to be always missing something.  For example,
-#	why don't they say where to find the Tcl and Tk header files?
-#
-#       For example, give me the library directory paths separately
-#	(I can't easily parse "-Ldir", but I can always paste a -L
-#	on the front).  If I want to specify equivalent of the -R flag,
-#	I need the build a path of the library directories. Such as
-#
-#	   "-R $(BLTLIB):$(TKLIB):$(TCLLIB):($XLIB):$(JPEGLIB)"
+#	This didn't work so well in the pre-8.5 days, but
+#	seems to be okay now.
 #
 # -----------------------------------------------------------------------
 
 if test "x$xc_with_tcl" != "x" ; then
   . $tcl_config_sh
   . $tk_config_sh
+
+  # Should probably trust the config file contents, but this configure
+  # file checks the Tcl and Tk include and lib directories.  Since
+  # the config file doesn't separate out the libraries from the strings
+  # passed to the compiler/linker, do it manually here.
+  #
+  # Extract TCL_LIB_DIR from TCL_LIB_SPEC
+  # Extract TK_LIB_DIR from TK_LIB_SPEC
+  # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC
+  # Extract TK_INC_DIR from TK_INCLUDE_SPEC
+  #
+  # These will be the defaults unless overridden by configure command line
+
+  tmpstr=${TCL_LIB_SPEC#*-L}
+  TCL_LIB_DIR=${tmpstr% -l*}
+  tmpstr=${TK_LIB_SPEC#*-L}
+  TK_LIB_DIR=${tmpstr% -l*}
+  TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I}
+  TK_INC_DIR=${TK_INCLUDE_SPEC#*-I}
+
   LIBS="${TCL_LIBS} ${LIBS}"
 
-  if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
-    :
-  elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then
-    :
-  elif test "$TCL_VERSION" = "$TK_VERSION" ; then
+  if test "$TCL_VERSION" = "$TK_VERSION" ; then
     :
   else
     echo "Mismatched Tcl/Tk versions ($TCL_VERSION != $TK_VERSION)"
@@ -6582,6 +6973,11 @@ if test "x$xc_with_tcl" != "x" ; then
   fi
 fi
 
+# -----------------------------------------------------------------------
+# Rely on TCL_INCLUDE_SPEC from tclConfig.sh unless "--with-tclincls"
+# overrides.  With TCL_INCLUDE_SPEC, pull out TCL_INC_DIR
+# -----------------------------------------------------------------------
+
 if test "x$xc_with_tcl" != "x" ; then
   if test "x${xc_with_tcl_includes}" != "x" ; then
     if test -r "${xc_with_tcl_includes}/tcl.h" ; then
@@ -6600,6 +6996,7 @@ if test "x$xc_with_tcl" != "x" ; then
     do
       if test -r "$dir/tcl.h" ; then
         TCL_INC_DIR=$dir
+        TCL_INCLUDE_SPEC="-I${TCL_INC_DIR}"
         break
       fi
     done
@@ -6613,25 +7010,31 @@ if test "x$xc_with_tcl" != "x" ; then
   fi
 fi
 
+# -----------------------------------------------------------------------
+# Rely on TK_INCLUDE_SPEC from tkConfig.sh unless "--with-tkincls"
+# overrides.  With TK_INCLUDE_SPEC, pull out TK_INC_DIR
+# -----------------------------------------------------------------------
+
 if test "x$xc_with_tcl" != "x" ; then
   if test "x${xc_with_tk_includes}" != "x" ; then
     if test -r "${xc_with_tk_includes}/tk.h" ; then
       TK_INC_DIR=${xc_with_tk_includes}
-    else
+    elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
       echo "Can't find tk.h in \"${xc_with_tk_includes}\""
       echo "Reverting to non-Tcl compilation"
       xc_with_tcl=""
     fi
-  else
+  elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
     for dir in \
+     ${TK_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
      ${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION} \
      ${TK_PREFIX}/include \
      ${TK_SRC_DIR}/generic \
-     ${TK_INC_DIR} \
-     ${TCL_INC_DIR}
+     ${TK_INC_DIR}
     do
       if test -r "$dir/tk.h" ; then
         TK_INC_DIR=$dir
+        TK_INCLUDE_SPEC="-I${TK_INC_DIR}"
         break
       fi
     done
@@ -6640,79 +7043,21 @@ if test "x$xc_with_tcl" != "x" ; then
       echo "Reverting to non-Tcl compilation"
       xc_with_tcl=""
     fi
-  fi
-fi
-
-if test "x$xc_with_tcl" != "x" ; then
-  case $target in
-    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
-      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-      ;;
-    *)
-      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
-      TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
-      ;;
-  esac
-
-  TCL_LIB_SPEC="-l${TCL_LIB_NAME}"
-  TK_LIB_SPEC="-l${TK_LIB_NAME}"
-
-# Find the version of "wish" that corresponds to TCL_EXEC_PREFIX
-# We really ought to run "ldd" to confirm that the linked libraries match.
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wish executable" >&5
-$as_echo_n "checking for wish executable... " >&6; }
-  for dir in \
-   ${TK_EXEC_PREFIX}/bin \
-   ${TK_EXEC_PREFIX}
-  do
-    for wishexe in \
-      wish \
-      wish${TK_VERSION} \
-      wish.exe \
-      wish${TK_VERSION}.exe
-    do
-      if test -r "$dir/$wishexe" ; then
-        WISH_EXE=$dir/$wishexe
-        break
-      fi
-    done
-    if test "x${WISH_EXE}" != "x" ; then
-      break
-    fi
-  done
-  if test "x${WISH_EXE}" = "x" ; then
-    echo "Warning: Can't find executable for \"wish\".  You may have to"
-    echo "manually set the value for WISH_EXE in the xcircuit startup script."
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${WISH_EXE}" >&5
-$as_echo "${WISH_EXE}" >&6; }
+    TK_INC_DIR=`echo ${TK_INCLUDE_SPEC} | sed -e '/-I/s/-I//'`
   fi
+fi
 
-# Have to define SHDLIB_EXT here even though we have to do it below, too.
-  case $target in
-     *-hpux*)
-	SHDLIB_EXT=".sl"
-	;;
-     *cygwin*)
-	SHDLIB_EXT=".dll"
-	;;
-     *-darwin*)
-	SHDLIB_EXT=".dylib"
-	;;
-     *-openbsd*)
-	SHDLIB_EXT=".so.${TCL_LIB_FILE##*.so.}"
-	;;
-     *)
-	SHDLIB_EXT=".so"
-	;;
-  esac
+# --------------------------------------------------------------
+# Rely on TCL_LIB_SPEC from tclConfig.sh unless "--with-tcllibs"
+# overrides.  With TCL_LIB_SPEC, pull out TCL_LIB_DIR
+# --------------------------------------------------------------
 
+if test "x$xc_with_tcl" != "x" ; then
   if test "x${xc_with_tcl_libraries}" != "x" ; then
+    TCL_LIB_SPEC=""
     for libname in \
+     "${xc_with_tcl_libraries}/${TCL_LIB_FILE}" \
      "${xc_with_tcl_libraries}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
     do
       if test -r "$libname" ; then
@@ -6720,13 +7065,12 @@ $as_echo "${WISH_EXE}" >&6; }
         break
       fi
     done
-
-    if test "x${TCL_LIB_DIR}" = "x" ; then
+    if test "x${TCL_LIB_DIR}" == "x" ; then
       echo "Can't find tcl library in \"${xc_with_tcl_libraries}\""
       echo "Reverting to non-Tcl compile"
       xc_with_tcl=""
     fi
-  else
+  elif test "x${TCL_LIB_SPEC}" == "x" ; then
     for libpfix in "lib64" "lib"
     do
       libname="${TCL_EXEC_PREFIX}/${libpfix}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
@@ -6740,12 +7084,21 @@ $as_echo "${WISH_EXE}" >&6; }
       echo "Reverting to non-Tcl compile"
       xc_with_tcl=""
     fi
+  else
+    TCL_LIB_DIR=`echo ${TCL_LIB_SPEC} | sed -e '/-L/s/-L//' -e '/-l/s/-l.*//'`
   fi
 fi
 
+# --------------------------------------------------------------
+# Rely on TK_LIB_SPEC from tkConfig.sh unless "--with-tklibs"
+# overrides.  With TK_LIB_SPEC, pull out TK_LIB_DIR
+# --------------------------------------------------------------
+
 if test "x$xc_with_tcl" != "x" ; then
   if test "x${xc_with_tk_libraries}" != "x" ; then
+    TK_LIB_SPEC=""
     for libname in \
+     "${xc_with_tk_libraries}/${TK_LIB_FILE}" \
      "${xc_with_tk_libraries}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
     do
       if test -r "$libname" ; then
@@ -6753,12 +7106,12 @@ if test "x$xc_with_tcl" != "x" ; then
         break
       fi
     done
-    if test "x${TK_LIB_DIR}" = "x" ; then
+    if test "x${TK_LIB_DIR}" == "x" ; then
       echo "Can't find tk library in \"${xc_with_tk_libraries}\""
       echo "Reverting to non-Tcl compile"
       xc_with_tcl=""
     fi
-  else
+  elif test "x${TK_LIB_SPEC}" == "x" ; then
     for libpfix in "lib64" "lib"
     do
       libname="${TK_EXEC_PREFIX}/${libpfix}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
@@ -6772,306 +7125,179 @@ if test "x$xc_with_tcl" != "x" ; then
       echo "Reverting to non-Tcl compile"
       xc_with_tcl=""
     fi
+  else
+    TK_LIB_DIR=`echo ${TCL_LIB_SPEC} | sed -e '/-L/s/-L//' -e '/-l/s/-l.*//'`
   fi
 fi
 
-
-# -----------------------------------------------------------------------
-#
-# Tk libraries and header files
-#
-# -----------------------------------------------------------------------
+#--------------------------------------------------------------------
+# If TCL_LIB_SPEC and/or TK_LIB_SPEC do not exist, construct them
+#--------------------------------------------------------------------
 
 if test "x$xc_with_tcl" != "x" ; then
-  if test "${TK_INC_DIR}" != "/usr/include" -a \
-	"${TK_INC_DIR}" != "${TCL_INC_DIR}"; then
-    INC_SPECS="${INC_SPECS} -I${TK_INC_DIR}"
-  fi
-  if test "${TK_LIB_DIR}" = "/usr/lib" -o \
-	"${TK_LIB_DIR}" = "/usr/lib64" ; then
-    LIB_SPECS="${TK_LIB_SPEC}"
-  else
-    LIB_SPECS="-L${TK_LIB_DIR} ${TK_LIB_SPEC}"
-    if test "x${loader_run_path}" = "x" ; then
-      loader_run_path="${TK_LIB_DIR}"
-    else
-      loader_run_path="${TK_LIB_DIR}:${loader_run_path}"
-    fi
+  if test "x${TCL_LIB_SPEC}" == "x" ; then
+    case $target in
+      *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
+        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+        ;;
+      *)
+        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+        ;;
+    esac
+    TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_LIB_NAME}"
   fi
 
-# -----------------------------------------------------------------------
-#
-# Tcl libraries and header files
-#
-# Add a header file directory specification only if the Tcl headers reside
-# in a different directory from Tk's.
-#
-#
-# -----------------------------------------------------------------------
-  if test "x${TCL_INCLUDE_SPEC}" != "x" ; then
-    INC_SPECS="${INC_SPECS} ${TCL_INCLUDE_SPEC}"
-  elif test "${TCL_INC_DIR}" != "/usr/include" ; then
-    INC_SPECS="${INC_SPECS} -I${TCL_INC_DIR}"
+  if test "x${TK_LIB_SPEC}" == "x" ; then
+    case $target in
+      *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
+        TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+        ;;
+      *)
+        TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
+        ;;
+    esac
+    TK_LIB_SPEC="-L${TK_LIB_DIR} -l${TK_LIB_NAME}"
   fi
 
-  if test "${TCL_LIB_DIR}" = "/usr/lib" -o \
-	"${TCL_LIB_DIR}" = "/usr/lib64" -o \
-	"${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then
-    LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}"
-  else
-    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
-    if test "x${loader_run_path}" = "x" ; then
-      loader_run_path="${TCL_LIB_DIR}"
-    else
-      loader_run_path="${TCL_LIB_DIR}:${loader_run_path}"
+  # Find the version of "wish" that corresponds to TCL_EXEC_PREFIX
+  # We really ought to run "ldd" to confirm that the linked libraries match.
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wish executable" >&5
+$as_echo_n "checking for wish executable... " >&6; }
+  for dir in \
+   ${TK_EXEC_PREFIX}/bin \
+   ${TK_EXEC_PREFIX}
+  do
+    for wishexe in \
+      wish \
+      wish${TK_VERSION} \
+      wish.exe \
+      wish${TK_VERSION}.exe
+    do
+      if test -r "$dir/$wishexe" ; then
+        WISH_EXE=$dir/$wishexe
+        break
+      fi
+    done
+    if test "x${WISH_EXE}" != "x" ; then
+      break
     fi
+  done
+  if test "x${WISH_EXE}" = "x" ; then
+    echo "Warning: Can't find executable for \"wish\".  You may have to"
+    echo "manually set the value for WISH_EXE in the xcircuit startup script."
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${WISH_EXE}" >&5
+$as_echo "${WISH_EXE}" >&6; }
   fi
 
-#--------------------------------------------------------------------
-#
-# Check if we can generate shared libraries on this system.  Set flags
-# to generate shared libraries for systems that we know about.  Start
-# with the values found in tclConfig.sh, make changes as we know about
-# the different systems.
-#
-#--------------------------------------------------------------------
-
-# Initialize shared library build variables
-
-  LDDL_FLAGS="-shared"
-  SHDLIB_EXT=".so"
-  LD_RUN_PATH=""
-  EXTRA_LIB_SPECS=""
-
-  build_shared="yes"
-
+  # Have to define SHDLIB_EXT here even though we have to do it below, too.
   case $target in
-    *-aix4.[2-9]*)
-      # No Position-Independent flags needed
-
-      # Use the installed export file or the one found in the source directory.
-
-      if test -r "${TCL_LIB_DIR}/lib${TCL_LIB_NAME}.exp" ; then
-        tcl_exp="${TCL_LIB_DIR}/lib${TCL_LIB_NAME}.exp"
-      else
-        tcl_exp="${TCL_SRC_DIR}/unix/lib.exp"
-      fi
-      if test -r "${TK_LIB_DIR}/lib${TK_LIB_NAME}.exp" ; then
-        tk_exp="${TK_LIB_DIR}/lib${TK_LIB_NAME}.exp"
-      else
-        tk_exp="${TK_SRC_DIR}/unix/lib.exp"
-      fi
-
-      full_src_path=`cd ${srcdir}; pwd`
-
-      # Use shell-script to link shared library
-      SHLIB_LD="${full_src_path}/cf/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry -bI:${tk_exp} -bI:${tcl_exp}"
-
-      SHLIB_LIB_SPEC="${aix_lib_specs} -lc"
-
-      LDFLAGS="-L${loader_run_path}"
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
-
-    *-aix*)
-      # No Position-Independent flags needed
-
-      # Use the installed export file or the one found in the source directory.
-
-      if test -r "${TCL_LIB_DIR}/lib${TCL_LIB_NAME}.exp" ; then
-        tcl_exp="${TCL_LIB_DIR}/lib${TCL_LIB_NAME}.exp"
-      else
-        tcl_exp="${TCL_SRC_DIR}/unix/lib.exp"
-      fi
-      if test -r "${TK_LIB_DIR}/lib${TK_LIB_NAME}.exp" ; then
-        tk_exp="${TK_LIB_DIR}/lib${TK_LIB_NAME}.exp"
-      else
-        tk_exp="${TK_SRC_DIR}/unix/lib.exp"
-      fi
-
-      full_src_path=`cd ${srcdir}/cf; pwd`
-
-      # Use shell-script to link shared library
-
-      SHLIB_LD="${full_src_path}/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry -bI:${tk_exp} -bI:${tcl_exp}"
-
-      SHLIB_LIB_SPECS="${aix_lib_specs} -lc"
-
-      LDFLAGS="-L${loader_run_path}"
-      EXTRA_LIB_SPECS="-lld"
-      ;;
-
-    *-bsdi2*|*-bsdi3*)
-      SHLIB_LD="shlicc"
-      LDDL_FLAGS="-r"
-
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
-
-    *-darwin*)
-      SHDLIB_EXT=".dylib"
-      SHLIB_LIB_SPECS="${LIB_SPECS}"
-      if test "${xc_with_gnu_ld}" = "yes" ; then
-	 LDDL_FLAGS="-dynamiclib -bind_at_load"
-      else
-	 LDDL_FLAGS="-single_module -dynamiclib -flat_namespace"
-	 LDDL_FLAGS="${LDDL_FLAGS} -undefined suppress -noprebind"
-	 SHLIB_CFLAGS="-I/sw/include -fno-common"
-      fi
-      ;;
-
-    *cygwin*)
-      $as_echo "#define CYGWIN 1" >>confdefs.h
-
-      SHDLIB_EXT=".dll"
-      LDDL_FLAGS="-shared -Wl,--enable-auto-image-base -Wl,-rpath,${loader_run_path}"
-      SHLIB_LIB_SPECS="${LIB_SPECS}"
-      ;;
-
-    *-bsdi4*)
-      SHLIB_CFLAGS="-export-dynamic -fPIC"
-      SHLIB_LD="${CC}"
-      LDDL_FLAGS='-shared -Wl,-E -Wl,-soname,$@'
-      ;;
-
-    *-dgux*)
-      SHLIB_CFLAGS="-K PIC"
-      SHLIB_LD="cc"
-      LDDL_FLAGS="-G"
-
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
-
-    *-hpux*)
-      if test "$GCC" = "no" ; then
-        DEFINES="$DEFINES -D_HPUX_SOURCE"
-      fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  found=yes
-else
-  found=no
+     *-hpux*)
+	SHDLIB_EXT=".sl"
+	;;
+     *cygwin*)
+	SHDLIB_EXT=".dll.a"
+	;;
+     *-darwin*)
+	SHDLIB_EXT=".dylib"
+	;;
+     *-openbsd*)
+	SHDLIB_EXT=".so.${TCL_LIB_FILE##*.so.}"
+	;;
+     *)
+	SHDLIB_EXT=".so"
+	;;
+  esac
 fi
 
-      if test "${found}" = "yes" ; then
-        SHLIB_CFLAGS="+z"
-        SHLIB_LD="ld"
-        LDDL_FLAGS="-b -E -n +s +b,${loader_run_path}:."
-        SHDLIB_EXT=".sl"
-
-        # The run path is included in both LDFLAGS and LDDL_FLAGS
-        # because SHLIB_LD is ld and LD is cc/gcc.
 
-        LDFLAGS="-Wl,-E -Wl,+s,+b,${loader_run_path}:."
-        EXTRA_LIB_SPECS="-ldld"
-      fi
-      ;;
+# -----------------------------------------------------------------------
+#
+# Tk libraries and header files
+#
+# -----------------------------------------------------------------------
 
-    *-irix64-6.5*)
-      SHLIB_LD="ld"
-      LDDL_FLAGS="-32 -shared -rdata_shared"
-      LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
-      ;;
+if test "x$xc_with_tcl" != "x" ; then
+  INC_SPECS="${INC_SPECS} ${TCL_INCLUDE_SPEC} ${TK_INCLUDE_SPEC}"
+  LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC} ${TK_LIB_SPEC}"
 
-    *-irix-56.*|*-irix64-*)
-      SHLIB_LD="ld"
-      LDDL_FLAGS="-shared -rdata_shared"
-      LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
-      LDFLAGS=""
-      if test "$GCC" = "yes" ; then
-        SHLIB_CFLAGS="-mabi=n32 $SHLIB_CFLAGS"
-        LDDL_FLAGS="-mabi=n32 $LDDL_FLAGS"
-        LDFLAGS="-mabi=n32 $LDFLAGS"
-      else
-        CFLAGS="-n32 $CFLAGS"
-        LDFLAGS="-n32 $LDFLAGS"
-      fi
-      ;;
+  if test "x${loader_run_path}" = "x" ; then
+    loader_run_path="${TCL_LIB_DIR}"
+  else
+    loader_run_path="${TCL_LIB_DIR}:${loader_run_path}"
+  fi
 
-    *-linux*)
-      SHLIB_CFLAGS="-fPIC"
-      SHLIB_LD="${CC}"
-      LDDL_FLAGS='-shared -Wl,-soname,$@'
-      LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
+  #--------------------------------------------------------------------
+  #
+  # Check if we can generate shared libraries on this system.  Set flags
+  # to generate shared libraries for systems that we know about.  Start
+  # with the values found in tclConfig.sh, make changes as we know about
+  # the different systems.
+  #
+  #--------------------------------------------------------------------
 
-      EXTRA_LIB_SPECS="-ldl"
+  # Initialize shared library build variables
 
-      case $target in
-	 x86_64-*)
-	    # AMD 64-bit archictecture
-	    # Add -fPIC to standard compile switch
-	    CFLAGS="${CFLAGS} -fPIC"
-	    ;;
-      esac
-      ;;
+  if test "x${TCL_SHLIB_SUFFIX}" == "x" ; then
+    SHDLIB_EXT=".so"
+  else
+    SHDLIB_EXT="${TCL_SHLIB_SUFFIX}"
+  fi
 
-    *-mp-ras-02*)
-      SHLIB_CFLAGS="-G -K PIC"
-      SHLIB_LD="${CC}"
-      LDDL_FLAGS=""
-      ;;
+  if test "x${TCL_SHLIB_LD}" == "x" ; then
+
+    # Construct shared library build arguments the painful way
+    # This is not expected to be necessary, so the number of
+    # supported systems has been pared down to a minimum.
+
+    LDDL_FLAGS="-shared"
+    LD_RUN_PATH=""
+    SHLIB_LD="${CC}"
+    EXTRA_LIB_SPECS=""
+
+    case $target in
+      *-darwin*)
+        SHDLIB_EXT=".dylib"
+        SHLIB_LIB_SPECS="${LIB_SPECS}"
+        if test "${xc_with_gnu_ld}" = "yes" ; then
+	   LDDL_FLAGS="-dynamiclib -bind_at_load"
+        else
+	   LDDL_FLAGS="-single_module -dynamiclib -flat_namespace"
+	   LDDL_FLAGS="${LDDL_FLAGS} -undefined suppress -noprebind"
+	   SHLIB_CFLAGS="-I/sw/include -fno-common"
+        fi
+        ;;
 
-    *-mp-ras-*)
-      SHLIB_CFLAGS="-G -K PIC"
-      SHLIB_LD="${CC}"
-      LDDL_FLAGS="-Wl,-Bexport"
-      ;;
+      *cygwin*)
+        $as_echo "#define CYGWIN 1" >>confdefs.h
 
-    *-ncr-sysv4-*2*)
-      SHLIB_CFLAGS="-K PIC"
-      SHLIB_LD="cc"
-      LDDL_FLAGS="-G"
+        SHDLIB_EXT=".dll.a"
+        LDDL_FLAGS="-shared -Wl,--enable-auto-image-base -Wl,-rpath,${loader_run_path}"
+        SHLIB_LIB_SPECS="${LIB_SPECS}"
+        ;;
 
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
+      *-linux*)
+        SHLIB_CFLAGS="-fPIC"
+        LDDL_FLAGS='-shared -Wl,-soname,$@'
+        LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
 
-    *-ncr-sysv4*)
-      SHLIB_CFLAGS="-K PIC"
-      SHLIB_LD="cc"
-      LDDL_FLAGS="-G -Wl,-Bexport"
+        EXTRA_LIB_SPECS="-ldl"
 
-      LDFLAGS="-Wl,-Bexport"
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
+        case $target in
+	   x86_64-*)
+	      # AMD 64-bit archictecture
+	      # Add -fPIC to standard compile switch
+	      CFLAGS="${CFLAGS} -fPIC"
+	      ;;
+        esac
+        ;;
 
-    *-netbsd*|*-freebsd*|*-openbsd*)
-      # Not available on all versions:  check for include file.
-      ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+      *-netbsd*|*-freebsd*|*-openbsd*)
+        # Not available on all versions:  check for include file.
+        ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
 if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   test_ok=yes
 else
@@ -7079,110 +7305,47 @@ else
 fi
 
 
-      if test "$test_ok" = yes; then
-        SHLIB_CFLAGS="-fpic"
-        SHLIB_LD="ld"
-        LDDL_FLAGS="-shared"
-      fi
-      ;;
-
-    *-nextstep*)
-      SHLIB_LD="cc"
-      LDDL_FLAGS="-nostdlib -r"
-      ;;
-
-    *-osf1-1.012*)
-      # OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1
-
-      # Warning: Ugly Makefile Hack
-      #	Make package name same as library name
-
-      SHLIB_LD='ld -R -export $@:'
-      ;;
-
-    *-osf1-1.*)
-      # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
-
-      SHLIB_CFLAGS="-fpic"
-      SHLIB_LD="ld -shared"
-      ;;
-
-    *-osf1V*)
-      # Digital OSF/1
-
-      SHLIB_LD='ld'
-      LDDL_FLAGS='-shared -expect_unresolved "*"'
-      LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
-      LDFLAGS=""
-      ;;
-
-    *-sco*)
-      # Note, dlopen is available only on SCO 3.2.5 and greater.  However,
-      # this test works, since "uname -s" was non-standard in 3.2.4 and
-      # below.
-
-      SHLIB_CFLAGS="-Kpic -belf"
-      SHLIB_LD="ld"
-      LDDL_FLAGS="-G"
-      LDFLAGS="-belf -Wl,-Bexport"
-      ;;
-
-    *-sni-sysv*)
-
-      SHLIB_CFLAGS="-K PIC"
-      SHLIB_LD="cc"
-      LDDL_FLAGS="-G"
-
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
+        if test "$test_ok" = yes; then
+          SHLIB_CFLAGS="-fpic"
+          SHLIB_LD="ld"
+          LDDL_FLAGS="-shared"
+        fi
+        ;;
+    esac
 
-    *-sunos4*)
+    if test "$GCC" = "yes" ; then
+       CFLAGS="-fPIC ${CFLAGS}"
+    fi
 
-      SHLIB_CFLAGS="-PIC"
-      SHLIB_LD="ld"
-      LDDL_FLAGS="-assert pure-text"
+  else
 
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
+    # Rely on shared lib arguments in tclConfig.sh
 
-    *-solaris2*)
+    SHLIB_LD="${TCL_SHLIB_LD}"
+    EXTRA_LIB_FLAGS=""
+    LDDL_FLAGS="${TCL_LD_FLAGS}"
+    LD_RUN_PATH=""
 
-      if test "${xc_with_gnu_ld}" = "yes" ; then
-        LDDL_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
+    case $target in
+      *-linux*)
         LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
-      else
-        LDDL_FLAGS="-shared -mimpure-text"
-        LD_RUN_PATH="-R ${loader_run_path}"
-      fi
-      EXTRA_LIB_SPECS="-ldl"
-      SHLIB_LIB_SPECS="${LIB_SPECS}"
-    ;;
-
-    *-mips-dde-sysv*)
-
-      SHLIB_CFLAGS="-KPIC"
-      SHLIB_LD="cc"
-      LDDL_FLAGS="-G"
-
-      EXTRA_LIB_SPECS="-ldl"
-      ;;
-
-    *-pc-sysv4* | *-unixware-5*)
-      SHLIB_CFLAGS="-G -KPIC"
-      SHLIB_LD="${CC}"
-      LDDL_FLAGS=" -Wl,-Bexport"
-      ;;
-
-  esac
+	;;
+    esac
+  fi
 
-# If we're running gcc, then set SHLIB_CFLAGS flags for compiling
-# shared libraries for gcc, instead of those of the vendor's
-# compiler.
+  # If we're running gcc, then set SHLIB_CFLAGS flags for compiling
+  # shared libraries for gcc, instead of those of the vendor's
+  # compiler.
 
   if test "$GCC" = "yes" ; then
-#   SHLIB_CFLAGS="${SHLIB_CFLAGS} -fPIC"
-    CFLAGS="-fPIC ${CFLAGS}"
+    if test "x${TCL_SHLIB_CFLAGS}" = "x" ; then
+       SHLIB_CFLAGS="-fPIC ${SHLIB_CFLAGS}"
+    else
+       SHLIB_CFLAGS="${TCL_SHLIB_CFLAGS} ${SHLIB_CFLAGS}"
+    fi
   fi
+  CFLAGS="${CFLAGS} ${SHLIB_CFLAGS}"
+
   if test "${xc_with_gnu_ld}" = "yes" ; then
     LDDL_FLAGS="${LDDL_FLAGS} -Wl,--version-script=symbol.map"
   fi
@@ -7265,7 +7428,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_GS_EXEC=""
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7322,7 +7485,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_SPICE_EXEC=""
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7385,7 +7548,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7718,6 +7881,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -8032,16 +8203,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -8101,28 +8272,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -8144,7 +8303,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.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8201,10 +8360,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.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -8284,7 +8443,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -8753,7 +8912,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -8766,7 +8925,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -8800,21 +8959,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -8885,3 +9042,32 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+echo ""
+echo "Configuration results:"
+echo "----------------------------------------------------"
+echo ""
+
+if test "x$xc_with_tcl" == "x" ; then
+   if test "x$PYTHON" != x; then
+      echo "Using Python interface (not recommended)"
+   else
+      echo "No Tcl/Tk, using standard Xlib/Xt interface."
+      echo "If that is not what you wanted, then make sure"
+      echo "you have Tcl/Tk development packages installed?"
+   fi
+else
+   echo "Using Tcl/Tk interface"
+fi
+echo ""
+
+if test "x$xc_with_cairo" == "x" ; then
+   echo "No Cairo graphics."
+   echo "If that is not what you wanted, then make sure"
+   echo "you have libcairo and fontconfig installed."
+   echo "Try installing package cairo-devel."
+else
+   echo "Using Cairo graphics"
+fi
+echo ""
+echo "CFLAGS=${CFLAGS}"