Attachment 157851 Details for Bug 208679 – Proposed diff

Proposed diff

vamos-0.5.5-autotools.diff (text/x-patch), 2.42 MB, created by Ralf Corsepius on 2007-06-26 04:41:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Corsepius

Created: 2007-06-26 04:41:50 UTC

Size: 2.42 MB

patch

obsolete

>diff -uNr vamos-0.5.5.orig/acinclude.m4 vamos-0.5.5/acinclude.m4
>--- vamos-0.5.5.orig/acinclude.m4	2002-05-29 23:33:54.000000000 +0200
>+++ vamos-0.5.5/acinclude.m4	1970-01-01 01:00:00.000000000 +0100
>@@ -1,3901 +0,0 @@
>-# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
>-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
>-## Free Software Foundation, Inc.
>-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
>-##
>-## This program is free software; you can redistribute it and/or modify
>-## it under the terms of the GNU General Public License as published by
>-## the Free Software Foundation; either version 2 of the License, or
>-## (at your option) any later version.
>-##
>-## This program is distributed in the hope that it will be useful, but
>-## WITHOUT ANY WARRANTY; without even the implied warranty of
>-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-## General Public License for more details.
>-##
>-## You should have received a copy of the GNU General Public License
>-## along with this program; if not, write to the Free Software
>-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-##
>-## As a special exception to the GNU General Public License, if you
>-## distribute this file as part of a program that contains a
>-## configuration script generated by Autoconf, you may include it under
>-## the same distribution terms that you use for the rest of that program.
>-
>-# serial 46 AC_PROG_LIBTOOL
>-
>-AC_DEFUN([AC_PROG_LIBTOOL],
>-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
>-
>-# This can be used to rebuild libtool when needed
>-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>-
>-# Always use our own libtool.
>-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>-AC_SUBST(LIBTOOL)dnl
>-
>-# Prevent multiple expansion
>-define([AC_PROG_LIBTOOL], [])
>-])
>-
>-AC_DEFUN([AC_LIBTOOL_SETUP],
>-[AC_PREREQ(2.13)dnl
>-AC_REQUIRE([AC_ENABLE_SHARED])dnl
>-AC_REQUIRE([AC_ENABLE_STATIC])dnl
>-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
>-AC_REQUIRE([AC_CANONICAL_HOST])dnl
>-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
>-AC_REQUIRE([AC_PROG_CC])dnl
>-AC_REQUIRE([AC_PROG_LD])dnl
>-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
>-AC_REQUIRE([AC_PROG_NM])dnl
>-AC_REQUIRE([AC_PROG_LN_S])dnl
>-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
>-AC_REQUIRE([AC_OBJEXT])dnl
>-AC_REQUIRE([AC_EXEEXT])dnl
>-dnl
>-
>-_LT_AC_PROG_ECHO_BACKSLASH
>-# Only perform the check for file, if the check method requires it
>-case $deplibs_check_method in
>-file_magic*)
>-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
>-    AC_PATH_MAGIC
>-  fi
>-  ;;
>-esac
>-
>-AC_CHECK_TOOL(RANLIB, ranlib, :)
>-AC_CHECK_TOOL(STRIP, strip, :)
>-
>-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
>-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
>-enable_win32_dll=yes, enable_win32_dll=no)
>-
>-AC_ARG_ENABLE(libtool-lock,
>-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
>-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
>-
>-# Some flags need to be propagated to the compiler or linker for good
>-# libtool support.
>-case $host in
>-*-*-irix6*)
>-  # Find out which ABI we are using.
>-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
>-  if AC_TRY_EVAL(ac_compile); then
>-    case `/usr/bin/file conftest.$ac_objext` in
>-    *32-bit*)
>-      LD="${LD-ld} -32"
>-      ;;
>-    *N32*)
>-      LD="${LD-ld} -n32"
>-      ;;
>-    *64-bit*)
>-      LD="${LD-ld} -64"
>-      ;;
>-    esac
>-  fi
>-  rm -rf conftest*
>-  ;;
>-
>-*-*-sco3.2v5*)
>-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
>-  SAVE_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -belf"
>-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
>-    [AC_LANG_SAVE
>-     AC_LANG_C
>-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
>-     AC_LANG_RESTORE])
>-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
>-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
>-    CFLAGS="$SAVE_CFLAGS"
>-  fi
>-  ;;
>-
>-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
>-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
>-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
>-  AC_CHECK_TOOL(AS, as, false)
>-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
>-
>-  # recent cygwin and mingw systems supply a stub DllMain which the user
>-  # can override, but on older systems we have to supply one
>-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
>-    [AC_TRY_LINK([],
>-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
>-      DllMain (0, 0, 0);],
>-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
>-
>-  case $host/$CC in
>-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
>-    # old mingw systems require "-dll" to link a DLL, while more recent ones
>-    # require "-mdll"
>-    SAVE_CFLAGS="$CFLAGS"
>-    CFLAGS="$CFLAGS -mdll"
>-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
>-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
>-    CFLAGS="$SAVE_CFLAGS" ;;
>-  *-*-cygwin* | *-*-pw32*)
>-    # cygwin systems need to pass --dll to the linker, and not link
>-    # crt.o which will require a WinMain@16 definition.
>-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
>-  esac
>-  ;;
>-  ])
>-esac
>-
>-_LT_AC_LTCONFIG_HACK
>-
>-])
>-
>-# AC_LIBTOOL_HEADER_ASSERT
>-# ------------------------
>-AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
>-[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
>-    [lt_cv_func_assert_works],
>-    [case $host in
>-    *-*-solaris*)
>-      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
>-        case `$CC --version 2>/dev/null` in
>-        [[12]].*) lt_cv_func_assert_works=no ;;
>-        *)        lt_cv_func_assert_works=yes ;;
>-        esac
>-      fi
>-      ;;
>-    esac])
>-
>-if test "x$lt_cv_func_assert_works" = xyes; then
>-  AC_CHECK_HEADERS(assert.h)
>-fi
>-])# AC_LIBTOOL_HEADER_ASSERT
>-
>-# _LT_AC_CHECK_DLFCN
>-# --------------------
>-AC_DEFUN([_LT_AC_CHECK_DLFCN],
>-[AC_CHECK_HEADERS(dlfcn.h)
>-])# _LT_AC_CHECK_DLFCN
>-
>-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
>-# ---------------------------------
>-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
>-[AC_REQUIRE([AC_CANONICAL_HOST])
>-AC_REQUIRE([AC_PROG_NM])
>-AC_REQUIRE([AC_OBJEXT])
>-# Check for command to grab the raw symbol name followed by C symbol from nm.
>-AC_MSG_CHECKING([command to parse $NM output])
>-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
>-
>-# These are sane defaults that work on at least a few old systems.
>-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
>-
>-# Character class describing NM global symbol codes.
>-symcode='[[BCDEGRST]]'
>-
>-# Regexp to match symbols that can be accessed directly from C.
>-sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
>-
>-# Transform the above into a raw symbol and a C symbol.
>-symxfrm='\1 \2\3 \3'
>-
>-# Transform an extracted symbol line into a proper C declaration
>-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern char \1;/p'"
>-
>-# Transform an extracted symbol line into symbol name and symbol address
>-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>-
>-# Define system-specific variables.
>-case $host_os in
>-aix*)
>-  symcode='[[BCDT]]'
>-  ;;
>-cygwin* | mingw* | pw32*)
>-  symcode='[[ABCDGISTW]]'
>-  ;;
>-hpux*) # Its linker distinguishes data from code symbols
>-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern char \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>-  ;;
>-irix*)
>-  symcode='[[BCDEGRST]]'
>-  ;;
>-solaris* | sysv5*)
>-  symcode='[[BDT]]'
>-  ;;
>-sysv4)
>-  symcode='[[DFNSTU]]'
>-  ;;
>-esac
>-
>-# Handle CRLF in mingw tool chain
>-opt_cr=
>-case $host_os in
>-mingw*)
>-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
>-  ;;
>-esac
>-
>-# If we're using GNU nm, then use its standard symbol codes.
>-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
>-  symcode='[[ABCDGISTW]]'
>-fi
>-
>-# Try without a prefix undercore, then with it.
>-for ac_symprfx in "" "_"; do
>-
>-  # Write the raw and C identifiers.
>-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]$$symcode$symcode*$[[ 	]][[ 	]]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'"
>-
>-  # Check to see that the pipe works correctly.
>-  pipe_works=no
>-  rm -f conftest*
>-  cat > conftest.$ac_ext <<EOF
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-char nm_test_var;
>-void nm_test_func(){}
>-#ifdef __cplusplus
>-}
>-#endif
>-int main(){nm_test_var='a';nm_test_func();return(0);}
>-EOF
>-
>-  if AC_TRY_EVAL(ac_compile); then
>-    # Now try to grab the symbols.
>-    nlist=conftest.nm
>-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
>-      # Try sorting and uniquifying the output.
>-      if sort "$nlist" | uniq > "$nlist"T; then
>-	mv -f "$nlist"T "$nlist"
>-      else
>-	rm -f "$nlist"T
>-      fi
>-
>-      # Make sure that we snagged all the symbols we need.
>-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
>-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
>-	  cat <<EOF > conftest.$ac_ext
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-
>-EOF
>-	  # Now generate the symbol file.
>-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
>-
>-	  cat <<EOF >> conftest.$ac_ext
>-#if defined (__STDC__) && __STDC__
>-# define lt_ptr void *
>-#else
>-# define lt_ptr char *
>-# define const
>-#endif
>-
>-/* The mapping between symbol names and symbols. */
>-const struct {
>-  const char *name;
>-  lt_ptr address;
>-}
>-lt_preloaded_symbols[[]] =
>-{
>-EOF
>-	  sed "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
>-	  cat <<\EOF >> conftest.$ac_ext
>-  {0, (lt_ptr) 0}
>-};
>-
>-#ifdef __cplusplus
>-}
>-#endif
>-EOF
>-	  # Now try linking the two files.
>-	  mv conftest.$ac_objext conftstm.$ac_objext
>-	  save_LIBS="$LIBS"
>-	  save_CFLAGS="$CFLAGS"
>-	  LIBS="conftstm.$ac_objext"
>-	  CFLAGS="$CFLAGS$no_builtin_flag"
>-	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
>-	    pipe_works=yes
>-	  fi
>-	  LIBS="$save_LIBS"
>-	  CFLAGS="$save_CFLAGS"
>-	else
>-	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
>-	fi
>-      else
>-	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
>-      fi
>-    else
>-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
>-    fi
>-  else
>-    echo "$progname: failed program was:" >&AC_FD_CC
>-    cat conftest.$ac_ext >&5
>-  fi
>-  rm -f conftest* conftst*
>-
>-  # Do not use the global_symbol_pipe unless it works.
>-  if test "$pipe_works" = yes; then
>-    break
>-  else
>-    lt_cv_sys_global_symbol_pipe=
>-  fi
>-done
>-])
>-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
>-if test -z "$lt_cv_sys_global_symbol_pipe"; then
>-  global_symbol_to_cdecl=
>-  global_symbol_to_c_name_address=
>-else
>-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
>-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
>-fi
>-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
>-then
>-  AC_MSG_RESULT(failed)
>-else
>-  AC_MSG_RESULT(ok)
>-fi
>-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
>-
>-# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
>-# ---------------------------------
>-AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
>-[# Find the correct PATH separator.  Usually this is `:', but
>-# DJGPP uses `;' like DOS.
>-if test "X${PATH_SEPARATOR+set}" != Xset; then
>-  UNAME=${UNAME-`uname 2>/dev/null`}
>-  case X$UNAME in
>-    *-DOS) lt_cv_sys_path_separator=';' ;;
>-    *)     lt_cv_sys_path_separator=':' ;;
>-  esac
>-  PATH_SEPARATOR=$lt_cv_sys_path_separator
>-fi
>-])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
>-
>-# _LT_AC_PROG_ECHO_BACKSLASH
>-# --------------------------
>-# Add some code to the start of the generated configure script which
>-# will find an echo command which doesn't interpret backslashes.
>-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
>-[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
>-			      [AC_DIVERT_PUSH(NOTICE)])
>-_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
>-
>-# Check that we are running under the correct shell.
>-SHELL=${CONFIG_SHELL-/bin/sh}
>-
>-case X$ECHO in
>-X*--fallback-echo)
>-  # Remove one level of quotation (which was required for Make).
>-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
>-  ;;
>-esac
>-
>-echo=${ECHO-echo}
>-if test "X[$]1" = X--no-reexec; then
>-  # Discard the --no-reexec flag, and continue.
>-  shift
>-elif test "X[$]1" = X--fallback-echo; then
>-  # Avoid inline document here, it may be left over
>-  :
>-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
>-  # Yippee, $echo works!
>-  :
>-else
>-  # Restart under the correct shell.
>-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
>-fi
>-
>-if test "X[$]1" = X--fallback-echo; then
>-  # used as fallback echo
>-  shift
>-  cat <<EOF
>-$*
>-EOF
>-  exit 0
>-fi
>-
>-# The HP-UX ksh and POSIX shell print the target directory to stdout
>-# if CDPATH is set.
>-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>-
>-if test -z "$ECHO"; then
>-if test "X${echo_test_string+set}" != Xset; then
>-# find a string as large as possible, as long as the shell can cope with it
>-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
>-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
>-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
>-       echo_test_string="`eval $cmd`" &&
>-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
>-    then
>-      break
>-    fi
>-  done
>-fi
>-
>-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
>-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
>-   test "X$echo_testing_string" = "X$echo_test_string"; then
>-  :
>-else
>-  # The Solaris, AIX, and Digital Unix default echo programs unquote
>-  # backslashes.  This makes it impossible to quote backslashes using
>-  #   echo "$something" | sed 's/\\/\\\\/g'
>-  #
>-  # So, first we look for a working echo in the user's PATH.
>-
>-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for dir in $PATH /usr/ucb; do
>-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
>-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
>-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
>-       test "X$echo_testing_string" = "X$echo_test_string"; then
>-      echo="$dir/echo"
>-      break
>-    fi
>-  done
>-  IFS="$save_ifs"
>-
>-  if test "X$echo" = Xecho; then
>-    # We didn't find a better echo, so look for alternatives.
>-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
>-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
>-       test "X$echo_testing_string" = "X$echo_test_string"; then
>-      # This shell has a builtin print -r that does the trick.
>-      echo='print -r'
>-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
>-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
>-      # If we have ksh, try running configure again with it.
>-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
>-      export ORIGINAL_CONFIG_SHELL
>-      CONFIG_SHELL=/bin/ksh
>-      export CONFIG_SHELL
>-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
>-    else
>-      # Try using printf.
>-      echo='printf %s\n'
>-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
>-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
>-	 test "X$echo_testing_string" = "X$echo_test_string"; then
>-	# Cool, printf works
>-	:
>-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
>-	   test "X$echo_testing_string" = 'X\t' &&
>-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
>-	   test "X$echo_testing_string" = "X$echo_test_string"; then
>-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
>-	export CONFIG_SHELL
>-	SHELL="$CONFIG_SHELL"
>-	export SHELL
>-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
>-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
>-	   test "X$echo_testing_string" = 'X\t' &&
>-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
>-	   test "X$echo_testing_string" = "X$echo_test_string"; then
>-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
>-      else
>-	# maybe with a smaller string...
>-	prev=:
>-
>-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
>-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
>-	  then
>-	    break
>-	  fi
>-	  prev="$cmd"
>-	done
>-
>-	if test "$prev" != 'sed 50q "[$]0"'; then
>-	  echo_test_string=`eval $prev`
>-	  export echo_test_string
>-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
>-	else
>-	  # Oops.  We lost completely, so just stick with echo.
>-	  echo=echo
>-	fi
>-      fi
>-    fi
>-  fi
>-fi
>-fi
>-
>-# Copy echo and quote the copy suitably for passing to libtool from
>-# the Makefile, instead of quoting the original, which is used later.
>-ECHO=$echo
>-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
>-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
>-fi
>-
>-AC_SUBST(ECHO)
>-AC_DIVERT_POP
>-])# _LT_AC_PROG_ECHO_BACKSLASH
>-
>-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
>-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
>-# ------------------------------------------------------------------
>-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
>-[if test "$cross_compiling" = yes; then :
>-  [$4]
>-else
>-  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>-  lt_status=$lt_dlunknown
>-  cat > conftest.$ac_ext <<EOF
>-[#line __oline__ "configure"
>-#include "confdefs.h"
>-
>-#if HAVE_DLFCN_H
>-#include <dlfcn.h>
>-#endif
>-
>-#include <stdio.h>
>-
>-#ifdef RTLD_GLOBAL
>-#  define LT_DLGLOBAL		RTLD_GLOBAL
>-#else
>-#  ifdef DL_GLOBAL
>-#    define LT_DLGLOBAL		DL_GLOBAL
>-#  else
>-#    define LT_DLGLOBAL		0
>-#  endif
>-#endif
>-
>-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
>-   find out it does not work in some platform. */
>-#ifndef LT_DLLAZY_OR_NOW
>-#  ifdef RTLD_LAZY
>-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
>-#  else
>-#    ifdef DL_LAZY
>-#      define LT_DLLAZY_OR_NOW		DL_LAZY
>-#    else
>-#      ifdef RTLD_NOW
>-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
>-#      else
>-#        ifdef DL_NOW
>-#          define LT_DLLAZY_OR_NOW	DL_NOW
>-#        else
>-#          define LT_DLLAZY_OR_NOW	0
>-#        endif
>-#      endif
>-#    endif
>-#  endif
>-#endif
>-
>-#ifdef __cplusplus
>-extern "C" void exit (int);
>-#endif
>-
>-void fnord() { int i=42;}
>-int main ()
>-{
>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>-  int status = $lt_dlunknown;
>-
>-  if (self)
>-    {
>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>-      /* dlclose (self); */
>-    }
>-
>-    exit (status);
>-}]
>-EOF
>-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>-    lt_status=$?
>-    case x$lt_status in
>-      x$lt_dlno_uscore) $1 ;;
>-      x$lt_dlneed_uscore) $2 ;;
>-      x$lt_unknown|x*) $3 ;;
>-    esac
>-  else :
>-    # compilation failed
>-    $3
>-  fi
>-fi
>-rm -fr conftest*
>-])# _LT_AC_TRY_DLOPEN_SELF
>-
>-# AC_LIBTOOL_DLOPEN_SELF
>-# -------------------
>-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
>-[if test "x$enable_dlopen" != xyes; then
>-  enable_dlopen=unknown
>-  enable_dlopen_self=unknown
>-  enable_dlopen_self_static=unknown
>-else
>-  lt_cv_dlopen=no
>-  lt_cv_dlopen_libs=
>-
>-  case $host_os in
>-  beos*)
>-    lt_cv_dlopen="load_add_on"
>-    lt_cv_dlopen_libs=
>-    lt_cv_dlopen_self=yes
>-    ;;
>-
>-  cygwin* | mingw* | pw32*)
>-    lt_cv_dlopen="LoadLibrary"
>-    lt_cv_dlopen_libs=
>-   ;;
>-
>-  *)
>-    AC_CHECK_FUNC([shl_load],
>-          [lt_cv_dlopen="shl_load"],
>-      [AC_CHECK_LIB([dld], [shl_load],
>-            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
>-	[AC_CHECK_FUNC([dlopen],
>-	      [lt_cv_dlopen="dlopen"],
>-	  [AC_CHECK_LIB([dl], [dlopen],
>-	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
>-	    [AC_CHECK_LIB([svld], [dlopen],
>-	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
>-	      [AC_CHECK_LIB([dld], [dld_link],
>-	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
>-	      ])
>-	    ])
>-	  ])
>-	])
>-      ])
>-    ;;
>-  esac
>-
>-  if test "x$lt_cv_dlopen" != xno; then
>-    enable_dlopen=yes
>-  else
>-    enable_dlopen=no
>-  fi
>-
>-  case $lt_cv_dlopen in
>-  dlopen)
>-    save_CPPFLAGS="$CPPFLAGS"
>-    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
>-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
>-
>-    save_LDFLAGS="$LDFLAGS"
>-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>-
>-    save_LIBS="$LIBS"
>-    LIBS="$lt_cv_dlopen_libs $LIBS"
>-
>-    AC_CACHE_CHECK([whether a program can dlopen itself],
>-	  lt_cv_dlopen_self, [dnl
>-	  _LT_AC_TRY_DLOPEN_SELF(
>-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
>-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
>-    ])
>-
>-    if test "x$lt_cv_dlopen_self" = xyes; then
>-      LDFLAGS="$LDFLAGS $link_static_flag"
>-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
>-    	  lt_cv_dlopen_self_static, [dnl
>-	  _LT_AC_TRY_DLOPEN_SELF(
>-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
>-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
>-      ])
>-    fi
>-
>-    CPPFLAGS="$save_CPPFLAGS"
>-    LDFLAGS="$save_LDFLAGS"
>-    LIBS="$save_LIBS"
>-    ;;
>-  esac
>-
>-  case $lt_cv_dlopen_self in
>-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
>-  *) enable_dlopen_self=unknown ;;
>-  esac
>-
>-  case $lt_cv_dlopen_self_static in
>-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
>-  *) enable_dlopen_self_static=unknown ;;
>-  esac
>-fi
>-])# AC_LIBTOOL_DLOPEN_SELF
>-
>-AC_DEFUN([_LT_AC_LTCONFIG_HACK],
>-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
>-# Sed substitution that helps us do robust quoting.  It backslashifies
>-# metacharacters that are still active within double-quoted strings.
>-Xsed='sed -e s/^X//'
>-sed_quote_subst='s/$[[\\"\\`$\\\\]]$/\\\1/g'
>-
>-# Same as above, but do not quote variable references.
>-double_quote_subst='s/$[[\\"\\`\\\\]]$/\\\1/g'
>-
>-# Sed substitution to delay expansion of an escaped shell variable in a
>-# double_quote_subst'ed string.
>-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
>-
>-# Constants:
>-rm="rm -f"
>-
>-# Global variables:
>-default_ofile=libtool
>-can_build_shared=yes
>-
>-# All known linkers require a `.a' archive for static linking (except M$VC,
>-# which needs '.lib').
>-libext=a
>-ltmain="$ac_aux_dir/ltmain.sh"
>-ofile="$default_ofile"
>-with_gnu_ld="$lt_cv_prog_gnu_ld"
>-need_locks="$enable_libtool_lock"
>-
>-old_CC="$CC"
>-old_CFLAGS="$CFLAGS"
>-
>-# Set sane defaults for various variables
>-test -z "$AR" && AR=ar
>-test -z "$AR_FLAGS" && AR_FLAGS=cru
>-test -z "$AS" && AS=as
>-test -z "$CC" && CC=cc
>-test -z "$DLLTOOL" && DLLTOOL=dlltool
>-test -z "$LD" && LD=ld
>-test -z "$LN_S" && LN_S="ln -s"
>-test -z "$MAGIC_CMD" && MAGIC_CMD=file
>-test -z "$NM" && NM=nm
>-test -z "$OBJDUMP" && OBJDUMP=objdump
>-test -z "$RANLIB" && RANLIB=:
>-test -z "$STRIP" && STRIP=:
>-test -z "$ac_objext" && ac_objext=o
>-
>-if test x"$host" != x"$build"; then
>-  ac_tool_prefix=${host_alias}-
>-else
>-  ac_tool_prefix=
>-fi
>-
>-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
>-case $host_os in
>-linux-gnu*) ;;
>-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
>-esac
>-
>-case $host_os in
>-aix3*)
>-  # AIX sometimes has problems with the GCC collect2 program.  For some
>-  # reason, if we set the COLLECT_NAMES environment variable, the problems
>-  # vanish in a puff of smoke.
>-  if test "X${COLLECT_NAMES+set}" != Xset; then
>-    COLLECT_NAMES=
>-    export COLLECT_NAMES
>-  fi
>-  ;;
>-esac
>-
>-# Determine commands to create old-style static archives.
>-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
>-old_postinstall_cmds='chmod 644 $oldlib'
>-old_postuninstall_cmds=
>-
>-if test -n "$RANLIB"; then
>-  case $host_os in
>-  openbsd*)
>-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
>-    ;;
>-  *)
>-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
>-    ;;
>-  esac
>-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
>-fi
>-
>-# Allow CC to be a program name with arguments.
>-set dummy $CC
>-compiler="[$]2"
>-
>-## FIXME: this should be a separate macro
>-##
>-AC_MSG_CHECKING([for objdir])
>-rm -f .libs 2>/dev/null
>-mkdir .libs 2>/dev/null
>-if test -d .libs; then
>-  objdir=.libs
>-else
>-  # MS-DOS does not allow filenames that begin with a dot.
>-  objdir=_libs
>-fi
>-rmdir .libs 2>/dev/null
>-AC_MSG_RESULT($objdir)
>-##
>-## END FIXME
>-
>-
>-## FIXME: this should be a separate macro
>-##
>-AC_ARG_WITH(pic,
>-[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
>-pic_mode="$withval", pic_mode=default)
>-test -z "$pic_mode" && pic_mode=default
>-
>-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
>-# in isolation, and that seeing it set (from the cache) indicates that
>-# the associated values are set (in the cache) correctly too.
>-AC_MSG_CHECKING([for $compiler option to produce PIC])
>-AC_CACHE_VAL(lt_cv_prog_cc_pic,
>-[ lt_cv_prog_cc_pic=
>-  lt_cv_prog_cc_shlib=
>-  lt_cv_prog_cc_wl=
>-  lt_cv_prog_cc_static=
>-  lt_cv_prog_cc_no_builtin=
>-  lt_cv_prog_cc_can_build_shared=$can_build_shared
>-
>-  if test "$GCC" = yes; then
>-    lt_cv_prog_cc_wl='-Wl,'
>-    lt_cv_prog_cc_static='-static'
>-
>-    case $host_os in
>-    aix*)
>-      # Below there is a dirty hack to force normal static linking with -ldl
>-      # The problem is because libdl dynamically linked with both libc and
>-      # libC (AIX C++ library), which obviously doesn't included in libraries
>-      # list by gcc. This cause undefined symbols with -static flags.
>-      # This hack allows C programs to be linked with "-static -ldl", but
>-      # not sure about C++ programs.
>-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
>-      ;;
>-    amigaos*)
>-      # FIXME: we need at least 68020 code to build shared libraries, but
>-      # adding the `-m68020' flag to GCC prevents building anything better,
>-      # like `-m68040'.
>-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
>-      ;;
>-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
>-      # PIC is the default for these OSes.
>-      ;;
>-    darwin* | rhapsody*)
>-      # PIC is the default on this platform
>-      # Common symbols not allowed in MH_DYLIB files
>-      lt_cv_prog_cc_pic='-fno-common'
>-      ;;
>-    cygwin* | mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
>-      ;;
>-    sysv4*MP*)
>-      if test -d /usr/nec; then
>-	 lt_cv_prog_cc_pic=-Kconform_pic
>-      fi
>-      ;;
>-    *)
>-      lt_cv_prog_cc_pic='-fPIC'
>-      ;;
>-    esac
>-  else
>-    # PORTME Check for PIC flags for the system compiler.
>-    case $host_os in
>-    aix3* | aix4* | aix5*)
>-      lt_cv_prog_cc_wl='-Wl,'
>-      # All AIX code is PIC.
>-      if test "$host_cpu" = ia64; then
>-	# AIX 5 now supports IA64 processor
>-	lt_cv_prog_cc_static='-Bstatic'
>-      else
>-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
>-      fi
>-      ;;
>-
>-    hpux9* | hpux10* | hpux11*)
>-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
>-      lt_cv_prog_cc_pic='+Z'
>-      ;;
>-
>-    irix5* | irix6*)
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static='-non_shared'
>-      # PIC (with -KPIC) is the default.
>-      ;;
>-
>-    cygwin* | mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
>-      ;;
>-
>-    newsos6)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      ;;
>-
>-    osf3* | osf4* | osf5*)
>-      # All OSF/1 code is PIC.
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static='-non_shared'
>-      ;;
>-
>-    sco3.2v5*)
>-      lt_cv_prog_cc_pic='-Kpic'
>-      lt_cv_prog_cc_static='-dn'
>-      lt_cv_prog_cc_shlib='-belf'
>-      ;;
>-
>-    solaris*)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      lt_cv_prog_cc_wl='-Wl,'
>-      ;;
>-
>-    sunos4*)
>-      lt_cv_prog_cc_pic='-PIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      lt_cv_prog_cc_wl='-Qoption ld '
>-      ;;
>-
>-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      if test "x$host_vendor" = xsni; then
>-	lt_cv_prog_cc_wl='-LD'
>-      else
>-	lt_cv_prog_cc_wl='-Wl,'
>-      fi
>-      ;;
>-
>-    uts4*)
>-      lt_cv_prog_cc_pic='-pic'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      ;;
>-
>-    sysv4*MP*)
>-      if test -d /usr/nec ;then
>-	lt_cv_prog_cc_pic='-Kconform_pic'
>-	lt_cv_prog_cc_static='-Bstatic'
>-      fi
>-      ;;
>-
>-    *)
>-      lt_cv_prog_cc_can_build_shared=no
>-      ;;
>-    esac
>-  fi
>-])
>-if test -z "$lt_cv_prog_cc_pic"; then
>-  AC_MSG_RESULT([none])
>-else
>-  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
>-
>-  # Check to make sure the pic_flag actually works.
>-  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
>-  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
>-    save_CFLAGS="$CFLAGS"
>-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
>-    AC_TRY_COMPILE([], [], [dnl
>-      case $host_os in
>-      hpux9* | hpux10* | hpux11*)
>-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
>-	# they create non-PIC objects.  So, if there were any warnings, we
>-	# assume that PIC is not supported.
>-	if test -s conftest.err; then
>-	  lt_cv_prog_cc_pic_works=no
>-	else
>-	  lt_cv_prog_cc_pic_works=yes
>-	fi
>-	;;
>-      *)
>-	lt_cv_prog_cc_pic_works=yes
>-	;;
>-      esac
>-    ], [dnl
>-      lt_cv_prog_cc_pic_works=no
>-    ])
>-    CFLAGS="$save_CFLAGS"
>-  ])
>-
>-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
>-    lt_cv_prog_cc_pic=
>-    lt_cv_prog_cc_can_build_shared=no
>-  else
>-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
>-  fi
>-
>-  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
>-fi
>-##
>-## END FIXME
>-
>-# Check for any special shared library compilation flags.
>-if test -n "$lt_cv_prog_cc_shlib"; then
>-  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
>-  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
>-  else
>-   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
>-    lt_cv_prog_cc_can_build_shared=no
>-  fi
>-fi
>-
>-## FIXME: this should be a separate macro
>-##
>-AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
>-AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
>-  lt_cv_prog_cc_static_works=no
>-  save_LDFLAGS="$LDFLAGS"
>-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
>-  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
>-  LDFLAGS="$save_LDFLAGS"
>-])
>-
>-# Belt *and* braces to stop my trousers falling down:
>-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
>-AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
>-
>-pic_flag="$lt_cv_prog_cc_pic"
>-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
>-wl="$lt_cv_prog_cc_wl"
>-link_static_flag="$lt_cv_prog_cc_static"
>-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
>-can_build_shared="$lt_cv_prog_cc_can_build_shared"
>-##
>-## END FIXME
>-
>-
>-## FIXME: this should be a separate macro
>-##
>-# Check to see if options -o and -c are simultaneously supported by compiler
>-AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
>-AC_CACHE_VAL([lt_cv_compiler_c_o], [
>-$rm -r conftest 2>/dev/null
>-mkdir conftest
>-cd conftest
>-echo "int some_variable = 0;" > conftest.$ac_ext
>-mkdir out
>-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
>-# that will create temporary files in the current directory regardless of
>-# the output directory.  Thus, making CWD read-only will cause this test
>-# to fail, enabling locking or at least warning the user not to do parallel
>-# builds.
>-chmod -w .
>-save_CFLAGS="$CFLAGS"
>-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
>-compiler_c_o=no
>-if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
>-  # The compiler can only warn and ignore the option if not recognized
>-  # So say no if there are warnings
>-  if test -s out/conftest.err; then
>-    lt_cv_compiler_c_o=no
>-  else
>-    lt_cv_compiler_c_o=yes
>-  fi
>-else
>-  # Append any errors to the config.log.
>-  cat out/conftest.err 1>&AC_FD_CC
>-  lt_cv_compiler_c_o=no
>-fi
>-CFLAGS="$save_CFLAGS"
>-chmod u+w .
>-$rm conftest* out/*
>-rmdir out
>-cd ..
>-rmdir conftest
>-$rm -r conftest 2>/dev/null
>-])
>-compiler_c_o=$lt_cv_compiler_c_o
>-AC_MSG_RESULT([$compiler_c_o])
>-
>-if test x"$compiler_c_o" = x"yes"; then
>-  # Check to see if we can write to a .lo
>-  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
>-  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
>-  lt_cv_compiler_o_lo=no
>-  save_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -c -o conftest.lo"
>-  save_objext="$ac_objext"
>-  ac_objext=lo
>-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
>-    # The compiler can only warn and ignore the option if not recognized
>-    # So say no if there are warnings
>-    if test -s conftest.err; then
>-      lt_cv_compiler_o_lo=no
>-    else
>-      lt_cv_compiler_o_lo=yes
>-    fi
>-  ])
>-  ac_objext="$save_objext"
>-  CFLAGS="$save_CFLAGS"
>-  ])
>-  compiler_o_lo=$lt_cv_compiler_o_lo
>-  AC_MSG_RESULT([$compiler_o_lo])
>-else
>-  compiler_o_lo=no
>-fi
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-# Check to see if we can do hard links to lock some files if needed
>-hard_links="nottested"
>-if test "$compiler_c_o" = no && test "$need_locks" != no; then
>-  # do not overwrite the value of need_locks provided by the user
>-  AC_MSG_CHECKING([if we can lock with hard links])
>-  hard_links=yes
>-  $rm conftest*
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  touch conftest.a
>-  ln conftest.a conftest.b 2>&5 || hard_links=no
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  AC_MSG_RESULT([$hard_links])
>-  if test "$hard_links" = no; then
>-    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
>-    need_locks=warn
>-  fi
>-else
>-  need_locks=no
>-fi
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-if test "$GCC" = yes; then
>-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
>-  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
>-  echo "int some_variable = 0;" > conftest.$ac_ext
>-  save_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
>-  compiler_rtti_exceptions=no
>-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
>-    # The compiler can only warn and ignore the option if not recognized
>-    # So say no if there are warnings
>-    if test -s conftest.err; then
>-      compiler_rtti_exceptions=no
>-    else
>-      compiler_rtti_exceptions=yes
>-    fi
>-  ])
>-  CFLAGS="$save_CFLAGS"
>-  AC_MSG_RESULT([$compiler_rtti_exceptions])
>-
>-  if test "$compiler_rtti_exceptions" = "yes"; then
>-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
>-  else
>-    no_builtin_flag=' -fno-builtin'
>-  fi
>-fi
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-# See if the linker supports building shared libraries.
>-AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
>-
>-allow_undefined_flag=
>-no_undefined_flag=
>-need_lib_prefix=unknown
>-need_version=unknown
>-# when you set need_version to no, make sure it does not cause -set_version
>-# flags to be left without arguments
>-archive_cmds=
>-archive_expsym_cmds=
>-old_archive_from_new_cmds=
>-old_archive_from_expsyms_cmds=
>-export_dynamic_flag_spec=
>-whole_archive_flag_spec=
>-thread_safe_flag_spec=
>-hardcode_into_libs=no
>-hardcode_libdir_flag_spec=
>-hardcode_libdir_separator=
>-hardcode_direct=no
>-hardcode_minus_L=no
>-hardcode_shlibpath_var=unsupported
>-runpath_var=
>-link_all_deplibs=unknown
>-always_export_symbols=no
>-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
>-# include_expsyms should be a list of space-separated symbols to be *always*
>-# included in the symbol list
>-include_expsyms=
>-# exclude_expsyms can be an egrep regular expression of symbols to exclude
>-# it will be wrapped by ` (' and `)$', so one must not match beginning or
>-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>-# as well as any symbol that contains `d'.
>-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
>-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>-# platforms (ab)use it in PIC code, but their linkers get confused if
>-# the symbol is explicitly referenced.  Since portable code cannot
>-# rely on this symbol name, it's probably fine to never include it in
>-# preloaded symbol tables.
>-extract_expsyms_cmds=
>-
>-case $host_os in
>-cygwin* | mingw* | pw32*)
>-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
>-  # When not using gcc, we currently assume that we are using
>-  # Microsoft Visual C++.
>-  if test "$GCC" != yes; then
>-    with_gnu_ld=no
>-  fi
>-  ;;
>-openbsd*)
>-  with_gnu_ld=no
>-  ;;
>-esac
>-
>-ld_shlibs=yes
>-if test "$with_gnu_ld" = yes; then
>-  # If archive_cmds runs LD, not CC, wlarc should be empty
>-  wlarc='${wl}'
>-
>-  # See if GNU ld supports shared libraries.
>-  case $host_os in
>-  aix3* | aix4* | aix5*)
>-    # On AIX, the GNU linker is very broken
>-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
>-    ld_shlibs=no
>-    cat <<EOF 1>&2
>-
>-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>-*** to be unable to reliably create shared libraries on AIX.
>-*** Therefore, libtool is disabling shared libraries support.  If you
>-*** really care for shared libraries, you may want to modify your PATH
>-*** so that a non-GNU linker is found, and then restart.
>-
>-EOF
>-    ;;
>-
>-  amigaos*)
>-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-
>-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>-    # that the semantics of dynamic libraries on AmigaOS, at least up
>-    # to version 4, is to share data among multiple programs linked
>-    # with the same dynamic library.  Since this doesn't match the
>-    # behavior of shared libraries on other platforms, we can use
>-    # them.
>-    ld_shlibs=no
>-    ;;
>-
>-  beos*)
>-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      allow_undefined_flag=unsupported
>-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>-      # support --undefined.  This deserves some investigation.  FIXME
>-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-    else
>-      ld_shlibs=no
>-    fi
>-    ;;
>-
>-  cygwin* | mingw* | pw32*)
>-    # hardcode_libdir_flag_spec is actually meaningless, as there is
>-    # no search path for DLLs.
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    allow_undefined_flag=unsupported
>-    always_export_symbols=yes
>-
>-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
>-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
>-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
>-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
>-      else $CC -o impgen impgen.c ; fi)~
>-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
>-
>-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
>-
>-    # cygwin and mingw dlls have different entry points and sets of symbols
>-    # to exclude.
>-    # FIXME: what about values for MSVC?
>-    dll_entry=__cygwin_dll_entry@12
>-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
>-    case $host_os in
>-    mingw*)
>-      # mingw values
>-      dll_entry=_DllMainCRTStartup@12
>-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
>-      ;;
>-    esac
>-
>-    # mingw and cygwin differ, and it's simplest to just exclude the union
>-    # of the two symbol sets.
>-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
>-
>-    # recent cygwin and mingw systems supply a stub DllMain which the user
>-    # can override, but on older systems we have to supply one (in ltdll.c)
>-    if test "x$lt_cv_need_dllmain" = "xyes"; then
>-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
>-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
>-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
>-    else
>-      ltdll_obj=
>-      ltdll_cmds=
>-    fi
>-
>-    # Extract the symbol export list from an `--export-all' def file,
>-    # then regenerate the def file from the symbol export list, so that
>-    # the compiled dll only exports the symbol export list.
>-    # Be careful not to strip the DATA tag left be newer dlltools.
>-    export_symbols_cmds="$ltdll_cmds"'
>-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
>-      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
>-
>-    # If the export-symbols file already is a .def file (1st line
>-    # is EXPORTS), use it as is.
>-    # If DATA tags from a recent dlltool are present, honour them!
>-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
>-	cp $export_symbols $output_objdir/$soname-def;
>-      else
>-	echo EXPORTS > $output_objdir/$soname-def;
>-	_lt_hint=1;
>-	cat $export_symbols | while read symbol; do
>-	 set dummy \$symbol;
>-	 case \[$]# in
>-	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
>-	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
>-	 esac;
>-	 _lt_hint=`expr 1 + \$_lt_hint`;
>-	done;
>-      fi~
>-      '"$ltdll_cmds"'
>-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
>-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
>-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
>-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
>-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
>-    ;;
>-
>-  netbsd*)
>-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>-      wlarc=
>-    else
>-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    fi
>-    ;;
>-
>-  solaris* | sysv5*)
>-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
>-      ld_shlibs=no
>-      cat <<EOF 1>&2
>-
>-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>-*** create shared libraries on Solaris systems.  Therefore, libtool
>-*** is disabling shared libraries support.  We urge you to upgrade GNU
>-*** binutils to release 2.9.1 or newer.  Another option is to modify
>-*** your PATH or compiler configuration so that the native linker is
>-*** used, and then restart.
>-
>-EOF
>-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    else
>-      ld_shlibs=no
>-    fi
>-    ;;
>-
>-  sunos4*)
>-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-    wlarc=
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  *)
>-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    else
>-      ld_shlibs=no
>-    fi
>-    ;;
>-  esac
>-
>-  if test "$ld_shlibs" = yes; then
>-    runpath_var=LD_RUN_PATH
>-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
>-    export_dynamic_flag_spec='${wl}--export-dynamic'
>-    case $host_os in
>-    cygwin* | mingw* | pw32*)
>-      # dlltool doesn't understand --whole-archive et. al.
>-      whole_archive_flag_spec=
>-      ;;
>-    *)
>-      # ancient GNU ld didn't support --whole-archive et. al.
>-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
>-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>-      else
>-	whole_archive_flag_spec=
>-      fi
>-      ;;
>-    esac
>-  fi
>-else
>-  # PORTME fill in a description of your system's linker (not GNU ld)
>-  case $host_os in
>-  aix3*)
>-    allow_undefined_flag=unsupported
>-    always_export_symbols=yes
>-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>-    # Note: this linker hardcodes the directories in LIBPATH if there
>-    # are no directories specified by -L.
>-    hardcode_minus_L=yes
>-    if test "$GCC" = yes && test -z "$link_static_flag"; then
>-      # Neither direct hardcoding nor static linking is supported with a
>-      # broken collect2.
>-      hardcode_direct=unsupported
>-    fi
>-    ;;
>-
>-  aix4* | aix5*)
>-    if test "$host_cpu" = ia64; then
>-      # On IA64, the linker does run time linking by default, so we don't
>-      # have to do anything special.
>-      aix_use_runtimelinking=no
>-      exp_sym_flag='-Bexport'
>-      no_entry_flag=""
>-    else
>-      aix_use_runtimelinking=no
>-
>-      # Test if we are trying to use run time linking or normal
>-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
>-      # need to do runtime linking.
>-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
>-	for ld_flag in $LDFLAGS; do
>-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>-	    aix_use_runtimelinking=yes
>-	    break
>-	  fi
>-	done
>-      esac
>-
>-      exp_sym_flag='-bexport'
>-      no_entry_flag='-bnoentry'
>-    fi
>-
>-    # When large executables or shared objects are built, AIX ld can
>-    # have problems creating the table of contents.  If linking a library
>-    # or program results in "error TOC overflow" add -mminimal-toc to
>-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>-
>-    hardcode_direct=yes
>-    archive_cmds=''
>-    hardcode_libdir_separator=':'
>-    if test "$GCC" = yes; then
>-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
>-	collect2name=`${CC} -print-prog-name=collect2`
>-	if test -f "$collect2name" && \
>-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
>-	then
>-	  # We have reworked collect2
>-	  hardcode_direct=yes
>-	else
>-	  # We have old collect2
>-	  hardcode_direct=unsupported
>-	  # It fails to find uninstalled libraries when the uninstalled
>-	  # path is not listed in the libpath.  Setting hardcode_minus_L
>-	  # to unsupported forces relinking
>-	  hardcode_minus_L=yes
>-	  hardcode_libdir_flag_spec='-L$libdir'
>-	  hardcode_libdir_separator=
>-	fi
>-      esac
>-
>-      shared_flag='-shared'
>-    else
>-      # not using gcc
>-      if test "$host_cpu" = ia64; then
>-	shared_flag='${wl}-G'
>-      else
>-	if test "$aix_use_runtimelinking" = yes; then
>-	  shared_flag='${wl}-G'
>-	else
>-	  shared_flag='${wl}-bM:SRE'
>-	fi
>-      fi
>-    fi
>-
>-    # It seems that -bexpall can do strange things, so it is better to
>-    # generate a list of symbols to export.
>-    always_export_symbols=yes
>-    if test "$aix_use_runtimelinking" = yes; then
>-      # Warning - without using the other runtime loading flags (-brtl),
>-      # -berok will link without error, but may produce a broken library.
>-      allow_undefined_flag='-berok'
>-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
>-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>-    else
>-      if test "$host_cpu" = ia64; then
>-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
>-	allow_undefined_flag="-z nodefs"
>-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>-      else
>-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
>-	# Warning - without using the other run time loading flags,
>-	# -berok will link without error, but may produce a broken library.
>-	allow_undefined_flag='${wl}-berok'
>-	# This is a bit strange, but is similar to how AIX traditionally builds
>-	# it's shared libraries.
>-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
>-      fi
>-    fi
>-    ;;
>-
>-  amigaos*)
>-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-    # see comment about different semantics on the GNU ld section
>-    ld_shlibs=no
>-    ;;
>-
>-  cygwin* | mingw* | pw32*)
>-    # When not using gcc, we currently assume that we are using
>-    # Microsoft Visual C++.
>-    # hardcode_libdir_flag_spec is actually meaningless, as there is
>-    # no search path for DLLs.
>-    hardcode_libdir_flag_spec=' '
>-    allow_undefined_flag=unsupported
>-    # Tell ltmain to make .lib files, not .a files.
>-    libext=lib
>-    # FIXME: Setting linknames here is a bad hack.
>-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
>-    # The linker will automatically build a .lib file if we build a DLL.
>-    old_archive_from_new_cmds='true'
>-    # FIXME: Should let the user specify the lib program.
>-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
>-    fix_srcfile_path='`cygpath -w "$srcfile"`'
>-    ;;
>-
>-  darwin* | rhapsody*)
>-    case "$host_os" in
>-    rhapsody* | darwin1.[[012]])
>-      allow_undefined_flag='-undefined suppress'
>-      ;;
>-    *) # Darwin 1.3 on
>-      allow_undefined_flag='-flat_namespace -undefined suppress'
>-      ;;
>-    esac
>-    # FIXME: Relying on posixy $() will cause problems for
>-    #        cross-compilation, but unfortunately the echo tests do not
>-    #        yet detect zsh echo's removal of \ escapes.
>-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
>-    # We need to add '_' to the symbols in $export_symbols first
>-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    whole_archive_flag_spec='-all_load $convenience'
>-    ;;
>-
>-  freebsd1*)
>-    ld_shlibs=no
>-    ;;
>-
>-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>-  # support.  Future versions do this automatically, but an explicit c++rt0.o
>-  # does not break anything, and helps significantly (at the cost of a little
>-  # extra space).
>-  freebsd2.2*)
>-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
>-  freebsd2*)
>-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>-  freebsd*)
>-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  hpux9* | hpux10* | hpux11*)
>-    case $host_os in
>-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
>-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
>-    esac
>-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes # Not in the search PATH, but as the default
>-			 # location of the library.
>-    export_dynamic_flag_spec='${wl}-E'
>-    ;;
>-
>-  irix5* | irix6*)
>-    if test "$GCC" = yes; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-    else
>-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-    fi
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    link_all_deplibs=yes
>-    ;;
>-
>-  netbsd*)
>-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
>-    else
>-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
>-    fi
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  newsos6)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  openbsd*)
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>-      export_dynamic_flag_spec='${wl}-E'
>-    else
>-      case "$host_os" in
>-      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
>-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-	hardcode_libdir_flag_spec='-R$libdir'
>-        ;;
>-      *)
>-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
>-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>-        ;;
>-      esac
>-    fi
>-    ;;
>-
>-  os2*)
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-    allow_undefined_flag=unsupported
>-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
>-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
>-    ;;
>-
>-  osf3*)
>-    if test "$GCC" = yes; then
>-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-    else
>-      allow_undefined_flag=' -expect_unresolved \*'
>-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-    fi
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    ;;
>-
>-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
>-    if test "$GCC" = yes; then
>-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    else
>-      allow_undefined_flag=' -expect_unresolved \*'
>-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
>-
>-      #Both c and cxx compiler support -rpath directly
>-      hardcode_libdir_flag_spec='-rpath $libdir'
>-    fi
>-    hardcode_libdir_separator=:
>-    ;;
>-
>-  sco3.2v5*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_shlibpath_var=no
>-    runpath_var=LD_RUN_PATH
>-    hardcode_runpath_var=yes
>-    export_dynamic_flag_spec='${wl}-Bexport'
>-    ;;
>-
>-  solaris*)
>-    # gcc --version < 3.0 without binutils cannot create self contained
>-    # shared libraries reliably, requiring libgcc.a to resolve some of
>-    # the object symbols generated in some cases.  Libraries that use
>-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
>-    # a copy of libgcc.a into every shared library to guarantee resolving
>-    # such symbols causes other problems:  According to Tim Van Holder
>-    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
>-    # (to the application) exception stack for one thing.
>-    no_undefined_flag=' -z defs'
>-    if test "$GCC" = yes; then
>-      case `$CC --version 2>/dev/null` in
>-      [[12]].*)
>-	cat <<EOF 1>&2
>-
>-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
>-*** create self contained shared libraries on Solaris systems, without
>-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
>-*** -no-undefined support, which will at least allow you to build shared
>-*** libraries.  However, you may find that when you link such libraries
>-*** into an application without using GCC, you have to manually add
>-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
>-*** upgrade to a newer version of GCC.  Another option is to rebuild your
>-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
>-
>-EOF
>-        no_undefined_flag=
>-	;;
>-      esac
>-    fi
>-    # $CC -shared without GNU ld will not create a library from C++
>-    # object files and a static libstdc++, better avoid it by now
>-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_shlibpath_var=no
>-    case $host_os in
>-    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
>-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
>-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
>-    esac
>-    link_all_deplibs=yes
>-    ;;
>-
>-  sunos4*)
>-    if test "x$host_vendor" = xsequent; then
>-      # Use $CC to link under sequent, because it throws in some extra .o
>-      # files that make .init and .fini sections work.
>-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
>-    else
>-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
>-    fi
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  sysv4)
>-    if test "x$host_vendor" = xsno; then
>-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct=yes # is this really true???
>-    else
>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
>-    fi
>-    runpath_var='LD_RUN_PATH'
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  sysv4.3*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_shlibpath_var=no
>-    export_dynamic_flag_spec='-Bexport'
>-    ;;
>-
>-  sysv5*)
>-    no_undefined_flag=' -z text'
>-    # $CC -shared without GNU ld will not create a library from C++
>-    # object files and a static libstdc++, better avoid it by now
>-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-    hardcode_libdir_flag_spec=
>-    hardcode_shlibpath_var=no
>-    runpath_var='LD_RUN_PATH'
>-    ;;
>-
>-  uts4*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  dgux*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  sysv4*MP*)
>-    if test -d /usr/nec; then
>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_shlibpath_var=no
>-      runpath_var=LD_RUN_PATH
>-      hardcode_runpath_var=yes
>-      ld_shlibs=yes
>-    fi
>-    ;;
>-
>-  sysv4.2uw2*)
>-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_minus_L=no
>-    hardcode_shlibpath_var=no
>-    hardcode_runpath_var=yes
>-    runpath_var=LD_RUN_PATH
>-    ;;
>-
>-  sysv5uw7* | unixware7*)
>-    no_undefined_flag='${wl}-z ${wl}text'
>-    if test "$GCC" = yes; then
>-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>-    else
>-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>-    fi
>-    runpath_var='LD_RUN_PATH'
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  *)
>-    ld_shlibs=no
>-    ;;
>-  esac
>-fi
>-AC_MSG_RESULT([$ld_shlibs])
>-test "$ld_shlibs" = no && can_build_shared=no
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-# Check hardcoding attributes.
>-AC_MSG_CHECKING([how to hardcode library paths into programs])
>-hardcode_action=
>-if test -n "$hardcode_libdir_flag_spec" || \
>-   test -n "$runpath_var"; then
>-
>-  # We can hardcode non-existant directories.
>-  if test "$hardcode_direct" != no &&
>-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>-     # have to relink, otherwise we might link with an installed library
>-     # when we should be linking with a yet-to-be-installed one
>-     ## test "$hardcode_shlibpath_var" != no &&
>-     test "$hardcode_minus_L" != no; then
>-    # Linking always hardcodes the temporary library directory.
>-    hardcode_action=relink
>-  else
>-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>-    hardcode_action=immediate
>-  fi
>-else
>-  # We cannot hardcode anything, or else we can only hardcode existing
>-  # directories.
>-  hardcode_action=unsupported
>-fi
>-AC_MSG_RESULT([$hardcode_action])
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-striplib=
>-old_striplib=
>-AC_MSG_CHECKING([whether stripping libraries is possible])
>-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>-  AC_MSG_RESULT([yes])
>-else
>-  AC_MSG_RESULT([no])
>-fi
>-##
>-## END FIXME
>-
>-reload_cmds='$LD$reload_flag -o $output$reload_objs'
>-test -z "$deplibs_check_method" && deplibs_check_method=unknown
>-
>-## FIXME: this should be a separate macro
>-##
>-# PORTME Fill in your ld.so characteristics
>-AC_MSG_CHECKING([dynamic linker characteristics])
>-library_names_spec=
>-libname_spec='lib$name'
>-soname_spec=
>-postinstall_cmds=
>-postuninstall_cmds=
>-finish_cmds=
>-finish_eval=
>-shlibpath_var=
>-shlibpath_overrides_runpath=unknown
>-version_type=none
>-dynamic_linker="$host_os ld.so"
>-sys_lib_dlsearch_path_spec="/lib /usr/lib"
>-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
>-
>-case $host_os in
>-aix3*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
>-  shlibpath_var=LIBPATH
>-
>-  # AIX has no versioning support, so we append a major version to the name.
>-  soname_spec='${libname}${release}.so$major'
>-  ;;
>-
>-aix4* | aix5*)
>-  version_type=linux
>-  if test "$host_cpu" = ia64; then
>-    # AIX 5 supports IA64
>-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
>-    shlibpath_var=LD_LIBRARY_PATH
>-  else
>-    # With GCC up to 2.95.x, collect2 would create an import file
>-    # for dependence libraries.  The import file would start with
>-    # the line `#! .'.  This would cause the generated library to
>-    # depend on `.', always an invalid library.  This was fixed in
>-    # development snapshots of GCC prior to 3.0.
>-    case $host_os in
>-      aix4 | aix4.[[01]] | aix4.[[01]].*)
>-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>-	     echo ' yes '
>-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>-	  :
>-	else
>-	  can_build_shared=no
>-	fi
>-	;;
>-    esac
>-    # AIX (on Power*) has no versioning support, so currently we can
>-    # not hardcode correct soname into executable. Probably we can
>-    # add versioning support to collect2, so additional links can
>-    # be useful in future.
>-    if test "$aix_use_runtimelinking" = yes; then
>-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>-      # instead of lib<name>.a to let people know that these are not
>-      # typical AIX shared libraries.
>-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-    else
>-      # We preserve .a as extension for shared libraries through AIX4.2
>-      # and later when we are not doing run time linking.
>-      library_names_spec='${libname}${release}.a $libname.a'
>-      soname_spec='${libname}${release}.so$major'
>-    fi
>-    shlibpath_var=LIBPATH
>-  fi
>-  ;;
>-
>-amigaos*)
>-  library_names_spec='$libname.ixlibrary $libname.a'
>-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
>-  ;;
>-
>-beos*)
>-  library_names_spec='${libname}.so'
>-  dynamic_linker="$host_os ld.so"
>-  shlibpath_var=LIBRARY_PATH
>-  ;;
>-
>-bsdi4*)
>-  version_type=linux
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>-  export_dynamic_flag_spec=-rdynamic
>-  # the default ld.so.conf also contains /usr/contrib/lib and
>-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>-  # libtool to hard-code these into programs
>-  ;;
>-
>-cygwin* | mingw* | pw32*)
>-  version_type=windows
>-  need_version=no
>-  need_lib_prefix=no
>-  case $GCC,$host_os in
>-  yes,cygwin*)
>-    library_names_spec='$libname.dll.a'
>-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
>-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
>-      dldir=$destdir/`dirname \$dlpath`~
>-      test -d \$dldir || mkdir -p \$dldir~
>-      $install_prog .libs/$dlname \$dldir/$dlname'
>-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
>-      dlpath=$dir/\$dldll~
>-       $rm \$dlpath'
>-    ;;
>-  yes,mingw*)
>-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
>-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
>-    ;;
>-  yes,pw32*)
>-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
>-    ;;
>-  *)
>-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
>-    ;;
>-  esac
>-  dynamic_linker='Win32 ld.exe'
>-  # FIXME: first we should search . and the directory the executable is in
>-  shlibpath_var=PATH
>-  ;;
>-
>-darwin* | rhapsody*)
>-  dynamic_linker="$host_os dyld"
>-  version_type=darwin
>-  need_lib_prefix=no
>-  need_version=no
>-  # FIXME: Relying on posixy $() will cause problems for
>-  #        cross-compilation, but unfortunately the echo tests do not
>-  #        yet detect zsh echo's removal of \ escapes.
>-  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
>-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
>-  shlibpath_overrides_runpath=yes
>-  shlibpath_var=DYLD_LIBRARY_PATH
>-  ;;
>-
>-freebsd1*)
>-  dynamic_linker=no
>-  ;;
>-
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>-  version_type=freebsd-$objformat
>-  case $version_type in
>-    freebsd-elf*)
>-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
>-      need_version=no
>-      need_lib_prefix=no
>-      ;;
>-    freebsd-*)
>-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
>-      need_version=yes
>-      ;;
>-  esac
>-  shlibpath_var=LD_LIBRARY_PATH
>-  case $host_os in
>-  freebsd2*)
>-    shlibpath_overrides_runpath=yes
>-    ;;
>-  *)
>-    shlibpath_overrides_runpath=no
>-    hardcode_into_libs=yes
>-    ;;
>-  esac
>-  ;;
>-
>-gnu*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  hardcode_into_libs=yes
>-  ;;
>-
>-hpux9* | hpux10* | hpux11*)
>-  # Give a soname corresponding to the major version so that dld.sl refuses to
>-  # link against other versions.
>-  dynamic_linker="$host_os dld.sl"
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  shlibpath_var=SHLIB_PATH
>-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
>-  soname_spec='${libname}${release}.sl$major'
>-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>-  postinstall_cmds='chmod 555 $lib'
>-  ;;
>-
>-irix5* | irix6*)
>-  version_type=irix
>-  need_lib_prefix=no
>-  need_version=no
>-  soname_spec='${libname}${release}.so$major'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
>-  case $host_os in
>-  irix5*)
>-    libsuff= shlibsuff=
>-    ;;
>-  *)
>-    case $LD in # libtool.m4 will add one of these switches to LD
>-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
>-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
>-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
>-    *) libsuff= shlibsuff= libmagic=never-match;;
>-    esac
>-    ;;
>-  esac
>-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>-  shlibpath_overrides_runpath=no
>-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>-  ;;
>-
>-# No shared lib support for Linux oldld, aout, or coff.
>-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
>-  dynamic_linker=no
>-  ;;
>-
>-# This must be Linux ELF.
>-linux-gnu*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=no
>-  # This implies no fast_install, which is unacceptable.
>-  # Some rework will be needed to allow for fast_install
>-  # before this can be enabled.
>-  hardcode_into_libs=yes
>-
>-  # We used to test for /lib/ld.so.1 and disable shared libraries on
>-  # powerpc, because MkLinux only supported shared libraries with the
>-  # GNU dynamic linker.  Since this was broken with cross compilers,
>-  # most powerpc-linux boxes support dynamic linking these days and
>-  # people can always --disable-shared, the test was removed, and we
>-  # assume the GNU/Linux dynamic linker is in use.
>-  dynamic_linker='GNU/Linux ld.so'
>-  ;;
>-
>-netbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-    dynamic_linker='NetBSD (a.out) ld.so'
>-  else
>-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
>-    soname_spec='${libname}${release}.so$major'
>-    dynamic_linker='NetBSD ld.elf_so'
>-  fi
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>-  ;;
>-
>-newsos6)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  ;;
>-
>-openbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    case "$host_os" in
>-    openbsd2.[[89]] | openbsd2.[[89]].*)
>-      shlibpath_overrides_runpath=no
>-      ;;
>-    *)
>-      shlibpath_overrides_runpath=yes
>-      ;;
>-    esac
>-  else
>-    shlibpath_overrides_runpath=yes
>-  fi
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
>-os2*)
>-  libname_spec='$name'
>-  need_lib_prefix=no
>-  library_names_spec='$libname.dll $libname.a'
>-  dynamic_linker='OS/2 ld.exe'
>-  shlibpath_var=LIBPATH
>-  ;;
>-
>-osf3* | osf4* | osf5*)
>-  version_type=osf
>-  need_version=no
>-  soname_spec='${libname}${release}.so'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>-  ;;
>-
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}.so$major'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
>-solaris*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>-  # ldd complains unless libraries are executable
>-  postinstall_cmds='chmod +x $lib'
>-  ;;
>-
>-sunos4*)
>-  version_type=sunos
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  if test "$with_gnu_ld" = yes; then
>-    need_lib_prefix=no
>-  fi
>-  need_version=yes
>-  ;;
>-
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  case $host_vendor in
>-    sni)
>-      shlibpath_overrides_runpath=no
>-      ;;
>-    motorola)
>-      need_lib_prefix=no
>-      need_version=no
>-      shlibpath_overrides_runpath=no
>-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>-      ;;
>-  esac
>-  ;;
>-
>-uts4*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
>-dgux*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
>-sysv4*MP*)
>-  if test -d /usr/nec ;then
>-    version_type=linux
>-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
>-    soname_spec='$libname.so.$major'
>-    shlibpath_var=LD_LIBRARY_PATH
>-  fi
>-  ;;
>-
>-*)
>-  dynamic_linker=no
>-  ;;
>-esac
>-AC_MSG_RESULT([$dynamic_linker])
>-test "$dynamic_linker" = no && can_build_shared=no
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-# Report the final consequences.
>-AC_MSG_CHECKING([if libtool supports shared libraries])
>-AC_MSG_RESULT([$can_build_shared])
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-AC_MSG_CHECKING([whether to build shared libraries])
>-test "$can_build_shared" = "no" && enable_shared=no
>-
>-# On AIX, shared libraries and static libraries use the same namespace, and
>-# are all built from PIC.
>-case "$host_os" in
>-aix3*)
>-  test "$enable_shared" = yes && enable_static=no
>-  if test -n "$RANLIB"; then
>-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
>-    postinstall_cmds='$RANLIB $lib'
>-  fi
>-  ;;
>-
>-aix4*)
>-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>-    test "$enable_shared" = yes && enable_static=no
>-  fi
>-  ;;
>-esac
>-AC_MSG_RESULT([$enable_shared])
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-AC_MSG_CHECKING([whether to build static libraries])
>-# Make sure either enable_shared or enable_static is yes.
>-test "$enable_shared" = yes || enable_static=yes
>-AC_MSG_RESULT([$enable_static])
>-##
>-## END FIXME
>-
>-if test "$hardcode_action" = relink; then
>-  # Fast installation is not supported
>-  enable_fast_install=no
>-elif test "$shlibpath_overrides_runpath" = yes ||
>-     test "$enable_shared" = no; then
>-  # Fast installation is not necessary
>-  enable_fast_install=needless
>-fi
>-
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>-
>-AC_LIBTOOL_DLOPEN_SELF
>-
>-## FIXME: this should be a separate macro
>-##
>-if test "$enable_shared" = yes && test "$GCC" = yes; then
>-  case $archive_cmds in
>-  *'~'*)
>-    # FIXME: we may have to deal with multi-command sequences.
>-    ;;
>-  '$CC '*)
>-    # Test whether the compiler implicitly links with -lc since on some
>-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
>-    # to ld, don't add -lc before -lgcc.
>-    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
>-    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
>-    [$rm conftest*
>-    echo 'static int dummy;' > conftest.$ac_ext
>-
>-    if AC_TRY_EVAL(ac_compile); then
>-      soname=conftest
>-      lib=conftest
>-      libobjs=conftest.$ac_objext
>-      deplibs=
>-      wl=$lt_cv_prog_cc_wl
>-      compiler_flags=-v
>-      linker_flags=-v
>-      verstring=
>-      output_objdir=.
>-      libname=conftest
>-      save_allow_undefined_flag=$allow_undefined_flag
>-      allow_undefined_flag=
>-      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
>-      then
>-	lt_cv_archive_cmds_need_lc=no
>-      else
>-	lt_cv_archive_cmds_need_lc=yes
>-      fi
>-      allow_undefined_flag=$save_allow_undefined_flag
>-    else
>-      cat conftest.err 1>&5
>-    fi])
>-    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
>-    ;;
>-  esac
>-fi
>-need_lc=${lt_cv_archive_cmds_need_lc-yes}
>-##
>-## END FIXME
>-
>-## FIXME: this should be a separate macro
>-##
>-# The second clause should only fire when bootstrapping the
>-# libtool distribution, otherwise you forgot to ship ltmain.sh
>-# with your package, and you will get complaints that there are
>-# no rules to generate ltmain.sh.
>-if test -f "$ltmain"; then
>-  :
>-else
>-  # If there is no Makefile yet, we rely on a make rule to execute
>-  # `config.status --recheck' to rerun these tests and create the
>-  # libtool script then.
>-  test -f Makefile && make "$ltmain"
>-fi
>-
>-if test -f "$ltmain"; then
>-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
>-  $rm -f "${ofile}T"
>-
>-  echo creating $ofile
>-
>-  # Now quote all the things that may contain metacharacters while being
>-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>-  # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS \
>-    AR AR_FLAGS CC LD LN_S NM SHELL \
>-    reload_flag reload_cmds wl \
>-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
>-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
>-    library_names_spec soname_spec \
>-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
>-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
>-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
>-    old_striplib striplib file_magic_cmd export_symbols_cmds \
>-    deplibs_check_method allow_undefined_flag no_undefined_flag \
>-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
>-    global_symbol_to_c_name_address \
>-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
>-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
>-
>-    case $var in
>-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
>-    old_postinstall_cmds | old_postuninstall_cmds | \
>-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
>-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
>-    postinstall_cmds | postuninstall_cmds | \
>-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>-      # Double-quote double-evaled strings.
>-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>-      ;;
>-    *)
>-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>-      ;;
>-    esac
>-  done
>-
>-  cat <<__EOF__ > "${ofile}T"
>-#! $SHELL
>-
>-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
>-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
>-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
>-#
>-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
>-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
>-#
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2 of the License, or
>-# (at your option) any later version.
>-#
>-# This program is distributed in the hope that it will be useful, but
>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-# General Public License for more details.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-#
>-# As a special exception to the GNU General Public License, if you
>-# distribute this file as part of a program that contains a
>-# configuration script generated by Autoconf, you may include it under
>-# the same distribution terms that you use for the rest of that program.
>-
>-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
>-Xsed="sed -e s/^X//"
>-
>-# The HP-UX ksh and POSIX shell print the target directory to stdout
>-# if CDPATH is set.
>-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>-
>-# ### BEGIN LIBTOOL CONFIG
>-
>-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>-
>-# Shell to use when invoking shell scripts.
>-SHELL=$lt_SHELL
>-
>-# Whether or not to build shared libraries.
>-build_libtool_libs=$enable_shared
>-
>-# Whether or not to build static libraries.
>-build_old_libs=$enable_static
>-
>-# Whether or not to add -lc for building shared libraries.
>-build_libtool_need_lc=$need_lc
>-
>-# Whether or not to optimize for fast installation.
>-fast_install=$enable_fast_install
>-
>-# The host system.
>-host_alias=$host_alias
>-host=$host
>-
>-# An echo program that does not interpret backslashes.
>-echo=$lt_echo
>-
>-# The archiver.
>-AR=$lt_AR
>-AR_FLAGS=$lt_AR_FLAGS
>-
>-# The default C compiler.
>-CC=$lt_CC
>-
>-# Is the compiler the GNU C compiler?
>-with_gcc=$GCC
>-
>-# The linker used to build libraries.
>-LD=$lt_LD
>-
>-# Whether we need hard or soft links.
>-LN_S=$lt_LN_S
>-
>-# A BSD-compatible nm program.
>-NM=$lt_NM
>-
>-# A symbol stripping program
>-STRIP=$STRIP
>-
>-# Used to examine libraries when file_magic_cmd begins "file"
>-MAGIC_CMD=$MAGIC_CMD
>-
>-# Used on cygwin: DLL creation program.
>-DLLTOOL="$DLLTOOL"
>-
>-# Used on cygwin: object dumper.
>-OBJDUMP="$OBJDUMP"
>-
>-# Used on cygwin: assembler.
>-AS="$AS"
>-
>-# The name of the directory that contains temporary libtool files.
>-objdir=$objdir
>-
>-# How to create reloadable object files.
>-reload_flag=$lt_reload_flag
>-reload_cmds=$lt_reload_cmds
>-
>-# How to pass a linker flag through the compiler.
>-wl=$lt_wl
>-
>-# Object file suffix (normally "o").
>-objext="$ac_objext"
>-
>-# Old archive suffix (normally "a").
>-libext="$libext"
>-
>-# Executable file suffix (normally "").
>-exeext="$exeext"
>-
>-# Additional compiler flags for building library objects.
>-pic_flag=$lt_pic_flag
>-pic_mode=$pic_mode
>-
>-# Does compiler simultaneously support -c and -o options?
>-compiler_c_o=$lt_compiler_c_o
>-
>-# Can we write directly to a .lo ?
>-compiler_o_lo=$lt_compiler_o_lo
>-
>-# Must we lock files when doing compilation ?
>-need_locks=$lt_need_locks
>-
>-# Do we need the lib prefix for modules?
>-need_lib_prefix=$need_lib_prefix
>-
>-# Do we need a version for libraries?
>-need_version=$need_version
>-
>-# Whether dlopen is supported.
>-dlopen_support=$enable_dlopen
>-
>-# Whether dlopen of programs is supported.
>-dlopen_self=$enable_dlopen_self
>-
>-# Whether dlopen of statically linked programs is supported.
>-dlopen_self_static=$enable_dlopen_self_static
>-
>-# Compiler flag to prevent dynamic linking.
>-link_static_flag=$lt_link_static_flag
>-
>-# Compiler flag to turn off builtin functions.
>-no_builtin_flag=$lt_no_builtin_flag
>-
>-# Compiler flag to allow reflexive dlopens.
>-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
>-
>-# Compiler flag to generate shared objects directly from archives.
>-whole_archive_flag_spec=$lt_whole_archive_flag_spec
>-
>-# Compiler flag to generate thread-safe objects.
>-thread_safe_flag_spec=$lt_thread_safe_flag_spec
>-
>-# Library versioning type.
>-version_type=$version_type
>-
>-# Format of library name prefix.
>-libname_spec=$lt_libname_spec
>-
>-# List of archive names.  First name is the real one, the rest are links.
>-# The last name is the one that the linker finds with -lNAME.
>-library_names_spec=$lt_library_names_spec
>-
>-# The coded name of the library, if different from the real name.
>-soname_spec=$lt_soname_spec
>-
>-# Commands used to build and install an old-style archive.
>-RANLIB=$lt_RANLIB
>-old_archive_cmds=$lt_old_archive_cmds
>-old_postinstall_cmds=$lt_old_postinstall_cmds
>-old_postuninstall_cmds=$lt_old_postuninstall_cmds
>-
>-# Create an old-style archive from a shared archive.
>-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
>-
>-# Create a temporary old-style archive to link instead of a shared archive.
>-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
>-
>-# Commands used to build and install a shared archive.
>-archive_cmds=$lt_archive_cmds
>-archive_expsym_cmds=$lt_archive_expsym_cmds
>-postinstall_cmds=$lt_postinstall_cmds
>-postuninstall_cmds=$lt_postuninstall_cmds
>-
>-# Commands to strip libraries.
>-old_striplib=$lt_old_striplib
>-striplib=$lt_striplib
>-
>-# Method to check whether dependent libraries are shared objects.
>-deplibs_check_method=$lt_deplibs_check_method
>-
>-# Command to use when deplibs_check_method == file_magic.
>-file_magic_cmd=$lt_file_magic_cmd
>-
>-# Flag that allows shared libraries with undefined symbols to be built.
>-allow_undefined_flag=$lt_allow_undefined_flag
>-
>-# Flag that forces no undefined symbols.
>-no_undefined_flag=$lt_no_undefined_flag
>-
>-# Commands used to finish a libtool library installation in a directory.
>-finish_cmds=$lt_finish_cmds
>-
>-# Same as above, but a single script fragment to be evaled but not shown.
>-finish_eval=$lt_finish_eval
>-
>-# Take the output of nm and produce a listing of raw symbols and C names.
>-global_symbol_pipe=$lt_global_symbol_pipe
>-
>-# Transform the output of nm in a proper C declaration
>-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
>-
>-# Transform the output of nm in a C name address pair
>-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
>-
>-# This is the shared library runtime path variable.
>-runpath_var=$runpath_var
>-
>-# This is the shared library path variable.
>-shlibpath_var=$shlibpath_var
>-
>-# Is shlibpath searched before the hard-coded library search path?
>-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
>-
>-# How to hardcode a shared library path into an executable.
>-hardcode_action=$hardcode_action
>-
>-# Whether we should hardcode library paths into libraries.
>-hardcode_into_libs=$hardcode_into_libs
>-
>-# Flag to hardcode \$libdir into a binary during linking.
>-# This must work even if \$libdir does not exist.
>-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
>-
>-# Whether we need a single -rpath flag with a separated argument.
>-hardcode_libdir_separator=$lt_hardcode_libdir_separator
>-
>-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
>-# resulting binary.
>-hardcode_direct=$hardcode_direct
>-
>-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
>-# resulting binary.
>-hardcode_minus_L=$hardcode_minus_L
>-
>-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
>-# the resulting binary.
>-hardcode_shlibpath_var=$hardcode_shlibpath_var
>-
>-# Variables whose values should be saved in libtool wrapper scripts and
>-# restored at relink time.
>-variables_saved_for_relink="$variables_saved_for_relink"
>-
>-# Whether libtool must link a program against all its dependency libraries.
>-link_all_deplibs=$link_all_deplibs
>-
>-# Compile-time system search path for libraries
>-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>-
>-# Run-time system search path for libraries
>-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
>-
>-# Fix the shell variable \$srcfile for the compiler.
>-fix_srcfile_path="$fix_srcfile_path"
>-
>-# Set to yes if exported symbols are required.
>-always_export_symbols=$always_export_symbols
>-
>-# The commands to list exported symbols.
>-export_symbols_cmds=$lt_export_symbols_cmds
>-
>-# The commands to extract the exported symbol list from a shared archive.
>-extract_expsyms_cmds=$lt_extract_expsyms_cmds
>-
>-# Symbols that should not be listed in the preloaded symbols.
>-exclude_expsyms=$lt_exclude_expsyms
>-
>-# Symbols that must always be exported.
>-include_expsyms=$lt_include_expsyms
>-
>-# ### END LIBTOOL CONFIG
>-
>-__EOF__
>-
>-  case $host_os in
>-  aix3*)
>-    cat <<\EOF >> "${ofile}T"
>-
>-# AIX sometimes has problems with the GCC collect2 program.  For some
>-# reason, if we set the COLLECT_NAMES environment variable, the problems
>-# vanish in a puff of smoke.
>-if test "X${COLLECT_NAMES+set}" != Xset; then
>-  COLLECT_NAMES=
>-  export COLLECT_NAMES
>-fi
>-EOF
>-    ;;
>-  esac
>-
>-  case $host_os in
>-  cygwin* | mingw* | pw32* | os2*)
>-    cat <<'EOF' >> "${ofile}T"
>-      # This is a source program that is used to create dlls on Windows
>-      # Don't remove nor modify the starting and closing comments
>-# /* ltdll.c starts here */
>-# #define WIN32_LEAN_AND_MEAN
>-# #include <windows.h>
>-# #undef WIN32_LEAN_AND_MEAN
>-# #include <stdio.h>
>-#
>-# #ifndef __CYGWIN__
>-# #  ifdef __CYGWIN32__
>-# #    define __CYGWIN__ __CYGWIN32__
>-# #  endif
>-# #endif
>-#
>-# #ifdef __cplusplus
>-# extern "C" {
>-# #endif
>-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
>-# #ifdef __cplusplus
>-# }
>-# #endif
>-#
>-# #ifdef __CYGWIN__
>-# #include <cygwin/cygwin_dll.h>
>-# DECLARE_CYGWIN_DLL( DllMain );
>-# #endif
>-# HINSTANCE __hDllInstance_base;
>-#
>-# BOOL APIENTRY
>-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
>-# {
>-#   __hDllInstance_base = hInst;
>-#   return TRUE;
>-# }
>-# /* ltdll.c ends here */
>-	# This is a source program that is used to create import libraries
>-	# on Windows for dlls which lack them. Don't remove nor modify the
>-	# starting and closing comments
>-# /* impgen.c starts here */
>-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
>-#
>-#  This file is part of GNU libtool.
>-#
>-#  This program is free software; you can redistribute it and/or modify
>-#  it under the terms of the GNU General Public License as published by
>-#  the Free Software Foundation; either version 2 of the License, or
>-#  (at your option) any later version.
>-#
>-#  This program is distributed in the hope that it will be useful,
>-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
>-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-#  GNU General Public License for more details.
>-#
>-#  You should have received a copy of the GNU General Public License
>-#  along with this program; if not, write to the Free Software
>-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-#  */
>-#
>-# #include <stdio.h>		/* for printf() */
>-# #include <unistd.h>		/* for open(), lseek(), read() */
>-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
>-# #include <string.h>		/* for strdup() */
>-#
>-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
>-# #ifndef O_BINARY
>-# #define O_BINARY 0
>-# #endif
>-#
>-# static unsigned int
>-# pe_get16 (fd, offset)
>-#      int fd;
>-#      int offset;
>-# {
>-#   unsigned char b[2];
>-#   lseek (fd, offset, SEEK_SET);
>-#   read (fd, b, 2);
>-#   return b[0] + (b[1]<<8);
>-# }
>-#
>-# static unsigned int
>-# pe_get32 (fd, offset)
>-#     int fd;
>-#     int offset;
>-# {
>-#   unsigned char b[4];
>-#   lseek (fd, offset, SEEK_SET);
>-#   read (fd, b, 4);
>-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
>-# }
>-#
>-# static unsigned int
>-# pe_as32 (ptr)
>-#      void *ptr;
>-# {
>-#   unsigned char *b = ptr;
>-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
>-# }
>-#
>-# int
>-# main (argc, argv)
>-#     int argc;
>-#     char *argv[];
>-# {
>-#     int dll;
>-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
>-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
>-#     unsigned long name_rvas, nexp;
>-#     unsigned char *expdata, *erva;
>-#     char *filename, *dll_name;
>-#
>-#     filename = argv[1];
>-#
>-#     dll = open(filename, O_RDONLY|O_BINARY);
>-#     if (dll < 1)
>-# 	return 1;
>-#
>-#     dll_name = filename;
>-#
>-#     for (i=0; filename[i]; i++)
>-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
>-# 	    dll_name = filename + i +1;
>-#
>-#     pe_header_offset = pe_get32 (dll, 0x3c);
>-#     opthdr_ofs = pe_header_offset + 4 + 20;
>-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
>-#
>-#     if (num_entries < 1) /* no exports */
>-# 	return 1;
>-#
>-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
>-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
>-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
>-#     secptr = (pe_header_offset + 4 + 20 +
>-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
>-#
>-#     expptr = 0;
>-#     for (i = 0; i < nsections; i++)
>-#     {
>-# 	char sname[8];
>-# 	unsigned long secptr1 = secptr + 40 * i;
>-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
>-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
>-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
>-# 	lseek(dll, secptr1, SEEK_SET);
>-# 	read(dll, sname, 8);
>-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
>-# 	{
>-# 	    expptr = fptr + (export_rva - vaddr);
>-# 	    if (export_rva + export_size > vaddr + vsize)
>-# 		export_size = vsize - (export_rva - vaddr);
>-# 	    break;
>-# 	}
>-#     }
>-#
>-#     expdata = (unsigned char*)malloc(export_size);
>-#     lseek (dll, expptr, SEEK_SET);
>-#     read (dll, expdata, export_size);
>-#     erva = expdata - export_rva;
>-#
>-#     nexp = pe_as32 (expdata+24);
>-#     name_rvas = pe_as32 (expdata+32);
>-#
>-#     printf ("EXPORTS\n");
>-#     for (i = 0; i<nexp; i++)
>-#     {
>-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
>-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
>-#     }
>-#
>-#     return 0;
>-# }
>-# /* impgen.c ends here */
>-
>-EOF
>-    ;;
>-  esac
>-
>-  # We use sed instead of cat because bash on DJGPP gets confused if
>-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
>-  # text mode, it properly converts lines to CR/LF.  This bash problem
>-  # is reportedly fixed, but why not run on old versions too?
>-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
>-
>-  mv -f "${ofile}T" "$ofile" || \
>-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
>-  chmod +x "$ofile"
>-fi
>-##
>-## END FIXME
>-
>-])# _LT_AC_LTCONFIG_HACK
>-
>-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
>-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
>-
>-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
>-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
>-
>-# AC_ENABLE_SHARED - implement the --enable-shared flag
>-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
>-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
>-#   `yes'.
>-AC_DEFUN([AC_ENABLE_SHARED],
>-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
>-AC_ARG_ENABLE(shared,
>-changequote(<<, >>)dnl
>-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
>-changequote([, ])dnl
>-[p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_shared=yes ;;
>-no) enable_shared=no ;;
>-*)
>-  enable_shared=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_shared=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac],
>-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
>-])
>-
>-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
>-AC_DEFUN([AC_DISABLE_SHARED],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-AC_ENABLE_SHARED(no)])
>-
>-# AC_ENABLE_STATIC - implement the --enable-static flag
>-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
>-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
>-#   `yes'.
>-AC_DEFUN([AC_ENABLE_STATIC],
>-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
>-AC_ARG_ENABLE(static,
>-changequote(<<, >>)dnl
>-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
>-changequote([, ])dnl
>-[p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_static=yes ;;
>-no) enable_static=no ;;
>-*)
>-  enable_static=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_static=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac],
>-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
>-])
>-
>-# AC_DISABLE_STATIC - set the default static flag to --disable-static
>-AC_DEFUN([AC_DISABLE_STATIC],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-AC_ENABLE_STATIC(no)])
>-
>-
>-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
>-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
>-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
>-#   `yes'.
>-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
>-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
>-AC_ARG_ENABLE(fast-install,
>-changequote(<<, >>)dnl
>-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
>-changequote([, ])dnl
>-[p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_fast_install=yes ;;
>-no) enable_fast_install=no ;;
>-*)
>-  enable_fast_install=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_fast_install=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac],
>-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
>-])
>-
>-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
>-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-AC_ENABLE_FAST_INSTALL(no)])
>-
>-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
>-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
>-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
>-#   `both'.
>-AC_DEFUN([AC_LIBTOOL_PICMODE],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-pic_mode=ifelse($#,1,$1,default)])
>-
>-
>-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
>-AC_DEFUN([AC_PATH_TOOL_PREFIX],
>-[AC_MSG_CHECKING([for $1])
>-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
>-[case $MAGIC_CMD in
>-  /*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
>-  ;;
>-  ?:/*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
>-  ;;
>-  *)
>-  ac_save_MAGIC_CMD="$MAGIC_CMD"
>-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
>-dnl $ac_dummy forces splitting on constant user-supplied paths.
>-dnl POSIX.2 word splitting is done only on the output of word expansions,
>-dnl not every word.  This closes a longstanding sh security hole.
>-  ac_dummy="ifelse([$2], , $PATH, [$2])"
>-  for ac_dir in $ac_dummy; do
>-    test -z "$ac_dir" && ac_dir=.
>-    if test -f $ac_dir/$1; then
>-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
>-      if test -n "$file_magic_test_file"; then
>-	case $deplibs_check_method in
>-	"file_magic "*)
>-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
>-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>-	    egrep "$file_magic_regex" > /dev/null; then
>-	    :
>-	  else
>-	    cat <<EOF 1>&2
>-
>-*** Warning: the command libtool uses to detect shared libraries,
>-*** $file_magic_cmd, produces output that libtool cannot recognize.
>-*** The result is that libtool may fail to recognize shared libraries
>-*** as such.  This will affect the creation of libtool libraries that
>-*** depend on shared libraries, but programs linked with such libtool
>-*** libraries will work regardless of this problem.  Nevertheless, you
>-*** may want to report the problem to your system manager and/or to
>-*** bug-libtool@gnu.org
>-
>-EOF
>-	  fi ;;
>-	esac
>-      fi
>-      break
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  MAGIC_CMD="$ac_save_MAGIC_CMD"
>-  ;;
>-esac])
>-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-if test -n "$MAGIC_CMD"; then
>-  AC_MSG_RESULT($MAGIC_CMD)
>-else
>-  AC_MSG_RESULT(no)
>-fi
>-])
>-
>-
>-# AC_PATH_MAGIC - find a file program which can recognise a shared library
>-AC_DEFUN([AC_PATH_MAGIC],
>-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
>-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
>-if test -z "$lt_cv_path_MAGIC_CMD"; then
>-  if test -n "$ac_tool_prefix"; then
>-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
>-  else
>-    MAGIC_CMD=:
>-  fi
>-fi
>-])
>-
>-
>-# AC_PROG_LD - find the path to the GNU or non-GNU linker
>-AC_DEFUN([AC_PROG_LD],
>-[AC_ARG_WITH(gnu-ld,
>-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
>-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
>-AC_REQUIRE([AC_PROG_CC])dnl
>-AC_REQUIRE([AC_CANONICAL_HOST])dnl
>-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
>-AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
>-ac_prog=ld
>-if test "$GCC" = yes; then
>-  # Check if gcc -print-prog-name=ld gives a path.
>-  AC_MSG_CHECKING([for ld used by GCC])
>-  case $host in
>-  *-*-mingw*)
>-    # gcc leaves a trailing carriage return which upsets mingw
>-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
>-  *)
>-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
>-  esac
>-  case $ac_prog in
>-    # Accept absolute paths.
>-    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
>-      re_direlt='/[[^/]][[^/]]*/\.\./'
>-      # Canonicalize the path of ld
>-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
>-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
>-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
>-      done
>-      test -z "$LD" && LD="$ac_prog"
>-      ;;
>-  "")
>-    # If it fails, then pretend we aren't using GCC.
>-    ac_prog=ld
>-    ;;
>-  *)
>-    # If it is relative, then search for the first ld in PATH.
>-    with_gnu_ld=unknown
>-    ;;
>-  esac
>-elif test "$with_gnu_ld" = yes; then
>-  AC_MSG_CHECKING([for GNU ld])
>-else
>-  AC_MSG_CHECKING([for non-GNU ld])
>-fi
>-AC_CACHE_VAL(lt_cv_path_LD,
>-[if test -z "$LD"; then
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for ac_dir in $PATH; do
>-    test -z "$ac_dir" && ac_dir=.
>-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>-      lt_cv_path_LD="$ac_dir/$ac_prog"
>-      # Check to see if the program is GNU ld.  I'd rather use --version,
>-      # but apparently some GNU ld's only accept -v.
>-      # Break only if it was the GNU/non-GNU ld that we prefer.
>-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
>-	test "$with_gnu_ld" != no && break
>-      else
>-	test "$with_gnu_ld" != yes && break
>-      fi
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-else
>-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
>-fi])
>-LD="$lt_cv_path_LD"
>-if test -n "$LD"; then
>-  AC_MSG_RESULT($LD)
>-else
>-  AC_MSG_RESULT(no)
>-fi
>-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
>-AC_PROG_LD_GNU
>-])
>-
>-# AC_PROG_LD_GNU -
>-AC_DEFUN([AC_PROG_LD_GNU],
>-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
>-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
>-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
>-  lt_cv_prog_gnu_ld=yes
>-else
>-  lt_cv_prog_gnu_ld=no
>-fi])
>-with_gnu_ld=$lt_cv_prog_gnu_ld
>-])
>-
>-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
>-#   -- PORTME Some linkers may need a different reload flag.
>-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
>-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
>-[lt_cv_ld_reload_flag='-r'])
>-reload_flag=$lt_cv_ld_reload_flag
>-test -n "$reload_flag" && reload_flag=" $reload_flag"
>-])
>-
>-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
>-#  -- PORTME fill in with the dynamic library characteristics
>-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
>-[AC_CACHE_CHECK([how to recognise dependant libraries],
>-lt_cv_deplibs_check_method,
>-[lt_cv_file_magic_cmd='$MAGIC_CMD'
>-lt_cv_file_magic_test_file=
>-lt_cv_deplibs_check_method='unknown'
>-# Need to set the preceding variable on all platforms that support
>-# interlibrary dependencies.
>-# 'none' -- dependencies not supported.
>-# `unknown' -- same as none, but documents that we really don't know.
>-# 'pass_all' -- all dependencies passed with no checks.
>-# 'test_compile' -- check by making test program.
>-# 'file_magic [[regex]]' -- check by looking for files in library path
>-# which responds to the $file_magic_cmd with a given egrep regex.
>-# If you have `file' or equivalent on your system and you're not sure
>-# whether `pass_all' will *always* work, you probably want this one.
>-
>-case $host_os in
>-aix4* | aix5*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-beos*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-bsdi4*)
>-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
>-  lt_cv_file_magic_cmd='/usr/bin/file -L'
>-  lt_cv_file_magic_test_file=/shlib/libc.so
>-  ;;
>-
>-cygwin* | mingw* | pw32*)
>-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
>-  lt_cv_file_magic_cmd='$OBJDUMP -f'
>-  ;;
>-
>-darwin* | rhapsody*)
>-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
>-  lt_cv_file_magic_cmd='/usr/bin/file -L'
>-  case "$host_os" in
>-  rhapsody* | darwin1.[[012]])
>-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
>-    ;;
>-  *) # Darwin 1.3 on
>-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
>-    ;;
>-  esac
>-  ;;
>-
>-freebsd*)
>-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>-    case $host_cpu in
>-    i*86 )
>-      # Not sure whether the presence of OpenBSD here was a mistake.
>-      # Let's accept both of them until this is cleared up.
>-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
>-      lt_cv_file_magic_cmd=/usr/bin/file
>-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>-      ;;
>-    esac
>-  else
>-    lt_cv_deplibs_check_method=pass_all
>-  fi
>-  ;;
>-
>-gnu*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-hpux10.20*|hpux11*)
>-  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
>-  ;;
>-
>-irix5* | irix6*)
>-  case $host_os in
>-  irix5*)
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
>-    ;;
>-  *)
>-    case $LD in
>-    *-32|*"-32 ") libmagic=32-bit;;
>-    *-n32|*"-n32 ") libmagic=N32;;
>-    *-64|*"-64 ") libmagic=64-bit;;
>-    *) libmagic=never-match;;
>-    esac
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
>-    ;;
>-  esac
>-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-# This must be Linux ELF.
>-linux-gnu*)
>-  case $host_cpu in
>-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
>-    lt_cv_deplibs_check_method=pass_all ;;
>-  *)
>-    # glibc up to 2.1.1 does not perform some relocations on ARM
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
>-  esac
>-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
>-  ;;
>-
>-netbsd*)
>-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
>-  else
>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
>-  fi
>-  ;;
>-
>-newos6*)
>-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
>-  ;;
>-
>-openbsd*)
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
>-  else
>-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
>-  fi
>-  ;;
>-
>-osf3* | osf4* | osf5*)
>-  # this will be overridden with pass_all, but let us keep it just in case
>-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
>-  lt_cv_file_magic_test_file=/shlib/libc.so
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-sco3.2v5*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-solaris*)
>-  lt_cv_deplibs_check_method=pass_all
>-  lt_cv_file_magic_test_file=/lib/libc.so
>-  ;;
>-
>-sysv5uw[[78]]* | sysv4*uw2*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-  case $host_vendor in
>-  motorola)
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
>-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
>-    ;;
>-  ncr)
>-    lt_cv_deplibs_check_method=pass_all
>-    ;;
>-  sequent)
>-    lt_cv_file_magic_cmd='/bin/file'
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
>-    ;;
>-  sni)
>-    lt_cv_file_magic_cmd='/bin/file'
>-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
>-    lt_cv_file_magic_test_file=/lib/libc.so
>-    ;;
>-  esac
>-  ;;
>-esac
>-])
>-file_magic_cmd=$lt_cv_file_magic_cmd
>-deplibs_check_method=$lt_cv_deplibs_check_method
>-])
>-
>-
>-# AC_PROG_NM - find the path to a BSD-compatible name lister
>-AC_DEFUN([AC_PROG_NM],
>-[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
>-AC_MSG_CHECKING([for BSD-compatible nm])
>-AC_CACHE_VAL(lt_cv_path_NM,
>-[if test -n "$NM"; then
>-  # Let the user override the test.
>-  lt_cv_path_NM="$NM"
>-else
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
>-    test -z "$ac_dir" && ac_dir=.
>-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
>-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
>-      # Check to see if the nm accepts a BSD-compat flag.
>-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
>-      #   nm: unknown option "B" ignored
>-      # Tru64's nm complains that /dev/null is an invalid object file
>-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
>-	lt_cv_path_NM="$tmp_nm -B"
>-	break
>-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
>-	lt_cv_path_NM="$tmp_nm -p"
>-	break
>-      else
>-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
>-	continue # so that we can try to find one that supports BSD flags
>-      fi
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
>-fi])
>-NM="$lt_cv_path_NM"
>-AC_MSG_RESULT([$NM])
>-])
>-
>-# AC_CHECK_LIBM - check for math library
>-AC_DEFUN([AC_CHECK_LIBM],
>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
>-LIBM=
>-case $host in
>-*-*-beos* | *-*-cygwin* | *-*-pw32*)
>-  # These system don't have libm
>-  ;;
>-*-ncr-sysv4.3*)
>-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
>-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
>-  ;;
>-*)
>-  AC_CHECK_LIB(m, main, LIBM="-lm")
>-  ;;
>-esac
>-])
>-
>-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
>-# the libltdl convenience library and INCLTDL to the include flags for
>-# the libltdl header and adds --enable-ltdl-convenience to the
>-# configure arguments.  Note that LIBLTDL and INCLTDL are not
>-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
>-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
>-# with '${top_builddir}/' and INCLTDL will be prefixed with
>-# '${top_srcdir}/' (note the single quotes!).  If your package is not
>-# flat and you're not using automake, define top_builddir and
>-# top_srcdir appropriately in the Makefiles.
>-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-  case $enable_ltdl_convenience in
>-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
>-  "") enable_ltdl_convenience=yes
>-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
>-  esac
>-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
>-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
>-])
>-
>-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
>-# the libltdl installable library and INCLTDL to the include flags for
>-# the libltdl header and adds --enable-ltdl-install to the configure
>-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
>-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
>-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
>-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
>-# with '${top_srcdir}/' (note the single quotes!).  If your package is
>-# not flat and you're not using automake, define top_builddir and
>-# top_srcdir appropriately in the Makefiles.
>-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
>-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-  AC_CHECK_LIB(ltdl, main,
>-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
>-  [if test x"$enable_ltdl_install" = xno; then
>-     AC_MSG_WARN([libltdl not installed, but installation disabled])
>-   else
>-     enable_ltdl_install=yes
>-   fi
>-  ])
>-  if test x"$enable_ltdl_install" = x"yes"; then
>-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
>-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
>-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
>-  else
>-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
>-    LIBLTDL="-lltdl"
>-    INCLTDL=
>-  fi
>-])
>-
>-# old names
>-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
>-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
>-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
>-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
>-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
>-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
>-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
>-
>-# This is just to silence aclocal about the macro not being used
>-ifelse([AC_DISABLE_FAST_INSTALL])
>-## ltdl.m4 - Configure ltdl for the target system. -*-Shell-script-*-
>-## Copyright (C) 1999-2000 Free Software Foundation, Inc.
>-##
>-## This program is free software; you can redistribute it and/or modify
>-## it under the terms of the GNU General Public License as published by
>-## the Free Software Foundation; either version 2 of the License, or
>-## (at your option) any later version.
>-##
>-## This program is distributed in the hope that it will be useful, but
>-## WITHOUT ANY WARRANTY; without even the implied warranty of
>-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-## General Public License for more details.
>-##
>-## You should have received a copy of the GNU General Public License
>-## along with this program; if not, write to the Free Software
>-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-##
>-## As a special exception to the GNU General Public License, if you
>-## distribute this file as part of a program that contains a
>-## configuration script generated by Autoconf, you may include it under
>-## the same distribution terms that you use for the rest of that program.
>-
>-# serial 2 AC_LIB_LTDL
>-
>-# AC_LIB_LTDL
>-# -----------
>-# Perform all the checks necessary for compilation of the ltdl objects
>-#  -- including compiler checks and header checks.
>-AC_DEFUN(AC_LIB_LTDL,
>-[AC_PREREQ(2.13)
>-AC_REQUIRE([AC_PROG_CC])
>-AC_REQUIRE([AC_C_CONST])
>-AC_REQUIRE([AC_HEADER_STDC])
>-AC_REQUIRE([AC_HEADER_DIRENT])
>-AC_REQUIRE([AC_LIBTOOL_HEADER_ASSERT])
>-AC_REQUIRE([_LT_AC_CHECK_DLFCN])
>-AC_REQUIRE([AC_LTDL_ENABLE_INSTALL])
>-AC_REQUIRE([AC_LTDL_SHLIBEXT])
>-AC_REQUIRE([AC_LTDL_SHLIBPATH])
>-AC_REQUIRE([AC_LTDL_SYSSEARCHPATH])
>-AC_REQUIRE([AC_LTDL_OBJDIR])
>-AC_REQUIRE([AC_LTDL_DLPREOPEN])
>-AC_REQUIRE([AC_LTDL_DLLIB])
>-AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])
>-AC_REQUIRE([AC_LTDL_DLSYM_USCORE])
>-AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])
>-AC_REQUIRE([AC_LTDL_FUNC_ARGZ])
>-
>-AC_CHECK_HEADERS([errno.h malloc.h memory.h stdlib.h stdio.h ctype.h unistd.h])
>-AC_CHECK_HEADERS([dl.h sys/dl.h dld.h])
>-AC_CHECK_HEADERS([string.h strings.h], break)
>-
>-AC_CHECK_FUNCS([strchr index], break)
>-AC_CHECK_FUNCS([strrchr rindex], break)
>-AC_CHECK_FUNCS([memcpy bcopy], break)
>-AC_CHECK_FUNCS([memmove strcmp])
>-
>-])# AC_LIB_LTDL
>-
>-# AC_LTDL_ENABLE_INSTALL
>-# ----------------------
>-AC_DEFUN(AC_LTDL_ENABLE_INSTALL,
>-[AC_ARG_ENABLE(ltdl-install,
>-[  --enable-ltdl-install   install libltdl])
>-
>-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
>-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
>-])])# AC_LTDL_ENABLE_INSTALL
>-
>-# AC_LTDL_SYS_DLOPEN_DEPLIBS
>-# --------------------------
>-AC_DEFUN(AC_LTDL_SYS_DLOPEN_DEPLIBS,
>-[AC_REQUIRE([AC_CANONICAL_HOST])
>-AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
>-	libltdl_cv_sys_dlopen_deplibs, [dnl
>-	# PORTME does your system automatically load deplibs for dlopen()?
>-	libltdl_cv_sys_dlopen_deplibs=unknown
>-	case "$host_os" in
>-	linux*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	netbsd*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	openbsd*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	solaris*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	esac
>-])
>-if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
>- AC_DEFINE(LTDL_DLOPEN_DEPLIBS, 1,
>-    [Define if the OS needs help to load dependent libraries for dlopen(). ])
>-fi
>-])# AC_LTDL_SYS_DLOPEN_DEPLIBS
>-
>-# AC_LTDL_SHLIBEXT
>-# ----------------
>-AC_DEFUN(AC_LTDL_SHLIBEXT,
>-[AC_REQUIRE([_LT_AC_LTCONFIG_HACK])
>-AC_CACHE_CHECK([which extension is used for shared libraries],
>-  libltdl_cv_shlibext,
>-[ac_last=
>-  for ac_spec in $library_names_spec; do
>-    ac_last="$ac_spec"
>-  done
>-  echo "$ac_last" | [sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//'] > conftest
>-libltdl_cv_shlibext=`cat conftest`
>-rm -f conftest
>-])
>-if test -n "$libltdl_cv_shlibext"; then
>-  AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
>-    [Define to the extension used for shared libraries, say, ".so". ])
>-fi
>-])# AC_LTDL_SHLIBEXT
>-
>-# AC_LTDL_SHLIBPATH
>-# -----------------
>-AC_DEFUN(AC_LTDL_SHLIBPATH,
>-[AC_REQUIRE([_LT_AC_LTCONFIG_HACK])
>-AC_CACHE_CHECK([which variable specifies run-time library path],
>-  libltdl_cv_shlibpath_var, [libltdl_cv_shlibpath_var="$shlibpath_var"])
>-if test -n "$libltdl_cv_shlibpath_var"; then
>-  AC_DEFINE_UNQUOTED(LTDL_SHLIBPATH_VAR, "$libltdl_cv_shlibpath_var",
>-    [Define to the name of the environment variable that determines the dynamic library search path. ])
>-fi
>-])# AC_LTDL_SHLIBPATH
>-
>-# AC_LTDL_SYSSEARCHPATH
>-# ---------------------
>-AC_DEFUN(AC_LTDL_SYSSEARCHPATH,
>-[AC_REQUIRE([_LT_AC_LTCONFIG_HACK])
>-AC_CACHE_CHECK([for the default library search path],
>-  libltdl_cv_sys_search_path, [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"])
>-if test -n "$libltdl_cv_sys_search_path"; then
>-  case "$host" in
>-  *-*-mingw*) pathsep=";" ;;
>-  *) pathsep=":" ;;
>-  esac
>-  sys_search_path=
>-  for dir in $libltdl_cv_sys_search_path; do
>-    if test -z "$sys_search_path"; then
>-      sys_search_path="$dir"
>-    else
>-      sys_search_path="$sys_search_path$pathsep$dir"
>-    fi
>-  done
>-  AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, "$sys_search_path",
>-    [Define to the system default library search path. ])
>-fi
>-])# AC_LTDL_SYSSEARCHPATH
>-
>-# AC_LTDL_OBJDIR
>-# --------------
>-AC_DEFUN(AC_LTDL_OBJDIR,
>-[AC_CACHE_CHECK([for objdir],
>-  libltdl_cv_objdir, [libltdl_cv_objdir="$objdir"
>-if test -n "$objdir"; then
>-  :
>-else
>-  rm -f .libs 2>/dev/null
>-  mkdir .libs 2>/dev/null
>-  if test -d .libs; then
>-    libltdl_cv_objdir=.libs
>-  else
>-    # MS-DOS does not allow filenames that begin with a dot.
>-    libltdl_cv_objdir=_libs
>-  fi
>-rmdir .libs 2>/dev/null
>-fi])
>-AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/",
>-  [Define to the sub-directory in which libtool stores uninstalled libraries. ])
>-])# AC_LTDL_OBJDIR
>-
>-# AC_LTDL_DLPREOPEN
>-# -----------------
>-AC_DEFUN(AC_LTDL_DLPREOPEN,
>-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
>-AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
>-       libltdl_cv_preloaded_symbols, [dnl
>-  if test -n "$global_symbol_pipe"; then
>-    libltdl_cv_preloaded_symbols=yes
>-  else
>-    libltdl_cv_preloaded_symbols=no
>-  fi
>-])
>-if test x"$libltdl_cv_preloaded_symbols" = x"yes"; then
>-  AC_DEFINE(HAVE_PRELOADED_SYMBOLS, 1,
>-    [Define if libtool can extract symbol lists from object files. ])
>-fi
>-])# AC_LTDL_DLPREOPEN
>-
>-# AC_LTDL_DLLIB
>-# -------------
>-AC_DEFUN(AC_LTDL_DLLIB,
>-[LIBADD_DL=
>-AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1,
>-   [Define if you have the libdl library or equivalent. ]) LIBADD_DL="-ldl"],
>-[AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1,
>-   [Define if you have the libdl library or equivalent.])],
>-[AC_CHECK_LIB(svld, dlopen, [AC_DEFINE(HAVE_LIBDL, 1,
>-   [Define if you have the libdl library or equivalent.]) LIBADD_DL="-lsvld"]
>-)])])
>-AC_CHECK_FUNC(shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1,
>-   [Define if you have the shl_load function.])],
>-[AC_CHECK_LIB(dld, shl_load,
>-  [AC_DEFINE(HAVE_SHL_LOAD, 1,
>-     [Define if you have the shl_load function.])
>-   LIBADD_DL="$LIBADD_DL -ldld"])
>-])
>-AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD, 1,
>-  [Define if you have the GNU dld library.])dnl
>-test "x$ac_cv_lib_dld_shl_load" = yes || LIBADD_DL="$LIBADD_DL -ldld"])
>-AC_SUBST(LIBADD_DL)
>-
>-if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = xyes; then
>- LIBS_SAVE="$LIBS"
>- LIBS="$LIBS $LIBADD_DL"
>- AC_CHECK_FUNCS(dlerror)
>- LIBS="$LIBS_SAVE"
>-fi
>-])# AC_LTDL_DLLIB
>-
>-# AC_LTDL_SYMBOL_USCORE
>-# ---------------------
>-AC_DEFUN(AC_LTDL_SYMBOL_USCORE,
>-[dnl does the compiler prefix global symbols with an underscore?
>-AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
>-AC_MSG_CHECKING([for _ prefix in compiled symbols])
>-AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
>-[ac_cv_sys_symbol_underscore=no
>-cat > conftest.$ac_ext <<EOF
>-void nm_test_func(){}
>-int main(){nm_test_func;return 0;}
>-EOF
>-if AC_TRY_EVAL(ac_compile); then
>-  # Now try to grab the symbols.
>-  ac_nlist=conftest.nm
>-  if AC_TRY_EVAL(NM conftest.$ac_objext \| $global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
>-    # See whether the symbols have a leading underscore.
>-    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
>-      ac_cv_sys_symbol_underscore=yes
>-    else
>-      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
>-	:
>-      else
>-	echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
>-      fi
>-    fi
>-  else
>-    echo "configure: cannot run $global_symbol_pipe" >&AC_FD_CC
>-  fi
>-else
>-  echo "configure: failed program was:" >&AC_FD_CC
>-  cat conftest.c >&AC_FD_CC
>-fi
>-rm -rf conftest*
>-])
>-AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
>-])# AC_LTDL_SYMBOL_USCORE
>-
>-
>-# AC_LTDL_DLSYM_USCORE
>-# --------------------
>-AC_DEFUN(AC_LTDL_DLSYM_USCORE,
>-[AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl
>-if test x"$ac_cv_sys_symbol_underscore" = xyes; then
>-  if test x"$ac_cv_func_dlopen" = xyes ||
>-     test x"$ac_cv_lib_dl_dlopen" = xyes ; then
>-	AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
>-		libltdl_cv_need_uscore, [dnl
>-		libltdl_cv_need_uscore=unknown
>-                save_LIBS="$LIBS"
>-                LIBS="$LIBS $LIBADD_DL"
>-		_LT_AC_TRY_DLOPEN_SELF(
>-		  libltdl_cv_need_uscore=no, libltdl_cv_need_uscore=yes,
>-		  [],			     libltdl_cv_need_uscore=cross)
>-		LIBS="$save_LIBS"
>-	])
>-  fi
>-fi
>-
>-if test x"$libltdl_cv_need_uscore" = xyes; then
>-  AC_DEFINE(NEED_USCORE, 1,
>-    [Define if dlsym() requires a leading underscode in symbol names. ])
>-fi
>-])# AC_LTDL_DLSYM_USCORE
>-
>-
>-# AC_CHECK_TYPES(TYPES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
>-#                [INCLUDES])
>-# ---------------------------------------------------------------
>-# This macro did not exist in Autoconf 2.13, which we do still support
>-ifdef([AC_CHECK_TYPES], [],
>-[define([AC_CHECK_TYPES],
>-  [AC_CACHE_CHECK([for $1], ac_Type,
>-    [AC_TRY_LINK([$4],
>-	[if (($1 *) 0)
>-	  return 0;
>-	if (sizeof ($1))
>-	  return 0;],
>-	[ac_Type=yes],
>-	[ac_Type=no])])
>-  if test "x$ac_Type" = xyes; then
>-    ifelse([$2], [], [:], [$2])
>-  else
>-    ifelse([$3], [], [:], [$3])
>-  fi])
>-])# AC_CHECK_TYPES
>-
>-
>-# AC_LTDL_FUNC_ARGZ
>-# -----------------
>-AC_DEFUN([AC_LTDL_FUNC_ARGZ],
>-[AC_CHECK_HEADERS([argz.h])
>-
>-AC_CHECK_TYPES([error_t],
>-  [],
>-  [AC_DEFINE([error_t], [int],
>-    [Define to a type to use for \`error_t' if it is not otherwise available.])],
>-  [#if HAVE_ARGZ_H
>-#  include <argz.h>
>-#endif])
>-
>-AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify])
>-])# AC_LTDL_FUNC_ARGZ
>diff -uNr vamos-0.5.5.orig/aclocal.m4 vamos-0.5.5/aclocal.m4
>--- vamos-0.5.5.orig/aclocal.m4	2005-10-29 22:27:35.000000000 +0200
>+++ vamos-0.5.5/aclocal.m4	2007-06-25 18:02:46.000000000 +0200
>@@ -1,7 +1,7 @@
>-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
>+# generated automatically by aclocal 1.10 -*- Autoconf -*-
> 
>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
>+# 2005, 2006  Free Software Foundation, Inc.
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -11,12 +11,68 @@
> # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
> # PARTICULAR PURPOSE.
> 
>-# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
>+m4_if(m4_PACKAGE_VERSION, [2.61],,
>+[m4_fatal([this file was generated for autoconf 2.61.
>+You have another version of autoconf.  If you want to use that,
>+you should regenerate the build system entirely.], [63])])
>+
>+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
>+
>+# serial 48 AC_PROG_LIBTOOL
>+
> 
>-# serial 46 AC_PROG_LIBTOOL
>+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
>+# -----------------------------------------------------------
>+# If this macro is not defined by Autoconf, define it here.
>+m4_ifdef([AC_PROVIDE_IFELSE],
>+         [],
>+         [m4_define([AC_PROVIDE_IFELSE],
>+	         [m4_ifdef([AC_PROVIDE_$1],
>+		           [$2], [$3])])])
> 
>+
>+# AC_PROG_LIBTOOL
>+# ---------------
> AC_DEFUN([AC_PROG_LIBTOOL],
>+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
>+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
>+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
>+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
>+    [AC_LIBTOOL_CXX],
>+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
>+  ])])
>+dnl And a similar setup for Fortran 77 support
>+  AC_PROVIDE_IFELSE([AC_PROG_F77],
>+    [AC_LIBTOOL_F77],
>+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
>+])])
>+
>+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
>+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
>+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
>+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
>+    [AC_LIBTOOL_GCJ],
>+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
>+      [AC_LIBTOOL_GCJ],
>+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
>+	[AC_LIBTOOL_GCJ],
>+      [ifdef([AC_PROG_GCJ],
>+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
>+       ifdef([A][M_PROG_GCJ],
>+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
>+       ifdef([LT_AC_PROG_GCJ],
>+	     [define([LT_AC_PROG_GCJ],
>+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
>+])])# AC_PROG_LIBTOOL
>+
>+
>+# _AC_PROG_LIBTOOL
>+# ----------------
>+AC_DEFUN([_AC_PROG_LIBTOOL],
> [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
>+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
>+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
>+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
> 
> # This can be used to rebuild libtool when needed
> LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>@@ -27,10 +83,13 @@
> 
> # Prevent multiple expansion
> define([AC_PROG_LIBTOOL], [])
>-])
>+])# _AC_PROG_LIBTOOL
> 
>+
>+# AC_LIBTOOL_SETUP
>+# ----------------
> AC_DEFUN([AC_LIBTOOL_SETUP],
>-[AC_PREREQ(2.13)dnl
>+[AC_PREREQ(2.50)dnl
> AC_REQUIRE([AC_ENABLE_SHARED])dnl
> AC_REQUIRE([AC_ENABLE_STATIC])dnl
> AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
>@@ -40,13 +99,106 @@
> AC_REQUIRE([AC_PROG_LD])dnl
> AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
> AC_REQUIRE([AC_PROG_NM])dnl
>+
> AC_REQUIRE([AC_PROG_LN_S])dnl
> AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
>+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
> AC_REQUIRE([AC_OBJEXT])dnl
> AC_REQUIRE([AC_EXEEXT])dnl
> dnl
> 
>+AC_LIBTOOL_SYS_MAX_CMD_LEN
>+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
>+AC_LIBTOOL_OBJDIR
>+
>+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
> _LT_AC_PROG_ECHO_BACKSLASH
>+
>+case $host_os in
>+aix3*)
>+  # AIX sometimes has problems with the GCC collect2 program.  For some
>+  # reason, if we set the COLLECT_NAMES environment variable, the problems
>+  # vanish in a puff of smoke.
>+  if test "X${COLLECT_NAMES+set}" != Xset; then
>+    COLLECT_NAMES=
>+    export COLLECT_NAMES
>+  fi
>+  ;;
>+esac
>+
>+# Sed substitution that helps us do robust quoting.  It backslashifies
>+# metacharacters that are still active within double-quoted strings.
>+Xsed='sed -e 1s/^X//'
>+[sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g']
>+
>+# Same as above, but do not quote variable references.
>+[double_quote_subst='s/$[\\"\\`\\\\]$/\\\1/g']
>+
>+# Sed substitution to delay expansion of an escaped shell variable in a
>+# double_quote_subst'ed string.
>+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
>+
>+# Sed substitution to avoid accidental globbing in evaled expressions
>+no_glob_subst='s/\*/\\\*/g'
>+
>+# Constants:
>+rm="rm -f"
>+
>+# Global variables:
>+default_ofile=libtool
>+can_build_shared=yes
>+
>+# All known linkers require a `.a' archive for static linking (except MSVC,
>+# which needs '.lib').
>+libext=a
>+ltmain="$ac_aux_dir/ltmain.sh"
>+ofile="$default_ofile"
>+with_gnu_ld="$lt_cv_prog_gnu_ld"
>+
>+AC_CHECK_TOOL(AR, ar, false)
>+AC_CHECK_TOOL(RANLIB, ranlib, :)
>+AC_CHECK_TOOL(STRIP, strip, :)
>+
>+old_CC="$CC"
>+old_CFLAGS="$CFLAGS"
>+
>+# Set sane defaults for various variables
>+test -z "$AR" && AR=ar
>+test -z "$AR_FLAGS" && AR_FLAGS=cru
>+test -z "$AS" && AS=as
>+test -z "$CC" && CC=cc
>+test -z "$LTCC" && LTCC=$CC
>+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
>+test -z "$DLLTOOL" && DLLTOOL=dlltool
>+test -z "$LD" && LD=ld
>+test -z "$LN_S" && LN_S="ln -s"
>+test -z "$MAGIC_CMD" && MAGIC_CMD=file
>+test -z "$NM" && NM=nm
>+test -z "$SED" && SED=sed
>+test -z "$OBJDUMP" && OBJDUMP=objdump
>+test -z "$RANLIB" && RANLIB=:
>+test -z "$STRIP" && STRIP=:
>+test -z "$ac_objext" && ac_objext=o
>+
>+# Determine commands to create old-style static archives.
>+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
>+old_postinstall_cmds='chmod 644 $oldlib'
>+old_postuninstall_cmds=
>+
>+if test -n "$RANLIB"; then
>+  case $host_os in
>+  openbsd*)
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
>+    ;;
>+  *)
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
>+    ;;
>+  esac
>+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
>+fi
>+
>+_LT_CC_BASENAME([$compiler])
>+
> # Only perform the check for file, if the check method requires it
> case $deplibs_check_method in
> file_magic*)
>@@ -56,369 +208,168 @@
>   ;;
> esac
> 
>-AC_CHECK_TOOL(RANLIB, ranlib, :)
>-AC_CHECK_TOOL(STRIP, strip, :)
>-
>-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
>-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
>+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
>+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
> enable_win32_dll=yes, enable_win32_dll=no)
> 
>-AC_ARG_ENABLE(libtool-lock,
>-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
>+AC_ARG_ENABLE([libtool-lock],
>+    [AC_HELP_STRING([--disable-libtool-lock],
>+	[avoid locking (might break parallel builds)])])
> test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
> 
>-# Some flags need to be propagated to the compiler or linker for good
>-# libtool support.
>-case $host in
>-*-*-irix6*)
>-  # Find out which ABI we are using.
>-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
>-  if AC_TRY_EVAL(ac_compile); then
>-    case `/usr/bin/file conftest.$ac_objext` in
>-    *32-bit*)
>-      LD="${LD-ld} -32"
>-      ;;
>-    *N32*)
>-      LD="${LD-ld} -n32"
>-      ;;
>-    *64-bit*)
>-      LD="${LD-ld} -64"
>-      ;;
>-    esac
>-  fi
>-  rm -rf conftest*
>-  ;;
>+AC_ARG_WITH([pic],
>+    [AC_HELP_STRING([--with-pic],
>+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
>+    [pic_mode="$withval"],
>+    [pic_mode=default])
>+test -z "$pic_mode" && pic_mode=default
> 
>-*-*-sco3.2v5*)
>-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
>-  SAVE_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -belf"
>-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
>-    [AC_LANG_SAVE
>-     AC_LANG_C
>-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
>-     AC_LANG_RESTORE])
>-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
>-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
>-    CFLAGS="$SAVE_CFLAGS"
>-  fi
>-  ;;
>+# Use C for the default configuration in the libtool script
>+tagname=
>+AC_LIBTOOL_LANG_C_CONFIG
>+_LT_AC_TAGCONFIG
>+])# AC_LIBTOOL_SETUP
> 
>-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
>-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
>-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
>-  AC_CHECK_TOOL(AS, as, false)
>-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
> 
>-  # recent cygwin and mingw systems supply a stub DllMain which the user
>-  # can override, but on older systems we have to supply one
>-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
>-    [AC_TRY_LINK([],
>-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
>-      DllMain (0, 0, 0);],
>-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
>-
>-  case $host/$CC in
>-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
>-    # old mingw systems require "-dll" to link a DLL, while more recent ones
>-    # require "-mdll"
>-    SAVE_CFLAGS="$CFLAGS"
>-    CFLAGS="$CFLAGS -mdll"
>-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
>-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
>-    CFLAGS="$SAVE_CFLAGS" ;;
>-  *-*-cygwin* | *-*-pw32*)
>-    # cygwin systems need to pass --dll to the linker, and not link
>-    # crt.o which will require a WinMain@16 definition.
>-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
>-  esac
>-  ;;
>-  ])
>-esac
>+# _LT_AC_SYS_COMPILER
>+# -------------------
>+AC_DEFUN([_LT_AC_SYS_COMPILER],
>+[AC_REQUIRE([AC_PROG_CC])dnl
> 
>-_LT_AC_LTCONFIG_HACK
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
> 
>-])
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
> 
>-# AC_LIBTOOL_HEADER_ASSERT
>-# ------------------------
>-AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
>-[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
>-    [lt_cv_func_assert_works],
>-    [case $host in
>-    *-*-solaris*)
>-      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
>-        case `$CC --version 2>/dev/null` in
>-        [[12]].*) lt_cv_func_assert_works=no ;;
>-        *)        lt_cv_func_assert_works=yes ;;
>-        esac
>-      fi
>-      ;;
>-    esac])
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
>+])# _LT_AC_SYS_COMPILER
> 
>-if test "x$lt_cv_func_assert_works" = xyes; then
>-  AC_CHECK_HEADERS(assert.h)
>-fi
>-])# AC_LIBTOOL_HEADER_ASSERT
> 
>-# _LT_AC_CHECK_DLFCN
>-# --------------------
>-AC_DEFUN([_LT_AC_CHECK_DLFCN],
>-[AC_CHECK_HEADERS(dlfcn.h)
>-])# _LT_AC_CHECK_DLFCN
>+# _LT_CC_BASENAME(CC)
>+# -------------------
>+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
>+AC_DEFUN([_LT_CC_BASENAME],
>+[for cc_temp in $1""; do
>+  case $cc_temp in
>+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
>+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+])
> 
>-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
>-# ---------------------------------
>-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
>-[AC_REQUIRE([AC_CANONICAL_HOST])
>-AC_REQUIRE([AC_PROG_NM])
>-AC_REQUIRE([AC_OBJEXT])
>-# Check for command to grab the raw symbol name followed by C symbol from nm.
>-AC_MSG_CHECKING([command to parse $NM output])
>-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
> 
>-# These are sane defaults that work on at least a few old systems.
>-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
>+# _LT_COMPILER_BOILERPLATE
>+# ------------------------
>+# Check for compiler boilerplate output or warnings with
>+# the simple compiler test code.
>+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
>+[ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+])# _LT_COMPILER_BOILERPLATE
> 
>-# Character class describing NM global symbol codes.
>-symcode='[[BCDEGRST]]'
> 
>-# Regexp to match symbols that can be accessed directly from C.
>-sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
>+# _LT_LINKER_BOILERPLATE
>+# ----------------------
>+# Check for linker boilerplate output or warnings with
>+# the simple link test code.
>+AC_DEFUN([_LT_LINKER_BOILERPLATE],
>+[ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+])# _LT_LINKER_BOILERPLATE
> 
>-# Transform the above into a raw symbol and a C symbol.
>-symxfrm='\1 \2\3 \3'
> 
>-# Transform an extracted symbol line into a proper C declaration
>-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern char \1;/p'"
>+# _LT_AC_SYS_LIBPATH_AIX
>+# ----------------------
>+# Links a minimal program and checks the executable
>+# for the system default hardcoded library path. In most cases,
>+# this is /usr/lib:/lib, but when the MPI compilers are used
>+# the location of the communication and MPI libs are included too.
>+# If we don't find anything, use the default library path according
>+# to the aix ld manual.
>+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
>+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi],[])
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+])# _LT_AC_SYS_LIBPATH_AIX
> 
>-# Transform an extracted symbol line into symbol name and symbol address
>-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
> 
>-# Define system-specific variables.
>-case $host_os in
>-aix*)
>-  symcode='[[BCDT]]'
>-  ;;
>-cygwin* | mingw* | pw32*)
>-  symcode='[[ABCDGISTW]]'
>-  ;;
>-hpux*) # Its linker distinguishes data from code symbols
>-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern char \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>-  ;;
>-irix*)
>-  symcode='[[BCDEGRST]]'
>-  ;;
>-solaris* | sysv5*)
>-  symcode='[[BDT]]'
>-  ;;
>-sysv4)
>-  symcode='[[DFNSTU]]'
>-  ;;
>-esac
>+# _LT_AC_SHELL_INIT(ARG)
>+# ----------------------
>+AC_DEFUN([_LT_AC_SHELL_INIT],
>+[ifdef([AC_DIVERSION_NOTICE],
>+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
>+	 [AC_DIVERT_PUSH(NOTICE)])
>+$1
>+AC_DIVERT_POP
>+])# _LT_AC_SHELL_INIT
> 
>-# Handle CRLF in mingw tool chain
>-opt_cr=
>-case $host_os in
>-mingw*)
>-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
>+
>+# _LT_AC_PROG_ECHO_BACKSLASH
>+# --------------------------
>+# Add some code to the start of the generated configure script which
>+# will find an echo command which doesn't interpret backslashes.
>+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
>+[_LT_AC_SHELL_INIT([
>+# Check that we are running under the correct shell.
>+SHELL=${CONFIG_SHELL-/bin/sh}
>+
>+case X$ECHO in
>+X*--fallback-echo)
>+  # Remove one level of quotation (which was required for Make).
>+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
>   ;;
> esac
> 
>-# If we're using GNU nm, then use its standard symbol codes.
>-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
>-  symcode='[[ABCDGISTW]]'
>+echo=${ECHO-echo}
>+if test "X[$]1" = X--no-reexec; then
>+  # Discard the --no-reexec flag, and continue.
>+  shift
>+elif test "X[$]1" = X--fallback-echo; then
>+  # Avoid inline document here, it may be left over
>+  :
>+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
>+  # Yippee, $echo works!
>+  :
>+else
>+  # Restart under the correct shell.
>+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
> fi
> 
>-# Try without a prefix undercore, then with it.
>-for ac_symprfx in "" "_"; do
>-
>-  # Write the raw and C identifiers.
>-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]$$symcode$symcode*$[[ 	]][[ 	]]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'"
>-
>-  # Check to see that the pipe works correctly.
>-  pipe_works=no
>-  rm -f conftest*
>-  cat > conftest.$ac_ext <<EOF
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-char nm_test_var;
>-void nm_test_func(){}
>-#ifdef __cplusplus
>-}
>-#endif
>-int main(){nm_test_var='a';nm_test_func();return(0);}
>+if test "X[$]1" = X--fallback-echo; then
>+  # used as fallback echo
>+  shift
>+  cat <<EOF
>+[$]*
> EOF
>+  exit 0
>+fi
> 
>-  if AC_TRY_EVAL(ac_compile); then
>-    # Now try to grab the symbols.
>-    nlist=conftest.nm
>-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
>-      # Try sorting and uniquifying the output.
>-      if sort "$nlist" | uniq > "$nlist"T; then
>-	mv -f "$nlist"T "$nlist"
>-      else
>-	rm -f "$nlist"T
>-      fi
>-
>-      # Make sure that we snagged all the symbols we need.
>-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
>-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
>-	  cat <<EOF > conftest.$ac_ext
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-
>-EOF
>-	  # Now generate the symbol file.
>-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
>-
>-	  cat <<EOF >> conftest.$ac_ext
>-#if defined (__STDC__) && __STDC__
>-# define lt_ptr void *
>-#else
>-# define lt_ptr char *
>-# define const
>-#endif
>-
>-/* The mapping between symbol names and symbols. */
>-const struct {
>-  const char *name;
>-  lt_ptr address;
>-}
>-lt_preloaded_symbols[[]] =
>-{
>-EOF
>-	  sed "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
>-	  cat <<\EOF >> conftest.$ac_ext
>-  {0, (lt_ptr) 0}
>-};
>-
>-#ifdef __cplusplus
>-}
>-#endif
>-EOF
>-	  # Now try linking the two files.
>-	  mv conftest.$ac_objext conftstm.$ac_objext
>-	  save_LIBS="$LIBS"
>-	  save_CFLAGS="$CFLAGS"
>-	  LIBS="conftstm.$ac_objext"
>-	  CFLAGS="$CFLAGS$no_builtin_flag"
>-	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
>-	    pipe_works=yes
>-	  fi
>-	  LIBS="$save_LIBS"
>-	  CFLAGS="$save_CFLAGS"
>-	else
>-	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
>-	fi
>-      else
>-	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
>-      fi
>-    else
>-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
>-    fi
>-  else
>-    echo "$progname: failed program was:" >&AC_FD_CC
>-    cat conftest.$ac_ext >&5
>-  fi
>-  rm -f conftest* conftst*
>-
>-  # Do not use the global_symbol_pipe unless it works.
>-  if test "$pipe_works" = yes; then
>-    break
>-  else
>-    lt_cv_sys_global_symbol_pipe=
>-  fi
>-done
>-])
>-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
>-if test -z "$lt_cv_sys_global_symbol_pipe"; then
>-  global_symbol_to_cdecl=
>-  global_symbol_to_c_name_address=
>-else
>-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
>-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
>-fi
>-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
>-then
>-  AC_MSG_RESULT(failed)
>-else
>-  AC_MSG_RESULT(ok)
>-fi
>-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
>-
>-# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
>-# ---------------------------------
>-AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
>-[# Find the correct PATH separator.  Usually this is `:', but
>-# DJGPP uses `;' like DOS.
>-if test "X${PATH_SEPARATOR+set}" != Xset; then
>-  UNAME=${UNAME-`uname 2>/dev/null`}
>-  case X$UNAME in
>-    *-DOS) lt_cv_sys_path_separator=';' ;;
>-    *)     lt_cv_sys_path_separator=':' ;;
>-  esac
>-  PATH_SEPARATOR=$lt_cv_sys_path_separator
>-fi
>-])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
>-
>-# _LT_AC_PROG_ECHO_BACKSLASH
>-# --------------------------
>-# Add some code to the start of the generated configure script which
>-# will find an echo command which doesn't interpret backslashes.
>-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
>-[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
>-			      [AC_DIVERT_PUSH(NOTICE)])
>-_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
>-
>-# Check that we are running under the correct shell.
>-SHELL=${CONFIG_SHELL-/bin/sh}
>-
>-case X$ECHO in
>-X*--fallback-echo)
>-  # Remove one level of quotation (which was required for Make).
>-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
>-  ;;
>-esac
>-
>-echo=${ECHO-echo}
>-if test "X[$]1" = X--no-reexec; then
>-  # Discard the --no-reexec flag, and continue.
>-  shift
>-elif test "X[$]1" = X--fallback-echo; then
>-  # Avoid inline document here, it may be left over
>-  :
>-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
>-  # Yippee, $echo works!
>-  :
>-else
>-  # Restart under the correct shell.
>-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
>-fi
>-
>-if test "X[$]1" = X--fallback-echo; then
>-  # used as fallback echo
>-  shift
>-  cat <<EOF
>-$*
>-EOF
>-  exit 0
>-fi
>-
>-# The HP-UX ksh and POSIX shell print the target directory to stdout
>-# if CDPATH is set.
>-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>+# The HP-UX ksh and POSIX shell print the target directory to stdout
>+# if CDPATH is set.
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> 
> if test -z "$ECHO"; then
> if test "X${echo_test_string+set}" != Xset; then
> # find a string as large as possible, as long as the shell can cope with it
>   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
>     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
>-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
>-       echo_test_string="`eval $cmd`" &&
>+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
>+       echo_test_string=`eval $cmd` &&
>        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
>     then
>       break
>@@ -437,8 +388,9 @@
>   #
>   # So, first we look for a working echo in the user's PATH.
> 
>-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>   for dir in $PATH /usr/ucb; do
>+    IFS="$lt_save_ifs"
>     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
>        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
>        echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
>@@ -447,7 +399,7 @@
>       break
>     fi
>   done
>-  IFS="$save_ifs"
>+  IFS="$lt_save_ifs"
> 
>   if test "X$echo" = Xecho; then
>     # We didn't find a better echo, so look for alternatives.
>@@ -520,17 +472,365 @@
> fi
> 
> AC_SUBST(ECHO)
>-AC_DIVERT_POP
>-])# _LT_AC_PROG_ECHO_BACKSLASH
>+])])# _LT_AC_PROG_ECHO_BACKSLASH
>+
>+
>+# _LT_AC_LOCK
>+# -----------
>+AC_DEFUN([_LT_AC_LOCK],
>+[AC_ARG_ENABLE([libtool-lock],
>+    [AC_HELP_STRING([--disable-libtool-lock],
>+	[avoid locking (might break parallel builds)])])
>+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
>+
>+# Some flags need to be propagated to the compiler or linker for good
>+# libtool support.
>+case $host in
>+ia64-*-hpux*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>+  if AC_TRY_EVAL(ac_compile); then
>+    case `/usr/bin/file conftest.$ac_objext` in
>+    *ELF-32*)
>+      HPUX_IA64_MODE="32"
>+      ;;
>+    *ELF-64*)
>+      HPUX_IA64_MODE="64"
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
>+*-*-irix6*)
>+  # Find out which ABI we are using.
>+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
>+  if AC_TRY_EVAL(ac_compile); then
>+   if test "$lt_cv_prog_gnu_ld" = yes; then
>+    case `/usr/bin/file conftest.$ac_objext` in
>+    *32-bit*)
>+      LD="${LD-ld} -melf32bsmip"
>+      ;;
>+    *N32*)
>+      LD="${LD-ld} -melf32bmipn32"
>+      ;;
>+    *64-bit*)
>+      LD="${LD-ld} -melf64bmip"
>+      ;;
>+    esac
>+   else
>+    case `/usr/bin/file conftest.$ac_objext` in
>+    *32-bit*)
>+      LD="${LD-ld} -32"
>+      ;;
>+    *N32*)
>+      LD="${LD-ld} -n32"
>+      ;;
>+    *64-bit*)
>+      LD="${LD-ld} -64"
>+      ;;
>+    esac
>+   fi
>+  fi
>+  rm -rf conftest*
>+  ;;
>+
>+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>+  if AC_TRY_EVAL(ac_compile); then
>+    case `/usr/bin/file conftest.o` in
>+    *32-bit*)
>+      case $host in
>+        x86_64-*linux*)
>+          LD="${LD-ld} -m elf_i386"
>+          ;;
>+        ppc64-*linux*|powerpc64-*linux*)
>+          LD="${LD-ld} -m elf32ppclinux"
>+          ;;
>+        s390x-*linux*)
>+          LD="${LD-ld} -m elf_s390"
>+          ;;
>+        sparc64-*linux*)
>+          LD="${LD-ld} -m elf32_sparc"
>+          ;;
>+      esac
>+      ;;
>+    *64-bit*)
>+      case $host in
>+        x86_64-*linux*)
>+          LD="${LD-ld} -m elf_x86_64"
>+          ;;
>+        ppc*-*linux*|powerpc*-*linux*)
>+          LD="${LD-ld} -m elf64ppc"
>+          ;;
>+        s390*-*linux*)
>+          LD="${LD-ld} -m elf64_s390"
>+          ;;
>+        sparc*-*linux*)
>+          LD="${LD-ld} -m elf64_sparc"
>+          ;;
>+      esac
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
>+
>+*-*-sco3.2v5*)
>+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
>+  SAVE_CFLAGS="$CFLAGS"
>+  CFLAGS="$CFLAGS -belf"
>+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
>+    [AC_LANG_PUSH(C)
>+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
>+     AC_LANG_POP])
>+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
>+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
>+    CFLAGS="$SAVE_CFLAGS"
>+  fi
>+  ;;
>+sparc*-*solaris*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>+  if AC_TRY_EVAL(ac_compile); then
>+    case `/usr/bin/file conftest.o` in
>+    *64-bit*)
>+      case $lt_cv_prog_gnu_ld in
>+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
>+      *)    LD="${LD-ld} -64" ;;
>+      esac
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
>+
>+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
>+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
>+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
>+  AC_CHECK_TOOL(AS, as, false)
>+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
>+  ;;
>+  ])
>+esac
>+
>+need_locks="$enable_libtool_lock"
>+
>+])# _LT_AC_LOCK
>+
>+
>+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
>+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
>+# ----------------------------------------------------------------
>+# Check whether the given compiler option works
>+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
>+[AC_REQUIRE([LT_AC_PROG_SED])
>+AC_CACHE_CHECK([$1], [$2],
>+  [$2=no
>+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="$3"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&AS_MESSAGE_LOG_FD
>+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       $2=yes
>+     fi
>+   fi
>+   $rm conftest*
>+])
>+
>+if test x"[$]$2" = xyes; then
>+    ifelse([$5], , :, [$5])
>+else
>+    ifelse([$6], , :, [$6])
>+fi
>+])# AC_LIBTOOL_COMPILER_OPTION
>+
>+
>+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
>+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
>+# ------------------------------------------------------------
>+# Check whether the given compiler option works
>+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
>+[AC_CACHE_CHECK([$1], [$2],
>+  [$2=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $3"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         $2=yes
>+       fi
>+     else
>+       $2=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
>+])
>+
>+if test x"[$]$2" = xyes; then
>+    ifelse([$4], , :, [$4])
>+else
>+    ifelse([$5], , :, [$5])
>+fi
>+])# AC_LIBTOOL_LINKER_OPTION
>+
>+
>+# AC_LIBTOOL_SYS_MAX_CMD_LEN
>+# --------------------------
>+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
>+[# find the maximum length of command line arguments
>+AC_MSG_CHECKING([the maximum length of command line arguments])
>+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
>+  i=0
>+  teststring="ABCD"
>+
>+  case $build_os in
>+  msdosdjgpp*)
>+    # On DJGPP, this test can blow up pretty badly due to problems in libc
>+    # (any single argument exceeding 2000 bytes causes a buffer overrun
>+    # during glob expansion).  Even if it were fixed, the result of this
>+    # check would be larger than it should be.
>+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
>+    ;;
>+
>+  gnu*)
>+    # Under GNU Hurd, this test is not required because there is
>+    # no limit to the length of command line arguments.
>+    # Libtool will interpret -1 as no limit whatsoever
>+    lt_cv_sys_max_cmd_len=-1;
>+    ;;
>+
>+  cygwin* | mingw*)
>+    # On Win9x/ME, this test blows up -- it succeeds, but takes
>+    # about 5 minutes as the teststring grows exponentially.
>+    # Worse, since 9x/ME are not pre-emptively multitasking,
>+    # you end up with a "frozen" computer, even though with patience
>+    # the test eventually succeeds (with a max line length of 256k).
>+    # Instead, let's just punt: use the minimum linelength reported by
>+    # all of the supported platforms: 8192 (on NT/2K/XP).
>+    lt_cv_sys_max_cmd_len=8192;
>+    ;;
>+
>+  amigaos*)
>+    # On AmigaOS with pdksh, this test takes hours, literally.
>+    # So we just punt and use a minimum line length of 8192.
>+    lt_cv_sys_max_cmd_len=8192;
>+    ;;
>+
>+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
>+    # This has been around since 386BSD, at least.  Likely further.
>+    if test -x /sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
>+    elif test -x /usr/sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
>+    else
>+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
>+    fi
>+    # And add a safety zone
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
>+    ;;
>+
>+  interix*)
>+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
>+    lt_cv_sys_max_cmd_len=196608
>+    ;;
>+
>+  osf*)
>+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
>+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
>+    # nice to cause kernel panics so lets avoid the loop below.
>+    # First set a reasonable default.
>+    lt_cv_sys_max_cmd_len=16384
>+    #
>+    if test -x /sbin/sysconfig; then
>+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
>+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
>+      esac
>+    fi
>+    ;;
>+  sco3.2v5*)
>+    lt_cv_sys_max_cmd_len=102400
>+    ;;
>+  sysv5* | sco5v6* | sysv4.2uw2*)
>+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
>+    if test -n "$kargmax"; then
>+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
>+    else
>+      lt_cv_sys_max_cmd_len=32768
>+    fi
>+    ;;
>+  *)
>+    # If test is not a shell built-in, we'll probably end up computing a
>+    # maximum length that is only half of the actual maximum length, but
>+    # we can't tell.
>+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
>+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
>+	       = "XX$teststring") >/dev/null 2>&1 &&
>+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
>+	    lt_cv_sys_max_cmd_len=$new_result &&
>+	    test $i != 17 # 1/2 MB should be enough
>+    do
>+      i=`expr $i + 1`
>+      teststring=$teststring$teststring
>+    done
>+    teststring=
>+    # Add a significant safety factor because C++ compilers can tack on massive
>+    # amounts of additional arguments before passing them to the linker.
>+    # It appears as though 1/2 is a usable value.
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
>+    ;;
>+  esac
>+])
>+if test -n $lt_cv_sys_max_cmd_len ; then
>+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
>+else
>+  AC_MSG_RESULT(none)
>+fi
>+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
>+
>+
>+# _LT_AC_CHECK_DLFCN
>+# ------------------
>+AC_DEFUN([_LT_AC_CHECK_DLFCN],
>+[AC_CHECK_HEADERS(dlfcn.h)dnl
>+])# _LT_AC_CHECK_DLFCN
>+
> 
> # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
> #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
>-# ------------------------------------------------------------------
>+# ---------------------------------------------------------------------
> AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
>-[if test "$cross_compiling" = yes; then :
>+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
>+if test "$cross_compiling" = yes; then :
>   [$4]
> else
>-  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<EOF
>@@ -591,17 +891,19 @@
>       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>       /* dlclose (self); */
>     }
>+  else
>+    puts (dlerror ());
> 
>     exit (status);
> }]
> EOF
>   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
>     lt_status=$?
>     case x$lt_status in
>       x$lt_dlno_uscore) $1 ;;
>       x$lt_dlneed_uscore) $2 ;;
>-      x$lt_unknown|x*) $3 ;;
>+      x$lt_dlunknown|x*) $3 ;;
>     esac
>   else :
>     # compilation failed
>@@ -611,10 +913,12 @@
> rm -fr conftest*
> ])# _LT_AC_TRY_DLOPEN_SELF
> 
>+
> # AC_LIBTOOL_DLOPEN_SELF
>-# -------------------
>+# ----------------------
> AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
>-[if test "x$enable_dlopen" != xyes; then
>+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
>+if test "x$enable_dlopen" != xyes; then
>   enable_dlopen=unknown
>   enable_dlopen_self=unknown
>   enable_dlopen_self_static=unknown
>@@ -629,24 +933,39 @@
>     lt_cv_dlopen_self=yes
>     ;;
> 
>-  cygwin* | mingw* | pw32*)
>+  mingw* | pw32*)
>     lt_cv_dlopen="LoadLibrary"
>     lt_cv_dlopen_libs=
>    ;;
> 
>+  cygwin*)
>+    lt_cv_dlopen="dlopen"
>+    lt_cv_dlopen_libs=
>+   ;;
>+
>+  darwin*)
>+  # if libdl is installed we need to link against it
>+    AC_CHECK_LIB([dl], [dlopen],
>+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
>+    lt_cv_dlopen="dyld"
>+    lt_cv_dlopen_libs=
>+    lt_cv_dlopen_self=yes
>+    ])
>+   ;;
>+
>   *)
>     AC_CHECK_FUNC([shl_load],
>-          [lt_cv_dlopen="shl_load"],
>+	  [lt_cv_dlopen="shl_load"],
>       [AC_CHECK_LIB([dld], [shl_load],
>-            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
>+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
> 	[AC_CHECK_FUNC([dlopen],
> 	      [lt_cv_dlopen="dlopen"],
> 	  [AC_CHECK_LIB([dl], [dlopen],
>-	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
>+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
> 	    [AC_CHECK_LIB([svld], [dlopen],
>-	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
>+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
> 	      [AC_CHECK_LIB([dld], [dld_link],
>-	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
>+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
> 	      ])
> 	    ])
> 	  ])
>@@ -664,11 +983,10 @@
>   case $lt_cv_dlopen in
>   dlopen)
>     save_CPPFLAGS="$CPPFLAGS"
>-    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
>     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
> 
>     save_LDFLAGS="$LDFLAGS"
>-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
> 
>     save_LIBS="$LIBS"
>     LIBS="$lt_cv_dlopen_libs $LIBS"
>@@ -681,7 +999,7 @@
>     ])
> 
>     if test "x$lt_cv_dlopen_self" = xyes; then
>-      LDFLAGS="$LDFLAGS $link_static_flag"
>+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
>       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
>     	  lt_cv_dlopen_self_static, [dnl
> 	  _LT_AC_TRY_DLOPEN_SELF(
>@@ -708,1567 +1026,1690 @@
> fi
> ])# AC_LIBTOOL_DLOPEN_SELF
> 
>-AC_DEFUN([_LT_AC_LTCONFIG_HACK],
>-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
>-# Sed substitution that helps us do robust quoting.  It backslashifies
>-# metacharacters that are still active within double-quoted strings.
>-Xsed='sed -e s/^X//'
>-sed_quote_subst='s/$[[\\"\\`$\\\\]]$/\\\1/g'
>-
>-# Same as above, but do not quote variable references.
>-double_quote_subst='s/$[[\\"\\`\\\\]]$/\\\1/g'
>-
>-# Sed substitution to delay expansion of an escaped shell variable in a
>-# double_quote_subst'ed string.
>-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
> 
>-# Constants:
>-rm="rm -f"
>+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
>+# ---------------------------------
>+# Check to see if options -c and -o are simultaneously supported by compiler
>+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
>+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
>+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
>+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
>+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
>+   $rm -r conftest 2>/dev/null
>+   mkdir conftest
>+   cd conftest
>+   mkdir out
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+   lt_compiler_flag="-o out/conftest2.$ac_objext"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
>+   (eval "$lt_compile" 2>out/conftest.err)
>+   ac_status=$?
>+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
>+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
>+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
>+   then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
>+     fi
>+   fi
>+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
>+   $rm conftest*
>+   # SGI C++ compiler will create directory out/ii_files/ for
>+   # template instantiation
>+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>+   $rm out/* && rmdir out
>+   cd ..
>+   rmdir conftest
>+   $rm conftest*
>+])
>+])# AC_LIBTOOL_PROG_CC_C_O
> 
>-# Global variables:
>-default_ofile=libtool
>-can_build_shared=yes
> 
>-# All known linkers require a `.a' archive for static linking (except M$VC,
>-# which needs '.lib').
>-libext=a
>-ltmain="$ac_aux_dir/ltmain.sh"
>-ofile="$default_ofile"
>-with_gnu_ld="$lt_cv_prog_gnu_ld"
>-need_locks="$enable_libtool_lock"
>+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
>+# -----------------------------------------
>+# Check to see if we can do hard links to lock some files if needed
>+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
>+[AC_REQUIRE([_LT_AC_LOCK])dnl
> 
>-old_CC="$CC"
>-old_CFLAGS="$CFLAGS"
>+hard_links="nottested"
>+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
>+  # do not overwrite the value of need_locks provided by the user
>+  AC_MSG_CHECKING([if we can lock with hard links])
>+  hard_links=yes
>+  $rm conftest*
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  touch conftest.a
>+  ln conftest.a conftest.b 2>&5 || hard_links=no
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  AC_MSG_RESULT([$hard_links])
>+  if test "$hard_links" = no; then
>+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
>+    need_locks=warn
>+  fi
>+else
>+  need_locks=no
>+fi
>+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
> 
>-# Set sane defaults for various variables
>-test -z "$AR" && AR=ar
>-test -z "$AR_FLAGS" && AR_FLAGS=cru
>-test -z "$AS" && AS=as
>-test -z "$CC" && CC=cc
>-test -z "$DLLTOOL" && DLLTOOL=dlltool
>-test -z "$LD" && LD=ld
>-test -z "$LN_S" && LN_S="ln -s"
>-test -z "$MAGIC_CMD" && MAGIC_CMD=file
>-test -z "$NM" && NM=nm
>-test -z "$OBJDUMP" && OBJDUMP=objdump
>-test -z "$RANLIB" && RANLIB=:
>-test -z "$STRIP" && STRIP=:
>-test -z "$ac_objext" && ac_objext=o
> 
>-if test x"$host" != x"$build"; then
>-  ac_tool_prefix=${host_alias}-
>+# AC_LIBTOOL_OBJDIR
>+# -----------------
>+AC_DEFUN([AC_LIBTOOL_OBJDIR],
>+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
>+[rm -f .libs 2>/dev/null
>+mkdir .libs 2>/dev/null
>+if test -d .libs; then
>+  lt_cv_objdir=.libs
> else
>-  ac_tool_prefix=
>+  # MS-DOS does not allow filenames that begin with a dot.
>+  lt_cv_objdir=_libs
> fi
>+rmdir .libs 2>/dev/null])
>+objdir=$lt_cv_objdir
>+])# AC_LIBTOOL_OBJDIR
> 
>-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
>-case $host_os in
>-linux-gnu*) ;;
>-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
>-esac
> 
>-case $host_os in
>-aix3*)
>-  # AIX sometimes has problems with the GCC collect2 program.  For some
>-  # reason, if we set the COLLECT_NAMES environment variable, the problems
>-  # vanish in a puff of smoke.
>-  if test "X${COLLECT_NAMES+set}" != Xset; then
>-    COLLECT_NAMES=
>-    export COLLECT_NAMES
>+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
>+# ----------------------------------------------
>+# Check hardcoding attributes.
>+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
>+[AC_MSG_CHECKING([how to hardcode library paths into programs])
>+_LT_AC_TAGVAR(hardcode_action, $1)=
>+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
>+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
>+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
>+
>+  # We can hardcode non-existant directories.
>+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
>+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>+     # have to relink, otherwise we might link with an installed library
>+     # when we should be linking with a yet-to-be-installed one
>+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
>+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
>+    # Linking always hardcodes the temporary library directory.
>+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
>+  else
>+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
>   fi
>-  ;;
>-esac
>+else
>+  # We cannot hardcode anything, or else we can only hardcode existing
>+  # directories.
>+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
>+fi
>+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
> 
>-# Determine commands to create old-style static archives.
>-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
>-old_postinstall_cmds='chmod 644 $oldlib'
>-old_postuninstall_cmds=
>+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
>+  # Fast installation is not supported
>+  enable_fast_install=no
>+elif test "$shlibpath_overrides_runpath" = yes ||
>+     test "$enable_shared" = no; then
>+  # Fast installation is not necessary
>+  enable_fast_install=needless
>+fi
>+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
> 
>-if test -n "$RANLIB"; then
>+
>+# AC_LIBTOOL_SYS_LIB_STRIP
>+# ------------------------
>+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
>+[striplib=
>+old_striplib=
>+AC_MSG_CHECKING([whether stripping libraries is possible])
>+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>+  AC_MSG_RESULT([yes])
>+else
>+# FIXME - insert some real tests, host_os isn't really good enough
>   case $host_os in
>-  openbsd*)
>-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
>-    ;;
>-  *)
>-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
>+   darwin*)
>+       if test -n "$STRIP" ; then
>+         striplib="$STRIP -x"
>+         AC_MSG_RESULT([yes])
>+       else
>+  AC_MSG_RESULT([no])
>+fi
>+       ;;
>+   *)
>+  AC_MSG_RESULT([no])
>     ;;
>   esac
>-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
> fi
>+])# AC_LIBTOOL_SYS_LIB_STRIP
> 
>-# Allow CC to be a program name with arguments.
>-set dummy $CC
>-compiler="[$]2"
> 
>-AC_MSG_CHECKING([for objdir])
>-rm -f .libs 2>/dev/null
>-mkdir .libs 2>/dev/null
>-if test -d .libs; then
>-  objdir=.libs
>+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
>+# -----------------------------
>+# PORTME Fill in your ld.so characteristics
>+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
>+[AC_MSG_CHECKING([dynamic linker characteristics])
>+library_names_spec=
>+libname_spec='lib$name'
>+soname_spec=
>+shrext_cmds=".so"
>+postinstall_cmds=
>+postuninstall_cmds=
>+finish_cmds=
>+finish_eval=
>+shlibpath_var=
>+shlibpath_overrides_runpath=unknown
>+version_type=none
>+dynamic_linker="$host_os ld.so"
>+sys_lib_dlsearch_path_spec="/lib /usr/lib"
>+if test "$GCC" = yes; then
>+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
>+    # if the path contains ";" then we assume it to be the separator
>+    # otherwise default to the standard path separator (i.e. ":") - it is
>+    # assumed that no part of a normal pathname contains ";" but that should
>+    # okay in the real world where ";" in dirpaths is itself problematic.
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+  else
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+  fi
> else
>-  # MS-DOS does not allow filenames that begin with a dot.
>-  objdir=_libs
>+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
> fi
>-rmdir .libs 2>/dev/null
>-AC_MSG_RESULT($objdir)
>-
>+need_lib_prefix=unknown
>+hardcode_into_libs=no
> 
>-AC_ARG_WITH(pic,
>-[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
>-pic_mode="$withval", pic_mode=default)
>-test -z "$pic_mode" && pic_mode=default
>+# when you set need_version to no, make sure it does not cause -set_version
>+# flags to be left without arguments
>+need_version=unknown
> 
>-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
>-# in isolation, and that seeing it set (from the cache) indicates that
>-# the associated values are set (in the cache) correctly too.
>-AC_MSG_CHECKING([for $compiler option to produce PIC])
>-AC_CACHE_VAL(lt_cv_prog_cc_pic,
>-[ lt_cv_prog_cc_pic=
>-  lt_cv_prog_cc_shlib=
>-  lt_cv_prog_cc_wl=
>-  lt_cv_prog_cc_static=
>-  lt_cv_prog_cc_no_builtin=
>-  lt_cv_prog_cc_can_build_shared=$can_build_shared
>+case $host_os in
>+aix3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
>+  shlibpath_var=LIBPATH
> 
>-  if test "$GCC" = yes; then
>-    lt_cv_prog_cc_wl='-Wl,'
>-    lt_cv_prog_cc_static='-static'
>+  # AIX 3 has no versioning support, so we append a major version to the name.
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  ;;
> 
>-    case $host_os in
>-    aix*)
>-      # Below there is a dirty hack to force normal static linking with -ldl
>-      # The problem is because libdl dynamically linked with both libc and
>-      # libC (AIX C++ library), which obviously doesn't included in libraries
>-      # list by gcc. This cause undefined symbols with -static flags.
>-      # This hack allows C programs to be linked with "-static -ldl", but
>-      # not sure about C++ programs.
>-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
>-      ;;
>-    amigaos*)
>-      # FIXME: we need at least 68020 code to build shared libraries, but
>-      # adding the `-m68020' flag to GCC prevents building anything better,
>-      # like `-m68040'.
>-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
>-      ;;
>-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
>-      # PIC is the default for these OSes.
>-      ;;
>-    darwin* | rhapsody*)
>-      # PIC is the default on this platform
>-      # Common symbols not allowed in MH_DYLIB files
>-      lt_cv_prog_cc_pic='-fno-common'
>-      ;;
>-    cygwin* | mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
>-      ;;
>-    sysv4*MP*)
>-      if test -d /usr/nec; then
>-	 lt_cv_prog_cc_pic=-Kconform_pic
>-      fi
>-      ;;
>-    *)
>-      lt_cv_prog_cc_pic='-fPIC'
>-      ;;
>-    esac
>+aix4* | aix5*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  hardcode_into_libs=yes
>+  if test "$host_cpu" = ia64; then
>+    # AIX 5 supports IA64
>+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
>+    shlibpath_var=LD_LIBRARY_PATH
>   else
>-    # PORTME Check for PIC flags for the system compiler.
>+    # With GCC up to 2.95.x, collect2 would create an import file
>+    # for dependence libraries.  The import file would start with
>+    # the line `#! .'.  This would cause the generated library to
>+    # depend on `.', always an invalid library.  This was fixed in
>+    # development snapshots of GCC prior to 3.0.
>     case $host_os in
>-    aix3* | aix4* | aix5*)
>-      lt_cv_prog_cc_wl='-Wl,'
>-      # All AIX code is PIC.
>-      if test "$host_cpu" = ia64; then
>-	# AIX 5 now supports IA64 processor
>-	lt_cv_prog_cc_static='-Bstatic'
>+      aix4 | aix4.[[01]] | aix4.[[01]].*)
>+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>+	   echo ' yes '
>+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>+	:
>       else
>-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
>+	can_build_shared=no
>       fi
>       ;;
>+    esac
>+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
>+    # soname into executable. Probably we can add versioning support to
>+    # collect2, so additional links can be useful in future.
>+    if test "$aix_use_runtimelinking" = yes; then
>+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>+      # instead of lib<name>.a to let people know that these are not
>+      # typical AIX shared libraries.
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    else
>+      # We preserve .a as extension for shared libraries through AIX4.2
>+      # and later when we are not doing run time linking.
>+      library_names_spec='${libname}${release}.a $libname.a'
>+      soname_spec='${libname}${release}${shared_ext}$major'
>+    fi
>+    shlibpath_var=LIBPATH
>+  fi
>+  ;;
> 
>-    hpux9* | hpux10* | hpux11*)
>-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
>-      lt_cv_prog_cc_pic='+Z'
>-      ;;
>-
>-    irix5* | irix6*)
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static='-non_shared'
>-      # PIC (with -KPIC) is the default.
>-      ;;
>-
>-    cygwin* | mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
>-      ;;
>+amigaos*)
>+  library_names_spec='$libname.ixlibrary $libname.a'
>+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
>+  ;;
> 
>-    newsos6)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      ;;
>+beos*)
>+  library_names_spec='${libname}${shared_ext}'
>+  dynamic_linker="$host_os ld.so"
>+  shlibpath_var=LIBRARY_PATH
>+  ;;
> 
>-    osf3* | osf4* | osf5*)
>-      # All OSF/1 code is PIC.
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static='-non_shared'
>-      ;;
>+bsdi[[45]]*)
>+  version_type=linux
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>+  # the default ld.so.conf also contains /usr/contrib/lib and
>+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>+  # libtool to hard-code these into programs
>+  ;;
> 
>-    sco3.2v5*)
>-      lt_cv_prog_cc_pic='-Kpic'
>-      lt_cv_prog_cc_static='-dn'
>-      lt_cv_prog_cc_shlib='-belf'
>-      ;;
>+cygwin* | mingw* | pw32*)
>+  version_type=windows
>+  shrext_cmds=".dll"
>+  need_version=no
>+  need_lib_prefix=no
> 
>-    solaris*)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      lt_cv_prog_cc_wl='-Wl,'
>-      ;;
>+  case $GCC,$host_os in
>+  yes,cygwin* | yes,mingw* | yes,pw32*)
>+    library_names_spec='$libname.dll.a'
>+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
>+    postinstall_cmds='base_file=`basename \${file}`~
>+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
>+      dldir=$destdir/`dirname \$dlpath`~
>+      test -d \$dldir || mkdir -p \$dldir~
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>+      dlpath=$dir/\$dldll~
>+       $rm \$dlpath'
>+    shlibpath_overrides_runpath=yes
> 
>-    sunos4*)
>-      lt_cv_prog_cc_pic='-PIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      lt_cv_prog_cc_wl='-Qoption ld '
>+    case $host_os in
>+    cygwin*)
>+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
>+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
>       ;;
>-
>-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      if test "x$host_vendor" = xsni; then
>-	lt_cv_prog_cc_wl='-LD'
>+    mingw*)
>+      # MinGW DLLs use traditional 'lib' prefix
>+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
>+        # It is most probably a Windows format PATH printed by
>+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
>+        # path with ; separators, and with drive letters. We can handle the
>+        # drive letters (cygwin fileutils understands them), so leave them,
>+        # especially as we might pass files found there to a mingw objdump,
>+        # which wouldn't understand a cygwinified path. Ahh.
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>       else
>-	lt_cv_prog_cc_wl='-Wl,'
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>       fi
>       ;;
>-
>-    uts4*)
>-      lt_cv_prog_cc_pic='-pic'
>-      lt_cv_prog_cc_static='-Bstatic'
>+    pw32*)
>+      # pw32 DLLs use 'pw' prefix rather than 'lib'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
>       ;;
>+    esac
>+    ;;
> 
>-    sysv4*MP*)
>-      if test -d /usr/nec ;then
>-	lt_cv_prog_cc_pic='-Kconform_pic'
>-	lt_cv_prog_cc_static='-Bstatic'
>-      fi
>-      ;;
>-
>-    *)
>-      lt_cv_prog_cc_can_build_shared=no
>-      ;;
>-    esac
>-  fi
>-])
>-if test -z "$lt_cv_prog_cc_pic"; then
>-  AC_MSG_RESULT([none])
>-else
>-  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
>-
>-  # Check to make sure the pic_flag actually works.
>-  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
>-  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
>-    save_CFLAGS="$CFLAGS"
>-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
>-    AC_TRY_COMPILE([], [], [dnl
>-      case $host_os in
>-      hpux9* | hpux10* | hpux11*)
>-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
>-	# they create non-PIC objects.  So, if there were any warnings, we
>-	# assume that PIC is not supported.
>-	if test -s conftest.err; then
>-	  lt_cv_prog_cc_pic_works=no
>-	else
>-	  lt_cv_prog_cc_pic_works=yes
>-	fi
>-	;;
>-      *)
>-	lt_cv_prog_cc_pic_works=yes
>-	;;
>-      esac
>-    ], [dnl
>-      lt_cv_prog_cc_pic_works=no
>-    ])
>-    CFLAGS="$save_CFLAGS"
>-  ])
>-
>-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
>-    lt_cv_prog_cc_pic=
>-    lt_cv_prog_cc_can_build_shared=no
>-  else
>-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
>-  fi
>-
>-  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
>-fi
>-
>-# Check for any special shared library compilation flags.
>-if test -n "$lt_cv_prog_cc_shlib"; then
>-  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
>-  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
>-  else
>-   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
>-    lt_cv_prog_cc_can_build_shared=no
>-  fi
>-fi
>-
>-AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
>-AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
>-  lt_cv_prog_cc_static_works=no
>-  save_LDFLAGS="$LDFLAGS"
>-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
>-  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
>-  LDFLAGS="$save_LDFLAGS"
>-])
>+  *)
>+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
>+    ;;
>+  esac
>+  dynamic_linker='Win32 ld.exe'
>+  # FIXME: first we should search . and the directory the executable is in
>+  shlibpath_var=PATH
>+  ;;
> 
>-# Belt *and* braces to stop my trousers falling down:
>-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
>-AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
>-
>-pic_flag="$lt_cv_prog_cc_pic"
>-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
>-wl="$lt_cv_prog_cc_wl"
>-link_static_flag="$lt_cv_prog_cc_static"
>-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
>-can_build_shared="$lt_cv_prog_cc_can_build_shared"
>-
>-
>-# Check to see if options -o and -c are simultaneously supported by compiler
>-AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
>-AC_CACHE_VAL([lt_cv_compiler_c_o], [
>-$rm -r conftest 2>/dev/null
>-mkdir conftest
>-cd conftest
>-echo "int some_variable = 0;" > conftest.$ac_ext
>-mkdir out
>-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
>-# that will create temporary files in the current directory regardless of
>-# the output directory.  Thus, making CWD read-only will cause this test
>-# to fail, enabling locking or at least warning the user not to do parallel
>-# builds.
>-chmod -w .
>-save_CFLAGS="$CFLAGS"
>-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
>-compiler_c_o=no
>-if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
>-  # The compiler can only warn and ignore the option if not recognized
>-  # So say no if there are warnings
>-  if test -s out/conftest.err; then
>-    lt_cv_compiler_c_o=no
>+darwin* | rhapsody*)
>+  dynamic_linker="$host_os dyld"
>+  version_type=darwin
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>+  soname_spec='${libname}${release}${major}$shared_ext'
>+  shlibpath_overrides_runpath=yes
>+  shlibpath_var=DYLD_LIBRARY_PATH
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>+  if test "$GCC" = yes; then
>+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>   else
>-    lt_cv_compiler_c_o=yes
>+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
>   fi
>-else
>-  # Append any errors to the config.log.
>-  cat out/conftest.err 1>&AC_FD_CC
>-  lt_cv_compiler_c_o=no
>-fi
>-CFLAGS="$save_CFLAGS"
>-chmod u+w .
>-$rm conftest* out/*
>-rmdir out
>-cd ..
>-rmdir conftest
>-$rm -r conftest 2>/dev/null
>-])
>-compiler_c_o=$lt_cv_compiler_c_o
>-AC_MSG_RESULT([$compiler_c_o])
>+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
>+  ;;
> 
>-if test x"$compiler_c_o" = x"yes"; then
>-  # Check to see if we can write to a .lo
>-  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
>-  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
>-  lt_cv_compiler_o_lo=no
>-  save_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -c -o conftest.lo"
>-  save_objext="$ac_objext"
>-  ac_objext=lo
>-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
>-    # The compiler can only warn and ignore the option if not recognized
>-    # So say no if there are warnings
>-    if test -s conftest.err; then
>-      lt_cv_compiler_o_lo=no
>-    else
>-      lt_cv_compiler_o_lo=yes
>-    fi
>-  ])
>-  ac_objext="$save_objext"
>-  CFLAGS="$save_CFLAGS"
>-  ])
>-  compiler_o_lo=$lt_cv_compiler_o_lo
>-  AC_MSG_RESULT([$compiler_o_lo])
>-else
>-  compiler_o_lo=no
>-fi
>+dgux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
> 
>-# Check to see if we can do hard links to lock some files if needed
>-hard_links="nottested"
>-if test "$compiler_c_o" = no && test "$need_locks" != no; then
>-  # do not overwrite the value of need_locks provided by the user
>-  AC_MSG_CHECKING([if we can lock with hard links])
>-  hard_links=yes
>-  $rm conftest*
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  touch conftest.a
>-  ln conftest.a conftest.b 2>&5 || hard_links=no
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  AC_MSG_RESULT([$hard_links])
>-  if test "$hard_links" = no; then
>-    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
>-    need_locks=warn
>-  fi
>-else
>-  need_locks=no
>-fi
>+freebsd1*)
>+  dynamic_linker=no
>+  ;;
> 
>-if test "$GCC" = yes; then
>-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
>-  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
>-  echo "int some_variable = 0;" > conftest.$ac_ext
>-  save_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
>-  compiler_rtti_exceptions=no
>-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
>-    # The compiler can only warn and ignore the option if not recognized
>-    # So say no if there are warnings
>-    if test -s conftest.err; then
>-      compiler_rtti_exceptions=no
>-    else
>-      compiler_rtti_exceptions=yes
>-    fi
>-  ])
>-  CFLAGS="$save_CFLAGS"
>-  AC_MSG_RESULT([$compiler_rtti_exceptions])
>+kfreebsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
> 
>-  if test "$compiler_rtti_exceptions" = "yes"; then
>-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>   else
>-    no_builtin_flag=' -fno-builtin'
>-  fi
>-fi
>-
>-# See if the linker supports building shared libraries.
>-AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
>-
>-allow_undefined_flag=
>-no_undefined_flag=
>-need_lib_prefix=unknown
>-need_version=unknown
>-# when you set need_version to no, make sure it does not cause -set_version
>-# flags to be left without arguments
>-archive_cmds=
>-archive_expsym_cmds=
>-old_archive_from_new_cmds=
>-old_archive_from_expsyms_cmds=
>-export_dynamic_flag_spec=
>-whole_archive_flag_spec=
>-thread_safe_flag_spec=
>-hardcode_into_libs=no
>-hardcode_libdir_flag_spec=
>-hardcode_libdir_separator=
>-hardcode_direct=no
>-hardcode_minus_L=no
>-hardcode_shlibpath_var=unsupported
>-runpath_var=
>-link_all_deplibs=unknown
>-always_export_symbols=no
>-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
>-# include_expsyms should be a list of space-separated symbols to be *always*
>-# included in the symbol list
>-include_expsyms=
>-# exclude_expsyms can be an egrep regular expression of symbols to exclude
>-# it will be wrapped by ` (' and `)$', so one must not match beginning or
>-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>-# as well as any symbol that contains `d'.
>-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
>-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>-# platforms (ab)use it in PIC code, but their linkers get confused if
>-# the symbol is explicitly referenced.  Since portable code cannot
>-# rely on this symbol name, it's probably fine to never include it in
>-# preloaded symbol tables.
>-extract_expsyms_cmds=
>-
>-case $host_os in
>-cygwin* | mingw* | pw32*)
>-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
>-  # When not using gcc, we currently assume that we are using
>-  # Microsoft Visual C++.
>-  if test "$GCC" != yes; then
>-    with_gnu_ld=no
>+    case $host_os in
>+    freebsd[[123]]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>   fi
>-  ;;
>-openbsd*)
>-  with_gnu_ld=no
>-  ;;
>-esac
>-
>-ld_shlibs=yes
>-if test "$with_gnu_ld" = yes; then
>-  # If archive_cmds runs LD, not CC, wlarc should be empty
>-  wlarc='${wl}'
>-
>-  # See if GNU ld supports shared libraries.
>+  version_type=freebsd-$objformat
>+  case $version_type in
>+    freebsd-elf*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+      need_version=no
>+      need_lib_prefix=no
>+      ;;
>+    freebsd-*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
>+      need_version=yes
>+      ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY_PATH
>   case $host_os in
>-  aix3* | aix4* | aix5*)
>-    # On AIX, the GNU linker is very broken
>-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
>-    ld_shlibs=no
>-    cat <<EOF 1>&2
>-
>-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>-*** to be unable to reliably create shared libraries on AIX.
>-*** Therefore, libtool is disabling shared libraries support.  If you
>-*** really care for shared libraries, you may want to modify your PATH
>-*** so that a non-GNU linker is found, and then restart.
>-
>-EOF
>+  freebsd2*)
>+    shlibpath_overrides_runpath=yes
>     ;;
>-
>-  amigaos*)
>-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-
>-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>-    # that the semantics of dynamic libraries on AmigaOS, at least up
>-    # to version 4, is to share data among multiple programs linked
>-    # with the same dynamic library.  Since this doesn't match the
>-    # behavior of shared libraries on other platforms, we can use
>-    # them.
>-    ld_shlibs=no
>+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>     ;;
>-
>-  beos*)
>-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      allow_undefined_flag=unsupported
>-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>-      # support --undefined.  This deserves some investigation.  FIXME
>-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-    else
>-      ld_shlibs=no
>-    fi
>+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
>+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
>+    shlibpath_overrides_runpath=no
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>     ;;
>+  esac
>+  ;;
> 
>-  cygwin* | mingw* | pw32*)
>-    # hardcode_libdir_flag_spec is actually meaningless, as there is
>-    # no search path for DLLs.
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    allow_undefined_flag=unsupported
>-    always_export_symbols=yes
>-
>-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
>-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
>-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
>-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
>-      else $CC -o impgen impgen.c ; fi)~
>-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
>-
>-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
>-
>-    # cygwin and mingw dlls have different entry points and sets of symbols
>-    # to exclude.
>-    # FIXME: what about values for MSVC?
>-    dll_entry=__cygwin_dll_entry@12
>-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
>-    case $host_os in
>-    mingw*)
>-      # mingw values
>-      dll_entry=_DllMainCRTStartup@12
>-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
>-      ;;
>-    esac
>+gnu*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  ;;
> 
>-    # mingw and cygwin differ, and it's simplest to just exclude the union
>-    # of the two symbol sets.
>-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
>-
>-    # recent cygwin and mingw systems supply a stub DllMain which the user
>-    # can override, but on older systems we have to supply one (in ltdll.c)
>-    if test "x$lt_cv_need_dllmain" = "xyes"; then
>-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
>-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
>-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
>+hpux9* | hpux10* | hpux11*)
>+  # Give a soname corresponding to the major version so that dld.sl refuses to
>+  # link against other versions.
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  case $host_cpu in
>+  ia64*)
>+    shrext_cmds='.so'
>+    hardcode_into_libs=yes
>+    dynamic_linker="$host_os dld.so"
>+    shlibpath_var=LD_LIBRARY_PATH
>+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    if test "X$HPUX_IA64_MODE" = X32; then
>+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
>     else
>-      ltdll_obj=
>-      ltdll_cmds=
>+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
>     fi
>-
>-    # Extract the symbol export list from an `--export-all' def file,
>-    # then regenerate the def file from the symbol export list, so that
>-    # the compiled dll only exports the symbol export list.
>-    # Be careful not to strip the DATA tag left be newer dlltools.
>-    export_symbols_cmds="$ltdll_cmds"'
>-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
>-      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
>-
>-    # If the export-symbols file already is a .def file (1st line
>-    # is EXPORTS), use it as is.
>-    # If DATA tags from a recent dlltool are present, honour them!
>-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
>-	cp $export_symbols $output_objdir/$soname-def;
>-      else
>-	echo EXPORTS > $output_objdir/$soname-def;
>-	_lt_hint=1;
>-	cat $export_symbols | while read symbol; do
>-	 set dummy \$symbol;
>-	 case \[$]# in
>-	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
>-	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
>-	 esac;
>-	 _lt_hint=`expr 1 + \$_lt_hint`;
>-	done;
>-      fi~
>-      '"$ltdll_cmds"'
>-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
>-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
>-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
>-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
>-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
>+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>     ;;
>-
>-  netbsd*)
>-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>-      wlarc=
>-    else
>-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    fi
>+   hppa*64*)
>+     shrext_cmds='.sl'
>+     hardcode_into_libs=yes
>+     dynamic_linker="$host_os dld.sl"
>+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
>+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+     soname_spec='${libname}${release}${shared_ext}$major'
>+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
>+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+     ;;
>+   *)
>+    shrext_cmds='.sl'
>+    dynamic_linker="$host_os dld.sl"
>+    shlibpath_var=SHLIB_PATH
>+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>     ;;
>+  esac
>+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>+  postinstall_cmds='chmod 555 $lib'
>+  ;;
> 
>-  solaris* | sysv5*)
>-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
>-      ld_shlibs=no
>-      cat <<EOF 1>&2
>-
>-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>-*** create shared libraries on Solaris systems.  Therefore, libtool
>-*** is disabling shared libraries support.  We urge you to upgrade GNU
>-*** binutils to release 2.9.1 or newer.  Another option is to modify
>-*** your PATH or compiler configuration so that the native linker is
>-*** used, and then restart.
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
> 
>-EOF
>-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    else
>-      ld_shlibs=no
>-    fi
>+irix5* | irix6* | nonstopux*)
>+  case $host_os in
>+    nonstopux*) version_type=nonstopux ;;
>+    *)
>+	if test "$lt_cv_prog_gnu_ld" = yes; then
>+		version_type=linux
>+	else
>+		version_type=irix
>+	fi ;;
>+  esac
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  case $host_os in
>+  irix5* | nonstopux*)
>+    libsuff= shlibsuff=
>     ;;
>-
>-  sunos4*)
>-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-    wlarc=
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>+  *)
>+    case $LD in # libtool.m4 will add one of these switches to LD
>+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
>+      libsuff= shlibsuff= libmagic=32-bit;;
>+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
>+      libsuff=32 shlibsuff=N32 libmagic=N32;;
>+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
>+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
>+    *) libsuff= shlibsuff= libmagic=never-match;;
>+    esac
>     ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>+  shlibpath_overrides_runpath=no
>+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>+  hardcode_into_libs=yes
>+  ;;
> 
>-  *)
>-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    else
>-      ld_shlibs=no
>+# No shared lib support for Linux oldld, aout, or coff.
>+linux*oldld* | linux*aout* | linux*coff*)
>+  dynamic_linker=no
>+  ;;
>+
>+# This must be Linux ELF.
>+linux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  # This implies no fast_install, which is unacceptable.
>+  # Some rework will be needed to allow for fast_install
>+  # before this can be enabled.
>+  hardcode_into_libs=yes
>+
>+  # find out which ABI we are using
>+  libsuff=
>+  case "$host_cpu" in
>+  x86_64*|s390x*|powerpc64*)
>+    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
>+    if AC_TRY_EVAL(ac_compile); then
>+      case `/usr/bin/file conftest.$ac_objext` in
>+      *64-bit*)
>+        libsuff=64
>+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>+        ;;
>+      esac
>     fi
>+    rm -rf conftest*
>     ;;
>   esac
> 
>-  if test "$ld_shlibs" = yes; then
>-    runpath_var=LD_RUN_PATH
>-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
>-    export_dynamic_flag_spec='${wl}--export-dynamic'
>-    case $host_os in
>-    cygwin* | mingw* | pw32*)
>-      # dlltool doesn't understand --whole-archive et. al.
>-      whole_archive_flag_spec=
>-      ;;
>-    *)
>-      # ancient GNU ld didn't support --whole-archive et. al.
>-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
>-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>-      else
>-	whole_archive_flag_spec=
>-      fi
>-      ;;
>-    esac
>+  # Append ld.so.conf contents to the search path
>+  if test -f /etc/ld.so.conf; then
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[	 ]*//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>   fi
>-else
>-  # PORTME fill in a description of your system's linker (not GNU ld)
>-  case $host_os in
>-  aix3*)
>-    allow_undefined_flag=unsupported
>-    always_export_symbols=yes
>-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>-    # Note: this linker hardcodes the directories in LIBPATH if there
>-    # are no directories specified by -L.
>-    hardcode_minus_L=yes
>-    if test "$GCC" = yes && test -z "$link_static_flag"; then
>-      # Neither direct hardcoding nor static linking is supported with a
>-      # broken collect2.
>-      hardcode_direct=unsupported
>-    fi
>-    ;;
> 
>-  aix4* | aix5*)
>-    if test "$host_cpu" = ia64; then
>-      # On IA64, the linker does run time linking by default, so we don't
>-      # have to do anything special.
>-      aix_use_runtimelinking=no
>-      exp_sym_flag='-Bexport'
>-      no_entry_flag=""
>-    else
>-      aix_use_runtimelinking=no
>+  # We used to test for /lib/ld.so.1 and disable shared libraries on
>+  # powerpc, because MkLinux only supported shared libraries with the
>+  # GNU dynamic linker.  Since this was broken with cross compilers,
>+  # most powerpc-linux boxes support dynamic linking these days and
>+  # people can always --disable-shared, the test was removed, and we
>+  # assume the GNU/Linux dynamic linker is in use.
>+  dynamic_linker='GNU/Linux ld.so'
>+  ;;
> 
>-      # Test if we are trying to use run time linking or normal
>-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
>-      # need to do runtime linking.
>-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
>-	for ld_flag in $LDFLAGS; do
>-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>-	    aix_use_runtimelinking=yes
>-	    break
>-	  fi
>-	done
>-      esac
>+knetbsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
> 
>-      exp_sym_flag='-bexport'
>-      no_entry_flag='-bnoentry'
>-    fi
>+netbsd*)
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+    dynamic_linker='NetBSD (a.out) ld.so'
>+  else
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    dynamic_linker='NetBSD ld.elf_so'
>+  fi
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  ;;
> 
>-    # When large executables or shared objects are built, AIX ld can
>-    # have problems creating the table of contents.  If linking a library
>-    # or program results in "error TOC overflow" add -mminimal-toc to
>-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>+newsos6)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
> 
>-    hardcode_direct=yes
>-    archive_cmds=''
>-    hardcode_libdir_separator=':'
>-    if test "$GCC" = yes; then
>-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
>-	collect2name=`${CC} -print-prog-name=collect2`
>-	if test -f "$collect2name" && \
>-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
>-	then
>-	  # We have reworked collect2
>-	  hardcode_direct=yes
>-	else
>-	  # We have old collect2
>-	  hardcode_direct=unsupported
>-	  # It fails to find uninstalled libraries when the uninstalled
>-	  # path is not listed in the libpath.  Setting hardcode_minus_L
>-	  # to unsupported forces relinking
>-	  hardcode_minus_L=yes
>-	  hardcode_libdir_flag_spec='-L$libdir'
>-	  hardcode_libdir_separator=
>-	fi
>+nto-qnx*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+openbsd*)
>+  version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>+  need_lib_prefix=no
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+    case $host_os in
>+      openbsd2.[[89]] | openbsd2.[[89]].*)
>+	shlibpath_overrides_runpath=no
>+	;;
>+      *)
>+	shlibpath_overrides_runpath=yes
>+	;;
>       esac
>+  else
>+    shlibpath_overrides_runpath=yes
>+  fi
>+  ;;
> 
>-      shared_flag='-shared'
>-    else
>-      # not using gcc
>-      if test "$host_cpu" = ia64; then
>-	shared_flag='${wl}-G'
>-      else
>-	if test "$aix_use_runtimelinking" = yes; then
>-	  shared_flag='${wl}-G'
>-	else
>-	  shared_flag='${wl}-bM:SRE'
>-	fi
>-      fi
>-    fi
>+os2*)
>+  libname_spec='$name'
>+  shrext_cmds=".dll"
>+  need_lib_prefix=no
>+  library_names_spec='$libname${shared_ext} $libname.a'
>+  dynamic_linker='OS/2 ld.exe'
>+  shlibpath_var=LIBPATH
>+  ;;
> 
>-    # It seems that -bexpall can do strange things, so it is better to
>-    # generate a list of symbols to export.
>-    always_export_symbols=yes
>-    if test "$aix_use_runtimelinking" = yes; then
>-      # Warning - without using the other runtime loading flags (-brtl),
>-      # -berok will link without error, but may produce a broken library.
>-      allow_undefined_flag='-berok'
>-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
>-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>-    else
>-      if test "$host_cpu" = ia64; then
>-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
>-	allow_undefined_flag="-z nodefs"
>-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>-      else
>-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
>-	# Warning - without using the other run time loading flags,
>-	# -berok will link without error, but may produce a broken library.
>-	allow_undefined_flag='${wl}-berok'
>-	# This is a bit strange, but is similar to how AIX traditionally builds
>-	# it's shared libraries.
>-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
>-      fi
>-    fi
>-    ;;
>+osf3* | osf4* | osf5*)
>+  version_type=osf
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>+  ;;
> 
>-  amigaos*)
>-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-    # see comment about different semantics on the GNU ld section
>-    ld_shlibs=no
>-    ;;
>+solaris*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  # ldd complains unless libraries are executable
>+  postinstall_cmds='chmod +x $lib'
>+  ;;
> 
>-  cygwin* | mingw* | pw32*)
>-    # When not using gcc, we currently assume that we are using
>-    # Microsoft Visual C++.
>-    # hardcode_libdir_flag_spec is actually meaningless, as there is
>-    # no search path for DLLs.
>-    hardcode_libdir_flag_spec=' '
>-    allow_undefined_flag=unsupported
>-    # Tell ltmain to make .lib files, not .a files.
>-    libext=lib
>-    # FIXME: Setting linknames here is a bad hack.
>-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
>-    # The linker will automatically build a .lib file if we build a DLL.
>-    old_archive_from_new_cmds='true'
>-    # FIXME: Should let the user specify the lib program.
>-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
>-    fix_srcfile_path='`cygpath -w "$srcfile"`'
>-    ;;
>-
>-  darwin* | rhapsody*)
>-    case "$host_os" in
>-    rhapsody* | darwin1.[[012]])
>-      allow_undefined_flag='-undefined suppress'
>+sunos4*)
>+  version_type=sunos
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  if test "$with_gnu_ld" = yes; then
>+    need_lib_prefix=no
>+  fi
>+  need_version=yes
>+  ;;
>+
>+sysv4 | sysv4.3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_vendor in
>+    sni)
>+      shlibpath_overrides_runpath=no
>+      need_lib_prefix=no
>+      export_dynamic_flag_spec='${wl}-Blargedynsym'
>+      runpath_var=LD_RUN_PATH
>       ;;
>-    *) # Darwin 1.3 on
>-      allow_undefined_flag='-flat_namespace -undefined suppress'
>+    siemens)
>+      need_lib_prefix=no
>       ;;
>-    esac
>-    # FIXME: Relying on posixy $() will cause problems for
>-    #        cross-compilation, but unfortunately the echo tests do not
>-    #        yet detect zsh echo's removal of \ escapes.
>-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
>-    # We need to add '_' to the symbols in $export_symbols first
>-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    whole_archive_flag_spec='-all_load $convenience'
>-    ;;
>-
>-  freebsd1*)
>-    ld_shlibs=no
>-    ;;
>-
>-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>-  # support.  Future versions do this automatically, but an explicit c++rt0.o
>-  # does not break anything, and helps significantly (at the cost of a little
>-  # extra space).
>-  freebsd2.2*)
>-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
>-  freebsd2*)
>-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+    motorola)
>+      need_lib_prefix=no
>+      need_version=no
>+      shlibpath_overrides_runpath=no
>+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>+      ;;
>+  esac
>+  ;;
> 
>-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>-  freebsd*)
>-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+sysv4*MP*)
>+  if test -d /usr/nec ;then
>+    version_type=linux
>+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
>+    soname_spec='$libname${shared_ext}.$major'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  fi
>+  ;;
> 
>-  hpux9* | hpux10* | hpux11*)
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>     case $host_os in
>-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
>-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+	;;
>     esac
>-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes # Not in the search PATH, but as the default
>-			 # location of the library.
>-    export_dynamic_flag_spec='${wl}-E'
>-    ;;
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
> 
>-  irix5* | irix6*)
>-    if test "$GCC" = yes; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-    else
>-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-    fi
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    link_all_deplibs=yes
>-    ;;
>+uts4*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
> 
>-  netbsd*)
>-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
>-    else
>-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
>-    fi
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+*)
>+  dynamic_linker=no
>+  ;;
>+esac
>+AC_MSG_RESULT([$dynamic_linker])
>+test "$dynamic_linker" = no && can_build_shared=no
> 
>-  newsos6)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    hardcode_shlibpath_var=no
>-    ;;
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
> 
>-  openbsd*)
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>-      export_dynamic_flag_spec='${wl}-E'
>-    else
>-      case "$host_os" in
>-      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
>-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-	hardcode_libdir_flag_spec='-R$libdir'
>-        ;;
>-      *)
>-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
>-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>-        ;;
>-      esac
>-    fi
>-    ;;
> 
>-  os2*)
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-    allow_undefined_flag=unsupported
>-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
>-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
>-    ;;
>+# _LT_AC_TAGCONFIG
>+# ----------------
>+AC_DEFUN([_LT_AC_TAGCONFIG],
>+[AC_ARG_WITH([tags],
>+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
>+        [include additional configurations @<:@automatic@:>@])],
>+    [tagnames="$withval"])
>+
>+if test -f "$ltmain" && test -n "$tagnames"; then
>+  if test ! -f "${ofile}"; then
>+    AC_MSG_WARN([output file `$ofile' does not exist])
>+  fi
> 
>-  osf3*)
>-    if test "$GCC" = yes; then
>-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+  if test -z "$LTCC"; then
>+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
>+    if test -z "$LTCC"; then
>+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
>     else
>-      allow_undefined_flag=' -expect_unresolved \*'
>-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
>     fi
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    ;;
>+  fi
>+  if test -z "$LTCFLAGS"; then
>+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
>+  fi
> 
>-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
>-    if test "$GCC" = yes; then
>-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    else
>-      allow_undefined_flag=' -expect_unresolved \*'
>-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
>+  # Extract list of available tagged configurations in $ofile.
>+  # Note that this assumes the entire list is on one line.
>+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=$.*$$/\1/' -e 's/\"//g'`
>+
>+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+  for tagname in $tagnames; do
>+    IFS="$lt_save_ifs"
>+    # Check whether tagname contains only valid characters
>+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
>+    "") ;;
>+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
>+	;;
>+    esac
> 
>-      #Both c and cxx compiler support -rpath directly
>-      hardcode_libdir_flag_spec='-rpath $libdir'
>+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
>+    then
>+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
>     fi
>-    hardcode_libdir_separator=:
>-    ;;
> 
>-  sco3.2v5*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_shlibpath_var=no
>-    runpath_var=LD_RUN_PATH
>-    hardcode_runpath_var=yes
>-    export_dynamic_flag_spec='${wl}-Bexport'
>-    ;;
>+    # Update the list of available tags.
>+    if test -n "$tagname"; then
>+      echo appending configuration tag \"$tagname\" to $ofile
>+
>+      case $tagname in
>+      CXX)
>+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
>+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
>+	    (test "X$CXX" != "Xg++"))) ; then
>+	  AC_LIBTOOL_LANG_CXX_CONFIG
>+	else
>+	  tagname=""
>+	fi
>+	;;
> 
>-  solaris*)
>-    # gcc --version < 3.0 without binutils cannot create self contained
>-    # shared libraries reliably, requiring libgcc.a to resolve some of
>-    # the object symbols generated in some cases.  Libraries that use
>-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
>-    # a copy of libgcc.a into every shared library to guarantee resolving
>-    # such symbols causes other problems:  According to Tim Van Holder
>-    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
>-    # (to the application) exception stack for one thing.
>-    no_undefined_flag=' -z defs'
>-    if test "$GCC" = yes; then
>-      case `$CC --version 2>/dev/null` in
>-      [[12]].*)
>-	cat <<EOF 1>&2
>+      F77)
>+	if test -n "$F77" && test "X$F77" != "Xno"; then
>+	  AC_LIBTOOL_LANG_F77_CONFIG
>+	else
>+	  tagname=""
>+	fi
>+	;;
>+
>+      GCJ)
>+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
>+	  AC_LIBTOOL_LANG_GCJ_CONFIG
>+	else
>+	  tagname=""
>+	fi
>+	;;
> 
>-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
>-*** create self contained shared libraries on Solaris systems, without
>-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
>-*** -no-undefined support, which will at least allow you to build shared
>-*** libraries.  However, you may find that when you link such libraries
>-*** into an application without using GCC, you have to manually add
>-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
>-*** upgrade to a newer version of GCC.  Another option is to rebuild your
>-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
>+      RC)
>+	AC_LIBTOOL_LANG_RC_CONFIG
>+	;;
> 
>-EOF
>-        no_undefined_flag=
>+      *)
>+	AC_MSG_ERROR([Unsupported tag name: $tagname])
> 	;;
>       esac
>-    fi
>-    # $CC -shared without GNU ld will not create a library from C++
>-    # object files and a static libstdc++, better avoid it by now
>-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_shlibpath_var=no
>-    case $host_os in
>-    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
>-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
>-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
>-    esac
>-    link_all_deplibs=yes
>-    ;;
> 
>-  sunos4*)
>-    if test "x$host_vendor" = xsequent; then
>-      # Use $CC to link under sequent, because it throws in some extra .o
>-      # files that make .init and .fini sections work.
>-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
>-    else
>-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
>+      # Append the new tag name to the list of available tags.
>+      if test -n "$tagname" ; then
>+      available_tags="$available_tags $tagname"
>     fi
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>-
>-  sysv4)
>-    if test "x$host_vendor" = xsno; then
>-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct=yes # is this really true???
>-    else
>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
>     fi
>-    runpath_var='LD_RUN_PATH'
>-    hardcode_shlibpath_var=no
>-    ;;
>+  done
>+  IFS="$lt_save_ifs"
> 
>-  sysv4.3*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_shlibpath_var=no
>-    export_dynamic_flag_spec='-Bexport'
>-    ;;
>-
>-  sysv5*)
>-    no_undefined_flag=' -z text'
>-    # $CC -shared without GNU ld will not create a library from C++
>-    # object files and a static libstdc++, better avoid it by now
>-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-    hardcode_libdir_flag_spec=
>-    hardcode_shlibpath_var=no
>-    runpath_var='LD_RUN_PATH'
>-    ;;
>+  # Now substitute the updated list of available tags.
>+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
>+    mv "${ofile}T" "$ofile"
>+    chmod +x "$ofile"
>+  else
>+    rm -f "${ofile}T"
>+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
>+  fi
>+fi
>+])# _LT_AC_TAGCONFIG
> 
>-  uts4*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_shlibpath_var=no
>-    ;;
> 
>-  dgux*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_shlibpath_var=no
>-    ;;
>+# AC_LIBTOOL_DLOPEN
>+# -----------------
>+# enable checks for dlopen support
>+AC_DEFUN([AC_LIBTOOL_DLOPEN],
>+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
>+])# AC_LIBTOOL_DLOPEN
> 
>-  sysv4*MP*)
>-    if test -d /usr/nec; then
>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_shlibpath_var=no
>-      runpath_var=LD_RUN_PATH
>-      hardcode_runpath_var=yes
>-      ld_shlibs=yes
>-    fi
>-    ;;
> 
>-  sysv4.2uw2*)
>-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_minus_L=no
>-    hardcode_shlibpath_var=no
>-    hardcode_runpath_var=yes
>-    runpath_var=LD_RUN_PATH
>-    ;;
>+# AC_LIBTOOL_WIN32_DLL
>+# --------------------
>+# declare package support for building win32 DLLs
>+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
>+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
>+])# AC_LIBTOOL_WIN32_DLL
> 
>-  sysv5uw7* | unixware7*)
>-    no_undefined_flag='${wl}-z ${wl}text'
>-    if test "$GCC" = yes; then
>-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>-    else
>-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>-    fi
>-    runpath_var='LD_RUN_PATH'
>-    hardcode_shlibpath_var=no
>-    ;;
> 
>-  *)
>-    ld_shlibs=no
>-    ;;
>-  esac
>-fi
>-AC_MSG_RESULT([$ld_shlibs])
>-test "$ld_shlibs" = no && can_build_shared=no
>+# AC_ENABLE_SHARED([DEFAULT])
>+# ---------------------------
>+# implement the --enable-shared flag
>+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
>+AC_DEFUN([AC_ENABLE_SHARED],
>+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
>+AC_ARG_ENABLE([shared],
>+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
>+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
>+    [p=${PACKAGE-default}
>+    case $enableval in
>+    yes) enable_shared=yes ;;
>+    no) enable_shared=no ;;
>+    *)
>+      enable_shared=no
>+      # Look at the argument we got.  We use all the common list separators.
>+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+      for pkg in $enableval; do
>+	IFS="$lt_save_ifs"
>+	if test "X$pkg" = "X$p"; then
>+	  enable_shared=yes
>+	fi
>+      done
>+      IFS="$lt_save_ifs"
>+      ;;
>+    esac],
>+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
>+])# AC_ENABLE_SHARED
> 
>-# Check hardcoding attributes.
>-AC_MSG_CHECKING([how to hardcode library paths into programs])
>-hardcode_action=
>-if test -n "$hardcode_libdir_flag_spec" || \
>-   test -n "$runpath_var"; then
> 
>-  # We can hardcode non-existant directories.
>-  if test "$hardcode_direct" != no &&
>-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>-     # have to relink, otherwise we might link with an installed library
>-     # when we should be linking with a yet-to-be-installed one
>-     ## test "$hardcode_shlibpath_var" != no &&
>-     test "$hardcode_minus_L" != no; then
>-    # Linking always hardcodes the temporary library directory.
>-    hardcode_action=relink
>-  else
>-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>-    hardcode_action=immediate
>-  fi
>-else
>-  # We cannot hardcode anything, or else we can only hardcode existing
>-  # directories.
>-  hardcode_action=unsupported
>-fi
>-AC_MSG_RESULT([$hardcode_action])
>+# AC_DISABLE_SHARED
>+# -----------------
>+# set the default shared flag to --disable-shared
>+AC_DEFUN([AC_DISABLE_SHARED],
>+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>+AC_ENABLE_SHARED(no)
>+])# AC_DISABLE_SHARED
> 
>-striplib=
>-old_striplib=
>-AC_MSG_CHECKING([whether stripping libraries is possible])
>-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>-  AC_MSG_RESULT([yes])
>-else
>-  AC_MSG_RESULT([no])
>-fi
> 
>-reload_cmds='$LD$reload_flag -o $output$reload_objs'
>-test -z "$deplibs_check_method" && deplibs_check_method=unknown
>+# AC_ENABLE_STATIC([DEFAULT])
>+# ---------------------------
>+# implement the --enable-static flag
>+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
>+AC_DEFUN([AC_ENABLE_STATIC],
>+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
>+AC_ARG_ENABLE([static],
>+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
>+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
>+    [p=${PACKAGE-default}
>+    case $enableval in
>+    yes) enable_static=yes ;;
>+    no) enable_static=no ;;
>+    *)
>+     enable_static=no
>+      # Look at the argument we got.  We use all the common list separators.
>+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+      for pkg in $enableval; do
>+	IFS="$lt_save_ifs"
>+	if test "X$pkg" = "X$p"; then
>+	  enable_static=yes
>+	fi
>+      done
>+      IFS="$lt_save_ifs"
>+      ;;
>+    esac],
>+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
>+])# AC_ENABLE_STATIC
> 
>-# PORTME Fill in your ld.so characteristics
>-AC_MSG_CHECKING([dynamic linker characteristics])
>-library_names_spec=
>-libname_spec='lib$name'
>-soname_spec=
>-postinstall_cmds=
>-postuninstall_cmds=
>-finish_cmds=
>-finish_eval=
>-shlibpath_var=
>-shlibpath_overrides_runpath=unknown
>-version_type=none
>-dynamic_linker="$host_os ld.so"
>-sys_lib_dlsearch_path_spec="/lib /usr/lib"
>-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
> 
>-case $host_os in
>-aix3*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
>-  shlibpath_var=LIBPATH
>+# AC_DISABLE_STATIC
>+# -----------------
>+# set the default static flag to --disable-static
>+AC_DEFUN([AC_DISABLE_STATIC],
>+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>+AC_ENABLE_STATIC(no)
>+])# AC_DISABLE_STATIC
> 
>-  # AIX has no versioning support, so we append a major version to the name.
>-  soname_spec='${libname}${release}.so$major'
>-  ;;
> 
>-aix4* | aix5*)
>-  version_type=linux
>-  if test "$host_cpu" = ia64; then
>-    # AIX 5 supports IA64
>-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
>-    shlibpath_var=LD_LIBRARY_PATH
>-  else
>-    # With GCC up to 2.95.x, collect2 would create an import file
>-    # for dependence libraries.  The import file would start with
>-    # the line `#! .'.  This would cause the generated library to
>-    # depend on `.', always an invalid library.  This was fixed in
>-    # development snapshots of GCC prior to 3.0.
>-    case $host_os in
>-      aix4 | aix4.[[01]] | aix4.[[01]].*)
>-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>-	     echo ' yes '
>-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>-	  :
>-	else
>-	  can_build_shared=no
>+# AC_ENABLE_FAST_INSTALL([DEFAULT])
>+# ---------------------------------
>+# implement the --enable-fast-install flag
>+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
>+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
>+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
>+AC_ARG_ENABLE([fast-install],
>+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
>+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
>+    [p=${PACKAGE-default}
>+    case $enableval in
>+    yes) enable_fast_install=yes ;;
>+    no) enable_fast_install=no ;;
>+    *)
>+      enable_fast_install=no
>+      # Look at the argument we got.  We use all the common list separators.
>+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+      for pkg in $enableval; do
>+	IFS="$lt_save_ifs"
>+	if test "X$pkg" = "X$p"; then
>+	  enable_fast_install=yes
> 	fi
>-	;;
>-    esac
>-    # AIX (on Power*) has no versioning support, so currently we can
>-    # not hardcode correct soname into executable. Probably we can
>-    # add versioning support to collect2, so additional links can
>-    # be useful in future.
>-    if test "$aix_use_runtimelinking" = yes; then
>-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>-      # instead of lib<name>.a to let people know that these are not
>-      # typical AIX shared libraries.
>-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-    else
>-      # We preserve .a as extension for shared libraries through AIX4.2
>-      # and later when we are not doing run time linking.
>-      library_names_spec='${libname}${release}.a $libname.a'
>-      soname_spec='${libname}${release}.so$major'
>-    fi
>-    shlibpath_var=LIBPATH
>-  fi
>-  ;;
>+      done
>+      IFS="$lt_save_ifs"
>+      ;;
>+    esac],
>+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
>+])# AC_ENABLE_FAST_INSTALL
> 
>-amigaos*)
>-  library_names_spec='$libname.ixlibrary $libname.a'
>-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
>-  ;;
> 
>-beos*)
>-  library_names_spec='${libname}.so'
>-  dynamic_linker="$host_os ld.so"
>-  shlibpath_var=LIBRARY_PATH
>-  ;;
>+# AC_DISABLE_FAST_INSTALL
>+# -----------------------
>+# set the default to --disable-fast-install
>+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
>+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>+AC_ENABLE_FAST_INSTALL(no)
>+])# AC_DISABLE_FAST_INSTALL
> 
>-bsdi4*)
>-  version_type=linux
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>-  export_dynamic_flag_spec=-rdynamic
>-  # the default ld.so.conf also contains /usr/contrib/lib and
>-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>-  # libtool to hard-code these into programs
>-  ;;
> 
>-cygwin* | mingw* | pw32*)
>-  version_type=windows
>-  need_version=no
>-  need_lib_prefix=no
>-  case $GCC,$host_os in
>-  yes,cygwin*)
>-    library_names_spec='$libname.dll.a'
>-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
>-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
>-      dldir=$destdir/`dirname \$dlpath`~
>-      test -d \$dldir || mkdir -p \$dldir~
>-      $install_prog .libs/$dlname \$dldir/$dlname'
>-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
>-      dlpath=$dir/\$dldll~
>-       $rm \$dlpath'
>-    ;;
>-  yes,mingw*)
>-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
>-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
>-    ;;
>-  yes,pw32*)
>-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
>-    ;;
>-  *)
>-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
>-    ;;
>-  esac
>-  dynamic_linker='Win32 ld.exe'
>-  # FIXME: first we should search . and the directory the executable is in
>-  shlibpath_var=PATH
>-  ;;
>+# AC_LIBTOOL_PICMODE([MODE])
>+# --------------------------
>+# implement the --with-pic flag
>+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
>+AC_DEFUN([AC_LIBTOOL_PICMODE],
>+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>+pic_mode=ifelse($#,1,$1,default)
>+])# AC_LIBTOOL_PICMODE
> 
>-darwin* | rhapsody*)
>-  dynamic_linker="$host_os dyld"
>-  version_type=darwin
>-  need_lib_prefix=no
>-  need_version=no
>-  # FIXME: Relying on posixy $() will cause problems for
>-  #        cross-compilation, but unfortunately the echo tests do not
>-  #        yet detect zsh echo's removal of \ escapes.
>-  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
>-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
>-  shlibpath_overrides_runpath=yes
>-  shlibpath_var=DYLD_LIBRARY_PATH
>-  ;;
> 
>-freebsd1*)
>-  dynamic_linker=no
>-  ;;
>+# AC_PROG_EGREP
>+# -------------
>+# This is predefined starting with Autoconf 2.54, so this conditional
>+# definition can be removed once we require Autoconf 2.54 or later.
>+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
>+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
>+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
>+    then ac_cv_prog_egrep='grep -E'
>+    else ac_cv_prog_egrep='egrep'
>+    fi])
>+ EGREP=$ac_cv_prog_egrep
>+ AC_SUBST([EGREP])
>+])])
> 
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>-  version_type=freebsd-$objformat
>-  case $version_type in
>-    freebsd-elf*)
>-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
>-      need_version=no
>-      need_lib_prefix=no
>-      ;;
>-    freebsd-*)
>-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
>-      need_version=yes
>-      ;;
>-  esac
>-  shlibpath_var=LD_LIBRARY_PATH
>-  case $host_os in
>-  freebsd2*)
>-    shlibpath_overrides_runpath=yes
>-    ;;
>-  *)
>-    shlibpath_overrides_runpath=no
>-    hardcode_into_libs=yes
>-    ;;
>-  esac
>-  ;;
> 
>-gnu*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  hardcode_into_libs=yes
>+# AC_PATH_TOOL_PREFIX
>+# -------------------
>+# find a file program which can recognise shared library
>+AC_DEFUN([AC_PATH_TOOL_PREFIX],
>+[AC_REQUIRE([AC_PROG_EGREP])dnl
>+AC_MSG_CHECKING([for $1])
>+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
>+[case $MAGIC_CMD in
>+[[\\/*] |  ?:[\\/]*])
>+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
>   ;;
>+*)
>+  lt_save_MAGIC_CMD="$MAGIC_CMD"
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+dnl $ac_dummy forces splitting on constant user-supplied paths.
>+dnl POSIX.2 word splitting is done only on the output of word expansions,
>+dnl not every word.  This closes a longstanding sh security hole.
>+  ac_dummy="ifelse([$2], , $PATH, [$2])"
>+  for ac_dir in $ac_dummy; do
>+    IFS="$lt_save_ifs"
>+    test -z "$ac_dir" && ac_dir=.
>+    if test -f $ac_dir/$1; then
>+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
>+      if test -n "$file_magic_test_file"; then
>+	case $deplibs_check_method in
>+	"file_magic "*)
>+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
>+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>+	    $EGREP "$file_magic_regex" > /dev/null; then
>+	    :
>+	  else
>+	    cat <<EOF 1>&2
> 
>-hpux9* | hpux10* | hpux11*)
>-  # Give a soname corresponding to the major version so that dld.sl refuses to
>-  # link against other versions.
>-  dynamic_linker="$host_os dld.sl"
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  shlibpath_var=SHLIB_PATH
>-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
>-  soname_spec='${libname}${release}.sl$major'
>-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>-  postinstall_cmds='chmod 555 $lib'
>+*** Warning: the command libtool uses to detect shared libraries,
>+*** $file_magic_cmd, produces output that libtool cannot recognize.
>+*** The result is that libtool may fail to recognize shared libraries
>+*** as such.  This will affect the creation of libtool libraries that
>+*** depend on shared libraries, but programs linked with such libtool
>+*** libraries will work regardless of this problem.  Nevertheless, you
>+*** may want to report the problem to your system manager and/or to
>+*** bug-libtool@gnu.org
>+
>+EOF
>+	  fi ;;
>+	esac
>+      fi
>+      break
>+    fi
>+  done
>+  IFS="$lt_save_ifs"
>+  MAGIC_CMD="$lt_save_MAGIC_CMD"
>   ;;
>+esac])
>+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>+if test -n "$MAGIC_CMD"; then
>+  AC_MSG_RESULT($MAGIC_CMD)
>+else
>+  AC_MSG_RESULT(no)
>+fi
>+])# AC_PATH_TOOL_PREFIX
> 
>-irix5* | irix6*)
>-  version_type=irix
>-  need_lib_prefix=no
>-  need_version=no
>-  soname_spec='${libname}${release}.so$major'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
>-  case $host_os in
>-  irix5*)
>-    libsuff= shlibsuff=
>+
>+# AC_PATH_MAGIC
>+# -------------
>+# find a file program which can recognise a shared library
>+AC_DEFUN([AC_PATH_MAGIC],
>+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
>+if test -z "$lt_cv_path_MAGIC_CMD"; then
>+  if test -n "$ac_tool_prefix"; then
>+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
>+  else
>+    MAGIC_CMD=:
>+  fi
>+fi
>+])# AC_PATH_MAGIC
>+
>+
>+# AC_PROG_LD
>+# ----------
>+# find the pathname to the GNU or non-GNU linker
>+AC_DEFUN([AC_PROG_LD],
>+[AC_ARG_WITH([gnu-ld],
>+    [AC_HELP_STRING([--with-gnu-ld],
>+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
>+    [test "$withval" = no || with_gnu_ld=yes],
>+    [with_gnu_ld=no])
>+AC_REQUIRE([LT_AC_PROG_SED])dnl
>+AC_REQUIRE([AC_PROG_CC])dnl
>+AC_REQUIRE([AC_CANONICAL_HOST])dnl
>+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
>+ac_prog=ld
>+if test "$GCC" = yes; then
>+  # Check if gcc -print-prog-name=ld gives a path.
>+  AC_MSG_CHECKING([for ld used by $CC])
>+  case $host in
>+  *-*-mingw*)
>+    # gcc leaves a trailing carriage return which upsets mingw
>+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
>+  *)
>+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
>+  esac
>+  case $ac_prog in
>+    # Accept absolute paths.
>+    [[\\/]]* | ?:[[\\/]]*)
>+      re_direlt='/[[^/]][[^/]]*/\.\./'
>+      # Canonicalize the pathname of ld
>+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
>+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
>+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
>+      done
>+      test -z "$LD" && LD="$ac_prog"
>+      ;;
>+  "")
>+    # If it fails, then pretend we aren't using GCC.
>+    ac_prog=ld
>     ;;
>   *)
>-    case $LD in # libtool.m4 will add one of these switches to LD
>-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
>-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
>-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
>-    *) libsuff= shlibsuff= libmagic=never-match;;
>-    esac
>+    # If it is relative, then search for the first ld in PATH.
>+    with_gnu_ld=unknown
>     ;;
>   esac
>-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>-  shlibpath_overrides_runpath=no
>-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>+elif test "$with_gnu_ld" = yes; then
>+  AC_MSG_CHECKING([for GNU ld])
>+else
>+  AC_MSG_CHECKING([for non-GNU ld])
>+fi
>+AC_CACHE_VAL(lt_cv_path_LD,
>+[if test -z "$LD"; then
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+  for ac_dir in $PATH; do
>+    IFS="$lt_save_ifs"
>+    test -z "$ac_dir" && ac_dir=.
>+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>+      lt_cv_path_LD="$ac_dir/$ac_prog"
>+      # Check to see if the program is GNU ld.  I'd rather use --version,
>+      # but apparently some variants of GNU ld only accept -v.
>+      # Break only if it was the GNU/non-GNU ld that we prefer.
>+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
>+      *GNU* | *'with BFD'*)
>+	test "$with_gnu_ld" != no && break
>+	;;
>+      *)
>+	test "$with_gnu_ld" != yes && break
>+	;;
>+      esac
>+    fi
>+  done
>+  IFS="$lt_save_ifs"
>+else
>+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
>+fi])
>+LD="$lt_cv_path_LD"
>+if test -n "$LD"; then
>+  AC_MSG_RESULT($LD)
>+else
>+  AC_MSG_RESULT(no)
>+fi
>+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
>+AC_PROG_LD_GNU
>+])# AC_PROG_LD
>+
>+
>+# AC_PROG_LD_GNU
>+# --------------
>+AC_DEFUN([AC_PROG_LD_GNU],
>+[AC_REQUIRE([AC_PROG_EGREP])dnl
>+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
>+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
>+case `$LD -v 2>&1 </dev/null` in
>+*GNU* | *'with BFD'*)
>+  lt_cv_prog_gnu_ld=yes
>+  ;;
>+*)
>+  lt_cv_prog_gnu_ld=no
>   ;;
>+esac])
>+with_gnu_ld=$lt_cv_prog_gnu_ld
>+])# AC_PROG_LD_GNU
> 
>-# No shared lib support for Linux oldld, aout, or coff.
>-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
>-  dynamic_linker=no
>+
>+# AC_PROG_LD_RELOAD_FLAG
>+# ----------------------
>+# find reload flag for linker
>+#   -- PORTME Some linkers may need a different reload flag.
>+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
>+[AC_CACHE_CHECK([for $LD option to reload object files],
>+  lt_cv_ld_reload_flag,
>+  [lt_cv_ld_reload_flag='-r'])
>+reload_flag=$lt_cv_ld_reload_flag
>+case $reload_flag in
>+"" | " "*) ;;
>+*) reload_flag=" $reload_flag" ;;
>+esac
>+reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+case $host_os in
>+  darwin*)
>+    if test "$GCC" = yes; then
>+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
>+    else
>+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+    fi
>+    ;;
>+esac
>+])# AC_PROG_LD_RELOAD_FLAG
>+
>+
>+# AC_DEPLIBS_CHECK_METHOD
>+# -----------------------
>+# how to check for library dependencies
>+#  -- PORTME fill in with the dynamic library characteristics
>+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
>+[AC_CACHE_CHECK([how to recognise dependent libraries],
>+lt_cv_deplibs_check_method,
>+[lt_cv_file_magic_cmd='$MAGIC_CMD'
>+lt_cv_file_magic_test_file=
>+lt_cv_deplibs_check_method='unknown'
>+# Need to set the preceding variable on all platforms that support
>+# interlibrary dependencies.
>+# 'none' -- dependencies not supported.
>+# `unknown' -- same as none, but documents that we really don't know.
>+# 'pass_all' -- all dependencies passed with no checks.
>+# 'test_compile' -- check by making test program.
>+# 'file_magic [[regex]]' -- check by looking for files in library path
>+# which responds to the $file_magic_cmd with a given extended regex.
>+# If you have `file' or equivalent on your system and you're not sure
>+# whether `pass_all' will *always* work, you probably want this one.
>+
>+case $host_os in
>+aix4* | aix5*)
>+  lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-# This must be Linux ELF.
>-linux-gnu*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=no
>-  # This implies no fast_install, which is unacceptable.
>-  # Some rework will be needed to allow for fast_install
>-  # before this can be enabled.
>-  hardcode_into_libs=yes
>+beos*)
>+  lt_cv_deplibs_check_method=pass_all
>+  ;;
> 
>-  # We used to test for /lib/ld.so.1 and disable shared libraries on
>-  # powerpc, because MkLinux only supported shared libraries with the
>-  # GNU dynamic linker.  Since this was broken with cross compilers,
>-  # most powerpc-linux boxes support dynamic linking these days and
>-  # people can always --disable-shared, the test was removed, and we
>-  # assume the GNU/Linux dynamic linker is in use.
>-  dynamic_linker='GNU/Linux ld.so'
>+bsdi[[45]]*)
>+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
>+  lt_cv_file_magic_cmd='/usr/bin/file -L'
>+  lt_cv_file_magic_test_file=/shlib/libc.so
>   ;;
> 
>-netbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-    dynamic_linker='NetBSD (a.out) ld.so'
>-  else
>-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
>-    soname_spec='${libname}${release}.so$major'
>-    dynamic_linker='NetBSD ld.elf_so'
>-  fi
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>+cygwin*)
>+  # func_win32_libid is a shell function defined in ltmain.sh
>+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
>+  lt_cv_file_magic_cmd='func_win32_libid'
>   ;;
> 
>-newsos6)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>+mingw* | pw32*)
>+  # Base MSYS/MinGW do not provide the 'file' command needed by
>+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
>+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
>+  lt_cv_file_magic_cmd='$OBJDUMP -f'
>   ;;
> 
>-openbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    case "$host_os" in
>-    openbsd2.[[89]] | openbsd2.[[89]].*)
>-      shlibpath_overrides_runpath=no
>-      ;;
>-    *)
>-      shlibpath_overrides_runpath=yes
>+darwin* | rhapsody*)
>+  lt_cv_deplibs_check_method=pass_all
>+  ;;
>+
>+freebsd* | kfreebsd*-gnu | dragonfly*)
>+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>+    case $host_cpu in
>+    i*86 )
>+      # Not sure whether the presence of OpenBSD here was a mistake.
>+      # Let's accept both of them until this is cleared up.
>+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
>+      lt_cv_file_magic_cmd=/usr/bin/file
>+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>       ;;
>     esac
>   else
>-    shlibpath_overrides_runpath=yes
>+    lt_cv_deplibs_check_method=pass_all
>   fi
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>   ;;
> 
>-os2*)
>-  libname_spec='$name'
>-  need_lib_prefix=no
>-  library_names_spec='$libname.dll $libname.a'
>-  dynamic_linker='OS/2 ld.exe'
>-  shlibpath_var=LIBPATH
>+gnu*)
>+  lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-osf3* | osf4* | osf5*)
>-  version_type=osf
>-  need_version=no
>-  soname_spec='${libname}${release}.so'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>+hpux10.20* | hpux11*)
>+  lt_cv_file_magic_cmd=/usr/bin/file
>+  case $host_cpu in
>+  ia64*)
>+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
>+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
>+    ;;
>+  hppa*64*)
>+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
>+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
>+    ;;
>+  *)
>+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
>+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
>+    ;;
>+  esac
>   ;;
> 
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}.so$major'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>+interix3*)
>+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
>+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
>   ;;
> 
>-solaris*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>-  # ldd complains unless libraries are executable
>-  postinstall_cmds='chmod +x $lib'
>+irix5* | irix6* | nonstopux*)
>+  case $LD in
>+  *-32|*"-32 ") libmagic=32-bit;;
>+  *-n32|*"-n32 ") libmagic=N32;;
>+  *-64|*"-64 ") libmagic=64-bit;;
>+  *) libmagic=never-match;;
>+  esac
>+  lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-sunos4*)
>-  version_type=sunos
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  if test "$with_gnu_ld" = yes; then
>-    need_lib_prefix=no
>+# This must be Linux ELF.
>+linux*)
>+  lt_cv_deplibs_check_method=pass_all
>+  ;;
>+
>+netbsd*)
>+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
>+  else
>+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
>   fi
>-  need_version=yes
>   ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>+newos6*)
>+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
>+  lt_cv_file_magic_cmd=/usr/bin/file
>+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
>+  ;;
>+
>+nto-qnx*)
>+  lt_cv_deplibs_check_method=unknown
>+  ;;
>+
>+openbsd*)
>+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
>+  else
>+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
>+  fi
>+  ;;
>+
>+osf3* | osf4* | osf5*)
>+  lt_cv_deplibs_check_method=pass_all
>+  ;;
>+
>+solaris*)
>+  lt_cv_deplibs_check_method=pass_all
>+  ;;
>+
>+sysv4 | sysv4.3*)
>   case $host_vendor in
>-    sni)
>-      shlibpath_overrides_runpath=no
>-      ;;
>-    motorola)
>-      need_lib_prefix=no
>-      need_version=no
>-      shlibpath_overrides_runpath=no
>-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>-      ;;
>+  motorola)
>+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
>+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
>+    ;;
>+  ncr)
>+    lt_cv_deplibs_check_method=pass_all
>+    ;;
>+  sequent)
>+    lt_cv_file_magic_cmd='/bin/file'
>+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
>+    ;;
>+  sni)
>+    lt_cv_file_magic_cmd='/bin/file'
>+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
>+    lt_cv_file_magic_test_file=/lib/libc.so
>+    ;;
>+  siemens)
>+    lt_cv_deplibs_check_method=pass_all
>+    ;;
>+  pc)
>+    lt_cv_deplibs_check_method=pass_all
>+    ;;
>   esac
>   ;;
> 
>-uts4*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  lt_cv_deplibs_check_method=pass_all
>   ;;
>+esac
>+])
>+file_magic_cmd=$lt_cv_file_magic_cmd
>+deplibs_check_method=$lt_cv_deplibs_check_method
>+test -z "$deplibs_check_method" && deplibs_check_method=unknown
>+])# AC_DEPLIBS_CHECK_METHOD
> 
>-dgux*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
> 
>-sysv4*MP*)
>-  if test -d /usr/nec ;then
>-    version_type=linux
>-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
>-    soname_spec='$libname.so.$major'
>-    shlibpath_var=LD_LIBRARY_PATH
>+# AC_PROG_NM
>+# ----------
>+# find the pathname to a BSD-compatible name lister
>+AC_DEFUN([AC_PROG_NM],
>+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
>+[if test -n "$NM"; then
>+  # Let the user override the test.
>+  lt_cv_path_NM="$NM"
>+else
>+  lt_nm_to_check="${ac_tool_prefix}nm"
>+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
>+    lt_nm_to_check="$lt_nm_to_check nm"
>   fi
>-  ;;
>+  for lt_tmp_nm in $lt_nm_to_check; do
>+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
>+      IFS="$lt_save_ifs"
>+      test -z "$ac_dir" && ac_dir=.
>+      tmp_nm="$ac_dir/$lt_tmp_nm"
>+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
>+	# Check to see if the nm accepts a BSD-compat flag.
>+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
>+	#   nm: unknown option "B" ignored
>+	# Tru64's nm complains that /dev/null is an invalid object file
>+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
>+	*/dev/null* | *'Invalid file or object type'*)
>+	  lt_cv_path_NM="$tmp_nm -B"
>+	  break
>+	  ;;
>+	*)
>+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
>+	  */dev/null*)
>+	    lt_cv_path_NM="$tmp_nm -p"
>+	    break
>+	    ;;
>+	  *)
>+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
>+	    continue # so that we can try to find one that supports BSD flags
>+	    ;;
>+	  esac
>+	  ;;
>+	esac
>+      fi
>+    done
>+    IFS="$lt_save_ifs"
>+  done
>+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
>+fi])
>+NM="$lt_cv_path_NM"
>+])# AC_PROG_NM
>+
> 
>+# AC_CHECK_LIBM
>+# -------------
>+# check for math library
>+AC_DEFUN([AC_CHECK_LIBM],
>+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
>+LIBM=
>+case $host in
>+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
>+  # These system don't have libm, or don't need it
>+  ;;
>+*-ncr-sysv4.3*)
>+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
>+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
>+  ;;
> *)
>-  dynamic_linker=no
>+  AC_CHECK_LIB(m, cos, LIBM="-lm")
>   ;;
> esac
>-AC_MSG_RESULT([$dynamic_linker])
>-test "$dynamic_linker" = no && can_build_shared=no
>+])# AC_CHECK_LIBM
>+
>+
>+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
>+# -----------------------------------
>+# sets LIBLTDL to the link flags for the libltdl convenience library and
>+# LTDLINCL to the include flags for the libltdl header and adds
>+# --enable-ltdl-convenience to the configure arguments.  Note that
>+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
>+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
>+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
>+# (note the single quotes!).  If your package is not flat and you're not
>+# using automake, define top_builddir and top_srcdir appropriately in
>+# the Makefiles.
>+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
>+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>+  case $enable_ltdl_convenience in
>+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
>+  "") enable_ltdl_convenience=yes
>+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
>+  esac
>+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
>+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
>+  # For backwards non-gettext consistent compatibility...
>+  INCLTDL="$LTDLINCL"
>+])# AC_LIBLTDL_CONVENIENCE
>+
>+
>+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
>+# -----------------------------------
>+# sets LIBLTDL to the link flags for the libltdl installable library and
>+# LTDLINCL to the include flags for the libltdl header and adds
>+# --enable-ltdl-install to the configure arguments.  Note that
>+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
>+# and an installed libltdl is not found, it is assumed to be `libltdl'.
>+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
>+# '${top_srcdir}/' (note the single quotes!).  If your package is not
>+# flat and you're not using automake, define top_builddir and top_srcdir
>+# appropriately in the Makefiles.
>+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
>+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
>+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>+  AC_CHECK_LIB(ltdl, lt_dlinit,
>+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
>+  [if test x"$enable_ltdl_install" = xno; then
>+     AC_MSG_WARN([libltdl not installed, but installation disabled])
>+   else
>+     enable_ltdl_install=yes
>+   fi
>+  ])
>+  if test x"$enable_ltdl_install" = x"yes"; then
>+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
>+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
>+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
>+  else
>+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
>+    LIBLTDL="-lltdl"
>+    LTDLINCL=
>+  fi
>+  # For backwards non-gettext consistent compatibility...
>+  INCLTDL="$LTDLINCL"
>+])# AC_LIBLTDL_INSTALLABLE
>+
>+
>+# AC_LIBTOOL_CXX
>+# --------------
>+# enable support for C++ libraries
>+AC_DEFUN([AC_LIBTOOL_CXX],
>+[AC_REQUIRE([_LT_AC_LANG_CXX])
>+])# AC_LIBTOOL_CXX
>+
>+
>+# _LT_AC_LANG_CXX
>+# ---------------
>+AC_DEFUN([_LT_AC_LANG_CXX],
>+[AC_REQUIRE([AC_PROG_CXX])
>+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
>+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
>+])# _LT_AC_LANG_CXX
>+
>+# _LT_AC_PROG_CXXCPP
>+# ------------------
>+AC_DEFUN([_LT_AC_PROG_CXXCPP],
>+[
>+AC_REQUIRE([AC_PROG_CXX])
>+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
>+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
>+    (test "X$CXX" != "Xg++"))) ; then
>+  AC_PROG_CXXCPP
>+fi
>+])# _LT_AC_PROG_CXXCPP
>+
>+# AC_LIBTOOL_F77
>+# --------------
>+# enable support for Fortran 77 libraries
>+AC_DEFUN([AC_LIBTOOL_F77],
>+[AC_REQUIRE([_LT_AC_LANG_F77])
>+])# AC_LIBTOOL_F77
>+
>+
>+# _LT_AC_LANG_F77
>+# ---------------
>+AC_DEFUN([_LT_AC_LANG_F77],
>+[AC_REQUIRE([AC_PROG_F77])
>+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
>+])# _LT_AC_LANG_F77
>+
>+
>+# AC_LIBTOOL_GCJ
>+# --------------
>+# enable support for GCJ libraries
>+AC_DEFUN([AC_LIBTOOL_GCJ],
>+[AC_REQUIRE([_LT_AC_LANG_GCJ])
>+])# AC_LIBTOOL_GCJ
>+
>+
>+# _LT_AC_LANG_GCJ
>+# ---------------
>+AC_DEFUN([_LT_AC_LANG_GCJ],
>+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
>+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
>+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
>+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
>+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
>+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
>+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
>+])# _LT_AC_LANG_GCJ
>+
>+
>+# AC_LIBTOOL_RC
>+# -------------
>+# enable support for Windows resource files
>+AC_DEFUN([AC_LIBTOOL_RC],
>+[AC_REQUIRE([LT_AC_PROG_RC])
>+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
>+])# AC_LIBTOOL_RC
>+
> 
>-# Report the final consequences.
>+# AC_LIBTOOL_LANG_C_CONFIG
>+# ------------------------
>+# Ensure that the configuration vars for the C compiler are
>+# suitably defined.  Those variables are subsequently used by
>+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
>+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
>+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
>+[lt_save_CC="$CC"
>+AC_LANG_PUSH(C)
>+
>+# Source file extension for C test sources.
>+ac_ext=c
>+
>+# Object file extension for compiled C test sources.
>+objext=o
>+_LT_AC_TAGVAR(objext, $1)=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="int some_variable = 0;\n"
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code='int main(){return(0);}\n'
>+
>+_LT_AC_SYS_COMPILER
>+
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
>+
>+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
>+AC_LIBTOOL_PROG_COMPILER_PIC($1)
>+AC_LIBTOOL_PROG_CC_C_O($1)
>+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
>+AC_LIBTOOL_PROG_LD_SHLIBS($1)
>+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
>+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
>+AC_LIBTOOL_SYS_LIB_STRIP
>+AC_LIBTOOL_DLOPEN_SELF
>+
>+# Report which library types will actually be built
> AC_MSG_CHECKING([if libtool supports shared libraries])
> AC_MSG_RESULT([$can_build_shared])
> 
>@@ -2277,7 +2718,7 @@
> 
> # On AIX, shared libraries and static libraries use the same namespace, and
> # are all built from PIC.
>-case "$host_os" in
>+case $host_os in
> aix3*)
>   test "$enable_shared" = yes && enable_static=no
>   if test -n "$RANLIB"; then
>@@ -2286,11 +2727,11 @@
>   fi
>   ;;
> 
>-aix4*)
>+aix4* | aix5*)
>   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>     test "$enable_shared" = yes && enable_static=no
>   fi
>-  ;;
>+    ;;
> esac
> AC_MSG_RESULT([$enable_shared])
> 
>@@ -2299,246 +2740,1636 @@
> test "$enable_shared" = yes || enable_static=yes
> AC_MSG_RESULT([$enable_static])
> 
>-if test "$hardcode_action" = relink; then
>-  # Fast installation is not supported
>-  enable_fast_install=no
>-elif test "$shlibpath_overrides_runpath" = yes ||
>-     test "$enable_shared" = no; then
>-  # Fast installation is not necessary
>-  enable_fast_install=needless
>-fi
>+AC_LIBTOOL_CONFIG($1)
> 
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>+AC_LANG_POP
>+CC="$lt_save_CC"
>+])# AC_LIBTOOL_LANG_C_CONFIG
> 
>-AC_LIBTOOL_DLOPEN_SELF
> 
>-if test "$enable_shared" = yes && test "$GCC" = yes; then
>-  case $archive_cmds in
>-  *'~'*)
>-    # FIXME: we may have to deal with multi-command sequences.
>-    ;;
>-  '$CC '*)
>-    # Test whether the compiler implicitly links with -lc since on some
>-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
>-    # to ld, don't add -lc before -lgcc.
>-    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
>-    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
>-    [$rm conftest*
>-    echo 'static int dummy;' > conftest.$ac_ext
>+# AC_LIBTOOL_LANG_CXX_CONFIG
>+# --------------------------
>+# Ensure that the configuration vars for the C compiler are
>+# suitably defined.  Those variables are subsequently used by
>+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
>+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
>+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
>+[AC_LANG_PUSH(C++)
>+AC_REQUIRE([AC_PROG_CXX])
>+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
>+
>+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
>+_LT_AC_TAGVAR(always_export_symbols, $1)=no
>+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
>+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
>+_LT_AC_TAGVAR(hardcode_direct, $1)=no
>+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
>+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
>+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
>+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
>+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
>+_LT_AC_TAGVAR(module_cmds, $1)=
>+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
>+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
>+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
>+_LT_AC_TAGVAR(no_undefined_flag, $1)=
>+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
>+
>+# Dependencies to place before and after the object being linked:
>+_LT_AC_TAGVAR(predep_objects, $1)=
>+_LT_AC_TAGVAR(postdep_objects, $1)=
>+_LT_AC_TAGVAR(predeps, $1)=
>+_LT_AC_TAGVAR(postdeps, $1)=
>+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
>+
>+# Source file extension for C++ test sources.
>+ac_ext=cpp
>+
>+# Object file extension for compiled C++ test sources.
>+objext=o
>+_LT_AC_TAGVAR(objext, $1)=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="int some_variable = 0;\n"
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
>+
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>+_LT_AC_SYS_COMPILER
>+
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
> 
>-    if AC_TRY_EVAL(ac_compile); then
>-      soname=conftest
>-      lib=conftest
>-      libobjs=conftest.$ac_objext
>-      deplibs=
>-      wl=$lt_cv_prog_cc_wl
>-      compiler_flags=-v
>-      linker_flags=-v
>-      verstring=
>-      output_objdir=.
>-      libname=conftest
>-      save_allow_undefined_flag=$allow_undefined_flag
>-      allow_undefined_flag=
>-      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
>-      then
>-	lt_cv_archive_cmds_need_lc=no
>-      else
>-	lt_cv_archive_cmds_need_lc=yes
>-      fi
>-      allow_undefined_flag=$save_allow_undefined_flag
>-    else
>-      cat conftest.err 1>&5
>-    fi])
>-    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
>-    ;;
>-  esac
>+# Allow CC to be a program name with arguments.
>+lt_save_CC=$CC
>+lt_save_LD=$LD
>+lt_save_GCC=$GCC
>+GCC=$GXX
>+lt_save_with_gnu_ld=$with_gnu_ld
>+lt_save_path_LD=$lt_cv_path_LD
>+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
>+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
>+else
>+  $as_unset lt_cv_prog_gnu_ld
> fi
>-need_lc=${lt_cv_archive_cmds_need_lc-yes}
>-
>-# The second clause should only fire when bootstrapping the
>-# libtool distribution, otherwise you forgot to ship ltmain.sh
>-# with your package, and you will get complaints that there are
>-# no rules to generate ltmain.sh.
>-if test -f "$ltmain"; then
>-  :
>+if test -n "${lt_cv_path_LDCXX+set}"; then
>+  lt_cv_path_LD=$lt_cv_path_LDCXX
> else
>-  # If there is no Makefile yet, we rely on a make rule to execute
>-  # `config.status --recheck' to rerun these tests and create the
>-  # libtool script then.
>-  test -f Makefile && make "$ltmain"
>+  $as_unset lt_cv_path_LD
>+fi
>+test -z "${LDCXX+set}" || LD=$LDCXX
>+CC=${CXX-"c++"}
>+compiler=$CC
>+_LT_AC_TAGVAR(compiler, $1)=$CC
>+_LT_CC_BASENAME([$compiler])
>+
>+# We don't want -fno-exception wen compiling C++ code, so set the
>+# no_builtin_flag separately
>+if test "$GXX" = yes; then
>+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
>+else
>+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
> fi
> 
>-if test -f "$ltmain"; then
>-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
>-  $rm -f "${ofile}T"
>+if test "$GXX" = yes; then
>+  # Set up default GNU C++ configuration
> 
>-  echo creating $ofile
>+  AC_PROG_LD
> 
>-  # Now quote all the things that may contain metacharacters while being
>-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>-  # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS \
>-    AR AR_FLAGS CC LD LN_S NM SHELL \
>-    reload_flag reload_cmds wl \
>-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
>-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
>-    library_names_spec soname_spec \
>-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
>-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
>-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
>-    old_striplib striplib file_magic_cmd export_symbols_cmds \
>-    deplibs_check_method allow_undefined_flag no_undefined_flag \
>-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
>-    global_symbol_to_c_name_address \
>-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
>-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
>+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
>+  # archiving commands below assume that GNU ld is being used.
>+  if test "$with_gnu_ld" = yes; then
>+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
> 
>-    case $var in
>-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
>-    old_postinstall_cmds | old_postuninstall_cmds | \
>-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
>-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
>-    postinstall_cmds | postuninstall_cmds | \
>-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>-      # Double-quote double-evaled strings.
>-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>-      ;;
>-    *)
>-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>-      ;;
>-    esac
>-  done
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
> 
>-  cat <<__EOF__ > "${ofile}T"
>-#! $SHELL
>+    # If archive_cmds runs LD, not CC, wlarc should be empty
>+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
>+    #     investigate it a little bit more. (MM)
>+    wlarc='${wl}'
>+
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
>+	grep 'no-whole-archive' > /dev/null; then
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+    else
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>+    fi
>+  else
>+    with_gnu_ld=no
>+    wlarc=
> 
>-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
>-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
>-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
>-#
>-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
>-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
>-#
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2 of the License, or
>-# (at your option) any later version.
>-#
>-# This program is distributed in the hope that it will be useful, but
>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-# General Public License for more details.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-#
>-# As a special exception to the GNU General Public License, if you
>-# distribute this file as part of a program that contains a
>-# configuration script generated by Autoconf, you may include it under
>-# the same distribution terms that you use for the rest of that program.
>+    # A generic and very simple default shared library creation
>+    # command for GNU C++ for the case where it uses the native
>+    # linker, instead of GNU ld.  If possible, this setting should
>+    # overridden to take advantage of the native linker features on
>+    # the platform it is being used on.
>+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
>+  fi
> 
>-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
>-Xsed="sed -e s/^X//"
>+  # Commands to make compiler produce verbose output that lists
>+  # what "hidden" libraries, object files and flags are used when
>+  # linking a shared library.
>+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
> 
>-# The HP-UX ksh and POSIX shell print the target directory to stdout
>-# if CDPATH is set.
>-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>-
>-# ### BEGIN LIBTOOL CONFIG
>-
>-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>-
>-# Shell to use when invoking shell scripts.
>-SHELL=$lt_SHELL
>-
>-# Whether or not to build shared libraries.
>-build_libtool_libs=$enable_shared
>+else
>+  GXX=no
>+  with_gnu_ld=no
>+  wlarc=
>+fi
> 
>-# Whether or not to build static libraries.
>-build_old_libs=$enable_static
>+# PORTME: fill in a description of your system's C++ link characteristics
>+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
>+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
>+case $host_os in
>+  aix3*)
>+    # FIXME: insert proper C++ library support
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  aix4* | aix5*)
>+    if test "$host_cpu" = ia64; then
>+      # On IA64, the linker does run time linking by default, so we don't
>+      # have to do anything special.
>+      aix_use_runtimelinking=no
>+      exp_sym_flag='-Bexport'
>+      no_entry_flag=""
>+    else
>+      aix_use_runtimelinking=no
> 
>-# Whether or not to add -lc for building shared libraries.
>-build_libtool_need_lc=$need_lc
>+      # Test if we are trying to use run time linking or normal
>+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
>+      # need to do runtime linking.
>+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
>+	for ld_flag in $LDFLAGS; do
>+	  case $ld_flag in
>+	  *-brtl*)
>+	    aix_use_runtimelinking=yes
>+	    break
>+	    ;;
>+	  esac
>+	done
>+	;;
>+      esac
> 
>-# Whether or not to optimize for fast installation.
>-fast_install=$enable_fast_install
>+      exp_sym_flag='-bexport'
>+      no_entry_flag='-bnoentry'
>+    fi
> 
>-# The host system.
>-host_alias=$host_alias
>-host=$host
>+    # When large executables or shared objects are built, AIX ld can
>+    # have problems creating the table of contents.  If linking a library
>+    # or program results in "error TOC overflow" add -mminimal-toc to
>+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
> 
>-# An echo program that does not interpret backslashes.
>-echo=$lt_echo
>+    _LT_AC_TAGVAR(archive_cmds, $1)=''
>+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> 
>-# The archiver.
>-AR=$lt_AR
>-AR_FLAGS=$lt_AR_FLAGS
>+    if test "$GXX" = yes; then
>+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
>+      # We only want to do this on AIX 4.2 and lower, the check
>+      # below for broken collect2 doesn't work under 4.3+
>+	collect2name=`${CC} -print-prog-name=collect2`
>+	if test -f "$collect2name" && \
>+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
>+	then
>+	  # We have reworked collect2
>+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+	else
>+	  # We have old collect2
>+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
>+	  # It fails to find uninstalled libraries when the uninstalled
>+	  # path is not listed in the libpath.  Setting hardcode_minus_L
>+	  # to unsupported forces relinking
>+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
>+	fi
>+	;;
>+      esac
>+      shared_flag='-shared'
>+      if test "$aix_use_runtimelinking" = yes; then
>+	shared_flag="$shared_flag "'${wl}-G'
>+      fi
>+    else
>+      # not using gcc
>+      if test "$host_cpu" = ia64; then
>+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>+	# chokes on -Wl,-G. The following line is correct:
>+	shared_flag='-G'
>+      else
>+	if test "$aix_use_runtimelinking" = yes; then
>+	  shared_flag='${wl}-G'
>+	else
>+	  shared_flag='${wl}-bM:SRE'
>+	fi
>+      fi
>+    fi
> 
>-# The default C compiler.
>-CC=$lt_CC
>+    # It seems that -bexpall does not export symbols beginning with
>+    # underscore (_), so it is better to generate a list of symbols to export.
>+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
>+    if test "$aix_use_runtimelinking" = yes; then
>+      # Warning - without using the other runtime loading flags (-brtl),
>+      # -berok will link without error, but may produce a broken library.
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
>+      # Determine the default libpath from the value encoded in an empty executable.
>+      _LT_AC_SYS_LIBPATH_AIX
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
> 
>-# Is the compiler the GNU C compiler?
>-with_gcc=$GCC
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+     else
>+      if test "$host_cpu" = ia64; then
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>+      else
>+	# Determine the default libpath from the value encoded in an empty executable.
>+	_LT_AC_SYS_LIBPATH_AIX
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	# Warning - without using the other run time loading flags,
>+	# -berok will link without error, but may produce a broken library.
>+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
>+	# Exported symbols can be pulled into shared objects from archives
>+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
>+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
>+	# This is similar to how AIX traditionally builds its shared libraries.
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+      fi
>+    fi
>+    ;;
> 
>-# The linker used to build libraries.
>-LD=$lt_LD
>+  beos*)
>+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+      # support --undefined.  This deserves some investigation.  FIXME
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+    else
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    fi
>+    ;;
> 
>-# Whether we need hard or soft links.
>-LN_S=$lt_LN_S
>+  chorus*)
>+    case $cc_basename in
>+      *)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+    esac
>+    ;;
> 
>-# A BSD-compatible nm program.
>-NM=$lt_NM
>+  cygwin* | mingw* | pw32*)
>+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
>+    # as there is no search path for DLLs.
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
>+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
>+
>+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+      # If the export-symbols file already is a .def file (1st line
>+      # is EXPORTS), use it as is; otherwise, prepend...
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>+	cp $export_symbols $output_objdir/$soname.def;
>+      else
>+	echo EXPORTS > $output_objdir/$soname.def;
>+	cat $export_symbols >> $output_objdir/$soname.def;
>+      fi~
>+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+    else
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    fi
>+  ;;
>+      darwin* | rhapsody*)
>+        case $host_os in
>+        rhapsody* | darwin1.[[012]])
>+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
>+         ;;
>+       *) # Darwin 1.3 on
>+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+         else
>+           case ${MACOSX_DEPLOYMENT_TARGET} in
>+             10.[[012]])
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+               ;;
>+             10.*)
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
>+               ;;
>+           esac
>+         fi
>+         ;;
>+        esac
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+
>+    if test "$GXX" = yes ; then
>+      lt_int_apple_cc_single_mod=no
>+      output_verbose_link_cmd='echo'
>+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
>+       lt_int_apple_cc_single_mod=yes
>+      fi
>+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      else
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+        fi
>+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          else
>+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          fi
>+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+          ;;
>+      esac
>+      fi
>+        ;;
> 
>-# A symbol stripping program
>-STRIP=$STRIP
>+  dgux*)
>+    case $cc_basename in
>+      ec++*)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      ghcx*)
>+	# Green Hills C++ Compiler
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+    esac
>+    ;;
>+  freebsd[[12]]*)
>+    # C++ shared libraries reported to be fairly broken before switch to ELF
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  freebsd-elf*)
>+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+    ;;
>+  freebsd* | kfreebsd*-gnu | dragonfly*)
>+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
>+    # conventions
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
>+    ;;
>+  gnu*)
>+    ;;
>+  hpux9*)
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
>+				# but as the default
>+				# location of the library.
>+
>+    case $cc_basename in
>+    CC*)
>+      # FIXME: insert proper C++ library support
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      ;;
>+    aCC*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      # Commands to make compiler produce verbose output that lists
>+      # what "hidden" libraries, object files and flags are used when
>+      # linking a shared library.
>+      #
>+      # There doesn't appear to be a way to prevent this compiler from
>+      # explicitly linking system object files so we need to strip them
>+      # from the output so that they don't get included in the library
>+      # dependencies.
>+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+      ;;
>+    *)
>+      if test "$GXX" = yes; then
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      else
>+        # FIXME: insert proper C++ library support
>+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      fi
>+      ;;
>+    esac
>+    ;;
>+  hpux10*|hpux11*)
>+    if test $with_gnu_ld = no; then
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
>+        ;;
>+      *)
>+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+        ;;
>+      esac
>+    fi
>+    case $host_cpu in
>+    hppa*64*|ia64*)
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
>+    *)
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
>+					      # but as the default
>+					      # location of the library.
>+      ;;
>+    esac
> 
>-# Used to examine libraries when file_magic_cmd begins "file"
>-MAGIC_CMD=$MAGIC_CMD
>+    case $cc_basename in
>+      CC*)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      aCC*)
>+	case $host_cpu in
>+	hppa*64*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	  ;;
>+	*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	  ;;
>+	esac
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+      *)
>+	if test "$GXX" = yes; then
>+	  if test $with_gnu_ld = no; then
>+	    case $host_cpu in
>+	    hppa*64*)
>+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	      ;;
>+	    ia64*)
>+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	      ;;
>+	    *)
>+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	      ;;
>+	    esac
>+	  fi
>+	else
>+	  # FIXME: insert proper C++ library support
>+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	fi
>+	;;
>+    esac
>+    ;;
>+  interix3*)
>+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+    # Instead, shared libraries are loaded at an image base (0x10000000 by
>+    # default) and relocated if they conflict, which is a slow very memory
>+    # consuming and fragmenting process.  To avoid this, we pick a random,
>+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    ;;
>+  irix5* | irix6*)
>+    case $cc_basename in
>+      CC*)
>+	# SGI C++
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+
>+	# Archives containing C++ object files must be created using
>+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
>+	# necessary to make sure instantiated templates are included
>+	# in the archive.
>+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
>+	;;
>+      *)
>+	if test "$GXX" = yes; then
>+	  if test "$with_gnu_ld" = no; then
>+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+	  else
>+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
>+	  fi
>+	fi
>+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+	;;
>+    esac
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+    ;;
>+  linux*)
>+    case $cc_basename in
>+      KCC*)
>+	# Kuck and Associates, Inc. (KAI) C++ Compiler
>+
>+	# KCC will only create a shared library if the output file
>+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
>+	# to its proper name (with version) after linking.
>+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
>+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>+
>+	# Archives containing C++ object files must be created using
>+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
>+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
>+	;;
>+      icpc*)
>+	# Intel C++
>+	with_gnu_ld=yes
>+	# version 8.0 and above of icpc choke on multiply defined symbols
>+	# if we add $predep_objects and $postdep_objects, however 7.1 and
>+	# earlier do not add the objects themselves.
>+	case `$CC -V 2>&1` in
>+	*"Version 7."*)
>+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+	  ;;
>+	*)  # Version 8.0 or newer
>+	  tmp_idyn=
>+	  case $host_cpu in
>+	    ia64*) tmp_idyn=' -i_dynamic';;
>+	  esac
>+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+	  ;;
>+	esac
>+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
>+	;;
>+      pgCC*)
>+        # Portland Group C++ compiler
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
>+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
>+
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
>+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+        ;;
>+      cxx*)
>+	# Compaq C++
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
>+
>+	runpath_var=LD_RUN_PATH
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
>+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+    esac
>+    ;;
>+  lynxos*)
>+    # FIXME: insert proper C++ library support
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  m88k*)
>+    # FIXME: insert proper C++ library support
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  mvs*)
>+    case $cc_basename in
>+      cxx*)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+    esac
>+    ;;
>+  netbsd*)
>+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
>+      wlarc=
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    fi
>+    # Workaround some broken pre-1.5 toolchains
>+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
>+    ;;
>+  openbsd2*)
>+    # C++ shared libraries are fairly broken
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  openbsd*)
>+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+    fi
>+    output_verbose_link_cmd='echo'
>+    ;;
>+  osf3*)
>+    case $cc_basename in
>+      KCC*)
>+	# Kuck and Associates, Inc. (KAI) C++ Compiler
>+
>+	# KCC will only create a shared library if the output file
>+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
>+	# to its proper name (with version) after linking.
>+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
>+
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	# Archives containing C++ object files must be created using
>+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
>+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
> 
>-# Used on cygwin: DLL creation program.
>-DLLTOOL="$DLLTOOL"
>+	;;
>+      RCC*)
>+	# Rational C++ 2.4.1
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      cxx*)
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+      *)
>+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+
>+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	  # Commands to make compiler produce verbose output that lists
>+	  # what "hidden" libraries, object files and flags are used when
>+	  # linking a shared library.
>+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
> 
>-# Used on cygwin: object dumper.
>-OBJDUMP="$OBJDUMP"
>+	else
>+	  # FIXME: insert proper C++ library support
>+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	fi
>+	;;
>+    esac
>+    ;;
>+  osf4* | osf5*)
>+    case $cc_basename in
>+      KCC*)
>+	# Kuck and Associates, Inc. (KAI) C++ Compiler
>+
>+	# KCC will only create a shared library if the output file
>+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
>+	# to its proper name (with version) after linking.
>+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
>+
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	# Archives containing C++ object files must be created using
>+	# the KAI C++ compiler.
>+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
>+	;;
>+      RCC*)
>+	# Rational C++ 2.4.1
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      cxx*)
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
>+	  echo "-hidden">> $lib.exp~
>+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
>+	  $rm $lib.exp'
>+
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
>+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+      *)
>+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+
>+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	  # Commands to make compiler produce verbose output that lists
>+	  # what "hidden" libraries, object files and flags are used when
>+	  # linking a shared library.
>+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
> 
>-# Used on cygwin: assembler.
>-AS="$AS"
>+	else
>+	  # FIXME: insert proper C++ library support
>+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	fi
>+	;;
>+    esac
>+    ;;
>+  psos*)
>+    # FIXME: insert proper C++ library support
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  sunos4*)
>+    case $cc_basename in
>+      CC*)
>+	# Sun C++ 4.x
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      lcc*)
>+	# Lucid
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+    esac
>+    ;;
>+  solaris*)
>+    case $cc_basename in
>+      CC*)
>+	# Sun C++ 4.2, 5.x and Centerline C++
>+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
>+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+	case $host_os in
>+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
>+	  *)
>+	    # The C++ compiler is used as linker so we must use $wl
>+	    # flag to pass the commands to the underlying system
>+	    # linker. We must also pass each convience library through
>+	    # to the system linker between allextract/defaultextract.
>+	    # The C++ compiler will combine linker options so we
>+	    # cannot just pass the convience library names through
>+	    # without $wl.
>+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
>+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
>+	    ;;
>+	esac
>+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> 
>-# The name of the directory that contains temporary libtool files.
>-objdir=$objdir
>+	output_verbose_link_cmd='echo'
> 
>-# How to create reloadable object files.
>-reload_flag=$lt_reload_flag
>-reload_cmds=$lt_reload_cmds
>+	# Archives containing C++ object files must be created using
>+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
>+	# necessary to make sure instantiated templates are included
>+	# in the archive.
>+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
>+	;;
>+      gcx*)
>+	# Green Hills C++ Compiler
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
> 
>-# How to pass a linker flag through the compiler.
>-wl=$lt_wl
>+	# The C++ compiler must be used to create the archive.
>+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
>+	;;
>+      *)
>+	# GNU C++ compiler with Solaris linker
>+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
>+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
>+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
>+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+
>+	    # Commands to make compiler produce verbose output that lists
>+	    # what "hidden" libraries, object files and flags are used when
>+	    # linking a shared library.
>+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
>+	  else
>+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
>+	    # platform.
>+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
>+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+
>+	    # Commands to make compiler produce verbose output that lists
>+	    # what "hidden" libraries, object files and flags are used when
>+	    # linking a shared library.
>+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
>+	  fi
> 
>-# Object file suffix (normally "o").
>-objext="$ac_objext"
>+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
>+	fi
>+	;;
>+    esac
>+    ;;
>+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
>+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    runpath_var='LD_RUN_PATH'
> 
>-# Old archive suffix (normally "a").
>-libext="$libext"
>+    case $cc_basename in
>+      CC*)
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+      *)
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+    esac
>+    ;;
>+  sysv5* | sco3.2v5* | sco5v6*)
>+    # Note: We can NOT use -z defs as we might desire, because we do not
>+    # link with -lc, and that would cause any symbols used from libc to
>+    # always be unresolved, which means just about no library would
>+    # ever link correctly.  If we're not using GNU ld we use -z text
>+    # though, which does catch some bad symbols but isn't as heavy-handed
>+    # as -z defs.
>+    # For security reasons, it is highly recommended that you always
>+    # use absolute paths for naming shared libraries, and exclude the
>+    # DT_RUNPATH tag from executables and libraries.  But doing so
>+    # requires that you compile everything twice, which is a pain.
>+    # So that behaviour is only enabled if SCOABSPATH is set to a
>+    # non-empty value in the environment.  Most likely only useful for
>+    # creating official distributions of packages.
>+    # This is a hack until libtool officially supports absolute path
>+    # names for shared libraries.
>+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
>+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
>+    runpath_var='LD_RUN_PATH'
>+
>+    case $cc_basename in
>+      CC*)
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+      *)
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+    esac
>+    ;;
>+  tandem*)
>+    case $cc_basename in
>+      NCC*)
>+	# NonStop-UX NCC 3.20
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	;;
>+    esac
>+    ;;
>+  vxworks*)
>+    # FIXME: insert proper C++ library support
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  *)
>+    # FIXME: insert proper C++ library support
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+esac
>+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
>+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
>+
>+_LT_AC_TAGVAR(GCC, $1)="$GXX"
>+_LT_AC_TAGVAR(LD, $1)="$LD"
>+
>+AC_LIBTOOL_POSTDEP_PREDEP($1)
>+AC_LIBTOOL_PROG_COMPILER_PIC($1)
>+AC_LIBTOOL_PROG_CC_C_O($1)
>+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
>+AC_LIBTOOL_PROG_LD_SHLIBS($1)
>+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
>+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
>+
>+AC_LIBTOOL_CONFIG($1)
>+
>+AC_LANG_POP
>+CC=$lt_save_CC
>+LDCXX=$LD
>+LD=$lt_save_LD
>+GCC=$lt_save_GCC
>+with_gnu_ldcxx=$with_gnu_ld
>+with_gnu_ld=$lt_save_with_gnu_ld
>+lt_cv_path_LDCXX=$lt_cv_path_LD
>+lt_cv_path_LD=$lt_save_path_LD
>+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
>+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
>+])# AC_LIBTOOL_LANG_CXX_CONFIG
>+
>+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
>+# ------------------------------------
>+# Figure out "hidden" library dependencies from verbose
>+# compiler output when linking a shared library.
>+# Parse the compiler output and extract the necessary
>+# objects, libraries and library flags.
>+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
>+dnl we can't use the lt_simple_compile_test_code here,
>+dnl because it contains code intended for an executable,
>+dnl not a library.  It's possible we should let each
>+dnl tag define a new lt_????_link_test_code variable,
>+dnl but it's only used here...
>+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
>+int a;
>+void foo (void) { a = 0; }
>+EOF
>+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
>+class Foo
>+{
>+public:
>+  Foo (void) { a = 0; }
>+private:
>+  int a;
>+};
>+EOF
>+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
>+      subroutine foo
>+      implicit none
>+      integer*4 a
>+      a=0
>+      return
>+      end
>+EOF
>+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
>+public class foo {
>+  private int a;
>+  public void bar (void) {
>+    a = 0;
>+  }
>+};
>+EOF
>+])
>+dnl Parse the compiler output and extract the necessary
>+dnl objects, libraries and library flags.
>+if AC_TRY_EVAL(ac_compile); then
>+  # Parse the compiler output and extract the necessary
>+  # objects, libraries and library flags.
>+
>+  # Sentinel used to keep track of whether or not we are before
>+  # the conftest object file.
>+  pre_test_object_deps_done=no
>+
>+  # The `*' in the case matches for architectures that use `case' in
>+  # $output_verbose_cmd can trigger glob expansion during the loop
>+  # eval without this substitution.
>+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
>+
>+  for p in `eval $output_verbose_link_cmd`; do
>+    case $p in
>+
>+    -L* | -R* | -l*)
>+       # Some compilers place space between "-{L,R}" and the path.
>+       # Remove the space.
>+       if test $p = "-L" \
>+	  || test $p = "-R"; then
>+	 prev=$p
>+	 continue
>+       else
>+	 prev=
>+       fi
>+
>+       if test "$pre_test_object_deps_done" = no; then
>+	 case $p in
>+	 -L* | -R*)
>+	   # Internal compiler library paths should come after those
>+	   # provided the user.  The postdeps already come after the
>+	   # user supplied libs so there is no need to process them.
>+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
>+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
>+	   else
>+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
>+	   fi
>+	   ;;
>+	 # The "-l" case would never come before the object being
>+	 # linked, so don't bother handling this case.
>+	 esac
>+       else
>+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
>+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
>+	 else
>+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
>+	 fi
>+       fi
>+       ;;
>+
>+    *.$objext)
>+       # This assumes that the test object file only shows up
>+       # once in the compiler output.
>+       if test "$p" = "conftest.$objext"; then
>+	 pre_test_object_deps_done=yes
>+	 continue
>+       fi
>+
>+       if test "$pre_test_object_deps_done" = no; then
>+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
>+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
>+	 else
>+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
>+	 fi
>+       else
>+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
>+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
>+	 else
>+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
>+	 fi
>+       fi
>+       ;;
>+
>+    *) ;; # Ignore the rest.
>+
>+    esac
>+  done
>+
>+  # Clean up.
>+  rm -f a.out a.exe
>+else
>+  echo "libtool.m4: error: problem compiling $1 test program"
>+fi
>+
>+$rm -f confest.$objext
>+
>+# PORTME: override above test on systems where it is broken
>+ifelse([$1],[CXX],
>+[case $host_os in
>+interix3*)
>+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
>+  # hack all around it, let's just trust "g++" to DTRT.
>+  _LT_AC_TAGVAR(predep_objects,$1)=
>+  _LT_AC_TAGVAR(postdep_objects,$1)=
>+  _LT_AC_TAGVAR(postdeps,$1)=
>+  ;;
>+
>+solaris*)
>+  case $cc_basename in
>+  CC*)
>+    # Adding this requires a known-good setup of shared libraries for
>+    # Sun compiler versions before 5.6, else PIC objects from an old
>+    # archive will be linked into the output, leading to subtle bugs.
>+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
>+    ;;
>+  esac
>+  ;;
>+esac
>+])
>+
>+case " $_LT_AC_TAGVAR(postdeps, $1) " in
>+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
>+esac
>+])# AC_LIBTOOL_POSTDEP_PREDEP
>+
>+# AC_LIBTOOL_LANG_F77_CONFIG
>+# --------------------------
>+# Ensure that the configuration vars for the C compiler are
>+# suitably defined.  Those variables are subsequently used by
>+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
>+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
>+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
>+[AC_REQUIRE([AC_PROG_F77])
>+AC_LANG_PUSH(Fortran 77)
>+
>+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
>+_LT_AC_TAGVAR(always_export_symbols, $1)=no
>+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
>+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
>+_LT_AC_TAGVAR(hardcode_direct, $1)=no
>+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
>+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
>+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
>+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
>+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
>+_LT_AC_TAGVAR(module_cmds, $1)=
>+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
>+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
>+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
>+_LT_AC_TAGVAR(no_undefined_flag, $1)=
>+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
>+
>+# Source file extension for f77 test sources.
>+ac_ext=f
>+
>+# Object file extension for compiled f77 test sources.
>+objext=o
>+_LT_AC_TAGVAR(objext, $1)=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code="      program t\n      end\n"
>+
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>+_LT_AC_SYS_COMPILER
>+
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
>+
>+# Allow CC to be a program name with arguments.
>+lt_save_CC="$CC"
>+CC=${F77-"f77"}
>+compiler=$CC
>+_LT_AC_TAGVAR(compiler, $1)=$CC
>+_LT_CC_BASENAME([$compiler])
>+
>+AC_MSG_CHECKING([if libtool supports shared libraries])
>+AC_MSG_RESULT([$can_build_shared])
>+
>+AC_MSG_CHECKING([whether to build shared libraries])
>+test "$can_build_shared" = "no" && enable_shared=no
>+
>+# On AIX, shared libraries and static libraries use the same namespace, and
>+# are all built from PIC.
>+case $host_os in
>+aix3*)
>+  test "$enable_shared" = yes && enable_static=no
>+  if test -n "$RANLIB"; then
>+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
>+    postinstall_cmds='$RANLIB $lib'
>+  fi
>+  ;;
>+aix4* | aix5*)
>+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>+    test "$enable_shared" = yes && enable_static=no
>+  fi
>+  ;;
>+esac
>+AC_MSG_RESULT([$enable_shared])
>+
>+AC_MSG_CHECKING([whether to build static libraries])
>+# Make sure either enable_shared or enable_static is yes.
>+test "$enable_shared" = yes || enable_static=yes
>+AC_MSG_RESULT([$enable_static])
>+
>+_LT_AC_TAGVAR(GCC, $1)="$G77"
>+_LT_AC_TAGVAR(LD, $1)="$LD"
>+
>+AC_LIBTOOL_PROG_COMPILER_PIC($1)
>+AC_LIBTOOL_PROG_CC_C_O($1)
>+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
>+AC_LIBTOOL_PROG_LD_SHLIBS($1)
>+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
>+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
>+
>+AC_LIBTOOL_CONFIG($1)
>+
>+AC_LANG_POP
>+CC="$lt_save_CC"
>+])# AC_LIBTOOL_LANG_F77_CONFIG
>+
>+
>+# AC_LIBTOOL_LANG_GCJ_CONFIG
>+# --------------------------
>+# Ensure that the configuration vars for the C compiler are
>+# suitably defined.  Those variables are subsequently used by
>+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
>+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
>+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
>+[AC_LANG_SAVE
>+
>+# Source file extension for Java test sources.
>+ac_ext=java
>+
>+# Object file extension for compiled Java test sources.
>+objext=o
>+_LT_AC_TAGVAR(objext, $1)=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="class foo {}\n"
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
>+
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>+_LT_AC_SYS_COMPILER
>+
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
>+
>+# Allow CC to be a program name with arguments.
>+lt_save_CC="$CC"
>+CC=${GCJ-"gcj"}
>+compiler=$CC
>+_LT_AC_TAGVAR(compiler, $1)=$CC
>+_LT_CC_BASENAME([$compiler])
>+
>+# GCJ did not exist at the time GCC didn't implicitly link libc in.
>+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+
>+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
>+
>+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
>+AC_LIBTOOL_PROG_COMPILER_PIC($1)
>+AC_LIBTOOL_PROG_CC_C_O($1)
>+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
>+AC_LIBTOOL_PROG_LD_SHLIBS($1)
>+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
>+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
>+
>+AC_LIBTOOL_CONFIG($1)
>+
>+AC_LANG_RESTORE
>+CC="$lt_save_CC"
>+])# AC_LIBTOOL_LANG_GCJ_CONFIG
>+
>+
>+# AC_LIBTOOL_LANG_RC_CONFIG
>+# -------------------------
>+# Ensure that the configuration vars for the Windows resource compiler are
>+# suitably defined.  Those variables are subsequently used by
>+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
>+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
>+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
>+[AC_LANG_SAVE
>+
>+# Source file extension for RC test sources.
>+ac_ext=rc
>+
>+# Object file extension for compiled RC test sources.
>+objext=o
>+_LT_AC_TAGVAR(objext, $1)=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code="$lt_simple_compile_test_code"
>+
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>+_LT_AC_SYS_COMPILER
>+
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
>+
>+# Allow CC to be a program name with arguments.
>+lt_save_CC="$CC"
>+CC=${RC-"windres"}
>+compiler=$CC
>+_LT_AC_TAGVAR(compiler, $1)=$CC
>+_LT_CC_BASENAME([$compiler])
>+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
>+
>+AC_LIBTOOL_CONFIG($1)
>+
>+AC_LANG_RESTORE
>+CC="$lt_save_CC"
>+])# AC_LIBTOOL_LANG_RC_CONFIG
>+
>+
>+# AC_LIBTOOL_CONFIG([TAGNAME])
>+# ----------------------------
>+# If TAGNAME is not passed, then create an initial libtool script
>+# with a default configuration from the untagged config vars.  Otherwise
>+# add code to config.status for appending the configuration named by
>+# TAGNAME from the matching tagged config vars.
>+AC_DEFUN([AC_LIBTOOL_CONFIG],
>+[# The else clause should only fire when bootstrapping the
>+# libtool distribution, otherwise you forgot to ship ltmain.sh
>+# with your package, and you will get complaints that there are
>+# no rules to generate ltmain.sh.
>+if test -f "$ltmain"; then
>+  # See if we are running on zsh, and set the options which allow our commands through
>+  # without removal of \ escapes.
>+  if test -n "${ZSH_VERSION+set}" ; then
>+    setopt NO_GLOB_SUBST
>+  fi
>+  # Now quote all the things that may contain metacharacters while being
>+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>+  # variables and quote the copies for generation of the libtool script.
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>+    SED SHELL STRIP \
>+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>+    deplibs_check_method reload_flag reload_cmds need_locks \
>+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>+    lt_cv_sys_global_symbol_to_c_name_address \
>+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>+    old_postinstall_cmds old_postuninstall_cmds \
>+    _LT_AC_TAGVAR(compiler, $1) \
>+    _LT_AC_TAGVAR(CC, $1) \
>+    _LT_AC_TAGVAR(LD, $1) \
>+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
>+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
>+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
>+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
>+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
>+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
>+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
>+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
>+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
>+    _LT_AC_TAGVAR(predep_objects, $1) \
>+    _LT_AC_TAGVAR(postdep_objects, $1) \
>+    _LT_AC_TAGVAR(predeps, $1) \
>+    _LT_AC_TAGVAR(postdeps, $1) \
>+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
>+    _LT_AC_TAGVAR(archive_cmds, $1) \
>+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
>+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
>+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
>+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
>+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
>+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
>+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
>+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
>+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
>+    _LT_AC_TAGVAR(module_cmds, $1) \
>+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
>+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
>+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
>+    _LT_AC_TAGVAR(include_expsyms, $1); do
>+
>+    case $var in
>+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
>+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
>+    _LT_AC_TAGVAR(archive_cmds, $1) | \
>+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
>+    _LT_AC_TAGVAR(module_cmds, $1) | \
>+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
>+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
>+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
>+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>+    postinstall_cmds | postuninstall_cmds | \
>+    old_postinstall_cmds | old_postuninstall_cmds | \
>+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>+      # Double-quote double-evaled strings.
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>+      ;;
>+    *)
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>+      ;;
>+    esac
>+  done
>+
>+  case $lt_echo in
>+  *'\[$]0 --fallback-echo"')
>+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
>+    ;;
>+  esac
>+
>+ifelse([$1], [],
>+  [cfgfile="${ofile}T"
>+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
>+  $rm -f "$cfgfile"
>+  AC_MSG_NOTICE([creating $ofile])],
>+  [cfgfile="$ofile"])
>+
>+  cat <<__EOF__ >> "$cfgfile"
>+ifelse([$1], [],
>+[#! $SHELL
>+
>+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
>+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
>+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
>+#
>+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
>+# Free Software Foundation, Inc.
>+#
>+# This file is part of GNU Libtool:
>+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
>+#
>+# This program is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 2 of the License, or
>+# (at your option) any later version.
>+#
>+# This program is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+# General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>+#
>+# As a special exception to the GNU General Public License, if you
>+# distribute this file as part of a program that contains a
>+# configuration script generated by Autoconf, you may include it under
>+# the same distribution terms that you use for the rest of that program.
>+
>+# A sed program that does not truncate output.
>+SED=$lt_SED
>+
>+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
>+Xsed="$SED -e 1s/^X//"
>+
>+# The HP-UX ksh and POSIX shell print the target directory to stdout
>+# if CDPATH is set.
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
>+
>+# The names of the tagged configurations supported by this script.
>+available_tags=
>+
>+# ### BEGIN LIBTOOL CONFIG],
>+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
>+
>+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>+
>+# Shell to use when invoking shell scripts.
>+SHELL=$lt_SHELL
>+
>+# Whether or not to build shared libraries.
>+build_libtool_libs=$enable_shared
>+
>+# Whether or not to build static libraries.
>+build_old_libs=$enable_static
>+
>+# Whether or not to add -lc for building shared libraries.
>+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
>+
>+# Whether or not to disallow shared libs when runtime libs are static
>+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
>+
>+# Whether or not to optimize for fast installation.
>+fast_install=$enable_fast_install
>+
>+# The host system.
>+host_alias=$host_alias
>+host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
>+
>+# An echo program that does not interpret backslashes.
>+echo=$lt_echo
>+
>+# The archiver.
>+AR=$lt_AR
>+AR_FLAGS=$lt_AR_FLAGS
>+
>+# A C compiler.
>+LTCC=$lt_LTCC
>+
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
>+# A language-specific compiler.
>+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
>+
>+# Is the compiler the GNU C compiler?
>+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
>+
>+# An ERE matcher.
>+EGREP=$lt_EGREP
>+
>+# The linker used to build libraries.
>+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
>+
>+# Whether we need hard or soft links.
>+LN_S=$lt_LN_S
>+
>+# A BSD-compatible nm program.
>+NM=$lt_NM
>+
>+# A symbol stripping program
>+STRIP=$lt_STRIP
>+
>+# Used to examine libraries when file_magic_cmd begins "file"
>+MAGIC_CMD=$MAGIC_CMD
>+
>+# Used on cygwin: DLL creation program.
>+DLLTOOL="$DLLTOOL"
>+
>+# Used on cygwin: object dumper.
>+OBJDUMP="$OBJDUMP"
>+
>+# Used on cygwin: assembler.
>+AS="$AS"
>+
>+# The name of the directory that contains temporary libtool files.
>+objdir=$objdir
>+
>+# How to create reloadable object files.
>+reload_flag=$lt_reload_flag
>+reload_cmds=$lt_reload_cmds
>+
>+# How to pass a linker flag through the compiler.
>+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
>+
>+# Object file suffix (normally "o").
>+objext="$ac_objext"
>+
>+# Old archive suffix (normally "a").
>+libext="$libext"
>+
>+# Shared library suffix (normally ".so").
>+shrext_cmds='$shrext_cmds'
> 
> # Executable file suffix (normally "").
> exeext="$exeext"
> 
> # Additional compiler flags for building library objects.
>-pic_flag=$lt_pic_flag
>+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
> pic_mode=$pic_mode
> 
>-# Does compiler simultaneously support -c and -o options?
>-compiler_c_o=$lt_compiler_c_o
>+# What is the maximum length of a command?
>+max_cmd_len=$lt_cv_sys_max_cmd_len
> 
>-# Can we write directly to a .lo ?
>-compiler_o_lo=$lt_compiler_o_lo
>+# Does compiler simultaneously support -c and -o options?
>+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
> 
>-# Must we lock files when doing compilation ?
>+# Must we lock files when doing compilation?
> need_locks=$lt_need_locks
> 
> # Do we need the lib prefix for modules?
>@@ -2557,19 +4388,19 @@
> dlopen_self_static=$enable_dlopen_self_static
> 
> # Compiler flag to prevent dynamic linking.
>-link_static_flag=$lt_link_static_flag
>+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
> 
> # Compiler flag to turn off builtin functions.
>-no_builtin_flag=$lt_no_builtin_flag
>+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
> 
> # Compiler flag to allow reflexive dlopens.
>-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
>+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
> 
> # Compiler flag to generate shared objects directly from archives.
>-whole_archive_flag_spec=$lt_whole_archive_flag_spec
>+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
> 
> # Compiler flag to generate thread-safe objects.
>-thread_safe_flag_spec=$lt_thread_safe_flag_spec
>+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
> 
> # Library versioning type.
> version_type=$version_type
>@@ -2586,26 +4417,50 @@
> 
> # Commands used to build and install an old-style archive.
> RANLIB=$lt_RANLIB
>-old_archive_cmds=$lt_old_archive_cmds
>+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
> old_postinstall_cmds=$lt_old_postinstall_cmds
> old_postuninstall_cmds=$lt_old_postuninstall_cmds
> 
> # Create an old-style archive from a shared archive.
>-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
>+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
> 
> # Create a temporary old-style archive to link instead of a shared archive.
>-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
>+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
> 
> # Commands used to build and install a shared archive.
>-archive_cmds=$lt_archive_cmds
>-archive_expsym_cmds=$lt_archive_expsym_cmds
>+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
>+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
> postinstall_cmds=$lt_postinstall_cmds
> postuninstall_cmds=$lt_postuninstall_cmds
> 
>+# Commands used to build a loadable module (assumed same as above if empty)
>+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
>+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
>+
> # Commands to strip libraries.
> old_striplib=$lt_old_striplib
> striplib=$lt_striplib
> 
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
>+
>+# The library search path used internally by the compiler when linking
>+# a shared library.
>+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
>+
> # Method to check whether dependent libraries are shared objects.
> deplibs_check_method=$lt_deplibs_check_method
> 
>@@ -2613,10 +4468,10 @@
> file_magic_cmd=$lt_file_magic_cmd
> 
> # Flag that allows shared libraries with undefined symbols to be built.
>-allow_undefined_flag=$lt_allow_undefined_flag
>+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
> 
> # Flag that forces no undefined symbols.
>-no_undefined_flag=$lt_no_undefined_flag
>+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
> 
> # Commands used to finish a libtool library installation in a directory.
> finish_cmds=$lt_finish_cmds
>@@ -2625,13 +4480,13 @@
> finish_eval=$lt_finish_eval
> 
> # Take the output of nm and produce a listing of raw symbols and C names.
>-global_symbol_pipe=$lt_global_symbol_pipe
>+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
> 
> # Transform the output of nm in a proper C declaration
>-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
>+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
> 
> # Transform the output of nm in a C name address pair
>-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
>+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
> 
> # This is the shared library runtime path variable.
> runpath_var=$runpath_var
>@@ -2643,36 +4498,45 @@
> shlibpath_overrides_runpath=$shlibpath_overrides_runpath
> 
> # How to hardcode a shared library path into an executable.
>-hardcode_action=$hardcode_action
>+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
> 
> # Whether we should hardcode library paths into libraries.
> hardcode_into_libs=$hardcode_into_libs
> 
> # Flag to hardcode \$libdir into a binary during linking.
> # This must work even if \$libdir does not exist.
>-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
>+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
>+
>+# If ld is used when linking, flag to hardcode \$libdir into
>+# a binary during linking. This must work even if \$libdir does
>+# not exist.
>+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
> 
> # Whether we need a single -rpath flag with a separated argument.
>-hardcode_libdir_separator=$lt_hardcode_libdir_separator
>+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
> 
>-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
>+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
> # resulting binary.
>-hardcode_direct=$hardcode_direct
>+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
> 
> # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
> # resulting binary.
>-hardcode_minus_L=$hardcode_minus_L
>+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
> 
> # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
> # the resulting binary.
>-hardcode_shlibpath_var=$hardcode_shlibpath_var
>+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
>+
>+# Set to yes if building a shared library automatically hardcodes DIR into the library
>+# and all subsequent libraries and executables linked against it.
>+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
> 
> # Variables whose values should be saved in libtool wrapper scripts and
> # restored at relink time.
> variables_saved_for_relink="$variables_saved_for_relink"
> 
> # Whether libtool must link a program against all its dependency libraries.
>-link_all_deplibs=$link_all_deplibs
>+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
> 
> # Compile-time system search path for libraries
> sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>@@ -2681,30 +4545,33 @@
> sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
> 
> # Fix the shell variable \$srcfile for the compiler.
>-fix_srcfile_path="$fix_srcfile_path"
>+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
> 
> # Set to yes if exported symbols are required.
>-always_export_symbols=$always_export_symbols
>+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
> 
> # The commands to list exported symbols.
>-export_symbols_cmds=$lt_export_symbols_cmds
>+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
> 
> # The commands to extract the exported symbol list from a shared archive.
> extract_expsyms_cmds=$lt_extract_expsyms_cmds
> 
> # Symbols that should not be listed in the preloaded symbols.
>-exclude_expsyms=$lt_exclude_expsyms
>+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
> 
> # Symbols that must always be exported.
>-include_expsyms=$lt_include_expsyms
>+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
> 
>-# ### END LIBTOOL CONFIG
>+ifelse([$1],[],
>+[# ### END LIBTOOL CONFIG],
>+[# ### END LIBTOOL TAG CONFIG: $tagname])
> 
> __EOF__
> 
>+ifelse([$1],[], [
>   case $host_os in
>   aix3*)
>-    cat <<\EOF >> "${ofile}T"
>+    cat <<\EOF >> "$cfgfile"
> 
> # AIX sometimes has problems with the GCC collect2 program.  For some
> # reason, if we set the COLLECT_NAMES environment variable, the problems
>@@ -2717,1469 +4584,1875 @@
>     ;;
>   esac
> 
>-  case $host_os in
>-  cygwin* | mingw* | pw32* | os2*)
>-    cat <<'EOF' >> "${ofile}T"
>-      # This is a source program that is used to create dlls on Windows
>-      # Don't remove nor modify the starting and closing comments
>-# /* ltdll.c starts here */
>-# #define WIN32_LEAN_AND_MEAN
>-# #include <windows.h>
>-# #undef WIN32_LEAN_AND_MEAN
>-# #include <stdio.h>
>-#
>-# #ifndef __CYGWIN__
>-# #  ifdef __CYGWIN32__
>-# #    define __CYGWIN__ __CYGWIN32__
>-# #  endif
>-# #endif
>-#
>-# #ifdef __cplusplus
>-# extern "C" {
>-# #endif
>-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
>-# #ifdef __cplusplus
>-# }
>-# #endif
>-#
>-# #ifdef __CYGWIN__
>-# #include <cygwin/cygwin_dll.h>
>-# DECLARE_CYGWIN_DLL( DllMain );
>-# #endif
>-# HINSTANCE __hDllInstance_base;
>-#
>-# BOOL APIENTRY
>-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
>-# {
>-#   __hDllInstance_base = hInst;
>-#   return TRUE;
>-# }
>-# /* ltdll.c ends here */
>-	# This is a source program that is used to create import libraries
>-	# on Windows for dlls which lack them. Don't remove nor modify the
>-	# starting and closing comments
>-# /* impgen.c starts here */
>-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
>-#
>-#  This file is part of GNU libtool.
>-#
>-#  This program is free software; you can redistribute it and/or modify
>-#  it under the terms of the GNU General Public License as published by
>-#  the Free Software Foundation; either version 2 of the License, or
>-#  (at your option) any later version.
>-#
>-#  This program is distributed in the hope that it will be useful,
>-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
>-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-#  GNU General Public License for more details.
>-#
>-#  You should have received a copy of the GNU General Public License
>-#  along with this program; if not, write to the Free Software
>-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-#  */
>-#
>-# #include <stdio.h>		/* for printf() */
>-# #include <unistd.h>		/* for open(), lseek(), read() */
>-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
>-# #include <string.h>		/* for strdup() */
>-#
>-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
>-# #ifndef O_BINARY
>-# #define O_BINARY 0
>-# #endif
>-#
>-# static unsigned int
>-# pe_get16 (fd, offset)
>-#      int fd;
>-#      int offset;
>-# {
>-#   unsigned char b[2];
>-#   lseek (fd, offset, SEEK_SET);
>-#   read (fd, b, 2);
>-#   return b[0] + (b[1]<<8);
>-# }
>-#
>-# static unsigned int
>-# pe_get32 (fd, offset)
>-#     int fd;
>-#     int offset;
>-# {
>-#   unsigned char b[4];
>-#   lseek (fd, offset, SEEK_SET);
>-#   read (fd, b, 4);
>-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
>-# }
>-#
>-# static unsigned int
>-# pe_as32 (ptr)
>-#      void *ptr;
>-# {
>-#   unsigned char *b = ptr;
>-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
>-# }
>-#
>-# int
>-# main (argc, argv)
>-#     int argc;
>-#     char *argv[];
>-# {
>-#     int dll;
>-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
>-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
>-#     unsigned long name_rvas, nexp;
>-#     unsigned char *expdata, *erva;
>-#     char *filename, *dll_name;
>-#
>-#     filename = argv[1];
>-#
>-#     dll = open(filename, O_RDONLY|O_BINARY);
>-#     if (dll < 1)
>-# 	return 1;
>-#
>-#     dll_name = filename;
>-#
>-#     for (i=0; filename[i]; i++)
>-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
>-# 	    dll_name = filename + i +1;
>-#
>-#     pe_header_offset = pe_get32 (dll, 0x3c);
>-#     opthdr_ofs = pe_header_offset + 4 + 20;
>-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
>-#
>-#     if (num_entries < 1) /* no exports */
>-# 	return 1;
>-#
>-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
>-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
>-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
>-#     secptr = (pe_header_offset + 4 + 20 +
>-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
>-#
>-#     expptr = 0;
>-#     for (i = 0; i < nsections; i++)
>-#     {
>-# 	char sname[8];
>-# 	unsigned long secptr1 = secptr + 40 * i;
>-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
>-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
>-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
>-# 	lseek(dll, secptr1, SEEK_SET);
>-# 	read(dll, sname, 8);
>-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
>-# 	{
>-# 	    expptr = fptr + (export_rva - vaddr);
>-# 	    if (export_rva + export_size > vaddr + vsize)
>-# 		export_size = vsize - (export_rva - vaddr);
>-# 	    break;
>-# 	}
>-#     }
>-#
>-#     expdata = (unsigned char*)malloc(export_size);
>-#     lseek (dll, expptr, SEEK_SET);
>-#     read (dll, expdata, export_size);
>-#     erva = expdata - export_rva;
>-#
>-#     nexp = pe_as32 (expdata+24);
>-#     name_rvas = pe_as32 (expdata+32);
>-#
>-#     printf ("EXPORTS\n");
>-#     for (i = 0; i<nexp; i++)
>-#     {
>-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
>-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
>-#     }
>-#
>-#     return 0;
>-# }
>-# /* impgen.c ends here */
>-
>-EOF
>-    ;;
>-  esac
>-
>   # We use sed instead of cat because bash on DJGPP gets confused if
>   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
>   # text mode, it properly converts lines to CR/LF.  This bash problem
>   # is reportedly fixed, but why not run on old versions too?
>-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
>+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
> 
>-  mv -f "${ofile}T" "$ofile" || \
>-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
>+  mv -f "$cfgfile" "$ofile" || \
>+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
>   chmod +x "$ofile"
>+])
>+else
>+  # If there is no Makefile yet, we rely on a make rule to execute
>+  # `config.status --recheck' to rerun these tests and create the
>+  # libtool script then.
>+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>+  if test -f "$ltmain_in"; then
>+    test -f Makefile && make "$ltmain"
>+  fi
> fi
>+])# AC_LIBTOOL_CONFIG
> 
>-])# _LT_AC_LTCONFIG_HACK
> 
>-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
>-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
>+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
>+# -------------------------------------------
>+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
>+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
> 
>-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
>-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
>+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
> 
>-# AC_ENABLE_SHARED - implement the --enable-shared flag
>-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
>-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
>-#   `yes'.
>-AC_DEFUN([AC_ENABLE_SHARED],
>-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
>-AC_ARG_ENABLE(shared,
>-changequote(<<, >>)dnl
>-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
>-changequote([, ])dnl
>-[p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_shared=yes ;;
>-no) enable_shared=no ;;
>-*)
>-  enable_shared=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_shared=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac],
>-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
>-])
>-
>-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
>-AC_DEFUN([AC_DISABLE_SHARED],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-AC_ENABLE_SHARED(no)])
>+if test "$GCC" = yes; then
>+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
> 
>-# AC_ENABLE_STATIC - implement the --enable-static flag
>-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
>-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
>-#   `yes'.
>-AC_DEFUN([AC_ENABLE_STATIC],
>-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
>-AC_ARG_ENABLE(static,
>-changequote(<<, >>)dnl
>-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
>-changequote([, ])dnl
>-[p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_static=yes ;;
>-no) enable_static=no ;;
>-*)
>-  enable_static=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_static=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac],
>-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
>-])
>+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
>+    lt_cv_prog_compiler_rtti_exceptions,
>+    [-fno-rtti -fno-exceptions], [],
>+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
>+fi
>+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
> 
>-# AC_DISABLE_STATIC - set the default static flag to --disable-static
>-AC_DEFUN([AC_DISABLE_STATIC],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-AC_ENABLE_STATIC(no)])
> 
>+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
>+# ---------------------------------
>+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
>+[AC_REQUIRE([AC_CANONICAL_HOST])
>+AC_REQUIRE([AC_PROG_NM])
>+AC_REQUIRE([AC_OBJEXT])
>+# Check for command to grab the raw symbol name followed by C symbol from nm.
>+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
>+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
>+[
>+# These are sane defaults that work on at least a few old systems.
>+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
> 
>-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
>-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
>-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
>-#   `yes'.
>-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
>-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
>-AC_ARG_ENABLE(fast-install,
>-changequote(<<, >>)dnl
>-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
>-changequote([, ])dnl
>-[p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_fast_install=yes ;;
>-no) enable_fast_install=no ;;
>-*)
>-  enable_fast_install=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_fast_install=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac],
>-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
>-])
>+# Character class describing NM global symbol codes.
>+symcode='[[BCDEGRST]]'
> 
>-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
>-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-AC_ENABLE_FAST_INSTALL(no)])
>+# Regexp to match symbols that can be accessed directly from C.
>+sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
> 
>-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
>-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
>-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
>-#   `both'.
>-AC_DEFUN([AC_LIBTOOL_PICMODE],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-pic_mode=ifelse($#,1,$1,default)])
>+# Transform an extracted symbol line into a proper C declaration
>+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'"
> 
>+# Transform an extracted symbol line into symbol name and symbol address
>+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
> 
>-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
>-AC_DEFUN([AC_PATH_TOOL_PREFIX],
>-[AC_MSG_CHECKING([for $1])
>-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
>-[case $MAGIC_CMD in
>-  /*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
>+# Define system-specific variables.
>+case $host_os in
>+aix*)
>+  symcode='[[BCDT]]'
>   ;;
>-  ?:/*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
>+cygwin* | mingw* | pw32*)
>+  symcode='[[ABCDGISTW]]'
>   ;;
>-  *)
>-  ac_save_MAGIC_CMD="$MAGIC_CMD"
>-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
>-dnl $ac_dummy forces splitting on constant user-supplied paths.
>-dnl POSIX.2 word splitting is done only on the output of word expansions,
>-dnl not every word.  This closes a longstanding sh security hole.
>-  ac_dummy="ifelse([$2], , $PATH, [$2])"
>-  for ac_dir in $ac_dummy; do
>-    test -z "$ac_dir" && ac_dir=.
>-    if test -f $ac_dir/$1; then
>-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
>-      if test -n "$file_magic_test_file"; then
>-	case $deplibs_check_method in
>-	"file_magic "*)
>-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
>-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>-	    egrep "$file_magic_regex" > /dev/null; then
>-	    :
>-	  else
>-	    cat <<EOF 1>&2
>-
>-*** Warning: the command libtool uses to detect shared libraries,
>-*** $file_magic_cmd, produces output that libtool cannot recognize.
>-*** The result is that libtool may fail to recognize shared libraries
>-*** as such.  This will affect the creation of libtool libraries that
>-*** depend on shared libraries, but programs linked with such libtool
>-*** libraries will work regardless of this problem.  Nevertheless, you
>-*** may want to report the problem to your system manager and/or to
>-*** bug-libtool@gnu.org
>+hpux*) # Its linker distinguishes data from code symbols
>+  if test "$host_cpu" = ia64; then
>+    symcode='[[ABCDEGRST]]'
>+  fi
>+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>+  ;;
>+linux*)
>+  if test "$host_cpu" = ia64; then
>+    symcode='[[ABCDGIRSTW]]'
>+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>+  fi
>+  ;;
>+irix* | nonstopux*)
>+  symcode='[[BCDEGRST]]'
>+  ;;
>+osf*)
>+  symcode='[[BCDEGQRST]]'
>+  ;;
>+solaris*)
>+  symcode='[[BDRT]]'
>+  ;;
>+sco3.2v5*)
>+  symcode='[[DT]]'
>+  ;;
>+sysv4.2uw2*)
>+  symcode='[[DT]]'
>+  ;;
>+sysv5* | sco5v6* | unixware* | OpenUNIX*)
>+  symcode='[[ABDT]]'
>+  ;;
>+sysv4)
>+  symcode='[[DFNSTU]]'
>+  ;;
>+esac
> 
>-EOF
>-	  fi ;;
>-	esac
>-      fi
>-      break
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  MAGIC_CMD="$ac_save_MAGIC_CMD"
>+# Handle CRLF in mingw tool chain
>+opt_cr=
>+case $build_os in
>+mingw*)
>+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
>   ;;
>-esac])
>-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-if test -n "$MAGIC_CMD"; then
>-  AC_MSG_RESULT($MAGIC_CMD)
>-else
>-  AC_MSG_RESULT(no)
>-fi
>-])
>+esac
> 
>+# If we're using GNU nm, then use its standard symbol codes.
>+case `$NM -V 2>&1` in
>+*GNU* | *'with BFD'*)
>+  symcode='[[ABCDGIRSTW]]' ;;
>+esac
> 
>-# AC_PATH_MAGIC - find a file program which can recognise a shared library
>-AC_DEFUN([AC_PATH_MAGIC],
>-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
>-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
>-if test -z "$lt_cv_path_MAGIC_CMD"; then
>-  if test -n "$ac_tool_prefix"; then
>-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
>-  else
>-    MAGIC_CMD=:
>-  fi
>-fi
>-])
>+# Try without a prefix undercore, then with it.
>+for ac_symprfx in "" "_"; do
> 
>+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
>+  symxfrm="\\1 $ac_symprfx\\2 \\2"
> 
>-# AC_PROG_LD - find the path to the GNU or non-GNU linker
>-AC_DEFUN([AC_PROG_LD],
>-[AC_ARG_WITH(gnu-ld,
>-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
>-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
>-AC_REQUIRE([AC_PROG_CC])dnl
>-AC_REQUIRE([AC_CANONICAL_HOST])dnl
>-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
>-AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
>-ac_prog=ld
>-if test "$GCC" = yes; then
>-  # Check if gcc -print-prog-name=ld gives a path.
>-  AC_MSG_CHECKING([for ld used by GCC])
>-  case $host in
>-  *-*-mingw*)
>-    # gcc leaves a trailing carriage return which upsets mingw
>-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
>-  *)
>-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
>-  esac
>-  case $ac_prog in
>-    # Accept absolute paths.
>-    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
>-      re_direlt='/[[^/]][[^/]]*/\.\./'
>-      # Canonicalize the path of ld
>-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
>-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
>-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
>-      done
>-      test -z "$LD" && LD="$ac_prog"
>-      ;;
>-  "")
>-    # If it fails, then pretend we aren't using GCC.
>-    ac_prog=ld
>-    ;;
>-  *)
>-    # If it is relative, then search for the first ld in PATH.
>-    with_gnu_ld=unknown
>-    ;;
>-  esac
>-elif test "$with_gnu_ld" = yes; then
>-  AC_MSG_CHECKING([for GNU ld])
>-else
>-  AC_MSG_CHECKING([for non-GNU ld])
>-fi
>-AC_CACHE_VAL(lt_cv_path_LD,
>-[if test -z "$LD"; then
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for ac_dir in $PATH; do
>-    test -z "$ac_dir" && ac_dir=.
>-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>-      lt_cv_path_LD="$ac_dir/$ac_prog"
>-      # Check to see if the program is GNU ld.  I'd rather use --version,
>-      # but apparently some GNU ld's only accept -v.
>-      # Break only if it was the GNU/non-GNU ld that we prefer.
>-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
>-	test "$with_gnu_ld" != no && break
>-      else
>-	test "$with_gnu_ld" != yes && break
>-      fi
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-else
>-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
>-fi])
>-LD="$lt_cv_path_LD"
>-if test -n "$LD"; then
>-  AC_MSG_RESULT($LD)
>-else
>-  AC_MSG_RESULT(no)
>-fi
>-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
>-AC_PROG_LD_GNU
>-])
>+  # Write the raw and C identifiers.
>+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]$$symcode$symcode*$[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
> 
>-# AC_PROG_LD_GNU -
>-AC_DEFUN([AC_PROG_LD_GNU],
>-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
>-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
>-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
>-  lt_cv_prog_gnu_ld=yes
>-else
>-  lt_cv_prog_gnu_ld=no
>-fi])
>-with_gnu_ld=$lt_cv_prog_gnu_ld
>-])
>+  # Check to see that the pipe works correctly.
>+  pipe_works=no
> 
>-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
>-#   -- PORTME Some linkers may need a different reload flag.
>-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
>-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
>-[lt_cv_ld_reload_flag='-r'])
>-reload_flag=$lt_cv_ld_reload_flag
>-test -n "$reload_flag" && reload_flag=" $reload_flag"
>-])
>+  rm -f conftest*
>+  cat > conftest.$ac_ext <<EOF
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+char nm_test_var;
>+void nm_test_func(){}
>+#ifdef __cplusplus
>+}
>+#endif
>+int main(){nm_test_var='a';nm_test_func();return(0);}
>+EOF
> 
>-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
>-#  -- PORTME fill in with the dynamic library characteristics
>-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
>-[AC_CACHE_CHECK([how to recognise dependant libraries],
>-lt_cv_deplibs_check_method,
>-[lt_cv_file_magic_cmd='$MAGIC_CMD'
>-lt_cv_file_magic_test_file=
>-lt_cv_deplibs_check_method='unknown'
>-# Need to set the preceding variable on all platforms that support
>-# interlibrary dependencies.
>-# 'none' -- dependencies not supported.
>-# `unknown' -- same as none, but documents that we really don't know.
>-# 'pass_all' -- all dependencies passed with no checks.
>-# 'test_compile' -- check by making test program.
>-# 'file_magic [[regex]]' -- check by looking for files in library path
>-# which responds to the $file_magic_cmd with a given egrep regex.
>-# If you have `file' or equivalent on your system and you're not sure
>-# whether `pass_all' will *always* work, you probably want this one.
>+  if AC_TRY_EVAL(ac_compile); then
>+    # Now try to grab the symbols.
>+    nlist=conftest.nm
>+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
>+      # Try sorting and uniquifying the output.
>+      if sort "$nlist" | uniq > "$nlist"T; then
>+	mv -f "$nlist"T "$nlist"
>+      else
>+	rm -f "$nlist"T
>+      fi
> 
>-case $host_os in
>-aix4* | aix5*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>+      # Make sure that we snagged all the symbols we need.
>+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
>+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
>+	  cat <<EOF > conftest.$ac_ext
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
> 
>-beos*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>+EOF
>+	  # Now generate the symbol file.
>+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
> 
>-bsdi4*)
>-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
>-  lt_cv_file_magic_cmd='/usr/bin/file -L'
>-  lt_cv_file_magic_test_file=/shlib/libc.so
>-  ;;
>+	  cat <<EOF >> conftest.$ac_ext
>+#if defined (__STDC__) && __STDC__
>+# define lt_ptr_t void *
>+#else
>+# define lt_ptr_t char *
>+# define const
>+#endif
> 
>-cygwin* | mingw* | pw32*)
>-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
>-  lt_cv_file_magic_cmd='$OBJDUMP -f'
>-  ;;
>+/* The mapping between symbol names and symbols. */
>+const struct {
>+  const char *name;
>+  lt_ptr_t address;
>+}
>+lt_preloaded_symbols[[]] =
>+{
>+EOF
>+	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
>+	  cat <<\EOF >> conftest.$ac_ext
>+  {0, (lt_ptr_t) 0}
>+};
> 
>-darwin* | rhapsody*)
>-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
>-  lt_cv_file_magic_cmd='/usr/bin/file -L'
>-  case "$host_os" in
>-  rhapsody* | darwin1.[[012]])
>-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
>-    ;;
>-  *) # Darwin 1.3 on
>-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
>-    ;;
>-  esac
>-  ;;
>+#ifdef __cplusplus
>+}
>+#endif
>+EOF
>+	  # Now try linking the two files.
>+	  mv conftest.$ac_objext conftstm.$ac_objext
>+	  lt_save_LIBS="$LIBS"
>+	  lt_save_CFLAGS="$CFLAGS"
>+	  LIBS="conftstm.$ac_objext"
>+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
>+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
>+	    pipe_works=yes
>+	  fi
>+	  LIBS="$lt_save_LIBS"
>+	  CFLAGS="$lt_save_CFLAGS"
>+	else
>+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
>+	fi
>+      else
>+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
>+      fi
>+    else
>+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
>+    fi
>+  else
>+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
>+    cat conftest.$ac_ext >&5
>+  fi
>+  rm -f conftest* conftst*
> 
>-freebsd*)
>-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>-    case $host_cpu in
>-    i*86 )
>-      # Not sure whether the presence of OpenBSD here was a mistake.
>-      # Let's accept both of them until this is cleared up.
>-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
>-      lt_cv_file_magic_cmd=/usr/bin/file
>-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>-      ;;
>-    esac
>+  # Do not use the global_symbol_pipe unless it works.
>+  if test "$pipe_works" = yes; then
>+    break
>   else
>-    lt_cv_deplibs_check_method=pass_all
>+    lt_cv_sys_global_symbol_pipe=
>   fi
>-  ;;
>+done
>+])
>+if test -z "$lt_cv_sys_global_symbol_pipe"; then
>+  lt_cv_sys_global_symbol_to_cdecl=
>+fi
>+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
>+  AC_MSG_RESULT(failed)
>+else
>+  AC_MSG_RESULT(ok)
>+fi
>+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
> 
>-gnu*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
> 
>-hpux10.20*|hpux11*)
>-  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
>-  ;;
>+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
>+# ---------------------------------------
>+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
>+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
>+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
> 
>-irix5* | irix6*)
>-  case $host_os in
>-  irix5*)
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
>-    ;;
>-  *)
>-    case $LD in
>-    *-32|*"-32 ") libmagic=32-bit;;
>-    *-n32|*"-n32 ") libmagic=N32;;
>-    *-64|*"-64 ") libmagic=64-bit;;
>-    *) libmagic=never-match;;
>+AC_MSG_CHECKING([for $compiler option to produce PIC])
>+ ifelse([$1],[CXX],[
>+  # C++ specific cases for pic, static, wl, etc.
>+  if test "$GXX" = yes; then
>+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
>+
>+    case $host_os in
>+    aix*)
>+      # All AIX code is PIC.
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      fi
>+      ;;
>+    amigaos*)
>+      # FIXME: we need at least 68020 code to build shared libraries, but
>+      # adding the `-m68020' flag to GCC prevents building anything better,
>+      # like `-m68040'.
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
>+      ;;
>+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>+      # PIC is the default for these OSes.
>+      ;;
>+    mingw* | os2* | pw32*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
>+      ;;
>+    darwin* | rhapsody*)
>+      # PIC is the default on this platform
>+      # Common symbols not allowed in MH_DYLIB files
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
>+      ;;
>+    *djgpp*)
>+      # DJGPP does not support shared libraries at all
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>+      ;;
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
>+      fi
>+      ;;
>+    hpux*)
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	;;
>+      *)
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>+	;;
>+      esac
>+      ;;
>+    *)
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>+      ;;
>     esac
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
>-    ;;
>-  esac
>-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-# This must be Linux ELF.
>-linux-gnu*)
>-  case $host_cpu in
>-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
>-    lt_cv_deplibs_check_method=pass_all ;;
>-  *)
>-    # glibc up to 2.1.1 does not perform some relocations on ARM
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
>-  esac
>-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
>-  ;;
>-
>-netbsd*)
>-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
>   else
>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
>+    case $host_os in
>+      aix4* | aix5*)
>+	# All AIX code is PIC.
>+	if test "$host_cpu" = ia64; then
>+	  # AIX 5 now supports IA64 processor
>+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+	else
>+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
>+	fi
>+	;;
>+      chorus*)
>+	case $cc_basename in
>+	cxch68*)
>+	  # Green Hills C++ Compiler
>+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
>+	  ;;
>+	esac
>+	;;
>+       darwin*)
>+         # PIC is the default on this platform
>+         # Common symbols not allowed in MH_DYLIB files
>+         case $cc_basename in
>+           xlc*)
>+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
>+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+           ;;
>+         esac
>+       ;;
>+      dgux*)
>+	case $cc_basename in
>+	  ec++*)
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+	    ;;
>+	  ghcx*)
>+	    # Green Hills C++ Compiler
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      freebsd* | kfreebsd*-gnu | dragonfly*)
>+	# FreeBSD uses GNU C++
>+	;;
>+      hpux9* | hpux10* | hpux11*)
>+	case $cc_basename in
>+	  CC*)
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
>+	    if test "$host_cpu" != ia64; then
>+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
>+	    fi
>+	    ;;
>+	  aCC*)
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
>+	    case $host_cpu in
>+	    hppa*64*|ia64*)
>+	      # +Z the default
>+	      ;;
>+	    *)
>+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
>+	      ;;
>+	    esac
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      interix*)
>+	# This is c89, which is MS Visual C++ (no shared libs)
>+	# Anyone wants to do a port?
>+	;;
>+      irix5* | irix6* | nonstopux*)
>+	case $cc_basename in
>+	  CC*)
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>+	    # CC pic flag -KPIC is the default.
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      linux*)
>+	case $cc_basename in
>+	  KCC*)
>+	    # KAI C++ Compiler
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>+	    ;;
>+	  icpc* | ecpc*)
>+	    # Intel C++
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
>+	    ;;
>+	  pgCC*)
>+	    # Portland Group C++ compiler.
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+	    ;;
>+	  cxx*)
>+	    # Compaq C++
>+	    # Make sure the PIC flag is empty.  It appears that all Alpha
>+	    # Linux and Compaq Tru64 Unix objects are PIC.
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      lynxos*)
>+	;;
>+      m88k*)
>+	;;
>+      mvs*)
>+	case $cc_basename in
>+	  cxx*)
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      netbsd*)
>+	;;
>+      osf3* | osf4* | osf5*)
>+	case $cc_basename in
>+	  KCC*)
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
>+	    ;;
>+	  RCC*)
>+	    # Rational C++ 2.4.1
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>+	    ;;
>+	  cxx*)
>+	    # Digital/Compaq C++
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	    # Make sure the PIC flag is empty.  It appears that all Alpha
>+	    # Linux and Compaq Tru64 Unix objects are PIC.
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      psos*)
>+	;;
>+      solaris*)
>+	case $cc_basename in
>+	  CC*)
>+	    # Sun C++ 4.2, 5.x and Centerline C++
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
>+	    ;;
>+	  gcx*)
>+	    # Green Hills C++ Compiler
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      sunos4*)
>+	case $cc_basename in
>+	  CC*)
>+	    # Sun C++ 4.x
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+	    ;;
>+	  lcc*)
>+	    # Lucid
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      tandem*)
>+	case $cc_basename in
>+	  NCC*)
>+	    # NonStop-UX NCC 3.20
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+	case $cc_basename in
>+	  CC*)
>+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+	    ;;
>+	esac
>+	;;
>+      vxworks*)
>+	;;
>+      *)
>+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
>+	;;
>+    esac
>   fi
>-  ;;
>-
>-newos6*)
>-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
>-  ;;
>+],
>+[
>+  if test "$GCC" = yes; then
>+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
> 
>-openbsd*)
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
>-  else
>-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
>-  fi
>-  ;;
>+    case $host_os in
>+      aix*)
>+      # All AIX code is PIC.
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      fi
>+      ;;
> 
>-osf3* | osf4* | osf5*)
>-  # this will be overridden with pass_all, but let us keep it just in case
>-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
>-  lt_cv_file_magic_test_file=/shlib/libc.so
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>+    amigaos*)
>+      # FIXME: we need at least 68020 code to build shared libraries, but
>+      # adding the `-m68020' flag to GCC prevents building anything better,
>+      # like `-m68040'.
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
>+      ;;
> 
>-sco3.2v5*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>+      # PIC is the default for these OSes.
>+      ;;
> 
>-solaris*)
>-  lt_cv_deplibs_check_method=pass_all
>-  lt_cv_file_magic_test_file=/lib/libc.so
>-  ;;
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
>+      ;;
> 
>-sysv5uw[[78]]* | sysv4*uw2*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>+    darwin* | rhapsody*)
>+      # PIC is the default on this platform
>+      # Common symbols not allowed in MH_DYLIB files
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
>+      ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-  case $host_vendor in
>-  motorola)
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
>-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
>-    ;;
>-  ncr)
>-    lt_cv_deplibs_check_method=pass_all
>-    ;;
>-  sequent)
>-    lt_cv_file_magic_cmd='/bin/file'
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
>-    ;;
>-  sni)
>-    lt_cv_file_magic_cmd='/bin/file'
>-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
>-    lt_cv_file_magic_test_file=/lib/libc.so
>-    ;;
>-  esac
>-  ;;
>-esac
>-])
>-file_magic_cmd=$lt_cv_file_magic_cmd
>-deplibs_check_method=$lt_cv_deplibs_check_method
>-])
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
> 
>+    msdosdjgpp*)
>+      # Just because we use GCC doesn't mean we suddenly get shared libraries
>+      # on systems that don't support them.
>+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
>+      enable_shared=no
>+      ;;
> 
>-# AC_PROG_NM - find the path to a BSD-compatible name lister
>-AC_DEFUN([AC_PROG_NM],
>-[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
>-AC_MSG_CHECKING([for BSD-compatible nm])
>-AC_CACHE_VAL(lt_cv_path_NM,
>-[if test -n "$NM"; then
>-  # Let the user override the test.
>-  lt_cv_path_NM="$NM"
>-else
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
>-    test -z "$ac_dir" && ac_dir=.
>-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
>-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
>-      # Check to see if the nm accepts a BSD-compat flag.
>-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
>-      #   nm: unknown option "B" ignored
>-      # Tru64's nm complains that /dev/null is an invalid object file
>-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
>-	lt_cv_path_NM="$tmp_nm -B"
>-	break
>-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
>-	lt_cv_path_NM="$tmp_nm -p"
>-	break
>-      else
>-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
>-	continue # so that we can try to find one that supports BSD flags
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
>       fi
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
>-fi])
>-NM="$lt_cv_path_NM"
>-AC_MSG_RESULT([$NM])
>-])
>-
>-# AC_CHECK_LIBM - check for math library
>-AC_DEFUN([AC_CHECK_LIBM],
>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
>-LIBM=
>-case $host in
>-*-*-beos* | *-*-cygwin* | *-*-pw32*)
>-  # These system don't have libm
>-  ;;
>-*-ncr-sysv4.3*)
>-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
>-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
>-  ;;
>-*)
>-  AC_CHECK_LIB(m, main, LIBM="-lm")
>-  ;;
>-esac
>-])
>+      ;;
> 
>-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
>-# the libltdl convenience library and INCLTDL to the include flags for
>-# the libltdl header and adds --enable-ltdl-convenience to the
>-# configure arguments.  Note that LIBLTDL and INCLTDL are not
>-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
>-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
>-# with '${top_builddir}/' and INCLTDL will be prefixed with
>-# '${top_srcdir}/' (note the single quotes!).  If your package is not
>-# flat and you're not using automake, define top_builddir and
>-# top_srcdir appropriately in the Makefiles.
>-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-  case $enable_ltdl_convenience in
>-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
>-  "") enable_ltdl_convenience=yes
>-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
>-  esac
>-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
>-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
>-])
>+    hpux*)
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>+	;;
>+      esac
>+      ;;
> 
>-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
>-# the libltdl installable library and INCLTDL to the include flags for
>-# the libltdl header and adds --enable-ltdl-install to the configure
>-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
>-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
>-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
>-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
>-# with '${top_srcdir}/' (note the single quotes!).  If your package is
>-# not flat and you're not using automake, define top_builddir and
>-# top_srcdir appropriately in the Makefiles.
>-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
>-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
>-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>-  AC_CHECK_LIB(ltdl, main,
>-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
>-  [if test x"$enable_ltdl_install" = xno; then
>-     AC_MSG_WARN([libltdl not installed, but installation disabled])
>-   else
>-     enable_ltdl_install=yes
>-   fi
>-  ])
>-  if test x"$enable_ltdl_install" = x"yes"; then
>-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
>-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
>-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
>+    *)
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>+      ;;
>+    esac
>   else
>-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
>-    LIBLTDL="-lltdl"
>-    INCLTDL=
>-  fi
>-])
>+    # PORTME Check for flag to pass linker flags through the system compiler.
>+    case $host_os in
>+    aix*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      else
>+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
>+      fi
>+      ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
>+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+         ;;
>+       esac
>+       ;;
> 
>-# old names
>-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
>-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
>-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
>-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
>-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
>-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
>-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
>+      ;;
> 
>-# This is just to silence aclocal about the macro not being used
>-ifelse([AC_DISABLE_FAST_INSTALL])
>+    hpux9* | hpux10* | hpux11*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
>+	;;
>+      esac
>+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
>+      ;;
> 
>-# serial 2 AC_LIB_LTDL
>+    irix5* | irix6* | nonstopux*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      # PIC (with -KPIC) is the default.
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>+      ;;
> 
>-# AC_LIB_LTDL
>-# -----------
>-# Perform all the checks necessary for compilation of the ltdl objects
>-#  -- including compiler checks and header checks.
>-AC_DEFUN(AC_LIB_LTDL,
>-[AC_PREREQ(2.13)
>-AC_REQUIRE([AC_PROG_CC])
>-AC_REQUIRE([AC_C_CONST])
>-AC_REQUIRE([AC_HEADER_STDC])
>-AC_REQUIRE([AC_HEADER_DIRENT])
>-AC_REQUIRE([AC_LIBTOOL_HEADER_ASSERT])
>-AC_REQUIRE([_LT_AC_CHECK_DLFCN])
>-AC_REQUIRE([AC_LTDL_ENABLE_INSTALL])
>-AC_REQUIRE([AC_LTDL_SHLIBEXT])
>-AC_REQUIRE([AC_LTDL_SHLIBPATH])
>-AC_REQUIRE([AC_LTDL_SYSSEARCHPATH])
>-AC_REQUIRE([AC_LTDL_OBJDIR])
>-AC_REQUIRE([AC_LTDL_DLPREOPEN])
>-AC_REQUIRE([AC_LTDL_DLLIB])
>-AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])
>-AC_REQUIRE([AC_LTDL_DLSYM_USCORE])
>-AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])
>-AC_REQUIRE([AC_LTDL_FUNC_ARGZ])
>-
>-AC_CHECK_HEADERS([errno.h malloc.h memory.h stdlib.h stdio.h ctype.h unistd.h])
>-AC_CHECK_HEADERS([dl.h sys/dl.h dld.h])
>-AC_CHECK_HEADERS([string.h strings.h], break)
>-
>-AC_CHECK_FUNCS([strchr index], break)
>-AC_CHECK_FUNCS([strrchr rindex], break)
>-AC_CHECK_FUNCS([memcpy bcopy], break)
>-AC_CHECK_FUNCS([memmove strcmp])
>+    newsos6)
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      ;;
> 
>-])# AC_LIB_LTDL
>+    linux*)
>+      case $cc_basename in
>+      icc* | ecc*)
>+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
>+        ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+	# which looks to be a dead project)
>+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
>+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+        ;;
>+      ccc*)
>+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+        # All Alpha code is PIC.
>+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>+        ;;
>+      esac
>+      ;;
> 
>-# AC_LTDL_ENABLE_INSTALL
>-# ----------------------
>-AC_DEFUN(AC_LTDL_ENABLE_INSTALL,
>-[AC_ARG_ENABLE(ltdl-install,
>-[  --enable-ltdl-install   install libltdl])
>-
>-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
>-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
>-])])# AC_LTDL_ENABLE_INSTALL
>+    osf3* | osf4* | osf5*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      # All OSF/1 code is PIC.
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>+      ;;
> 
>-# AC_LTDL_SYS_DLOPEN_DEPLIBS
>-# --------------------------
>-AC_DEFUN(AC_LTDL_SYS_DLOPEN_DEPLIBS,
>-[AC_REQUIRE([AC_CANONICAL_HOST])
>-AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
>-	libltdl_cv_sys_dlopen_deplibs, [dnl
>-	# PORTME does your system automatically load deplibs for dlopen()?
>-	libltdl_cv_sys_dlopen_deplibs=unknown
>-	case "$host_os" in
>-	linux*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	netbsd*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	openbsd*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	solaris*)
>-	  libltdl_cv_sys_dlopen_deplibs=yes
>-	  ;;
>-	esac
>-])
>-if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
>- AC_DEFINE(LTDL_DLOPEN_DEPLIBS, 1,
>-    [Define if the OS needs help to load dependent libraries for dlopen(). ])
>-fi
>-])# AC_LTDL_SYS_DLOPEN_DEPLIBS
>+    solaris*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
>+      *)
>+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
>+      esac
>+      ;;
> 
>-# AC_LTDL_SHLIBEXT
>-# ----------------
>-AC_DEFUN(AC_LTDL_SHLIBEXT,
>-[AC_REQUIRE([_LT_AC_LTCONFIG_HACK])
>-AC_CACHE_CHECK([which extension is used for shared libraries],
>-  libltdl_cv_shlibext,
>-[ac_last=
>-  for ac_spec in $library_names_spec; do
>-    ac_last="$ac_spec"
>-  done
>-  echo "$ac_last" | [sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//'] > conftest
>-libltdl_cv_shlibext=`cat conftest`
>-rm -f conftest
>-])
>-if test -n "$libltdl_cv_shlibext"; then
>-  AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
>-    [Define to the extension used for shared libraries, say, ".so". ])
>-fi
>-])# AC_LTDL_SHLIBEXT
>+    sunos4*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      ;;
>+
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      ;;
> 
>-# AC_LTDL_SHLIBPATH
>-# -----------------
>-AC_DEFUN(AC_LTDL_SHLIBPATH,
>-[AC_REQUIRE([_LT_AC_LTCONFIG_HACK])
>-AC_CACHE_CHECK([which variable specifies run-time library path],
>-  libltdl_cv_shlibpath_var, [libltdl_cv_shlibpath_var="$shlibpath_var"])
>-if test -n "$libltdl_cv_shlibpath_var"; then
>-  AC_DEFINE_UNQUOTED(LTDL_SHLIBPATH_VAR, "$libltdl_cv_shlibpath_var",
>-    [Define to the name of the environment variable that determines the dynamic library search path. ])
>-fi
>-])# AC_LTDL_SHLIBPATH
>+    sysv4*MP*)
>+      if test -d /usr/nec ;then
>+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
>+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      fi
>+      ;;
> 
>-# AC_LTDL_SYSSEARCHPATH
>-# ---------------------
>-AC_DEFUN(AC_LTDL_SYSSEARCHPATH,
>-[AC_REQUIRE([_LT_AC_LTCONFIG_HACK])
>-AC_CACHE_CHECK([for the default library search path],
>-  libltdl_cv_sys_search_path, [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"])
>-if test -n "$libltdl_cv_sys_search_path"; then
>-  case "$host" in
>-  *-*-mingw*) pathsep=";" ;;
>-  *) pathsep=":" ;;
>-  esac
>-  sys_search_path=
>-  for dir in $libltdl_cv_sys_search_path; do
>-    if test -z "$sys_search_path"; then
>-      sys_search_path="$dir"
>-    else
>-      sys_search_path="$sys_search_path$pathsep$dir"
>-    fi
>-  done
>-  AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, "$sys_search_path",
>-    [Define to the system default library search path. ])
>-fi
>-])# AC_LTDL_SYSSEARCHPATH
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      ;;
> 
>-# AC_LTDL_OBJDIR
>-# --------------
>-AC_DEFUN(AC_LTDL_OBJDIR,
>-[AC_CACHE_CHECK([for objdir],
>-  libltdl_cv_objdir, [libltdl_cv_objdir="$objdir"
>-if test -n "$objdir"; then
>-  :
>-else
>-  rm -f .libs 2>/dev/null
>-  mkdir .libs 2>/dev/null
>-  if test -d .libs; then
>-    libltdl_cv_objdir=.libs
>-  else
>-    # MS-DOS does not allow filenames that begin with a dot.
>-    libltdl_cv_objdir=_libs
>-  fi
>-rmdir .libs 2>/dev/null
>-fi])
>-AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/",
>-  [Define to the sub-directory in which libtool stores uninstalled libraries. ])
>-])# AC_LTDL_OBJDIR
>+    unicos*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
>+      ;;
> 
>-# AC_LTDL_DLPREOPEN
>-# -----------------
>-AC_DEFUN(AC_LTDL_DLPREOPEN,
>-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
>-AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
>-       libltdl_cv_preloaded_symbols, [dnl
>-  if test -n "$global_symbol_pipe"; then
>-    libltdl_cv_preloaded_symbols=yes
>-  else
>-    libltdl_cv_preloaded_symbols=no
>+    uts4*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      ;;
>+
>+    *)
>+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
>+      ;;
>+    esac
>   fi
> ])
>-if test x"$libltdl_cv_preloaded_symbols" = x"yes"; then
>-  AC_DEFINE(HAVE_PRELOADED_SYMBOLS, 1,
>-    [Define if libtool can extract symbol lists from object files. ])
>+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
>+
>+#
>+# Check to make sure the PIC flag actually works.
>+#
>+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
>+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
>+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
>+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
>+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
>+     "" | " "*) ;;
>+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
>+     esac],
>+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
> fi
>-])# AC_LTDL_DLPREOPEN
>+case $host_os in
>+  # For platforms which do not support PIC, -DPIC is meaningless:
>+  *djgpp*)
>+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>+    ;;
>+  *)
>+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
>+    ;;
>+esac
> 
>-# AC_LTDL_DLLIB
>-# -------------
>-AC_DEFUN(AC_LTDL_DLLIB,
>-[LIBADD_DL=
>-AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1,
>-   [Define if you have the libdl library or equivalent. ]) LIBADD_DL="-ldl"],
>-[AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1,
>-   [Define if you have the libdl library or equivalent.])],
>-[AC_CHECK_LIB(svld, dlopen, [AC_DEFINE(HAVE_LIBDL, 1,
>-   [Define if you have the libdl library or equivalent.]) LIBADD_DL="-lsvld"]
>-)])])
>-AC_CHECK_FUNC(shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1,
>-   [Define if you have the shl_load function.])],
>-[AC_CHECK_LIB(dld, shl_load,
>-  [AC_DEFINE(HAVE_SHL_LOAD, 1,
>-     [Define if you have the shl_load function.])
>-   LIBADD_DL="$LIBADD_DL -ldld"])
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
>+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
>+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
>+  $lt_tmp_static_flag,
>+  [],
>+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
> ])
>-AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD, 1,
>-  [Define if you have the GNU dld library.])dnl
>-test "x$ac_cv_lib_dld_shl_load" = yes || LIBADD_DL="$LIBADD_DL -ldld"])
>-AC_SUBST(LIBADD_DL)
>-
>-if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = xyes; then
>- LIBS_SAVE="$LIBS"
>- LIBS="$LIBS $LIBADD_DL"
>- AC_CHECK_FUNCS(dlerror)
>- LIBS="$LIBS_SAVE"
>-fi
>-])# AC_LTDL_DLLIB
> 
>-# AC_LTDL_SYMBOL_USCORE
>-# ---------------------
>-AC_DEFUN(AC_LTDL_SYMBOL_USCORE,
>-[dnl does the compiler prefix global symbols with an underscore?
>-AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
>-AC_MSG_CHECKING([for _ prefix in compiled symbols])
>-AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
>-[ac_cv_sys_symbol_underscore=no
>-cat > conftest.$ac_ext <<EOF
>-void nm_test_func(){}
>-int main(){nm_test_func;return 0;}
>-EOF
>-if AC_TRY_EVAL(ac_compile); then
>-  # Now try to grab the symbols.
>-  ac_nlist=conftest.nm
>-  if AC_TRY_EVAL(NM conftest.$ac_objext \| $global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
>-    # See whether the symbols have a leading underscore.
>-    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
>-      ac_cv_sys_symbol_underscore=yes
>+
>+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
>+# ------------------------------------
>+# See if the linker supports building shared libraries.
>+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
>+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
>+ifelse([$1],[CXX],[
>+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  case $host_os in
>+  aix4* | aix5*)
>+    # If we're using GNU nm, then we don't want the "-C" option.
>+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
>+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
>     else
>-      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
>-	:
>-      else
>-	echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
>-      fi
>+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
>     fi
>-  else
>-    echo "configure: cannot run $global_symbol_pipe" >&AC_FD_CC
>-  fi
>-else
>-  echo "configure: failed program was:" >&AC_FD_CC
>-  cat conftest.c >&AC_FD_CC
>-fi
>-rm -rf conftest*
>-])
>-AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
>-])# AC_LTDL_SYMBOL_USCORE
>-
>+    ;;
>+  pw32*)
>+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
>+  ;;
>+  cygwin* | mingw*)
>+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[[^ ]]*$ [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
>+  ;;
>+  *)
>+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  ;;
>+  esac
>+],[
>+  runpath_var=
>+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
>+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
>+  _LT_AC_TAGVAR(archive_cmds, $1)=
>+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
>+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
>+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
>+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
>+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
>+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
>+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
>+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
>+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
>+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
>+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
>+  _LT_AC_TAGVAR(module_cmds, $1)=
>+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
>+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
>+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  # include_expsyms should be a list of space-separated symbols to be *always*
>+  # included in the symbol list
>+  _LT_AC_TAGVAR(include_expsyms, $1)=
>+  # exclude_expsyms can be an extended regexp of symbols to exclude
>+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
>+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>+  # as well as any symbol that contains `d'.
>+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
>+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>+  # platforms (ab)use it in PIC code, but their linkers get confused if
>+  # the symbol is explicitly referenced.  Since portable code cannot
>+  # rely on this symbol name, it's probably fine to never include it in
>+  # preloaded symbol tables.
>+  extract_expsyms_cmds=
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  _LT_CC_BASENAME([$compiler])
>+  case $host_os in
>+  cygwin* | mingw* | pw32*)
>+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
>+    # When not using gcc, we currently assume that we are using
>+    # Microsoft Visual C++.
>+    if test "$GCC" != yes; then
>+      with_gnu_ld=no
>+    fi
>+    ;;
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>+  openbsd*)
>+    with_gnu_ld=no
>+    ;;
>+  esac
> 
>-# AC_LTDL_DLSYM_USCORE
>-# --------------------
>-AC_DEFUN(AC_LTDL_DLSYM_USCORE,
>-[AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl
>-if test x"$ac_cv_sys_symbol_underscore" = xyes; then
>-  if test x"$ac_cv_func_dlopen" = xyes ||
>-     test x"$ac_cv_lib_dl_dlopen" = xyes ; then
>-	AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
>-		libltdl_cv_need_uscore, [dnl
>-		libltdl_cv_need_uscore=unknown
>-                save_LIBS="$LIBS"
>-                LIBS="$LIBS $LIBADD_DL"
>-		_LT_AC_TRY_DLOPEN_SELF(
>-		  libltdl_cv_need_uscore=no, libltdl_cv_need_uscore=yes,
>-		  [],			     libltdl_cv_need_uscore=cross)
>-		LIBS="$save_LIBS"
>-	])
>-  fi
>-fi
>+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
>+  if test "$with_gnu_ld" = yes; then
>+    # If archive_cmds runs LD, not CC, wlarc should be empty
>+    wlarc='${wl}'
> 
>-if test x"$libltdl_cv_need_uscore" = xyes; then
>-  AC_DEFINE(NEED_USCORE, 1,
>-    [Define if dlsym() requires a leading underscode in symbol names. ])
>-fi
>-])# AC_LTDL_DLSYM_USCORE
>-
>-
>-# AC_CHECK_TYPES(TYPES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
>-#                [INCLUDES])
>-# ---------------------------------------------------------------
>-# This macro did not exist in Autoconf 2.13, which we do still support
>-ifdef([AC_CHECK_TYPES], [],
>-[define([AC_CHECK_TYPES],
>-  [AC_CACHE_CHECK([for $1], ac_Type,
>-    [AC_TRY_LINK([$4],
>-	[if (($1 *) 0)
>-	  return 0;
>-	if (sizeof ($1))
>-	  return 0;],
>-	[ac_Type=yes],
>-	[ac_Type=no])])
>-  if test "x$ac_Type" = xyes; then
>-    ifelse([$2], [], [:], [$2])
>-  else
>-    ifelse([$3], [], [:], [$3])
>-  fi])
>-])# AC_CHECK_TYPES
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
> 
>+    # See if GNU ld supports shared libraries.
>+    case $host_os in
>+    aix3* | aix4* | aix5*)
>+      # On AIX/PPC, the GNU linker is very broken
>+      if test "$host_cpu" != ia64; then
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	cat <<EOF 1>&2
> 
>-# AC_LTDL_FUNC_ARGZ
>-# -----------------
>-AC_DEFUN([AC_LTDL_FUNC_ARGZ],
>-[AC_CHECK_HEADERS([argz.h])
>+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>+*** to be unable to reliably create shared libraries on AIX.
>+*** Therefore, libtool is disabling shared libraries support.  If you
>+*** really care for shared libraries, you may want to modify your PATH
>+*** so that a non-GNU linker is found, and then restart.
> 
>-AC_CHECK_TYPES([error_t],
>-  [],
>-  [AC_DEFINE([error_t], [int],
>-    [Define to a type to use for \`error_t' if it is not otherwise available.])],
>-  [#if HAVE_ARGZ_H
>-#  include <argz.h>
>-#endif])
>+EOF
>+      fi
>+      ;;
> 
>-AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify])
>-])# AC_LTDL_FUNC_ARGZ
>+    amigaos*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+
>+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>+      # that the semantics of dynamic libraries on AmigaOS, at least up
>+      # to version 4, is to share data among multiple programs linked
>+      # with the same dynamic library.  Since this doesn't match the
>+      # behavior of shared libraries on other platforms, we can't use
>+      # them.
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      ;;
> 
>-# AM_CONDITIONAL                                              -*- Autoconf -*-
>+    beos*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+	# support --undefined.  This deserves some investigation.  FIXME
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+      else
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      fi
>+      ;;
> 
>-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
>+    cygwin* | mingw* | pw32*)
>+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
>+      # as there is no search path for DLLs.
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
>+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
>+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
>+
>+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+	# If the export-symbols file already is a .def file (1st line
>+	# is EXPORTS), use it as is; otherwise, prepend...
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>+	  cp $export_symbols $output_objdir/$soname.def;
>+	else
>+	  echo EXPORTS > $output_objdir/$soname.def;
>+	  cat $export_symbols >> $output_objdir/$soname.def;
>+	fi~
>+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+      else
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      fi
>+      ;;
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+    interix3*)
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      ;;
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	tmp_addflag=
>+	case $cc_basename,$host_cpu in
>+	pgcc*)				# Portland Group C compiler
>+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag'
>+	  ;;
>+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
>+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag -Mnomain' ;;
>+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
>+	  tmp_addflag=' -i_dynamic' ;;
>+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
>+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
>+	ifc* | ifort*)			# Intel Fortran compiler
>+	  tmp_addflag=' -nofor_main' ;;
>+	esac
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+	if test $supports_anon_versioning = yes; then
>+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+	fi
>+      else
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      fi
>+      ;;
> 
>-# serial 5
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>+	wlarc=
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      fi
>+      ;;
> 
>-AC_PREREQ(2.52)
>+    solaris*)
>+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	cat <<EOF 1>&2
> 
>-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
>-# -------------------------------------
>-# Define a conditional.
>-AC_DEFUN([AM_CONDITIONAL],
>-[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
>-        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
>-AC_SUBST([$1_TRUE])
>-AC_SUBST([$1_FALSE])
>-if $2; then
>-  $1_TRUE=
>-  $1_FALSE='#'
>-else
>-  $1_TRUE='#'
>-  $1_FALSE=
>-fi
>-AC_CONFIG_COMMANDS_PRE(
>-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
>-  AC_MSG_ERROR([conditional "$1" was never defined.
>-Usually this means the macro was only invoked conditionally.])
>-fi])])
>+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>+*** create shared libraries on Solaris systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.9.1 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
> 
>-# Do all the work for Automake.                            -*- Autoconf -*-
>+EOF
>+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      fi
>+      ;;
> 
>-# This macro actually does too much some checks are only needed if
>-# your package does certain things.  But this isn't really a big deal.
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	cat <<_LT_EOF 1>&2
> 
>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+_LT_EOF
>+	;;
>+	*)
>+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>+	  else
>+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+	  fi
>+	;;
>+      esac
>+      ;;
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+    sunos4*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      wlarc=
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+    *)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      fi
>+      ;;
>+    esac
> 
>-# serial 10
>+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
>+      runpath_var=
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>+    fi
>+  else
>+    # PORTME fill in a description of your system's linker (not GNU ld)
>+    case $host_os in
>+    aix3*)
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>+      # Note: this linker hardcodes the directories in LIBPATH if there
>+      # are no directories specified by -L.
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>+	# Neither direct hardcoding nor static linking is supported with a
>+	# broken collect2.
>+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
>+      fi
>+      ;;
> 
>-AC_PREREQ([2.54])
>+    aix4* | aix5*)
>+      if test "$host_cpu" = ia64; then
>+	# On IA64, the linker does run time linking by default, so we don't
>+	# have to do anything special.
>+	aix_use_runtimelinking=no
>+	exp_sym_flag='-Bexport'
>+	no_entry_flag=""
>+      else
>+	# If we're using GNU nm, then we don't want the "-C" option.
>+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
>+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
>+	else
>+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
>+	fi
>+	aix_use_runtimelinking=no
> 
>-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
>-# the ones we care about.
>-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
>+	# Test if we are trying to use run time linking or normal
>+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
>+	# need to do runtime linking.
>+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
>+	  for ld_flag in $LDFLAGS; do
>+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>+  	    aix_use_runtimelinking=yes
>+  	    break
>+  	  fi
>+	  done
>+	  ;;
>+	esac
> 
>-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
>-# AM_INIT_AUTOMAKE([OPTIONS])
>-# -----------------------------------------------
>-# The call with PACKAGE and VERSION arguments is the old style
>-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
>-# and VERSION should now be passed to AC_INIT and removed from
>-# the call to AM_INIT_AUTOMAKE.
>-# We support both call styles for the transition.  After
>-# the next Automake release, Autoconf can make the AC_INIT
>-# arguments mandatory, and then we can depend on a new Autoconf
>-# release and drop the old call support.
>-AC_DEFUN([AM_INIT_AUTOMAKE],
>-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
>- AC_REQUIRE([AC_PROG_INSTALL])dnl
>-# test to see if srcdir already configured
>-if test "`cd $srcdir && pwd`" != "`pwd`" &&
>-   test -f $srcdir/config.status; then
>-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
>-fi
>+	exp_sym_flag='-bexport'
>+	no_entry_flag='-bnoentry'
>+      fi
> 
>-# test whether we have cygpath
>-if test -z "$CYGPATH_W"; then
>-  if (cygpath --version) >/dev/null 2>/dev/null; then
>-    CYGPATH_W='cygpath -w'
>-  else
>-    CYGPATH_W=echo
>-  fi
>-fi
>-AC_SUBST([CYGPATH_W])
>+      # When large executables or shared objects are built, AIX ld can
>+      # have problems creating the table of contents.  If linking a library
>+      # or program results in "error TOC overflow" add -mminimal-toc to
>+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>+
>+      _LT_AC_TAGVAR(archive_cmds, $1)=''
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+
>+      if test "$GCC" = yes; then
>+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
>+	# We only want to do this on AIX 4.2 and lower, the check
>+	# below for broken collect2 doesn't work under 4.3+
>+	  collect2name=`${CC} -print-prog-name=collect2`
>+	  if test -f "$collect2name" && \
>+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
>+	  then
>+  	  # We have reworked collect2
>+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+	  else
>+  	  # We have old collect2
>+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
>+  	  # It fails to find uninstalled libraries when the uninstalled
>+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
>+  	  # to unsupported forces relinking
>+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
>+	  fi
>+	  ;;
>+	esac
>+	shared_flag='-shared'
>+	if test "$aix_use_runtimelinking" = yes; then
>+	  shared_flag="$shared_flag "'${wl}-G'
>+	fi
>+      else
>+	# not using gcc
>+	if test "$host_cpu" = ia64; then
>+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>+  	# chokes on -Wl,-G. The following line is correct:
>+	  shared_flag='-G'
>+	else
>+	  if test "$aix_use_runtimelinking" = yes; then
>+	    shared_flag='${wl}-G'
>+	  else
>+	    shared_flag='${wl}-bM:SRE'
>+	  fi
>+	fi
>+      fi
> 
>-# Define the identity of the package.
>-dnl Distinguish between old-style and new-style calls.
>-m4_ifval([$2],
>-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
>- AC_SUBST([PACKAGE], [$1])dnl
>- AC_SUBST([VERSION], [$2])],
>-[_AM_SET_OPTIONS([$1])dnl
>- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
>- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
>+      # It seems that -bexpall does not export symbols beginning with
>+      # underscore (_), so it is better to generate a list of symbols to export.
>+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
>+      if test "$aix_use_runtimelinking" = yes; then
>+	# Warning - without using the other runtime loading flags (-brtl),
>+	# -berok will link without error, but may produce a broken library.
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
>+       # Determine the default libpath from the value encoded in an empty executable.
>+       _LT_AC_SYS_LIBPATH_AIX
>+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+       else
>+	if test "$host_cpu" = ia64; then
>+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
>+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
>+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>+	else
>+	 # Determine the default libpath from the value encoded in an empty executable.
>+	 _LT_AC_SYS_LIBPATH_AIX
>+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	  # Warning - without using the other run time loading flags,
>+	  # -berok will link without error, but may produce a broken library.
>+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
>+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
>+	  # Exported symbols can be pulled into shared objects from archives
>+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
>+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
>+	  # This is similar to how AIX traditionally builds its shared libraries.
>+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+	fi
>+      fi
>+      ;;
> 
>-_AM_IF_OPTION([no-define],,
>-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
>- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
>+    amigaos*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      # see comment about different semantics on the GNU ld section
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      ;;
> 
>-# Some tools Automake needs.
>-AC_REQUIRE([AM_SANITY_CHECK])dnl
>-AC_REQUIRE([AC_ARG_PROGRAM])dnl
>-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
>-AM_MISSING_PROG(AUTOCONF, autoconf)
>-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
>-AM_MISSING_PROG(AUTOHEADER, autoheader)
>-AM_MISSING_PROG(MAKEINFO, makeinfo)
>-AM_MISSING_PROG(AMTAR, tar)
>-AM_PROG_INSTALL_SH
>-AM_PROG_INSTALL_STRIP
>-# We need awk for the "check" target.  The system "awk" is bad on
>-# some platforms.
>-AC_REQUIRE([AC_PROG_AWK])dnl
>-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
>-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
>+    bsdi[[45]]*)
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
>+      ;;
> 
>-_AM_IF_OPTION([no-dependencies],,
>-[AC_PROVIDE_IFELSE([AC_PROG_CC],
>-                  [_AM_DEPENDENCIES(CC)],
>-                  [define([AC_PROG_CC],
>-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
>-AC_PROVIDE_IFELSE([AC_PROG_CXX],
>-                  [_AM_DEPENDENCIES(CXX)],
>-                  [define([AC_PROG_CXX],
>-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
>-])
>-])
>+    cygwin* | mingw* | pw32*)
>+      # When not using gcc, we currently assume that we are using
>+      # Microsoft Visual C++.
>+      # hardcode_libdir_flag_spec is actually meaningless, as there is
>+      # no search path for DLLs.
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+      # Tell ltmain to make .lib files, not .a files.
>+      libext=lib
>+      # Tell ltmain to make .dll files, not .so files.
>+      shrext_cmds=".dll"
>+      # FIXME: Setting linknames here is a bad hack.
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
>+      # The linker will automatically build a .lib file if we build a DLL.
>+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
>+      # FIXME: Should let the user specify the lib program.
>+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
>+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
>+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
>+      ;;
> 
>+    darwin* | rhapsody*)
>+      case $host_os in
>+        rhapsody* | darwin1.[[012]])
>+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
>+         ;;
>+       *) # Darwin 1.3 on
>+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+         else
>+           case ${MACOSX_DEPLOYMENT_TARGET} in
>+             10.[[012]])
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+               ;;
>+             10.*)
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
>+               ;;
>+           esac
>+         fi
>+         ;;
>+      esac
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+    if test "$GCC" = yes ; then
>+    	output_verbose_link_cmd='echo'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+    else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+          ;;
>+      esac
>+    fi
>+      ;;
> 
>-# When config.status generates a header, we must update the stamp-h file.
>-# This file resides in the same directory as the config header
>-# that is generated.  The stamp files are numbered to have different names.
>+    dgux*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
>-# loop where config.status creates the headers, so we can generate
>-# our stamp files there.
>-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
>-[# Compute $1's index in $config_headers.
>-_am_stamp_count=1
>-for _am_header in $config_headers :; do
>-  case $_am_header in
>-    $1 | $1:* )
>-      break ;;
>-    * )
>-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
>-  esac
>-done
>-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
>+    freebsd1*)
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      ;;
> 
>-# Copyright 2002  Free Software Foundation, Inc.
>+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>+    # support.  Future versions do this automatically, but an explicit c++rt0.o
>+    # does not break anything, and helps significantly (at the cost of a little
>+    # extra space).
>+    freebsd2.2*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
>+    freebsd2*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>+    hpux9*)
>+      if test "$GCC" = yes; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      fi
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+
>+      # hardcode_minus_L: Not really in the search PATH,
>+      # but as the default location of the library.
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+      ;;
> 
>-# AM_AUTOMAKE_VERSION(VERSION)
>-# ----------------------------
>-# Automake X.Y traces this macro to ensure aclocal.m4 has been
>-# generated from the m4 files accompanying Automake X.Y.
>-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
>+    hpux10*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+
>+	# hardcode_minus_L: Not really in the search PATH,
>+	# but as the default location of the library.
>+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      fi
>+      ;;
> 
>-# AM_SET_CURRENT_AUTOMAKE_VERSION
>-# -------------------------------
>-# Call AM_AUTOMAKE_VERSION so it can be traced.
>-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
>-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
>-	 [AM_AUTOMAKE_VERSION([1.7.9])])
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	case $host_cpu in
>+	hppa*64*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      else
>+	case $host_cpu in
>+	hppa*64*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+	case $host_cpu in
>+	hppa*64*|ia64*)
>+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
>+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+	  ;;
>+	*)
>+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+
>+	  # hardcode_minus_L: Not really in the search PATH,
>+	  # but as the default location of the library.
>+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+	  ;;
>+	esac
>+      fi
>+      ;;
> 
>-# Helper functions for option handling.                    -*- Autoconf -*-
>+    irix5* | irix6* | nonstopux*)
>+      if test "$GCC" = yes; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
>+      fi
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+      ;;
> 
>-# Copyright 2001, 2002  Free Software Foundation, Inc.
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
>+      fi
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+    newsos6)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+    openbsd*)
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+      else
>+       case $host_os in
>+	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
>+	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>+	   ;;
>+	 *)
>+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+	   ;;
>+       esac
>+      fi
>+      ;;
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+    os2*)
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
>+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
>+      ;;
> 
>-# serial 2
>+    osf3*)
>+      if test "$GCC" = yes; then
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+      fi
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+      ;;
> 
>-# _AM_MANGLE_OPTION(NAME)
>-# -----------------------
>-AC_DEFUN([_AM_MANGLE_OPTION],
>-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
>+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
>+      if test "$GCC" = yes; then
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>+      else
>+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
> 
>-# _AM_SET_OPTION(NAME)
>-# ------------------------------
>-# Set option NAME.  Presently that only means defining a flag for this option.
>-AC_DEFUN([_AM_SET_OPTION],
>-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
>+	# Both c and cxx compiler support -rpath directly
>+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
>+      fi
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+      ;;
> 
>-# _AM_SET_OPTIONS(OPTIONS)
>-# ----------------------------------
>-# OPTIONS is a space-separated list of Automake options.
>-AC_DEFUN([_AM_SET_OPTIONS],
>-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
>+    solaris*)
>+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
>+      if test "$GCC" = yes; then
>+	wlarc='${wl}'
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>+      else
>+	wlarc=''
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>+      fi
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      case $host_os in
>+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
>+      *)
>+ 	# The compiler driver will combine linker options so we
>+ 	# cannot just pass the convience library names through
>+ 	# without $wl, iff we do not link with $LD.
>+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
>+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
>+ 	case $wlarc in
>+ 	'')
>+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
>+ 	*)
>+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+ 	esac ;;
>+      esac
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+      ;;
> 
>-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
>-# -------------------------------------------
>-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
>-AC_DEFUN([_AM_IF_OPTION],
>-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
>+    sunos4*)
>+      if test "x$host_vendor" = xsequent; then
>+	# Use $CC to link under sequent, because it throws in some extra .o
>+	# files that make .init and .fini sections work.
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-#
>-# Check to make sure that the build environment is sane.
>-#
>+    sysv4)
>+      case $host_vendor in
>+	sni)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
>+	;;
>+	siemens)
>+	  ## LD is ld it makes a PLAMLIB
>+	  ## CC just makes a GrossModule.
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
>+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+        ;;
>+	motorola)
>+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
>+	;;
>+      esac
>+      runpath_var='LD_RUN_PATH'
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
>+    sysv4.3*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
>+      ;;
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+	runpath_var=LD_RUN_PATH
>+	hardcode_runpath_var=yes
>+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
>+      fi
>+      ;;
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
>+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
> 
>-# serial 3
>+    uts4*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>-# AM_SANITY_CHECK
>-# ---------------
>-AC_DEFUN([AM_SANITY_CHECK],
>-[AC_MSG_CHECKING([whether build environment is sane])
>-# Just in case
>-sleep 1
>-echo timestamp > conftest.file
>-# 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
>+    *)
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      ;;
>+    esac
>+  fi
>+])
>+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
>+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
> 
>-      # 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".
>-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
>-alias in your environment])
>-   fi
>+#
>+# Do we need to explicitly link libc?
>+#
>+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
>+x|xyes)
>+  # Assume -lc should be added
>+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
>+
>+  if test "$enable_shared" = yes && test "$GCC" = yes; then
>+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
>+    *'~'*)
>+      # FIXME: we may have to deal with multi-command sequences.
>+      ;;
>+    '$CC '*)
>+      # Test whether the compiler implicitly links with -lc since on some
>+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
>+      # to ld, don't add -lc before -lgcc.
>+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
>+      $rm conftest*
>+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
>+        soname=conftest
>+        lib=conftest
>+        libobjs=conftest.$ac_objext
>+        deplibs=
>+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
>+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
>+        compiler_flags=-v
>+        linker_flags=-v
>+        verstring=
>+        output_objdir=.
>+        libname=conftest
>+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
>+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
>+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
>+        then
>+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+        else
>+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
>+        fi
>+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
>+      else
>+        cat conftest.err 1>&5
>+      fi
>+      $rm conftest*
>+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
>+      ;;
>+    esac
>+  fi
>+  ;;
>+esac
>+])# AC_LIBTOOL_PROG_LD_SHLIBS
> 
>-   test "$[2]" = conftest.file
>-   )
>-then
>-   # Ok.
>-   :
>-else
>-   AC_MSG_ERROR([newly created file is older than distributed files!
>-Check your system clock])
>-fi
>-AC_MSG_RESULT(yes)])
> 
>-#  -*- Autoconf -*-
>+# _LT_AC_FILE_LTDLL_C
>+# -------------------
>+# Be careful that the start marker always follows a newline.
>+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
>+# /* ltdll.c starts here */
>+# #define WIN32_LEAN_AND_MEAN
>+# #include <windows.h>
>+# #undef WIN32_LEAN_AND_MEAN
>+# #include <stdio.h>
>+#
>+# #ifndef __CYGWIN__
>+# #  ifdef __CYGWIN32__
>+# #    define __CYGWIN__ __CYGWIN32__
>+# #  endif
>+# #endif
>+#
>+# #ifdef __cplusplus
>+# extern "C" {
>+# #endif
>+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
>+# #ifdef __cplusplus
>+# }
>+# #endif
>+#
>+# #ifdef __CYGWIN__
>+# #include <cygwin/cygwin_dll.h>
>+# DECLARE_CYGWIN_DLL( DllMain );
>+# #endif
>+# HINSTANCE __hDllInstance_base;
>+#
>+# BOOL APIENTRY
>+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
>+# {
>+#   __hDllInstance_base = hInst;
>+#   return TRUE;
>+# }
>+# /* ltdll.c ends here */
>+])# _LT_AC_FILE_LTDLL_C
>+
> 
>+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
>+# ---------------------------------
>+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
> 
>-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+# old names
>+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
>+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
>+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
>+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
>+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
>+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
>+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# This is just to silence aclocal about the macro not being used
>+ifelse([AC_DISABLE_FAST_INSTALL])
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+AC_DEFUN([LT_AC_PROG_GCJ],
>+[AC_CHECK_TOOL(GCJ, gcj, no)
>+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
>+  AC_SUBST(GCJFLAGS)
>+])
> 
>-# serial 3
>+AC_DEFUN([LT_AC_PROG_RC],
>+[AC_CHECK_TOOL(RC, windres, no)
>+])
> 
>-# AM_MISSING_PROG(NAME, PROGRAM)
>-# ------------------------------
>-AC_DEFUN([AM_MISSING_PROG],
>-[AC_REQUIRE([AM_MISSING_HAS_RUN])
>-$1=${$1-"${am_missing_run}$2"}
>-AC_SUBST($1)])
>+# NOTE: This macro has been submitted for inclusion into   #
>+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
>+#  a released version of Autoconf we should remove this    #
>+#  macro and use it instead.                               #
>+# LT_AC_PROG_SED
>+# --------------
>+# Check for a fully-functional sed program, that truncates
>+# as few characters as possible.  Prefer GNU sed if found.
>+AC_DEFUN([LT_AC_PROG_SED],
>+[AC_MSG_CHECKING([for a sed that does not truncate output])
>+AC_CACHE_VAL(lt_cv_path_SED,
>+[# Loop through the user's path and test for sed and gsed.
>+# Then use that list of sed's as ones to test for truncation.
>+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH
>+do
>+  IFS=$as_save_IFS
>+  test -z "$as_dir" && as_dir=.
>+  for lt_ac_prog in sed gsed; do
>+    for ac_exec_ext in '' $ac_executable_extensions; do
>+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
>+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
>+      fi
>+    done
>+  done
>+done
>+IFS=$as_save_IFS
>+lt_ac_max=0
>+lt_ac_count=0
>+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
>+# along with /bin/sed that truncates output.
>+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
>+  test ! -f $lt_ac_sed && continue
>+  cat /dev/null > conftest.in
>+  lt_ac_count=0
>+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
>+  # Check for GNU sed and select it if it is found.
>+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
>+    lt_cv_path_SED=$lt_ac_sed
>+    break
>+  fi
>+  while true; do
>+    cat conftest.in conftest.in >conftest.tmp
>+    mv conftest.tmp conftest.in
>+    cp conftest.in conftest.nl
>+    echo >>conftest.nl
>+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
>+    cmp -s conftest.out conftest.nl || break
>+    # 10000 chars as input seems more than enough
>+    test $lt_ac_count -gt 10 && break
>+    lt_ac_count=`expr $lt_ac_count + 1`
>+    if test $lt_ac_count -gt $lt_ac_max; then
>+      lt_ac_max=$lt_ac_count
>+      lt_cv_path_SED=$lt_ac_sed
>+    fi
>+  done
>+done
>+])
>+SED=$lt_cv_path_SED
>+AC_SUBST([SED])
>+AC_MSG_RESULT([$SED])
>+])
> 
>+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# AM_MISSING_HAS_RUN
>-# ------------------
>-# Define MISSING if not defined so far and test if it supports --run.
>-# If it does, set am_missing_run to use it, otherwise, to nothing.
>-AC_DEFUN([AM_MISSING_HAS_RUN],
>-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
>-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
>-# Use eval to expand $SHELL
>-if eval "$MISSING --run true"; then
>-  am_missing_run="$MISSING --run "
>-else
>-  am_missing_run=
>-  AC_MSG_WARN([`missing' script is too old or missing])
>-fi
>+# AM_AUTOMAKE_VERSION(VERSION)
>+# ----------------------------
>+# Automake X.Y traces this macro to ensure aclocal.m4 has been
>+# generated from the m4 files accompanying Automake X.Y.
>+# (This private macro should not be called outside this file.)
>+AC_DEFUN([AM_AUTOMAKE_VERSION],
>+[am__api_version='1.10'
>+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
>+dnl require some minimum version.  Point them to the right macro.
>+m4_if([$1], [1.10], [],
>+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
> ])
> 
>-# AM_AUX_DIR_EXPAND
>-
>-# Copyright 2001 Free Software Foundation, Inc.
>+# _AM_AUTOCONF_VERSION(VERSION)
>+# -----------------------------
>+# aclocal traces this macro to find the Autoconf version.
>+# This is a private macro too.  Using m4_define simplifies
>+# the logic in aclocal, which can simply ignore this definition.
>+m4_define([_AM_AUTOCONF_VERSION], [])
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+# AM_SET_CURRENT_AUTOMAKE_VERSION
>+# -------------------------------
>+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
>+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
>+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
>+[AM_AUTOMAKE_VERSION([1.10])dnl
>+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
> # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
> # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
>@@ -4219,131 +6492,56 @@
> # absolute PATH.  The drawback is that using absolute paths prevent a
> # configured tree to be moved without reconfiguration.
> 
>-# Rely on autoconf to set up CDPATH properly.
>-AC_PREREQ([2.50])
>-
>-AC_DEFUN([AM_AUX_DIR_EXPAND], [
>+AC_DEFUN([AM_AUX_DIR_EXPAND],
>+[dnl Rely on autoconf to set up CDPATH properly.
>+AC_PREREQ([2.50])dnl
> # expand $ac_aux_dir to an absolute path
> am_aux_dir=`cd $ac_aux_dir && pwd`
> ])
> 
>-# AM_PROG_INSTALL_SH
>-# ------------------
>-# Define $install_sh.
>-
>-# Copyright 2001 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>-AC_DEFUN([AM_PROG_INSTALL_SH],
>-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
>-install_sh=${install_sh-"$am_aux_dir/install-sh"}
>-AC_SUBST(install_sh)])
>-
>-# AM_PROG_INSTALL_STRIP
>-
>-# Copyright 2001 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>-# One issue with vendor `install' (even GNU) is that you can't
>-# specify the program used to strip binaries.  This is especially
>-# annoying in cross-compiling environments, where the build's strip
>-# is unlikely to handle the host's binaries.
>-# Fortunately install-sh will honor a STRIPPROG variable, so we
>-# always use install-sh in `make install-strip', and initialize
>-# STRIPPROG with the value of the STRIP variable (set by the user).
>-AC_DEFUN([AM_PROG_INSTALL_STRIP],
>-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
>-# 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.
>-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
>-if test "$cross_compiling" != no; then
>-  AC_CHECK_TOOL([STRIP], [strip], :)
>-fi
>-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
>-AC_SUBST([INSTALL_STRIP_PROGRAM])])
>-
>-#                                                          -*- Autoconf -*-
>-# Copyright (C) 2003  Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# AM_CONDITIONAL                                            -*- Autoconf -*-
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# serial 1
>+# serial 8
> 
>-# Check whether the underlying file-system supports filenames
>-# with a leading dot.  For instance MS-DOS doesn't.
>-AC_DEFUN([AM_SET_LEADING_DOT],
>-[rm -rf .tst 2>/dev/null
>-mkdir .tst 2>/dev/null
>-if test -d .tst; then
>-  am__leading_dot=.
>+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
>+# -------------------------------------
>+# Define a conditional.
>+AC_DEFUN([AM_CONDITIONAL],
>+[AC_PREREQ(2.52)dnl
>+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
>+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
>+AC_SUBST([$1_TRUE])dnl
>+AC_SUBST([$1_FALSE])dnl
>+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
>+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
>+if $2; then
>+  $1_TRUE=
>+  $1_FALSE='#'
> else
>-  am__leading_dot=_
>+  $1_TRUE='#'
>+  $1_FALSE=
> fi
>-rmdir .tst 2>/dev/null
>-AC_SUBST([am__leading_dot])])
>-
>-# serial 5						-*- Autoconf -*-
>-
>-# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+AC_CONFIG_COMMANDS_PRE(
>+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
>+  AC_MSG_ERROR([[conditional "$1" was never defined.
>+Usually this means the macro was only invoked conditionally.]])
>+fi])])
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>+# serial 9
> 
> # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
> # written in clear, in which case automake, when reading aclocal.m4,
>@@ -4352,7 +6550,6 @@
> # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
> 
> 
>-
> # _AM_DEPENDENCIES(NAME)
> # ----------------------
> # See how the compiler implements dependency checking.
>@@ -4372,6 +6569,7 @@
> ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
>        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
>        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
>+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
>        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
>                    [depcc="$$1"   am_compiler_list=])
> 
>@@ -4411,7 +6609,9 @@
>     : > sub/conftest.c
>     for i in 1 2 3 4 5 6; do
>       echo '#include "conftst'$i'.h"' >> sub/conftest.c
>-      : > sub/conftst$i.h
>+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
>+      # Solaris 8's {/usr,}/bin/sh.
>+      touch sub/conftst$i.h
>     done
>     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
> 
>@@ -4435,13 +6635,19 @@
>        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
>        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>          >/dev/null 2>conftest.err &&
>+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
>        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
>        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
>        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
>       # icc doesn't choke on unknown options, it will just issue warnings
>-      # (even with -Werror).  So we grep stderr for any message
>-      # that says an option was ignored.
>-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
>+      # or remarks (even with -Werror).  So we grep stderr for any message
>+      # that says an option was ignored or not supported.
>+      # When given -MP, icc 7.0 and 7.1 complain thusly:
>+      #   icc: Command line warning: ignoring option '-M'; no argument required
>+      # The diagnosis changed in icc 8.0:
>+      #   icc: Command line remark: option '-MP' not supported
>+      if (grep 'ignoring option' conftest.err ||
>+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
>         am_cv_$1_dependencies_compiler_type=$depmode
>         break
>       fi
>@@ -4475,36 +6681,27 @@
> # ------------
> AC_DEFUN([AM_DEP_TRACK],
> [AC_ARG_ENABLE(dependency-tracking,
>-[  --disable-dependency-tracking Speeds up one-time builds
>-  --enable-dependency-tracking  Do not reject slow dependency extractors])
>+[  --disable-dependency-tracking  speeds up one-time build
>+  --enable-dependency-tracking   do not reject slow dependency extractors])
> if test "x$enable_dependency_tracking" != xno; then
>   am_depcomp="$ac_aux_dir/depcomp"
>   AMDEPBACKSLASH='\'
> fi
> AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
>-AC_SUBST([AMDEPBACKSLASH])
>+AC_SUBST([AMDEPBACKSLASH])dnl
>+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
> ])
> 
>-# Generate code to set up dependency tracking.   -*- Autoconf -*-
>-
>-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# Generate code to set up dependency tracking.              -*- Autoconf -*-
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-#serial 2
>+#serial 3
> 
> # _AM_OUTPUT_DEPENDENCY_COMMANDS
> # ------------------------------
>@@ -4517,33 +6714,28 @@
>   # 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.
>-  # So let's grep whole file.
>-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
>+  # Grep'ing the whole file is not good either: AIX grep has a line
>+  # limit of 2048, but all sed's we know have understand at least 4000.
>+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
>     dirpart=`AS_DIRNAME("$mf")`
>   else
>     continue
>   fi
>-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
>-  # Extract the definition of DEP_FILES from the Makefile without
>-  # running `make'.
>-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
>+  # Extract the definition of DEPDIR, am__include, and am__quote
>+  # 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
>+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
>   # When using ansi2knr, U may be empty or an underscore; expand it
>-  U=`sed -n -e '/^U = / s///p' < "$mf"`
>-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
>-  # 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 -e '
>-    /^DEP_FILES = .*\\\\$/ {
>-      s/^DEP_FILES = //
>-      :loop
>-	s/\\\\$//
>-	p
>-	n
>-	/\\\\$/ b loop
>-      p
>-    }
>-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
>+  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
>     # Make sure the directory exists.
>     test -f "$dirpart/$file" && continue
>@@ -4556,39 +6748,188 @@
> ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
> 
> 
>-# AM_OUTPUT_DEPENDENCY_COMMANDS
>-# -----------------------------
>-# This macro should only be invoked once -- use via AC_REQUIRE.
>+# AM_OUTPUT_DEPENDENCY_COMMANDS
>+# -----------------------------
>+# This macro should only be invoked once -- use via AC_REQUIRE.
>+#
>+# This code is only required when automatic dependency tracking
>+# is enabled.  FIXME.  This creates each `.P' file that we will
>+# need in order to bootstrap the dependency handling code.
>+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
>+[AC_CONFIG_COMMANDS([depfiles],
>+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
>+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
>+])
>+
>+# Do all the work for Automake.                             -*- Autoconf -*-
>+
>+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
>+# 2005, 2006 Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# serial 12
>+
>+# This macro actually does too much.  Some checks are only needed if
>+# your package does certain things.  But this isn't really a big deal.
>+
>+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
>+# AM_INIT_AUTOMAKE([OPTIONS])
>+# -----------------------------------------------
>+# The call with PACKAGE and VERSION arguments is the old style
>+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
>+# and VERSION should now be passed to AC_INIT and removed from
>+# the call to AM_INIT_AUTOMAKE.
>+# We support both call styles for the transition.  After
>+# the next Automake release, Autoconf can make the AC_INIT
>+# arguments mandatory, and then we can depend on a new Autoconf
>+# release and drop the old call support.
>+AC_DEFUN([AM_INIT_AUTOMAKE],
>+[AC_PREREQ([2.60])dnl
>+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
>+dnl the ones we care about.
>+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
>+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
>+AC_REQUIRE([AC_PROG_INSTALL])dnl
>+if test "`cd $srcdir && pwd`" != "`pwd`"; then
>+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
>+  # is not polluted with repeated "-I."
>+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
>+  # test to see if srcdir already configured
>+  if test -f $srcdir/config.status; then
>+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
>+  fi
>+fi
>+
>+# test whether we have cygpath
>+if test -z "$CYGPATH_W"; then
>+  if (cygpath --version) >/dev/null 2>/dev/null; then
>+    CYGPATH_W='cygpath -w'
>+  else
>+    CYGPATH_W=echo
>+  fi
>+fi
>+AC_SUBST([CYGPATH_W])
>+
>+# Define the identity of the package.
>+dnl Distinguish between old-style and new-style calls.
>+m4_ifval([$2],
>+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
>+ AC_SUBST([PACKAGE], [$1])dnl
>+ AC_SUBST([VERSION], [$2])],
>+[_AM_SET_OPTIONS([$1])dnl
>+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
>+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
>+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
>+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
>+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
>+
>+_AM_IF_OPTION([no-define],,
>+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
>+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
>+
>+# Some tools Automake needs.
>+AC_REQUIRE([AM_SANITY_CHECK])dnl
>+AC_REQUIRE([AC_ARG_PROGRAM])dnl
>+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
>+AM_MISSING_PROG(AUTOCONF, autoconf)
>+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
>+AM_MISSING_PROG(AUTOHEADER, autoheader)
>+AM_MISSING_PROG(MAKEINFO, makeinfo)
>+AM_PROG_INSTALL_SH
>+AM_PROG_INSTALL_STRIP
>+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
>+# We need awk for the "check" target.  The system "awk" is bad on
>+# some platforms.
>+AC_REQUIRE([AC_PROG_AWK])dnl
>+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
>+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
>+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
>+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
>+	      		     [_AM_PROG_TAR([v7])])])
>+_AM_IF_OPTION([no-dependencies],,
>+[AC_PROVIDE_IFELSE([AC_PROG_CC],
>+                  [_AM_DEPENDENCIES(CC)],
>+                  [define([AC_PROG_CC],
>+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
>+AC_PROVIDE_IFELSE([AC_PROG_CXX],
>+                  [_AM_DEPENDENCIES(CXX)],
>+                  [define([AC_PROG_CXX],
>+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
>+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
>+                  [_AM_DEPENDENCIES(OBJC)],
>+                  [define([AC_PROG_OBJC],
>+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
>+])
>+])
>+
>+
>+# When config.status generates a header, we must update the stamp-h file.
>+# This file resides in the same directory as the config header
>+# that is generated.  The stamp files are numbered to have different names.
>+
>+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
>+# loop where config.status creates the headers, so we can generate
>+# our stamp files there.
>+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
>+[# Compute $1's index in $config_headers.
>+_am_stamp_count=1
>+for _am_header in $config_headers :; do
>+  case $_am_header in
>+    $1 | $1:* )
>+      break ;;
>+    * )
>+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
>+  esac
>+done
>+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
>+
>+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
> #
>-# This code is only required when automatic dependency tracking
>-# is enabled.  FIXME.  This creates each `.P' file that we will
>-# need in order to bootstrap the dependency handling code.
>-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
>-[AC_CONFIG_COMMANDS([depfiles],
>-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
>-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
>-])
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# Check to see how 'make' treats includes.	-*- Autoconf -*-
>+# AM_PROG_INSTALL_SH
>+# ------------------
>+# Define $install_sh.
>+AC_DEFUN([AM_PROG_INSTALL_SH],
>+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
>+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
>+AC_SUBST(install_sh)])
> 
>-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
>+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>+# serial 2
> 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# Check whether the underlying file-system supports filenames
>+# with a leading dot.  For instance MS-DOS doesn't.
>+AC_DEFUN([AM_SET_LEADING_DOT],
>+[rm -rf .tst 2>/dev/null
>+mkdir .tst 2>/dev/null
>+if test -d .tst; then
>+  am__leading_dot=.
>+else
>+  am__leading_dot=_
>+fi
>+rmdir .tst 2>/dev/null
>+AC_SUBST([am__leading_dot])])
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
> 
>-# serial 2
>+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# serial 3
> 
> # AM_MAKE_INCLUDE()
> # -----------------
>@@ -4632,3 +6973,286 @@
> rm -f confinc confmf
> ])
> 
>+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
>+
>+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# serial 5
>+
>+# AM_MISSING_PROG(NAME, PROGRAM)
>+# ------------------------------
>+AC_DEFUN([AM_MISSING_PROG],
>+[AC_REQUIRE([AM_MISSING_HAS_RUN])
>+$1=${$1-"${am_missing_run}$2"}
>+AC_SUBST($1)])
>+
>+
>+# AM_MISSING_HAS_RUN
>+# ------------------
>+# Define MISSING if not defined so far and test if it supports --run.
>+# If it does, set am_missing_run to use it, otherwise, to nothing.
>+AC_DEFUN([AM_MISSING_HAS_RUN],
>+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
>+AC_REQUIRE_AUX_FILE([missing])dnl
>+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
>+# Use eval to expand $SHELL
>+if eval "$MISSING --run true"; then
>+  am_missing_run="$MISSING --run "
>+else
>+  am_missing_run=
>+  AC_MSG_WARN([`missing' script is too old or missing])
>+fi
>+])
>+
>+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# AM_PROG_MKDIR_P
>+# ---------------
>+# Check for `mkdir -p'.
>+AC_DEFUN([AM_PROG_MKDIR_P],
>+[AC_PREREQ([2.60])dnl
>+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
>+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
>+dnl while keeping a definition of mkdir_p for backward compatibility.
>+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
>+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
>+dnl Makefile.ins that do not define MKDIR_P, so we do our own
>+dnl adjustment using top_builddir (which is defined more often than
>+dnl MKDIR_P).
>+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
>+case $mkdir_p in
>+  [[\\/$]]* | ?:[[\\/]]*) ;;
>+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
>+esac
>+])
>+
>+# Helper functions for option handling.                     -*- Autoconf -*-
>+
>+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# serial 3
>+
>+# _AM_MANGLE_OPTION(NAME)
>+# -----------------------
>+AC_DEFUN([_AM_MANGLE_OPTION],
>+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
>+
>+# _AM_SET_OPTION(NAME)
>+# ------------------------------
>+# Set option NAME.  Presently that only means defining a flag for this option.
>+AC_DEFUN([_AM_SET_OPTION],
>+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
>+
>+# _AM_SET_OPTIONS(OPTIONS)
>+# ----------------------------------
>+# OPTIONS is a space-separated list of Automake options.
>+AC_DEFUN([_AM_SET_OPTIONS],
>+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
>+
>+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
>+# -------------------------------------------
>+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
>+AC_DEFUN([_AM_IF_OPTION],
>+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
>+
>+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
>+
>+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# serial 4
>+
>+# AM_SANITY_CHECK
>+# ---------------
>+AC_DEFUN([AM_SANITY_CHECK],
>+[AC_MSG_CHECKING([whether build environment is sane])
>+# Just in case
>+sleep 1
>+echo timestamp > conftest.file
>+# 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".
>+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
>+alias in your environment])
>+   fi
>+
>+   test "$[2]" = conftest.file
>+   )
>+then
>+   # Ok.
>+   :
>+else
>+   AC_MSG_ERROR([newly created file is older than distributed files!
>+Check your system clock])
>+fi
>+AC_MSG_RESULT(yes)])
>+
>+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# AM_PROG_INSTALL_STRIP
>+# ---------------------
>+# One issue with vendor `install' (even GNU) is that you can't
>+# specify the program used to strip binaries.  This is especially
>+# annoying in cross-compiling environments, where the build's strip
>+# is unlikely to handle the host's binaries.
>+# Fortunately install-sh will honor a STRIPPROG variable, so we
>+# always use install-sh in `make install-strip', and initialize
>+# STRIPPROG with the value of the STRIP variable (set by the user).
>+AC_DEFUN([AM_PROG_INSTALL_STRIP],
>+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
>+# 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.
>+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
>+if test "$cross_compiling" != no; then
>+  AC_CHECK_TOOL([STRIP], [strip], :)
>+fi
>+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
>+AC_SUBST([INSTALL_STRIP_PROGRAM])])
>+
>+# Copyright (C) 2006  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# _AM_SUBST_NOTMAKE(VARIABLE)
>+# ---------------------------
>+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
>+# This macro is traced by Automake.
>+AC_DEFUN([_AM_SUBST_NOTMAKE])
>+
>+# Check how to create a tarball.                            -*- Autoconf -*-
>+
>+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# serial 2
>+
>+# _AM_PROG_TAR(FORMAT)
>+# --------------------
>+# Check how to create a tarball in format FORMAT.
>+# FORMAT should be one of `v7', `ustar', or `pax'.
>+#
>+# Substitute a variable $(am__tar) that is a command
>+# writing to stdout a FORMAT-tarball containing the directory
>+# $tardir.
>+#     tardir=directory && $(am__tar) > result.tar
>+#
>+# Substitute a variable $(am__untar) that extract such
>+# a tarball read from stdin.
>+#     $(am__untar) < result.tar
>+AC_DEFUN([_AM_PROG_TAR],
>+[# Always define AMTAR for backward compatibility.
>+AM_MISSING_PROG([AMTAR], [tar])
>+m4_if([$1], [v7],
>+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
>+     [m4_case([$1], [ustar],, [pax],,
>+              [m4_fatal([Unknown tar format])])
>+AC_MSG_CHECKING([how to create a $1 tar archive])
>+# Loop over all known methods to create a tar archive until one works.
>+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
>+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
>+# Do not fold the above two line into one, because Tru64 sh and
>+# Solaris sh will not grok spaces in the rhs of `-'.
>+for _am_tool in $_am_tools
>+do
>+  case $_am_tool in
>+  gnutar)
>+    for _am_tar in tar gnutar gtar;
>+    do
>+      AM_RUN_LOG([$_am_tar --version]) && break
>+    done
>+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
>+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
>+    am__untar="$_am_tar -xf -"
>+    ;;
>+  plaintar)
>+    # Must skip GNU tar: if it does not support --format= it doesn't create
>+    # ustar tarball either.
>+    (tar --version) >/dev/null 2>&1 && continue
>+    am__tar='tar chf - "$$tardir"'
>+    am__tar_='tar chf - "$tardir"'
>+    am__untar='tar xf -'
>+    ;;
>+  pax)
>+    am__tar='pax -L -x $1 -w "$$tardir"'
>+    am__tar_='pax -L -x $1 -w "$tardir"'
>+    am__untar='pax -r'
>+    ;;
>+  cpio)
>+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
>+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
>+    am__untar='cpio -i -H $1 -d'
>+    ;;
>+  none)
>+    am__tar=false
>+    am__tar_=false
>+    am__untar=false
>+    ;;
>+  esac
>+
>+  # If the value was cached, stop now.  We just wanted to have am__tar
>+  # and am__untar set.
>+  test -n "${am_cv_prog_tar_$1}" && break
>+
>+  # tar/untar a dummy directory, and stop if the command works
>+  rm -rf conftest.dir
>+  mkdir conftest.dir
>+  echo GrepMe > conftest.dir/file
>+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
>+  rm -rf conftest.dir
>+  if test -s conftest.tar; then
>+    AM_RUN_LOG([$am__untar <conftest.tar])
>+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
>+  fi
>+done
>+rm -rf conftest.dir
>+
>+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
>+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
>+AC_SUBST([am__tar])
>+AC_SUBST([am__untar])
>+]) # _AM_PROG_TAR
>+
>diff -uNr vamos-0.5.5.orig/body/Makefile.am vamos-0.5.5/body/Makefile.am
>--- vamos-0.5.5.orig/body/Makefile.am	2005-02-25 05:13:51.000000000 +0100
>+++ vamos-0.5.5/body/Makefile.am	2007-06-25 17:58:09.000000000 +0200
>@@ -23,4 +23,4 @@
> 
> INCLUDES = -I$(top_srcdir)/include
> 
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>+AM_CXXFLAGS =
>diff -uNr vamos-0.5.5.orig/body/Makefile.in vamos-0.5.5/body/Makefile.in
>--- vamos-0.5.5.orig/body/Makefile.in	2005-10-29 22:28:46.000000000 +0200
>+++ vamos-0.5.5/body/Makefile.in	2007-06-25 18:02:53.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,52 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = body
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(libdir)"
>+libLTLIBRARIES_INSTALL = $(INSTALL)
>+LTLIBRARIES = $(lib_LTLIBRARIES)
>+libvamos_body_la_LIBADD =
>+am_libvamos_body_la_OBJECTS = Aerodynamic_Device.lo Rigid_Body.lo \
>+	Brake.lo Car.lo Clutch.lo Contact_Point.lo Dashboard.lo \
>+	Differential.lo Drivetrain.lo Engine.lo Exerter.lo Frame.lo \
>+	Fuel_Tank.lo Gl_Car.lo Particle.lo Suspension.lo Tire.lo \
>+	Transmission.lo Wheel.lo
>+libvamos_body_la_OBJECTS = $(am_libvamos_body_la_OBJECTS)
>+DEFAULT_INCLUDES = -I.@am__isrc@
>+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>+am__depfiles_maybe = depfiles
>+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+CXXLD = $(CXX)
>+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+	$(LDFLAGS) -o $@
>+SOURCES = $(libvamos_body_la_SOURCES)
>+DIST_SOURCES = $(libvamos_body_la_SOURCES)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +92,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +113,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,54 +123,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> lib_LTLIBRARIES = libvamos-body.la
>-
> libvamos_body_la_SOURCES = \
> 	Aerodynamic_Device.cc \
> 	Rigid_Body.cc \
>@@ -155,94 +206,73 @@
> 	Transmission.cc \
> 	Wheel.cc
> 
>-
> INCLUDES = -I$(top_srcdir)/include
>-
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>-subdir = body
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-LTLIBRARIES = $(lib_LTLIBRARIES)
>-
>-libvamos_body_la_LDFLAGS =
>-libvamos_body_la_LIBADD =
>-am_libvamos_body_la_OBJECTS = Aerodynamic_Device.lo Rigid_Body.lo \
>-	Brake.lo Car.lo Clutch.lo Contact_Point.lo Dashboard.lo \
>-	Differential.lo Drivetrain.lo Engine.lo Exerter.lo Frame.lo \
>-	Fuel_Tank.lo Gl_Car.lo Particle.lo Suspension.lo Tire.lo \
>-	Transmission.lo Wheel.lo
>-libvamos_body_la_OBJECTS = $(am_libvamos_body_la_OBJECTS)
>-
>-DEFAULT_INCLUDES =  -I. -I$(srcdir)
>-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>-am__depfiles_maybe = depfiles
>-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Aerodynamic_Device.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Brake.Plo ./$(DEPDIR)/Car.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Clutch.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Contact_Point.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Dashboard.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Differential.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Drivetrain.Plo ./$(DEPDIR)/Engine.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Exerter.Plo ./$(DEPDIR)/Frame.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Fuel_Tank.Plo ./$(DEPDIR)/Gl_Car.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Particle.Plo ./$(DEPDIR)/Rigid_Body.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Suspension.Plo ./$(DEPDIR)/Tire.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Transmission.Plo ./$(DEPDIR)/Wheel.Plo
>-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CXXFLAGS) $(CXXFLAGS)
>-CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>-DIST_SOURCES = $(libvamos_body_la_SOURCES)
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-SOURCES = $(libvamos_body_la_SOURCES)
>-
>+AM_CXXFLAGS = 
> all: all-am
> 
> .SUFFIXES:
> .SUFFIXES: .cc .lo .o .obj
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  body/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  body/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>-libLTLIBRARIES_INSTALL = $(INSTALL)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> install-libLTLIBRARIES: $(lib_LTLIBRARIES)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  if test -f $$p; then \
>-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
>-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
>+	    f=$(am__strip_dir) \
>+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
>+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
> 	  else :; fi; \
> 	done
> 
> uninstall-libLTLIBRARIES:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
>-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
>-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
>+	  p=$(am__strip_dir) \
>+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
>+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
> 	done
> 
> clean-libLTLIBRARIES:
> 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
>-	  test "$$dir" = "$$p" && dir=.; \
>+	  test "$$dir" != "$$p" || dir=.; \
> 	  echo "rm -f \"$${dir}/so_locations\""; \
> 	  rm -f "$${dir}/so_locations"; \
> 	done
> libvamos-body.la: $(libvamos_body_la_OBJECTS) $(libvamos_body_la_DEPENDENCIES) 
>-	$(CXXLINK) -rpath $(libdir) $(libvamos_body_la_LDFLAGS) $(libvamos_body_la_OBJECTS) $(libvamos_body_la_LIBADD) $(LIBS)
>+	$(CXXLINK) -rpath $(libdir) $(libvamos_body_la_OBJECTS) $(libvamos_body_la_LIBADD) $(LIBS)
> 
> mostlyclean-compile:
>-	-rm -f *.$(OBJEXT) core *.core
>+	-rm -f *.$(OBJEXT)
> 
> distclean-compile:
> 	-rm -f *.tab.c
>@@ -268,37 +298,25 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Wheel.Plo@am__quote@
> 
> .cc.o:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
> 
> .cc.obj:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
> 
> .cc.lo:
>-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -306,18 +324,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -326,6 +332,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -337,10 +344,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -363,28 +371,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -398,9 +401,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(LTLIBRARIES)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	for dir in "$(DESTDIR)$(libdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -420,7 +424,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -434,24 +438,34 @@
> 	-rm -rf ./$(DEPDIR)
> 	-rm -f Makefile
> distclean-am: clean-am distclean-compile distclean-generic \
>-	distclean-libtool distclean-tags
>+	distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am: install-libLTLIBRARIES
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -472,20 +486,23 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
>+uninstall-am: uninstall-libLTLIBRARIES
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libLTLIBRARIES clean-libtool ctags distclean \
> 	distclean-compile distclean-generic distclean-libtool \
>-	distclean-tags distdir dvi dvi-am info info-am install \
>-	install-am install-data install-data-am install-exec \
>-	install-exec-am install-info install-info-am \
>-	install-libLTLIBRARIES install-man install-strip installcheck \
>+	distclean-tags distdir dvi dvi-am html html-am info info-am \
>+	install install-am install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am \
>+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
>+	install-ps install-ps-am install-strip installcheck \
> 	installcheck-am installdirs maintainer-clean \
> 	maintainer-clean-generic mostlyclean mostlyclean-compile \
> 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>-	tags uninstall uninstall-am uninstall-info-am \
>-	uninstall-libLTLIBRARIES
>+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/caelum/Makefile.am vamos-0.5.5/caelum/Makefile.am
>--- vamos-0.5.5.orig/caelum/Makefile.am	2005-03-09 03:39:08.000000000 +0100
>+++ vamos-0.5.5/caelum/Makefile.am	2007-06-25 17:58:09.000000000 +0200
>@@ -23,4 +23,4 @@
> 	Sky.h \
> 	Sphere_Sky.h
> 
>-AM_CXXFLAGS = -Wall -pedantic
>+AM_CXXFLAGS =
>diff -uNr vamos-0.5.5.orig/caelum/Makefile.in vamos-0.5.5/caelum/Makefile.in
>--- vamos-0.5.5.orig/caelum/Makefile.in	2005-10-29 22:29:00.000000000 +0200
>+++ vamos-0.5.5/caelum/Makefile.in	2007-06-25 18:02:53.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,43 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+noinst_PROGRAMS = caelum$(EXEEXT)
>+subdir = caelum
>+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
>+	COPYING
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+PROGRAMS = $(noinst_PROGRAMS)
>+am_caelum_OBJECTS = caelum.$(OBJEXT) Cylinder_Sky.$(OBJEXT) \
>+	Sky.$(OBJEXT) Sphere_Sky.$(OBJEXT)
>+caelum_OBJECTS = $(am_caelum_OBJECTS)
>+caelum_LDADD = $(LDADD)
>+DEFAULT_INCLUDES = -I.@am__isrc@
>+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>+am__depfiles_maybe = depfiles
>+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+CXXLD = $(CXX)
>+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+	$(LDFLAGS) -o $@
>+SOURCES = $(caelum_SOURCES)
>+DIST_SOURCES = $(caelum_SOURCES)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,23 +83,22 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
> INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
> LDFLAGS = @LDFLAGS@
> LIBOBJS = @LIBOBJS@
>-
> LIBS = \
> 	$(top_srcdir)/geometry/libvamos-geometry.la \
> 	$(top_srcdir)/media/libvamos-media.la \
>@@ -85,6 +111,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -94,113 +121,116 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>-noinst_PROGRAMS = caelum
>-
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> caelum_SOURCES = \
> 	caelum.cc \
> 	Cylinder_Sky.cc \
> 	Sky.cc \
> 	Sphere_Sky.cc
> 
>-
> INCLUDES = \
> 	-I$(top_srcdir)/include \
> 	`pkg-config --cflags sigc++-1.2`
> 
>-
> EXTRA_DIST = \
> 	Cylinder_Sky.h \
> 	Sky.h \
> 	Sphere_Sky.h
> 
>-
>-AM_CXXFLAGS = -Wall -pedantic
>-subdir = caelum
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-noinst_PROGRAMS = caelum$(EXEEXT)
>-PROGRAMS = $(noinst_PROGRAMS)
>-
>-am_caelum_OBJECTS = caelum.$(OBJEXT) Cylinder_Sky.$(OBJEXT) \
>-	Sky.$(OBJEXT) Sphere_Sky.$(OBJEXT)
>-caelum_OBJECTS = $(am_caelum_OBJECTS)
>-caelum_LDADD = $(LDADD)
>-caelum_DEPENDENCIES =
>-caelum_LDFLAGS =
>-
>-DEFAULT_INCLUDES =  -I. -I$(srcdir)
>-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>-am__depfiles_maybe = depfiles
>-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Cylinder_Sky.Po ./$(DEPDIR)/Sky.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/Sphere_Sky.Po ./$(DEPDIR)/caelum.Po
>-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CXXFLAGS) $(CXXFLAGS)
>-CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>-DIST_SOURCES = $(caelum_SOURCES)
>-DIST_COMMON = README $(srcdir)/Makefile.in COPYING Makefile.am
>-SOURCES = $(caelum_SOURCES)
>-
>+AM_CXXFLAGS = 
> all: all-am
> 
> .SUFFIXES:
> .SUFFIXES: .cc .lo .o .obj
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  caelum/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  caelum/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> clean-noinstPROGRAMS:
> 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
>@@ -210,10 +240,10 @@
> 	done
> caelum$(EXEEXT): $(caelum_OBJECTS) $(caelum_DEPENDENCIES) 
> 	@rm -f caelum$(EXEEXT)
>-	$(CXXLINK) $(caelum_LDFLAGS) $(caelum_OBJECTS) $(caelum_LDADD) $(LIBS)
>+	$(CXXLINK) $(caelum_OBJECTS) $(caelum_LDADD) $(LIBS)
> 
> mostlyclean-compile:
>-	-rm -f *.$(OBJEXT) core *.core
>+	-rm -f *.$(OBJEXT)
> 
> distclean-compile:
> 	-rm -f *.tab.c
>@@ -224,37 +254,25 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caelum.Po@am__quote@
> 
> .cc.o:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
> 
> .cc.obj:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
> 
> .cc.lo:
>-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -262,18 +280,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -282,6 +288,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -293,10 +300,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -319,28 +327,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -354,7 +357,6 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(PROGRAMS)
>-
> installdirs:
> install: install-am
> install-exec: install-exec-am
>@@ -375,7 +377,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -389,24 +391,34 @@
> 	-rm -rf ./$(DEPDIR)
> 	-rm -f Makefile
> distclean-am: clean-am distclean-compile distclean-generic \
>-	distclean-libtool distclean-tags
>+	distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -427,18 +439,22 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am:
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libtool clean-noinstPROGRAMS ctags distclean \
> 	distclean-compile distclean-generic distclean-libtool \
>-	distclean-tags distdir dvi dvi-am info info-am install \
>-	install-am install-data install-data-am install-exec \
>-	install-exec-am install-info install-info-am install-man \
>+	distclean-tags distdir dvi dvi-am html html-am info info-am \
>+	install install-am install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am install-man \
>+	install-pdf install-pdf-am install-ps install-ps-am \
> 	install-strip installcheck installcheck-am installdirs \
> 	maintainer-clean maintainer-clean-generic mostlyclean \
>-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
>-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
>+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
>+	pdf pdf-am ps ps-am tags uninstall uninstall-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/config/config.guess vamos-0.5.5/config/config.guess
>--- vamos-0.5.5.orig/config/config.guess	2001-10-17 03:31:34.000000000 +0200
>+++ vamos-0.5.5/config/config.guess	2007-06-25 17:58:11.000000000 +0200
>@@ -1,8 +1,10 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
>-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
>-#   Free Software Foundation, Inc.
>-#
>+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
>+
>+timestamp='2003-06-17'
>+
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
> # the Free Software Foundation; either version 2 of the License, or
>@@ -22,101 +24,275 @@
> # configuration script generated by Autoconf, you may include it under
> # the same distribution terms that you use for the rest of that program.
> 
>-# Written by Per Bothner <bothner@cygnus.com>.
>-# The master version of this file is at the FSF in /home/gd/gnu/lib.
>-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
>+# Originally written by Per Bothner <per@bothner.com>.
>+# Please send patches to <config-patches@gnu.org>.  Submit a context
>+# diff and a properly formatted ChangeLog entry.
> #
> # This script attempts to guess a canonical system name similar to
> # config.sub.  If it succeeds, it prints the system name on stdout, and
> # exits with 0.  Otherwise, it exits with 1.
> #
> # The plan is that this can be called by configure scripts if you
>-# don't specify an explicit system type (host/target name).
>-#
>-# Only a few systems have been added to this list; please add others
>-# (but try to keep the structure clean).
>-#
>+# don't specify an explicit build system type.
> 
>-# Use $HOST_CC if defined. $CC may point to a cross-compiler
>-if test x"$CC_FOR_BUILD" = x; then
>-  if test x"$HOST_CC" != x; then
>-    CC_FOR_BUILD="$HOST_CC"
>-  else
>-    if test x"$CC" != x; then
>-      CC_FOR_BUILD="$CC"
>-    else
>-      CC_FOR_BUILD=cc
>-    fi
>-  fi
>+me=`echo "$0" | sed -e 's,.*/,,'`
>+
>+usage="\
>+Usage: $0 [OPTION]
>+
>+Output the configuration name of the system \`$me' is run on.
>+
>+Operation modes:
>+  -h, --help         print this help, then exit
>+  -t, --time-stamp   print date of last modification, then exit
>+  -v, --version      print version number, then exit
>+
>+Report bugs and patches to <config-patches@gnu.org>."
>+
>+version="\
>+GNU config.guess ($timestamp)
>+
>+Originally written by Per Bothner.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
>+Free Software Foundation, Inc.
>+
>+This is free software; see the source for copying conditions.  There is NO
>+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>+
>+help="
>+Try \`$me --help' for more information."
>+
>+# Parse command line
>+while test $# -gt 0 ; do
>+  case $1 in
>+    --time-stamp | --time* | -t )
>+       echo "$timestamp" ; exit 0 ;;
>+    --version | -v )
>+       echo "$version" ; exit 0 ;;
>+    --help | --h* | -h )
>+       echo "$usage"; exit 0 ;;
>+    -- )     # Stop option processing
>+       shift; break ;;
>+    - )	# Use stdin as input.
>+       break ;;
>+    -* )
>+       echo "$me: invalid option $1$help" >&2
>+       exit 1 ;;
>+    * )
>+       break ;;
>+  esac
>+done
>+
>+if test $# != 0; then
>+  echo "$me: too many arguments$help" >&2
>+  exit 1
> fi
> 
>+trap 'exit 1' 1 2 15
>+
>+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
>+# compiler to aid in system detection is discouraged as it requires
>+# temporary files to be created and, as you can see below, it is a
>+# headache to deal with in a portable fashion.
>+
>+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
>+# use `HOST_CC' if defined, but it is deprecated.
>+
>+# Portable tmp directory creation inspired by the Autoconf team.
>+
>+set_cc_for_build='
>+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
>+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
>+: ${TMPDIR=/tmp} ;
>+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>+dummy=$tmp/dummy ;
>+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
>+case $CC_FOR_BUILD,$HOST_CC,$CC in
>+ ,,)    echo "int x;" > $dummy.c ;
>+	for c in cc gcc c89 c99 ; do
>+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
>+	     CC_FOR_BUILD="$c"; break ;
>+	  fi ;
>+	done ;
>+	if test x"$CC_FOR_BUILD" = x ; then
>+	  CC_FOR_BUILD=no_compiler_found ;
>+	fi
>+	;;
>+ ,,*)   CC_FOR_BUILD=$CC ;;
>+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
>+esac ;'
> 
> # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
>-# (ghazi@noc.rutgers.edu 8/24/94.)
>+# (ghazi@noc.rutgers.edu 1994-08-24)
> if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
> 	PATH=$PATH:/.attbin ; export PATH
> fi
> 
> UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
> UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
>-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
>+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
> UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
> 
>-dummy=dummy-$$
>-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
>+## for Red Hat Linux
>+if test -f /etc/redhat-release ; then
>+    VENDOR=redhat ;
>+else
>+    VENDOR= ;
>+fi
> 
> # Note: order is significant - the case branches are not exclusive.
> 
> case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>+    *:NetBSD:*:*)
>+	# NetBSD (nbsd) targets should (where applicable) match one or
>+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
>+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
>+	# switched to ELF, *-*-netbsd* would select the old
>+	# object file format.  This provides both forward
>+	# compatibility and a consistent mechanism for selecting the
>+	# object file format.
>+	#
>+	# Note: NetBSD doesn't particularly care about the vendor
>+	# portion of the name.  We always set it to "unknown".
>+	sysctl="sysctl -n hw.machine_arch"
>+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
>+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
>+	case "${UNAME_MACHINE_ARCH}" in
>+	    armeb) machine=armeb-unknown ;;
>+	    arm*) machine=arm-unknown ;;
>+	    sh3el) machine=shl-unknown ;;
>+	    sh3eb) machine=sh-unknown ;;
>+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
>+	esac
>+	# The Operating System including object format, if it has switched
>+	# to ELF recently, or will in the future.
>+	case "${UNAME_MACHINE_ARCH}" in
>+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
>+		eval $set_cc_for_build
>+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+			| grep __ELF__ >/dev/null
>+		then
>+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
>+		    # Return netbsd for either.  FIX?
>+		    os=netbsd
>+		else
>+		    os=netbsdelf
>+		fi
>+		;;
>+	    *)
>+	        os=netbsd
>+		;;
>+	esac
>+	# The OS release
>+	# Debian GNU/NetBSD machines have a different userland, and
>+	# thus, need a distinct triplet. However, they do not need
>+	# kernel version information, so it can be replaced with a
>+	# suitable tag, in the style of linux-gnu.
>+	case "${UNAME_VERSION}" in
>+	    Debian*)
>+		release='-gnu'
>+		;;
>+	    *)
>+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
>+		;;
>+	esac
>+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
>+	# contains redundant information, the shorter form:
>+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
>+	echo "${machine}-${os}${release}"
>+	exit 0 ;;
>+    amiga:OpenBSD:*:*)
>+	echo m68k-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    arc:OpenBSD:*:*)
>+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    hp300:OpenBSD:*:*)
>+	echo m68k-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    mac68k:OpenBSD:*:*)
>+	echo m68k-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    macppc:OpenBSD:*:*)
>+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    mvme68k:OpenBSD:*:*)
>+	echo m68k-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    mvme88k:OpenBSD:*:*)
>+	echo m88k-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    mvmeppc:OpenBSD:*:*)
>+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    pmax:OpenBSD:*:*)
>+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    sgi:OpenBSD:*:*)
>+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    sun3:OpenBSD:*:*)
>+	echo m68k-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    wgrisc:OpenBSD:*:*)
>+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>+    *:OpenBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
>+	exit 0 ;;
>     alpha:OSF1:*:*)
> 	if test $UNAME_RELEASE = "V4.0"; then
> 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
> 	fi
>+	# According to Compaq, /usr/sbin/psrinfo has been available on
>+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
>+	# covers most systems running today.  This code pipes the CPU
>+	# types through head -n 1, so we only detect the type of CPU 0.
>+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
>+	case "$ALPHA_CPU_TYPE" in
>+	    "EV4 (21064)")
>+		UNAME_MACHINE="alpha" ;;
>+	    "EV4.5 (21064)")
>+		UNAME_MACHINE="alpha" ;;
>+	    "LCA4 (21066/21068)")
>+		UNAME_MACHINE="alpha" ;;
>+	    "EV5 (21164)")
>+		UNAME_MACHINE="alphaev5" ;;
>+	    "EV5.6 (21164A)")
>+		UNAME_MACHINE="alphaev56" ;;
>+	    "EV5.6 (21164PC)")
>+		UNAME_MACHINE="alphapca56" ;;
>+	    "EV5.7 (21164PC)")
>+		UNAME_MACHINE="alphapca57" ;;
>+	    "EV6 (21264)")
>+		UNAME_MACHINE="alphaev6" ;;
>+	    "EV6.7 (21264A)")
>+		UNAME_MACHINE="alphaev67" ;;
>+	    "EV6.8CB (21264C)")
>+		UNAME_MACHINE="alphaev68" ;;
>+	    "EV6.8AL (21264B)")
>+		UNAME_MACHINE="alphaev68" ;;
>+	    "EV6.8CX (21264D)")
>+		UNAME_MACHINE="alphaev68" ;;
>+	    "EV6.9A (21264/EV69A)")
>+		UNAME_MACHINE="alphaev69" ;;
>+	    "EV7 (21364)")
>+		UNAME_MACHINE="alphaev7" ;;
>+	    "EV7.9 (21364A)")
>+		UNAME_MACHINE="alphaev79" ;;
>+	esac
> 	# A Vn.n version is a released version.
> 	# A Tn.n version is a released field test version.
> 	# A Xn.n version is an unreleased experimental baselevel.
> 	# 1.2 uses "1.2" for uname -r.
>-	cat <<EOF >$dummy.s
>-	.globl main
>-	.ent main
>-main:
>-	.frame \$30,0,\$26,0
>-	.prologue 0
>-	.long 0x47e03d80 # implver $0
>-	lda \$2,259
>-	.long 0x47e20c21 # amask $2,$1
>-	srl \$1,8,\$2
>-	sll \$2,2,\$2
>-	sll \$0,3,\$0
>-	addl \$1,\$0,\$0
>-	addl \$2,\$0,\$0
>-	ret \$31,(\$26),1
>-	.end main
>-EOF
>-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
>-	if test "$?" = 0 ; then
>-		./$dummy
>-		case "$?" in
>-			7)
>-				UNAME_MACHINE="alpha"
>-				;;
>-			15)
>-				UNAME_MACHINE="alphaev5"
>-				;;
>-			14)
>-				UNAME_MACHINE="alphaev56"
>-				;;
>-			10)
>-				UNAME_MACHINE="alphapca56"
>-				;;
>-			16)
>-				UNAME_MACHINE="alphaev6"
>-				;;
>-		esac
>-	fi
>-	rm -f $dummy.s $dummy
> 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> 	exit 0 ;;
>+    Alpha*:OpenVMS:*:*)
>+	echo alpha-hp-vms
>+	exit 0 ;;
>     Alpha\ *:Windows_NT*:*)
> 	# How do we know it's Interix rather than the generic POSIX subsystem?
> 	# Should we change UNAME_MACHINE based on the output of uname instead
>@@ -127,42 +303,21 @@
> 	echo alpha-dec-winnt3.5
> 	exit 0 ;;
>     Amiga*:UNIX_System_V:4.0:*)
>-	echo m68k-cbm-sysv4
>+	echo m68k-unknown-sysv4
> 	exit 0;;
>-    amiga:NetBSD:*:*)
>-      echo m68k-cbm-netbsd${UNAME_RELEASE}
>-      exit 0 ;;
>-    amiga:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>     *:[Aa]miga[Oo][Ss]:*:*)
> 	echo ${UNAME_MACHINE}-unknown-amigaos
> 	exit 0 ;;
>-    arc64:OpenBSD:*:*)
>-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    arc:OpenBSD:*:*)
>-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>+    *:[Mm]orph[Oo][Ss]:*:*)
>+	echo ${UNAME_MACHINE}-unknown-morphos
> 	exit 0 ;;
>-    hkmips:OpenBSD:*:*)
>-	echo mips-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    pmax:OpenBSD:*:*)
>-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    sgi:OpenBSD:*:*)
>-	echo mips-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    wgrisc:OpenBSD:*:*)
>-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>+    *:OS/390:*:*)
>+	echo i370-ibm-openedition
> 	exit 0 ;;
>     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
> 	echo arm-acorn-riscix${UNAME_RELEASE}
> 	exit 0;;
>-    arm32:NetBSD:*:*)
>-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
>-	exit 0 ;;
>-    SR2?01:HI-UX/MPP:*:*)
>+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
> 	echo hppa1.1-hitachi-hiuxmpp
> 	exit 0;;
>     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
>@@ -176,6 +331,13 @@
>     NILE*:*:*:dcosx)
> 	echo pyramid-pyramid-svr4
> 	exit 0 ;;
>+    DRS?6000:unix:4.0:6*)
>+	echo sparc-icl-nx6
>+	exit 0 ;;
>+    DRS?6000:UNIX_SV:4.2*:7*)
>+	case `/usr/bin/uname -p` in
>+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
>+	esac ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit 0 ;;
>@@ -204,7 +366,7 @@
> 	echo m68k-sun-sunos${UNAME_RELEASE}
> 	exit 0 ;;
>     sun*:*:4.2BSD:*)
>-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
>+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
> 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
> 	case "`/bin/arch`" in
> 	    sun3)
>@@ -218,15 +380,9 @@
>     aushp:SunOS:*:*)
> 	echo sparc-auspex-sunos${UNAME_RELEASE}
> 	exit 0 ;;
>-    atari*:NetBSD:*:*)
>-	echo m68k-atari-netbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    atari*:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>     # The situation for MiNT is a little confusing.  The machine name
>     # can be virtually everything (everything which is not
>-    # "atarist" or "atariste" at least should have a processor 
>+    # "atarist" or "atariste" at least should have a processor
>     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
>     # to the lowercase version "mint" (or "freemint").  Finally
>     # the system name "TOS" denotes a system which is actually not
>@@ -250,30 +406,9 @@
>     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
>         echo m68k-unknown-mint${UNAME_RELEASE}
>         exit 0 ;;
>-    sun3*:NetBSD:*:*)
>-	echo m68k-sun-netbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    sun3*:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    mac68k:NetBSD:*:*)
>-	echo m68k-apple-netbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    mac68k:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    mvme68k:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    mvme88k:OpenBSD:*:*)
>-	echo m88k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>     powerpc:machten:*:*)
> 	echo powerpc-apple-machten${UNAME_RELEASE}
> 	exit 0 ;;
>-    macppc:NetBSD:*:*)
>-        echo powerpc-apple-netbsd${UNAME_RELEASE}
>-        exit 0 ;;
>     RISC*:Mach:*:*)
> 	echo mips-dec-mach_bsd4.3
> 	exit 0 ;;
>@@ -287,8 +422,10 @@
> 	echo clipper-intergraph-clix${UNAME_RELEASE}
> 	exit 0 ;;
>     mips:*:*:UMIPS | mips:*:*:RISCos)
>+	eval $set_cc_for_build
> 	sed 's/^	//' << EOF >$dummy.c
> #ifdef __cplusplus
>+#include <stdio.h>  /* for printf() prototype */
> 	int main (int argc, char *argv[]) {
> #else
> 	int main (argc, argv) int argc; char *argv[]; {
>@@ -307,12 +444,20 @@
> 	  exit (-1);
> 	}
> EOF
>-	$CC_FOR_BUILD $dummy.c -o $dummy \
>-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \
>-	  && rm $dummy.c $dummy && exit 0
>-	rm -f $dummy.c $dummy
>+	$CC_FOR_BUILD -o $dummy $dummy.c \
>+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \
>+	  && exit 0
> 	echo mips-mips-riscos${UNAME_RELEASE}
> 	exit 0 ;;
>+    Motorola:PowerMAX_OS:*:*)
>+	echo powerpc-motorola-powermax
>+	exit 0 ;;
>+    Motorola:*:4.3:PL8-*)
>+	echo powerpc-harris-powermax
>+	exit 0 ;;
>+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
>+	echo powerpc-harris-powermax
>+	exit 0 ;;
>     Night_Hawk:Power_UNIX:*:*)
> 	echo powerpc-harris-powerunix
> 	exit 0 ;;
>@@ -328,15 +473,18 @@
>     AViiON:dgux:*:*)
>         # DG/UX returns AViiON for all architectures
>         UNAME_PROCESSOR=`/usr/bin/uname -p`
>-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
>-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
>-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
>+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
>+	then
>+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
>+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
>+	    then
> 		echo m88k-dg-dgux${UNAME_RELEASE}
>-	else
>+	    else
> 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
>+	    fi
>+	else
>+	    echo i586-dg-dgux${UNAME_RELEASE}
> 	fi
>-        else echo i586-dg-dgux${UNAME_RELEASE}
>-        fi
>  	exit 0 ;;
>     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
> 	echo m88k-dolphin-sysv3
>@@ -357,11 +505,20 @@
>     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
> 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
> 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
>-    i?86:AIX:*:*)
>+    i*86:AIX:*:*)
> 	echo i386-ibm-aix
> 	exit 0 ;;
>+    ia64:AIX:*:*)
>+	if [ -x /usr/bin/oslevel ] ; then
>+		IBM_REV=`/usr/bin/oslevel`
>+	else
>+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
>+	fi
>+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
>+	exit 0 ;;
>     *:AIX:2:3)
> 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
>+		eval $set_cc_for_build
> 		sed 's/^		//' << EOF >$dummy.c
> 		#include <sys/systemcfg.h>
> 
>@@ -373,8 +530,7 @@
> 			exit(0);
> 			}
> EOF
>-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
>-		rm -f $dummy.c $dummy
>+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
> 		echo rs6000-ibm-aix3.2.5
> 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
> 		echo rs6000-ibm-aix3.2.4
>@@ -382,9 +538,9 @@
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit 0 ;;
>-    *:AIX:*:4)
>-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
>-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
>+    *:AIX:*:[45])
>+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
>+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
> 	else
> 		IBM_ARCH=powerpc
>@@ -392,7 +548,7 @@
> 	if [ -x /usr/bin/oslevel ] ; then
> 		IBM_REV=`/usr/bin/oslevel`
> 	else
>-		IBM_REV=4.${UNAME_RELEASE}
>+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
> 	fi
> 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
> 	exit 0 ;;
>@@ -402,7 +558,7 @@
>     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
> 	echo romp-ibm-bsd4.4
> 	exit 0 ;;
>-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
>+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
> 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
> 	exit 0 ;;                           # report: romp-ibm BSD 4.3
>     *:BOSX:*:*)
>@@ -418,11 +574,30 @@
> 	echo m68k-hp-bsd4.4
> 	exit 0 ;;
>     9000/[34678]??:HP-UX:*:*)
>+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
> 	case "${UNAME_MACHINE}" in
> 	    9000/31? )            HP_ARCH=m68000 ;;
> 	    9000/[34]?? )         HP_ARCH=m68k ;;
> 	    9000/[678][0-9][0-9])
>-              sed 's/^              //' << EOF >$dummy.c
>+		if [ -x /usr/bin/getconf ]; then
>+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
>+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
>+                    case "${sc_cpu_version}" in
>+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
>+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
>+                      532)                      # CPU_PA_RISC2_0
>+                        case "${sc_kernel_bits}" in
>+                          32) HP_ARCH="hppa2.0n" ;;
>+                          64) HP_ARCH="hppa2.0w" ;;
>+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
>+                        esac ;;
>+                    esac
>+		fi
>+		if [ "${HP_ARCH}" = "" ]; then
>+		    eval $set_cc_for_build
>+		    sed 's/^              //' << EOF >$dummy.c
>+
>+              #define _HPUX_SOURCE
>               #include <stdlib.h>
>               #include <unistd.h>
> 
>@@ -453,13 +628,29 @@
>                   exit (0);
>               }
> EOF
>-	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
>-	rm -f $dummy.c $dummy
>+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
>+		    test -z "$HP_ARCH" && HP_ARCH=hppa
>+		fi ;;
> 	esac
>-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
>+	if [ ${HP_ARCH} = "hppa2.0w" ]
>+	then
>+	    # avoid double evaluation of $set_cc_for_build
>+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
>+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
>+	    then
>+		HP_ARCH="hppa2.0w"
>+	    else
>+		HP_ARCH="hppa64"
>+	    fi
>+	fi
> 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
> 	exit 0 ;;
>+    ia64:HP-UX:*:*)
>+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
>+	echo ia64-hp-hpux${HPUX_REV}
>+	exit 0 ;;
>     3050*:HI-UX:*:*)
>+	eval $set_cc_for_build
> 	sed 's/^	//' << EOF >$dummy.c
> 	#include <unistd.h>
> 	int
>@@ -485,8 +676,7 @@
> 	  exit (0);
> 	}
> EOF
>-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
>-	rm -f $dummy.c $dummy
>+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
> 	echo unknown-hitachi-hiuxwe2
> 	exit 0 ;;
>     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
>@@ -495,7 +685,7 @@
>     9000/8??:4.3bsd:*:*)
> 	echo hppa1.0-hp-bsd
> 	exit 0 ;;
>-    *9??*:MPE/iX:*:*)
>+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
> 	echo hppa1.0-hp-mpeix
> 	exit 0 ;;
>     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
>@@ -504,7 +694,7 @@
>     hp8??:OSF1:*:*)
> 	echo hppa1.0-hp-osf
> 	exit 0 ;;
>-    i?86:OSF1:*:*)
>+    i*86:OSF1:*:*)
> 	if [ -x /usr/sbin/sysversion ] ; then
> 	    echo ${UNAME_MACHINE}-unknown-osf1mk
> 	else
>@@ -514,9 +704,6 @@
>     parisc*:Lites*:*:*)
> 	echo hppa1.1-hp-lites
> 	exit 0 ;;
>-    hppa*:OpenBSD:*:*)
>-	echo hppa-unknown-openbsd
>-	exit 0 ;;
>     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
> 	echo c1-convex-bsd
>         exit 0 ;;
>@@ -535,41 +722,34 @@
>     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
> 	echo c4-convex-bsd
>         exit 0 ;;
>-    CRAY*X-MP:*:*:*)
>-	echo xmp-cray-unicos
>-        exit 0 ;;
>     CRAY*Y-MP:*:*:*)
>-	echo ymp-cray-unicos${UNAME_RELEASE}
>+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> 	exit 0 ;;
>     CRAY*[A-Z]90:*:*:*)
> 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
> 	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
>-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
>+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
>+	      -e 's/\.[^.]*$/.X/'
> 	exit 0 ;;
>     CRAY*TS:*:*:*)
>-	echo t90-cray-unicos${UNAME_RELEASE}
>+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> 	exit 0 ;;
>     CRAY*T3E:*:*:*)
>-	echo t3e-cray-unicosmk${UNAME_RELEASE}
>+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> 	exit 0 ;;
>-    CRAY-2:*:*:*)
>-	echo cray2-cray-unicos
>-        exit 0 ;;
>-    F300:UNIX_System_V:*:*)
>+    CRAY*SV1:*:*:*)
>+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>+	exit 0 ;;
>+    *:UNICOS/mp:*:*)
>+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
>+	exit 0 ;;
>+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
>+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
>         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
>         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
>-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
>+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
>         exit 0 ;;
>-    F301:UNIX_System_V:*:*)
>-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
>-       exit 0 ;;
>-    hp3[0-9][05]:NetBSD:*:*)
>-	echo m68k-hp-netbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    hp300:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
>+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
> 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
> 	exit 0 ;;
>     sparc*:BSD/OS:*:*)
>@@ -578,20 +758,19 @@
>     *:BSD/OS:*:*)
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit 0 ;;
>-    *:FreeBSD:*:*)
>-	if test -x /usr/bin/objformat; then
>-	    if test "elf" = "`/usr/bin/objformat`"; then
>-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
>-		exit 0
>-	    fi
>-	fi
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>-	exit 0 ;;
>-    *:NetBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
>-	exit 0 ;;
>-    *:OpenBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
>+    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
>+	# Determine whether the default compiler uses glibc.
>+	eval $set_cc_for_build
>+	sed 's/^	//' << EOF >$dummy.c
>+	#include <features.h>
>+	#if __GLIBC__ >= 2
>+	LIBC=gnu
>+	#else
>+	LIBC=
>+	#endif
>+EOF
>+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
> 	exit 0 ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
>@@ -599,11 +778,20 @@
>     i*:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit 0 ;;
>+    i*:PW*:*)
>+	echo ${UNAME_MACHINE}-pc-pw32
>+	exit 0 ;;
>+    x86:Interix*:[34]*)
>+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>+	exit 0 ;;
>+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
>+	echo i${UNAME_MACHINE}-pc-mks
>+	exit 0 ;;
>     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
> 	# How do we know it's Interix rather than the generic POSIX subsystem?
> 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
> 	# UNAME_MACHINE based on the output of uname instead of i386?
>-	echo i386-pc-interix
>+	echo i586-pc-interix
> 	exit 0 ;;
>     i*:UWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-uwin
>@@ -617,179 +805,165 @@
>     *:GNU:*:*)
> 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
> 	exit 0 ;;
>-    *:Linux:*:*)
>-#	# uname on the ARM produces all sorts of strangeness, and we need to
>-#	# filter it out.
>-#	case "$UNAME_MACHINE" in
>-#	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
>-#	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
>-#	esac
>-
>+    i*86:Minix:*:*)
>+	echo ${UNAME_MACHINE}-pc-minix
>+	exit 0 ;;
>+    arm*:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit 0 ;;
>+    cris:Linux:*:*)
>+	echo cris-axis-linux-gnu
>+	exit 0 ;;
>+    ia64:Linux:*:*)
>+	echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
>+	exit 0 ;;
>+    m68*:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit 0 ;;
>+    mips:Linux:*:*)
>+	eval $set_cc_for_build
>+	sed 's/^	//' << EOF >$dummy.c
>+	#undef CPU
>+	#undef mips
>+	#undef mipsel
>+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
>+	CPU=mipsel
>+	#else
>+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
>+	CPU=mips
>+	#else
>+	CPU=
>+	#endif
>+	#endif
>+EOF
>+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
>+	;;
>+    mips64:Linux:*:*)
>+	eval $set_cc_for_build
>+	sed 's/^	//' << EOF >$dummy.c
>+	#undef CPU
>+	#undef mips64
>+	#undef mips64el
>+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
>+	CPU=mips64el
>+	#else
>+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
>+	CPU=mips64
>+	#else
>+	CPU=
>+	#endif
>+	#endif
>+EOF
>+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
>+	;;
>+    ppc:Linux:*:*)
>+	echo powerpc-${VENDOR:-unknown}-linux-gnu
>+	exit 0 ;;
>+    ppc64:Linux:*:*)
>+	echo powerpc64-${VENDOR:-unknown}-linux-gnu
>+	exit 0 ;;
>+    alpha:Linux:*:*)
>+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
>+	  EV5)   UNAME_MACHINE=alphaev5 ;;
>+	  EV56)  UNAME_MACHINE=alphaev56 ;;
>+	  PCA56) UNAME_MACHINE=alphapca56 ;;
>+	  PCA57) UNAME_MACHINE=alphapca56 ;;
>+	  EV6)   UNAME_MACHINE=alphaev6 ;;
>+	  EV67)  UNAME_MACHINE=alphaev67 ;;
>+	  EV68*) UNAME_MACHINE=alphaev68 ;;
>+        esac
>+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
>+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
>+	exit 0 ;;
>+    parisc:Linux:*:* | hppa:Linux:*:*)
>+	# Look for CPU level
>+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
>+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
>+	  *)    echo hppa-unknown-linux-gnu ;;
>+	esac
>+	exit 0 ;;
>+    parisc64:Linux:*:* | hppa64:Linux:*:*)
>+	echo hppa64-unknown-linux-gnu
>+	exit 0 ;;
>+    s390:Linux:*:* | s390x:Linux:*:*)
>+	echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
>+	exit 0 ;;
>+    sh64*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit 0 ;;
>+    sh*:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit 0 ;;
>+    sparc:Linux:*:* | sparc64:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit 0 ;;
>+    x86_64:Linux:*:*)
>+	echo x86_64-${VENDOR:-unknown}-linux-gnu
>+	exit 0 ;;
>+    i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
> 	# problems with other programs or directories called `ld' in the path.
>-	ld_help_string=`cd /; ld --help 2>&1`
>-	ld_supported_emulations=`echo $ld_help_string \
>-			 | sed -ne '/supported emulations:/!d
>+	# Set LC_ALL=C to ensure ld outputs messages in English.
>+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
>+			 | sed -ne '/supported targets:/!d
> 				    s/[ 	][ 	]*/ /g
>-				    s/.*supported emulations: *//
>+				    s/.*supported targets: *//
> 				    s/ .*//
> 				    p'`
>-        case "$ld_supported_emulations" in
>-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
>-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
>-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
>-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
>-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
>-	  elf32arm)   echo "${UNAME_MACHINE}-unknown-linux-gnu"     ; exit 0 ;;
>-	  elf32ppc)
>-		# Determine Lib Version
>-		cat >$dummy.c <<EOF
>-#include <features.h>
>-#if defined(__GLIBC__)
>-extern char __libc_version[];
>-extern char __libc_release[];
>-#endif
>-main(argc, argv)
>-     int argc;
>-     char *argv[];
>-{
>-#if defined(__GLIBC__)
>-  printf("%s %s\n", __libc_version, __libc_release);
>-#else
>-  printf("unkown\n");
>-#endif
>-  return 0;
>-}
>-EOF
>-		LIBC=""
>-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
>-		if test "$?" = 0 ; then
>-			./$dummy | grep 1\.99 > /dev/null
>-			if test "$?" = 0 ; then
>-				LIBC="libc1"
>-			fi
>-		fi	
>-		rm -f $dummy.c $dummy
>-		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
>+        case "$ld_supported_targets" in
>+	  elf32-i386)
>+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
>+		;;
>+	  a.out-i386-linux)
>+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
>+		exit 0 ;;
>+	  coff-i386)
>+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
>+		exit 0 ;;
>+	  "")
>+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
>+		# one that does not give us useful --help.
>+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
>+		exit 0 ;;
> 	esac
>-
>-	if test "${UNAME_MACHINE}" = "alpha" ; then
>-		sed 's/^	//'  <<EOF >$dummy.s
>-		.globl main
>-		.ent main
>-	main:
>-		.frame \$30,0,\$26,0
>-		.prologue 0
>-		.long 0x47e03d80 # implver $0
>-		lda \$2,259
>-		.long 0x47e20c21 # amask $2,$1
>-		srl \$1,8,\$2
>-		sll \$2,2,\$2
>-		sll \$0,3,\$0
>-		addl \$1,\$0,\$0
>-		addl \$2,\$0,\$0
>-		ret \$31,(\$26),1
>-		.end main
>-EOF
>-		LIBC=""
>-		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
>-		if test "$?" = 0 ; then
>-			./$dummy
>-			case "$?" in
>-			7)
>-				UNAME_MACHINE="alpha"
>-				;;
>-			15)
>-				UNAME_MACHINE="alphaev5"
>-				;;
>-			14)
>-				UNAME_MACHINE="alphaev56"
>-				;;
>-			10)
>-				UNAME_MACHINE="alphapca56"
>-				;;
>-			16)
>-				UNAME_MACHINE="alphaev6"
>-				;;
>-			esac
>-
>-			objdump --private-headers $dummy | \
>-			  grep ld.so.1 > /dev/null
>-			if test "$?" = 0 ; then
>-				LIBC="libc1"
>-			fi
>-		fi
>-		rm -f $dummy.s $dummy
>-		echo ${UNAME_MACHINE}-mandrake-linux-gnu${LIBC} ; exit 0
>-	elif test "${UNAME_MACHINE}" = "mips" ; then
>-	  cat >$dummy.c <<EOF
>-#ifdef __cplusplus
>-	int main (int argc, char *argv[]) {
>-#else
>-	int main (argc, argv) int argc; char *argv[]; {
>-#endif
>-#ifdef __MIPSEB__
>-  printf ("%s-unknown-linux-gnu\n", argv[1]);
>-#endif
>-#ifdef __MIPSEL__
>-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
>-#endif
>-  return 0;
>-}
>-EOF
>-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
>-	  rm -f $dummy.c $dummy
>-	else
>-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
>-	  # or one that does not give us useful --help.
>-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
>-	  # If ld does not provide *any* "supported emulations:"
>-	  # that means it is gnuoldld.
>-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
>-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
>-
>-	  case "${UNAME_MACHINE}" in
>-	  i?86)
>-	    VENDOR=pc;
>-	    ;;
>-	  *)
>-	    VENDOR=mandrake;
>-	    ;;
>-	  esac
>-	  # Determine whether the default compiler is a.out or elf
>-	  cat >$dummy.c <<EOF
>-#include <features.h>
>-#ifdef __cplusplus
>-	int main (int argc, char *argv[]) {
>-#else
>-	int main (argc, argv) int argc; char *argv[]; {
>-#endif
>-#ifdef __ELF__
>-# ifdef __GLIBC__
>-#  if __GLIBC__ >= 2
>-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
>-#  else
>-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
>-#  endif
>-# else
>-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
>-# endif
>-#else
>-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
>-#endif
>-  return 0;
>-}
>+	# Determine whether the default compiler is a.out or elf
>+	eval $set_cc_for_build
>+	sed 's/^	//' << EOF >$dummy.c
>+	#include <features.h>
>+	#ifdef __ELF__
>+	# ifdef __GLIBC__
>+	#  if __GLIBC__ >= 2
>+	LIBC=gnu
>+	#  else
>+	LIBC=gnulibc1
>+	#  endif
>+	# else
>+	LIBC=gnulibc1
>+	# endif
>+	#else
>+	#ifdef __INTEL_COMPILER
>+	LIBC=gnu
>+	#else
>+	LIBC=gnuaout
>+	#endif
>+	#endif
> EOF
>-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
>-	  rm -f $dummy.c $dummy
>-	fi ;;
>-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
>-# are messed up and put the nodename in both sysname and nodename.
>-    i?86:DYNIX/ptx:4*:*)
>+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
>+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
>+	;;
>+    i*86:DYNIX/ptx:4*:*)
>+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
>+	# earlier versions are messed up and put the nodename in both
>+	# sysname and nodename.
> 	echo i386-sequent-sysv4
> 	exit 0 ;;
>-    i?86:UNIX_SV:4.2MP:2.*)
>+    i*86:UNIX_SV:4.2MP:2.*)
>         # Unixware is an offshoot of SVR4, but it has its own version
>         # number series starting with 2...
>         # I am not positive that other SVR4 systems won't match this,
>@@ -797,33 +971,51 @@
>         # Use sysv4.2uw... so that sysv4* matches it.
> 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
> 	exit 0 ;;
>-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
>+    i*86:OS/2:*:*)
>+	# If we were able to find `uname', then EMX Unix compatibility
>+	# is probably installed.
>+	echo ${UNAME_MACHINE}-pc-os2-emx
>+	exit 0 ;;
>+    i*86:XTS-300:*:STOP)
>+	echo ${UNAME_MACHINE}-unknown-stop
>+	exit 0 ;;
>+    i*86:atheos:*:*)
>+	echo ${UNAME_MACHINE}-unknown-atheos
>+	exit 0 ;;
>+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
>+	echo i386-unknown-lynxos${UNAME_RELEASE}
>+	exit 0 ;;
>+    i*86:*DOS:*:*)
>+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
>+	exit 0 ;;
>+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
>+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
> 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
>-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
>+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
> 	else
>-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
>+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
> 	fi
> 	exit 0 ;;
>-    i?86:*:5:7*)
>-	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
>-	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
>-	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
>-	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
>-	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
>-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
>+    i*86:*:5:[78]*)
>+	case `/bin/uname -X | grep "^Machine"` in
>+	    *486*)	     UNAME_MACHINE=i486 ;;
>+	    *Pentium)	     UNAME_MACHINE=i586 ;;
>+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
>+	esac
>+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
> 	exit 0 ;;
>-    i?86:*:3.2:*)
>+    i*86:*:3.2:*)
> 	if test -f /usr/options/cb.name; then
> 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
> 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
> 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
>-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
>-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
>-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
>+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
>+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
>+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
> 			&& UNAME_MACHINE=i586
>-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
>+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
> 			&& UNAME_MACHINE=i686
>-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
>+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
> 			&& UNAME_MACHINE=i686
> 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
> 	else
>@@ -831,6 +1023,7 @@
> 	fi
> 	exit 0 ;;
>     pc:*:*:*)
>+	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>         # the processor, so we play safe by assuming i386.
> 	echo i386-pc-msdosdjgpp
>@@ -852,9 +1045,15 @@
> 	# "miniframe"
> 	echo m68010-convergent-sysv
> 	exit 0 ;;
>+    mc68k:UNIX:SYSTEM5:3.51m)
>+	echo m68k-convergent-sysv
>+	exit 0 ;;
>+    M680?0:D-NIX:5.3:*)
>+	echo m68k-diab-dnix
>+	exit 0 ;;
>     M68*:*:R3V[567]*:*)
> 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
>-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
>+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
> 	OS_REL=''
> 	test -r /etc/.relid \
> 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>@@ -865,21 +1064,21 @@
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && echo i486-ncr-sysv4 && exit 0 ;;
>-    m68*:LynxOS:2.*:*)
>+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit 0 ;;
>     mc68030:UNIX_System_V:4.*:*)
> 	echo m68k-atari-sysv4
> 	exit 0 ;;
>-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
>-	echo i386-unknown-lynxos${UNAME_RELEASE}
>-	exit 0 ;;
>     TSUNAMI:LynxOS:2.*:*)
> 	echo sparc-unknown-lynxos${UNAME_RELEASE}
> 	exit 0 ;;
>-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
>+    rs6000:LynxOS:2.*:*)
> 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
> 	exit 0 ;;
>+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
>+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
>+	exit 0 ;;
>     SM[BE]S:UNIX_SV:*:*)
> 	echo mips-dde-sysv${UNAME_RELEASE}
> 	exit 0 ;;
>@@ -897,8 +1096,8 @@
> 		echo ns32k-sni-sysv
> 	fi
> 	exit 0 ;;
>-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
>-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
>+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
>+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
>         echo i586-unisys-sysv4
>         exit 0 ;;
>     *:UNIX_System_V:4*:FTX*)
>@@ -910,10 +1109,14 @@
> 	# From seanf@swdc.stratus.com.
> 	echo i860-stratus-sysv4
> 	exit 0 ;;
>+    *:VOS:*:*)
>+	# From Paul.Green@stratus.com.
>+	echo hppa1.1-stratus-vos
>+	exit 0 ;;
>     mc68*:A/UX:*:*)
> 	echo m68k-apple-aux${UNAME_RELEASE}
> 	exit 0 ;;
>-    news*:NEWS-OS:*:6*)
>+    news*:NEWS-OS:6*:*)
> 	echo mips-sony-newsos6
> 	exit 0 ;;
>     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
>@@ -938,17 +1141,83 @@
>     SX-5:SUPER-UX:*:*)
> 	echo sx5-nec-superux${UNAME_RELEASE}
> 	exit 0 ;;
>+    SX-6:SUPER-UX:*:*)
>+	echo sx6-nec-superux${UNAME_RELEASE}
>+	exit 0 ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit 0 ;;
>     *:Rhapsody:*:*)
> 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
> 	exit 0 ;;
>+    *:Darwin:*:*)
>+	case `uname -p` in
>+	    *86) UNAME_PROCESSOR=i686 ;;
>+	    powerpc) UNAME_PROCESSOR=powerpc ;;
>+	esac
>+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>+	exit 0 ;;
>+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
>+	UNAME_PROCESSOR=`uname -p`
>+	if test "$UNAME_PROCESSOR" = "x86"; then
>+		UNAME_PROCESSOR=i386
>+		UNAME_MACHINE=pc
>+	fi
>+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
>+	exit 0 ;;
>+    *:QNX:*:4*)
>+	echo i386-pc-qnx
>+	exit 0 ;;
>+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
>+	echo nsr-tandem-nsk${UNAME_RELEASE}
>+	exit 0 ;;
>+    *:NonStop-UX:*:*)
>+	echo mips-compaq-nonstopux
>+	exit 0 ;;
>+    BS2000:POSIX*:*:*)
>+	echo bs2000-siemens-sysv
>+	exit 0 ;;
>+    DS/*:UNIX_System_V:*:*)
>+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
>+	exit 0 ;;
>+    *:Plan9:*:*)
>+	# "uname -m" is not consistent, so use $cputype instead. 386
>+	# is converted to i386 for consistency with other x86
>+	# operating systems.
>+	if test "$cputype" = "386"; then
>+	    UNAME_MACHINE=i386
>+	else
>+	    UNAME_MACHINE="$cputype"
>+	fi
>+	echo ${UNAME_MACHINE}-unknown-plan9
>+	exit 0 ;;
>+    *:TOPS-10:*:*)
>+	echo pdp10-unknown-tops10
>+	exit 0 ;;
>+    *:TENEX:*:*)
>+	echo pdp10-unknown-tenex
>+	exit 0 ;;
>+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
>+	echo pdp10-dec-tops20
>+	exit 0 ;;
>+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
>+	echo pdp10-xkl-tops20
>+	exit 0 ;;
>+    *:TOPS-20:*:*)
>+	echo pdp10-unknown-tops20
>+	exit 0 ;;
>+    *:ITS:*:*)
>+	echo pdp10-unknown-its
>+	exit 0 ;;
>+    SEI:*:*:SEIUX)
>+        echo mips-sei-seiux${UNAME_RELEASE}
>+	exit 0 ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
> #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
> 
>+eval $set_cc_for_build
> cat >$dummy.c <<EOF
> #ifdef _SEQUENT_
> # include <sys/types.h>
>@@ -1035,11 +1304,24 @@
> #endif
> 
> #if defined (vax)
>-#if !defined (ultrix)
>-  printf ("vax-dec-bsd\n"); exit (0);
>-#else
>-  printf ("vax-dec-ultrix\n"); exit (0);
>-#endif
>+# if !defined (ultrix)
>+#  include <sys/param.h>
>+#  if defined (BSD)
>+#   if BSD == 43
>+      printf ("vax-dec-bsd4.3\n"); exit (0);
>+#   else
>+#    if BSD == 199006
>+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
>+#    else
>+      printf ("vax-dec-bsd\n"); exit (0);
>+#    endif
>+#   endif
>+#  else
>+    printf ("vax-dec-bsd\n"); exit (0);
>+#  endif
>+# else
>+    printf ("vax-dec-ultrix\n"); exit (0);
>+# endif
> #endif
> 
> #if defined (alliant) && defined (i860)
>@@ -1050,8 +1332,7 @@
> }
> EOF
> 
>-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
>-rm -f $dummy.c $dummy
>+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
> 
> # Apollos put the system type in the environment.
> 
>@@ -1083,6 +1364,48 @@
>     esac
> fi
> 
>-#echo '(Unable to guess system type)' 1>&2
>+cat >&2 <<EOF
>+$0: unable to guess system type
>+
>+This script, last modified $timestamp, has failed to recognize
>+the operating system you are using. It is advised that you
>+download the most up to date version of the config scripts from
>+
>+    ftp://ftp.gnu.org/pub/gnu/config/
>+
>+If the version you run ($0) is already up to date, please
>+send the following data and any information you think might be
>+pertinent to <config-patches@gnu.org> in order to provide the needed
>+information to handle your system.
>+
>+config.guess timestamp = $timestamp
>+
>+uname -m = `(uname -m) 2>/dev/null || echo unknown`
>+uname -r = `(uname -r) 2>/dev/null || echo unknown`
>+uname -s = `(uname -s) 2>/dev/null || echo unknown`
>+uname -v = `(uname -v) 2>/dev/null || echo unknown`
>+
>+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
>+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
>+
>+hostinfo               = `(hostinfo) 2>/dev/null`
>+/bin/universe          = `(/bin/universe) 2>/dev/null`
>+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
>+/bin/arch              = `(/bin/arch) 2>/dev/null`
>+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
>+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
>+
>+UNAME_MACHINE = ${UNAME_MACHINE}
>+UNAME_RELEASE = ${UNAME_RELEASE}
>+UNAME_SYSTEM  = ${UNAME_SYSTEM}
>+UNAME_VERSION = ${UNAME_VERSION}
>+EOF
> 
> exit 1
>+
>+# Local variables:
>+# eval: (add-hook 'write-file-hooks 'time-stamp)
>+# time-stamp-start: "timestamp='"
>+# time-stamp-format: "%:y-%02m-%02d"
>+# time-stamp-end: "'"
>+# End:
>diff -uNr vamos-0.5.5.orig/config/config.sub vamos-0.5.5/config/config.sub
>--- vamos-0.5.5.orig/config/config.sub	2001-10-17 03:31:35.000000000 +0200
>+++ vamos-0.5.5/config/config.sub	2007-06-25 17:58:11.000000000 +0200
>@@ -1,6 +1,10 @@
> #! /bin/sh
>-# Configuration validation subroutine script, version 1.1.
>-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
>+# Configuration validation subroutine script.
>+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
>+
>+timestamp='2003-06-18'
>+
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
> # can handle that machine.  It does not imply ALL GNU software can.
>@@ -25,6 +29,9 @@
> # configuration script generated by Autoconf, you may include it under
> # the same distribution terms that you use for the rest of that program.
> 
>+# Please send patches to <config-patches@gnu.org>.  Submit a context
>+# diff and a properly formatted ChangeLog entry.
>+#
> # Configuration subroutine to validate and canonicalize a configuration type.
> # Supply the specified configuration type as an argument.
> # If it is invalid, we print an error message on stderr and exit with code 1.
>@@ -45,30 +52,73 @@
> #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
> # It is wrong to echo any other type of specification.
> 
>-if [ x$1 = x ]
>-then
>-	echo Configuration name missing. 1>&2
>-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
>-	echo "or     $0 ALIAS" 1>&2
>-	echo where ALIAS is a recognized configuration type. 1>&2
>-	exit 1
>-fi
>+me=`echo "$0" | sed -e 's,.*/,,'`
> 
>-# First pass through any local machine types.
>-case $1 in
>-	*local*)
>-		echo $1
>-		exit 0
>-		;;
>-	*)
>-	;;
>+usage="\
>+Usage: $0 [OPTION] CPU-MFR-OPSYS
>+       $0 [OPTION] ALIAS
>+
>+Canonicalize a configuration name.
>+
>+Operation modes:
>+  -h, --help         print this help, then exit
>+  -t, --time-stamp   print date of last modification, then exit
>+  -v, --version      print version number, then exit
>+
>+Report bugs and patches to <config-patches@gnu.org>."
>+
>+version="\
>+GNU config.sub ($timestamp)
>+
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
>+Free Software Foundation, Inc.
>+
>+This is free software; see the source for copying conditions.  There is NO
>+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>+
>+help="
>+Try \`$me --help' for more information."
>+
>+# Parse command line
>+while test $# -gt 0 ; do
>+  case $1 in
>+    --time-stamp | --time* | -t )
>+       echo "$timestamp" ; exit 0 ;;
>+    --version | -v )
>+       echo "$version" ; exit 0 ;;
>+    --help | --h* | -h )
>+       echo "$usage"; exit 0 ;;
>+    -- )     # Stop option processing
>+       shift; break ;;
>+    - )	# Use stdin as input.
>+       break ;;
>+    -* )
>+       echo "$me: invalid option $1$help"
>+       exit 1 ;;
>+
>+    *local*)
>+       # First pass through any local machine types.
>+       echo $1
>+       exit 0;;
>+
>+    * )
>+       break ;;
>+  esac
>+done
>+
>+case $# in
>+ 0) echo "$me: missing argument$help" >&2
>+    exit 1;;
>+ 1) ;;
>+ *) echo "$me: too many arguments$help" >&2
>+    exit 1;;
> esac
> 
> # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  linux-gnu*)
>+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -94,7 +144,7 @@
> 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
> 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
> 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
>-	-apple)
>+	-apple | -axis)
> 		os=
> 		basic_machine=$1
> 		;;
>@@ -105,9 +155,17 @@
> 	-scout)
> 		;;
> 	-wrs)
>-		os=vxworks
>+		os=-vxworks
>+		basic_machine=$1
>+		;;
>+	-chorusos*)
>+		os=-chorusos
> 		basic_machine=$1
> 		;;
>+ 	-chorusrdb)
>+ 		os=-chorusrdb
>+		basic_machine=$1
>+ 		;;
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>@@ -156,33 +214,73 @@
> 	-psos*)
> 		os=-psos
> 		;;
>+	-mint | -mint[0-9]*)
>+		basic_machine=m68k-atari
>+		os=-mint
>+		;;
> esac
> 
> # Decode aliases for certain CPU-COMPANY combinations.
> case $basic_machine in
> 	# Recognize the basic CPU types without company name.
> 	# Some are omitted here because they have special meanings below.
>-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
>-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
>-		| 580 | i960 | h8300 \
>-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
>-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
>-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
>-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
>-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
>-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
>-		| mips64vr5000 | miprs64vr5000el \
>-		| armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
>-		| thumb | d10v)
>+	1750a | 580 \
>+	| a29k \
>+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
>+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| c4x | clipper \
>+	| d10v | d30v | dlx | dsp16xx \
>+	| fr30 | frv \
>+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
>+	| i370 | i860 | i960 | ia64 \
>+	| ip2k \
>+	| m32r | m68000 | m68k | m88k | mcore \
>+	| mips | mipsbe | mipseb | mipsel | mipsle \
>+	| mips16 \
>+	| mips64 | mips64el \
>+	| mips64vr | mips64vrel \
>+	| mips64orion | mips64orionel \
>+	| mips64vr4100 | mips64vr4100el \
>+	| mips64vr4300 | mips64vr4300el \
>+	| mips64vr5000 | mips64vr5000el \
>+	| mipsisa32 | mipsisa32el \
>+	| mipsisa32r2 | mipsisa32r2el \
>+	| mipsisa64 | mipsisa64el \
>+	| mipsisa64sb1 | mipsisa64sb1el \
>+	| mipsisa64sr71k | mipsisa64sr71kel \
>+	| mipstx39 | mipstx39el \
>+	| mn10200 | mn10300 \
>+	| msp430 \
>+	| ns16k | ns32k \
>+	| openrisc | or32 \
>+	| pdp10 | pdp11 | pj | pjl \
>+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
>+	| pyramid \
>+	| s390 | s390x \
>+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| sh64 | sh64le \
>+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
>+	| strongarm \
>+	| tahoe | thumb | tic4x | tic80 | tron \
>+	| v850 | v850e \
>+	| we32k \
>+	| x86 | xscale | xstormy16 | xtensa \
>+	| z8k)
>+		basic_machine=$basic_machine-unknown
>+		;;
>+	m6811 | m68hc11 | m6812 | m68hc12)
>+		# Motorola 68HC11/12.
> 		basic_machine=$basic_machine-unknown
>+		os=-none
> 		;;
>-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
>+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
> 	# (2) the word "unknown" tends to confuse beginning users.
>-	i[34567]86)
>+	i*86 | x86_64)
> 	  basic_machine=$basic_machine-pc
> 	  ;;
> 	# Object if more than one company name word.
>@@ -191,24 +289,61 @@
> 		exit 1
> 		;;
> 	# Recognize the basic CPU types with company name.
>-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
>-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
>-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
>-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
>-	      | xmp-* | ymp-* \
>-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
>-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
>-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
>-	      | clipper-* | orion-* \
>-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
>-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
>-	      | mips64el-* | mips64orion-* | mips64orionel-* \
>-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
>-	      | mipstx39-* | mipstx39el-* \
>-	      | armv[34][lb]-* \
>-	      | f301-* | armv*-* | t3e-* \
>-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
>-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
>+	580-* \
>+	| a29k-* \
>+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
>+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
>+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
>+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>+	| avr-* \
>+	| bs2000-* \
>+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
>+	| clipper-* | cydra-* \
>+	| d10v-* | d30v-* | dlx-* \
>+	| elxsi-* \
>+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| h8300-* | h8500-* \
>+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
>+	| i*86-* | i860-* | i960-* | ia64-* \
>+	| ip2k-* \
>+	| m32r-* \
>+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>+	| m88110-* | m88k-* | mcore-* \
>+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
>+	| mips16-* \
>+	| mips64-* | mips64el-* \
>+	| mips64vr-* | mips64vrel-* \
>+	| mips64orion-* | mips64orionel-* \
>+	| mips64vr4100-* | mips64vr4100el-* \
>+	| mips64vr4300-* | mips64vr4300el-* \
>+	| mips64vr5000-* | mips64vr5000el-* \
>+	| mipsisa32-* | mipsisa32el-* \
>+	| mipsisa32r2-* | mipsisa32r2el-* \
>+	| mipsisa64-* | mipsisa64el-* \
>+	| mipsisa64sb1-* | mipsisa64sb1el-* \
>+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
>+	| mipstx39-* | mipstx39el-* \
>+	| msp430-* \
>+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
>+	| orion-* \
>+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
>+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
>+	| pyramid-* \
>+	| romp-* | rs6000-* \
>+	| s390-* | s390x-* \
>+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| tahoe-* | thumb-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tron-* \
>+	| v850-* | v850e-* | vax-* \
>+	| we32k-* \
>+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
>+	| xtensa-* \
>+	| ymp-* \
>+	| z8k-*)
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -240,19 +375,22 @@
> 		basic_machine=a29k-none
> 		os=-bsd
> 		;;
>+	amd64)
>+		basic_machine=x86_64-pc
>+		;;
> 	amdahl)
> 		basic_machine=580-amdahl
> 		os=-sysv
> 		;;
> 	amiga | amiga-*)
>-		basic_machine=m68k-cbm
>+		basic_machine=m68k-unknown
> 		;;
> 	amigaos | amigados)
>-		basic_machine=m68k-cbm
>+		basic_machine=m68k-unknown
> 		os=-amigaos
> 		;;
> 	amigaunix | amix)
>-		basic_machine=m68k-cbm
>+		basic_machine=m68k-unknown
> 		os=-sysv4
> 		;;
> 	apollo68)
>@@ -271,6 +409,10 @@
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	c90)
>+		basic_machine=c90-cray
>+		os=-unicos
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -291,27 +433,30 @@
> 		basic_machine=c38-convex
> 		os=-bsd
> 		;;
>-	cray | ymp)
>-		basic_machine=ymp-cray
>-		os=-unicos
>-		;;
>-	cray2)
>-		basic_machine=cray2-cray
>-		os=-unicos
>-		;;
>-	[ctj]90-cray)
>-		basic_machine=c90-cray
>+	cray | j90)
>+		basic_machine=j90-cray
> 		os=-unicos
> 		;;
> 	crds | unos)
> 		basic_machine=m68k-crds
> 		;;
>+	cris | cris-* | etrax*)
>+		basic_machine=cris-axis
>+		;;
> 	da30 | da30-*)
> 		basic_machine=m68k-da30
> 		;;
> 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
> 		basic_machine=mips-dec
> 		;;
>+	decsystem10* | dec10*)
>+		basic_machine=pdp10-dec
>+		os=-tops10
>+		;;
>+	decsystem20* | dec20*)
>+		basic_machine=pdp10-dec
>+		os=-tops20
>+		;;
> 	delta | 3300 | motorola-3300 | motorola-delta \
> 	      | 3300-motorola | delta-motorola)
> 		basic_machine=m68k-motorola
>@@ -353,6 +498,10 @@
> 		basic_machine=tron-gmicro
> 		os=-sysv
> 		;;
>+	go32)
>+		basic_machine=i386-pc
>+		os=-go32
>+		;;
> 	h3050r* | hiux*)
> 		basic_machine=hppa1.1-hitachi
> 		os=-hiuxwe2
>@@ -426,22 +575,21 @@
> 		;;
> 	i370-ibm* | ibm*)
> 		basic_machine=i370-ibm
>-		os=-mvs
> 		;;
> # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
>-	i[34567]86v32)
>+	i*86v32)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-sysv32
> 		;;
>-	i[34567]86v4*)
>+	i*86v4*)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-sysv4
> 		;;
>-	i[34567]86v)
>+	i*86v)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-sysv
> 		;;
>-	i[34567]86sol2)
>+	i*86sol2)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-solaris2
> 		;;
>@@ -453,14 +601,6 @@
> 		basic_machine=i386-unknown
> 		os=-vsta
> 		;;
>-	i386-go32 | go32)
>-		basic_machine=i386-unknown
>-		os=-go32
>-		;;
>-	i386-mingw32 | mingw32)
>-		basic_machine=i386-unknown
>-		os=-mingw32
>-		;;
> 	iris | iris4d)
> 		basic_machine=mips-sgi
> 		case $os in
>@@ -486,35 +626,43 @@
> 		basic_machine=ns32k-utek
> 		os=-sysv
> 		;;
>+	mingw32)
>+		basic_machine=i386-pc
>+		os=-mingw32
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>-	*mint | *MiNT)
>+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
> 		basic_machine=m68k-atari
> 		os=-mint
> 		;;
>-	mipsel*-linux*)
>-		basic_machine=mipsel-unknown
>-		os=-linux-gnu
>-		;;
>-	mips*-linux*)
>-		basic_machine=mips-unknown
>-		os=-linux-gnu
>-		;;
> 	mips3*-*)
> 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
> 		;;
> 	mips3*)
> 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
> 		;;
>+	mmix*)
>+		basic_machine=mmix-knuth
>+		os=-mmixware
>+		;;
> 	monitor)
> 		basic_machine=m68k-rom68k
> 		os=-coff
> 		;;
>+	morphos)
>+		basic_machine=powerpc-unknown
>+		os=-morphos
>+		;;
> 	msdos)
>-		basic_machine=i386-unknown
>+		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	mvs)
>+		basic_machine=i370-ibm
>+		os=-mvs
>+		;;
> 	ncr3000)
> 		basic_machine=i486-ncr
> 		os=-sysv4
>@@ -524,7 +672,7 @@
> 		os=-netbsd
> 		;;
> 	netwinder)
>-		basic_machine=armv4l-corel
>+		basic_machine=armv4l-rebel
> 		os=-linux
> 		;;
> 	news | news700 | news800 | news900)
>@@ -572,13 +720,28 @@
> 		basic_machine=i960-intel
> 		os=-mon960
> 		;;
>+	nonstopux)
>+		basic_machine=mips-compaq
>+		os=-nonstopux
>+		;;
> 	np1)
> 		basic_machine=np1-gould
> 		;;
>+	nv1)
>+		basic_machine=nv1-cray
>+		os=-unicosmp
>+		;;
>+	nsr-tandem)
>+		basic_machine=nsr-tandem
>+		;;
> 	op50n-* | op60c-*)
> 		basic_machine=hppa1.1-oki
> 		os=-proelf
> 		;;
>+	or32 | or32-*)
>+		basic_machine=or32-unknown
>+		os=-coff
>+		;;
> 	OSE68000 | ose68000)
> 		basic_machine=m68000-ericsson
> 		os=-ose
>@@ -601,45 +764,65 @@
> 	pbb)
> 		basic_machine=m68k-tti
> 		;;
>-        pc532 | pc532-*)
>+	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>-	pentium | p5 | k5 | k6 | nexen)
>+	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>-	pentiumpro | p6 | 6x86)
>+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
>+		basic_machine=i686-pc
>+		;;
>+	pentiumii | pentium2 | pentiumiii | pentium3)
> 		basic_machine=i686-pc
> 		;;
>-	pentiumii | pentium2)
>+	pentium4)
> 		basic_machine=i786-pc
> 		;;
>-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
>+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
> 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
>-	pentiumpro-* | p6-* | 6x86-*)
>+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
>+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
>+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
> 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
>-	pentiumii-* | pentium2-*)
>+	pentium4-*)
> 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
> 	pn)
> 		basic_machine=pn-gould
> 		;;
>-	power)	basic_machine=rs6000-ibm
>+	power)	basic_machine=power-ibm
> 		;;
> 	ppc)	basic_machine=powerpc-unknown
>-	        ;;
>+		;;
> 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
> 	ppcle | powerpclittle | ppc-le | powerpc-little)
> 		basic_machine=powerpcle-unknown
>-	        ;;
>+		;;
> 	ppcle-* | powerpclittle-*)
> 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
>+	ppc64)	basic_machine=powerpc64-unknown
>+		;;
>+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
>+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
>+		basic_machine=powerpc64le-unknown
>+		;;
>+	ppc64le-* | powerpc64little-*)
>+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	ps2)
> 		basic_machine=i386-ibm
> 		;;
>+	pw32)
>+		basic_machine=i586-unknown
>+		os=-pw32
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -654,6 +837,16 @@
> 		basic_machine=a29k-amd
> 		os=-udi
> 		;;
>+	sb1)
>+		basic_machine=mipsisa64sb1-unknown
>+		;;
>+	sb1el)
>+		basic_machine=mipsisa64sb1el-unknown
>+		;;
>+	sei)
>+		basic_machine=mips-sei
>+		os=-seiux
>+		;;
> 	sequent)
> 		basic_machine=i386-sequent
> 		;;
>@@ -661,7 +854,10 @@
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>-	sparclite-wrs)
>+	sh64)
>+		basic_machine=sh64-unknown
>+		;;
>+	sparclite-wrs | simso-wrs)
> 		basic_machine=sparclite-wrs
> 		os=-vxworks
> 		;;
>@@ -719,20 +915,44 @@
> 	sun386 | sun386i | roadrunner)
> 		basic_machine=i386-sun
> 		;;
>+	sv1)
>+		basic_machine=sv1-cray
>+		os=-unicos
>+		;;
> 	symmetry)
> 		basic_machine=i386-sequent
> 		os=-dynix
> 		;;
> 	t3e)
>-		basic_machine=t3e-cray
>+		basic_machine=alphaev5-cray
>+		os=-unicos
>+		;;
>+	t90)
>+		basic_machine=t90-cray
> 		os=-unicos
> 		;;
>+	tic54x | c54x*)
>+		basic_machine=tic54x-unknown
>+		os=-coff
>+		;;
>+	tic55x | c55x*)
>+		basic_machine=tic55x-unknown
>+		os=-coff
>+		;;
>+	tic6x | c6x*)
>+		basic_machine=tic6x-unknown
>+		os=-coff
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
> 	tx39el)
> 		basic_machine=mipstx39el-unknown
> 		;;
>+	toad1)
>+		basic_machine=pdp10-xkl
>+		os=-tops20
>+		;;
> 	tower | tower-32)
> 		basic_machine=m68k-ncr
> 		;;
>@@ -757,8 +977,8 @@
> 		os=-vms
> 		;;
> 	vpp*|vx|vx-*)
>-               basic_machine=f301-fujitsu
>-               ;;
>+		basic_machine=f301-fujitsu
>+		;;
> 	vxworks960)
> 		basic_machine=i960-wrs
> 		os=-vxworks
>@@ -779,13 +999,13 @@
> 		basic_machine=hppa1.1-winbond
> 		os=-proelf
> 		;;
>-	xmp)
>-		basic_machine=xmp-cray
>-		os=-unicos
>-		;;
>-        xps | xps100)
>+	xps | xps100)
> 		basic_machine=xps100-honeywell
> 		;;
>+	ymp)
>+		basic_machine=ymp-cray
>+		os=-unicos
>+		;;
> 	z8k-*-coff)
> 		basic_machine=z8k-unknown
> 		os=-sim
>@@ -806,13 +1026,6 @@
> 	op60c)
> 		basic_machine=hppa1.1-oki
> 		;;
>-	mips)
>-		if [ x$os = x-linux-gnu ]; then
>-			basic_machine=mips-unknown
>-		else
>-			basic_machine=mips-mips
>-		fi
>-		;;
> 	romp)
> 		basic_machine=romp-ibm
> 		;;
>@@ -822,16 +1035,26 @@
> 	vax)
> 		basic_machine=vax-dec
> 		;;
>+	pdp10)
>+		# there are many clones, so DEC is not a safe bet
>+		basic_machine=pdp10-unknown
>+		;;
> 	pdp11)
> 		basic_machine=pdp11-dec
> 		;;
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sparc | sparcv9)
>+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
>+		basic_machine=sh-unknown
>+		;;
>+	sh64)
>+		basic_machine=sh64-unknown
>+		;;
>+	sparc | sparcv8 | sparcv9 | sparcv9b)
> 		basic_machine=sparc-sun
> 		;;
>-        cydra)
>+	cydra)
> 		basic_machine=cydra-cydrome
> 		;;
> 	orion)
>@@ -846,9 +1069,8 @@
> 	pmac | pmac-mpw)
> 		basic_machine=powerpc-apple
> 		;;
>-	c4x*)
>-		basic_machine=c4x-none
>-		os=-coff
>+	*-unknown)
>+		# Make sure to match an already-canonicalized machine name.
> 		;;
> 	*)
> 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
>@@ -906,14 +1128,34 @@
> 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>+	      | -chorusos* | -chorusrdb* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
> 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
>-	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
>+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
>+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
>+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
>+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
>+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
>+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
>+	-qnx*)
>+		case $basic_machine in
>+		    x86-* | i*86-*)
>+			;;
>+		    *)
>+			os=-nto$os
>+			;;
>+		esac
>+		;;
>+	-nto-qnx*)
>+		;;
>+	-nto*)
>+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
>+		;;
> 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
> 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
>-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
>+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
> 		;;
> 	-mac*)
> 		os=`echo $os | sed -e 's|mac|macos|'`
>@@ -927,6 +1169,12 @@
> 	-sunos6*)
> 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
> 		;;
>+	-opened*)
>+		os=-openedition
>+		;;
>+	-wince*)
>+		os=-wince
>+		;;
> 	-osfrose*)
> 		os=-osfrose
> 		;;
>@@ -942,14 +1190,23 @@
> 	-acis*)
> 		os=-aos
> 		;;
>+	-atheos*)
>+		os=-atheos
>+		;;
> 	-386bsd)
> 		os=-bsd
> 		;;
> 	-ctix* | -uts*)
> 		os=-sysv
> 		;;
>+	-nova*)
>+		os=-rtmk-nova
>+		;;
> 	-ns2 )
>-	        os=-nextstep2
>+		os=-nextstep2
>+		;;
>+	-nsk*)
>+		os=-nsk
> 		;;
> 	# Preserve the version number of sinix5.
> 	-sinix5.*)
>@@ -985,8 +1242,14 @@
> 	-xenix)
> 		os=-xenix
> 		;;
>-        -*mint | -*MiNT)
>-	        os=-mint
>+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
>+		os=-mint
>+		;;
>+	-aros*)
>+		os=-aros
>+		;;
>+	-kaos*)
>+		os=-kaos
> 		;;
> 	-none)
> 		;;
>@@ -1013,13 +1276,20 @@
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>-	arm*-corel)
>+	arm*-rebel)
> 		os=-linux
> 		;;
> 	arm*-semi)
> 		os=-aout
> 		;;
>-        pdp11-*)
>+	c4x-* | tic4x-*)
>+		os=-coff
>+		;;
>+	# This must come before the *-dec entry.
>+	pdp10-*)
>+		os=-tops20
>+		;;
>+	pdp11-*)
> 		os=-none
> 		;;
> 	*-dec | vax-*)
>@@ -1046,6 +1316,9 @@
> 	mips*-*)
> 		os=-elf
> 		;;
>+	or32-*)
>+		os=-coff
>+		;;
> 	*-tti)	# must be before sparc entry or we get the wrong os.
> 		os=-sysv3
> 		;;
>@@ -1109,25 +1382,25 @@
> 	*-next)
> 		os=-nextstep3
> 		;;
>-        *-gould)
>+	*-gould)
> 		os=-sysv
> 		;;
>-        *-highlevel)
>+	*-highlevel)
> 		os=-bsd
> 		;;
> 	*-encore)
> 		os=-bsd
> 		;;
>-        *-sgi)
>+	*-sgi)
> 		os=-irix
> 		;;
>-        *-siemens)
>+	*-siemens)
> 		os=-sysv4
> 		;;
> 	*-masscomp)
> 		os=-rtu
> 		;;
>-	f301-fujitsu)
>+	f30[01]-fujitsu | f700-fujitsu)
> 		os=-uxpv
> 		;;
> 	*-rom68k)
>@@ -1187,13 +1460,13 @@
> 			-genix*)
> 				vendor=ns
> 				;;
>-			-mvs*)
>+			-mvs* | -opened*)
> 				vendor=ibm
> 				;;
> 			-ptx*)
> 				vendor=sequent
> 				;;
>-			-vxsim* | -vxworks*)
>+			-vxsim* | -vxworks* | -windiss*)
> 				vendor=wrs
> 				;;
> 			-aux*)
>@@ -1205,12 +1478,23 @@
> 			-mpw* | -macos*)
> 				vendor=apple
> 				;;
>-			-*mint | -*MiNT)
>+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
> 				vendor=atari
> 				;;
>+			-vos*)
>+				vendor=stratus
>+				;;
> 		esac
> 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
> 		;;
> esac
> 
> echo $basic_machine$os
>+exit 0
>+
>+# Local variables:
>+# eval: (add-hook 'write-file-hooks 'time-stamp)
>+# time-stamp-start: "timestamp='"
>+# time-stamp-format: "%:y-%02m-%02d"
>+# time-stamp-end: "'"
>+# End:
>diff -uNr vamos-0.5.5.orig/config/depcomp vamos-0.5.5/config/depcomp
>--- vamos-0.5.5.orig/config/depcomp	2002-06-06 01:17:10.000000000 +0200
>+++ vamos-0.5.5/config/depcomp	2007-06-25 17:58:09.000000000 +0200
>@@ -1,7 +1,10 @@
> #! /bin/sh
>-
> # depcomp - compile a program generating dependencies as side-effects
>-# Copyright 1999, 2000 Free Software Foundation, Inc.
>+
>+scriptversion=2006-10-15.18
>+
>+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
>+# Foundation, Inc.
> 
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>@@ -15,8 +18,8 @@
> 
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> 
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -25,22 +28,45 @@
> 
> # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
> 
>+case $1 in
>+  '')
>+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
>+     exit 1;
>+     ;;
>+  -h | --h*)
>+    cat <<\EOF
>+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
>+
>+Run PROGRAMS ARGS to compile a file, generating dependencies
>+as side-effects.
>+
>+Environment variables:
>+  depmode     Dependency tracking mode.
>+  source      Source file read by `PROGRAMS ARGS'.
>+  object      Object file output by `PROGRAMS ARGS'.
>+  DEPDIR      directory where to store dependencies.
>+  depfile     Dependency file to output.
>+  tmpdepfile  Temporary file to use when outputing dependencies.
>+  libtool     Whether libtool is used (yes/no).
>+
>+Report bugs to <bug-automake@gnu.org>.
>+EOF
>+    exit $?
>+    ;;
>+  -v | --v*)
>+    echo "depcomp $scriptversion"
>+    exit $?
>+    ;;
>+esac
>+
> if test -z "$depmode" || test -z "$source" || test -z "$object"; then
>   echo "depcomp: Variables source, object and depmode must be set" 1>&2
>   exit 1
> fi
>-# `libtool' can also be set to `yes' or `no'.
>-
>-if test -z "$depfile"; then
>-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.$[^.]*$$,.P\1,'`
>-   dir=`echo "$object" | sed 's,/.*$,/,'`
>-   if test "$dir" = "$object"; then
>-      dir=
>-   fi
>-   # FIXME: should be _deps on DOS.
>-   depfile="$dir.deps/$base"
>-fi
> 
>+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
>+depfile=${depfile-`echo "$object" |
>+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`}
> tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`}
> 
> rm -f "$tmpdepfile"
>@@ -66,7 +92,20 @@
> ## gcc 3 implements dependency tracking that does exactly what
> ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
> ## it if -MD -MP comes after the -MF stuff.  Hmm.
>-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
>+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
>+## the command line argument order; so add the flags where they
>+## appear in depend2.am.  Note that the slowdown incurred here
>+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
>+  for arg
>+  do
>+    case $arg in
>+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
>+    *)  set fnord "$@" "$arg" ;;
>+    esac
>+    shift # fnord
>+    shift # $arg
>+  done
>+  "$@"
>   stat=$?
>   if test $stat -eq 0; then :
>   else
>@@ -172,19 +211,25 @@
> 
> aix)
>   # The C for AIX Compiler uses -M and outputs the dependencies
>-  # in a .u file.  This file always lives in the current directory.
>-  # Also, the AIX compiler puts `$object:' at the start of each line;
>-  # $object doesn't have directory information.
>-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/$.*$\..*$/\1/'`
>+  # in a .u file.  In older versions, this file always lives in the
>+  # current directory.  Also, the AIX compiler puts `$object:' at the
>+  # start of each line; $object doesn't have directory information.
>+  # Version 6 uses the directory in both cases.
>+  stripped=`echo "$object" | sed 's/$.*$\..*$/\1/'`
>   tmpdepfile="$stripped.u"
>-  outname="$stripped.o"
>   if test "$libtool" = yes; then
>     "$@" -Wc,-M
>   else
>     "$@" -M
>   fi
>-
>   stat=$?
>+
>+  if test -f "$tmpdepfile"; then :
>+  else
>+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
>+    tmpdepfile="$stripped.u"
>+  fi
>+
>   if test $stat -eq 0; then :
>   else
>     rm -f "$tmpdepfile"
>@@ -192,6 +237,7 @@
>   fi
> 
>   if test -f "$tmpdepfile"; then
>+    outname="$stripped.o"
>     # Each line is of the form `foo.o: dependent.h'.
>     # Do two passes, one to just change these to
>     # `$object: dependent.h' and one to simply `dependent.h:'.
>@@ -206,38 +252,136 @@
>   rm -f "$tmpdepfile"
>   ;;
> 
>+icc)
>+  # Intel's C compiler understands `-MD -MF file'.  However on
>+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
>+  # ICC 7.0 will fill foo.d with something like
>+  #    foo.o: sub/foo.c
>+  #    foo.o: sub/foo.h
>+  # which is wrong.  We want:
>+  #    sub/foo.o: sub/foo.c
>+  #    sub/foo.o: sub/foo.h
>+  #    sub/foo.c:
>+  #    sub/foo.h:
>+  # ICC 7.1 will output
>+  #    foo.o: sub/foo.c sub/foo.h
>+  # and will wrap long lines using \ :
>+  #    foo.o: sub/foo.c ... \
>+  #     sub/foo.h ... \
>+  #     ...
>+
>+  "$@" -MD -MF "$tmpdepfile"
>+  stat=$?
>+  if test $stat -eq 0; then :
>+  else
>+    rm -f "$tmpdepfile"
>+    exit $stat
>+  fi
>+  rm -f "$depfile"
>+  # Each line is of the form `foo.o: dependent.h',
>+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
>+  # Do two passes, one to just change these to
>+  # `$object: dependent.h' and one to simply `dependent.h:'.
>+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
>+  # Some versions of the HPUX 10.20 sed can't process this invocation
>+  # correctly.  Breaking it into two sed invocations is a workaround.
>+  sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
>+    sed -e 's/$/ :/' >> "$depfile"
>+  rm -f "$tmpdepfile"
>+  ;;
>+
>+hp2)
>+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
>+  # compilers, which have integrated preprocessors.  The correct option
>+  # to use with these is +Maked; it writes dependencies to a file named
>+  # 'foo.d', which lands next to the object file, wherever that
>+  # happens to be.
>+  # Much of this is similar to the tru64 case; see comments there.
>+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
>+  test "x$dir" = "x$object" && dir=
>+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
>+  if test "$libtool" = yes; then
>+    tmpdepfile1=$dir$base.d
>+    tmpdepfile2=$dir.libs/$base.d
>+    "$@" -Wc,+Maked
>+  else
>+    tmpdepfile1=$dir$base.d
>+    tmpdepfile2=$dir$base.d
>+    "$@" +Maked
>+  fi
>+  stat=$?
>+  if test $stat -eq 0; then :
>+  else
>+     rm -f "$tmpdepfile1" "$tmpdepfile2"
>+     exit $stat
>+  fi
>+
>+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
>+  do
>+    test -f "$tmpdepfile" && break
>+  done
>+  if test -f "$tmpdepfile"; then
>+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
>+    # Add `dependent.h:' lines.
>+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
>+  else
>+    echo "#dummy" > "$depfile"
>+  fi
>+  rm -f "$tmpdepfile" "$tmpdepfile2"
>+  ;;
>+
> tru64)
>-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
>+   # The Tru64 compiler uses -MD to generate dependencies as a side
>    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
>-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
>+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
>    # dependencies in `foo.d' instead, so we check for that too.
>    # Subdirectories are respected.
>+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
>+   test "x$dir" = "x$object" && dir=
>+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
> 
>-   base=`echo "$object" | sed -e 's/\.o$/.d/' -e 's/\.lo$/.d/'`
>-   tmpdepfile1="$base.o.d"
>-   tmpdepfile2="$base.d"
>    if test "$libtool" = yes; then
>+      # With Tru64 cc, shared objects can also be used to make a
>+      # static library.  This mechanism is used in libtool 1.4 series to
>+      # handle both shared and static libraries in a single compilation.
>+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
>+      #
>+      # With libtool 1.5 this exception was removed, and libtool now
>+      # generates 2 separate objects for the 2 libraries.  These two
>+      # compilations output dependencies in $dir.libs/$base.o.d and
>+      # in $dir$base.o.d.  We have to check for both files, because
>+      # one of the two compilations can be disabled.  We should prefer
>+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
>+      # automatically cleaned when .libs/ is deleted, while ignoring
>+      # the former would cause a distcleancheck panic.
>+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
>+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
>+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
>+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
>       "$@" -Wc,-MD
>    else
>+      tmpdepfile1=$dir$base.o.d
>+      tmpdepfile2=$dir$base.d
>+      tmpdepfile3=$dir$base.d
>+      tmpdepfile4=$dir$base.d
>       "$@" -MD
>    fi
> 
>    stat=$?
>    if test $stat -eq 0; then :
>    else
>-      rm -f "$tmpdepfile1" "$tmpdepfile2"
>+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
>       exit $stat
>    fi
> 
>-   if test -f "$tmpdepfile1"; then
>-      tmpdepfile="$tmpdepfile1"
>-   else
>-      tmpdepfile="$tmpdepfile2"
>-   fi
>+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
>+   do
>+     test -f "$tmpdepfile" && break
>+   done
>    if test -f "$tmpdepfile"; then
>       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
>-      # That's a space and a tab in the [].
>-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
>+      # That's a tab and a space in the [].
>+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
>    else
>       echo "#dummy" > "$depfile"
>    fi
>@@ -250,34 +394,42 @@
> 
> dashmstdout)
>   # Important note: in order to support this mode, a compiler *must*
>-  # always write the proprocessed file to stdout, regardless of -o,
>-  # because we must use -o when running libtool.
>-  test -z "$dashmflag" && dashmflag=-M
>-  ( IFS=" "
>-    case " $* " in
>-    *" --mode=compile "*) # this is libtool, let us make it quiet
>-      for arg
>-      do # cycle over the arguments
>-        case "$arg" in
>-	"--mode=compile")
>-	  # insert --quiet before "--mode=compile"
>-	  set fnord "$@" --quiet
>-	  shift # fnord
>-	  ;;
>-	esac
>-	set fnord "$@" "$arg"
>-	shift # fnord
>-	shift # "$arg"
>-      done
>+  # always write the preprocessed file to stdout, regardless of -o.
>+  "$@" || exit $?
>+
>+  # Remove the call to Libtool.
>+  if test "$libtool" = yes; then
>+    while test $1 != '--mode=compile'; do
>+      shift
>+    done
>+    shift
>+  fi
>+
>+  # Remove `-o $object'.
>+  IFS=" "
>+  for arg
>+  do
>+    case $arg in
>+    -o)
>+      shift
>+      ;;
>+    $object)
>+      shift
>+      ;;
>+    *)
>+      set fnord "$@" "$arg"
>+      shift # fnord
>+      shift # $arg
>       ;;
>     esac
>-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
>-  ) &
>-  proc=$!
>-  "$@"
>-  stat=$?
>-  wait "$proc"
>-  if test "$stat" != 0; then exit $stat; fi
>+  done
>+
>+  test -z "$dashmflag" && dashmflag=-M
>+  # Require at least two characters before searching for `:'
>+  # in the target name.  This is to cope with DOS-style filenames:
>+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
>+  "$@" $dashmflag |
>+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
>   rm -f "$depfile"
>   cat < "$tmpdepfile" > "$depfile"
>   tr ' ' '
>@@ -295,33 +447,37 @@
>   ;;
> 
> makedepend)
>-  # X makedepend
>-  (
>-    shift
>-    cleared=no
>-    for arg in "$@"; do
>-      case $cleared in no)
>-        set ""; shift
>-	cleared=yes
>-      esac
>-      case "$arg" in
>-        -D*|-I*)
>-	  set fnord "$@" "$arg"; shift;;
>-	-*)
>-	  ;;
>-	*)
>-	  set fnord "$@" "$arg"; shift;;
>-      esac
>+  "$@" || exit $?
>+  # Remove any Libtool call
>+  if test "$libtool" = yes; then
>+    while test $1 != '--mode=compile'; do
>+      shift
>     done
>-    obj_suffix="`echo $object | sed 's/^.*\././'`"
>-    touch "$tmpdepfile"
>-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
>-  ) &
>-  proc=$!
>-  "$@"
>-  stat=$?
>-  wait "$proc"
>-  if test "$stat" != 0; then exit $stat; fi
>+    shift
>+  fi
>+  # X makedepend
>+  shift
>+  cleared=no
>+  for arg in "$@"; do
>+    case $cleared in
>+    no)
>+      set ""; shift
>+      cleared=yes ;;
>+    esac
>+    case "$arg" in
>+    -D*|-I*)
>+      set fnord "$@" "$arg"; shift ;;
>+    # Strip any option that makedepend may not understand.  Remove
>+    # the object too, otherwise makedepend will parse it as a source file.
>+    -*|$object)
>+      ;;
>+    *)
>+      set fnord "$@" "$arg"; shift ;;
>+    esac
>+  done
>+  obj_suffix="`echo $object | sed 's/^.*\././'`"
>+  touch "$tmpdepfile"
>+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
>   rm -f "$depfile"
>   cat < "$tmpdepfile" > "$depfile"
>   sed '1,2d' "$tmpdepfile" | tr ' ' '
>@@ -334,35 +490,40 @@
> 
> cpp)
>   # Important note: in order to support this mode, a compiler *must*
>-  # always write the proprocessed file to stdout, regardless of -o,
>-  # because we must use -o when running libtool.
>-  ( IFS=" "
>-    case " $* " in
>-    *" --mode=compile "*)
>-      for arg
>-      do # cycle over the arguments
>-        case $arg in
>-	"--mode=compile")
>-	  # insert --quiet before "--mode=compile"
>-	  set fnord "$@" --quiet
>-	  shift # fnord
>-	  ;;
>-	esac
>-	set fnord "$@" "$arg"
>-	shift # fnord
>-	shift # "$arg"
>-      done
>+  # always write the preprocessed file to stdout.
>+  "$@" || exit $?
>+
>+  # Remove the call to Libtool.
>+  if test "$libtool" = yes; then
>+    while test $1 != '--mode=compile'; do
>+      shift
>+    done
>+    shift
>+  fi
>+
>+  # Remove `-o $object'.
>+  IFS=" "
>+  for arg
>+  do
>+    case $arg in
>+    -o)
>+      shift
>+      ;;
>+    $object)
>+      shift
>+      ;;
>+    *)
>+      set fnord "$@" "$arg"
>+      shift # fnord
>+      shift # $arg
>       ;;
>     esac
>-    "$@" -E |
>-    sed -n '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
>+  done
>+
>+  "$@" -E |
>+    sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
>+       -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
>     sed '$ s: \\$::' > "$tmpdepfile"
>-  ) &
>-  proc=$!
>-  "$@"
>-  stat=$?
>-  wait "$proc"
>-  if test "$stat" != 0; then exit $stat; fi
>   rm -f "$depfile"
>   echo "$object : \\" > "$depfile"
>   cat < "$tmpdepfile" >> "$depfile"
>@@ -372,49 +533,27 @@
> 
> msvisualcpp)
>   # Important note: in order to support this mode, a compiler *must*
>-  # always write the proprocessed file to stdout, regardless of -o,
>+  # always write the preprocessed file to stdout, regardless of -o,
>   # because we must use -o when running libtool.
>-  ( IFS=" "
>-    case " $* " in
>-    *" --mode=compile "*)
>-      for arg
>-      do # cycle over the arguments
>-        case $arg in
>-	"--mode=compile")
>-	  # insert --quiet before "--mode=compile"
>-	  set fnord "$@" --quiet
>-	  shift # fnord
>-	  ;;
>-	esac
>-	set fnord "$@" "$arg"
>-	shift # fnord
>-	shift # "$arg"
>-      done
>-      ;;
>-    esac
>-    for arg
>-    do
>-      case "$arg" in
>-      "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
>+  "$@" || exit $?
>+  IFS=" "
>+  for arg
>+  do
>+    case "$arg" in
>+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
> 	set fnord "$@"
> 	shift
> 	shift
> 	;;
>-      *)
>+    *)
> 	set fnord "$@" "$arg"
> 	shift
> 	shift
> 	;;
>-      esac
>-    done
>-    "$@" -E |
>-    sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
>-  ) &
>-  proc=$!
>-  "$@"
>-  stat=$?
>-  wait "$proc"
>-  if test "$stat" != 0; then exit $stat; fi
>+    esac
>+  done
>+  "$@" -E |
>+  sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
>   rm -f "$depfile"
>   echo "$object : \\" > "$depfile"
>   . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
>@@ -434,3 +573,12 @@
> esac
> 
> exit 0
>+
>+# Local Variables:
>+# mode: shell-script
>+# sh-indentation: 2
>+# eval: (add-hook 'write-file-hooks 'time-stamp)
>+# time-stamp-start: "scriptversion="
>+# time-stamp-format: "%:y-%02m-%02d.%02H"
>+# time-stamp-end: "$"
>+# End:
>diff -uNr vamos-0.5.5.orig/config/install-sh vamos-0.5.5/config/install-sh
>--- vamos-0.5.5.orig/config/install-sh	2001-10-17 03:31:35.000000000 +0200
>+++ vamos-0.5.5/config/install-sh	2007-06-25 17:58:10.000000000 +0200
>@@ -1,36 +1,62 @@
> #!/bin/sh
>-#
> # install - install a program, script, or datafile
>-# This comes from X11R5 (mit/util/scripts/install.sh).
>+
>+scriptversion=2006-10-14.15
>+
>+# This originates from X11R5 (mit/util/scripts/install.sh), which was
>+# later released in X11R6 (xc/config/util/install.sh) with the
>+# following copyright and license.
>+#
>+# Copyright (C) 1994 X Consortium
>+#
>+# Permission is hereby granted, free of charge, to any person obtaining a copy
>+# of this software and associated documentation files (the "Software"), to
>+# deal in the Software without restriction, including without limitation the
>+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
>+# sell copies of the Software, and to permit persons to whom the Software is
>+# furnished to do so, subject to the following conditions:
> #
>-# Copyright 1991 by the Massachusetts Institute of Technology
>+# The above copyright notice and this permission notice shall be included in
>+# all copies or substantial portions of the Software.
> #
>-# Permission to use, copy, modify, distribute, and sell this software and its
>-# documentation for any purpose is hereby granted without fee, provided that
>-# the above copyright notice appear in all copies and that both that
>-# copyright notice and this permission notice appear in supporting
>-# documentation, and that the name of M.I.T. not be used in advertising or
>-# publicity pertaining to distribution of the software without specific,
>-# written prior permission.  M.I.T. makes no representations about the
>-# suitability of this software for any purpose.  It is provided "as is"
>-# without express or implied warranty.
>+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
>+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
>+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
>+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>+#
>+# Except as contained in this notice, the name of the X Consortium shall not
>+# be used in advertising or otherwise to promote the sale, use or other deal-
>+# ings in this Software without prior written authorization from the X Consor-
>+# tium.
>+#
>+#
>+# FSF changes to this file are in the public domain.
> #
> # Calling this script install-sh is preferred over install.sh, to prevent
> # `make' implicit rules from creating a file called install from it
> # when there is no Makefile.
> #
> # This script is compatible with the BSD install script, but was written
>-# from scratch.  It can only install one file at a time, a restriction
>-# shared with many OS's install programs.
>+# from scratch.
> 
>+nl='
>+'
>+IFS=" ""	$nl"
> 
> # set DOITPROG to echo to test this script
> 
> # Don't use :- since 4.3BSD and earlier shells don't like it.
> doit="${DOITPROG-}"
>+if test -z "$doit"; then
>+  doit_exec=exec
>+else
>+  doit_exec=$doit
>+fi
> 
>-
>-# put in absolute paths if you don't have them in your path; or use env. vars.
>+# Put in absolute file names if you don't have them in your path;
>+# or use environment vars.
> 
> mvprog="${MVPROG-mv}"
> cpprog="${CPPROG-cp}"
>@@ -41,211 +67,441 @@
> rmprog="${RMPROG-rm}"
> mkdirprog="${MKDIRPROG-mkdir}"
> 
>-transformbasename=""
>-transform_arg=""
>-instcmd="$mvprog"
>-chmodcmd="$chmodprog 0755"
>-chowncmd=""
>-chgrpcmd=""
>-stripcmd=""
>-rmcmd="$rmprog -f"
>-mvcmd="$mvprog"
>-src=""
>-dst=""
>-dir_arg=""
>-
>-while [ x"$1" != x ]; do
>-    case $1 in
>-	-c) instcmd="$cpprog"
>-	    shift
>-	    continue;;
>-
>-	-d) dir_arg=true
>-	    shift
>-	    continue;;
>-
>-	-m) chmodcmd="$chmodprog $2"
>-	    shift
>-	    shift
>-	    continue;;
>-
>-	-o) chowncmd="$chownprog $2"
>-	    shift
>-	    shift
>-	    continue;;
>-
>-	-g) chgrpcmd="$chgrpprog $2"
>-	    shift
>-	    shift
>-	    continue;;
>-
>-	-s) stripcmd="$stripprog"
>-	    shift
>-	    continue;;
>-
>-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
>-	    shift
>-	    continue;;
>-
>-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
>-	    shift
>-	    continue;;
>-
>-	*)  if [ x"$src" = x ]
>-	    then
>-		src=$1
>-	    else
>-		# this colon is to work around a 386BSD /bin/sh bug
>-		:
>-		dst=$1
>-	    fi
>-	    shift
>-	    continue;;
>-    esac
>-done
>-
>-if [ x"$src" = x ]
>-then
>-	echo "install:	no input file specified"
>-	exit 1
>-else
>-	true
>-fi
>+posix_glob=
>+posix_mkdir=
> 
>-if [ x"$dir_arg" != x ]; then
>-	dst=$src
>-	src=""
>-	
>-	if [ -d $dst ]; then
>-		instcmd=:
>-		chmodcmd=""
>-	else
>-		instcmd=mkdir
>-	fi
>-else
>+# Desired mode of installed file.
>+mode=0755
> 
>-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
>-# might cause directories to be created, which would be especially bad 
>-# if $src (and thus $dsttmp) contains '*'.
>-
>-	if [ -f $src -o -d $src ]
>-	then
>-		true
>-	else
>-		echo "install:  $src does not exist"
>-		exit 1
>-	fi
>-	
>-	if [ x"$dst" = x ]
>-	then
>-		echo "install:	no destination specified"
>-		exit 1
>-	else
>-		true
>-	fi
>+chmodcmd=$chmodprog
>+chowncmd=
>+chgrpcmd=
>+stripcmd=
>+rmcmd="$rmprog -f"
>+mvcmd="$mvprog"
>+src=
>+dst=
>+dir_arg=
>+dstarg=
>+no_target_directory=
>+
>+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
>+   or: $0 [OPTION]... SRCFILES... DIRECTORY
>+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
>+   or: $0 [OPTION]... -d DIRECTORIES...
>+
>+In the 1st form, copy SRCFILE to DSTFILE.
>+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
>+In the 4th, create DIRECTORIES.
>+
>+Options:
>+-c         (ignored)
>+-d         create directories instead of installing files.
>+-g GROUP   $chgrpprog installed files to GROUP.
>+-m MODE    $chmodprog installed files to MODE.
>+-o USER    $chownprog installed files to USER.
>+-s         $stripprog installed files.
>+-t DIRECTORY  install into DIRECTORY.
>+-T         report an error if DSTFILE is a directory.
>+--help     display this help and exit.
>+--version  display version info and exit.
>+
>+Environment variables override the default commands:
>+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
>+"
>+
>+while test $# -ne 0; do
>+  case $1 in
>+    -c) shift
>+        continue;;
>+
>+    -d) dir_arg=true
>+        shift
>+        continue;;
>+
>+    -g) chgrpcmd="$chgrpprog $2"
>+        shift
>+        shift
>+        continue;;
>+
>+    --help) echo "$usage"; exit $?;;
>+
>+    -m) mode=$2
>+        shift
>+        shift
>+	case $mode in
>+	  *' '* | *'	'* | *'
>+'*	  | *'*'* | *'?'* | *'['*)
>+	    echo "$0: invalid mode: $mode" >&2
>+	    exit 1;;
>+	esac
>+        continue;;
>+
>+    -o) chowncmd="$chownprog $2"
>+        shift
>+        shift
>+        continue;;
>+
>+    -s) stripcmd=$stripprog
>+        shift
>+        continue;;
> 
>-# If destination is a directory, append the input filename; if your system
>-# does not like double slashes in filenames, you may need to add some logic
>+    -t) dstarg=$2
>+	shift
>+	shift
>+	continue;;
> 
>-	if [ -d $dst ]
>-	then
>-		dst="$dst"/`basename $src`
>-	else
>-		true
>-	fi
>-fi
>+    -T) no_target_directory=true
>+	shift
>+	continue;;
> 
>-## this sed command emulates the dirname command
>-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
>+    --version) echo "$0 $scriptversion"; exit $?;;
> 
>-# Make sure that the destination directory exists.
>-#  this part is taken from Noah Friedman's mkinstalldirs script
>+    --)	shift
>+	break;;
> 
>-# Skip lots of stat calls in the usual case.
>-if [ ! -d "$dstdir" ]; then
>-defaultIFS='	
>-'
>-IFS="${IFS-${defaultIFS}}"
>+    -*)	echo "$0: invalid option: $1" >&2
>+	exit 1;;
> 
>-oIFS="${IFS}"
>-# Some sh's can't handle IFS=/ for some reason.
>-IFS='%'
>-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
>-IFS="${oIFS}"
>+    *)  break;;
>+  esac
>+done
> 
>-pathcomp=''
>+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
>+  # When -d is used, all remaining arguments are directories to create.
>+  # When -t is used, the destination is already specified.
>+  # Otherwise, the last argument is the destination.  Remove it from $@.
>+  for arg
>+  do
>+    if test -n "$dstarg"; then
>+      # $@ is not empty: it contains at least $arg.
>+      set fnord "$@" "$dstarg"
>+      shift # fnord
>+    fi
>+    shift # arg
>+    dstarg=$arg
>+  done
>+fi
> 
>-while [ $# -ne 0 ] ; do
>-	pathcomp="${pathcomp}${1}"
>-	shift
>+if test $# -eq 0; then
>+  if test -z "$dir_arg"; then
>+    echo "$0: no input file specified." >&2
>+    exit 1
>+  fi
>+  # It's OK to call `install-sh -d' without argument.
>+  # This can happen when creating conditional directories.
>+  exit 0
>+fi
> 
>-	if [ ! -d "${pathcomp}" ] ;
>-        then
>-		$mkdirprog "${pathcomp}"
>-	else
>-		true
>-	fi
>+if test -z "$dir_arg"; then
>+  trap '(exit $?); exit' 1 2 13 15
> 
>-	pathcomp="${pathcomp}/"
>-done
>+  # Set umask so as not to create temps with too-generous modes.
>+  # However, 'strip' requires both read and write access to temps.
>+  case $mode in
>+    # Optimize common cases.
>+    *644) cp_umask=133;;
>+    *755) cp_umask=22;;
>+
>+    *[0-7])
>+      if test -z "$stripcmd"; then
>+	u_plus_rw=
>+      else
>+	u_plus_rw='% 200'
>+      fi
>+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
>+    *)
>+      if test -z "$stripcmd"; then
>+	u_plus_rw=
>+      else
>+	u_plus_rw=,u+rw
>+      fi
>+      cp_umask=$mode$u_plus_rw;;
>+  esac
> fi
> 
>-if [ x"$dir_arg" != x ]
>-then
>-	$doit $instcmd $dst &&
>-
>-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
>-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
>-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
>-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
>-else
>-
>-# If we're going to rename the final executable, determine the name now.
>+for src
>+do
>+  # Protect names starting with `-'.
>+  case $src in
>+    -*) src=./$src ;;
>+  esac
>+
>+  if test -n "$dir_arg"; then
>+    dst=$src
>+    dstdir=$dst
>+    test -d "$dstdir"
>+    dstdir_status=$?
>+  else
>+
>+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
>+    # might cause directories to be created, which would be especially bad
>+    # if $src (and thus $dsttmp) contains '*'.
>+    if test ! -f "$src" && test ! -d "$src"; then
>+      echo "$0: $src does not exist." >&2
>+      exit 1
>+    fi
>+
>+    if test -z "$dstarg"; then
>+      echo "$0: no destination specified." >&2
>+      exit 1
>+    fi
>+
>+    dst=$dstarg
>+    # Protect names starting with `-'.
>+    case $dst in
>+      -*) dst=./$dst ;;
>+    esac
> 
>-	if [ x"$transformarg" = x ] 
>-	then
>-		dstfile=`basename $dst`
>+    # If destination is a directory, append the input filename; won't work
>+    # if double slashes aren't ignored.
>+    if test -d "$dst"; then
>+      if test -n "$no_target_directory"; then
>+	echo "$0: $dstarg: Is a directory" >&2
>+	exit 1
>+      fi
>+      dstdir=$dst
>+      dst=$dstdir/`basename "$src"`
>+      dstdir_status=0
>+    else
>+      # Prefer dirname, but fall back on a substitute if dirname fails.
>+      dstdir=`
>+	(dirname "$dst") 2>/dev/null ||
>+	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
>+	     X"$dst" : 'X$//$[^/]' \| \
>+	     X"$dst" : 'X$//$$' \| \
>+	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
>+	echo X"$dst" |
>+	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
>+		   s//\1/
>+		   q
>+		 }
>+		 /^X$\/\/$[^/].*/{
>+		   s//\1/
>+		   q
>+		 }
>+		 /^X$\/\/$$/{
>+		   s//\1/
>+		   q
>+		 }
>+		 /^X$\/$.*/{
>+		   s//\1/
>+		   q
>+		 }
>+		 s/.*/./; q'
>+      `
>+
>+      test -d "$dstdir"
>+      dstdir_status=$?
>+    fi
>+  fi
>+
>+  obsolete_mkdir_used=false
>+
>+  if test $dstdir_status != 0; then
>+    case $posix_mkdir in
>+      '')
>+	# Create intermediate dirs using mode 755 as modified by the umask.
>+	# This is like FreeBSD 'install' as of 1997-10-28.
>+	umask=`umask`
>+	case $stripcmd.$umask in
>+	  # Optimize common cases.
>+	  *[2367][2367]) mkdir_umask=$umask;;
>+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
>+
>+	  *[0-7])
>+	    mkdir_umask=`expr $umask + 22 \
>+	      - $umask % 100 % 40 + $umask % 20 \
>+	      - $umask % 10 % 4 + $umask % 2
>+	    `;;
>+	  *) mkdir_umask=$umask,go-w;;
>+	esac
>+
>+	# With -d, create the new directory with the user-specified mode.
>+	# Otherwise, rely on $mkdir_umask.
>+	if test -n "$dir_arg"; then
>+	  mkdir_mode=-m$mode
> 	else
>-		dstfile=`basename $dst $transformbasename | 
>-			sed $transformarg`$transformbasename
>+	  mkdir_mode=
> 	fi
> 
>-# don't allow the sed command to completely eliminate the filename
>+	posix_mkdir=false
>+	case $umask in
>+	  *[123567][0-7][0-7])
>+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
>+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
>+	    ;;
>+	  *)
>+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
>+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
> 
>-	if [ x"$dstfile" = x ] 
>-	then
>-		dstfile=`basename $dst`
>+	    if (umask $mkdir_umask &&
>+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
>+	    then
>+	      if test -z "$dir_arg" || {
>+		   # Check for POSIX incompatibilities with -m.
>+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
>+		   # other-writeable bit of parent directory when it shouldn't.
>+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
>+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
>+		   case $ls_ld_tmpdir in
>+		     d????-?r-*) different_mode=700;;
>+		     d????-?--*) different_mode=755;;
>+		     *) false;;
>+		   esac &&
>+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
>+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
>+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
>+		   }
>+		 }
>+	      then posix_mkdir=:
>+	      fi
>+	      rmdir "$tmpdir/d" "$tmpdir"
>+	    else
>+	      # Remove any dirs left behind by ancient mkdir implementations.
>+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
>+	    fi
>+	    trap '' 0;;
>+	esac;;
>+    esac
>+
>+    if
>+      $posix_mkdir && (
>+	umask $mkdir_umask &&
>+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
>+      )
>+    then :
>+    else
>+
>+      # The umask is ridiculous, or mkdir does not conform to POSIX,
>+      # or it failed possibly due to a race condition.  Create the
>+      # directory the slow way, step by step, checking for races as we go.
>+
>+      case $dstdir in
>+	/*) prefix=/ ;;
>+	-*) prefix=./ ;;
>+	*)  prefix= ;;
>+      esac
>+
>+      case $posix_glob in
>+        '')
>+	  if (set -f) 2>/dev/null; then
>+	    posix_glob=true
>+	  else
>+	    posix_glob=false
>+	  fi ;;
>+      esac
>+
>+      oIFS=$IFS
>+      IFS=/
>+      $posix_glob && set -f
>+      set fnord $dstdir
>+      shift
>+      $posix_glob && set +f
>+      IFS=$oIFS
>+
>+      prefixes=
>+
>+      for d
>+      do
>+	test -z "$d" && continue
>+
>+	prefix=$prefix$d
>+	if test -d "$prefix"; then
>+	  prefixes=
> 	else
>-		true
>+	  if $posix_mkdir; then
>+	    (umask=$mkdir_umask &&
>+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
>+	    # Don't fail if two instances are running concurrently.
>+	    test -d "$prefix" || exit 1
>+	  else
>+	    case $prefix in
>+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
>+	      *) qprefix=$prefix;;
>+	    esac
>+	    prefixes="$prefixes '$qprefix'"
>+	  fi
> 	fi
>+	prefix=$prefix/
>+      done
> 
>-# Make a temp file name in the proper directory.
>-
>-	dsttmp=$dstdir/#inst.$$#
>-
>-# Move or copy the file name to the temp name
>-
>-	$doit $instcmd $src $dsttmp &&
>-
>-	trap "rm -f ${dsttmp}" 0 &&
>-
>-# and set any options; do chmod last to preserve setuid bits
>-
>-# If any of these fail, we abort the whole thing.  If we want to
>-# ignore errors from any of these, just make sure not to ignore
>-# errors from the above "$doit $instcmd $src $dsttmp" command.
>-
>-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
>-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
>-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
>-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
>-
>-# Now rename the file to the real destination.
>-
>-	$doit $rmcmd -f $dstdir/$dstfile &&
>-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
>-
>-fi &&
>+      if test -n "$prefixes"; then
>+	# Don't fail if two instances are running concurrently.
>+	(umask $mkdir_umask &&
>+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
>+	  test -d "$dstdir" || exit 1
>+	obsolete_mkdir_used=true
>+      fi
>+    fi
>+  fi
>+
>+  if test -n "$dir_arg"; then
>+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
>+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
>+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
>+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
>+  else
>+
>+    # Make a couple of temp file names in the proper directory.
>+    dsttmp=$dstdir/_inst.$$_
>+    rmtmp=$dstdir/_rm.$$_
>+
>+    # Trap to clean up those temp files at exit.
>+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
>+
>+    # Copy the file name to the temp name.
>+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
>+
>+    # and set any options; do chmod last to preserve setuid bits.
>+    #
>+    # If any of these fail, we abort the whole thing.  If we want to
>+    # ignore errors from any of these, just make sure not to ignore
>+    # errors from the above "$doit $cpprog $src $dsttmp" command.
>+    #
>+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
>+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
>+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
>+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
>+
>+    # Now rename the file to the real destination.
>+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
>+      || {
>+	   # The rename failed, perhaps because mv can't rename something else
>+	   # to itself, or perhaps because mv is so ancient that it does not
>+	   # support -f.
>+
>+	   # Now remove or move aside any old file at destination location.
>+	   # We try this two ways since rm can't unlink itself on some
>+	   # systems and the destination file might be busy for other
>+	   # reasons.  In this case, the final cleanup might fail but the new
>+	   # file should still install successfully.
>+	   {
>+	     if test -f "$dst"; then
>+	       $doit $rmcmd -f "$dst" 2>/dev/null \
>+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
>+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
>+	       || {
>+		 echo "$0: cannot unlink or rename $dst" >&2
>+		 (exit 1); exit 1
>+	       }
>+	     else
>+	       :
>+	     fi
>+	   } &&
>+
>+	   # Now rename the file to the real destination.
>+	   $doit $mvcmd "$dsttmp" "$dst"
>+	 }
>+    } || exit 1
> 
>+    trap '' 0
>+  fi
>+done
> 
>-exit 0
>+# Local variables:
>+# eval: (add-hook 'write-file-hooks 'time-stamp)
>+# time-stamp-start: "scriptversion="
>+# time-stamp-format: "%:y-%02m-%02d.%02H"
>+# time-stamp-end: "$"
>+# End:
>diff -uNr vamos-0.5.5.orig/config/ltmain.sh vamos-0.5.5/config/ltmain.sh
>--- vamos-0.5.5.orig/config/ltmain.sh	2002-05-29 23:33:54.000000000 +0200
>+++ vamos-0.5.5/config/ltmain.sh	2007-06-25 17:58:10.000000000 +0200
>@@ -1,7 +1,7 @@
> # ltmain.sh - Provide generalized library-building support services.
> # NOTE: Changing this file will not affect anything until you rerun configure.
> #
>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
>+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
> # Free Software Foundation, Inc.
> # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
> #
>@@ -17,13 +17,47 @@
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
> # the same distribution terms that you use for the rest of that program.
> 
>+basename="s,^.*/,,g"
>+
>+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
>+# is ksh but when the shell is invoked as "sh" and the current value of
>+# the _XPG environment variable is not equal to 1 (one), the special
>+# positional parameter $0, within a function call, is the name of the
>+# function.
>+progpath="$0"
>+
>+# The name of this program:
>+progname=`echo "$progpath" | $SED $basename`
>+modename="$progname"
>+
>+# Global variables:
>+EXIT_SUCCESS=0
>+EXIT_FAILURE=1
>+
>+PROGRAM=ltmain.sh
>+PACKAGE=libtool
>+VERSION=1.5.22
>+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
>+
>+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
>+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>+  emulate sh
>+  NULLCMD=:
>+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
>+  # is contrary to our usage.  Disable this feature.
>+  alias -g '${1+"$@"}'='"$@"'
>+  setopt NO_GLOB_SUBST
>+else
>+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
>+fi
>+
> # Check that we have a working $echo.
> if test "X$1" = X--no-reexec; then
>   # Discard the --no-reexec flag, and continue.
>@@ -36,7 +70,7 @@
>   :
> else
>   # Restart under the correct shell, and then maybe $echo will work.
>-  exec $SHELL "$0" --no-reexec ${1+"$@"}
>+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
> fi
> 
> if test "X$1" = X--fallback-echo; then
>@@ -45,19 +79,9 @@
>   cat <<EOF
> $*
> EOF
>-  exit 0
>+  exit $EXIT_SUCCESS
> fi
> 
>-# The name of this program.
>-progname=`$echo "$0" | sed 's%^.*/%%'`
>-modename="$progname"
>-
>-# Constants.
>-PROGRAM=ltmain.sh
>-PACKAGE=libtool
>-VERSION=1.4.2
>-TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)"
>-
> default_mode=
> help="Try \`$progname --help' for more information."
> magic="%%%MAGIC variable%%%"
>@@ -67,30 +91,44 @@
> 
> # Sed substitution that helps us do robust quoting.  It backslashifies
> # metacharacters that are still active within double-quoted strings.
>-Xsed='sed -e 1s/^X//'
>+Xsed="${SED}"' -e 1s/^X//'
> sed_quote_subst='s/$[\\`\\"$\\\\]$/\\\1/g'
>-SP2NL='tr \040 \012'
>-NL2SP='tr \015\012 \040\040'
>+# test EBCDIC or ASCII
>+case `echo X|tr X '\101'` in
>+ A) # ASCII based system
>+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
>+  SP2NL='tr \040 \012'
>+  NL2SP='tr \015\012 \040\040'
>+  ;;
>+ *) # EBCDIC based system
>+  SP2NL='tr \100 \n'
>+  NL2SP='tr \r\n \100\100'
>+  ;;
>+esac
> 
> # NLS nuisances.
> # Only set LANG and LC_ALL to C if already set.
> # These must not be set unconditionally because not all systems understand
> # e.g. LANG=C (notably SCO).
> # We save the old values to restore during execute mode.
>-if test "${LC_ALL+set}" = set; then
>-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
>-fi
>-if test "${LANG+set}" = set; then
>-  save_LANG="$LANG"; LANG=C; export LANG
>-fi
>+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
>+do
>+  eval "if test \"\${$lt_var+set}\" = set; then
>+         save_$lt_var=\$$lt_var
>+         $lt_var=C
>+         export $lt_var
>+       fi"
>+done
> 
> # Make sure IFS has a sensible default
>-: ${IFS=" 	"}
>+lt_nl='
>+'
>+IFS=" 	$lt_nl"
> 
> if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
>-  echo "$modename: not configured to build any kind of library" 1>&2
>-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
>-  exit 1
>+  $echo "$modename: not configured to build any kind of library" 1>&2
>+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
>+  exit $EXIT_FAILURE
> fi
> 
> # Global variables.
>@@ -102,11 +140,280 @@
> show="$echo"
> show_help=
> execute_dlfiles=
>+duplicate_deps=no
>+preserve_args=
> lo2o="s/\\.lo\$/.${objext}/"
> o2lo="s/\\.${objext}\$/.lo/"
>+extracted_archives=
>+extracted_serial=0
>+
>+#####################################
>+# Shell function definitions:
>+# This seems to be the best place for them
>+
>+# func_mktempdir [string]
>+# Make a temporary directory that won't clash with other running
>+# libtool processes, and avoids race conditions if possible.  If
>+# given, STRING is the basename for that directory.
>+func_mktempdir ()
>+{
>+    my_template="${TMPDIR-/tmp}/${1-$progname}"
>+
>+    if test "$run" = ":"; then
>+      # Return a directory name, but don't create it in dry-run mode
>+      my_tmpdir="${my_template}-$$"
>+    else
>+
>+      # If mktemp works, use that first and foremost
>+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
>+
>+      if test ! -d "$my_tmpdir"; then
>+	# Failing that, at least try and use $RANDOM to avoid a race
>+	my_tmpdir="${my_template}-${RANDOM-0}$$"
>+
>+	save_mktempdir_umask=`umask`
>+	umask 0077
>+	$mkdir "$my_tmpdir"
>+	umask $save_mktempdir_umask
>+      fi
>+
>+      # If we're not in dry-run mode, bomb out on failure
>+      test -d "$my_tmpdir" || {
>+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
>+	exit $EXIT_FAILURE
>+      }
>+    fi
>+
>+    $echo "X$my_tmpdir" | $Xsed
>+}
>+
>+
>+# func_win32_libid arg
>+# return the library type of file 'arg'
>+#
>+# Need a lot of goo to handle *both* DLLs and import libs
>+# Has to be a shell function in order to 'eat' the argument
>+# that is supplied when $file_magic_command is called.
>+func_win32_libid ()
>+{
>+  win32_libid_type="unknown"
>+  win32_fileres=`file -L $1 2>/dev/null`
>+  case $win32_fileres in
>+  *ar\ archive\ import\ library*) # definitely import
>+    win32_libid_type="x86 archive import"
>+    ;;
>+  *ar\ archive*) # could be an import, or static
>+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
>+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
>+      win32_nmres=`eval $NM -f posix -A $1 | \
>+	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
>+      case $win32_nmres in
>+      import*)  win32_libid_type="x86 archive import";;
>+      *)        win32_libid_type="x86 archive static";;
>+      esac
>+    fi
>+    ;;
>+  *DLL*)
>+    win32_libid_type="x86 DLL"
>+    ;;
>+  *executable*) # but shell scripts are "executable" too...
>+    case $win32_fileres in
>+    *MS\ Windows\ PE\ Intel*)
>+      win32_libid_type="x86 DLL"
>+      ;;
>+    esac
>+    ;;
>+  esac
>+  $echo $win32_libid_type
>+}
>+
>+
>+# func_infer_tag arg
>+# Infer tagged configuration to use if any are available and
>+# if one wasn't chosen via the "--tag" command line option.
>+# Only attempt this if the compiler in the base compile
>+# command doesn't match the default compiler.
>+# arg is usually of the form 'gcc ...'
>+func_infer_tag ()
>+{
>+    if test -n "$available_tags" && test -z "$tagname"; then
>+      CC_quoted=
>+      for arg in $CC; do
>+	case $arg in
>+	  *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>+	  arg="\"$arg\""
>+	  ;;
>+	esac
>+	CC_quoted="$CC_quoted $arg"
>+      done
>+      case $@ in
>+      # Blanks in the command may have been stripped by the calling shell,
>+      # but not from the CC environment variable when configure was run.
>+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
>+      # Blanks at the start of $base_compile will cause this to fail
>+      # if we don't check for them as well.
>+      *)
>+	for z in $available_tags; do
>+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
>+	    # Evaluate the configuration.
>+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
>+	    CC_quoted=
>+	    for arg in $CC; do
>+	    # Double-quote args containing other shell metacharacters.
>+	    case $arg in
>+	      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>+	      arg="\"$arg\""
>+	      ;;
>+	    esac
>+	    CC_quoted="$CC_quoted $arg"
>+	  done
>+	    case "$@ " in
>+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
>+	      # The compiler in the base compile command matches
>+	      # the one in the tagged configuration.
>+	      # Assume this is the tagged configuration we want.
>+	      tagname=$z
>+	      break
>+	      ;;
>+	    esac
>+	  fi
>+	done
>+	# If $tagname still isn't set, then no tagged configuration
>+	# was found and let the user know that the "--tag" command
>+	# line option must be used.
>+	if test -z "$tagname"; then
>+	  $echo "$modename: unable to infer tagged configuration"
>+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
>+	  exit $EXIT_FAILURE
>+#        else
>+#          $echo "$modename: using $tagname tagged configuration"
>+	fi
>+	;;
>+      esac
>+    fi
>+}
>+
>+
>+# func_extract_an_archive dir oldlib
>+func_extract_an_archive ()
>+{
>+    f_ex_an_ar_dir="$1"; shift
>+    f_ex_an_ar_oldlib="$1"
>+
>+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
>+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
>+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
>+     :
>+    else
>+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
>+      exit $EXIT_FAILURE
>+    fi
>+}
>+
>+# func_extract_archives gentop oldlib ...
>+func_extract_archives ()
>+{
>+    my_gentop="$1"; shift
>+    my_oldlibs=${1+"$@"}
>+    my_oldobjs=""
>+    my_xlib=""
>+    my_xabs=""
>+    my_xdir=""
>+    my_status=""
>+
>+    $show "${rm}r $my_gentop"
>+    $run ${rm}r "$my_gentop"
>+    $show "$mkdir $my_gentop"
>+    $run $mkdir "$my_gentop"
>+    my_status=$?
>+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
>+      exit $my_status
>+    fi
>+
>+    for my_xlib in $my_oldlibs; do
>+      # Extract the objects.
>+      case $my_xlib in
>+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
>+	*) my_xabs=`pwd`"/$my_xlib" ;;
>+      esac
>+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
>+      my_xlib_u=$my_xlib
>+      while :; do
>+        case " $extracted_archives " in
>+       *" $my_xlib_u "*)
>+         extracted_serial=`expr $extracted_serial + 1`
>+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
>+       *) break ;;
>+       esac
>+      done
>+      extracted_archives="$extracted_archives $my_xlib_u"
>+      my_xdir="$my_gentop/$my_xlib_u"
>+
>+      $show "${rm}r $my_xdir"
>+      $run ${rm}r "$my_xdir"
>+      $show "$mkdir $my_xdir"
>+      $run $mkdir "$my_xdir"
>+      exit_status=$?
>+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
>+	exit $exit_status
>+      fi
>+      case $host in
>+      *-darwin*)
>+	$show "Extracting $my_xabs"
>+	# Do not bother doing anything if just a dry run
>+	if test -z "$run"; then
>+	  darwin_orig_dir=`pwd`
>+	  cd $my_xdir || exit $?
>+	  darwin_archive=$my_xabs
>+	  darwin_curdir=`pwd`
>+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
>+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
>+	  if test -n "$darwin_arches"; then 
>+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
>+	    darwin_arch=
>+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
>+	    for darwin_arch in  $darwin_arches ; do
>+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
>+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
>+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
>+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
>+	      cd "$darwin_curdir"
>+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
>+	    done # $darwin_arches
>+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
>+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
>+	    darwin_file=
>+	    darwin_files=
>+	    for darwin_file in $darwin_filelist; do
>+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
>+	      lipo -create -output "$darwin_file" $darwin_files
>+	    done # $darwin_filelist
>+	    ${rm}r unfat-$$
>+	    cd "$darwin_orig_dir"
>+	  else
>+	    cd "$darwin_orig_dir"
>+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
>+	  fi # $darwin_arches
>+	fi # $run
>+	;;
>+      *)
>+        func_extract_an_archive "$my_xdir" "$my_xabs"
>+        ;;
>+      esac
>+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
>+    done
>+    func_extract_archives_result="$my_oldobjs"
>+}
>+# End of Shell function definitions
>+#####################################
>+
>+# Darwin sucks
>+eval std_shrext=\"$shrext_cmds\"
>+
>+disable_libs=no
> 
> # Parse our command line options once, thoroughly.
>-while test $# -gt 0
>+while test "$#" -gt 0
> do
>   arg="$1"
>   shift
>@@ -122,6 +429,34 @@
>     execute_dlfiles)
>       execute_dlfiles="$execute_dlfiles $arg"
>       ;;
>+    tag)
>+      tagname="$arg"
>+      preserve_args="${preserve_args}=$arg"
>+
>+      # Check whether tagname contains only valid characters
>+      case $tagname in
>+      *[!-_A-Za-z0-9,/]*)
>+	$echo "$progname: invalid tag name: $tagname" 1>&2
>+	exit $EXIT_FAILURE
>+	;;
>+      esac
>+
>+      case $tagname in
>+      CC)
>+	# Don't test for the "default" C tag, as we know, it's there, but
>+	# not specially marked.
>+	;;
>+      *)
>+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
>+	  taglist="$taglist $tagname"
>+	  # Evaluate the configuration.
>+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
>+	else
>+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
>+	fi
>+	;;
>+      esac
>+      ;;
>     *)
>       eval "$prev=\$arg"
>       ;;
>@@ -139,18 +474,27 @@
>     ;;
> 
>   --version)
>-    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
>-    exit 0
>+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
>+    $echo
>+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
>+    $echo "This is free software; see the source for copying conditions.  There is NO"
>+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>+    exit $?
>     ;;
> 
>   --config)
>-    sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
>-    exit 0
>+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
>+    # Now print the configurations for the tags.
>+    for tagname in $taglist; do
>+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
>+    done
>+    exit $?
>     ;;
> 
>   --debug)
>-    echo "$progname: enabling shell trace mode"
>+    $echo "$progname: enabling shell trace mode"
>     set -x
>+    preserve_args="$preserve_args $arg"
>     ;;
> 
>   --dry-run | -n)
>@@ -158,18 +502,18 @@
>     ;;
> 
>   --features)
>-    echo "host: $host"
>+    $echo "host: $host"
>     if test "$build_libtool_libs" = yes; then
>-      echo "enable shared libraries"
>+      $echo "enable shared libraries"
>     else
>-      echo "disable shared libraries"
>+      $echo "disable shared libraries"
>     fi
>     if test "$build_old_libs" = yes; then
>-      echo "enable static libraries"
>+      $echo "enable static libraries"
>     else
>-      echo "disable static libraries"
>+      $echo "disable static libraries"
>     fi
>-    exit 0
>+    exit $?
>     ;;
> 
>   --finish) mode="finish" ;;
>@@ -177,8 +521,23 @@
>   --mode) prevopt="--mode" prev=mode ;;
>   --mode=*) mode="$optarg" ;;
> 
>+  --preserve-dup-deps) duplicate_deps="yes" ;;
>+
>   --quiet | --silent)
>     show=:
>+    preserve_args="$preserve_args $arg"
>+    ;;
>+
>+  --tag)
>+    prevopt="--tag"
>+    prev=tag
>+    preserve_args="$preserve_args --tag"
>+    ;;
>+  --tag=*)
>+    set tag "$optarg" ${1+"$@"}
>+    shift
>+    prev=tag
>+    preserve_args="$preserve_args --tag"
>     ;;
> 
>   -dlopen)
>@@ -189,7 +548,7 @@
>   -*)
>     $echo "$modename: unrecognized option \`$arg'" 1>&2
>     $echo "$help" 1>&2
>-    exit 1
>+    exit $EXIT_FAILURE
>     ;;
> 
>   *)
>@@ -202,9 +561,21 @@
> if test -n "$prevopt"; then
>   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
>   $echo "$help" 1>&2
>-  exit 1
>+  exit $EXIT_FAILURE
> fi
> 
>+case $disable_libs in
>+no) 
>+  ;;
>+shared)
>+  build_libtool_libs=no
>+  build_old_libs=yes
>+  ;;
>+static)
>+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
>+  ;;
>+esac
>+
> # If this variable is set in any of the actions, the command in it
> # will be execed at the end.  This prevents here-documents from being
> # left over by shells.
>@@ -214,8 +585,10 @@
> 
>   # Infer the operation mode.
>   if test -z "$mode"; then
>+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
>+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
>     case $nonopt in
>-    *cc | *++ | gcc* | *-gcc*)
>+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
>       mode=link
>       for arg
>       do
>@@ -256,7 +629,7 @@
>   if test -n "$execute_dlfiles" && test "$mode" != execute; then
>     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
>     $echo "$help" 1>&2
>-    exit 1
>+    exit $EXIT_FAILURE
>   fi
> 
>   # Change the help message to a mode-specific one.
>@@ -270,158 +643,127 @@
>     modename="$modename: compile"
>     # Get the compilation command and the source file.
>     base_compile=
>-    prev=
>-    lastarg=
>-    srcfile="$nonopt"
>+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
>+    suppress_opt=yes
>     suppress_output=
>+    arg_mode=normal
>+    libobj=
>+    later=
> 
>-    user_target=no
>     for arg
>     do
>-      case $prev in
>-      "") ;;
>-      xcompiler)
>-	# Aesthetically quote the previous argument.
>-	prev=
>-	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
>-
>-	case $arg in
>-	# Double-quote args containing other shell metacharacters.
>-	# Many Bourne shells cannot handle close brackets correctly
>-	# in scan sets, so we specify it separately.
>-	*[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>-	  arg="\"$arg\""
>-	  ;;
>-	esac
>-
>-	# Add the previous argument to base_compile.
>-	if test -z "$base_compile"; then
>-	  base_compile="$lastarg"
>-	else
>-	  base_compile="$base_compile $lastarg"
>-	fi
>-	continue
>-	;;
>-      esac
>-
>-      # Accept any command-line options.
>-      case $arg in
>-      -o)
>-	if test "$user_target" != "no"; then
>-	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
>-	  exit 1
>-	fi
>-	user_target=next
>+      case $arg_mode in
>+      arg  )
>+	# do not "continue".  Instead, add this to base_compile
>+	lastarg="$arg"
>+	arg_mode=normal
> 	;;
> 
>-      -static)
>-	build_old_libs=yes
>+      target )
>+	libobj="$arg"
>+	arg_mode=normal
> 	continue
> 	;;
> 
>-      -prefer-pic)
>-	pic_mode=yes
>-	continue
>-	;;
>+      normal )
>+	# Accept any command-line options.
>+	case $arg in
>+	-o)
>+	  if test -n "$libobj" ; then
>+	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
>+	    exit $EXIT_FAILURE
>+	  fi
>+	  arg_mode=target
>+	  continue
>+	  ;;
> 
>-      -prefer-non-pic)
>-	pic_mode=no
>-	continue
>-	;;
>+	-static | -prefer-pic | -prefer-non-pic)
>+	  later="$later $arg"
>+	  continue
>+	  ;;
> 
>-      -Xcompiler)
>-	prev=xcompiler
>-	continue
>-	;;
>+	-no-suppress)
>+	  suppress_opt=no
>+	  continue
>+	  ;;
> 
>-      -Wc,*)
>-	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
>-	lastarg=
>-	save_ifs="$IFS"; IFS=','
>-	for arg in $args; do
>-	  IFS="$save_ifs"
>+	-Xcompiler)
>+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
>+	  continue      #  The current "srcfile" will either be retained or
>+	  ;;            #  replaced later.  I would guess that would be a bug.
>+
>+	-Wc,*)
>+	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
>+	  lastarg=
>+	  save_ifs="$IFS"; IFS=','
>+ 	  for arg in $args; do
>+	    IFS="$save_ifs"
> 
>-	  # Double-quote args containing other shell metacharacters.
>-	  # Many Bourne shells cannot handle close brackets correctly
>-	  # in scan sets, so we specify it separately.
>-	  case $arg in
>-	    *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>-	    arg="\"$arg\""
>-	    ;;
>-	  esac
>-	  lastarg="$lastarg $arg"
>-	done
>-	IFS="$save_ifs"
>-	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
>+	    # Double-quote args containing other shell metacharacters.
>+	    # Many Bourne shells cannot handle close brackets correctly
>+	    # in scan sets, so we specify it separately.
>+	    case $arg in
>+	      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>+	      arg="\"$arg\""
>+	      ;;
>+	    esac
>+	    lastarg="$lastarg $arg"
>+	  done
>+	  IFS="$save_ifs"
>+	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
> 
>-	# Add the arguments to base_compile.
>-	if test -z "$base_compile"; then
>-	  base_compile="$lastarg"
>-	else
>+	  # Add the arguments to base_compile.
> 	  base_compile="$base_compile $lastarg"
>-	fi
>-	continue
>-	;;
>-      esac
>+	  continue
>+	  ;;
> 
>-      case $user_target in
>-      next)
>-	# The next one is the -o target name
>-	user_target=yes
>-	continue
>-	;;
>-      yes)
>-	# We got the output file
>-	user_target=set
>-	libobj="$arg"
>-	continue
>+	* )
>+	  # Accept the current argument as the source file.
>+	  # The previous "srcfile" becomes the current argument.
>+	  #
>+	  lastarg="$srcfile"
>+	  srcfile="$arg"
>+	  ;;
>+	esac  #  case $arg
> 	;;
>-      esac
>-
>-      # Accept the current argument as the source file.
>-      lastarg="$srcfile"
>-      srcfile="$arg"
>+      esac    #  case $arg_mode
> 
>       # Aesthetically quote the previous argument.
>-
>-      # Backslashify any backslashes, double quotes, and dollar signs.
>-      # These are the only characters that are still specially
>-      # interpreted inside of double-quoted scrings.
>       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
> 
>+      case $lastarg in
>       # Double-quote args containing other shell metacharacters.
>       # Many Bourne shells cannot handle close brackets correctly
>-      # in scan sets, so we specify it separately.
>-      case $lastarg in
>+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
>+      # in scan sets (worked around with variable expansion),
>+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
>+      # at all, so we specify them separately.
>       *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
> 	lastarg="\"$lastarg\""
> 	;;
>       esac
> 
>-      # Add the previous argument to base_compile.
>-      if test -z "$base_compile"; then
>-	base_compile="$lastarg"
>-      else
>-	base_compile="$base_compile $lastarg"
>-      fi
>-    done
>+      base_compile="$base_compile $lastarg"
>+    done # for arg
> 
>-    case $user_target in
>-    set)
>+    case $arg_mode in
>+    arg)
>+      $echo "$modename: you must specify an argument for -Xcompile"
>+      exit $EXIT_FAILURE
>       ;;
>-    no)
>-      # Get the name of the library object.
>-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
>+    target)
>+      $echo "$modename: you must specify a target with \`-o'" 1>&2
>+      exit $EXIT_FAILURE
>       ;;
>     *)
>-      $echo "$modename: you must specify a target with \`-o'" 1>&2
>-      exit 1
>+      # Get the name of the library object.
>+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
>       ;;
>     esac
> 
>     # Recognize several different file suffixes.
>     # If the user specifies -o file.o, it is replaced with file.lo
>-    xform='[cCFSfmso]'
>+    xform='[cCFSifmso]'
>     case $libobj in
>     *.ada) xform=ada ;;
>     *.adb) xform=adb ;;
>@@ -429,10 +771,14 @@
>     *.asm) xform=asm ;;
>     *.c++) xform=c++ ;;
>     *.cc) xform=cc ;;
>+    *.ii) xform=ii ;;
>+    *.class) xform=class ;;
>     *.cpp) xform=cpp ;;
>     *.cxx) xform=cxx ;;
>     *.f90) xform=f90 ;;
>     *.for) xform=for ;;
>+    *.java) xform=java ;;
>+    *.obj) xform=obj ;;
>     esac
> 
>     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
>@@ -441,25 +787,63 @@
>     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
>     *)
>       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>       ;;
>     esac
> 
>+    func_infer_tag $base_compile
>+
>+    for arg in $later; do
>+      case $arg in
>+      -static)
>+	build_old_libs=yes
>+	continue
>+	;;
>+
>+      -prefer-pic)
>+	pic_mode=yes
>+	continue
>+	;;
>+
>+      -prefer-non-pic)
>+	pic_mode=no
>+	continue
>+	;;
>+      esac
>+    done
>+
>+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
>+    case $qlibobj in
>+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>+	qlibobj="\"$qlibobj\"" ;;
>+    esac
>+    test "X$libobj" != "X$qlibobj" \
>+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
>+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
>+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
>+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
>+    if test "X$xdir" = "X$obj"; then
>+      xdir=
>+    else
>+      xdir=$xdir/
>+    fi
>+    lobj=${xdir}$objdir/$objname
>+
>     if test -z "$base_compile"; then
>       $echo "$modename: you must specify a compilation command" 1>&2
>       $echo "$help" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>     fi
> 
>     # Delete any leftover library objects.
>     if test "$build_old_libs" = yes; then
>-      removelist="$obj $libobj"
>+      removelist="$obj $lobj $libobj ${libobj}T"
>     else
>-      removelist="$libobj"
>+      removelist="$lobj $libobj ${libobj}T"
>     fi
> 
>     $run $rm $removelist
>-    trap "$run $rm $removelist; exit 1" 1 2 15
>+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
> 
>     # On Cygwin there's no "real" PIC flag so we must build both object types
>     case $host_os in
>@@ -467,7 +851,7 @@
>       pic_mode=default
>       ;;
>     esac
>-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
>+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
>       # non-PIC code in shared libraries is not supported
>       pic_mode=default
>     fi
>@@ -478,8 +862,9 @@
>       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
>       lockfile="$output_obj.lock"
>       removelist="$removelist $output_obj $lockfile"
>-      trap "$run $rm $removelist; exit 1" 1 2 15
>+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
>     else
>+      output_obj=
>       need_locks=no
>       lockfile=
>     fi
>@@ -487,13 +872,13 @@
>     # Lock this critical section if it is needed
>     # We use this script file to make the link, it avoids creating a new file
>     if test "$need_locks" = yes; then
>-      until $run ln "$0" "$lockfile" 2>/dev/null; do
>+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
> 	$show "Waiting for $lockfile to be removed"
> 	sleep 2
>       done
>     elif test "$need_locks" = warn; then
>       if test -f "$lockfile"; then
>-	echo "\
>+	$echo "\
> *** ERROR, $lockfile exists and contains:
> `cat $lockfile 2>/dev/null`
> 
>@@ -505,14 +890,33 @@
> compiler."
> 
> 	$run $rm $removelist
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
>-      echo $srcfile > "$lockfile"
>+      $echo "$srcfile" > "$lockfile"
>     fi
> 
>     if test -n "$fix_srcfile_path"; then
>       eval srcfile=\"$fix_srcfile_path\"
>     fi
>+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
>+    case $qsrcfile in
>+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>+      qsrcfile="\"$qsrcfile\"" ;;
>+    esac
>+
>+    $run $rm "$libobj" "${libobj}T"
>+
>+    # Create a libtool object file (analogous to a ".la" file),
>+    # but don't create it if we're doing a dry run.
>+    test -z "$run" && cat > ${libobj}T <<EOF
>+# $libobj - a libtool object file
>+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
>+#
>+# Please DO NOT delete this file!
>+# It is necessary for linking the library.
>+
>+# Name of the PIC object.
>+EOF
> 
>     # Only build a PIC object if we are building libtool libraries.
>     if test "$build_libtool_libs" = yes; then
>@@ -520,53 +924,38 @@
>       fbsd_hideous_sh_bug=$base_compile
> 
>       if test "$pic_mode" != no; then
>-	# All platforms use -DPIC, to notify preprocessed assembler code.
>-	command="$base_compile $srcfile $pic_flag -DPIC"
>+	command="$base_compile $qsrcfile $pic_flag"
>       else
> 	# Don't build PIC code
>-	command="$base_compile $srcfile"
>+	command="$base_compile $qsrcfile"
>       fi
>-      if test "$build_old_libs" = yes; then
>-	lo_libobj="$libobj"
>-	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
>-	if test "X$dir" = "X$libobj"; then
>-	  dir="$objdir"
>-	else
>-	  dir="$dir/$objdir"
>-	fi
>-	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
> 
>-	if test -d "$dir"; then
>-	  $show "$rm $libobj"
>-	  $run $rm $libobj
>-	else
>-	  $show "$mkdir $dir"
>-	  $run $mkdir $dir
>-	  status=$?
>-	  if test $status -ne 0 && test ! -d $dir; then
>-	    exit $status
>-	  fi
>+      if test ! -d "${xdir}$objdir"; then
>+	$show "$mkdir ${xdir}$objdir"
>+	$run $mkdir ${xdir}$objdir
>+	exit_status=$?
>+	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
>+	  exit $exit_status
> 	fi
>       fi
>-      if test "$compiler_o_lo" = yes; then
>-	output_obj="$libobj"
>-	command="$command -o $output_obj"
>-      elif test "$compiler_c_o" = yes; then
>-	output_obj="$obj"
>-	command="$command -o $output_obj"
>+
>+      if test -z "$output_obj"; then
>+	# Place PIC objects in $objdir
>+	command="$command -o $lobj"
>       fi
> 
>-      $run $rm "$output_obj"
>+      $run $rm "$lobj" "$output_obj"
>+
>       $show "$command"
>       if $run eval "$command"; then :
>       else
> 	test -n "$output_obj" && $run $rm $removelist
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
> 
>       if test "$need_locks" = warn &&
>-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
>-	echo "\
>+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
>+	$echo "\
> *** ERROR, $lockfile contains:
> `cat $lockfile 2>/dev/null`
> 
>@@ -581,13 +970,13 @@
> compiler."
> 
> 	$run $rm $removelist
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
> 
>       # Just move the object if needed, then go on to compile the next one
>-      if test x"$output_obj" != x"$libobj"; then
>-	$show "$mv $output_obj $libobj"
>-	if $run $mv $output_obj $libobj; then :
>+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
>+	$show "$mv $output_obj $lobj"
>+	if $run $mv $output_obj $lobj; then :
> 	else
> 	  error=$?
> 	  $run $rm $removelist
>@@ -595,77 +984,50 @@
> 	fi
>       fi
> 
>-      # If we have no pic_flag, then copy the object into place and finish.
>-      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
>-	 test "$build_old_libs" = yes; then
>-	# Rename the .lo from within objdir to obj
>-	if test -f $obj; then
>-	  $show $rm $obj
>-	  $run $rm $obj
>-	fi
>+      # Append the name of the PIC object to the libtool object file.
>+      test -z "$run" && cat >> ${libobj}T <<EOF
>+pic_object='$objdir/$objname'
> 
>-	$show "$mv $libobj $obj"
>-	if $run $mv $libobj $obj; then :
>-	else
>-	  error=$?
>-	  $run $rm $removelist
>-	  exit $error
>-	fi
>+EOF
> 
>-	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
>-	if test "X$xdir" = "X$obj"; then
>-	  xdir="."
>-	else
>-	  xdir="$xdir"
>-	fi
>-	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
>-	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
>-	# Now arrange that obj and lo_libobj become the same file
>-	$show "(cd $xdir && $LN_S $baseobj $libobj)"
>-	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
>-	  # Unlock the critical section if it was locked
>-	  if test "$need_locks" != no; then
>-	    $run $rm "$lockfile"
>-	  fi
>-	  exit 0
>-	else
>-	  error=$?
>-	  $run $rm $removelist
>-	  exit $error
>-	fi
>+      # Allow error messages only from the first compilation.
>+      if test "$suppress_opt" = yes; then
>+        suppress_output=' >/dev/null 2>&1'
>       fi
>+    else
>+      # No PIC object so indicate it doesn't exist in the libtool
>+      # object file.
>+      test -z "$run" && cat >> ${libobj}T <<EOF
>+pic_object=none
> 
>-      # Allow error messages only from the first compilation.
>-      suppress_output=' >/dev/null 2>&1'
>+EOF
>     fi
> 
>     # Only build a position-dependent object if we build old libraries.
>     if test "$build_old_libs" = yes; then
>       if test "$pic_mode" != yes; then
> 	# Don't build PIC code
>-	command="$base_compile $srcfile"
>+	command="$base_compile $qsrcfile"
>       else
>-	# All platforms use -DPIC, to notify preprocessed assembler code.
>-	command="$base_compile $srcfile $pic_flag -DPIC"
>+	command="$base_compile $qsrcfile $pic_flag"
>       fi
>       if test "$compiler_c_o" = yes; then
> 	command="$command -o $obj"
>-	output_obj="$obj"
>       fi
> 
>       # Suppress compiler output if we already did a PIC compilation.
>       command="$command$suppress_output"
>-      $run $rm "$output_obj"
>+      $run $rm "$obj" "$output_obj"
>       $show "$command"
>       if $run eval "$command"; then :
>       else
> 	$run $rm $removelist
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
> 
>       if test "$need_locks" = warn &&
>-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
>-	echo "\
>+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
>+	$echo "\
> *** ERROR, $lockfile contains:
> `cat $lockfile 2>/dev/null`
> 
>@@ -680,11 +1042,11 @@
> compiler."
> 
> 	$run $rm $removelist
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
> 
>       # Just move the object if needed
>-      if test x"$output_obj" != x"$obj"; then
>+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
> 	$show "$mv $output_obj $obj"
> 	if $run $mv $output_obj $obj; then :
> 	else
>@@ -694,29 +1056,31 @@
> 	fi
>       fi
> 
>-      # Create an invalid libtool object if no PIC, so that we do not
>-      # accidentally link it into a program.
>-      if test "$build_libtool_libs" != yes; then
>-	$show "echo timestamp > $libobj"
>-	$run eval "echo timestamp > \$libobj" || exit $?
>-      else
>-	# Move the .lo from within objdir
>-	$show "$mv $libobj $lo_libobj"
>-	if $run $mv $libobj $lo_libobj; then :
>-	else
>-	  error=$?
>-	  $run $rm $removelist
>-	  exit $error
>-	fi
>-      fi
>+      # Append the name of the non-PIC object the libtool object file.
>+      # Only append if the libtool object file exists.
>+      test -z "$run" && cat >> ${libobj}T <<EOF
>+# Name of the non-PIC object.
>+non_pic_object='$objname'
>+
>+EOF
>+    else
>+      # Append the name of the non-PIC object the libtool object file.
>+      # Only append if the libtool object file exists.
>+      test -z "$run" && cat >> ${libobj}T <<EOF
>+# Name of the non-PIC object.
>+non_pic_object=none
>+
>+EOF
>     fi
> 
>+    $run $mv "${libobj}T" "${libobj}"
>+
>     # Unlock the critical section if it was locked
>     if test "$need_locks" != no; then
>       $run $rm "$lockfile"
>     fi
> 
>-    exit 0
>+    exit $EXIT_SUCCESS
>     ;;
> 
>   # libtool link mode
>@@ -727,7 +1091,7 @@
>       # It is impossible to link a dll without this setting, and
>       # we shouldn't force the makefile maintainer to figure out
>       # which system we are compiling for in order to pass an extra
>-      # flag for every libtool invokation.
>+      # flag for every libtool invocation.
>       # allow_undefined=no
> 
>       # FIXME: Unfortunately, there are problems with the above when trying
>@@ -742,6 +1106,7 @@
>       ;;
>     esac
>     libtool_args="$nonopt"
>+    base_compile="$nonopt $@"
>     compile_command="$nonopt"
>     finalize_command="$nonopt"
> 
>@@ -757,6 +1122,7 @@
>     linker_flags=
>     dllsearchpath=
>     lib_search_path=`pwd`
>+    inst_prefix_dir=
> 
>     avoid_version=no
>     dlfiles=
>@@ -771,6 +1137,9 @@
>     module=no
>     no_install=no
>     objs=
>+    non_pic_objects=
>+    notinst_path= # paths that contain not-installed libtool libraries
>+    precious_files_regex=
>     prefer_static_libs=no
>     preload=no
>     prev=
>@@ -782,27 +1151,40 @@
>     temp_rpath=
>     thread_safe=no
>     vinfo=
>+    vinfo_number=no
>+
>+    func_infer_tag $base_compile
> 
>     # We need to know -static, to get the right output filenames.
>     for arg
>     do
>       case $arg in
>-      -all-static | -static)
>-	if test "X$arg" = "X-all-static"; then
>+      -all-static | -static | -static-libtool-libs)
>+    case $arg in
>+    -all-static)
> 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
> 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
> 	  fi
> 	  if test -n "$link_static_flag"; then
> 	    dlopen_self=$dlopen_self_static
> 	  fi
>-	else
>+	  prefer_static_libs=yes
>+	  ;;
>+    -static)
> 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
> 	    dlopen_self=$dlopen_self_static
> 	  fi
>-	fi
>+	  prefer_static_libs=built
>+	  ;;
>+    -static-libtool-libs)
>+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
>+        dlopen_self=$dlopen_self_static
>+      fi
>+      prefer_static_libs=yes
>+      ;;
>+    esac
> 	build_libtool_libs=no
> 	build_old_libs=yes
>-	prefer_static_libs=yes
> 	break
> 	;;
>       esac
>@@ -812,7 +1194,7 @@
>     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
> 
>     # Go through the arguments, transforming them on the way.
>-    while test $# -gt 0; do
>+    while test "$#" -gt 0; do
>       arg="$1"
>       shift
>       case $arg in
>@@ -877,7 +1259,7 @@
> 	  export_symbols="$arg"
> 	  if test ! -f "$arg"; then
> 	    $echo "$modename: symbol file \`$arg' does not exist"
>-	    exit 1
>+	    exit $EXIT_FAILURE
> 	  fi
> 	  prev=
> 	  continue
>@@ -887,18 +1269,140 @@
> 	  prev=
> 	  continue
> 	  ;;
>+	inst_prefix)
>+	  inst_prefix_dir="$arg"
>+	  prev=
>+	  continue
>+	  ;;
>+	precious_regex)
>+	  precious_files_regex="$arg"
>+	  prev=
>+	  continue
>+	  ;;
> 	release)
> 	  release="-$arg"
> 	  prev=
> 	  continue
> 	  ;;
>+	objectlist)
>+	  if test -f "$arg"; then
>+	    save_arg=$arg
>+	    moreargs=
>+	    for fil in `cat $save_arg`
>+	    do
>+#	      moreargs="$moreargs $fil"
>+	      arg=$fil
>+	      # A libtool-controlled object.
>+
>+	      # Check to see that this really is a libtool object.
>+	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+		pic_object=
>+		non_pic_object=
>+
>+		# Read the .lo file
>+		# If there is no directory component, then add one.
>+		case $arg in
>+		*/* | *\\*) . $arg ;;
>+		*) . ./$arg ;;
>+		esac
>+
>+		if test -z "$pic_object" || \
>+		   test -z "$non_pic_object" ||
>+		   test "$pic_object" = none && \
>+		   test "$non_pic_object" = none; then
>+		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
>+		  exit $EXIT_FAILURE
>+		fi
>+
>+		# Extract subdirectory from the argument.
>+		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
>+		if test "X$xdir" = "X$arg"; then
>+		  xdir=
>+		else
>+		  xdir="$xdir/"
>+		fi
>+
>+		if test "$pic_object" != none; then
>+		  # Prepend the subdirectory the object is found in.
>+		  pic_object="$xdir$pic_object"
>+
>+		  if test "$prev" = dlfiles; then
>+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
>+		      dlfiles="$dlfiles $pic_object"
>+		      prev=
>+		      continue
>+		    else
>+		      # If libtool objects are unsupported, then we need to preload.
>+		      prev=dlprefiles
>+		    fi
>+		  fi
>+
>+		  # CHECK ME:  I think I busted this.  -Ossama
>+		  if test "$prev" = dlprefiles; then
>+		    # Preload the old-style object.
>+		    dlprefiles="$dlprefiles $pic_object"
>+		    prev=
>+		  fi
>+
>+		  # A PIC object.
>+		  libobjs="$libobjs $pic_object"
>+		  arg="$pic_object"
>+		fi
>+
>+		# Non-PIC object.
>+		if test "$non_pic_object" != none; then
>+		  # Prepend the subdirectory the object is found in.
>+		  non_pic_object="$xdir$non_pic_object"
>+
>+		  # A standard non-PIC object
>+		  non_pic_objects="$non_pic_objects $non_pic_object"
>+		  if test -z "$pic_object" || test "$pic_object" = none ; then
>+		    arg="$non_pic_object"
>+		  fi
>+		else
>+		  # If the PIC object exists, use it instead.
>+		  # $xdir was prepended to $pic_object above.
>+		  non_pic_object="$pic_object"
>+		  non_pic_objects="$non_pic_objects $non_pic_object"
>+		fi
>+	      else
>+		# Only an error if not doing a dry-run.
>+		if test -z "$run"; then
>+		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
>+		  exit $EXIT_FAILURE
>+		else
>+		  # Dry-run case.
>+
>+		  # Extract subdirectory from the argument.
>+		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
>+		  if test "X$xdir" = "X$arg"; then
>+		    xdir=
>+		  else
>+		    xdir="$xdir/"
>+		  fi
>+
>+		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
>+		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
>+		  libobjs="$libobjs $pic_object"
>+		  non_pic_objects="$non_pic_objects $non_pic_object"
>+		fi
>+	      fi
>+	    done
>+	  else
>+	    $echo "$modename: link input file \`$save_arg' does not exist"
>+	    exit $EXIT_FAILURE
>+	  fi
>+	  arg=$save_arg
>+	  prev=
>+	  continue
>+	  ;;
> 	rpath | xrpath)
> 	  # We need an absolute path.
> 	  case $arg in
> 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
> 	  *)
> 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
>-	    exit 1
>+	    exit $EXIT_FAILURE
> 	    ;;
> 	  esac
> 	  if test "$prev" = rpath; then
>@@ -930,13 +1434,33 @@
> 	  finalize_command="$finalize_command $wl$qarg"
> 	  continue
> 	  ;;
>+	xcclinker)
>+	  linker_flags="$linker_flags $qarg"
>+	  compiler_flags="$compiler_flags $qarg"
>+	  prev=
>+	  compile_command="$compile_command $qarg"
>+	  finalize_command="$finalize_command $qarg"
>+	  continue
>+	  ;;
>+	shrext)
>+  	  shrext_cmds="$arg"
>+	  prev=
>+	  continue
>+	  ;;
>+	darwin_framework|darwin_framework_skip)
>+	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
>+	  compile_command="$compile_command $arg"
>+	  finalize_command="$finalize_command $arg"
>+	  prev=
>+	  continue
>+	  ;;
> 	*)
> 	  eval "$prev=\"\$arg\""
> 	  prev=
> 	  continue
> 	  ;;
> 	esac
>-      fi # test -n $prev
>+      fi # test -n "$prev"
> 
>       prevarg="$arg"
> 
>@@ -978,7 +1502,7 @@
>       -export-symbols | -export-symbols-regex)
> 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
> 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 	if test "X$arg" = "X-export-symbols"; then
> 	  prev=expsyms
>@@ -988,11 +1512,28 @@
> 	continue
> 	;;
> 
>+      -framework|-arch|-isysroot)
>+	case " $CC " in
>+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
>+		prev=darwin_framework_skip ;;
>+	  *) compiler_flags="$compiler_flags $arg"
>+	     prev=darwin_framework ;;
>+	esac
>+	compile_command="$compile_command $arg"
>+	finalize_command="$finalize_command $arg"
>+	continue
>+	;;
>+
>+      -inst-prefix-dir)
>+	prev=inst_prefix
>+	continue
>+	;;
>+
>       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
>       # so, if we see these flags be careful not to treat them like -L
>       -L[A-Z][A-Z]*:*)
> 	case $with_gcc/$host in
>-	no/*-*-irix*)
>+	no/*-*-irix* | /*-*-irix*)
> 	  compile_command="$compile_command $arg"
> 	  finalize_command="$finalize_command $arg"
> 	  ;;
>@@ -1009,7 +1550,8 @@
> 	  absdir=`cd "$dir" && pwd`
> 	  if test -z "$absdir"; then
> 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
>-	    exit 1
>+	    absdir="$dir"
>+	    notinst_path="$notinst_path $dir"
> 	  fi
> 	  dir="$absdir"
> 	  ;;
>@@ -1023,10 +1565,15 @@
> 	esac
> 	case $host in
> 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
>+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
> 	  case :$dllsearchpath: in
> 	  *":$dir:"*) ;;
> 	  *) dllsearchpath="$dllsearchpath:$dir";;
> 	  esac
>+	  case :$dllsearchpath: in
>+	  *":$testbindir:"*) ;;
>+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
>+	  esac
> 	  ;;
> 	esac
> 	continue
>@@ -1035,36 +1582,98 @@
>       -l*)
> 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
> 	  case $host in
>-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
>+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
> 	    # These systems don't actually have a C or math library (as such)
> 	    continue
> 	    ;;
>-	  *-*-mingw* | *-*-os2*)
>+	  *-*-os2*)
> 	    # These systems don't actually have a C library (as such)
> 	    test "X$arg" = "X-lc" && continue
> 	    ;;
>-	  *-*-openbsd*)
>+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
> 	    # Do not include libc due to us having libc/libc_r.
> 	    test "X$arg" = "X-lc" && continue
> 	    ;;
>-	  esac
>-	 elif test "X$arg" = "X-lc_r"; then
>-	  case $host in
>-	  *-*-openbsd*)
>-	    # Do not include libc_r directly, use -pthread flag.
>+	  *-*-rhapsody* | *-*-darwin1.[012])
>+	    # Rhapsody C and math libraries are in the System framework
>+	    deplibs="$deplibs -framework System"
> 	    continue
> 	    ;;
>+	  *-*-sco3.2v5* | *-*-sco5v6*)
>+	    # Causes problems with __ctype
>+	    test "X$arg" = "X-lc" && continue
>+	    ;;
>+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
>+	    # Compiler inserts libc in the correct place for threads to work
>+	    test "X$arg" = "X-lc" && continue
>+	    ;;
> 	  esac
>+	elif test "X$arg" = "X-lc_r"; then
>+	 case $host in
>+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
>+	   # Do not include libc_r directly, use -pthread flag.
>+	   continue
>+	   ;;
>+	 esac
> 	fi
> 	deplibs="$deplibs $arg"
> 	continue
> 	;;
> 
>+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
>+      # classes, name mangling, and exception handling.
>+      -model)
>+	compile_command="$compile_command $arg"
>+	compiler_flags="$compiler_flags $arg"
>+	finalize_command="$finalize_command $arg"
>+	prev=xcompiler
>+	continue
>+	;;
>+
>+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
>+	compiler_flags="$compiler_flags $arg"
>+	compile_command="$compile_command $arg"
>+	finalize_command="$finalize_command $arg"
>+	continue
>+	;;
>+
>       -module)
> 	module=yes
> 	continue
> 	;;
> 
>+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
>+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
>+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
>+      # +DA*, +DD* enable 64-bit mode on the HP compiler
>+      # -q* pass through compiler args for the IBM compiler
>+      # -m* pass through architecture-specific compiler args for GCC
>+      # -m*, -t[45]*, -txscale* pass through architecture-specific
>+      # compiler args for GCC
>+      # -pg pass through profiling flag for GCC
>+      # @file GCC response files
>+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
>+      -t[45]*|-txscale*|@*)
>+
>+	# Unknown arguments in both finalize_command and compile_command need
>+	# to be aesthetically quoted because they are evaled later.
>+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
>+	case $arg in
>+	*[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>+	  arg="\"$arg\""
>+	  ;;
>+	esac
>+        compile_command="$compile_command $arg"
>+        finalize_command="$finalize_command $arg"
>+        compiler_flags="$compiler_flags $arg"
>+        continue
>+        ;;
>+
>+      -shrext)
>+	prev=shrext
>+	continue
>+	;;
>+
>       -no-fast-install)
> 	fast_install=no
> 	continue
>@@ -1089,8 +1698,18 @@
> 	continue
> 	;;
> 
>+      -objectlist)
>+	prev=objectlist
>+	continue
>+	;;
>+
>       -o) prev=output ;;
> 
>+      -precious-files-regex)
>+	prev=precious_regex
>+	continue
>+	;;
>+
>       -release)
> 	prev=release
> 	continue
>@@ -1113,7 +1732,7 @@
> 	[\\/]* | [A-Za-z]:[\\/]*) ;;
> 	*)
> 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
> 	case "$xrpath " in
>@@ -1123,7 +1742,7 @@
> 	continue
> 	;;
> 
>-      -static)
>+      -static | -static-libtool-libs)
> 	# The effects of -static are defined in a previous loop.
> 	# We used to do the same as -all-static on platforms that
> 	# didn't have a PIC flag, but the assumption that the effects
>@@ -1141,6 +1760,11 @@
> 	prev=vinfo
> 	continue
> 	;;
>+      -version-number)
>+	prev=vinfo
>+	vinfo_number=yes
>+	continue
>+	;;
> 
>       -Wc,*)
> 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
>@@ -1189,6 +1813,11 @@
> 	continue
> 	;;
> 
>+      -XCClinker)
>+	prev=xcclinker
>+	continue
>+	;;
>+
>       # Some other compiler flag.
>       -* | +*)
> 	# Unknown arguments in both finalize_command and compile_command need
>@@ -1201,29 +1830,106 @@
> 	esac
> 	;;
> 
>-      *.lo | *.$objext)
>-	# A library or standard object.
>-	if test "$prev" = dlfiles; then
>-	  # This file was specified with -dlopen.
>-	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
>-	    dlfiles="$dlfiles $arg"
>-	    prev=
>-	    continue
>-	  else
>-	    # If libtool objects are unsupported, then we need to preload.
>-	    prev=dlprefiles
>-	  fi
>-	fi
>+      *.$objext)
>+	# A standard object.
>+	objs="$objs $arg"
>+	;;
> 
>-	if test "$prev" = dlprefiles; then
>-	  # Preload the old-style object.
>-	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
>-	  prev=
>-	else
>+      *.lo)
>+	# A libtool-controlled object.
>+
>+	# Check to see that this really is a libtool object.
>+	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+	  pic_object=
>+	  non_pic_object=
>+
>+	  # Read the .lo file
>+	  # If there is no directory component, then add one.
> 	  case $arg in
>-	  *.lo) libobjs="$libobjs $arg" ;;
>-	  *) objs="$objs $arg" ;;
>+	  */* | *\\*) . $arg ;;
>+	  *) . ./$arg ;;
> 	  esac
>+
>+	  if test -z "$pic_object" || \
>+	     test -z "$non_pic_object" ||
>+	     test "$pic_object" = none && \
>+	     test "$non_pic_object" = none; then
>+	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
>+	    exit $EXIT_FAILURE
>+	  fi
>+
>+	  # Extract subdirectory from the argument.
>+	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
>+	  if test "X$xdir" = "X$arg"; then
>+	    xdir=
>+ 	  else
>+	    xdir="$xdir/"
>+	  fi
>+
>+	  if test "$pic_object" != none; then
>+	    # Prepend the subdirectory the object is found in.
>+	    pic_object="$xdir$pic_object"
>+
>+	    if test "$prev" = dlfiles; then
>+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
>+		dlfiles="$dlfiles $pic_object"
>+		prev=
>+		continue
>+	      else
>+		# If libtool objects are unsupported, then we need to preload.
>+		prev=dlprefiles
>+	      fi
>+	    fi
>+
>+	    # CHECK ME:  I think I busted this.  -Ossama
>+	    if test "$prev" = dlprefiles; then
>+	      # Preload the old-style object.
>+	      dlprefiles="$dlprefiles $pic_object"
>+	      prev=
>+	    fi
>+
>+	    # A PIC object.
>+	    libobjs="$libobjs $pic_object"
>+	    arg="$pic_object"
>+	  fi
>+
>+	  # Non-PIC object.
>+	  if test "$non_pic_object" != none; then
>+	    # Prepend the subdirectory the object is found in.
>+	    non_pic_object="$xdir$non_pic_object"
>+
>+	    # A standard non-PIC object
>+	    non_pic_objects="$non_pic_objects $non_pic_object"
>+	    if test -z "$pic_object" || test "$pic_object" = none ; then
>+	      arg="$non_pic_object"
>+	    fi
>+	  else
>+	    # If the PIC object exists, use it instead.
>+	    # $xdir was prepended to $pic_object above.
>+	    non_pic_object="$pic_object"
>+	    non_pic_objects="$non_pic_objects $non_pic_object"
>+	  fi
>+	else
>+	  # Only an error if not doing a dry-run.
>+	  if test -z "$run"; then
>+	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
>+	    exit $EXIT_FAILURE
>+	  else
>+	    # Dry-run case.
>+
>+	    # Extract subdirectory from the argument.
>+	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
>+	    if test "X$xdir" = "X$arg"; then
>+	      xdir=
>+	    else
>+	      xdir="$xdir/"
>+	    fi
>+
>+	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
>+	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
>+	    libobjs="$libobjs $pic_object"
>+	    non_pic_objects="$non_pic_objects $non_pic_object"
>+	  fi
> 	fi
> 	;;
> 
>@@ -1274,7 +1980,7 @@
>     if test -n "$prev"; then
>       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
>       $echo "$help" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>     fi
> 
>     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
>@@ -1283,6 +1989,7 @@
>       finalize_command="$finalize_command $arg"
>     fi
> 
>+    oldlibs=
>     # calculate the name of the file, without its directory
>     outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
>     libobjs_save="$libobjs"
>@@ -1303,12 +2010,12 @@
>       output_objdir="$output_objdir/$objdir"
>     fi
>     # Create the object directory.
>-    if test ! -d $output_objdir; then
>+    if test ! -d "$output_objdir"; then
>       $show "$mkdir $output_objdir"
>       $run $mkdir $output_objdir
>-      status=$?
>-      if test $status -ne 0 && test ! -d $output_objdir; then
>-	exit $status
>+      exit_status=$?
>+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
>+	exit $exit_status
>       fi
>     fi
> 
>@@ -1317,7 +2024,7 @@
>     "")
>       $echo "$modename: you must specify an output file" 1>&2
>       $echo "$help" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>       ;;
>     *.$libext) linkmode=oldlib ;;
>     *.lo | *.$objext) linkmode=obj ;;
>@@ -1325,22 +2032,52 @@
>     *) linkmode=prog ;; # Anything else should be a program.
>     esac
> 
>+    case $host in
>+    *cygwin* | *mingw* | *pw32*)
>+      # don't eliminate duplications in $postdeps and $predeps
>+      duplicate_compiler_generated_deps=yes
>+      ;;
>+    *)
>+      duplicate_compiler_generated_deps=$duplicate_deps
>+      ;;
>+    esac
>     specialdeplibs=
>+
>     libs=
>     # Find all interdependent deplibs by searching for libraries
>     # that are linked more than once (e.g. -la -lb -la)
>     for deplib in $deplibs; do
>-      case "$libs " in
>-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>-      esac
>+      if test "X$duplicate_deps" = "Xyes" ; then
>+	case "$libs " in
>+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>+	esac
>+      fi
>       libs="$libs $deplib"
>     done
>+
>+    if test "$linkmode" = lib; then
>+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
>+
>+      # Compute libraries that are listed more than once in $predeps
>+      # $postdeps and mark them as special (i.e., whose duplicates are
>+      # not to be eliminated).
>+      pre_post_deps=
>+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
>+	for pre_post_dep in $predeps $postdeps; do
>+	  case "$pre_post_deps " in
>+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
>+	  esac
>+	  pre_post_deps="$pre_post_deps $pre_post_dep"
>+	done
>+      fi
>+      pre_post_deps=
>+    fi
>+
>     deplibs=
>     newdependency_libs=
>     newlib_search_path=
>     need_relink=no # whether we're linking any uninstalled libtool libraries
>     notinst_deplibs= # not-installed libtool libraries
>-    notinst_path= # paths that contain not-installed libtool libraries
>     case $linkmode in
>     lib)
> 	passes="conv link"
>@@ -1349,7 +2086,7 @@
> 	  *.la) ;;
> 	  *)
> 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
>-	    exit 1
>+	    exit $EXIT_FAILURE
> 	    ;;
> 	  esac
> 	done
>@@ -1366,39 +2103,55 @@
> 	;;
>     esac
>     for pass in $passes; do
>-      if test $linkmode = prog; then
>-	# Determine which files to process
>+      if test "$linkmode,$pass" = "lib,link" ||
>+	 test "$linkmode,$pass" = "prog,scan"; then
>+	libs="$deplibs"
>+	deplibs=
>+      fi
>+      if test "$linkmode" = prog; then
> 	case $pass in
>-	dlopen)
>-	  libs="$dlfiles"
>-	  save_deplibs="$deplibs" # Collect dlpreopened libraries
>-	  deplibs=
>-	  ;;
>+	dlopen) libs="$dlfiles" ;;
> 	dlpreopen) libs="$dlprefiles" ;;
> 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
> 	esac
>       fi
>+      if test "$pass" = dlopen; then
>+	# Collect dlpreopened libraries
>+	save_deplibs="$deplibs"
>+	deplibs=
>+      fi
>       for deplib in $libs; do
> 	lib=
> 	found=no
> 	case $deplib in
>-	-l*)
>-	  if test $linkmode = oldlib && test $linkmode = obj; then
>-	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
>-	    continue
>+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
>+	  if test "$linkmode,$pass" = "prog,link"; then
>+	    compile_deplibs="$deplib $compile_deplibs"
>+	    finalize_deplibs="$deplib $finalize_deplibs"
>+	  else
>+	    compiler_flags="$compiler_flags $deplib"
> 	  fi
>-	  if test $pass = conv; then
>-	    deplibs="$deplib $deplibs"
>+	  continue
>+	  ;;
>+	-l*)
>+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
>+	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
> 	    continue
> 	  fi
> 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
> 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
>-	    # Search the libtool library
>-	    lib="$searchdir/lib${name}.la"
>-	    if test -f "$lib"; then
>-	      found=yes
>-	      break
>-	    fi
>+	    for search_ext in .la $std_shrext .so .a; do
>+	      # Search the libtool library
>+	      lib="$searchdir/lib${name}${search_ext}"
>+	      if test -f "$lib"; then
>+		if test "$search_ext" = ".la"; then
>+		  found=yes
>+		else
>+		  found=no
>+		fi
>+		break 2
>+	      fi
>+	    done
> 	  done
> 	  if test "$found" != yes; then
> 	    # deplib doesn't seem to be a libtool library
>@@ -1407,40 +2160,76 @@
> 	      finalize_deplibs="$deplib $finalize_deplibs"
> 	    else
> 	      deplibs="$deplib $deplibs"
>-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
>+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
> 	    fi
> 	    continue
>+	  else # deplib is a libtool library
>+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
>+	    # We need to do some special things here, and not later.
>+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
>+	      case " $predeps $postdeps " in
>+	      *" $deplib "*)
>+		if (${SED} -e '2q' $lib |
>+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+		  library_names=
>+		  old_library=
>+		  case $lib in
>+		  */* | *\\*) . $lib ;;
>+		  *) . ./$lib ;;
>+		  esac
>+		  for l in $old_library $library_names; do
>+		    ll="$l"
>+		  done
>+		  if test "X$ll" = "X$old_library" ; then # only static version available
>+		    found=no
>+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
>+		    test "X$ladir" = "X$lib" && ladir="."
>+		    lib=$ladir/$old_library
>+		    if test "$linkmode,$pass" = "prog,link"; then
>+		      compile_deplibs="$deplib $compile_deplibs"
>+		      finalize_deplibs="$deplib $finalize_deplibs"
>+		    else
>+		      deplibs="$deplib $deplibs"
>+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
>+		    fi
>+		    continue
>+		  fi
>+		fi
>+	        ;;
>+	      *) ;;
>+	      esac
>+	    fi
> 	  fi
> 	  ;; # -l
> 	-L*)
> 	  case $linkmode in
> 	  lib)
> 	    deplibs="$deplib $deplibs"
>-	    test $pass = conv && continue
>+	    test "$pass" = conv && continue
> 	    newdependency_libs="$deplib $newdependency_libs"
> 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
> 	    ;;
> 	  prog)
>-	    if test $pass = conv; then
>+	    if test "$pass" = conv; then
> 	      deplibs="$deplib $deplibs"
> 	      continue
> 	    fi
>-	    if test $pass = scan; then
>+	    if test "$pass" = scan; then
> 	      deplibs="$deplib $deplibs"
>-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
> 	    else
> 	      compile_deplibs="$deplib $compile_deplibs"
> 	      finalize_deplibs="$deplib $finalize_deplibs"
> 	    fi
>+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
> 	    ;;
> 	  *)
>-	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
>+	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
> 	    ;;
> 	  esac # linkmode
> 	  continue
> 	  ;; # -L
> 	-R*)
>-	  if test $pass = link; then
>+	  if test "$pass" = link; then
> 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
> 	    # Make sure the xrpath contains only unique directories.
> 	    case "$xrpath " in
>@@ -1453,28 +2242,45 @@
> 	  ;;
> 	*.la) lib="$deplib" ;;
> 	*.$libext)
>-	  if test $pass = conv; then
>+	  if test "$pass" = conv; then
> 	    deplibs="$deplib $deplibs"
> 	    continue
> 	  fi
> 	  case $linkmode in
> 	  lib)
>-	    if test "$deplibs_check_method" != pass_all; then
>-	      echo
>-	      echo "*** Warning: This library needs some functionality provided by $deplib."
>-	      echo "*** I have the capability to make that library automatically link in when"
>-	      echo "*** you link to this library.  But I can only do this if you have a"
>-	      echo "*** shared version of the library, which you do not appear to have."
>+	    valid_a_lib=no
>+	    case $deplibs_check_method in
>+	      match_pattern*)
>+		set dummy $deplibs_check_method
>+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"`
>+		if eval $echo \"$deplib\" 2>/dev/null \
>+		    | $SED 10q \
>+		    | $EGREP "$match_pattern_regex" > /dev/null; then
>+		  valid_a_lib=yes
>+		fi
>+		;;
>+	      pass_all)
>+		valid_a_lib=yes
>+		;;
>+            esac
>+	    if test "$valid_a_lib" != yes; then
>+	      $echo
>+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
>+	      $echo "*** I have the capability to make that library automatically link in when"
>+	      $echo "*** you link to this library.  But I can only do this if you have a"
>+	      $echo "*** shared version of the library, which you do not appear to have"
>+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
>+	      $echo "*** that it is just a static archive that I should not used here."
> 	    else
>-	      echo
>-	      echo "*** Warning: Linking the shared library $output against the"
>-	      echo "*** static library $deplib is not portable!"
>+	      $echo
>+	      $echo "*** Warning: Linking the shared library $output against the"
>+	      $echo "*** static library $deplib is not portable!"
> 	      deplibs="$deplib $deplibs"
> 	    fi
> 	    continue
> 	    ;;
> 	  prog)
>-	    if test $pass != link; then
>+	    if test "$pass" != link; then
> 	      deplibs="$deplib $deplibs"
> 	    else
> 	      compile_deplibs="$deplib $compile_deplibs"
>@@ -1485,14 +2291,18 @@
> 	  esac # linkmode
> 	  ;; # *.$libext
> 	*.lo | *.$objext)
>-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
>-	    # If there is no dlopen support or we're linking statically,
>-	    # we need to preload.
>-	    newdlprefiles="$newdlprefiles $deplib"
>-	    compile_deplibs="$deplib $compile_deplibs"
>-	    finalize_deplibs="$deplib $finalize_deplibs"
>-	  else
>-	    newdlfiles="$newdlfiles $deplib"
>+	  if test "$pass" = conv; then
>+	    deplibs="$deplib $deplibs"
>+	  elif test "$linkmode" = prog; then
>+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
>+	      # If there is no dlopen support or we're linking statically,
>+	      # we need to preload.
>+	      newdlprefiles="$newdlprefiles $deplib"
>+	      compile_deplibs="$deplib $compile_deplibs"
>+	      finalize_deplibs="$deplib $finalize_deplibs"
>+	    else
>+	      newdlfiles="$newdlfiles $deplib"
>+	    fi
> 	  fi
> 	  continue
> 	  ;;
>@@ -1501,17 +2311,17 @@
> 	  continue
> 	  ;;
> 	esac # case $deplib
>-	if test $found = yes || test -f "$lib"; then :
>+	if test "$found" = yes || test -f "$lib"; then :
> 	else
>-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
>-	  exit 1
>+	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
>+	  exit $EXIT_FAILURE
> 	fi
> 
> 	# Check to see that this really is a libtool archive.
>-	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
>+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
> 	else
> 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 
> 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
>@@ -1524,8 +2334,11 @@
> 	library_names=
> 	old_library=
> 	# If the library was installed with an old release of libtool,
>-	# it will not redefine variable installed.
>+	# it will not redefine variables installed, or shouldnotlink
> 	installed=yes
>+	shouldnotlink=no
>+	avoidtemprpath=
>+
> 
> 	# Read the .la file
> 	case $lib in
>@@ -1535,19 +2348,18 @@
> 
> 	if test "$linkmode,$pass" = "lib,link" ||
> 	   test "$linkmode,$pass" = "prog,scan" ||
>-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
>-	   # Add dl[pre]opened files of deplib
>+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
> 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
> 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
> 	fi
> 
>-	if test $pass = conv; then
>+	if test "$pass" = conv; then
> 	  # Only check for convenience libraries
> 	  deplibs="$lib $deplibs"
> 	  if test -z "$libdir"; then
> 	    if test -z "$old_library"; then
> 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
>-	      exit 1
>+	      exit $EXIT_FAILURE
> 	    fi
> 	    # It is a libtool convenience library, so add in its objects.
> 	    convenience="$convenience $ladir/$objdir/$old_library"
>@@ -1555,18 +2367,21 @@
> 	    tmp_libs=
> 	    for deplib in $dependency_libs; do
> 	      deplibs="$deplib $deplibs"
>-	      case "$tmp_libs " in
>-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>-	      esac
>+              if test "X$duplicate_deps" = "Xyes" ; then
>+	        case "$tmp_libs " in
>+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>+	        esac
>+              fi
> 	      tmp_libs="$tmp_libs $deplib"
> 	    done
>-	  elif test $linkmode != prog && test $linkmode != lib; then
>+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
> 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
>-	    exit 1
>+	    exit $EXIT_FAILURE
> 	  fi
> 	  continue
> 	fi # $pass = conv
> 
>+
> 	# Get the name of the library we link against.
> 	linklib=
> 	for l in $old_library $library_names; do
>@@ -1574,19 +2389,23 @@
> 	done
> 	if test -z "$linklib"; then
> 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 
> 	# This library was specified with -dlopen.
>-	if test $pass = dlopen; then
>+	if test "$pass" = dlopen; then
> 	  if test -z "$libdir"; then
> 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
>-	    exit 1
>+	    exit $EXIT_FAILURE
> 	  fi
>-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
>+	  if test -z "$dlname" ||
>+	     test "$dlopen_support" != yes ||
>+	     test "$build_libtool_libs" = no; then
> 	    # If there is no dlname, no dlopen support or we're linking
>-	    # statically, we need to preload.
>-	    dlprefiles="$dlprefiles $lib"
>+	    # statically, we need to preload.  We also need to preload any
>+	    # dependent libraries so libltdl's deplib preloader doesn't
>+	    # bomb out in the load deplibs phase.
>+	    dlprefiles="$dlprefiles $lib $dependency_libs"
> 	  else
> 	    newdlfiles="$newdlfiles $lib"
> 	  fi
>@@ -1618,19 +2437,27 @@
> 	    dir="$libdir"
> 	    absdir="$libdir"
> 	  fi
>+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
> 	else
>-	  dir="$ladir/$objdir"
>-	  absdir="$abs_ladir/$objdir"
>-	  # Remove this search path later
>-	  notinst_path="$notinst_path $abs_ladir"
>+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
>+	    dir="$ladir"
>+	    absdir="$abs_ladir"
>+	    # Remove this search path later
>+	    notinst_path="$notinst_path $abs_ladir"
>+	  else
>+	    dir="$ladir/$objdir"
>+	    absdir="$abs_ladir/$objdir"
>+	    # Remove this search path later
>+	    notinst_path="$notinst_path $abs_ladir"
>+	  fi
> 	fi # $installed = yes
> 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
> 
> 	# This library was specified with -dlpreopen.
>-	if test $pass = dlpreopen; then
>+	if test "$pass" = dlpreopen; then
> 	  if test -z "$libdir"; then
> 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
>-	    exit 1
>+	    exit $EXIT_FAILURE
> 	  fi
> 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
> 	  # are required to link).
>@@ -1646,18 +2473,19 @@
> 
> 	if test -z "$libdir"; then
> 	  # Link the convenience library
>-	  if test $linkmode = lib; then
>+	  if test "$linkmode" = lib; then
> 	    deplibs="$dir/$old_library $deplibs"
> 	  elif test "$linkmode,$pass" = "prog,link"; then
> 	    compile_deplibs="$dir/$old_library $compile_deplibs"
> 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
> 	  else
>-	    deplibs="$lib $deplibs"
>+	    deplibs="$lib $deplibs" # used for prog,scan pass
> 	  fi
> 	  continue
> 	fi
> 
>-	if test $linkmode = prog && test $pass != link; then
>+
>+	if test "$linkmode" = prog && test "$pass" != link; then
> 	  newlib_search_path="$newlib_search_path $ladir"
> 	  deplibs="$lib $deplibs"
> 
>@@ -1673,28 +2501,38 @@
> 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
> 	    esac
> 	    # Need to link against all dependency_libs?
>-	    if test $linkalldeplibs = yes; then
>+	    if test "$linkalldeplibs" = yes; then
> 	      deplibs="$deplib $deplibs"
> 	    else
> 	      # Need to hardcode shared library paths
> 	      # or/and link against static libraries
> 	      newdependency_libs="$deplib $newdependency_libs"
> 	    fi
>-	    case "$tmp_libs " in
>-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>-	    esac
>+	    if test "X$duplicate_deps" = "Xyes" ; then
>+	      case "$tmp_libs " in
>+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>+	      esac
>+	    fi
> 	    tmp_libs="$tmp_libs $deplib"
> 	  done # for deplib
> 	  continue
> 	fi # $linkmode = prog...
> 
>-	link_static=no # Whether the deplib will be linked statically
>-	if test -n "$library_names" &&
>-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
>-	  # Link against this shared library
>+	if test "$linkmode,$pass" = "prog,link"; then
>+	  if test -n "$library_names" &&
>+         { { test "$prefer_static_libs" = no ||
>+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
>+           test -z "$old_library"; }; then
>+	    # We need to hardcode the library path
>+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
>+	      # Make sure the rpath contains only unique directories.
>+	      case "$temp_rpath " in
>+	      *" $dir "*) ;;
>+	      *" $absdir "*) ;;
>+	      *) temp_rpath="$temp_rpath $absdir" ;;
>+	      esac
>+	    fi
> 
>-	  if test "$linkmode,$pass" = "prog,link" ||
>-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
> 	    # Hardcode the library path.
> 	    # Skip directories that are in the system default run-time
> 	    # search path.
>@@ -1716,17 +2554,6 @@
> 	      esac
> 	      ;;
> 	    esac
>-	    if test $linkmode = prog; then
>-	      # We need to hardcode the library path
>-	      if test -n "$shlibpath_var"; then
>-		# Make sure the rpath contains only unique directories.
>-		case "$temp_rpath " in
>-		*" $dir "*) ;;
>-		*" $absdir "*) ;;
>-		*) temp_rpath="$temp_rpath $dir" ;;
>-		esac
>-	      fi
>-	    fi
> 	  fi # $linkmode,$pass = prog,link...
> 
> 	  if test "$alldeplibs" = yes &&
>@@ -1736,11 +2563,56 @@
> 	    # We only need to search for static libraries
> 	    continue
> 	  fi
>+	fi
> 
>+	link_static=no # Whether the deplib will be linked statically
>+	use_static_libs=$prefer_static_libs
>+	if test "$use_static_libs" = built && test "$installed" = yes ; then
>+	  use_static_libs=no
>+	fi
>+	if test -n "$library_names" &&
>+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
> 	  if test "$installed" = no; then
> 	    notinst_deplibs="$notinst_deplibs $lib"
> 	    need_relink=yes
> 	  fi
>+	  # This is a shared library
>+
>+	  # Warn about portability, can't link against -module's on
>+	  # some systems (darwin)
>+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
>+	    $echo
>+	    if test "$linkmode" = prog; then
>+	      $echo "*** Warning: Linking the executable $output against the loadable module"
>+	    else
>+	      $echo "*** Warning: Linking the shared library $output against the loadable module"
>+	    fi
>+	    $echo "*** $linklib is not portable!"
>+	  fi
>+	  if test "$linkmode" = lib &&
>+	     test "$hardcode_into_libs" = yes; then
>+	    # Hardcode the library path.
>+	    # Skip directories that are in the system default run-time
>+	    # search path.
>+	    case " $sys_lib_dlsearch_path " in
>+	    *" $absdir "*) ;;
>+	    *)
>+	      case "$compile_rpath " in
>+	      *" $absdir "*) ;;
>+	      *) compile_rpath="$compile_rpath $absdir"
>+	      esac
>+	      ;;
>+	    esac
>+	    case " $sys_lib_dlsearch_path " in
>+	    *" $libdir "*) ;;
>+	    *)
>+	      case "$finalize_rpath " in
>+	      *" $libdir "*) ;;
>+	      *) finalize_rpath="$finalize_rpath $libdir"
>+	      esac
>+	      ;;
>+	    esac
>+	  fi
> 
> 	  if test -n "$old_archive_from_expsyms_cmds"; then
> 	    # figure out the soname
>@@ -1754,7 +2626,7 @@
> 	    elif test -n "$soname_spec"; then
> 	      # bleh windows
> 	      case $host in
>-	      *cygwin*)
>+	      *cygwin* | mingw*)
> 		major=`expr $current - $age`
> 		versuffix="-$major"
> 		;;
>@@ -1766,17 +2638,18 @@
> 
> 	    # Make a new name for the extract_expsyms_cmds to use
> 	    soroot="$soname"
>-	    soname=`echo $soroot | sed -e 's/^.*\///'`
>-	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
>+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
>+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
> 
> 	    # If the library has no export list, then create one now
> 	    if test -f "$output_objdir/$soname-def"; then :
> 	    else
> 	      $show "extracting exported symbol list from \`$soname'"
> 	      save_ifs="$IFS"; IFS='~'
>-	      eval cmds=\"$extract_expsyms_cmds\"
>+	      cmds=$extract_expsyms_cmds
> 	      for cmd in $cmds; do
> 		IFS="$save_ifs"
>+		eval cmd=\"$cmd\"
> 		$show "$cmd"
> 		$run eval "$cmd" || exit $?
> 	      done
>@@ -1787,9 +2660,10 @@
> 	    if test -f "$output_objdir/$newlib"; then :; else
> 	      $show "generating import library for \`$soname'"
> 	      save_ifs="$IFS"; IFS='~'
>-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
>+	      cmds=$old_archive_from_expsyms_cmds
> 	      for cmd in $cmds; do
> 		IFS="$save_ifs"
>+		eval cmd=\"$cmd\"
> 		$show "$cmd"
> 		$run eval "$cmd" || exit $?
> 	      done
>@@ -1798,9 +2672,9 @@
> 	    # make sure the library variables are pointing to the new library
> 	    dir=$output_objdir
> 	    linklib=$newlib
>-	  fi # test -n $old_archive_from_expsyms_cmds
>+	  fi # test -n "$old_archive_from_expsyms_cmds"
> 
>-	  if test $linkmode = prog || test "$mode" != relink; then
>+	  if test "$linkmode" = prog || test "$mode" != relink; then
> 	    add_shlibpath=
> 	    add_dir=
> 	    add=
>@@ -1809,6 +2683,26 @@
> 	    immediate | unsupported)
> 	      if test "$hardcode_direct" = no; then
> 		add="$dir/$linklib"
>+		case $host in
>+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
>+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
>+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
>+		    *-*-unixware7*) add_dir="-L$dir" ;;
>+		  *-*-darwin* )
>+		    # if the lib is a module then we can not link against
>+		    # it, someone is ignoring the new warnings I added
>+		    if /usr/bin/file -L $add 2> /dev/null |
>+                      $EGREP ": [^:]* bundle" >/dev/null ; then
>+		      $echo "** Warning, lib $linklib is a module, not a shared library"
>+		      if test -z "$old_library" ; then
>+		        $echo
>+		        $echo "** And there doesn't seem to be a static archive available"
>+		        $echo "** The link will probably fail, sorry"
>+		      else
>+		        add="$dir/$old_library"
>+		      fi
>+		    fi
>+		esac
> 	      elif test "$hardcode_minus_L" = no; then
> 		case $host in
> 		*-*-sunos*) add_shlibpath="$dir" ;;
>@@ -1827,6 +2721,14 @@
> 		add="$dir/$linklib"
> 	      elif test "$hardcode_minus_L" = yes; then
> 		add_dir="-L$dir"
>+		# Try looking first in the location we're being installed to.
>+		if test -n "$inst_prefix_dir"; then
>+		  case $libdir in
>+		    [\\/]*)
>+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
>+		      ;;
>+		  esac
>+		fi
> 		add="-l$name"
> 	      elif test "$hardcode_shlibpath_var" = yes; then
> 		add_shlibpath="$dir"
>@@ -1840,7 +2742,7 @@
> 
> 	    if test "$lib_linked" != yes; then
> 	      $echo "$modename: configuration error: unsupported hardcode properties"
>-	      exit 1
>+	      exit $EXIT_FAILURE
> 	    fi
> 
> 	    if test -n "$add_shlibpath"; then
>@@ -1849,7 +2751,7 @@
> 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
> 	      esac
> 	    fi
>-	    if test $linkmode = prog; then
>+	    if test "$linkmode" = prog; then
> 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
> 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
> 	    else
>@@ -1866,7 +2768,7 @@
> 	    fi
> 	  fi
> 
>-	  if test $linkmode = prog || test "$mode" = relink; then
>+	  if test "$linkmode" = prog || test "$mode" = relink; then
> 	    add_shlibpath=
> 	    add_dir=
> 	    add=
>@@ -1882,13 +2784,28 @@
> 	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
> 	      esac
> 	      add="-l$name"
>+	    elif test "$hardcode_automatic" = yes; then
>+	      if test -n "$inst_prefix_dir" &&
>+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
>+	        add="$inst_prefix_dir$libdir/$linklib"
>+	      else
>+	        add="$libdir/$linklib"
>+	      fi
> 	    else
> 	      # We cannot seem to hardcode it, guess we'll fake it.
> 	      add_dir="-L$libdir"
>+	      # Try looking first in the location we're being installed to.
>+	      if test -n "$inst_prefix_dir"; then
>+		case $libdir in
>+		  [\\/]*)
>+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
>+		    ;;
>+		esac
>+	      fi
> 	      add="-l$name"
> 	    fi
> 
>-	    if test $linkmode = prog; then
>+	    if test "$linkmode" = prog; then
> 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
> 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
> 	    else
>@@ -1896,16 +2813,7 @@
> 	      test -n "$add" && deplibs="$add $deplibs"
> 	    fi
> 	  fi
>-	elif test $linkmode = prog; then
>-	  if test "$alldeplibs" = yes &&
>-	     { test "$deplibs_check_method" = pass_all ||
>-	       { test "$build_libtool_libs" = yes &&
>-		 test -n "$library_names"; }; }; then
>-	    # We only need to search for static libraries
>-	    continue
>-	  fi
>-
>-	  # Try to link the static library
>+	elif test "$linkmode" = prog; then
> 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
> 	  # is not unsupported.  This is valid on all known static and
> 	  # shared platforms.
>@@ -1925,20 +2833,21 @@
> 
> 	    # Just print a warning and add the library to dependency_libs so
> 	    # that the program can be linked against the static library.
>-	    echo
>-	    echo "*** Warning: This library needs some functionality provided by $lib."
>-	    echo "*** I have the capability to make that library automatically link in when"
>-	    echo "*** you link to this library.  But I can only do this if you have a"
>-	    echo "*** shared version of the library, which you do not appear to have."
>+	    $echo
>+	    $echo "*** Warning: This system can not link to static lib archive $lib."
>+	    $echo "*** I have the capability to make that library automatically link in when"
>+	    $echo "*** you link to this library.  But I can only do this if you have a"
>+	    $echo "*** shared version of the library, which you do not appear to have."
> 	    if test "$module" = yes; then
>-	      echo "*** Therefore, libtool will create a static module, that should work "
>-	      echo "*** as long as the dlopening application is linked with the -dlopen flag."
>+	      $echo "*** But as you try to build a module library, libtool will still create "
>+	      $echo "*** a static module, that should work as long as the dlopening application"
>+	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
> 	      if test -z "$global_symbol_pipe"; then
>-		echo
>-		echo "*** However, this would only work if libtool was able to extract symbol"
>-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
>-		echo "*** not find such a program.  So, this module is probably useless."
>-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
>+		$echo
>+		$echo "*** However, this would only work if libtool was able to extract symbol"
>+		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
>+		$echo "*** not find such a program.  So, this module is probably useless."
>+		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
> 	      fi
> 	      if test "$build_old_libs" = no; then
> 		build_libtool_libs=module
>@@ -1948,17 +2857,16 @@
> 	      fi
> 	    fi
> 	  else
>-	    convenience="$convenience $dir/$old_library"
>-	    old_convenience="$old_convenience $dir/$old_library"
> 	    deplibs="$dir/$old_library $deplibs"
> 	    link_static=yes
> 	  fi
> 	fi # link shared/static library?
> 
>-	if test $linkmode = lib; then
>+	if test "$linkmode" = lib; then
> 	  if test -n "$dependency_libs" &&
>-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
>-	       test $link_static = yes; }; then
>+	     { test "$hardcode_into_libs" != yes ||
>+	       test "$build_old_libs" = yes ||
>+	       test "$link_static" = yes; }; then
> 	    # Extract -R from dependency_libs
> 	    temp_deplibs=
> 	    for libdir in $dependency_libs; do
>@@ -1981,13 +2889,15 @@
> 	  tmp_libs=
> 	  for deplib in $dependency_libs; do
> 	    newdependency_libs="$deplib $newdependency_libs"
>-	    case "$tmp_libs " in
>-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>-	    esac
>+	    if test "X$duplicate_deps" = "Xyes" ; then
>+	      case "$tmp_libs " in
>+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
>+	      esac
>+	    fi
> 	    tmp_libs="$tmp_libs $deplib"
> 	  done
> 
>-	  if test $link_all_deplibs != no; then
>+	  if test "$link_all_deplibs" != no; then
> 	    # Add the search paths of all dependency libraries
> 	    for deplib in $dependency_libs; do
> 	      case $deplib in
>@@ -2007,38 +2917,83 @@
> 		  ;;
> 		esac
> 		if grep "^installed=no" $deplib > /dev/null; then
>-		  path="-L$absdir/$objdir"
>+		  path="$absdir/$objdir"
> 		else
>-		  eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $deplib`
>+		  eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
> 		  if test -z "$libdir"; then
> 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
>-		    exit 1
>+		    exit $EXIT_FAILURE
> 		  fi
> 		  if test "$absdir" != "$libdir"; then
> 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
> 		  fi
>-		  path="-L$absdir"
>+		  path="$absdir"
> 		fi
>+		depdepl=
>+		case $host in
>+		*-*-darwin*)
>+		  # we do not want to link against static libs,
>+		  # but need to link against shared
>+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`
>+		  if test -n "$deplibrary_names" ; then
>+		    for tmp in $deplibrary_names ; do
>+		      depdepl=$tmp
>+		    done
>+		    if test -f "$path/$depdepl" ; then
>+		      depdepl="$path/$depdepl"
>+		    fi
>+		    # do not add paths which are already there
>+		    case " $newlib_search_path " in
>+		    *" $path "*) ;;
>+		    *) newlib_search_path="$newlib_search_path $path";;
>+		    esac
>+		  fi
>+		  path=""
>+		  ;;
>+		*)
>+		  path="-L$path"
>+		  ;;
>+		esac
>+		;;
>+	      -l*)
>+		case $host in
>+		*-*-darwin*)
>+		  # Again, we only want to link against shared libraries
>+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
>+		  for tmp in $newlib_search_path ; do
>+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
>+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
>+		      break
>+		    fi
>+		  done
>+		  path=""
>+		  ;;
>+		*) continue ;;
>+		esac
> 		;;
> 	      *) continue ;;
> 	      esac
> 	      case " $deplibs " in
> 	      *" $path "*) ;;
>-	      *) deplibs="$deplibs $path" ;;
>+	      *) deplibs="$path $deplibs" ;;
>+	      esac
>+	      case " $deplibs " in
>+	      *" $depdepl "*) ;;
>+	      *) deplibs="$depdepl $deplibs" ;;
> 	      esac
> 	    done
> 	  fi # link_all_deplibs != no
> 	fi # linkmode = lib
>       done # for deplib in $libs
>-      if test $pass = dlpreopen; then
>+      dependency_libs="$newdependency_libs"
>+      if test "$pass" = dlpreopen; then
> 	# Link the dlpreopened libraries before other libraries
> 	for deplib in $save_deplibs; do
> 	  deplibs="$deplib $deplibs"
> 	done
>       fi
>-      if test $pass != dlopen; then
>-	test $pass != scan && dependency_libs="$newdependency_libs"
>-	if test $pass != conv; then
>+      if test "$pass" != dlopen; then
>+	if test "$pass" != conv; then
> 	  # Make sure lib_search_path contains only unique directories.
> 	  lib_search_path=
> 	  for dir in $newlib_search_path; do
>@@ -2060,9 +3015,30 @@
> 	  eval tmp_libs=\"\$$var\"
> 	  new_libs=
> 	  for deplib in $tmp_libs; do
>+	    # FIXME: Pedantically, this is the right thing to do, so
>+	    #        that some nasty dependency loop isn't accidentally
>+	    #        broken:
>+	    #new_libs="$deplib $new_libs"
>+	    # Pragmatically, this seems to cause very few problems in
>+	    # practice:
> 	    case $deplib in
> 	    -L*) new_libs="$deplib $new_libs" ;;
>+	    -R*) ;;
> 	    *)
>+	      # And here is the reason: when a library appears more
>+	      # than once as an explicit dependence of a library, or
>+	      # is implicitly linked in more than once by the
>+	      # compiler, it is considered special, and multiple
>+	      # occurrences thereof are not removed.  Compare this
>+	      # with having the same library being listed as a
>+	      # dependency of multiple other libraries: in this case,
>+	      # we know (pedantically, we assume) the library does not
>+	      # need to be listed more than once, so we keep only the
>+	      # last copy.  This is not always right, but it is rare
>+	      # enough that we require users that really mean to play
>+	      # such unportable linking tricks to link the library
>+	      # using -Wl,-lname, so that libtool does not consider it
>+	      # for duplicate removal.
> 	      case " $specialdeplibs " in
> 	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
> 	      *)
>@@ -2090,19 +3066,32 @@
> 	  eval $var=\"$tmp_libs\"
> 	done # for var
>       fi
>-      if test "$pass" = "conv" &&
>-       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
>-	libs="$deplibs" # reset libs
>-	deplibs=
>-      fi
>+      # Last step: remove runtime libs from dependency_libs
>+      # (they stay in deplibs)
>+      tmp_libs=
>+      for i in $dependency_libs ; do
>+	case " $predeps $postdeps $compiler_lib_search_path " in
>+	*" $i "*)
>+	  i=""
>+	  ;;
>+	esac
>+	if test -n "$i" ; then
>+	  tmp_libs="$tmp_libs $i"
>+	fi
>+      done
>+      dependency_libs=$tmp_libs
>     done # for pass
>-    if test $linkmode = prog; then
>+    if test "$linkmode" = prog; then
>       dlfiles="$newdlfiles"
>       dlprefiles="$newdlprefiles"
>     fi
> 
>     case $linkmode in
>     oldlib)
>+      if test -n "$deplibs"; then
>+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
>+      fi
>+
>       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
> 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
>       fi
>@@ -2116,7 +3105,7 @@
>       fi
> 
>       if test -n "$vinfo"; then
>-	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
>+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
>       fi
> 
>       if test -n "$release"; then
>@@ -2138,17 +3127,19 @@
>       case $outputname in
>       lib*)
> 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
>+	eval shared_ext=\"$shrext_cmds\"
> 	eval libname=\"$libname_spec\"
> 	;;
>       *)
> 	if test "$module" = no; then
> 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
> 	  $echo "$help" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 	if test "$need_lib_prefix" != no; then
> 	  # Add the "lib" prefix for modules if required
> 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
>+	  eval shared_ext=\"$shrext_cmds\"
> 	  eval libname=\"$libname_spec\"
> 	else
> 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
>@@ -2159,11 +3150,11 @@
>       if test -n "$objs"; then
> 	if test "$deplibs_check_method" != pass_all; then
> 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	else
>-	  echo
>-	  echo "*** Warning: Linking the shared library $output against the non-libtool"
>-	  echo "*** objects $objs is not portable!"
>+	  $echo
>+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
>+	  $echo "*** objects $objs is not portable!"
> 	  libobjs="$libobjs $objs"
> 	fi
>       fi
>@@ -2173,7 +3164,7 @@
>       fi
> 
>       set dummy $rpath
>-      if test $# -gt 2; then
>+      if test "$#" -gt 2; then
> 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
>       fi
>       install_libdir="$2"
>@@ -2182,14 +3173,16 @@
>       if test -z "$rpath"; then
> 	if test "$build_libtool_libs" = yes; then
> 	  # Building a libtool convenience library.
>-	  libext=al
>+	  # Some compilers have problems with a `.al' extension so
>+	  # convenience libraries should have the same extension an
>+	  # archive normally would.
> 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
> 	  build_libtool_libs=convenience
> 	  build_old_libs=yes
> 	fi
> 
> 	if test -n "$vinfo"; then
>-	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
>+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
> 	fi
> 
> 	if test -n "$release"; then
>@@ -2205,45 +3198,82 @@
> 	if test -n "$8"; then
> 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
> 	  $echo "$help" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 
>-	current="$2"
>-	revision="$3"
>-	age="$4"
>+	# convert absolute version numbers to libtool ages
>+	# this retains compatibility with .la files and attempts
>+	# to make the code below a bit more comprehensible
>+
>+	case $vinfo_number in
>+	yes)
>+	  number_major="$2"
>+	  number_minor="$3"
>+	  number_revision="$4"
>+	  #
>+	  # There are really only two kinds -- those that
>+	  # use the current revision as the major version
>+	  # and those that subtract age and use age as
>+	  # a minor version.  But, then there is irix
>+	  # which has an extra 1 added just for fun
>+	  #
>+	  case $version_type in
>+	  darwin|linux|osf|windows|none)
>+	    current=`expr $number_major + $number_minor`
>+	    age="$number_minor"
>+	    revision="$number_revision"
>+	    ;;
>+	  freebsd-aout|freebsd-elf|sunos)
>+	    current="$number_major"
>+	    revision="$number_minor"
>+	    age="0"
>+	    ;;
>+	  irix|nonstopux)
>+	    current=`expr $number_major + $number_minor - 1`
>+	    age="$number_minor"
>+	    revision="$number_minor"
>+	    ;;
>+	  esac
>+	  ;;
>+	no)
>+	  current="$2"
>+	  revision="$3"
>+	  age="$4"
>+	  ;;
>+	esac
> 
> 	# Check that each of the things are valid numbers.
> 	case $current in
>-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
>+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
> 	*)
>-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
>+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
> 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
> 
> 	case $revision in
>-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
>+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
> 	*)
>-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
>+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
> 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
> 
> 	case $age in
>-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
>+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
> 	*)
>-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
>+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
> 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
> 
>-	if test $age -gt $current; then
>+	if test "$age" -gt "$current"; then
> 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
> 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 
> 	# Calculate the version variables.
>@@ -2260,7 +3290,7 @@
> 	  versuffix="$major.$age.$revision"
> 	  # Darwin ld doesn't like 0 for these options...
> 	  minor_current=`expr $current + 1`
>-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
>+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
> 	  ;;
> 
> 	freebsd-aout)
>@@ -2273,16 +3303,21 @@
> 	  versuffix=".$current";
> 	  ;;
> 
>-	irix)
>+	irix | nonstopux)
> 	  major=`expr $current - $age + 1`
>-	  verstring="sgi$major.$revision"
>+
>+	  case $version_type in
>+	    nonstopux) verstring_prefix=nonstopux ;;
>+	    *)         verstring_prefix=sgi ;;
>+	  esac
>+	  verstring="$verstring_prefix$major.$revision"
> 
> 	  # Add in all the interfaces that we are compatible with.
> 	  loop=$revision
>-	  while test $loop != 0; do
>+	  while test "$loop" -ne 0; do
> 	    iface=`expr $revision - $loop`
> 	    loop=`expr $loop - 1`
>-	    verstring="sgi$major.$iface:$verstring"
>+	    verstring="$verstring_prefix$major.$iface:$verstring"
> 	  done
> 
> 	  # Before this point, $major must not contain `.'.
>@@ -2296,13 +3331,13 @@
> 	  ;;
> 
> 	osf)
>-	  major=`expr $current - $age`
>+	  major=.`expr $current - $age`
> 	  versuffix=".$current.$age.$revision"
> 	  verstring="$current.$age.$revision"
> 
> 	  # Add in all the interfaces that we are compatible with.
> 	  loop=$age
>-	  while test $loop != 0; do
>+	  while test "$loop" -ne 0; do
> 	    iface=`expr $current - $loop`
> 	    loop=`expr $loop - 1`
> 	    verstring="$verstring:${iface}.0"
>@@ -2326,20 +3361,19 @@
> 
> 	*)
> 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
>-	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
>-	  exit 1
>+	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
> 
> 	# Clear the version info if we defaulted, and they specified a release.
> 	if test -z "$vinfo" && test -n "$release"; then
> 	  major=
>-	  verstring="0.0"
> 	  case $version_type in
> 	  darwin)
> 	    # we can't check for "0.0" in archive_cmds due to quoting
> 	    # problems, so we reset it completely
>-	    verstring=""
>+	    verstring=
> 	    ;;
> 	  *)
> 	    verstring="0.0"
>@@ -2373,9 +3407,30 @@
>       fi
> 
>       if test "$mode" != relink; then
>-	# Remove our outputs.
>-	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
>-	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
>+	# Remove our outputs, but don't remove object files since they
>+	# may have been created when compiling PIC objects.
>+	removelist=
>+	tempremovelist=`$echo "$output_objdir/*"`
>+	for p in $tempremovelist; do
>+	  case $p in
>+	    *.$objext)
>+	       ;;
>+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
>+	       if test "X$precious_files_regex" != "X"; then
>+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
>+	         then
>+		   continue
>+		 fi
>+	       fi
>+	       removelist="$removelist $p"
>+	       ;;
>+	    *) ;;
>+	  esac
>+	done
>+	if test -n "$removelist"; then
>+	  $show "${rm}r $removelist"
>+	  $run ${rm}r $removelist
>+	fi
>       fi
> 
>       # Now set the variables for building old libraries.
>@@ -2387,11 +3442,11 @@
>       fi
> 
>       # Eliminate all temporary directories.
>-      for path in $notinst_path; do
>-	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
>-	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
>-	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
>-      done
>+#      for path in $notinst_path; do
>+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
>+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
>+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
>+#      done
> 
>       if test -n "$xrpath"; then
> 	# If the user specified any rpath flags, then add them.
>@@ -2403,7 +3458,7 @@
> 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
> 	  esac
> 	done
>-	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
>+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
> 	  dependency_libs="$temp_xrpath $dependency_libs"
> 	fi
>       fi
>@@ -2441,12 +3496,18 @@
> 	  *-*-netbsd*)
> 	    # Don't link with libc until the a.out ld.so is fixed.
> 	    ;;
>-	  *-*-openbsd*)
>+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
> 	    # Do not include libc due to us having libc/libc_r.
> 	    ;;
>-	  *)
>+	  *-*-sco3.2v5* | *-*-sco5v6*)
>+	    # Causes problems with __ctype
>+	    ;;
>+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
>+	    # Compiler inserts libc in the correct place for threads to work
>+	    ;;
>+ 	  *)
> 	    # Add libc to deplibs on all other systems if necessary.
>-	    if test $build_libtool_need_lc = "yes"; then
>+	    if test "$build_libtool_need_lc" = "yes"; then
> 	      deplibs="$deplibs -lc"
> 	    fi
> 	    ;;
>@@ -2473,7 +3534,7 @@
> 	  # This might be a little naive.  We might want to check
> 	  # whether the library exists or not.  But this is on
> 	  # osf3 & osf4 and I'm not really sure... Just
>-	  # implementing what was already the behaviour.
>+	  # implementing what was already the behavior.
> 	  newdeplibs=$deplibs
> 	  ;;
> 	test_compile)
>@@ -2486,64 +3547,85 @@
> 	  int main() { return 0; }
> EOF
> 	  $rm conftest
>-	  $CC -o conftest conftest.c $deplibs
>-	  if test $? -eq 0 ; then
>+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
> 	    ldd_output=`ldd conftest`
> 	    for i in $deplibs; do
>-	      name="`expr $i : '-l$.*$'`"
>+	      name=`expr $i : '-l$.*$'`
> 	      # If $name is empty we are operating on a -L argument.
>-	      if test -n "$name" && test "$name" != "0"; then
>-		libname=`eval \\$echo \"$libname_spec\"`
>-		deplib_matches=`eval \\$echo \"$library_names_spec\"`
>-		set dummy $deplib_matches
>-		deplib_match=$2
>-		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
>-		  newdeplibs="$newdeplibs $i"
>-		else
>-		  droppeddeps=yes
>-		  echo
>-		  echo "*** Warning: This library needs some functionality provided by $i."
>-		  echo "*** I have the capability to make that library automatically link in when"
>-		  echo "*** you link to this library.  But I can only do this if you have a"
>-		  echo "*** shared version of the library, which you do not appear to have."
>+              if test "$name" != "" && test "$name" != "0"; then
>+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
>+		  case " $predeps $postdeps " in
>+		  *" $i "*)
>+		    newdeplibs="$newdeplibs $i"
>+		    i=""
>+		    ;;
>+		  esac
>+	        fi
>+		if test -n "$i" ; then
>+		  libname=`eval \\$echo \"$libname_spec\"`
>+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
>+		  set dummy $deplib_matches
>+		  deplib_match=$2
>+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
>+		    newdeplibs="$newdeplibs $i"
>+		  else
>+		    droppeddeps=yes
>+		    $echo
>+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
>+		    $echo "*** I have the capability to make that library automatically link in when"
>+		    $echo "*** you link to this library.  But I can only do this if you have a"
>+		    $echo "*** shared version of the library, which I believe you do not have"
>+		    $echo "*** because a test_compile did reveal that the linker did not use it for"
>+		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
>+		  fi
> 		fi
> 	      else
> 		newdeplibs="$newdeplibs $i"
> 	      fi
> 	    done
> 	  else
>-	    # Error occured in the first compile.  Let's try to salvage the situation:
>-	    # Compile a seperate program for each library.
>+	    # Error occurred in the first compile.  Let's try to salvage
>+	    # the situation: Compile a separate program for each library.
> 	    for i in $deplibs; do
>-	      name="`expr $i : '-l$.*$'`"
>-	     # If $name is empty we are operating on a -L argument.
>-	      if test -n "$name" && test "$name" != "0"; then
>+	      name=`expr $i : '-l$.*$'`
>+	      # If $name is empty we are operating on a -L argument.
>+              if test "$name" != "" && test "$name" != "0"; then
> 		$rm conftest
>-		$CC -o conftest conftest.c $i
>-		# Did it work?
>-		if test $? -eq 0 ; then
>+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
> 		  ldd_output=`ldd conftest`
>-		  libname=`eval \\$echo \"$libname_spec\"`
>-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
>-		  set dummy $deplib_matches
>-		  deplib_match=$2
>-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
>-		    newdeplibs="$newdeplibs $i"
>-		  else
>-		    droppeddeps=yes
>-		    echo
>-		    echo "*** Warning: This library needs some functionality provided by $i."
>-		    echo "*** I have the capability to make that library automatically link in when"
>-		    echo "*** you link to this library.  But I can only do this if you have a"
>-		    echo "*** shared version of the library, which you do not appear to have."
>+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
>+		    case " $predeps $postdeps " in
>+		    *" $i "*)
>+		      newdeplibs="$newdeplibs $i"
>+		      i=""
>+		      ;;
>+		    esac
>+		  fi
>+		  if test -n "$i" ; then
>+		    libname=`eval \\$echo \"$libname_spec\"`
>+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
>+		    set dummy $deplib_matches
>+		    deplib_match=$2
>+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
>+		      newdeplibs="$newdeplibs $i"
>+		    else
>+		      droppeddeps=yes
>+		      $echo
>+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
>+		      $echo "*** I have the capability to make that library automatically link in when"
>+		      $echo "*** you link to this library.  But I can only do this if you have a"
>+		      $echo "*** shared version of the library, which you do not appear to have"
>+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
>+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
>+		    fi
> 		  fi
> 		else
> 		  droppeddeps=yes
>-		  echo
>-		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
>-		  echo "***  make it link in!  You will probably need to install it or some"
>-		  echo "*** library that it depends on before this library will be fully"
>-		  echo "*** functional.  Installing it before continuing would be even better."
>+		  $echo
>+		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
>+		  $echo "*** make it link in!  You will probably need to install it or some"
>+		  $echo "*** library that it depends on before this library will be fully"
>+		  $echo "*** functional.  Installing it before continuing would be even better."
> 		fi
> 	      else
> 		newdeplibs="$newdeplibs $i"
>@@ -2555,13 +3637,22 @@
> 	  set dummy $deplibs_check_method
> 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 $.*$"`
> 	  for a_deplib in $deplibs; do
>-	    name="`expr $a_deplib : '-l$.*$'`"
>+	    name=`expr $a_deplib : '-l$.*$'`
> 	    # If $name is empty we are operating on a -L argument.
>-	    if test -n "$name" && test "$name" != "0"; then
>-	      libname=`eval \\$echo \"$libname_spec\"`
>-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
>-		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
>-		    for potent_lib in $potential_libs; do
>+            if test "$name" != "" && test  "$name" != "0"; then
>+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
>+		case " $predeps $postdeps " in
>+		*" $a_deplib "*)
>+		  newdeplibs="$newdeplibs $a_deplib"
>+		  a_deplib=""
>+		  ;;
>+		esac
>+	      fi
>+	      if test -n "$a_deplib" ; then
>+		libname=`eval \\$echo \"$libname_spec\"`
>+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
>+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
>+		  for potent_lib in $potential_libs; do
> 		      # Follow soft links.
> 		      if ls -lLd "$potent_lib" 2>/dev/null \
> 			 | grep " -> " >/dev/null; then
>@@ -2574,28 +3665,36 @@
> 		      # but so what?
> 		      potlib="$potent_lib"
> 		      while test -h "$potlib" 2>/dev/null; do
>-			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
>+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
> 			case $potliblink in
> 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
> 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
> 			esac
> 		      done
> 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
>-			 | sed 10q \
>-			 | egrep "$file_magic_regex" > /dev/null; then
>+			 | ${SED} 10q \
>+			 | $EGREP "$file_magic_regex" > /dev/null; then
> 			newdeplibs="$newdeplibs $a_deplib"
> 			a_deplib=""
> 			break 2
> 		      fi
>-		    done
>-	      done
>+		  done
>+		done
>+	      fi
> 	      if test -n "$a_deplib" ; then
> 		droppeddeps=yes
>-		echo
>-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
>-		echo "*** I have the capability to make that library automatically link in when"
>-		echo "*** you link to this library.  But I can only do this if you have a"
>-		echo "*** shared version of the library, which you do not appear to have."
>+		$echo
>+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
>+		$echo "*** I have the capability to make that library automatically link in when"
>+		$echo "*** you link to this library.  But I can only do this if you have a"
>+		$echo "*** shared version of the library, which you do not appear to have"
>+		$echo "*** because I did check the linker path looking for a file starting"
>+		if test -z "$potlib" ; then
>+		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
>+		else
>+		  $echo "*** with $libname and none of the candidates passed a file format test"
>+		  $echo "*** using a file magic. Last file checked: $potlib"
>+		fi
> 	      fi
> 	    else
> 	      # Add a -L argument.
>@@ -2607,29 +3706,47 @@
> 	  set dummy $deplibs_check_method
> 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"`
> 	  for a_deplib in $deplibs; do
>-	    name="`expr $a_deplib : '-l$.*$'`"
>+	    name=`expr $a_deplib : '-l$.*$'`
> 	    # If $name is empty we are operating on a -L argument.
> 	    if test -n "$name" && test "$name" != "0"; then
>-	      libname=`eval \\$echo \"$libname_spec\"`
>-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
>-		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
>-		for potent_lib in $potential_libs; do
>-		  if eval echo \"$potent_lib\" 2>/dev/null \
>-		      | sed 10q \
>-		      | egrep "$match_pattern_regex" > /dev/null; then
>-		    newdeplibs="$newdeplibs $a_deplib"
>-		    a_deplib=""
>-		    break 2
>-		  fi
>+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
>+		case " $predeps $postdeps " in
>+		*" $a_deplib "*)
>+		  newdeplibs="$newdeplibs $a_deplib"
>+		  a_deplib=""
>+		  ;;
>+		esac
>+	      fi
>+	      if test -n "$a_deplib" ; then
>+		libname=`eval \\$echo \"$libname_spec\"`
>+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
>+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
>+		  for potent_lib in $potential_libs; do
>+		    potlib="$potent_lib" # see symlink-check above in file_magic test
>+		    if eval $echo \"$potent_lib\" 2>/dev/null \
>+		        | ${SED} 10q \
>+		        | $EGREP "$match_pattern_regex" > /dev/null; then
>+		      newdeplibs="$newdeplibs $a_deplib"
>+		      a_deplib=""
>+		      break 2
>+		    fi
>+		  done
> 		done
>-	      done
>+	      fi
> 	      if test -n "$a_deplib" ; then
> 		droppeddeps=yes
>-		echo
>-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
>-		echo "*** I have the capability to make that library automatically link in when"
>-		echo "*** you link to this library.  But I can only do this if you have a"
>-		echo "*** shared version of the library, which you do not appear to have."
>+		$echo
>+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
>+		$echo "*** I have the capability to make that library automatically link in when"
>+		$echo "*** you link to this library.  But I can only do this if you have a"
>+		$echo "*** shared version of the library, which you do not appear to have"
>+		$echo "*** because I did check the linker path looking for a file starting"
>+		if test -z "$potlib" ; then
>+		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
>+		else
>+		  $echo "*** with $libname and none of the candidates passed a file format test"
>+		  $echo "*** using a regex pattern. Last file checked: $potlib"
>+		fi
> 	      fi
> 	    else
> 	      # Add a -L argument.
>@@ -2639,16 +3756,23 @@
> 	  ;;
> 	none | unknown | *)
> 	  newdeplibs=""
>-	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
>-	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
>-	     grep . >/dev/null; then
>-	    echo
>+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
>+	    -e 's/ -[LR][^ ]*//g'`
>+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
>+	    for i in $predeps $postdeps ; do
>+	      # can't use Xsed below, because $i might contain '/'
>+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
>+	    done
>+	  fi
>+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
>+	    | grep . >/dev/null; then
>+	    $echo
> 	    if test "X$deplibs_check_method" = "Xnone"; then
>-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
>+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
> 	    else
>-	      echo "*** Warning: inter-library dependencies are not known to be supported."
>+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
> 	    fi
>-	    echo "*** All declared inter-library dependencies are being dropped."
>+	    $echo "*** All declared inter-library dependencies are being dropped."
> 	    droppeddeps=yes
> 	  fi
> 	  ;;
>@@ -2668,17 +3792,17 @@
> 
> 	if test "$droppeddeps" = yes; then
> 	  if test "$module" = yes; then
>-	    echo
>-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
>-	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
>-	    echo "*** a static module, that should work as long as the dlopening"
>-	    echo "*** application is linked with the -dlopen flag."
>+	    $echo
>+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
>+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
>+	    $echo "*** a static module, that should work as long as the dlopening"
>+	    $echo "*** application is linked with the -dlopen flag."
> 	    if test -z "$global_symbol_pipe"; then
>-	      echo
>-	      echo "*** However, this would only work if libtool was able to extract symbol"
>-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
>-	      echo "*** not find such a program.  So, this module is probably useless."
>-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
>+	      $echo
>+	      $echo "*** However, this would only work if libtool was able to extract symbol"
>+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
>+	      $echo "*** not find such a program.  So, this module is probably useless."
>+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
> 	    fi
> 	    if test "$build_old_libs" = no; then
> 	      oldlibs="$output_objdir/$libname.$libext"
>@@ -2688,16 +3812,16 @@
> 	      build_libtool_libs=no
> 	    fi
> 	  else
>-	    echo "*** The inter-library dependencies that have been dropped here will be"
>-	    echo "*** automatically added whenever a program is linked with this library"
>-	    echo "*** or is declared to -dlopen it."
>-
>-	    if test $allow_undefined = no; then
>-	      echo
>-	      echo "*** Since this library must not contain undefined symbols,"
>-	      echo "*** because either the platform does not support them or"
>-	      echo "*** it was explicitly requested with -no-undefined,"
>-	      echo "*** libtool will only create a static version of it."
>+	    $echo "*** The inter-library dependencies that have been dropped here will be"
>+	    $echo "*** automatically added whenever a program is linked with this library"
>+	    $echo "*** or is declared to -dlopen it."
>+
>+	    if test "$allow_undefined" = no; then
>+	      $echo
>+	      $echo "*** Since this library must not contain undefined symbols,"
>+	      $echo "*** because either the platform does not support them or"
>+	      $echo "*** it was explicitly requested with -no-undefined,"
>+	      $echo "*** libtool will only create a static version of it."
> 	      if test "$build_old_libs" = no; then
> 		oldlibs="$output_objdir/$libname.$libext"
> 		build_libtool_libs=module
>@@ -2712,6 +3836,35 @@
> 	deplibs=$newdeplibs
>       fi
> 
>+
>+      # move library search paths that coincide with paths to not yet
>+      # installed libraries to the beginning of the library search list
>+      new_libs=
>+      for path in $notinst_path; do
>+	case " $new_libs " in
>+	*" -L$path/$objdir "*) ;;
>+	*)
>+	  case " $deplibs " in
>+	  *" -L$path/$objdir "*)
>+	    new_libs="$new_libs -L$path/$objdir" ;;
>+	  esac
>+	  ;;
>+	esac
>+      done
>+      for deplib in $deplibs; do
>+	case $deplib in
>+	-L*)
>+	  case " $new_libs " in
>+	  *" $deplib "*) ;;
>+	  *) new_libs="$new_libs $deplib" ;;
>+	  esac
>+	  ;;
>+	*) new_libs="$new_libs $deplib" ;;
>+	esac
>+      done
>+      deplibs="$new_libs"
>+
>+
>       # All the library-specific variables (install_libdir is set above).
>       library_names=
>       old_library=
>@@ -2719,7 +3872,7 @@
> 
>       # Test again, we may have decided not to build it any more
>       if test "$build_libtool_libs" = yes; then
>-	if test $hardcode_into_libs = yes; then
>+	if test "$hardcode_into_libs" = yes; then
> 	  # Hardcode the library paths
> 	  hardcode_libdirs=
> 	  dep_rpath=
>@@ -2755,7 +3908,11 @@
> 	  if test -n "$hardcode_libdir_separator" &&
> 	     test -n "$hardcode_libdirs"; then
> 	    libdir="$hardcode_libdirs"
>-	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
>+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
>+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
>+	    else
>+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
>+	    fi
> 	  fi
> 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
> 	    # We should set the runpath_var.
>@@ -2775,6 +3932,7 @@
> 	fi
> 
> 	# Get the real and link names of the library.
>+	eval shared_ext=\"$shrext_cmds\"
> 	eval library_names=\"$library_names_spec\"
> 	set dummy $library_names
> 	realname="$2"
>@@ -2785,31 +3943,17 @@
> 	else
> 	  soname="$realname"
> 	fi
>-	test -z "$dlname" && dlname=$soname
>+	if test -z "$dlname"; then
>+	  dlname=$soname
>+	fi
> 
> 	lib="$output_objdir/$realname"
>+	linknames=
> 	for link
> 	do
> 	  linknames="$linknames $link"
> 	done
> 
>-	# Ensure that we have .o objects for linkers which dislike .lo
>-	# (e.g. aix) in case we are running --disable-static
>-	for obj in $libobjs; do
>-	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
>-	  if test "X$xdir" = "X$obj"; then
>-	    xdir="."
>-	  else
>-	    xdir="$xdir"
>-	  fi
>-	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
>-	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
>-	  if test ! -f $xdir/$oldobj; then
>-	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
>-	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
>-	  fi
>-	done
>-
> 	# Use standard objects if they are pic
> 	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
> 
>@@ -2819,17 +3963,29 @@
> 	    $show "generating symbol list for \`$libname.la'"
> 	    export_symbols="$output_objdir/$libname.exp"
> 	    $run $rm $export_symbols
>-	    eval cmds=\"$export_symbols_cmds\"
>+	    cmds=$export_symbols_cmds
> 	    save_ifs="$IFS"; IFS='~'
> 	    for cmd in $cmds; do
> 	      IFS="$save_ifs"
>-	      $show "$cmd"
>-	      $run eval "$cmd" || exit $?
>+	      eval cmd=\"$cmd\"
>+	      if len=`expr "X$cmd" : ".*"` &&
>+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
>+	        $show "$cmd"
>+	        $run eval "$cmd" || exit $?
>+	        skipped_export=false
>+	      else
>+	        # The command line is too long to execute in one step.
>+	        $show "using reloadable object file for export list..."
>+	        skipped_export=:
>+		# Break out early, otherwise skipped_export may be
>+		# set to false by a later but shorter cmd.
>+		break
>+	      fi
> 	    done
> 	    IFS="$save_ifs"
> 	    if test -n "$export_symbols_regex"; then
>-	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
>-	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
>+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
>+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
> 	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
> 	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
> 	    fi
>@@ -2840,74 +3996,210 @@
> 	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
> 	fi
> 
>+	tmp_deplibs=
>+	for test_deplib in $deplibs; do
>+		case " $convenience " in
>+		*" $test_deplib "*) ;;
>+		*)
>+			tmp_deplibs="$tmp_deplibs $test_deplib"
>+			;;
>+		esac
>+	done
>+	deplibs="$tmp_deplibs"
>+
> 	if test -n "$convenience"; then
> 	  if test -n "$whole_archive_flag_spec"; then
>+	    save_libobjs=$libobjs
> 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
> 	  else
> 	    gentop="$output_objdir/${outputname}x"
>-	    $show "${rm}r $gentop"
>-	    $run ${rm}r "$gentop"
>-	    $show "mkdir $gentop"
>-	    $run mkdir "$gentop"
>-	    status=$?
>-	    if test $status -ne 0 && test ! -d "$gentop"; then
>-	      exit $status
>-	    fi
> 	    generated="$generated $gentop"
> 
>-	    for xlib in $convenience; do
>-	      # Extract the objects.
>-	      case $xlib in
>-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
>-	      *) xabs=`pwd`"/$xlib" ;;
>-	      esac
>-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
>-	      xdir="$gentop/$xlib"
>+	    func_extract_archives $gentop $convenience
>+	    libobjs="$libobjs $func_extract_archives_result"
>+	  fi
>+	fi
>+	
>+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
>+	  eval flag=\"$thread_safe_flag_spec\"
>+	  linker_flags="$linker_flags $flag"
>+	fi
>+
>+	# Make a backup of the uninstalled library when relinking
>+	if test "$mode" = relink; then
>+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
>+	fi
>+
>+	# Do each of the archive commands.
>+	if test "$module" = yes && test -n "$module_cmds" ; then
>+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
>+	    eval test_cmds=\"$module_expsym_cmds\"
>+	    cmds=$module_expsym_cmds
>+	  else
>+	    eval test_cmds=\"$module_cmds\"
>+	    cmds=$module_cmds
>+	  fi
>+	else
>+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
>+	  eval test_cmds=\"$archive_expsym_cmds\"
>+	  cmds=$archive_expsym_cmds
>+	else
>+	  eval test_cmds=\"$archive_cmds\"
>+	  cmds=$archive_cmds
>+	  fi
>+	fi
>+
>+	if test "X$skipped_export" != "X:" &&
>+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
>+	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
>+	  :
>+	else
>+	  # The command line is too long to link in one step, link piecewise.
>+	  $echo "creating reloadable object files..."
>+
>+	  # Save the value of $output and $libobjs because we want to
>+	  # use them later.  If we have whole_archive_flag_spec, we
>+	  # want to use save_libobjs as it was before
>+	  # whole_archive_flag_spec was expanded, because we can't
>+	  # assume the linker understands whole_archive_flag_spec.
>+	  # This may have to be revisited, in case too many
>+	  # convenience libraries get linked in and end up exceeding
>+	  # the spec.
>+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
>+	    save_libobjs=$libobjs
>+	  fi
>+	  save_output=$output
>+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
>+
>+	  # Clear the reloadable object creation command queue and
>+	  # initialize k to one.
>+	  test_cmds=
>+	  concat_cmds=
>+	  objlist=
>+	  delfiles=
>+	  last_robj=
>+	  k=1
>+	  output=$output_objdir/$output_la-${k}.$objext
>+	  # Loop over the list of objects to be linked.
>+	  for obj in $save_libobjs
>+	  do
>+	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
>+	    if test "X$objlist" = X ||
>+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
>+		 test "$len" -le "$max_cmd_len"; }; then
>+	      objlist="$objlist $obj"
>+	    else
>+	      # The command $test_cmds is almost too long, add a
>+	      # command to the queue.
>+	      if test "$k" -eq 1 ; then
>+		# The first file doesn't have a previous command to add.
>+		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
>+	      else
>+		# All subsequent reloadable object files will link in
>+		# the last one created.
>+		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
>+	      fi
>+	      last_robj=$output_objdir/$output_la-${k}.$objext
>+	      k=`expr $k + 1`
>+	      output=$output_objdir/$output_la-${k}.$objext
>+	      objlist=$obj
>+	      len=1
>+	    fi
>+	  done
>+	  # Handle the remaining objects by creating one last
>+	  # reloadable object file.  All subsequent reloadable object
>+	  # files will link in the last one created.
>+	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
>+	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
>+
>+	  if ${skipped_export-false}; then
>+	    $show "generating symbol list for \`$libname.la'"
>+	    export_symbols="$output_objdir/$libname.exp"
>+	    $run $rm $export_symbols
>+	    libobjs=$output
>+	    # Append the command to create the export file.
>+	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
>+          fi
>+
>+	  # Set up a command to remove the reloadable object files
>+	  # after they are used.
>+	  i=0
>+	  while test "$i" -lt "$k"
>+	  do
>+	    i=`expr $i + 1`
>+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
>+	  done
>+
>+	  $echo "creating a temporary reloadable object file: $output"
> 
>-	      $show "${rm}r $xdir"
>-	      $run ${rm}r "$xdir"
>-	      $show "mkdir $xdir"
>-	      $run mkdir "$xdir"
>-	      status=$?
>-	      if test $status -ne 0 && test ! -d "$xdir"; then
>-		exit $status
>-	      fi
>-	      $show "(cd $xdir && $AR x $xabs)"
>-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
>+	  # Loop through the commands generated above and execute them.
>+	  save_ifs="$IFS"; IFS='~'
>+	  for cmd in $concat_cmds; do
>+	    IFS="$save_ifs"
>+	    $show "$cmd"
>+	    $run eval "$cmd" || exit $?
>+	  done
>+	  IFS="$save_ifs"
> 
>-	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
>-	    done
>-	  fi
>-	fi
>+	  libobjs=$output
>+	  # Restore the value of output.
>+	  output=$save_output
> 
>-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
>-	  eval flag=\"$thread_safe_flag_spec\"
>-	  linker_flags="$linker_flags $flag"
>-	fi
>+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
>+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
>+	  fi
>+	  # Expand the library linking commands again to reset the
>+	  # value of $libobjs for piecewise linking.
> 
>-	# Make a backup of the uninstalled library when relinking
>-	if test "$mode" = relink; then
>-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
>-	fi
>+	  # Do each of the archive commands.
>+	  if test "$module" = yes && test -n "$module_cmds" ; then
>+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
>+	      cmds=$module_expsym_cmds
>+	    else
>+	      cmds=$module_cmds
>+	    fi
>+	  else
>+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
>+	    cmds=$archive_expsym_cmds
>+	  else
>+	    cmds=$archive_cmds
>+	    fi
>+	  fi
> 
>-	# Do each of the archive commands.
>-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
>-	  eval cmds=\"$archive_expsym_cmds\"
>-	else
>-	  eval cmds=\"$archive_cmds\"
>+	  # Append the command to remove the reloadable object files
>+	  # to the just-reset $cmds.
>+	  eval cmds=\"\$cmds~\$rm $delfiles\"
> 	fi
> 	save_ifs="$IFS"; IFS='~'
> 	for cmd in $cmds; do
> 	  IFS="$save_ifs"
>+	  eval cmd=\"$cmd\"
> 	  $show "$cmd"
>-	  $run eval "$cmd" || exit $?
>+	  $run eval "$cmd" || {
>+	    lt_exit=$?
>+
>+	    # Restore the uninstalled library and exit
>+	    if test "$mode" = relink; then
>+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
>+	    fi
>+
>+	    exit $lt_exit
>+	  }
> 	done
> 	IFS="$save_ifs"
> 
> 	# Restore the uninstalled library and exit
> 	if test "$mode" = relink; then
> 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
>-	  exit 0
>+
>+	  if test -n "$convenience"; then
>+	    if test -z "$whole_archive_flag_spec"; then
>+	      $show "${rm}r $gentop"
>+	      $run ${rm}r "$gentop"
>+	    fi
>+	  fi
>+
>+	  exit $EXIT_SUCCESS
> 	fi
> 
> 	# Create links to the real library.
>@@ -2955,7 +4247,7 @@
>       *.lo)
> 	if test -n "$objs$old_deplibs"; then
> 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 	libobj="$output"
> 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
>@@ -2976,46 +4268,20 @@
>       reload_conv_objs=
>       gentop=
>       # reload_cmds runs $LD directly, so let us get rid of
>-      # -Wl from whole_archive_flag_spec
>+      # -Wl from whole_archive_flag_spec and hope we can get by with
>+      # turning comma into space..
>       wl=
> 
>       if test -n "$convenience"; then
> 	if test -n "$whole_archive_flag_spec"; then
>-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
>+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
>+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
> 	else
> 	  gentop="$output_objdir/${obj}x"
>-	  $show "${rm}r $gentop"
>-	  $run ${rm}r "$gentop"
>-	  $show "mkdir $gentop"
>-	  $run mkdir "$gentop"
>-	  status=$?
>-	  if test $status -ne 0 && test ! -d "$gentop"; then
>-	    exit $status
>-	  fi
> 	  generated="$generated $gentop"
> 
>-	  for xlib in $convenience; do
>-	    # Extract the objects.
>-	    case $xlib in
>-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
>-	    *) xabs=`pwd`"/$xlib" ;;
>-	    esac
>-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
>-	    xdir="$gentop/$xlib"
>-
>-	    $show "${rm}r $xdir"
>-	    $run ${rm}r "$xdir"
>-	    $show "mkdir $xdir"
>-	    $run mkdir "$xdir"
>-	    status=$?
>-	    if test $status -ne 0 && test ! -d "$xdir"; then
>-	      exit $status
>-	    fi
>-	    $show "(cd $xdir && $AR x $xabs)"
>-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
>-
>-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
>-	  done
>+	  func_extract_archives $gentop $convenience
>+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
> 	fi
>       fi
> 
>@@ -3023,10 +4289,11 @@
>       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
> 
>       output="$obj"
>-      eval cmds=\"$reload_cmds\"
>+      cmds=$reload_cmds
>       save_ifs="$IFS"; IFS='~'
>       for cmd in $cmds; do
> 	IFS="$save_ifs"
>+	eval cmd=\"$cmd\"
> 	$show "$cmd"
> 	$run eval "$cmd" || exit $?
>       done
>@@ -3039,7 +4306,7 @@
> 	  $run ${rm}r $gentop
> 	fi
> 
>-	exit 0
>+	exit $EXIT_SUCCESS
>       fi
> 
>       if test "$build_libtool_libs" != yes; then
>@@ -3050,37 +4317,24 @@
> 
> 	# Create an invalid libtool object if no PIC, so that we don't
> 	# accidentally link it into a program.
>-	$show "echo timestamp > $libobj"
>-	$run eval "echo timestamp > $libobj" || exit $?
>-	exit 0
>+	# $show "echo timestamp > $libobj"
>+	# $run eval "echo timestamp > $libobj" || exit $?
>+	exit $EXIT_SUCCESS
>       fi
> 
>       if test -n "$pic_flag" || test "$pic_mode" != default; then
> 	# Only do commands if we really have different PIC objects.
> 	reload_objs="$libobjs $reload_conv_objs"
> 	output="$libobj"
>-	eval cmds=\"$reload_cmds\"
>+	cmds=$reload_cmds
> 	save_ifs="$IFS"; IFS='~'
> 	for cmd in $cmds; do
> 	  IFS="$save_ifs"
>+	  eval cmd=\"$cmd\"
> 	  $show "$cmd"
> 	  $run eval "$cmd" || exit $?
> 	done
> 	IFS="$save_ifs"
>-      else
>-	# Just create a symlink.
>-	$show $rm $libobj
>-	$run $rm $libobj
>-	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
>-	if test "X$xdir" = "X$libobj"; then
>-	  xdir="."
>-	else
>-	  xdir="$xdir"
>-	fi
>-	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
>-	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
>-	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
>-	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
>       fi
> 
>       if test -n "$gentop"; then
>@@ -3088,12 +4342,12 @@
> 	$run ${rm}r $gentop
>       fi
> 
>-      exit 0
>+      exit $EXIT_SUCCESS
>       ;;
> 
>     prog)
>       case $host in
>-	*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
>+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
>       esac
>       if test -n "$vinfo"; then
> 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
>@@ -3118,6 +4372,45 @@
> 	;;
>       esac
> 
>+      case $host in
>+      *darwin*)
>+        # Don't allow lazy linking, it breaks C++ global constructors
>+        if test "$tagname" = CXX ; then
>+        compile_command="$compile_command ${wl}-bind_at_load"
>+        finalize_command="$finalize_command ${wl}-bind_at_load"
>+        fi
>+        ;;
>+      esac
>+
>+
>+      # move library search paths that coincide with paths to not yet
>+      # installed libraries to the beginning of the library search list
>+      new_libs=
>+      for path in $notinst_path; do
>+	case " $new_libs " in
>+	*" -L$path/$objdir "*) ;;
>+	*)
>+	  case " $compile_deplibs " in
>+	  *" -L$path/$objdir "*)
>+	    new_libs="$new_libs -L$path/$objdir" ;;
>+	  esac
>+	  ;;
>+	esac
>+      done
>+      for deplib in $compile_deplibs; do
>+	case $deplib in
>+	-L*)
>+	  case " $new_libs " in
>+	  *" $deplib "*) ;;
>+	  *) new_libs="$new_libs $deplib" ;;
>+	  esac
>+	  ;;
>+	*) new_libs="$new_libs $deplib" ;;
>+	esac
>+      done
>+      compile_deplibs="$new_libs"
>+
>+
>       compile_command="$compile_command $compile_deplibs"
>       finalize_command="$finalize_command $finalize_deplibs"
> 
>@@ -3162,10 +4455,15 @@
> 	fi
> 	case $host in
> 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
>+	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
> 	  case :$dllsearchpath: in
> 	  *":$libdir:"*) ;;
> 	  *) dllsearchpath="$dllsearchpath:$libdir";;
> 	  esac
>+	  case :$dllsearchpath: in
>+	  *":$testbindir:"*) ;;
>+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
>+	  esac
> 	  ;;
> 	esac
>       done
>@@ -3268,31 +4566,43 @@
> 	    done
> 
> 	    if test -n "$exclude_expsyms"; then
>-	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
>+	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
> 	      $run eval '$mv "$nlist"T "$nlist"'
> 	    fi
> 
> 	    if test -n "$export_symbols_regex"; then
>-	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
>+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
> 	      $run eval '$mv "$nlist"T "$nlist"'
> 	    fi
> 
> 	    # Prepare the list of exported symbols
> 	    if test -z "$export_symbols"; then
>-	      export_symbols="$output_objdir/$output.exp"
>+	      export_symbols="$output_objdir/$outputname.exp"
> 	      $run $rm $export_symbols
>-	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
>+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
>+              case $host in
>+              *cygwin* | *mingw* )
>+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
>+		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
>+                ;;
>+              esac
> 	    else
>-	      $run eval "sed -e 's/$[][.*^$]$/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
>-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
>+	      $run eval "${SED} -e 's/$[].[*^$]$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
>+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
> 	      $run eval 'mv "$nlist"T "$nlist"'
>+              case $host in
>+              *cygwin* | *mingw* )
>+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
>+		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
>+                ;;
>+              esac
> 	    fi
> 	  fi
> 
> 	  for arg in $dlprefiles; do
> 	    $show "extracting global C symbols from \`$arg'"
>-	    name=`echo "$arg" | sed -e 's%^.*/%%'`
>-	    $run eval 'echo ": $name " >> "$nlist"'
>+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
>+	    $run eval '$echo ": $name " >> "$nlist"'
> 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
> 	  done
> 
>@@ -3301,12 +4611,18 @@
> 	    test -f "$nlist" || : > "$nlist"
> 
> 	    if test -n "$exclude_expsyms"; then
>-	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
>+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
> 	      $mv "$nlist"T "$nlist"
> 	    fi
> 
> 	    # Try sorting and uniquifying the output.
>-	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
>+	    if grep -v "^: " < "$nlist" |
>+		if sort -k 3 </dev/null >/dev/null 2>&1; then
>+		  sort -k 3
>+		else
>+		  sort +2
>+		fi |
>+		uniq > "$nlist"S; then
> 	      :
> 	    else
> 	      grep -v "^: " < "$nlist" > "$nlist"S
>@@ -3315,7 +4631,7 @@
> 	    if test -f "$nlist"S; then
> 	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
> 	    else
>-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
>+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
> 	    fi
> 
> 	    $echo >> "$output_objdir/$dlsyms" "\
>@@ -3330,7 +4646,26 @@
> #endif
> 
> /* The mapping between symbol names and symbols. */
>+"
>+
>+	    case $host in
>+	    *cygwin* | *mingw* )
>+	  $echo >> "$output_objdir/$dlsyms" "\
>+/* DATA imports from DLLs on WIN32 can't be const, because
>+   runtime relocations are performed -- see ld's documentation
>+   on pseudo-relocs */
>+struct {
>+"
>+	      ;;
>+	    * )
>+	  $echo >> "$output_objdir/$dlsyms" "\
> const struct {
>+"
>+	      ;;
>+	    esac
>+
>+
>+	  $echo >> "$output_objdir/$dlsyms" "\
>   const char *name;
>   lt_ptr address;
> }
>@@ -3367,30 +4702,43 @@
> 	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
> 	    case "$compile_command " in
> 	    *" -static "*) ;;
>-	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
>+	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
> 	    esac;;
> 	  *-*-hpux*)
> 	    case "$compile_command " in
> 	    *" -static "*) ;;
>-	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
>+	    *) pic_flag_for_symtable=" $pic_flag";;
> 	    esac
> 	  esac
> 
> 	  # Now compile the dynamic symbol file.
>-	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
>-	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
>+	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
>+	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
> 
> 	  # Clean up the generated files.
> 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
> 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
> 
> 	  # Transform the symbol file into the correct name.
>-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
>-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
>+          case $host in
>+          *cygwin* | *mingw* )
>+            if test -f "$output_objdir/${outputname}.def" ; then
>+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
>+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
>+            else
>+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
>+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
>+             fi
>+            ;;
>+          * )
>+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
>+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
>+            ;;
>+          esac
> 	  ;;
> 	*)
> 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
>       else
>@@ -3399,19 +4747,19 @@
> 	# really was required.
> 
> 	# Nullify the symbol file.
>-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
>-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
>+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
>+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
>       fi
> 
>-      if test $need_relink = no || test "$build_libtool_libs" != yes; then
>+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
> 	# Replace the output file specification.
>-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
>+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
> 	link_command="$compile_command$compile_rpath"
> 
> 	# We have no uninstalled library dependencies, so finalize right now.
> 	$show "$link_command"
> 	$run eval "$link_command"
>-	status=$?
>+	exit_status=$?
> 
> 	# Delete the generated files.
> 	if test -n "$dlsyms"; then
>@@ -3419,7 +4767,7 @@
> 	  $run $rm "$output_objdir/${outputname}S.${objext}"
> 	fi
> 
>-	exit $status
>+	exit $exit_status
>       fi
> 
>       if test -n "$shlibpath_var"; then
>@@ -3478,7 +4826,7 @@
> 	# Link the executable and exit
> 	$show "$link_command"
> 	$run eval "$link_command" || exit $?
>-	exit 0
>+	exit $EXIT_SUCCESS
>       fi
> 
>       if test "$hardcode_action" = relink; then
>@@ -3492,7 +4840,7 @@
> 	if test "$fast_install" != no; then
> 	  link_command="$finalize_var$compile_command$finalize_rpath"
> 	  if test "$fast_install" = yes; then
>-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
>+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
> 	  else
> 	    # fast_install is set to needless
> 	    relink_command=
>@@ -3528,15 +4876,15 @@
> 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
> 	  fi
> 	done
>-	relink_command="cd `pwd`; $relink_command"
>-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
>+	relink_command="(cd `pwd`; $relink_command)"
>+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
>       fi
> 
>       # Quote $echo for shipping.
>-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
>-	case $0 in
>-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
>-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
>+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
>+	case $progpath in
>+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
>+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
> 	esac
> 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
>       else
>@@ -3548,15 +4896,376 @@
> 	# win32 will think the script is a binary if it has
> 	# a .exe suffix, so we strip it off here.
> 	case $output in
>-	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
>+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
> 	esac
> 	# test for cygwin because mv fails w/o .exe extensions
> 	case $host in
>-	  *cygwin*) exeext=.exe ;;
>+	  *cygwin*)
>+	    exeext=.exe
>+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
> 	  *) exeext= ;;
> 	esac
>-	$rm $output
>-	trap "$rm $output; exit 1" 1 2 15
>+	case $host in
>+	  *cygwin* | *mingw* )
>+            output_name=`basename $output`
>+            output_path=`dirname $output`
>+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
>+            cwrapper="$output_path/$output_name.exe"
>+            $rm $cwrappersource $cwrapper
>+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
>+
>+	    cat > $cwrappersource <<EOF
>+
>+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
>+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
>+
>+   The $output program cannot be directly executed until all the libtool
>+   libraries that it depends on are installed.
>+
>+   This wrapper executable should never be moved out of the build directory.
>+   If it is, it will not operate correctly.
>+
>+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
>+   but could eventually absorb all of the scripts functionality and
>+   exec $objdir/$outputname directly.
>+*/
>+EOF
>+	    cat >> $cwrappersource<<"EOF"
>+#include <stdio.h>
>+#include <stdlib.h>
>+#include <unistd.h>
>+#include <malloc.h>
>+#include <stdarg.h>
>+#include <assert.h>
>+#include <string.h>
>+#include <ctype.h>
>+#include <sys/stat.h>
>+
>+#if defined(PATH_MAX)
>+# define LT_PATHMAX PATH_MAX
>+#elif defined(MAXPATHLEN)
>+# define LT_PATHMAX MAXPATHLEN
>+#else
>+# define LT_PATHMAX 1024
>+#endif
>+
>+#ifndef DIR_SEPARATOR
>+# define DIR_SEPARATOR '/'
>+# define PATH_SEPARATOR ':'
>+#endif
>+
>+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
>+  defined (__OS2__)
>+# define HAVE_DOS_BASED_FILE_SYSTEM
>+# ifndef DIR_SEPARATOR_2
>+#  define DIR_SEPARATOR_2 '\\'
>+# endif
>+# ifndef PATH_SEPARATOR_2
>+#  define PATH_SEPARATOR_2 ';'
>+# endif
>+#endif
>+
>+#ifndef DIR_SEPARATOR_2
>+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
>+#else /* DIR_SEPARATOR_2 */
>+# define IS_DIR_SEPARATOR(ch) \
>+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
>+#endif /* DIR_SEPARATOR_2 */
>+
>+#ifndef PATH_SEPARATOR_2
>+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
>+#else /* PATH_SEPARATOR_2 */
>+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
>+#endif /* PATH_SEPARATOR_2 */
>+
>+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
>+#define XFREE(stale) do { \
>+  if (stale) { free ((void *) stale); stale = 0; } \
>+} while (0)
>+
>+/* -DDEBUG is fairly common in CFLAGS.  */
>+#undef DEBUG
>+#if defined DEBUGWRAPPER
>+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
>+#else
>+# define DEBUG(format, ...)
>+#endif
>+
>+const char *program_name = NULL;
>+
>+void * xmalloc (size_t num);
>+char * xstrdup (const char *string);
>+const char * base_name (const char *name);
>+char * find_executable(const char *wrapper);
>+int    check_executable(const char *path);
>+char * strendzap(char *str, const char *pat);
>+void lt_fatal (const char *message, ...);
>+
>+int
>+main (int argc, char *argv[])
>+{
>+  char **newargz;
>+  int i;
>+
>+  program_name = (char *) xstrdup (base_name (argv[0]));
>+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
>+  DEBUG("(main) program_name : %s\n",program_name);
>+  newargz = XMALLOC(char *, argc+2);
>+EOF
>+
>+            cat >> $cwrappersource <<EOF
>+  newargz[0] = (char *) xstrdup("$SHELL");
>+EOF
>+
>+            cat >> $cwrappersource <<"EOF"
>+  newargz[1] = find_executable(argv[0]);
>+  if (newargz[1] == NULL)
>+    lt_fatal("Couldn't find %s", argv[0]);
>+  DEBUG("(main) found exe at : %s\n",newargz[1]);
>+  /* we know the script has the same name, without the .exe */
>+  /* so make sure newargz[1] doesn't end in .exe */
>+  strendzap(newargz[1],".exe");
>+  for (i = 1; i < argc; i++)
>+    newargz[i+1] = xstrdup(argv[i]);
>+  newargz[argc+1] = NULL;
>+
>+  for (i=0; i<argc+1; i++)
>+  {
>+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
>+    ;
>+  }
>+
>+EOF
>+
>+            case $host_os in
>+              mingw*)
>+                cat >> $cwrappersource <<EOF
>+  execv("$SHELL",(char const **)newargz);
>+EOF
>+              ;;
>+              *)
>+                cat >> $cwrappersource <<EOF
>+  execv("$SHELL",newargz);
>+EOF
>+              ;;
>+            esac
>+
>+            cat >> $cwrappersource <<"EOF"
>+  return 127;
>+}
>+
>+void *
>+xmalloc (size_t num)
>+{
>+  void * p = (void *) malloc (num);
>+  if (!p)
>+    lt_fatal ("Memory exhausted");
>+
>+  return p;
>+}
>+
>+char *
>+xstrdup (const char *string)
>+{
>+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
>+;
>+}
>+
>+const char *
>+base_name (const char *name)
>+{
>+  const char *base;
>+
>+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
>+  /* Skip over the disk name in MSDOS pathnames. */
>+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
>+    name += 2;
>+#endif
>+
>+  for (base = name; *name; name++)
>+    if (IS_DIR_SEPARATOR (*name))
>+      base = name + 1;
>+  return base;
>+}
>+
>+int
>+check_executable(const char * path)
>+{
>+  struct stat st;
>+
>+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
>+  if ((!path) || (!*path))
>+    return 0;
>+
>+  if ((stat (path, &st) >= 0) &&
>+      (
>+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
>+#if defined (S_IXOTH)
>+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
>+#endif
>+#if defined (S_IXGRP)
>+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
>+#endif
>+       ((st.st_mode & S_IXUSR) == S_IXUSR))
>+      )
>+    return 1;
>+  else
>+    return 0;
>+}
>+
>+/* Searches for the full path of the wrapper.  Returns
>+   newly allocated full path name if found, NULL otherwise */
>+char *
>+find_executable (const char* wrapper)
>+{
>+  int has_slash = 0;
>+  const char* p;
>+  const char* p_next;
>+  /* static buffer for getcwd */
>+  char tmp[LT_PATHMAX + 1];
>+  int tmp_len;
>+  char* concat_name;
>+
>+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
>+
>+  if ((wrapper == NULL) || (*wrapper == '\0'))
>+    return NULL;
>+
>+  /* Absolute path? */
>+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
>+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
>+  {
>+    concat_name = xstrdup (wrapper);
>+    if (check_executable(concat_name))
>+      return concat_name;
>+    XFREE(concat_name);
>+  }
>+  else
>+  {
>+#endif
>+    if (IS_DIR_SEPARATOR (wrapper[0]))
>+    {
>+      concat_name = xstrdup (wrapper);
>+      if (check_executable(concat_name))
>+        return concat_name;
>+      XFREE(concat_name);
>+    }
>+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
>+  }
>+#endif
>+
>+  for (p = wrapper; *p; p++)
>+    if (*p == '/')
>+    {
>+      has_slash = 1;
>+      break;
>+    }
>+  if (!has_slash)
>+  {
>+    /* no slashes; search PATH */
>+    const char* path = getenv ("PATH");
>+    if (path != NULL)
>+    {
>+      for (p = path; *p; p = p_next)
>+      {
>+        const char* q;
>+        size_t p_len;
>+        for (q = p; *q; q++)
>+          if (IS_PATH_SEPARATOR(*q))
>+            break;
>+        p_len = q - p;
>+        p_next = (*q == '\0' ? q : q + 1);
>+        if (p_len == 0)
>+        {
>+          /* empty path: current directory */
>+          if (getcwd (tmp, LT_PATHMAX) == NULL)
>+            lt_fatal ("getcwd failed");
>+          tmp_len = strlen(tmp);
>+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
>+          memcpy (concat_name, tmp, tmp_len);
>+          concat_name[tmp_len] = '/';
>+          strcpy (concat_name + tmp_len + 1, wrapper);
>+        }
>+        else
>+        {
>+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
>+          memcpy (concat_name, p, p_len);
>+          concat_name[p_len] = '/';
>+          strcpy (concat_name + p_len + 1, wrapper);
>+        }
>+        if (check_executable(concat_name))
>+          return concat_name;
>+        XFREE(concat_name);
>+      }
>+    }
>+    /* not found in PATH; assume curdir */
>+  }
>+  /* Relative path | not found in path: prepend cwd */
>+  if (getcwd (tmp, LT_PATHMAX) == NULL)
>+    lt_fatal ("getcwd failed");
>+  tmp_len = strlen(tmp);
>+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
>+  memcpy (concat_name, tmp, tmp_len);
>+  concat_name[tmp_len] = '/';
>+  strcpy (concat_name + tmp_len + 1, wrapper);
>+
>+  if (check_executable(concat_name))
>+    return concat_name;
>+  XFREE(concat_name);
>+  return NULL;
>+}
>+
>+char *
>+strendzap(char *str, const char *pat)
>+{
>+  size_t len, patlen;
>+
>+  assert(str != NULL);
>+  assert(pat != NULL);
>+
>+  len = strlen(str);
>+  patlen = strlen(pat);
>+
>+  if (patlen <= len)
>+  {
>+    str += len - patlen;
>+    if (strcmp(str, pat) == 0)
>+      *str = '\0';
>+  }
>+  return str;
>+}
>+
>+static void
>+lt_error_core (int exit_status, const char * mode,
>+          const char * message, va_list ap)
>+{
>+  fprintf (stderr, "%s: %s: ", program_name, mode);
>+  vfprintf (stderr, message, ap);
>+  fprintf (stderr, ".\n");
>+
>+  if (exit_status >= 0)
>+    exit (exit_status);
>+}
>+
>+void
>+lt_fatal (const char *message, ...)
>+{
>+  va_list ap;
>+  va_start (ap, message);
>+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
>+  va_end (ap);
>+}
>+EOF
>+          # we should really use a build-platform specific compiler
>+          # here, but OTOH, the wrappers (shell script and this C one)
>+          # are only useful if you want to execute the "real" binary.
>+          # Since the "real" binary is built for $host, then this
>+          # wrapper might as well be built for $host, too.
>+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
>+          ;;
>+        esac
>+        $rm $output
>+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
> 
> 	$echo > $output "\
> #! $SHELL
>@@ -3572,12 +5281,24 @@
> 
> # Sed substitution that helps us do robust quoting.  It backslashifies
> # metacharacters that are still active within double-quoted strings.
>-Xsed='sed -e 1s/^X//'
>+Xsed='${SED} -e 1s/^X//'
> sed_quote_subst='$sed_quote_subst'
> 
>+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
>+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
>+  emulate sh
>+  NULLCMD=:
>+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
>+  # is contrary to our usage.  Disable this feature.
>+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
>+  setopt NO_GLOB_SUBST
>+else
>+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
>+fi
>+
> # The HP-UX ksh and POSIX shell print the target directory to stdout
> # if CDPATH is set.
>-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> 
> relink_command=\"$relink_command\"
> 
>@@ -3610,7 +5331,7 @@
>   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
> 
>   # Follow symbolic links until we get to the real thisdir.
>-  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
>+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
>   while test -n \"\$file\"; do
>     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
> 
>@@ -3623,7 +5344,7 @@
>     fi
> 
>     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
>-    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
>+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
>   done
> 
>   # Try to get the absolute directory name.
>@@ -3632,12 +5353,12 @@
> "
> 
> 	if test "$fast_install" = yes; then
>-	  echo >> $output "\
>+	  $echo >> $output "\
>   program=lt-'$outputname'$exeext
>   progdir=\"\$thisdir/$objdir\"
> 
>   if test ! -f \"\$progdir/\$program\" || \\
>-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
>+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
>        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
> 
>     file=\"\$\$-\$program\"
>@@ -3648,7 +5369,7 @@
>       $rm \"\$progdir/\$file\"
>     fi"
> 
>-	  echo >> $output "\
>+	  $echo >> $output "\
> 
>     # relink executable if necessary
>     if test -n \"\$relink_command\"; then
>@@ -3656,7 +5377,7 @@
>       else
> 	$echo \"\$relink_command_output\" >&2
> 	$rm \"\$progdir/\$file\"
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
>     fi
> 
>@@ -3666,13 +5387,13 @@
>     $rm \"\$progdir/\$file\"
>   fi"
> 	else
>-	  echo >> $output "\
>+	  $echo >> $output "\
>   program='$outputname'
>   progdir=\"\$thisdir/$objdir\"
> "
> 	fi
> 
>-	echo >> $output "\
>+	$echo >> $output "\
> 
>   if test -f \"\$progdir/\$program\"; then"
> 
>@@ -3703,47 +5424,35 @@
>       # Run the actual program with our arguments.
> "
> 	case $host in
>-	# win32 systems need to use the prog path for dll
>-	# lookup to work
>-	*-*-cygwin* | *-*-pw32*)
>-	  $echo >> $output "\
>-      exec \$progdir/\$program \${1+\"\$@\"}
>-"
>-	  ;;
>-
> 	# Backslashes separate directories on plain windows
> 	*-*-mingw | *-*-os2*)
> 	  $echo >> $output "\
>-      exec \$progdir\\\\\$program \${1+\"\$@\"}
>+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
> "
> 	  ;;
> 
> 	*)
> 	  $echo >> $output "\
>-      # Export the path to the program.
>-      PATH=\"\$progdir:\$PATH\"
>-      export PATH
>-
>-      exec \$program \${1+\"\$@\"}
>+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
> "
> 	  ;;
> 	esac
> 	$echo >> $output "\
>-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
>-      exit 1
>+      \$echo \"\$0: cannot exec \$program \$*\"
>+      exit $EXIT_FAILURE
>     fi
>   else
>     # The program doesn't exist.
>-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
>+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
>     \$echo \"This script is just a wrapper for \$program.\" 1>&2
>-    echo \"See the $PACKAGE documentation for more information.\" 1>&2
>-    exit 1
>+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
>+    exit $EXIT_FAILURE
>   fi
> fi\
> "
> 	chmod +x $output
>       fi
>-      exit 0
>+      exit $EXIT_SUCCESS
>       ;;
>     esac
> 
>@@ -3759,74 +5468,130 @@
> 	  oldobjs="$libobjs_save"
> 	  build_libtool_libs=no
> 	else
>-	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
>+	  oldobjs="$old_deplibs $non_pic_objects"
> 	fi
> 	addlibs="$old_convenience"
>       fi
> 
>       if test -n "$addlibs"; then
> 	gentop="$output_objdir/${outputname}x"
>-	$show "${rm}r $gentop"
>-	$run ${rm}r "$gentop"
>-	$show "mkdir $gentop"
>-	$run mkdir "$gentop"
>-	status=$?
>-	if test $status -ne 0 && test ! -d "$gentop"; then
>-	  exit $status
>-	fi
> 	generated="$generated $gentop"
> 
>-	# Add in members from convenience archives.
>-	for xlib in $addlibs; do
>-	  # Extract the objects.
>-	  case $xlib in
>-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
>-	  *) xabs=`pwd`"/$xlib" ;;
>-	  esac
>-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
>-	  xdir="$gentop/$xlib"
>-
>-	  $show "${rm}r $xdir"
>-	  $run ${rm}r "$xdir"
>-	  $show "mkdir $xdir"
>-	  $run mkdir "$xdir"
>-	  status=$?
>-	  if test $status -ne 0 && test ! -d "$xdir"; then
>-	    exit $status
>-	  fi
>-	  $show "(cd $xdir && $AR x $xabs)"
>-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
>-
>-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
>-	done
>+	func_extract_archives $gentop $addlibs
>+	oldobjs="$oldobjs $func_extract_archives_result"
>       fi
> 
>       # Do each command in the archive commands.
>       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
>-	eval cmds=\"$old_archive_from_new_cmds\"
>+       cmds=$old_archive_from_new_cmds
>       else
>-	# Ensure that we have .o objects in place in case we decided
>-	# not to build a shared library, and have fallen back to building
>-	# static libs even though --disable-static was passed!
>-	for oldobj in $oldobjs; do
>-	  if test ! -f $oldobj; then
>-	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
>-	    if test "X$xdir" = "X$oldobj"; then
>-	      xdir="."
>-	    else
>-	      xdir="$xdir"
>+	# POSIX demands no paths to be encoded in archives.  We have
>+	# to avoid creating archives with duplicate basenames if we
>+	# might have to extract them afterwards, e.g., when creating a
>+	# static archive out of a convenience library, or when linking
>+	# the entirety of a libtool archive into another (currently
>+	# not supported by libtool).
>+	if (for obj in $oldobjs
>+	    do
>+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
>+	    done | sort | sort -uc >/dev/null 2>&1); then
>+	  :
>+	else
>+	  $echo "copying selected object files to avoid basename conflicts..."
>+
>+	  if test -z "$gentop"; then
>+	    gentop="$output_objdir/${outputname}x"
>+	    generated="$generated $gentop"
>+
>+	    $show "${rm}r $gentop"
>+	    $run ${rm}r "$gentop"
>+	    $show "$mkdir $gentop"
>+	    $run $mkdir "$gentop"
>+	    exit_status=$?
>+	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
>+	      exit $exit_status
> 	    fi
>-	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
>-	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
>-	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
>-	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
> 	  fi
>-	done
>+
>+	  save_oldobjs=$oldobjs
>+	  oldobjs=
>+	  counter=1
>+	  for obj in $save_oldobjs
>+	  do
>+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
>+	    case " $oldobjs " in
>+	    " ") oldobjs=$obj ;;
>+	    *[\ /]"$objbase "*)
>+	      while :; do
>+		# Make sure we don't pick an alternate name that also
>+		# overlaps.
>+		newobj=lt$counter-$objbase
>+		counter=`expr $counter + 1`
>+		case " $oldobjs " in
>+		*[\ /]"$newobj "*) ;;
>+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
>+		esac
>+	      done
>+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
>+	      $run ln "$obj" "$gentop/$newobj" ||
>+	      $run cp "$obj" "$gentop/$newobj"
>+	      oldobjs="$oldobjs $gentop/$newobj"
>+	      ;;
>+	    *) oldobjs="$oldobjs $obj" ;;
>+	    esac
>+	  done
>+	fi
> 
> 	eval cmds=\"$old_archive_cmds\"
>+
>+	if len=`expr "X$cmds" : ".*"` &&
>+	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
>+	  cmds=$old_archive_cmds
>+	else
>+	  # the command line is too long to link in one step, link in parts
>+	  $echo "using piecewise archive linking..."
>+	  save_RANLIB=$RANLIB
>+	  RANLIB=:
>+	  objlist=
>+	  concat_cmds=
>+	  save_oldobjs=$oldobjs
>+
>+	  # Is there a better way of finding the last object in the list?
>+	  for obj in $save_oldobjs
>+	  do
>+	    last_oldobj=$obj
>+	  done
>+	  for obj in $save_oldobjs
>+	  do
>+	    oldobjs="$objlist $obj"
>+	    objlist="$objlist $obj"
>+	    eval test_cmds=\"$old_archive_cmds\"
>+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
>+	       test "$len" -le "$max_cmd_len"; then
>+	      :
>+	    else
>+	      # the above command should be used before it gets too long
>+	      oldobjs=$objlist
>+	      if test "$obj" = "$last_oldobj" ; then
>+	        RANLIB=$save_RANLIB
>+	      fi
>+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
>+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
>+	      objlist=
>+	    fi
>+	  done
>+	  RANLIB=$save_RANLIB
>+	  oldobjs=$objlist
>+	  if test "X$oldobjs" = "X" ; then
>+	    eval cmds=\"\$concat_cmds\"
>+	  else
>+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
>+	  fi
>+	fi
>       fi
>       save_ifs="$IFS"; IFS='~'
>       for cmd in $cmds; do
>+        eval cmd=\"$cmd\"
> 	IFS="$save_ifs"
> 	$show "$cmd"
> 	$run eval "$cmd" || exit $?
>@@ -3858,8 +5623,12 @@
> 	fi
>       done
>       # Quote the link command for shipping.
>-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
>-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
>+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
>+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
>+      if test "$hardcode_automatic" = yes ; then
>+	relink_command=
>+      fi
>+
> 
>       # Only create the output if not a dry run.
>       if test -z "$run"; then
>@@ -3875,10 +5644,10 @@
> 	      case $deplib in
> 	      *.la)
> 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
>-		eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $deplib`
>+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
> 		if test -z "$libdir"; then
> 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
>-		  exit 1
>+		  exit $EXIT_FAILURE
> 		fi
> 		newdependency_libs="$newdependency_libs $libdir/$name"
> 		;;
>@@ -3889,10 +5658,10 @@
> 	    newdlfiles=
> 	    for lib in $dlfiles; do
> 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
>-	      eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $lib`
>+	      eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
> 	      if test -z "$libdir"; then
> 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
>-		exit 1
>+		exit $EXIT_FAILURE
> 	      fi
> 	      newdlfiles="$newdlfiles $libdir/$name"
> 	    done
>@@ -3900,20 +5669,39 @@
> 	    newdlprefiles=
> 	    for lib in $dlprefiles; do
> 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
>-	      eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $lib`
>+	      eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
> 	      if test -z "$libdir"; then
> 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
>-		exit 1
>+		exit $EXIT_FAILURE
> 	      fi
> 	      newdlprefiles="$newdlprefiles $libdir/$name"
> 	    done
> 	    dlprefiles="$newdlprefiles"
>+	  else
>+	    newdlfiles=
>+	    for lib in $dlfiles; do
>+	      case $lib in
>+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
>+		*) abs=`pwd`"/$lib" ;;
>+	      esac
>+	      newdlfiles="$newdlfiles $abs"
>+	    done
>+	    dlfiles="$newdlfiles"
>+	    newdlprefiles=
>+	    for lib in $dlprefiles; do
>+	      case $lib in
>+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
>+		*) abs=`pwd`"/$lib" ;;
>+	      esac
>+	      newdlprefiles="$newdlprefiles $abs"
>+	    done
>+	    dlprefiles="$newdlprefiles"
> 	  fi
> 	  $rm $output
> 	  # place dlname in correct position for cygwin
> 	  tdlname=$dlname
> 	  case $host,$output,$installed,$module,$dlname in
>-	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
>+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
> 	  esac
> 	  $echo > $output "\
> # $outputname - a libtool library file
>@@ -3942,13 +5730,16 @@
> # Is this an already installed library?
> installed=$installed
> 
>+# Should we warn about portability when linking against -modules?
>+shouldnotlink=$module
>+
> # Files to dlopen/dlpreopen
> dlopen='$dlfiles'
> dlpreopen='$dlprefiles'
> 
> # Directory that this library needs to be installed in:
> libdir='$install_libdir'"
>-	  if test "$installed" = no && test $need_relink = yes; then
>+	  if test "$installed" = no && test "$need_relink" = yes; then
> 	    $echo >> $output "\
> relink_command=\"$relink_command\""
> 	  fi
>@@ -3961,7 +5752,7 @@
>       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
>       ;;
>     esac
>-    exit 0
>+    exit $EXIT_SUCCESS
>     ;;
> 
>   # libtool install mode
>@@ -3972,11 +5763,11 @@
>     # install_prog (especially on Windows NT).
>     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
>        # Allow the use of GNU shtool's install command.
>-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
>+       $echo "X$nonopt" | grep shtool > /dev/null; then
>       # Aesthetically quote it.
>       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
>       case $arg in
>-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*)
>+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
> 	arg="\"$arg\""
> 	;;
>       esac
>@@ -3985,14 +5776,14 @@
>       shift
>     else
>       install_prog=
>-      arg="$nonopt"
>+      arg=$nonopt
>     fi
> 
>     # The real first argument should be the name of the installation program.
>     # Aesthetically quote it.
>     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
>     case $arg in
>-    *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*)
>+    *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
>       arg="\"$arg\""
>       ;;
>     esac
>@@ -4010,28 +5801,31 @@
>     do
>       if test -n "$dest"; then
> 	files="$files $dest"
>-	dest="$arg"
>+	dest=$arg
> 	continue
>       fi
> 
>       case $arg in
>       -d) isdir=yes ;;
>-      -f) prev="-f" ;;
>-      -g) prev="-g" ;;
>-      -m) prev="-m" ;;
>-      -o) prev="-o" ;;
>+      -f) 
>+      	case " $install_prog " in
>+	*[\\\ /]cp\ *) ;;
>+	*) prev=$arg ;;
>+	esac
>+	;;
>+      -g | -m | -o) prev=$arg ;;
>       -s)
> 	stripme=" -s"
> 	continue
> 	;;
>-      -*) ;;
>-
>+      -*)
>+	;;
>       *)
> 	# If the previous option needed an argument, then skip it.
> 	if test -n "$prev"; then
> 	  prev=
> 	else
>-	  dest="$arg"
>+	  dest=$arg
> 	  continue
> 	fi
> 	;;
>@@ -4040,7 +5834,7 @@
>       # Aesthetically quote the argument.
>       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
>       case $arg in
>-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*)
>+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
> 	arg="\"$arg\""
> 	;;
>       esac
>@@ -4050,13 +5844,13 @@
>     if test -z "$install_prog"; then
>       $echo "$modename: you must specify an install program" 1>&2
>       $echo "$help" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>     fi
> 
>     if test -n "$prev"; then
>       $echo "$modename: the \`$prev' option requires an argument" 1>&2
>       $echo "$help" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>     fi
> 
>     if test -z "$files"; then
>@@ -4066,7 +5860,7 @@
> 	$echo "$modename: you must specify a destination" 1>&2
>       fi
>       $echo "$help" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>     fi
> 
>     # Strip any trailing slash from the destination.
>@@ -4084,10 +5878,10 @@
> 
>       # Not a directory, so check to see that there is only one file specified.
>       set dummy $files
>-      if test $# -gt 2; then
>+      if test "$#" -gt 2; then
> 	$echo "$modename: \`$dest' is not a directory" 1>&2
> 	$echo "$help" 1>&2
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
>     fi
>     case $destdir in
>@@ -4099,7 +5893,7 @@
> 	*)
> 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
> 	  $echo "$help" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
>       done
>@@ -4124,11 +5918,11 @@
> 
>       *.la)
> 	# Check to see that this really is a libtool archive.
>-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
>+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
> 	else
> 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
> 	  $echo "$help" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 
> 	library_names=
>@@ -4159,12 +5953,33 @@
> 	dir="$dir$objdir"
> 
> 	if test -n "$relink_command"; then
>+	  # Determine the prefix the user has applied to our future dir.
>+	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
>+
>+	  # Don't allow the user to place us outside of our expected
>+	  # location b/c this prevents finding dependent libraries that
>+	  # are installed to the same prefix.
>+	  # At present, this check doesn't affect windows .dll's that
>+	  # are installed into $libdir/../bin (currently, that works fine)
>+	  # but it's something to keep an eye on.
>+	  if test "$inst_prefix_dir" = "$destdir"; then
>+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
>+	    exit $EXIT_FAILURE
>+	  fi
>+
>+	  if test -n "$inst_prefix_dir"; then
>+	    # Stick the inst_prefix_dir data into the link command.
>+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
>+	  else
>+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
>+	  fi
>+
> 	  $echo "$modename: warning: relinking \`$file'" 1>&2
> 	  $show "$relink_command"
> 	  if $run eval "$relink_command"; then :
> 	  else
> 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
>-	    continue
>+	    exit $EXIT_FAILURE
> 	  fi
> 	fi
> 
>@@ -4186,25 +6001,38 @@
> 	    $run eval "$striplib $destdir/$realname" || exit $?
> 	  fi
> 
>-	  if test $# -gt 0; then
>+	  if test "$#" -gt 0; then
> 	    # Delete the old symlinks, and create new ones.
>+	    # Try `ln -sf' first, because the `ln' binary might depend on
>+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
>+	    # so we also need to try rm && ln -s.
> 	    for linkname
> 	    do
> 	      if test "$linkname" != "$realname"; then
>-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
>-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
>+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
>+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
> 	      fi
> 	    done
> 	  fi
> 
> 	  # Do each command in the postinstall commands.
> 	  lib="$destdir/$realname"
>-	  eval cmds=\"$postinstall_cmds\"
>+	  cmds=$postinstall_cmds
> 	  save_ifs="$IFS"; IFS='~'
> 	  for cmd in $cmds; do
> 	    IFS="$save_ifs"
>+	    eval cmd=\"$cmd\"
> 	    $show "$cmd"
>-	    $run eval "$cmd" || exit $?
>+	    $run eval "$cmd" || {
>+	      lt_exit=$?
>+
>+	      # Restore the uninstalled library and exit
>+	      if test "$mode" = relink; then
>+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
>+	      fi
>+
>+	      exit $lt_exit
>+	    }
> 	  done
> 	  IFS="$save_ifs"
> 	fi
>@@ -4242,7 +6070,7 @@
> 	*)
> 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
> 	  $echo "$help" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	  ;;
> 	esac
> 
>@@ -4260,7 +6088,7 @@
> 	  $show "$install_prog $staticobj $staticdest"
> 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
> 	fi
>-	exit 0
>+	exit $EXIT_SUCCESS
> 	;;
> 
>       *)
>@@ -4272,21 +6100,47 @@
> 	  destfile="$destdir/$destfile"
> 	fi
> 
>+	# If the file is missing, and there is a .exe on the end, strip it
>+	# because it is most likely a libtool script we actually want to
>+	# install
>+	stripped_ext=""
>+	case $file in
>+	  *.exe)
>+	    if test ! -f "$file"; then
>+	      file=`$echo $file|${SED} 's,.exe$,,'`
>+	      stripped_ext=".exe"
>+	    fi
>+	    ;;
>+	esac
>+
> 	# Do a test to see if this is really a libtool program.
>-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+	case $host in
>+	*cygwin*|*mingw*)
>+	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
>+	    ;;
>+	*)
>+	    wrapper=$file
>+	    ;;
>+	esac
>+	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
> 	  notinst_deplibs=
> 	  relink_command=
> 
>+	  # Note that it is not necessary on cygwin/mingw to append a dot to
>+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
>+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
>+	  # `FILE.' does not work on cygwin managed mounts.
>+	  #
> 	  # If there is no directory component, then add one.
>-	  case $file in
>-	  */* | *\\*) . $file ;;
>-	  *) . ./$file ;;
>+	  case $wrapper in
>+	  */* | *\\*) . ${wrapper} ;;
>+	  *) . ./${wrapper} ;;
> 	  esac
> 
> 	  # Check the variables that should have been set.
> 	  if test -z "$notinst_deplibs"; then
>-	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
>-	    exit 1
>+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
>+	    exit $EXIT_FAILURE
> 	  fi
> 
> 	  finalize=yes
>@@ -4308,27 +6162,25 @@
> 	  done
> 
> 	  relink_command=
>+	  # Note that it is not necessary on cygwin/mingw to append a dot to
>+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
>+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
>+	  # `FILE.' does not work on cygwin managed mounts.
>+	  #
> 	  # If there is no directory component, then add one.
>-	  case $file in
>-	  */* | *\\*) . $file ;;
>-	  *) . ./$file ;;
>+	  case $wrapper in
>+	  */* | *\\*) . ${wrapper} ;;
>+	  *) . ./${wrapper} ;;
> 	  esac
> 
> 	  outputname=
> 	  if test "$fast_install" = no && test -n "$relink_command"; then
> 	    if test "$finalize" = yes && test -z "$run"; then
>-	      tmpdir="/tmp"
>-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
>-	      tmpdir="$tmpdir/libtool-$$"
>-	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
>-	      else
>-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
>-		continue
>-	      fi
>-	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>+	      tmpdir=`func_mktempdir`
>+	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
> 	      outputname="$tmpdir/$file"
> 	      # Replace the output file specification.
>-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
>+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
> 
> 	      $show "$relink_command"
> 	      if $run eval "$relink_command"; then :
>@@ -4343,14 +6195,14 @@
> 	    fi
> 	  else
> 	    # Install the binary that we compiled earlier.
>-	    file=`$echo "X$file" | $Xsed -e "s%$[^/]*$$%$objdir/\1%"`
>+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%$[^/]*$$%$objdir/\1%"`
> 	  fi
> 	fi
> 
> 	# remove .exe since cygwin /usr/bin/install will append another
>-	# one anyways
>+	# one anyway 
> 	case $install_prog,$host in
>-	/usr/bin/install*,*cygwin*)
>+	*/usr/bin/install*,*cygwin*)
> 	  case $file:$destfile in
> 	  *.exe:*.exe)
> 	    # this is ok
>@@ -4359,7 +6211,7 @@
> 	    destfile=$destfile.exe
> 	    ;;
> 	  *:*.exe)
>-	    destfile=`echo $destfile | sed -e 's,.exe$,,'`
>+	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
> 	    ;;
> 	  esac
> 	  ;;
>@@ -4380,16 +6232,17 @@
>       $show "$install_prog $file $oldlib"
>       $run eval "$install_prog \$file \$oldlib" || exit $?
> 
>-      if test -n "$stripme" && test -n "$striplib"; then
>+      if test -n "$stripme" && test -n "$old_striplib"; then
> 	$show "$old_striplib $oldlib"
> 	$run eval "$old_striplib $oldlib" || exit $?
>       fi
> 
>       # Do each command in the postinstall commands.
>-      eval cmds=\"$old_postinstall_cmds\"
>+      cmds=$old_postinstall_cmds
>       save_ifs="$IFS"; IFS='~'
>       for cmd in $cmds; do
> 	IFS="$save_ifs"
>+	eval cmd=\"$cmd\"
> 	$show "$cmd"
> 	$run eval "$cmd" || exit $?
>       done
>@@ -4403,9 +6256,9 @@
>     if test -n "$current_libdirs"; then
>       # Maybe just do a dry run.
>       test -n "$run" && current_libdirs=" -n$current_libdirs"
>-      exec_cmd='$SHELL $0 --finish$current_libdirs'
>+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
>     else
>-      exit 0
>+      exit $EXIT_SUCCESS
>     fi
>     ;;
> 
>@@ -4424,10 +6277,11 @@
>       for libdir in $libdirs; do
> 	if test -n "$finish_cmds"; then
> 	  # Do each command in the finish commands.
>-	  eval cmds=\"$finish_cmds\"
>+	  cmds=$finish_cmds
> 	  save_ifs="$IFS"; IFS='~'
> 	  for cmd in $cmds; do
> 	    IFS="$save_ifs"
>+	    eval cmd=\"$cmd\"
> 	    $show "$cmd"
> 	    $run eval "$cmd" || admincmds="$admincmds
>        $cmd"
>@@ -4444,43 +6298,43 @@
>     fi
> 
>     # Exit here if they wanted silent mode.
>-    test "$show" = ":" && exit 0
>+    test "$show" = : && exit $EXIT_SUCCESS
> 
>-    echo "----------------------------------------------------------------------"
>-    echo "Libraries have been installed in:"
>+    $echo "X----------------------------------------------------------------------" | $Xsed
>+    $echo "Libraries have been installed in:"
>     for libdir in $libdirs; do
>-      echo "   $libdir"
>+      $echo "   $libdir"
>     done
>-    echo
>-    echo "If you ever happen to want to link against installed libraries"
>-    echo "in a given directory, LIBDIR, you must either use libtool, and"
>-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
>-    echo "flag during linking and do at least one of the following:"
>+    $echo
>+    $echo "If you ever happen to want to link against installed libraries"
>+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
>+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
>+    $echo "flag during linking and do at least one of the following:"
>     if test -n "$shlibpath_var"; then
>-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
>-      echo "     during execution"
>+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
>+      $echo "     during execution"
>     fi
>     if test -n "$runpath_var"; then
>-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
>-      echo "     during linking"
>+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
>+      $echo "     during linking"
>     fi
>     if test -n "$hardcode_libdir_flag_spec"; then
>       libdir=LIBDIR
>       eval flag=\"$hardcode_libdir_flag_spec\"
> 
>-      echo "   - use the \`$flag' linker flag"
>+      $echo "   - use the \`$flag' linker flag"
>     fi
>     if test -n "$admincmds"; then
>-      echo "   - have your system administrator run these commands:$admincmds"
>+      $echo "   - have your system administrator run these commands:$admincmds"
>     fi
>     if test -f /etc/ld.so.conf; then
>-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
>+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
>     fi
>-    echo
>-    echo "See any operating system documentation about shared libraries for"
>-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
>-    echo "----------------------------------------------------------------------"
>-    exit 0
>+    $echo
>+    $echo "See any operating system documentation about shared libraries for"
>+    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
>+    $echo "X----------------------------------------------------------------------" | $Xsed
>+    exit $EXIT_SUCCESS
>     ;;
> 
>   # libtool execute mode
>@@ -4492,7 +6346,7 @@
>     if test -z "$cmd"; then
>       $echo "$modename: you must specify a COMMAND" 1>&2
>       $echo "$help"
>-      exit 1
>+      exit $EXIT_FAILURE
>     fi
> 
>     # Handle -dlopen flags immediately.
>@@ -4500,18 +6354,18 @@
>       if test ! -f "$file"; then
> 	$echo "$modename: \`$file' is not a file" 1>&2
> 	$echo "$help" 1>&2
>-	exit 1
>+	exit $EXIT_FAILURE
>       fi
> 
>       dir=
>       case $file in
>       *.la)
> 	# Check to see that this really is a libtool archive.
>-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
>+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
> 	else
> 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
> 	  $echo "$help" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 
> 	# Read the libtool library.
>@@ -4538,7 +6392,7 @@
> 	  dir="$dir/$objdir"
> 	else
> 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
>-	  exit 1
>+	  exit $EXIT_FAILURE
> 	fi
> 	;;
> 
>@@ -4578,7 +6432,7 @@
>       -*) ;;
>       *)
> 	# Do a test to see if this is really a libtool program.
>-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
> 	  # If there is no directory component, then add one.
> 	  case $file in
> 	  */* | *\\*) . $file ;;
>@@ -4601,16 +6455,17 @@
> 	eval "export $shlibpath_var"
>       fi
> 
>-      # Restore saved enviroment variables
>-      if test "${save_LC_ALL+set}" = set; then
>-	LC_ALL="$save_LC_ALL"; export LC_ALL
>-      fi
>-      if test "${save_LANG+set}" = set; then
>-	LANG="$save_LANG"; export LANG
>-      fi
>+      # Restore saved environment variables
>+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
>+      do
>+       eval "if test \"\${save_$lt_var+set}\" = set; then
>+               $lt_var=\$save_$lt_var; export $lt_var
>+             fi"
>+      done
>+
> 
>       # Now prepare to actually exec the command.
>-      exec_cmd='"$cmd"$args'
>+      exec_cmd="\$cmd$args"
>     else
>       # Display what would be done.
>       if test -n "$shlibpath_var"; then
>@@ -4618,7 +6473,7 @@
> 	$echo "export $shlibpath_var"
>       fi
>       $echo "$cmd$args"
>-      exit 0
>+      exit $EXIT_SUCCESS
>     fi
>     ;;
> 
>@@ -4646,24 +6501,25 @@
>     if test -z "$rm"; then
>       $echo "$modename: you must specify an RM program" 1>&2
>       $echo "$help" 1>&2
>-      exit 1
>+      exit $EXIT_FAILURE
>     fi
> 
>     rmdirs=
> 
>+    origobjdir="$objdir"
>     for file in $files; do
>       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
>       if test "X$dir" = "X$file"; then
> 	dir=.
>-	objdir="$objdir"
>+	objdir="$origobjdir"
>       else
>-	objdir="$dir/$objdir"
>+	objdir="$dir/$origobjdir"
>       fi
>       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>-      test $mode = uninstall && objdir="$dir"
>+      test "$mode" = uninstall && objdir="$dir"
> 
>       # Remember objdir for removal later, being careful to avoid duplicates
>-      if test $mode = clean; then
>+      if test "$mode" = clean; then
> 	case " $rmdirs " in
> 	  *" $objdir "*) ;;
> 	  *) rmdirs="$rmdirs $objdir" ;;
>@@ -4687,7 +6543,7 @@
>       case $name in
>       *.la)
> 	# Possibly a libtool archive, so verify it.
>-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
> 	  . $dir/$name
> 
> 	  # Delete the libtool libraries and symlinks.
>@@ -4695,18 +6551,27 @@
> 	    rmfiles="$rmfiles $objdir/$n"
> 	  done
> 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
>-	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
> 
>-	  if test $mode = uninstall; then
>+	  case "$mode" in
>+	  clean)
>+	    case "  $library_names " in
>+	    # "  " in the beginning catches empty $dlname
>+	    *" $dlname "*) ;;
>+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
>+	    esac
>+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
>+	    ;;
>+	  uninstall)
> 	    if test -n "$library_names"; then
> 	      # Do each command in the postuninstall commands.
>-	      eval cmds=\"$postuninstall_cmds\"
>+	      cmds=$postuninstall_cmds
> 	      save_ifs="$IFS"; IFS='~'
> 	      for cmd in $cmds; do
> 		IFS="$save_ifs"
>+		eval cmd=\"$cmd\"
> 		$show "$cmd"
> 		$run eval "$cmd"
>-		if test $? != 0 && test "$rmforce" != yes; then
>+		if test "$?" -ne 0 && test "$rmforce" != yes; then
> 		  exit_status=1
> 		fi
> 	      done
>@@ -4715,40 +6580,72 @@
> 
> 	    if test -n "$old_library"; then
> 	      # Do each command in the old_postuninstall commands.
>-	      eval cmds=\"$old_postuninstall_cmds\"
>+	      cmds=$old_postuninstall_cmds
> 	      save_ifs="$IFS"; IFS='~'
> 	      for cmd in $cmds; do
> 		IFS="$save_ifs"
>+		eval cmd=\"$cmd\"
> 		$show "$cmd"
> 		$run eval "$cmd"
>-		if test $? != 0 && test "$rmforce" != yes; then
>+		if test "$?" -ne 0 && test "$rmforce" != yes; then
> 		  exit_status=1
> 		fi
> 	      done
> 	      IFS="$save_ifs"
> 	    fi
> 	    # FIXME: should reinstall the best remaining shared library.
>-	  fi
>+	    ;;
>+	  esac
> 	fi
> 	;;
> 
>       *.lo)
>-	if test "$build_old_libs" = yes; then
>-	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
>-	  rmfiles="$rmfiles $dir/$oldobj"
>+	# Possibly a libtool object, so verify it.
>+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+
>+	  # Read the .lo file
>+	  . $dir/$name
>+
>+	  # Add PIC object to the list of files to remove.
>+	  if test -n "$pic_object" \
>+	     && test "$pic_object" != none; then
>+	    rmfiles="$rmfiles $dir/$pic_object"
>+	  fi
>+
>+	  # Add non-PIC object to the list of files to remove.
>+	  if test -n "$non_pic_object" \
>+	     && test "$non_pic_object" != none; then
>+	    rmfiles="$rmfiles $dir/$non_pic_object"
>+	  fi
> 	fi
> 	;;
> 
>       *)
>-	# Do a test to see if this is a libtool program.
>-	if test $mode = clean &&
>-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>-	  relink_command=
>-	  . $dir/$file
>+	if test "$mode" = clean ; then
>+	  noexename=$name
>+	  case $file in
>+	  *.exe)
>+	    file=`$echo $file|${SED} 's,.exe$,,'`
>+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
>+	    # $file with .exe has already been added to rmfiles,
>+	    # add $file without .exe
>+	    rmfiles="$rmfiles $file"
>+	    ;;
>+	  esac
>+	  # Do a test to see if this is a libtool program.
>+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
>+	    relink_command=
>+	    . $dir/$noexename
> 
>-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
>-	  if test "$fast_install" = yes && test -n "$relink_command"; then
>-	    rmfiles="$rmfiles $objdir/lt-$name"
>+	    # note $name still contains .exe if it was in $file originally
>+	    # as does the version of $file that was added into $rmfiles
>+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
>+	    if test "$fast_install" = yes && test -n "$relink_command"; then
>+	      rmfiles="$rmfiles $objdir/lt-$name"
>+	    fi
>+	    if test "X$noexename" != "X$name" ; then
>+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
>+	    fi
> 	  fi
> 	fi
> 	;;
>@@ -4756,6 +6653,7 @@
>       $show "$rm $rmfiles"
>       $run $rm $rmfiles || exit_status=1
>     done
>+    objdir="$origobjdir"
> 
>     # Try to remove the ${objdir}s in the directories where we deleted files
>     for dir in $rmdirs; do
>@@ -4771,20 +6669,20 @@
>   "")
>     $echo "$modename: you must specify a MODE" 1>&2
>     $echo "$generic_help" 1>&2
>-    exit 1
>+    exit $EXIT_FAILURE
>     ;;
>   esac
> 
>   if test -z "$exec_cmd"; then
>     $echo "$modename: invalid operation mode \`$mode'" 1>&2
>     $echo "$generic_help" 1>&2
>-    exit 1
>+    exit $EXIT_FAILURE
>   fi
> fi # test -z "$show_help"
> 
> if test -n "$exec_cmd"; then
>   eval exec $exec_cmd
>-  exit 1
>+  exit $EXIT_FAILURE
> fi
> 
> # We need to display help for each of the modes.
>@@ -4803,6 +6701,7 @@
>     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
>     --quiet           same as \`--silent'
>     --silent          don't print informational messages
>+    --tag=TAG         use configuration variables from tag TAG
>     --version         print version information
> 
> MODE must be one of the following:
>@@ -4816,8 +6715,10 @@
>       uninstall       remove libraries from an installed directory
> 
> MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
>-a more detailed description of MODE."
>-  exit 0
>+a more detailed description of MODE.
>+
>+Report bugs to <bug-libtool@gnu.org>."
>+  exit $EXIT_SUCCESS
>   ;;
> 
> clean)
>@@ -4918,9 +6819,9 @@
>   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
>   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
>   -export-symbols SYMFILE
>-		    try to export only the symbols listed in SYMFILE
>+                    try to export only the symbols listed in SYMFILE
>   -export-symbols-regex REGEX
>-		    try to export only the symbols matching REGEX
>+                    try to export only the symbols matching REGEX
>   -LLIBDIR          search LIBDIR for required installed libraries
>   -lNAME            OUTPUT-FILE requires the installed library libNAME
>   -module           build a library that can dlopened
>@@ -4928,12 +6829,17 @@
>   -no-install       link a not-installable executable
>   -no-undefined     declare that a library does not refer to external symbols
>   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
>+  -objectlist FILE  Use a list of object files found in FILE to specify objects
>+  -precious-files-regex REGEX
>+                    don't remove output files matching REGEX
>   -release RELEASE  specify package release information
>   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
>   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
>-  -static           do not do any dynamic linking of libtool libraries
>+  -static           do not do any dynamic linking of uninstalled libtool libraries
>+  -static-libtool-libs
>+                    do not do any dynamic linking of libtool libraries
>   -version-info CURRENT[:REVISION[:AGE]]
>-		    specify library version info [each variable defaults to 0]
>+                    specify library version info [each variable defaults to 0]
> 
> All other options (arguments beginning with \`-') are ignored.
> 
>@@ -4969,14 +6875,33 @@
> *)
>   $echo "$modename: invalid operation mode \`$mode'" 1>&2
>   $echo "$help" 1>&2
>-  exit 1
>+  exit $EXIT_FAILURE
>   ;;
> esac
> 
>-echo
>+$echo
> $echo "Try \`$modename --help' for more information about other modes."
> 
>-exit 0
>+exit $?
>+
>+# The TAGs below are defined such that we never get into a situation
>+# in which we disable both kinds of libraries.  Given conflicting
>+# choices, we go for a static library, that is the most portable,
>+# since we can't tell whether shared libraries were disabled because
>+# the user asked for that or because the platform doesn't support
>+# them.  This is particularly important on AIX, because we don't
>+# support having both static and shared libraries enabled at the same
>+# time on that platform, so we default to a shared-only configuration.
>+# If a disable-shared tag is given, we'll fallback to a static-only
>+# configuration.  But we'll never go from static-only to shared-only.
>+
>+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
>+disable_libs=shared
>+# ### END LIBTOOL TAG CONFIG: disable-shared
>+
>+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
>+disable_libs=static
>+# ### END LIBTOOL TAG CONFIG: disable-static
> 
> # Local Variables:
> # mode:shell-script
>diff -uNr vamos-0.5.5.orig/config/Makefile.in vamos-0.5.5/config/Makefile.in
>--- vamos-0.5.5.orig/config/Makefile.in	2005-10-29 22:28:07.000000000 +0200
>+++ vamos-0.5.5/config/Makefile.in	2007-06-25 18:02:59.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -13,17 +13,11 @@
> # PARTICULAR PURPOSE.
> 
> @SET_MAKE@
>-
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +29,24 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = config
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \
>+	config.sub depcomp install-sh ltconfig ltmain.sh missing \
>+	mkinstalldirs texinfo.tex
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +63,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +84,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,52 +94,67 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> EXTRA_DIST = \
> 	config.guess \
> 	config.sub \
>@@ -141,60 +164,67 @@
> 	missing \
> 	mkinstalldirs
> 
>-subdir = config
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am config.guess config.sub \
>-	depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs \
>-	texinfo.tex
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  config/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  config/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
> tags: TAGS
> TAGS:
> 
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -208,7 +238,6 @@
> check-am: all-am
> check: check-am
> all-am: Makefile
>-
> installdirs:
> install: install-am
> install-exec: install-exec-am
>@@ -229,7 +258,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -240,24 +269,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -276,17 +315,20 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am:
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-man install-strip installcheck \
>-	installcheck-am installdirs maintainer-clean \
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-man install-pdf \
>+	install-pdf-am install-ps install-ps-am install-strip \
>+	installcheck installcheck-am installdirs maintainer-clean \
> 	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-info-am
>+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/config/missing vamos-0.5.5/config/missing
>--- vamos-0.5.5.orig/config/missing	2002-05-29 23:33:54.000000000 +0200
>+++ vamos-0.5.5/config/missing	2007-06-25 17:58:10.000000000 +0200
>@@ -1,6 +1,10 @@
> #! /bin/sh
> # Common stub for a few missing GNU programs while installing.
>-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
>+
>+scriptversion=2006-05-10.23
>+
>+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
>+#   Free Software Foundation, Inc.
> # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
> 
> # This program is free software; you can redistribute it and/or modify
>@@ -15,8 +19,8 @@
> 
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> 
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -29,6 +33,8 @@
> fi
> 
> run=:
>+sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
>+sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
> 
> # In the cases where this matters, `missing' is being run in the
> # srcdir already.
>@@ -38,18 +44,24 @@
>   configure_ac=configure.in
> fi
> 
>-case "$1" in
>+msg="missing on your system"
>+
>+case $1 in
> --run)
>   # Try to run requested program, and just exit if it succeeds.
>   run=
>   shift
>   "$@" && exit 0
>+  # Exit code 63 means version mismatch.  This often happens
>+  # when the user try to use an ancient version of a tool on
>+  # a file that requires a minimum version.  In this case we
>+  # we should proceed has if the program had been absent, or
>+  # if --run hadn't been passed.
>+  if test $? = 63; then
>+    run=:
>+    msg="probably too old"
>+  fi
>   ;;
>-esac
>-
>-# If it does not exist, or fails to run (possibly an outdated version),
>-# try to emulate it.
>-case "$1" in
> 
>   -h|--h|--he|--hel|--help)
>     echo "\
>@@ -67,6 +79,7 @@
>   aclocal      touch file \`aclocal.m4'
>   autoconf     touch file \`configure'
>   autoheader   touch file \`config.h.in'
>+  autom4te     touch the output file, or create a stub one
>   automake     touch all \`Makefile.in' files
>   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
>   flex         create \`lex.yy.c', if possible, from existing .c
>@@ -74,11 +87,15 @@
>   lex          create \`lex.yy.c', if possible, from existing .c
>   makeinfo     touch the output file
>   tar          try tar, gnutar, gtar, then tar without non-portable flags
>-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
>+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
>+
>+Send bug reports to <bug-automake@gnu.org>."
>+    exit $?
>     ;;
> 
>   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
>-    echo "missing 0.4 - GNU automake"
>+    echo "missing $scriptversion (GNU Automake)"
>+    exit $?
>     ;;
> 
>   -*)
>@@ -87,14 +104,44 @@
>     exit 1
>     ;;
> 
>-  aclocal*)
>+esac
>+
>+# Now exit if we have it, but it failed.  Also exit now if we
>+# don't have it and --version was passed (most likely to detect
>+# the program).
>+case $1 in
>+  lex|yacc)
>+    # Not GNU programs, they don't have --version.
>+    ;;
>+
>+  tar)
>+    if test -n "$run"; then
>+       echo 1>&2 "ERROR: \`tar' requires --run"
>+       exit 1
>+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
>+       exit 1
>+    fi
>+    ;;
>+
>+  *)
>     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
>        # We have it, but it failed.
>        exit 1
>+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
>+       # Could not run --version or --help.  This is probably someone
>+       # running `$TOOL --version' or `$TOOL --help' to check whether
>+       # $TOOL exists and not knowing $TOOL uses missing.
>+       exit 1
>     fi
>+    ;;
>+esac
> 
>+# If it does not exist, or fails to run (possibly an outdated version),
>+# try to emulate it.
>+case $1 in
>+  aclocal*)
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' is $msg.  You should only need it if
>          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
>          to install the \`Automake' and \`Perl' packages.  Grab them from
>          any GNU archive site."
>@@ -102,13 +149,8 @@
>     ;;
> 
>   autoconf)
>-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
>-       # We have it, but it failed.
>-       exit 1
>-    fi
>-
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' is $msg.  You should only need it if
>          you modified \`${configure_ac}'.  You might want to install the
>          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
>          archive site."
>@@ -116,13 +158,8 @@
>     ;;
> 
>   autoheader)
>-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
>-       # We have it, but it failed.
>-       exit 1
>-    fi
>-
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' is $msg.  You should only need it if
>          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
>          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
>          from any GNU archive site."
>@@ -130,7 +167,7 @@
>     test -z "$files" && files="config.h"
>     touch_files=
>     for f in $files; do
>-      case "$f" in
>+      case $f in
>       *:*) touch_files="$touch_files "`echo "$f" |
> 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
>       *) touch_files="$touch_files $f.in";;
>@@ -140,13 +177,8 @@
>     ;;
> 
>   automake*)
>-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
>-       # We have it, but it failed.
>-       exit 1
>-    fi
>-
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' is $msg.  You should only need it if
>          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
>          You might want to install the \`Automake' and \`Perl' packages.
>          Grab them from any GNU archive site."
>@@ -156,20 +188,15 @@
>     ;;
> 
>   autom4te)
>-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
>-       # We have it, but it failed.
>-       exit 1
>-    fi
>-
>     echo 1>&2 "\
>-WARNING: \`$1' is needed, and you do not seem to have it handy on your
>-         system.  You might have modified some files without having the
>+WARNING: \`$1' is needed, but is $msg.
>+         You might have modified some files without having the
>          proper tools for further handling them.
>-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
>+         You can get \`$1' as part of \`Autoconf' from any GNU
>          archive site."
> 
>-    file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'`
>-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'`
>+    file=`echo "$*" | sed -n "$sed_output"`
>+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
>     if test -f "$file"; then
> 	touch $file
>     else
>@@ -185,74 +212,67 @@
> 
>   bison|yacc)
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' $msg.  You should only need it if
>          you modified a \`.y' file.  You may need the \`Bison' package
>          in order for those modifications to take effect.  You can get
>          \`Bison' from any GNU archive site."
>     rm -f y.tab.c y.tab.h
>-    if [ $# -ne 1 ]; then
>+    if test $# -ne 1; then
>         eval LASTARG="\${$#}"
>-	case "$LASTARG" in
>+	case $LASTARG in
> 	*.y)
> 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
>-	    if [ -f "$SRCFILE" ]; then
>+	    if test -f "$SRCFILE"; then
> 	         cp "$SRCFILE" y.tab.c
> 	    fi
> 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
>-	    if [ -f "$SRCFILE" ]; then
>+	    if test -f "$SRCFILE"; then
> 	         cp "$SRCFILE" y.tab.h
> 	    fi
> 	  ;;
> 	esac
>     fi
>-    if [ ! -f y.tab.h ]; then
>+    if test ! -f y.tab.h; then
> 	echo >y.tab.h
>     fi
>-    if [ ! -f y.tab.c ]; then
>+    if test ! -f y.tab.c; then
> 	echo 'main() { return 0; }' >y.tab.c
>     fi
>     ;;
> 
>   lex|flex)
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' is $msg.  You should only need it if
>          you modified a \`.l' file.  You may need the \`Flex' package
>          in order for those modifications to take effect.  You can get
>          \`Flex' from any GNU archive site."
>     rm -f lex.yy.c
>-    if [ $# -ne 1 ]; then
>+    if test $# -ne 1; then
>         eval LASTARG="\${$#}"
>-	case "$LASTARG" in
>+	case $LASTARG in
> 	*.l)
> 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
>-	    if [ -f "$SRCFILE" ]; then
>+	    if test -f "$SRCFILE"; then
> 	         cp "$SRCFILE" lex.yy.c
> 	    fi
> 	  ;;
> 	esac
>     fi
>-    if [ ! -f lex.yy.c ]; then
>+    if test ! -f lex.yy.c; then
> 	echo 'main() { return 0; }' >lex.yy.c
>     fi
>     ;;
> 
>   help2man)
>-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
>-       # We have it, but it failed.
>-       exit 1
>-    fi
>-
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' is $msg.  You should only need it if
> 	 you modified a dependency of a manual page.  You may need the
> 	 \`Help2man' package in order for those modifications to take
> 	 effect.  You can get \`Help2man' from any GNU archive site."
> 
>-    file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'`
>-    if test -z "$file"; then
>-	file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'`
>-    fi
>-    if [ -f "$file" ]; then
>+    file=`echo "$*" | sed -n "$sed_output"`
>+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
>+    if test -f "$file"; then
> 	touch $file
>     else
> 	test -z "$file" || exec >$file
>@@ -262,54 +282,58 @@
>     ;;
> 
>   makeinfo)
>-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
>-       # We have makeinfo, but it failed.
>-       exit 1
>-    fi
>-
>     echo 1>&2 "\
>-WARNING: \`$1' is missing on your system.  You should only need it if
>+WARNING: \`$1' is $msg.  You should only need it if
>          you modified a \`.texi' or \`.texinfo' file, or any other file
>          indirectly affecting the aspect of the manual.  The spurious
>          call might also be the consequence of using a buggy \`make' (AIX,
>          DU, IRIX).  You might want to install the \`Texinfo' package or
>          the \`GNU make' package.  Grab either from any GNU archive site."
>-    file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'`
>+    # The file to touch is that specified with -o ...
>+    file=`echo "$*" | sed -n "$sed_output"`
>+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
>     if test -z "$file"; then
>-      file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
>-      file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file`
>-    fi
>+      # ... or it is the one specified with @setfilename ...
>+      infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
>+      file=`sed -n '
>+	/^@setfilename/{
>+	  s/.* $[^ ]*$ *$/\1/
>+	  p
>+	  q
>+	}' $infile`
>+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
>+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
>+    fi
>+    # If the file does not exist, the user really needs makeinfo;
>+    # let's fail without touching anything.
>+    test -f $file || exit 1
>     touch $file
>     ;;
> 
>   tar)
>     shift
>-    if test -n "$run"; then
>-      echo 1>&2 "ERROR: \`tar' requires --run"
>-      exit 1
>-    fi
> 
>     # We have already tried tar in the generic part.
>     # Look for gnutar/gtar before invocation to avoid ugly error
>     # messages.
>     if (gnutar --version > /dev/null 2>&1); then
>-       gnutar ${1+"$@"} && exit 0
>+       gnutar "$@" && exit 0
>     fi
>     if (gtar --version > /dev/null 2>&1); then
>-       gtar ${1+"$@"} && exit 0
>+       gtar "$@" && exit 0
>     fi
>     firstarg="$1"
>     if shift; then
>-	case "$firstarg" in
>+	case $firstarg in
> 	*o*)
> 	    firstarg=`echo "$firstarg" | sed s/o//`
>-	    tar "$firstarg" ${1+"$@"} && exit 0
>+	    tar "$firstarg" "$@" && exit 0
> 	    ;;
> 	esac
>-	case "$firstarg" in
>+	case $firstarg in
> 	*h*)
> 	    firstarg=`echo "$firstarg" | sed s/h//`
>-	    tar "$firstarg" ${1+"$@"} && exit 0
>+	    tar "$firstarg" "$@" && exit 0
> 	    ;;
> 	esac
>     fi
>@@ -323,10 +347,10 @@
> 
>   *)
>     echo 1>&2 "\
>-WARNING: \`$1' is needed, and you do not seem to have it handy on your
>-         system.  You might have modified some files without having the
>+WARNING: \`$1' is needed, and is $msg.
>+         You might have modified some files without having the
>          proper tools for further handling them.  Check the \`README' file,
>-         it often tells you about the needed prerequirements for installing
>+         it often tells you about the needed prerequisites for installing
>          this package.  You may also peek at any GNU archive site, in case
>          some other package would contain this missing \`$1' program."
>     exit 1
>@@ -334,3 +358,10 @@
> esac
> 
> exit 0
>+
>+# Local variables:
>+# eval: (add-hook 'write-file-hooks 'time-stamp)
>+# time-stamp-start: "scriptversion="
>+# time-stamp-format: "%:y-%02m-%02d.%02H"
>+# time-stamp-end: "$"
>+# End:
>diff -uNr vamos-0.5.5.orig/config/mkinstalldirs vamos-0.5.5/config/mkinstalldirs
>--- vamos-0.5.5.orig/config/mkinstalldirs	2001-10-17 03:31:41.000000000 +0200
>+++ vamos-0.5.5/config/mkinstalldirs	2007-06-25 17:58:10.000000000 +0200
>@@ -1,40 +1,161 @@
> #! /bin/sh
> # mkinstalldirs --- make directory hierarchy
>-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
>-# Created: 1993-05-16
>-# Public domain
> 
>-# $Id: mkinstalldirs,v 1.1.1.1 2001/10/17 01:31:41 snickadoo Exp $
>+scriptversion=2006-05-11.19
> 
>+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
>+# Created: 1993-05-16
>+# Public domain.
>+#
>+# This file is maintained in Automake, please report
>+# bugs to <bug-automake@gnu.org> or send patches to
>+# <automake-patches@gnu.org>.
>+
>+nl='
>+'
>+IFS=" ""	$nl"
> errstatus=0
>+dirmode=
>+
>+usage="\
>+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
>+
>+Create each directory DIR (with mode MODE, if specified), including all
>+leading file name components.
>+
>+Report bugs to <bug-automake@gnu.org>."
>+
>+# process command line arguments
>+while test $# -gt 0 ; do
>+  case $1 in
>+    -h | --help | --h*)         # -h for help
>+      echo "$usage"
>+      exit $?
>+      ;;
>+    -m)                         # -m PERM arg
>+      shift
>+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
>+      dirmode=$1
>+      shift
>+      ;;
>+    --version)
>+      echo "$0 $scriptversion"
>+      exit $?
>+      ;;
>+    --)                         # stop option processing
>+      shift
>+      break
>+      ;;
>+    -*)                         # unknown option
>+      echo "$usage" 1>&2
>+      exit 1
>+      ;;
>+    *)                          # first non-opt arg
>+      break
>+      ;;
>+  esac
>+done
> 
> for file
> do
>-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
>-   shift
>+  if test -d "$file"; then
>+    shift
>+  else
>+    break
>+  fi
>+done
>+
>+case $# in
>+  0) exit 0 ;;
>+esac
>+
>+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
>+# mkdir -p a/c at the same time, both will detect that a is missing,
>+# one will create a, then the other will try to create a and die with
>+# a "File exists" error.  This is a problem when calling mkinstalldirs
>+# from a parallel make.  We use --version in the probe to restrict
>+# ourselves to GNU mkdir, which is thread-safe.
>+case $dirmode in
>+  '')
>+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
>+      echo "mkdir -p -- $*"
>+      exec mkdir -p -- "$@"
>+    else
>+      # On NextStep and OpenStep, the `mkdir' command does not
>+      # recognize any option.  It will interpret all options as
>+      # directories to create, and then abort because `.' already
>+      # exists.
>+      test -d ./-p && rmdir ./-p
>+      test -d ./--version && rmdir ./--version
>+    fi
>+    ;;
>+  *)
>+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
>+       test ! -d ./--version; then
>+      echo "mkdir -m $dirmode -p -- $*"
>+      exec mkdir -m "$dirmode" -p -- "$@"
>+    else
>+      # Clean up after NextStep and OpenStep mkdir.
>+      for d in ./-m ./-p ./--version "./$dirmode";
>+      do
>+        test -d $d && rmdir $d
>+      done
>+    fi
>+    ;;
>+esac
> 
>-   pathcomp=
>-   for d
>-   do
>-     pathcomp="$pathcomp$d"
>-     case "$pathcomp" in
>-       -* ) pathcomp=./$pathcomp ;;
>-     esac
>-
>-     if test ! -d "$pathcomp"; then
>-        echo "mkdir $pathcomp"
>-
>-        mkdir "$pathcomp" || lasterr=$?
>-
>-        if test ! -d "$pathcomp"; then
>-  	  errstatus=$lasterr
>-        fi
>-     fi
>+for file
>+do
>+  case $file in
>+    /*) pathcomp=/ ;;
>+    *)  pathcomp= ;;
>+  esac
>+  oIFS=$IFS
>+  IFS=/
>+  set fnord $file
>+  shift
>+  IFS=$oIFS
>+
>+  for d
>+  do
>+    test "x$d" = x && continue
>+
>+    pathcomp=$pathcomp$d
>+    case $pathcomp in
>+      -*) pathcomp=./$pathcomp ;;
>+    esac
>+
>+    if test ! -d "$pathcomp"; then
>+      echo "mkdir $pathcomp"
>+
>+      mkdir "$pathcomp" || lasterr=$?
>+
>+      if test ! -d "$pathcomp"; then
>+	errstatus=$lasterr
>+      else
>+	if test ! -z "$dirmode"; then
>+	  echo "chmod $dirmode $pathcomp"
>+	  lasterr=
>+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
>+
>+	  if test ! -z "$lasterr"; then
>+	    errstatus=$lasterr
>+	  fi
>+	fi
>+      fi
>+    fi
> 
>-     pathcomp="$pathcomp/"
>-   done
>+    pathcomp=$pathcomp/
>+  done
> done
> 
> exit $errstatus
> 
>-# mkinstalldirs ends here
>+# Local Variables:
>+# mode: shell-script
>+# sh-indentation: 2
>+# eval: (add-hook 'write-file-hooks 'time-stamp)
>+# time-stamp-start: "scriptversion="
>+# time-stamp-format: "%:y-%02m-%02d.%02H"
>+# time-stamp-end: "$"
>+# End:
>diff -uNr vamos-0.5.5.orig/config/texinfo.tex vamos-0.5.5/config/texinfo.tex
>--- vamos-0.5.5.orig/config/texinfo.tex	2002-06-06 01:15:54.000000000 +0200
>+++ vamos-0.5.5/config/texinfo.tex	2007-06-25 17:58:10.000000000 +0200
>@@ -3,10 +3,11 @@
> % Load plain if necessary, i.e., if running under initex.
> \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
> %
>-\def\texinfoversion{2002-03-01.06}
>+\def\texinfoversion{2006-10-04.17}
> %
>-% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
>-%               2000, 01, 02 Free Software Foundation, Inc.
>+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
>+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
>+% Software Foundation, Inc.
> %
> % This texinfo.tex file is free software; you can redistribute it and/or
> % modify it under the terms of the GNU General Public License as
>@@ -20,27 +21,20 @@
> %
> % You should have received a copy of the GNU General Public License
> % along with this texinfo.tex file; see the file COPYING.  If not, write
>-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
>-% Boston, MA 02111-1307, USA.
>+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+% Boston, MA 02110-1301, USA.
> %
>-% In other words, you are welcome to use, share and improve this program.
>-% You are forbidden to forbid anyone else to use, share and improve
>-% what you give them.   Help stamp out software-hoarding!
>+% As a special exception, when this file is read by TeX when processing
>+% a Texinfo source document, you may use the result without
>+% restriction.  (This has been our intent since Texinfo was invented.)
> %
> % Please try the latest version of texinfo.tex before submitting bug
> % reports; you can get the latest version from:
>-%   ftp://ftp.gnu.org/gnu/texinfo.tex
>-%     (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
>-%   ftp://texinfo.org/texinfo/texinfo.tex
>+%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
> %   ftp://tug.org/tex/texinfo.tex
>-%     (and all CTAN mirrors, see http://www.ctan.org),
>-%   and /home/gd/gnu/doc/texinfo.tex on the GNU machines.
>-% 
>-% The texinfo.tex in any given Texinfo distribution could well be out
>+%     (and all CTAN mirrors, see http://www.ctan.org).
>+% The texinfo.tex in any given distribution could well be out
> % of date, so if that's what you're using, please check.
>-% 
>-% Texinfo has a small home page at http://texinfo.org/ and also
>-% http://www.gnu.org/software/texinfo.
> %
> % Send bug reports to bug-texinfo@gnu.org.  Please include including a
> % complete document in each bug report with which we can reproduce the
>@@ -53,13 +47,17 @@
> %   texindex foo.??
> %   tex foo.texi
> %   tex foo.texi
>-%   dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps.
>+%   dvips foo.dvi -o  # or whatever; this makes foo.ps.
> % The extra TeX runs get the cross-reference information correct.
> % Sometimes one run after texindex suffices, and sometimes you need more
> % than two; texi2dvi does it as many times as necessary.
> %
>-% It is possible to adapt texinfo.tex for other languages.  You can get
>-% the existing language-specific files from the full Texinfo distribution.
>+% It is possible to adapt texinfo.tex for other languages, to some
>+% extent.  You can get the existing language-specific files from the
>+% full Texinfo distribution.
>+%
>+% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
>+
> 
> \message{Loading texinfo [version \texinfoversion]:}
> 
>@@ -69,7 +67,14 @@
> \everyjob{\message{[Texinfo version \texinfoversion]}%
>   \catcode`+=\active \catcode`\_=\active}
> 
>-% Save some parts of plain tex whose names we will redefine.
>+\message{Basics,}
>+\chardef\other=12
>+
>+% We never want plain's \outer definition of \+ in Texinfo.
>+% For @tex, we can use \tabalign.
>+\let\+ = \relax
>+
>+% Save some plain tex macros whose names we will redefine.
> \let\ptexb=\b
> \let\ptexbullet=\bullet
> \let\ptexc=\c
>@@ -79,23 +84,35 @@
> \let\ptexend=\end
> \let\ptexequiv=\equiv
> \let\ptexexclam=\!
>+\let\ptexfootnote=\footnote
>+\let\ptexgtr=>
>+\let\ptexhat=^
> \let\ptexi=\i
>+\let\ptexindent=\indent
>+\let\ptexinsert=\insert
> \let\ptexlbrace=\{
>+\let\ptexless=<
>+\let\ptexnewwrite\newwrite
>+\let\ptexnoindent=\noindent
>+\let\ptexplus=+
> \let\ptexrbrace=\}
>+\let\ptexslash=\/
> \let\ptexstar=\*
> \let\ptext=\t
> 
>-% We never want plain's outer \+ definition in Texinfo.
>-% For @tex, we can use \tabalign.
>-\let\+ = \relax
>-
>-\message{Basics,}
>-\chardef\other=12
>-
> % If this character appears in an error message or help string, it
> % starts a new line in the output.
> \newlinechar = `^^J
> 
>+% Use TeX 3.0's \inputlineno to get the line number, for better error
>+% messages, but if we're using an old version of TeX, don't do anything.
>+%
>+\ifx\inputlineno\thisisundefined
>+  \let\linenumber = \empty % Pre-3.0.
>+\else
>+  \def\linenumber{l.\the\inputlineno:\space}
>+\fi
>+
> % Set up fixed words for English if not already set.
> \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
> \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
>@@ -134,48 +151,113 @@
> \ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
> \ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
> \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
>-\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi
> \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
>-\ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi
>+
>+% Since the category of space is not known, we have to be careful.
>+\chardef\spacecat = 10
>+\def\spaceisspace{\catcode`\ =\spacecat}
>+
>+% sometimes characters are active, so we need control sequences.
>+\chardef\colonChar = `\:
>+\chardef\commaChar = `\,
>+\chardef\dashChar  = `\-
>+\chardef\dotChar   = `\.
>+\chardef\exclamChar= `\!
>+\chardef\lquoteChar= `\`
>+\chardef\questChar = `\?
>+\chardef\rquoteChar= `\'
>+\chardef\semiChar  = `\;
>+\chardef\underChar = `\_
> 
> % Ignore a token.
> %
> \def\gobble#1{}
> 
>-\hyphenation{ap-pen-dix}
>-\hyphenation{mini-buf-fer mini-buf-fers}
>-\hyphenation{eshell}
>-\hyphenation{white-space}
>+% The following is used inside several \edef's.
>+\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
>+
>+% Hyphenation fixes.
>+\hyphenation{
>+  Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
>+  ap-pen-dix bit-map bit-maps
>+  data-base data-bases eshell fall-ing half-way long-est man-u-script
>+  man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
>+  par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
>+  spell-ing spell-ings
>+  stand-alone strong-est time-stamp time-stamps which-ever white-space
>+  wide-spread wrap-around
>+}
> 
> % Margin to add to right of even pages, to left of odd pages.
>-\newdimen \bindingoffset
>-\newdimen \normaloffset
>+\newdimen\bindingoffset
>+\newdimen\normaloffset
> \newdimen\pagewidth \newdimen\pageheight
> 
>+% For a final copy, take out the rectangles
>+% that mark overfull boxes (in case you have decided
>+% that the text looks ok even though it passes the margin).
>+%
>+\def\finalout{\overfullrule=0pt}
>+
>+% @| inserts a changebar to the left of the current line.  It should
>+% surround any changed text.  This approach does *not* work if the
>+% change spans more than two lines of output.  To handle that, we would
>+% have adopt a much more difficult approach (putting marks into the main
>+% vertical list for the beginning and end of each change).
>+%
>+\def\|{%
>+  % \vadjust can only be used in horizontal mode.
>+  \leavevmode
>+  %
>+  % Append this vertical mode material after the current line in the output.
>+  \vadjust{%
>+    % We want to insert a rule with the height and depth of the current
>+    % leading; that is exactly what \strutbox is supposed to record.
>+    \vskip-\baselineskip
>+    %
>+    % \vadjust-items are inserted at the left edge of the type.  So
>+    % the \llap here moves out into the left-hand margin.
>+    \llap{%
>+      %
>+      % For a thicker or thinner bar, change the `1pt'.
>+      \vrule height\baselineskip width1pt
>+      %
>+      % This is the space between the bar and the text.
>+      \hskip 12pt
>+    }%
>+  }%
>+}
>+
> % Sometimes it is convenient to have everything in the transcript file
> % and nothing on the terminal.  We don't just call \tracingall here,
>-% since that produces some useless output on the terminal.
>+% since that produces some useless output on the terminal.  We also make
>+% some effort to order the tracing commands to reduce output in the log
>+% file; cf. trace.sty in LaTeX.
> %
> \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
>-\ifx\eTeXversion\undefined
>-\def\loggingall{\tracingcommands2 \tracingstats2
>-   \tracingpages1 \tracingoutput1 \tracinglostchars1
>-   \tracingmacros2 \tracingparagraphs1 \tracingrestores1
>-   \showboxbreadth\maxdimen\showboxdepth\maxdimen
>-}%
>-\else
>-\def\loggingall{\tracingcommands3 \tracingstats2
>-   \tracingpages1 \tracingoutput1 \tracinglostchars1
>-   \tracingmacros2 \tracingparagraphs1 \tracingrestores1
>-   \tracingscantokens1 \tracingassigns1 \tracingifs1
>-   \tracinggroups1 \tracingnesting2
>-   \showboxbreadth\maxdimen\showboxdepth\maxdimen
>+\def\loggingall{%
>+  \tracingstats2
>+  \tracingpages1
>+  \tracinglostchars2  % 2 gives us more in etex
>+  \tracingparagraphs1
>+  \tracingoutput1
>+  \tracingmacros2
>+  \tracingrestores1
>+  \showboxbreadth\maxdimen \showboxdepth\maxdimen
>+  \ifx\eTeXversion\undefined\else % etex gives us more logging
>+    \tracingscantokens1
>+    \tracingifs1
>+    \tracinggroups1
>+    \tracingnesting2
>+    \tracingassigns1
>+  \fi
>+  \tracingcommands3  % 3 gives us more in etex
>+  \errorcontextlines16
> }%
>-\fi
> 
> % add check for \lastpenalty to plain's definitions.  If the last thing
> % we did was a \nobreak, we don't want to insert more space.
>-% 
>+%
> \def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
>   \removelastskip\penalty-50\smallskip\fi\fi}
> \def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
>@@ -222,13 +304,17 @@
>     % take effect in \write's, yet the group defined by the \vbox ends
>     % before the \shipout runs.
>     %
>-    \escapechar = `\\     % use backslash in output files.
>     \indexdummies         % don't expand commands in the output.
>     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
>-                   % the page break happens to be in the middle of an example.
>+               % the page break happens to be in the middle of an example.
>+               % We don't want .vr (or whatever) entries like this:
>+               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
>+               % "\acronym" won't work when it's read back in;
>+               % it needs to be 
>+               % {\code {{\tt \backslashcurfont }acronym}
>     \shipout\vbox{%
>       % Do this early so pdf references go to the beginning of the page.
>-      \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
>+      \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
>       %
>       \ifcropmarks \vbox to \outervsize\bgroup
>         \hsize = \outerhsize
>@@ -253,9 +339,9 @@
>       \pagebody{#1}%
>       \ifdim\ht\footlinebox > 0pt
>         % Only leave this space if the footline is nonempty.
>-        % (We lessened \vsize for it in \oddfootingxxx.)
>+        % (We lessened \vsize for it in \oddfootingyyy.)
>         % The \baselineskip=24pt in plain's \makefootline has no effect.
>-        \vskip 2\baselineskip
>+        \vskip 24pt
>         \unvbox\footlinebox
>       \fi
>       %
>@@ -276,7 +362,7 @@
>       \egroup % \vbox from first cropmarks clause
>       \fi
>     }% end of \shipout\vbox
>-  }% end of group with \turnoffactive
>+  }% end of group with \indexdummies
>   \advancepageno
>   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
> }
>@@ -309,143 +395,161 @@
> % the input line (except we remove a trailing comment).  #1 should be a
> % macro which expects an ordinary undelimited TeX argument.
> %
>-\def\parsearg#1{%
>-  \let\next = #1%
>+\def\parsearg{\parseargusing{}}
>+\def\parseargusing#1#2{%
>+  \def\argtorun{#2}%
>   \begingroup
>     \obeylines
>-    \futurelet\temp\parseargx
>-}
>-
>-% If the next token is an obeyed space (from an @example environment or
>-% the like), remove it and recurse.  Otherwise, we're done.
>-\def\parseargx{%
>-  % \obeyedspace is defined far below, after the definition of \sepspaces.
>-  \ifx\obeyedspace\temp
>-    \expandafter\parseargdiscardspace
>-  \else
>-    \expandafter\parseargline
>-  \fi
>+    \spaceisspace
>+    #1%
>+    \parseargline\empty% Insert the \empty token, see \finishparsearg below.
> }
> 
>-% Remove a single space (as the delimiter token to the macro call).
>-{\obeyspaces %
>- \gdef\parseargdiscardspace {\futurelet\temp\parseargx}}
>-
> {\obeylines %
>   \gdef\parseargline#1^^M{%
>     \endgroup % End of the group started in \parsearg.
>-    %
>-    % First remove any @c comment, then any @comment.
>-    % Result of each macro is put in \toks0.
>-    \argremovec #1\c\relax %
>-    \expandafter\argremovecomment \the\toks0 \comment\relax %
>-    %
>-    % Call the caller's macro, saved as \next in \parsearg.
>-    \expandafter\next\expandafter{\the\toks0}%
>+    \argremovecomment #1\comment\ArgTerm%
>   }%
> }
> 
>-% Since all \c{,omment} does is throw away the argument, we can let TeX
>-% do that for us.  The \relax here is matched by the \relax in the call
>-% in \parseargline; it could be more or less anything, its purpose is
>-% just to delimit the argument to the \c.
>-\def\argremovec#1\c#2\relax{\toks0 = {#1}}
>-\def\argremovecomment#1\comment#2\relax{\toks0 = {#1}}
>+% First remove any @comment, then any @c comment.
>+\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
>+\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
> 
>-% \argremovec{,omment} might leave us with trailing spaces, though; e.g.,
>+% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
>+%
>+% \argremovec might leave us with trailing space, e.g.,
> %    @end itemize  @c foo
>-% will have two active spaces as part of the argument with the
>-% `itemize'.  Here we remove all active spaces from #1, and assign the
>-% result to \toks0.
>-%
>-% This loses if there are any *other* active characters besides spaces
>-% in the argument -- _ ^ +, for example -- since they get expanded.
>-% Fortunately, Texinfo does not define any such commands.  (If it ever
>-% does, the catcode of the characters in questionwill have to be changed
>-% here.)  But this means we cannot call \removeactivespaces as part of
>-% \argremovec{,omment}, since @c uses \parsearg, and thus the argument
>-% that \parsearg gets might well have any character at all in it.
>+% This space token undergoes the same procedure and is eventually removed
>+% by \finishparsearg.
> %
>-\def\removeactivespaces#1{%
>-  \begingroup
>-    \ignoreactivespaces
>-    \edef\temp{#1}%
>-    \global\toks0 = \expandafter{\temp}%
>-  \endgroup
>+\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
>+\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
>+\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
>+  \def\temp{#3}%
>+  \ifx\temp\empty
>+    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
>+    \let\temp\finishparsearg
>+  \else
>+    \let\temp\argcheckspaces
>+  \fi
>+  % Put the space token in:
>+  \temp#1 #3\ArgTerm
> }
> 
>-% Change the active space to expand to nothing.
>+% If a _delimited_ argument is enclosed in braces, they get stripped; so
>+% to get _exactly_ the rest of the line, we had to prevent such situation.
>+% We prepended an \empty token at the very beginning and we expand it now,
>+% just before passing the control to \argtorun.
>+% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
>+% either the null string, or it ends with \^^M---thus there is no danger
>+% that a pair of braces would be stripped.
> %
>-\begingroup
>-  \obeyspaces
>-  \gdef\ignoreactivespaces{\obeyspaces\let =\empty}
>-\endgroup
>+% But first, we have to remove the trailing space token.
>+%
>+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
> 
>+% \parseargdef\foo{...}
>+%	is roughly equivalent to
>+% \def\foo{\parsearg\Xfoo}
>+% \def\Xfoo#1{...}
>+%
>+% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
>+% favourite TeX trick.  --kasal, 16nov03
> 
>-\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
>+\def\parseargdef#1{%
>+  \expandafter \doparseargdef \csname\string#1\endcsname #1%
>+}
>+\def\doparseargdef#1#2{%
>+  \def#2{\parsearg#1}%
>+  \def#1##1%
>+}
> 
>-%% These are used to keep @begin/@end levels from running away
>-%% Call \inENV within environments (after a \begingroup)
>-\newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi}
>-\def\ENVcheck{%
>-\ifENV\errmessage{Still within an environment; press RETURN to continue}
>-\endgroup\fi} % This is not perfect, but it should reduce lossage
>+% Several utility definitions with active space:
>+{
>+  \obeyspaces
>+  \gdef\obeyedspace{ }
> 
>-% @begin foo  is the same as @foo, for now.
>-\newhelp\EMsimple{Press RETURN to continue.}
>+  % Make each space character in the input produce a normal interword
>+  % space in the output.  Don't allow a line break at this space, as this
>+  % is used only in environments like @example, where each line of input
>+  % should produce a line of output anyway.
>+  %
>+  \gdef\sepspaces{\obeyspaces\let =\tie}
>+
>+  % If an index command is used in an @example environment, any spaces
>+  % therein should become regular spaces in the raw index file, not the
>+  % expansion of \tie (\leavevmode \penalty \@M \ ).
>+  \gdef\unsepspaces{\let =\space}
>+}
> 
>-\outer\def\begin{\parsearg\beginxxx}
> 
>-\def\beginxxx #1{%
>-\expandafter\ifx\csname #1\endcsname\relax
>-{\errhelp=\EMsimple \errmessage{Undefined command @begin #1}}\else
>-\csname #1\endcsname\fi}
>+\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
> 
>-% @end foo executes the definition of \Efoo.
>+% Define the framework for environments in texinfo.tex.  It's used like this:
> %
>-\def\end{\parsearg\endxxx}
>-\def\endxxx #1{%
>-  \removeactivespaces{#1}%
>-  \edef\endthing{\the\toks0}%
>-  %
>-  \expandafter\ifx\csname E\endthing\endcsname\relax
>-    \expandafter\ifx\csname \endthing\endcsname\relax
>-      % There's no \foo, i.e., no ``environment'' foo.
>-      \errhelp = \EMsimple
>-      \errmessage{Undefined command `@end \endthing'}%
>-    \else
>-      \unmatchedenderror\endthing
>-    \fi
>+%   \envdef\foo{...}
>+%   \def\Efoo{...}
>+%
>+% It's the responsibility of \envdef to insert \begingroup before the
>+% actual body; @end closes the group after calling \Efoo.  \envdef also
>+% defines \thisenv, so the current environment is known; @end checks
>+% whether the environment name matches.  The \checkenv macro can also be
>+% used to check whether the current environment is the one expected.
>+%
>+% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
>+% are not treated as enviroments; they don't open a group.  (The
>+% implementation of @end takes care not to call \endgroup in this
>+% special case.)
>+
>+
>+% At runtime, environments start with this:
>+\def\startenvironment#1{\begingroup\def\thisenv{#1}}
>+% initialize
>+\let\thisenv\empty
>+
>+% ... but they get defined via ``\envdef\foo{...}'':
>+\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
>+\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
>+
>+% Check whether we're in the right environment:
>+\def\checkenv#1{%
>+  \def\temp{#1}%
>+  \ifx\thisenv\temp
>   \else
>-    % Everything's ok; the right environment has been started.
>-    \csname E\endthing\endcsname
>+    \badenverr
>   \fi
> }
> 
>-% There is an environment #1, but it hasn't been started.  Give an error.
>-%
>-\def\unmatchedenderror#1{%
>+% Evironment mismatch, #1 expected:
>+\def\badenverr{%
>   \errhelp = \EMsimple
>-  \errmessage{This `@end #1' doesn't have a matching `@#1'}%
>+  \errmessage{This command can appear only \inenvironment\temp,
>+    not \inenvironment\thisenv}%
>+}
>+\def\inenvironment#1{%
>+  \ifx#1\empty
>+    out of any environment%
>+  \else
>+    in environment \expandafter\string#1%
>+  \fi
> }
> 
>-% Define the control sequence \E#1 to give an unmatched @end error.
>+% @end foo executes the definition of \Efoo.
>+% But first, it executes a specialized version of \checkenv
> %
>-\def\defineunmatchedend#1{%
>-  \expandafter\def\csname E#1\endcsname{\unmatchedenderror{#1}}%
>+\parseargdef\end{%
>+  \if 1\csname iscond.#1\endcsname
>+  \else
>+    % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
>+    \expandafter\checkenv\csname#1\endcsname
>+    \csname E#1\endcsname
>+    \endgroup
>+  \fi
> }
> 
>+\newhelp\EMsimple{Press RETURN to continue.}
> 
>-% Single-spacing is done by various environments (specifically, in
>-% \nonfillstart and \quotations).
>-\newskip\singlespaceskip \singlespaceskip = 12.5pt
>-\def\singlespace{%
>-  % Why was this kern here?  It messes up equalizing space above and below
>-  % environments.  --karl, 6may93
>-  %{\advance \baselineskip by -\singlespaceskip
>-  %\kern \baselineskip}%
>-  \setleading\singlespaceskip
>-}
> 
> %% Simple single-character @ commands
> 
>@@ -466,16 +570,22 @@
> \let\{=\mylbrace
> \let\}=\myrbrace
> \begingroup
>-  % Definitions to produce actual \{ & \} command in an index.
>-  \catcode`\{ = 12 \catcode`\} = 12
>+  % Definitions to produce \{ and \} commands for indices,
>+  % and @{ and @} for the aux/toc files.
>+  \catcode`\{ = \other \catcode`\} = \other
>   \catcode`\[ = 1 \catcode`\] = 2
>-  \catcode`\@ = 0 \catcode`\\ = 12
>-  @gdef@lbracecmd[\{]%
>-  @gdef@rbracecmd[\}]%
>-@endgroup
>+  \catcode`\! = 0 \catcode`\\ = \other
>+  !gdef!lbracecmd[\{]%
>+  !gdef!rbracecmd[\}]%
>+  !gdef!lbraceatcmd[@{]%
>+  !gdef!rbraceatcmd[@}]%
>+!endgroup
>+
>+% @comma{} to avoid , parsing problems.
>+\let\comma = ,
> 
> % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
>-% Others are defined by plain TeX: @` @' @" @^ @~ @= @v @H.
>+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
> \let\, = \c
> \let\dotaccent = \.
> \def\ringaccent#1{{\accent23 #1}}
>@@ -483,10 +593,12 @@
> \let\ubaraccent = \b
> \let\udotaccent = \d
> 
>-% Other special characters: @questiondown @exclamdown
>-% Plain TeX defines: @AA @AE @O @OE @L (and lowercase versions) @ss.
>+% Other special characters: @questiondown @exclamdown @ordf @ordm
>+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
> \def\questiondown{?`}
> \def\exclamdown{!`}
>+\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
>+\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
> 
> % Dotless i and dotless j, used for accents.
> \def\imacro{i}
>@@ -499,6 +611,25 @@
>   \fi\fi
> }
> 
>+% The \TeX{} logo, as in plain, but resetting the spacing so that a
>+% period following counts as ending a sentence.  (Idea found in latex.)
>+%
>+\edef\TeX{\TeX \spacefactor=1000 }
>+
>+% @LaTeX{} logo.  Not quite the same results as the definition in
>+% latex.ltx, since we use a different font for the raised A; it's most
>+% convenient for us to use an explicitly smaller font, rather than using
>+% the \scriptstyle font (since we don't reset \scriptstyle and
>+% \scriptscriptstyle).
>+%
>+\def\LaTeX{%
>+  L\kern-.36em
>+  {\setbox0=\hbox{T}%
>+   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
>+  \kern-.15em
>+  \TeX
>+}
>+
> % Be sure we're in horizontal mode when doing a tie, since we make space
> % equivalent to this in @example-like environments. Otherwise, a space
> % at the beginning of a line will start with \penalty -- and
>@@ -517,14 +648,32 @@
> % @* forces a line break.
> \def\*{\hfil\break\hbox{}\ignorespaces}
> 
>+% @/ allows a line break.
>+\let\/=\allowbreak
>+
> % @. is an end-of-sentence period.
>-\def\.{.\spacefactor=3000 }
>+\def\.{.\spacefactor=\endofsentencespacefactor\space}
> 
> % @! is an end-of-sentence bang.
>-\def\!{!\spacefactor=3000 }
>+\def\!{!\spacefactor=\endofsentencespacefactor\space}
> 
> % @? is an end-of-sentence query.
>-\def\?{?\spacefactor=3000 }
>+\def\?{?\spacefactor=\endofsentencespacefactor\space}
>+
>+% @frenchspacing on|off  says whether to put extra space after punctuation.
>+% 
>+\def\onword{on}
>+\def\offword{off}
>+%
>+\parseargdef\frenchspacing{%
>+  \def\temp{#1}%
>+  \ifx\temp\onword \plainfrenchspacing
>+  \else\ifx\temp\offword \plainnonfrenchspacing
>+  \else
>+    \errhelp = \EMsimple
>+    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
>+  \fi\fi
>+}
> 
> % @w prevents a word break.  Without the \leavevmode, @w at the
> % beginning of a paragraph, when TeX is still in vertical mode, would
>@@ -539,47 +688,24 @@
> % therefore, no glue is inserted, and the space between the headline and
> % the text is small, which looks bad.
> %
>-\def\group{\begingroup
>-  \ifnum\catcode13=\active \else
>+% Another complication is that the group might be very large.  This can
>+% cause the glue on the previous page to be unduly stretched, because it
>+% does not have much material.  In this case, it's better to add an
>+% explicit \vfill so that the extra space is at the bottom.  The
>+% threshold for doing this is if the group is more than \vfilllimit
>+% percent of a page (\vfilllimit can be changed inside of @tex).
>+%
>+\newbox\groupbox
>+\def\vfilllimit{0.7}
>+%
>+\envdef\group{%
>+  \ifnum\catcode`\^^M=\active \else
>     \errhelp = \groupinvalidhelp
>     \errmessage{@group invalid in context where filling is enabled}%
>   \fi
>+  \startsavinginserts
>   %
>-  % The \vtop we start below produces a box with normal height and large
>-  % depth; thus, TeX puts \baselineskip glue before it, and (when the
>-  % next line of text is done) \lineskip glue after it.  (See p.82 of
>-  % the TeXbook.)  Thus, space below is not quite equal to space
>-  % above.  But it's pretty close.
>-  \def\Egroup{%
>-    \egroup           % End the \vtop.
>-    \endgroup         % End the \group.
>-  }%
>-  %
>-  \vtop\bgroup
>-    % We have to put a strut on the last line in case the @group is in
>-    % the midst of an example, rather than completely enclosing it.
>-    % Otherwise, the interline space between the last line of the group
>-    % and the first line afterwards is too small.  But we can't put the
>-    % strut in \Egroup, since there it would be on a line by itself.
>-    % Hence this just inserts a strut at the beginning of each line.
>-    \everypar = {\strut}%
>-    %
>-    % Since we have a strut on every line, we don't need any of TeX's
>-    % normal interline spacing.
>-    \offinterlineskip
>-    %
>-    % OK, but now we have to do something about blank
>-    % lines in the input in @example-like environments, which normally
>-    % just turn into \lisppar, which will insert no space now that we've
>-    % turned off the interline space.  Simplest is to make them be an
>-    % empty paragraph.
>-    \ifx\par\lisppar
>-      \edef\par{\leavevmode \par}%
>-      %
>-      % Reset ^^M's definition to new definition of \par.
>-      \obeylines
>-    \fi
>-    %
>+  \setbox\groupbox = \vtop\bgroup
>     % Do @comment since we are called inside an environment such as
>     % @example, where each end-of-line in the input causes an
>     % end-of-line in the output.  We don't want the end-of-line after
>@@ -589,6 +715,32 @@
>     \comment
> }
> %
>+% The \vtop produces a box with normal height and large depth; thus, TeX puts
>+% \baselineskip glue before it, and (when the next line of text is done)
>+% \lineskip glue after it.  Thus, space below is not quite equal to space
>+% above.  But it's pretty close.
>+\def\Egroup{%
>+    % To get correct interline space between the last line of the group
>+    % and the first line afterwards, we have to propagate \prevdepth.
>+    \endgraf % Not \par, as it may have been set to \lisppar.
>+    \global\dimen1 = \prevdepth
>+  \egroup           % End the \vtop.
>+  % \dimen0 is the vertical size of the group's box.
>+  \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
>+  % \dimen2 is how much space is left on the page (more or less).
>+  \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
>+  % if the group doesn't fit on the current page, and it's a big big
>+  % group, force a page break.
>+  \ifdim \dimen0 > \dimen2
>+    \ifdim \pagetotal < \vfilllimit\pageheight
>+      \page
>+    \fi
>+  \fi
>+  \box\groupbox
>+  \prevdepth = \dimen1
>+  \checkinserts
>+}
>+%
> % TeX puts in an \escapechar (i.e., `@') at the beginning of the help
> % message, so this ends up printing `@group can only ...'.
> %
>@@ -601,10 +753,8 @@
> 
> \newdimen\mil  \mil=0.001in
> 
>-\def\need{\parsearg\needx}
>-
> % Old definition--didn't work.
>-%\def\needx #1{\par %
>+%\parseargdef\need{\par %
> %% This method tries to make TeX break the page naturally
> %% if the depth of the box does not fit.
> %{\baselineskip=0pt%
>@@ -612,7 +762,7 @@
> %\prevdepth=-1000pt
> %}}
> 
>-\def\needx#1{%
>+\parseargdef\need{%
>   % Ensure vertical mode, so we don't make a big box in the middle of a
>   % paragraph.
>   \par
>@@ -651,37 +801,11 @@
>   \fi
> }
> 
>-% @br   forces paragraph break
>+% @br   forces paragraph break (and is undocumented).
> 
> \let\br = \par
> 
>-% @dots{} output an ellipsis using the current font.
>-% We do .5em per period so that it has the same spacing in a typewriter
>-% font as three actual period characters.
>-%
>-\def\dots{%
>-  \leavevmode
>-  \hbox to 1.5em{%
>-    \hskip 0pt plus 0.25fil minus 0.25fil
>-    .\hss.\hss.%
>-    \hskip 0pt plus 0.5fil minus 0.5fil
>-  }%
>-}
>-
>-% @enddots{} is an end-of-sentence ellipsis.
>-%
>-\def\enddots{%
>-  \leavevmode
>-  \hbox to 2em{%
>-    \hskip 0pt plus 0.25fil minus 0.25fil
>-    .\hss.\hss.\hss.%
>-    \hskip 0pt plus 0.5fil minus 0.5fil
>-  }%
>-  \spacefactor=3000
>-}
>-
>-
>-% @page    forces the start of a new page
>+% @page forces the start of a new page.
> %
> \def\page{\par\vfill\supereject}
> 
>@@ -693,13 +817,11 @@
> \newskip\exdentamount
> 
> % This defn is used inside fill environments such as @defun.
>-\def\exdent{\parsearg\exdentyyy}
>-\def\exdentyyy #1{{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}}
>+\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
> 
> % This defn is used inside nofill environments such as @example.
>-\def\nofillexdent{\parsearg\nofillexdentyyy}
>-\def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
>-\leftline{\hskip\leftskip{\rm#1}}}}
>+\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
>+  \leftline{\hskip\leftskip{\rm#1}}}}
> 
> % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
> % paragraph.  For more general purposes, use the \margin insertion
>@@ -730,10 +852,10 @@
> % @inmargin{TEXT [, RIGHT-TEXT]}
> % (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
> % else use TEXT for both).
>-% 
>+%
> \def\inmargin#1{\parseinmargin #1,,\finish}
> \def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
>-  \setbox0 = \hbox{\ignorespaces #2}% 
>+  \setbox0 = \hbox{\ignorespaces #2}%
>   \ifdim\wd0 > 0pt
>     \def\lefttext{#1}%  have both texts
>     \def\righttext{#2}%
>@@ -751,37 +873,71 @@
> }
> 
> % @include file    insert text of that file as input.
>-% Allow normal characters that  we make active in the argument (a file name).
>-\def\include{\begingroup
>-  \catcode`\\=12
>-  \catcode`~=12
>-  \catcode`^=12
>-  \catcode`_=12
>-  \catcode`|=12
>-  \catcode`<=12
>-  \catcode`>=12
>-  \catcode`+=12
>-  \parsearg\includezzz}
>-% Restore active chars for included file.
>-\def\includezzz#1{\endgroup\begingroup
>-  % Read the included file in a group so nested @include's work.
>+%
>+\def\include{\parseargusing\filenamecatcodes\includezzz}
>+\def\includezzz#1{%
>+  \pushthisfilestack
>   \def\thisfile{#1}%
>-  \input\thisfile
>-\endgroup}
>+  {%
>+    \makevalueexpandable
>+    \def\temp{\input #1 }%
>+    \expandafter
>+  }\temp
>+  \popthisfilestack
>+}
>+\def\filenamecatcodes{%
>+  \catcode`\\=\other
>+  \catcode`~=\other
>+  \catcode`^=\other
>+  \catcode`_=\other
>+  \catcode`|=\other
>+  \catcode`<=\other
>+  \catcode`>=\other
>+  \catcode`+=\other
>+  \catcode`-=\other
>+}
> 
>-\def\thisfile{}
>+\def\pushthisfilestack{%
>+  \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
>+}
>+\def\pushthisfilestackX{%
>+  \expandafter\pushthisfilestackY\thisfile\StackTerm
>+}
>+\def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
>+  \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
>+}
>+
>+\def\popthisfilestack{\errthisfilestackempty}
>+\def\errthisfilestackempty{\errmessage{Internal error:
>+  the stack of filenames is empty.}}
> 
>-% @center line   outputs that line, centered
>+\def\thisfile{}
> 
>-\def\center{\parsearg\centerzzz}
>-\def\centerzzz #1{{\advance\hsize by -\leftskip
>-\advance\hsize by -\rightskip
>-\centerline{#1}}}
>+% @center line
>+% outputs that line, centered.
>+%
>+\parseargdef\center{%
>+  \ifhmode
>+    \let\next\centerH
>+  \else
>+    \let\next\centerV
>+  \fi
>+  \next{\hfil \ignorespaces#1\unskip \hfil}%
>+}
>+\def\centerH#1{%
>+  {%
>+    \hfil\break
>+    \advance\hsize by -\leftskip
>+    \advance\hsize by -\rightskip
>+    \line{#1}%
>+    \break
>+  }%
>+}
>+\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
> 
> % @sp n   outputs n lines of vertical space
> 
>-\def\sp{\parsearg\spxxx}
>-\def\spxxx #1{\vskip #1\baselineskip}
>+\parseargdef\sp{\vskip #1\baselineskip}
> 
> % @comment ...line which is ignored...
> % @c is the same as @comment
>@@ -796,13 +952,13 @@
> 
> % @paragraphindent NCHARS
> % We'll use ems for NCHARS, close enough.
>-% We cannot implement @paragraphindent asis, though.
>-% 
>+% NCHARS can also be the word `asis' or `none'.
>+% We cannot feasibly implement @paragraphindent asis, though.
>+%
> \def\asisword{asis} % no translation, these are keywords
> \def\noneword{none}
> %
>-\def\paragraphindent{\parsearg\doparagraphindent}
>-\def\doparagraphindent#1{%
>+\parseargdef\paragraphindent{%
>   \def\temp{#1}%
>   \ifx\temp\asisword
>   \else
>@@ -819,8 +975,7 @@
> % We'll use ems for NCHARS like @paragraphindent.
> % It seems @exampleindent asis isn't necessary, but
> % I preserve it to make it similar to @paragraphindent.
>-\def\exampleindent{\parsearg\doexampleindent}
>-\def\doexampleindent#1{%
>+\parseargdef\exampleindent{%
>   \def\temp{#1}%
>   \ifx\temp\asisword
>   \else
>@@ -832,40 +987,147 @@
>   \fi
> }
> 
>+% @firstparagraphindent WORD
>+% If WORD is `none', then suppress indentation of the first paragraph
>+% after a section heading.  If WORD is `insert', then do indent at such
>+% paragraphs.
>+%
>+% The paragraph indentation is suppressed or not by calling
>+% \suppressfirstparagraphindent, which the sectioning commands do.
>+% We switch the definition of this back and forth according to WORD.
>+% By default, we suppress indentation.
>+%
>+\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
>+\def\insertword{insert}
>+%
>+\parseargdef\firstparagraphindent{%
>+  \def\temp{#1}%
>+  \ifx\temp\noneword
>+    \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
>+  \else\ifx\temp\insertword
>+    \let\suppressfirstparagraphindent = \relax
>+  \else
>+    \errhelp = \EMsimple
>+    \errmessage{Unknown @firstparagraphindent option `\temp'}%
>+  \fi\fi
>+}
>+
>+% Here is how we actually suppress indentation.  Redefine \everypar to
>+% \kern backwards by \parindent, and then reset itself to empty.
>+%
>+% We also make \indent itself not actually do anything until the next
>+% paragraph.
>+%
>+\gdef\dosuppressfirstparagraphindent{%
>+  \gdef\indent{%
>+    \restorefirstparagraphindent
>+    \indent
>+  }%
>+  \gdef\noindent{%
>+    \restorefirstparagraphindent
>+    \noindent
>+  }%
>+  \global\everypar = {%
>+    \kern -\parindent
>+    \restorefirstparagraphindent
>+  }%
>+}
>+
>+\gdef\restorefirstparagraphindent{%
>+  \global \let \indent = \ptexindent
>+  \global \let \noindent = \ptexnoindent
>+  \global \everypar = {}%
>+}
>+
>+
> % @asis just yields its argument.  Used with @table, for example.
> %
> \def\asis#1{#1}
> 
> % @math outputs its argument in math mode.
>-% We don't use $'s directly in the definition of \math because we need
>-% to set catcodes according to plain TeX first, to allow for subscripts,
>-% superscripts, special math chars, etc.
>-% 
>-% @math does not do math typesetting in section titles, index
>-% entries, and other such contexts where the catcodes are set before
>-% @math gets a chance to work.  This could perhaps be fixed, but for now
>-% at least we can have real math in the main text, where it's needed most.
>-%
>-% 
>-\let\implicitmath = $%$ font-lock fix
> %
> % One complication: _ usually means subscripts, but it could also mean
> % an actual _ character, as in @math{@var{some_variable} + 1}.  So make
>-% _ within @math be active (mathcode "8000), and distinguish by seeing
>-% if the current family is \slfam, which is what @var uses.
>-% 
>-{\catcode95 = \active  % 95 = _
>-\gdef\mathunderscore{%
>-  \catcode95=\active
>-  \def_{\ifnum\fam=\slfam\_\else\sb\fi}%
>-}}
>+% _ active, and distinguish by seeing if the current family is \slfam,
>+% which is what @var uses.
>+{
>+  \catcode`\_ = \active
>+  \gdef\mathunderscore{%
>+    \catcode`\_=\active
>+    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
>+  }
>+}
>+% Another complication: we want \\ (and @\) to output a \ character.
>+% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
>+% this is not advertised and we don't care.  Texinfo does not
>+% otherwise define @\.
>+%
>+% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
>+\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
>+%
>+\def\math{%
>+  \tex
>+  \mathunderscore
>+  \let\\ = \mathbackslash
>+  \mathactive
>+  $\finishmath
>+}
>+\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
>+
>+% Some active characters (such as <) are spaced differently in math.
>+% We have to reset their definitions in case the @math was an argument
>+% to a command which sets the catcodes (such as @item or @section).
> %
>-\def\math{\tex\mathcode`\_="8000\mathunderscore \implicitmath\finishmath}
>-\def\finishmath#1{#1\implicitmath\Etex}
>+{
>+  \catcode`^ = \active
>+  \catcode`< = \active
>+  \catcode`> = \active
>+  \catcode`+ = \active
>+  \gdef\mathactive{%
>+    \let^ = \ptexhat
>+    \let< = \ptexless
>+    \let> = \ptexgtr
>+    \let+ = \ptexplus
>+  }
>+}
> 
> % @bullet and @minus need the same treatment as @math, just above.
>-\def\bullet{\implicitmath\ptexbullet\implicitmath}
>-\def\minus{\implicitmath-\implicitmath}
>+\def\bullet{$\ptexbullet$}
>+\def\minus{$-$}
>+
>+% @dots{} outputs an ellipsis using the current font.
>+% We do .5em per period so that it has the same spacing in the cm
>+% typewriter fonts as three actual period characters; on the other hand,
>+% in other typewriter fonts three periods are wider than 1.5em.  So do
>+% whichever is larger.
>+%
>+\def\dots{%
>+  \leavevmode
>+  \setbox0=\hbox{...}% get width of three periods
>+  \ifdim\wd0 > 1.5em
>+    \dimen0 = \wd0
>+  \else
>+    \dimen0 = 1.5em
>+  \fi
>+  \hbox to \dimen0{%
>+    \hskip 0pt plus.25fil
>+    .\hskip 0pt plus1fil
>+    .\hskip 0pt plus1fil
>+    .\hskip 0pt plus.5fil
>+  }%
>+}
>+
>+% @enddots{} is an end-of-sentence ellipsis.
>+%
>+\def\enddots{%
>+  \dots
>+  \spacefactor=\endofsentencespacefactor
>+}
>+
>+% @comma{} is so commas can be inserted into text without messing up
>+% Texinfo's parsing.
>+%
>+\let\comma = ,
> 
> % @refill is a no-op.
> \let\refill=\relax
>@@ -881,20 +1143,20 @@
> % So open here the files we need to have open while reading the input.
> % This makes it possible to make a .fmt file for texinfo.
> \def\setfilename{%
>+   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
>    \iflinks
>-     \readauxfile
>+     \tryauxfile
>+     % Open the new aux file.  TeX will close it automatically at exit.
>+     \immediate\openout\auxfile=\jobname.aux
>    \fi % \openindices needs to do some work in any case.
>    \openindices
>-   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
>-   \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
>+   \let\setfilename=\comment % Ignore extra @setfilename cmds.
>    %
>    % If texinfo.cnf is present on the system, read it.
>    % Useful for site-wide @afourpaper, etc.
>-   % Just to be on the safe side, close the input stream before the \input.
>    \openin 1 texinfo.cnf
>-   \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi
>-   \closein1
>-   \temp
>+   \ifeof 1 \else \input texinfo.cnf \fi
>+   \closein 1
>    %
>    \comment % Ignore the actual filename.
> }
>@@ -930,20 +1192,76 @@
> \newif\ifpdf
> \newif\ifpdfmakepagedest
> 
>+% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
>+% can be set).  So we test for \relax and 0 as well as \undefined,
>+% borrowed from ifpdf.sty.
> \ifx\pdfoutput\undefined
>-  \pdffalse
>-  \let\pdfmkdest = \gobble
>-  \let\pdfurl = \gobble
>-  \let\endlink = \relax
>-  \let\linkcolor = \relax
>-  \let\pdfmakeoutlines = \relax
> \else
>-  \pdftrue
>-  \pdfoutput = 1
>+  \ifx\pdfoutput\relax
>+  \else
>+    \ifcase\pdfoutput
>+    \else
>+      \pdftrue
>+    \fi
>+  \fi
>+\fi
>+
>+% PDF uses PostScript string constants for the names of xref targets,
>+% for display in the outlines, and in other places.  Thus, we have to
>+% double any backslashes.  Otherwise, a name like "\node" will be
>+% interpreted as a newline (\n), followed by o, d, e.  Not good.
>+% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
>+% (and related messages, the final outcome is that it is up to the TeX
>+% user to double the backslashes and otherwise make the string valid, so
>+% that's what we do).
>+
>+% double active backslashes.
>+% 
>+{\catcode`\@=0 \catcode`\\=\active
>+ @gdef@activebackslashdouble{%
>+   @catcode`@\=@active
>+   @let\=@doublebackslash}
>+}
>+
>+% To handle parens, we must adopt a different approach, since parens are
>+% not active characters.  hyperref.dtx (which has the same problem as
>+% us) handles it with this amazing macro to replace tokens.  I've
>+% tinkered with it a little for texinfo, but it's definitely from there.
>+% 
>+% #1 is the tokens to replace.
>+% #2 is the replacement.
>+% #3 is the control sequence with the string.
>+% 
>+\def\HyPsdSubst#1#2#3{%
>+  \def\HyPsdReplace##1#1##2\END{%
>+    ##1%
>+    \ifx\\##2\\%
>+    \else
>+      #2%
>+      \HyReturnAfterFi{%
>+        \HyPsdReplace##2\END
>+      }%
>+    \fi
>+  }%
>+  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
>+}
>+\long\def\HyReturnAfterFi#1\fi{\fi#1}
>+
>+% #1 is a control sequence in which to do the replacements.
>+\def\backslashparens#1{%
>+  \xdef#1{#1}% redefine it as its expansion; the definition is simply
>+             % \lastnode when called from \setref -> \pdfmkdest.
>+  \HyPsdSubst{(}{\realbackslash(}{#1}%
>+  \HyPsdSubst{)}{\realbackslash)}{#1}%
>+}
>+
>+\ifpdf
>   \input pdfcolor
>+  \pdfcatalog{/PageMode /UseOutlines}%
>+  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
>   \def\dopdfimage#1#2#3{%
>-    \def\imagewidth{#2}%
>-    \def\imageheight{#3}%
>+    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
>+    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
>     % without \immediate, pdftex seg faults when the same image is
>     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
>     \ifnum\pdftexversion < 14
>@@ -951,18 +1269,29 @@
>     \else
>       \immediate\pdfximage
>     \fi
>-      \ifx\empty\imagewidth\else width \imagewidth \fi
>-      \ifx\empty\imageheight\else height \imageheight \fi
>+      \ifdim \wd0 >0pt width \imagewidth \fi
>+      \ifdim \wd2 >0pt height \imageheight \fi
>       \ifnum\pdftexversion<13
>-	 #1.pdf%
>+         #1.pdf%
>        \else
>          {#1.pdf}%
>        \fi
>     \ifnum\pdftexversion < 14 \else
>       \pdfrefximage \pdflastximage
>     \fi}
>-  \def\pdfmkdest#1{{\normalturnoffactive \pdfdest name{#1} xyz}}
>-  \def\pdfmkpgn#1{#1}
>+  \def\pdfmkdest#1{{%
>+    % We have to set dummies so commands such as @code, and characters
>+    % such as \, aren't expanded when present in a section title.
>+    \atdummies
>+    \activebackslashdouble
>+    \def\pdfdestname{#1}%
>+    \backslashparens\pdfdestname
>+    \pdfdest name{\pdfdestname} xyz%
>+  }}%
>+  %
>+  % used to mark target names; must be expandable.
>+  \def\pdfmkpgn#1{#1}%
>+  %
>   \let\linkcolor = \Blue  % was Cyan, but that seems light?
>   \def\endlink{\Black\pdfendlink}
>   % Adding outlines to PDF; macros for calculating structure of outlines
>@@ -970,80 +1299,106 @@
>   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
>     \else \csname#1\endcsname \fi}
>   \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
>-    \advance\tempnum by1
>+    \advance\tempnum by 1
>     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
>-  \def\pdfmakeoutlines{{%
>-    \openin 1 \jobname.toc
>-    \ifeof 1\else\begingroup
>-      \closein 1 
>-      \indexnofonts
>-      \def\tt{}
>-      \let\_ = \normalunderscore
>-      % Thanh's hack / proper braces in bookmarks  
>-      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
>-      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
>-      %
>-      \def\chapentry ##1##2##3{}
>-      \let\appendixentry = \chapentry
>-      \def\unnumbchapentry ##1##2{}
>-      \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
>-      \def\unnumbsecentry ##1##2{}
>-      \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
>-      \def\unnumbsubsecentry ##1##2{}
>-      \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
>-      \def\unnumbsubsubsecentry ##1##2{}
>-      \input \jobname.toc
>-      \def\chapentry ##1##2##3{%
>-        \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
>-      \let\appendixentry = \chapentry
>-      \def\unnumbchapentry ##1##2{%
>-        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
>-      \def\secentry ##1##2##3##4{%
>-        \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
>-      \def\unnumbsecentry ##1##2{%
>-        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
>-      \def\subsecentry ##1##2##3##4##5{%
>-        \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
>-      \def\unnumbsubsecentry ##1##2{%
>-        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
>-      \def\subsubsecentry ##1##2##3##4##5##6{%
>-        \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
>-      \def\unnumbsubsubsecentry ##1##2{%
>-        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
>-      \input \jobname.toc
>-    \endgroup\fi
>-  }}
>-  \def\makelinks #1,{%
>-    \def\params{#1}\def\E{END}%
>-    \ifx\params\E
>-      \let\nextmakelinks=\relax
>+  %
>+  % #1 is the section text, which is what will be displayed in the
>+  % outline by the pdf viewer.  #2 is the pdf expression for the number
>+  % of subentries (or empty, for subsubsections).  #3 is the node text,
>+  % which might be empty if this toc entry had no corresponding node.
>+  % #4 is the page number
>+  %
>+  \def\dopdfoutline#1#2#3#4{%
>+    % Generate a link to the node text if that exists; else, use the
>+    % page number.  We could generate a destination for the section
>+    % text in the case where a section has no node, but it doesn't
>+    % seem worth the trouble, since most documents are normally structured.
>+    \def\pdfoutlinedest{#3}%
>+    \ifx\pdfoutlinedest\empty
>+      \def\pdfoutlinedest{#4}%
>     \else
>-      \let\nextmakelinks=\makelinks
>-      \ifnum\lnkcount>0,\fi
>-      \picknum{#1}%
>-      \startlink attr{/Border [0 0 0]} 
>-        goto name{\pdfmkpgn{\the\pgn}}%
>-      \linkcolor #1%
>-      \advance\lnkcount by 1%
>-      \endlink
>+      % Doubled backslashes in the name.
>+      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
>+       \backslashparens\pdfoutlinedest}%
>     \fi
>-    \nextmakelinks
>+    %
>+    % Also double the backslashes in the display string.
>+    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
>+     \backslashparens\pdfoutlinetext}%
>+    %
>+    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
>   }
>-  \def\picknum#1{\expandafter\pn#1}
>-  \def\pn#1{%
>-    \def\p{#1}%
>-    \ifx\p\lbrace
>-      \let\nextpn=\ppn
>-    \else
>-      \let\nextpn=\ppnn
>-      \def\first{#1}
>-    \fi
>-    \nextpn
>+  %
>+  \def\pdfmakeoutlines{%
>+    \begingroup
>+      % Thanh's hack / proper braces in bookmarks
>+      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
>+      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
>+      %
>+      % Read toc silently, to get counts of subentries for \pdfoutline.
>+      \def\numchapentry##1##2##3##4{%
>+	\def\thischapnum{##2}%
>+	\def\thissecnum{0}%
>+	\def\thissubsecnum{0}%
>+      }%
>+      \def\numsecentry##1##2##3##4{%
>+	\advancenumber{chap\thischapnum}%
>+	\def\thissecnum{##2}%
>+	\def\thissubsecnum{0}%
>+      }%
>+      \def\numsubsecentry##1##2##3##4{%
>+	\advancenumber{sec\thissecnum}%
>+	\def\thissubsecnum{##2}%
>+      }%
>+      \def\numsubsubsecentry##1##2##3##4{%
>+	\advancenumber{subsec\thissubsecnum}%
>+      }%
>+      \def\thischapnum{0}%
>+      \def\thissecnum{0}%
>+      \def\thissubsecnum{0}%
>+      %
>+      % use \def rather than \let here because we redefine \chapentry et
>+      % al. a second time, below.
>+      \def\appentry{\numchapentry}%
>+      \def\appsecentry{\numsecentry}%
>+      \def\appsubsecentry{\numsubsecentry}%
>+      \def\appsubsubsecentry{\numsubsubsecentry}%
>+      \def\unnchapentry{\numchapentry}%
>+      \def\unnsecentry{\numsecentry}%
>+      \def\unnsubsecentry{\numsubsecentry}%
>+      \def\unnsubsubsecentry{\numsubsubsecentry}%
>+      \readdatafile{toc}%
>+      %
>+      % Read toc second time, this time actually producing the outlines.
>+      % The `-' means take the \expnumber as the absolute number of
>+      % subentries, which we calculated on our first read of the .toc above.
>+      %
>+      % We use the node names as the destinations.
>+      \def\numchapentry##1##2##3##4{%
>+        \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
>+      \def\numsecentry##1##2##3##4{%
>+        \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
>+      \def\numsubsecentry##1##2##3##4{%
>+        \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
>+      \def\numsubsubsecentry##1##2##3##4{% count is always zero
>+        \dopdfoutline{##1}{}{##3}{##4}}%
>+      %
>+      % PDF outlines are displayed using system fonts, instead of
>+      % document fonts.  Therefore we cannot use special characters,
>+      % since the encoding is unknown.  For example, the eogonek from
>+      % Latin 2 (0xea) gets translated to a | character.  Info from
>+      % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
>+      %
>+      % xx to do this right, we have to translate 8-bit characters to
>+      % their "best" equivalent, based on the @documentencoding.  Right
>+      % now, I guess we'll just let the pdf reader have its way.
>+      \indexnofonts
>+      \setupdatafile
>+      \catcode`\\=\active \otherbackslash
>+      \input \jobname.toc
>+    \endgroup
>   }
>-  \def\ppn#1{\pgn=#1\gobble}
>-  \def\ppnn{\pgn=\first}
>-  \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
>-  \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
>+  %
>   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
>     \ifx\PP\D\let\nextsp\relax
>     \else\let\nextsp\skipspaces
>@@ -1058,25 +1413,32 @@
>   \else
>     \let \startlink \pdfstartlink
>   \fi
>+  % make a live url in pdf output.
>   \def\pdfurl#1{%
>     \begingroup
>-      \normalturnoffactive\def\@{@}%
>-      \let\value=\expandablevalue
>+      % it seems we really need yet another set of dummies; have not
>+      % tried to figure out what each command should do in the context
>+      % of @url.  for now, just make @/ a no-op, that's the only one
>+      % people have actually reported a problem with.
>+      % 
>+      \normalturnoffactive
>+      \def\@{@}%
>+      \let\/=\empty
>+      \makevalueexpandable
>       \leavevmode\Red
>       \startlink attr{/Border [0 0 0]}%
>         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
>-        % #1
>     \endgroup}
>   \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
>   \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
>   \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
>   \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
>   \def\maketoks{%
>-    \expandafter\poptoks\the\toksA|ENDTOKS|
>+    \expandafter\poptoks\the\toksA|ENDTOKS|\relax
>     \ifx\first0\adn0
>     \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
>     \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
>-    \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 
>+    \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
>     \else
>       \ifnum0=\countA\else\makelink\fi
>       \ifx\first.\let\next=\done\else
>@@ -1092,20 +1454,45 @@
>     \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
>     \linkcolor #1\endlink}
>   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
>-\fi % \ifx\pdfoutput
>+\else
>+  \let\pdfmkdest = \gobble
>+  \let\pdfurl = \gobble
>+  \let\endlink = \relax
>+  \let\linkcolor = \relax
>+  \let\pdfmakeoutlines = \relax
>+\fi  % \ifx\pdfoutput
> 
> 
> \message{fonts,}
>-% Font-change commands.
>+
>+% Change the current font style to #1, remembering it in \curfontstyle.
>+% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
>+% italics, not bold italics.
>+%
>+\def\setfontstyle#1{%
>+  \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
>+  \csname ten#1\endcsname  % change the current font
>+}
>+
>+% Select #1 fonts with the current style.
>+%
>+\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
>+
>+\def\rm{\fam=0 \setfontstyle{rm}}
>+\def\it{\fam=\itfam \setfontstyle{it}}
>+\def\sl{\fam=\slfam \setfontstyle{sl}}
>+\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
>+\def\tt{\fam=\ttfam \setfontstyle{tt}}
> 
> % Texinfo sort of supports the sans serif font style, which plain TeX does not.
>-% So we set up a \sf analogous to plain's \rm, etc.
>+% So we set up a \sf.
> \newfam\sffam
>-\def\sf{\fam=\sffam \tensf}
>+\def\sf{\fam=\sffam \setfontstyle{sf}}
> \let\li = \sf % Sometimes we call it \li, not \sf.
> 
>-% We don't need math for this one.
>-\def\ttsl{\tenttsl}
>+% We don't need math for this font style.
>+\def\ttsl{\setfontstyle{ttsl}}
>+
> 
> % Default leading.
> \newdimen\textleading  \textleading = 13.2pt
>@@ -1128,11 +1515,13 @@
>   }%
> }
> 
>+
> % Set the font macro #1 to the font named #2, adding on the
> % specified font prefix (normally `cm').
> % #3 is the font's design size, #4 is a scale factor
> \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
> 
>+
> % Use cm as the default font prefix.
> % To specify the font prefix, you must define \fontprefix
> % before you read in texinfo.tex.
>@@ -1156,20 +1545,15 @@
> \def\scshape{csc}
> \def\scbshape{csc}
> 
>-\newcount\mainmagstep
>-\ifx\bigger\relax
>-  % not really supported.
>-  \let\mainmagstep=\magstep1
>-  \setfont\textrm\rmshape{12}{1000}
>-  \setfont\texttt\ttshape{12}{1000}
>-\else
>-  \mainmagstep=\magstephalf
>-  \setfont\textrm\rmshape{10}{\mainmagstep}
>-  \setfont\texttt\ttshape{10}{\mainmagstep}
>-\fi
>-% Instead of cmb10, you many want to use cmbx10.
>-% cmbx10 is a prettier font on its own, but cmb10
>-% looks better when embedded in a line with cmr10.
>+% Definitions for a main text size of 11pt.  This is the default in
>+% Texinfo.
>+% 
>+\def\definetextfontsizexi{
>+% Text fonts (11.2pt, magstep1).
>+\def\textnominalsize{11pt}
>+\edef\mainmagstep{\magstephalf}
>+\setfont\textrm\rmshape{10}{\mainmagstep}
>+\setfont\texttt\ttshape{10}{\mainmagstep}
> \setfont\textbf\bfshape{10}{\mainmagstep}
> \setfont\textit\itshape{10}{\mainmagstep}
> \setfont\textsl\slshape{10}{\mainmagstep}
>@@ -1179,12 +1563,14 @@
> \font\texti=cmmi10 scaled \mainmagstep
> \font\textsy=cmsy10 scaled \mainmagstep
> 
>-% A few fonts for @defun, etc.
>-\setfont\defbf\bxshape{10}{\magstep1} %was 1314
>+% A few fonts for @defun names and args.
>+\setfont\defbf\bfshape{10}{\magstep1}
> \setfont\deftt\ttshape{10}{\magstep1}
>-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
>+\setfont\defttsl\ttslshape{10}{\magstep1}
>+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
> 
> % Fonts for indices, footnotes, small examples (9pt).
>+\def\smallnominalsize{9pt}
> \setfont\smallrm\rmshape{9}{1000}
> \setfont\smalltt\ttshape{9}{1000}
> \setfont\smallbf\bfshape{10}{900}
>@@ -1197,6 +1583,7 @@
> \font\smallsy=cmsy9
> 
> % Fonts for small examples (8pt).
>+\def\smallernominalsize{8pt}
> \setfont\smallerrm\rmshape{8}{1000}
> \setfont\smallertt\ttshape{8}{1000}
> \setfont\smallerbf\bfshape{10}{800}
>@@ -1208,7 +1595,8 @@
> \font\smalleri=cmmi8
> \font\smallersy=cmsy8
> 
>-% Fonts for title page:
>+% Fonts for title page (20.4pt):
>+\def\titlenominalsize{20pt}
> \setfont\titlerm\rmbshape{12}{\magstep3}
> \setfont\titleit\itbshape{10}{\magstep4}
> \setfont\titlesl\slbshape{10}{\magstep4}
>@@ -1220,8 +1608,10 @@
> \font\titlei=cmmi12 scaled \magstep3
> \font\titlesy=cmsy10 scaled \magstep4
> \def\authorrm{\secrm}
>+\def\authortt{\sectt}
> 
> % Chapter (and unnumbered) fonts (17.28pt).
>+\def\chapnominalsize{17pt}
> \setfont\chaprm\rmbshape{12}{\magstep2}
> \setfont\chapit\itbshape{10}{\magstep3}
> \setfont\chapsl\slbshape{10}{\magstep3}
>@@ -1234,6 +1624,7 @@
> \font\chapsy=cmsy10 scaled \magstep3
> 
> % Section fonts (14.4pt).
>+\def\secnominalsize{14pt}
> \setfont\secrm\rmbshape{12}{\magstep1}
> \setfont\secit\itbshape{10}{\magstep2}
> \setfont\secsl\slbshape{10}{\magstep2}
>@@ -1246,6 +1637,7 @@
> \font\secsy=cmsy10 scaled \magstep2
> 
> % Subsection fonts (13.15pt).
>+\def\ssecnominalsize{13pt}
> \setfont\ssecrm\rmbshape{12}{\magstephalf}
> \setfont\ssecit\itbshape{10}{1315}
> \setfont\ssecsl\slbshape{10}{1315}
>@@ -1253,11 +1645,181 @@
> \setfont\ssecttsl\ttslshape{10}{1315}
> \setfont\ssecsf\sfbshape{12}{\magstephalf}
> \let\ssecbf\ssecrm
>-\setfont\ssecsc\scbshape{10}{\magstep1}
>+\setfont\ssecsc\scbshape{10}{1315}
> \font\sseci=cmmi12 scaled \magstephalf
> \font\ssecsy=cmsy10 scaled 1315
>-% The smallcaps and symbol fonts should actually be scaled \magstep1.5,
>-% but that is not a standard magnification.
>+
>+% Reduced fonts for @acro in text (10pt).
>+\def\reducednominalsize{10pt}
>+\setfont\reducedrm\rmshape{10}{1000}
>+\setfont\reducedtt\ttshape{10}{1000}
>+\setfont\reducedbf\bfshape{10}{1000}
>+\setfont\reducedit\itshape{10}{1000}
>+\setfont\reducedsl\slshape{10}{1000}
>+\setfont\reducedsf\sfshape{10}{1000}
>+\setfont\reducedsc\scshape{10}{1000}
>+\setfont\reducedttsl\ttslshape{10}{1000}
>+\font\reducedi=cmmi10
>+\font\reducedsy=cmsy10
>+
>+% reset the current fonts
>+\textfonts
>+\rm
>+} % end of 11pt text font size definitions
>+
>+
>+% Definitions to make the main text be 10pt Computer Modern, with
>+% section, chapter, etc., sizes following suit.  This is for the GNU
>+% Press printing of the Emacs 22 manual.  Maybe other manuals in the
>+% future.  Used with @smallbook, which sets the leading to 12pt.
>+% 
>+\def\definetextfontsizex{%
>+% Text fonts (10pt).
>+\def\textnominalsize{10pt}
>+\edef\mainmagstep{1000}
>+\setfont\textrm\rmshape{10}{\mainmagstep}
>+\setfont\texttt\ttshape{10}{\mainmagstep}
>+\setfont\textbf\bfshape{10}{\mainmagstep}
>+\setfont\textit\itshape{10}{\mainmagstep}
>+\setfont\textsl\slshape{10}{\mainmagstep}
>+\setfont\textsf\sfshape{10}{\mainmagstep}
>+\setfont\textsc\scshape{10}{\mainmagstep}
>+\setfont\textttsl\ttslshape{10}{\mainmagstep}
>+\font\texti=cmmi10 scaled \mainmagstep
>+\font\textsy=cmsy10 scaled \mainmagstep
>+
>+% A few fonts for @defun names and args.
>+\setfont\defbf\bfshape{10}{\magstephalf}
>+\setfont\deftt\ttshape{10}{\magstephalf}
>+\setfont\defttsl\ttslshape{10}{\magstephalf}
>+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
>+
>+% Fonts for indices, footnotes, small examples (9pt).
>+\def\smallnominalsize{9pt}
>+\setfont\smallrm\rmshape{9}{1000}
>+\setfont\smalltt\ttshape{9}{1000}
>+\setfont\smallbf\bfshape{10}{900}
>+\setfont\smallit\itshape{9}{1000}
>+\setfont\smallsl\slshape{9}{1000}
>+\setfont\smallsf\sfshape{9}{1000}
>+\setfont\smallsc\scshape{10}{900}
>+\setfont\smallttsl\ttslshape{10}{900}
>+\font\smalli=cmmi9
>+\font\smallsy=cmsy9
>+
>+% Fonts for small examples (8pt).
>+\def\smallernominalsize{8pt}
>+\setfont\smallerrm\rmshape{8}{1000}
>+\setfont\smallertt\ttshape{8}{1000}
>+\setfont\smallerbf\bfshape{10}{800}
>+\setfont\smallerit\itshape{8}{1000}
>+\setfont\smallersl\slshape{8}{1000}
>+\setfont\smallersf\sfshape{8}{1000}
>+\setfont\smallersc\scshape{10}{800}
>+\setfont\smallerttsl\ttslshape{10}{800}
>+\font\smalleri=cmmi8
>+\font\smallersy=cmsy8
>+
>+% Fonts for title page (20.4pt):
>+\def\titlenominalsize{20pt}
>+\setfont\titlerm\rmbshape{12}{\magstep3}
>+\setfont\titleit\itbshape{10}{\magstep4}
>+\setfont\titlesl\slbshape{10}{\magstep4}
>+\setfont\titlett\ttbshape{12}{\magstep3}
>+\setfont\titlettsl\ttslshape{10}{\magstep4}
>+\setfont\titlesf\sfbshape{17}{\magstep1}
>+\let\titlebf=\titlerm
>+\setfont\titlesc\scbshape{10}{\magstep4}
>+\font\titlei=cmmi12 scaled \magstep3
>+\font\titlesy=cmsy10 scaled \magstep4
>+\def\authorrm{\secrm}
>+\def\authortt{\sectt}
>+
>+% Chapter fonts (14.4pt).
>+\def\chapnominalsize{14pt}
>+\setfont\chaprm\rmbshape{12}{\magstep1}
>+\setfont\chapit\itbshape{10}{\magstep2}
>+\setfont\chapsl\slbshape{10}{\magstep2}
>+\setfont\chaptt\ttbshape{12}{\magstep1}
>+\setfont\chapttsl\ttslshape{10}{\magstep2}
>+\setfont\chapsf\sfbshape{12}{\magstep1}
>+\let\chapbf\chaprm
>+\setfont\chapsc\scbshape{10}{\magstep2}
>+\font\chapi=cmmi12 scaled \magstep1
>+\font\chapsy=cmsy10 scaled \magstep2
>+
>+% Section fonts (12pt).
>+\def\secnominalsize{12pt}
>+\setfont\secrm\rmbshape{12}{1000}
>+\setfont\secit\itbshape{10}{\magstep1}
>+\setfont\secsl\slbshape{10}{\magstep1}
>+\setfont\sectt\ttbshape{12}{1000}
>+\setfont\secttsl\ttslshape{10}{\magstep1}
>+\setfont\secsf\sfbshape{12}{1000}
>+\let\secbf\secrm
>+\setfont\secsc\scbshape{10}{\magstep1}
>+\font\seci=cmmi12 
>+\font\secsy=cmsy10 scaled \magstep1
>+
>+% Subsection fonts (10pt).
>+\def\ssecnominalsize{10pt}
>+\setfont\ssecrm\rmbshape{10}{1000}
>+\setfont\ssecit\itbshape{10}{1000}
>+\setfont\ssecsl\slbshape{10}{1000}
>+\setfont\ssectt\ttbshape{10}{1000}
>+\setfont\ssecttsl\ttslshape{10}{1000}
>+\setfont\ssecsf\sfbshape{10}{1000}
>+\let\ssecbf\ssecrm
>+\setfont\ssecsc\scbshape{10}{1000}
>+\font\sseci=cmmi10
>+\font\ssecsy=cmsy10
>+
>+% Reduced fonts for @acro in text (9pt).
>+\def\reducednominalsize{9pt}
>+\setfont\reducedrm\rmshape{9}{1000}
>+\setfont\reducedtt\ttshape{9}{1000}
>+\setfont\reducedbf\bfshape{10}{900}
>+\setfont\reducedit\itshape{9}{1000}
>+\setfont\reducedsl\slshape{9}{1000}
>+\setfont\reducedsf\sfshape{9}{1000}
>+\setfont\reducedsc\scshape{10}{900}
>+\setfont\reducedttsl\ttslshape{10}{900}
>+\font\reducedi=cmmi9
>+\font\reducedsy=cmsy9
>+
>+% reduce space between paragraphs
>+\divide\parskip by 2
>+
>+% reset the current fonts
>+\textfonts
>+\rm
>+} % end of 10pt text font size definitions
>+
>+
>+% We provide the user-level command
>+%   @fonttextsize 10
>+% (or 11) to redefine the text font size.  pt is assumed.
>+% 
>+\def\xword{10}
>+\def\xiword{11}
>+%
>+\parseargdef\fonttextsize{%
>+  \def\textsizearg{#1}%
>+  \wlog{doing @fonttextsize \textsizearg}%
>+  %
>+  % Set \globaldefs so that documents can use this inside @tex, since
>+  % makeinfo 4.8 does not support it, but we need it nonetheless.
>+  % 
>+ \begingroup \globaldefs=1
>+  \ifx\textsizearg\xword \definetextfontsizex
>+  \else \ifx\textsizearg\xiword \definetextfontsizexi
>+  \else
>+    \errhelp=\EMsimple
>+    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
>+  \fi\fi
>+ \endgroup
>+}
>+
> 
> % In order for the font changes to affect most math symbols and letters,
> % we have to define the \textfont of the standard families.  Since
>@@ -1272,56 +1834,104 @@
> }
> 
> % The font-changing commands redefine the meanings of \tenSTYLE, instead
>-% of just \STYLE.  We do this so that font changes will continue to work
>-% in math mode, where it is the current \fam that is relevant in most
>-% cases, not the current font.  Plain TeX does \def\bf{\fam=\bffam
>-% \tenbf}, for example.  By redefining \tenbf, we obviate the need to
>-% redefine \bf itself.
>+% of just \STYLE.  We do this because \STYLE needs to also set the
>+% current \fam for math mode.  Our \STYLE (e.g., \rm) commands hardwire
>+% \tenSTYLE to set the current font.
>+%
>+% Each font-changing command also sets the names \lsize (one size lower)
>+% and \lllsize (three sizes lower).  These relative commands are used in
>+% the LaTeX logo and acronyms.
>+%
>+% This all needs generalizing, badly.
>+%
> \def\textfonts{%
>   \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
>   \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
>-  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl
>+  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
>+  \let\tenttsl=\textttsl
>+  \def\curfontsize{text}%
>+  \def\lsize{reduced}\def\lllsize{smaller}%
>   \resetmathfonts \setleading{\textleading}}
> \def\titlefonts{%
>   \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
>   \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
>   \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
>   \let\tenttsl=\titlettsl
>+  \def\curfontsize{title}%
>+  \def\lsize{chap}\def\lllsize{subsec}%
>   \resetmathfonts \setleading{25pt}}
> \def\titlefont#1{{\titlefonts\rm #1}}
> \def\chapfonts{%
>   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
>   \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
>-  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl
>+  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
>+  \let\tenttsl=\chapttsl
>+  \def\curfontsize{chap}%
>+  \def\lsize{sec}\def\lllsize{text}%
>   \resetmathfonts \setleading{19pt}}
> \def\secfonts{%
>   \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
>   \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
>-  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl
>+  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
>+  \let\tenttsl=\secttsl
>+  \def\curfontsize{sec}%
>+  \def\lsize{subsec}\def\lllsize{reduced}%
>   \resetmathfonts \setleading{16pt}}
> \def\subsecfonts{%
>   \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
>   \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
>-  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl
>+  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
>+  \let\tenttsl=\ssecttsl
>+  \def\curfontsize{ssec}%
>+  \def\lsize{text}\def\lllsize{small}%
>   \resetmathfonts \setleading{15pt}}
>-\let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
>+\let\subsubsecfonts = \subsecfonts
>+\def\reducedfonts{%
>+  \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
>+  \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
>+  \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
>+  \let\tenttsl=\reducedttsl
>+  \def\curfontsize{reduced}%
>+  \def\lsize{small}\def\lllsize{smaller}%
>+  \resetmathfonts \setleading{10.5pt}}
> \def\smallfonts{%
>   \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
>   \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
>   \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
>   \let\tenttsl=\smallttsl
>+  \def\curfontsize{small}%
>+  \def\lsize{smaller}\def\lllsize{smaller}%
>   \resetmathfonts \setleading{10.5pt}}
> \def\smallerfonts{%
>   \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
>   \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
>   \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
>   \let\tenttsl=\smallerttsl
>+  \def\curfontsize{smaller}%
>+  \def\lsize{smaller}\def\lllsize{smaller}%
>   \resetmathfonts \setleading{9.5pt}}
>-\let\smallexamplefonts = \smallerfonts
>+
>+% Set the fonts to use with the @small... environments.
>+\let\smallexamplefonts = \smallfonts
>+
>+% About \smallexamplefonts.  If we use \smallfonts (9pt), @smallexample
>+% can fit this many characters:
>+%   8.5x11=86   smallbook=72  a4=90  a5=69
>+% If we use \scriptfonts (8pt), then we can fit this many characters:
>+%   8.5x11=90+  smallbook=80  a4=90+  a5=77
>+% For me, subjectively, the few extra characters that fit aren't worth
>+% the additional smallness of 8pt.  So I'm making the default 9pt.
>+%
>+% By the way, for comparison, here's what fits with @example (10pt):
>+%   8.5x11=71  smallbook=60  a4=75  a5=58
>+%
>+% I wish the USA used A4 paper.
>+% --karl, 24jan03.
>+
> 
> % Set up the default fonts, so we can use them for creating boxes.
> %
>-\textfonts
>+\definetextfontsizexi
> 
> % Define these so they can be easily changed for other fonts.
> \def\angleleft{$\langle$}
>@@ -1332,27 +1942,41 @@
> 
> % Fonts for short table of contents.
> \setfont\shortcontrm\rmshape{12}{1000}
>-\setfont\shortcontbf\bxshape{12}{1000}
>+\setfont\shortcontbf\bfshape{10}{\magstep1}  % no cmb12
> \setfont\shortcontsl\slshape{12}{1000}
>+\setfont\shortconttt\ttshape{12}{1000}
> 
> %% Add scribe-like font environments, plus @l for inline lisp (usually sans
> %% serif) and @ii for TeX italic
> 
> % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
> % unless the following character is such as not to need one.
>-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
>-\def\smartslanted#1{{\sl #1}\futurelet\next\smartitalicx}
>-\def\smartitalic#1{{\it #1}\futurelet\next\smartitalicx}
>+\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
>+                    \ptexslash\fi\fi\fi}
>+\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
>+\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
>+
>+% like \smartslanted except unconditionally uses \ttsl.
>+% @var is set to this for defun arguments.
>+\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
>+
>+% like \smartslanted except unconditionally use \sl.  We never want
>+% ttsl for book titles, do we?
>+\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
> 
> \let\i=\smartitalic
>+\let\slanted=\smartslanted
> \let\var=\smartslanted
> \let\dfn=\smartslanted
> \let\emph=\smartitalic
>-\let\cite=\smartslanted
> 
>+% @b, explicit bold.
> \def\b#1{{\bf #1}}
> \let\strong=\b
> 
>+% @sansserif, explicit sans.
>+\def\sansserif#1{{\sf #1}}
>+
> % We can't just use \exhyphenpenalty, because that only has effect at
> % the end of a paragraph.  Restore normal hyphenation at the end of the
> % group within which \nohyphenation is presumably called.
>@@ -1360,11 +1984,28 @@
> \def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
> \def\restorehyphenation{\hyphenchar\font = `- }
> 
>+% Set sfcode to normal for the chars that usually have another value.
>+% Can't use plain's \frenchspacing because it uses the `\x notation, and
>+% sometimes \x has an active definition that messes things up.
>+%
>+\catcode`@=11
>+  \def\plainfrenchspacing{%
>+    \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
>+    \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
>+    \def\endofsentencespacefactor{1000}% for @. and friends
>+  }
>+  \def\plainnonfrenchspacing{%
>+    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
>+    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
>+    \def\endofsentencespacefactor{3000}% for @. and friends
>+  }
>+\catcode`@=\other
>+\def\endofsentencespacefactor{3000}% default
>+
> \def\t#1{%
>-  {\tt \rawbackslash \frenchspacing #1}%
>+  {\tt \rawbackslash \plainfrenchspacing #1}%
>   \null
> }
>-\let\ttfont=\t
> \def\samp#1{`\tclose{#1}'\null}
> \setfont\keyrm\rmshape{8}{1000}
> \font\keysy=cmsy9
>@@ -1399,13 +2040,13 @@
>     \nohyphenation
>     %
>     \rawbackslash
>-    \frenchspacing
>+    \plainfrenchspacing
>     #1%
>   }%
>   \null
> }
> 
>-% We *must* turn on hyphenation at `-' and `_' in \code.
>+% We *must* turn on hyphenation at `-' and `_' in @code.
> % Otherwise, it is too hard to avoid overfull hboxes
> % in the Emacs manual, the Library manual, etc.
> 
>@@ -1415,26 +2056,61 @@
> % and arrange explicitly to hyphenate at a dash.
> %  -- rms.
> {
>-  \catcode`\-=\active
>-  \catcode`\_=\active
>+  \catcode`\-=\active \catcode`\_=\active
>+  \catcode`\'=\active \catcode`\`=\active
>   %
>   \global\def\code{\begingroup
>-    \catcode`\-=\active \let-\codedash
>-    \catcode`\_=\active \let_\codeunder
>+    \catcode\rquoteChar=\active \catcode\lquoteChar=\active
>+    \let'\codequoteright \let`\codequoteleft
>+    %
>+    \catcode\dashChar=\active  \catcode\underChar=\active
>+    \ifallowcodebreaks
>+     \let-\codedash
>+     \let_\codeunder
>+    \else
>+     \let-\realdash
>+     \let_\realunder
>+    \fi
>     \codex
>   }
>-  %
>-  % If we end up with any active - characters when handling the index,
>-  % just treat them as a normal -.
>-  \global\def\indexbreaks{\catcode`\-=\active \let-\realdash}
> }
> 
> \def\realdash{-}
> \def\codedash{-\discretionary{}{}{}}
>-\def\codeunder{\ifusingtt{\normalunderscore\discretionary{}{}{}}{\_}}
>+\def\codeunder{%
>+  % this is all so @math{@code{var_name}+1} can work.  In math mode, _
>+  % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
>+  % will therefore expand the active definition of _, which is us
>+  % (inside @code that is), therefore an endless loop.
>+  \ifusingtt{\ifmmode
>+               \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
>+             \else\normalunderscore \fi
>+             \discretionary{}{}{}}%
>+            {\_}%
>+}
> \def\codex #1{\tclose{#1}\endgroup}
> 
>-%\let\exp=\tclose  %Was temporary
>+% An additional complication: the above will allow breaks after, e.g.,
>+% each of the four underscores in __typeof__.  This is undesirable in
>+% some manuals, especially if they don't have long identifiers in
>+% general.  @allowcodebreaks provides a way to control this.
>+% 
>+\newif\ifallowcodebreaks  \allowcodebreakstrue
>+
>+\def\keywordtrue{true}
>+\def\keywordfalse{false}
>+
>+\parseargdef\allowcodebreaks{%
>+  \def\txiarg{#1}%
>+  \ifx\txiarg\keywordtrue
>+    \allowcodebreakstrue
>+  \else\ifx\txiarg\keywordfalse
>+    \allowcodebreaksfalse
>+  \else
>+    \errhelp = \EMsimple
>+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
>+  \fi\fi
>+}
> 
> % @kbd is like @code, except that if the argument is just one @key command,
> % then @kbd has no effect.
>@@ -1442,24 +2118,25 @@
> % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
> %   `example' (@kbd uses ttsl only inside of @example and friends),
> %   or `code' (@kbd uses normal tty font always).
>-\def\kbdinputstyle{\parsearg\kbdinputstylexxx}
>-\def\kbdinputstylexxx#1{%
>-  \def\arg{#1}%
>-  \ifx\arg\worddistinct
>+\parseargdef\kbdinputstyle{%
>+  \def\txiarg{#1}%
>+  \ifx\txiarg\worddistinct
>     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
>-  \else\ifx\arg\wordexample
>+  \else\ifx\txiarg\wordexample
>     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
>-  \else\ifx\arg\wordcode
>+  \else\ifx\txiarg\wordcode
>     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
>+  \else
>+    \errhelp = \EMsimple
>+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
>   \fi\fi\fi
> }
> \def\worddistinct{distinct}
> \def\wordexample{example}
> \def\wordcode{code}
> 
>-% Default is kbdinputdistinct.  (Too much of a hassle to call the macro,
>-% the catcodes are wrong for parsearg to work.)
>-\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}
>+% Default is `distinct.'
>+\kbdinputstyle distinct
> 
> \def\xkey{\key}
> \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
>@@ -1467,8 +2144,8 @@
> \else{\tclose{\kbdfont\look}}\fi
> \else{\tclose{\kbdfont\look}}\fi}
> 
>-% For @url, @env, @command quotes seem unnecessary, so use \code.
>-\let\url=\code
>+% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
>+\let\indicateurl=\code
> \let\env=\code
> \let\command=\code
> 
>@@ -1500,9 +2177,13 @@
>   \endlink
> \endgroup}
> 
>+% @url synonym for @uref, since that's how everyone uses it.
>+%
>+\let\url=\uref
>+
> % rms does not like angle brackets --karl, 17may97.
> % So now @email is just like @uref, unless we are pdf.
>-% 
>+%
> %\def\email#1{\angleleft{\tt #1}\angleright}
> \ifpdf
>   \def\email#1{\doemail#1,,\finish}
>@@ -1541,12 +2222,105 @@
> \def\sc#1{{\smallcaps#1}}       % smallcaps font
> \def\ii#1{{\it #1}}             % italic font
> 
>-% @acronym downcases the argument and prints in smallcaps.
>-\def\acronym#1{{\smallcaps \lowercase{#1}}}
>+% @acronym for "FBI", "NATO", and the like.
>+% We print this one point size smaller, since it's intended for
>+% all-uppercase.
>+% 
>+\def\acronym#1{\doacronym #1,,\finish}
>+\def\doacronym#1,#2,#3\finish{%
>+  {\selectfonts\lsize #1}%
>+  \def\temp{#2}%
>+  \ifx\temp\empty \else
>+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
>+  \fi
>+}
>+
>+% @abbr for "Comput. J." and the like.
>+% No font change, but don't do end-of-sentence spacing.
>+% 
>+\def\abbr#1{\doabbr #1,,\finish}
>+\def\doabbr#1,#2,#3\finish{%
>+  {\plainfrenchspacing #1}%
>+  \def\temp{#2}%
>+  \ifx\temp\empty \else
>+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
>+  \fi
>+}
> 
>-% @pounds{} is a sterling sign.
>+% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
>+%
> \def\pounds{{\it\$}}
> 
>+% @euro{} comes from a separate font, depending on the current style.
>+% We use the free feym* fonts from the eurosym package by Henrik
>+% Theiling, which support regular, slanted, bold and bold slanted (and
>+% "outlined" (blackboard board, sort of) versions, which we don't need).
>+% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
>+% 
>+% Although only regular is the truly official Euro symbol, we ignore
>+% that.  The Euro is designed to be slightly taller than the regular
>+% font height.
>+% 
>+% feymr - regular
>+% feymo - slanted
>+% feybr - bold
>+% feybo - bold slanted
>+% 
>+% There is no good (free) typewriter version, to my knowledge.
>+% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
>+% Hmm.
>+% 
>+% Also doesn't work in math.  Do we need to do math with euro symbols?
>+% Hope not.
>+% 
>+% 
>+\def\euro{{\eurofont e}}
>+\def\eurofont{%
>+  % We set the font at each command, rather than predefining it in
>+  % \textfonts and the other font-switching commands, so that
>+  % installations which never need the symbol don't have to have the
>+  % font installed.
>+  % 
>+  % There is only one designed size (nominal 10pt), so we always scale
>+  % that to the current nominal size.
>+  % 
>+  % By the way, simply using "at 1em" works for cmr10 and the like, but
>+  % does not work for cmbx10 and other extended/shrunken fonts.
>+  % 
>+  \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
>+  %
>+  \ifx\curfontstyle\bfstylename 
>+    % bold:
>+    \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
>+  \else 
>+    % regular:
>+    \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
>+  \fi
>+  \thiseurofont
>+}
>+
>+% @registeredsymbol - R in a circle.  The font for the R should really
>+% be smaller yet, but lllsize is the best we can do for now.
>+% Adapted from the plain.tex definition of \copyright.
>+%
>+\def\registeredsymbol{%
>+  $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
>+               \hfil\crcr\Orb}}%
>+    }$%
>+}
>+
>+% @textdegree - the normal degrees sign.
>+%
>+\def\textdegree{$^\circ$}
>+
>+% Laurent Siebenmann reports \Orb undefined with:
>+%  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
>+% so we'll define it if necessary.
>+% 
>+\ifx\Orb\undefined
>+\def\Orb{\mathhexbox20D}
>+\fi
>+
> 
> \message{page headings,}
> 
>@@ -1565,88 +2339,103 @@
> \newif\ifsetshortcontentsaftertitlepage
>  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
> 
>-\def\shorttitlepage{\parsearg\shorttitlepagezzz}
>-\def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
>+\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
>         \endgroup\page\hbox{}\page}
> 
>-\def\titlepage{\begingroup \parindent=0pt \textfonts
>-   \let\subtitlerm=\tenrm
>-   \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}%
>-   %
>-   \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines}%
>-   %
>-   % Leave some space at the very top of the page.
>-   \vglue\titlepagetopglue
>-   %
>-   % Now you can print the title using @title.
>-   \def\title{\parsearg\titlezzz}%
>-   \def\titlezzz##1{\leftline{\titlefonts\rm ##1}
>-                    % print a rule at the page bottom also.
>-                    \finishedtitlepagefalse
>-                    \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
>-   % No rule at page bottom unless we print one at the top with @title.
>-   \finishedtitlepagetrue
>-   %
>-   % Now you can put text using @subtitle.
>-   \def\subtitle{\parsearg\subtitlezzz}%
>-   \def\subtitlezzz##1{{\subtitlefont \rightline{##1}}}%
>-   %
>-   % @author should come last, but may come many times.
>-   \def\author{\parsearg\authorzzz}%
>-   \def\authorzzz##1{\ifseenauthor\else\vskip 0pt plus 1filll\seenauthortrue\fi
>-      {\authorfont \leftline{##1}}}%
>-   %
>-   % Most title ``pages'' are actually two pages long, with space
>-   % at the top of the second.  We don't want the ragged left on the second.
>-   \let\oldpage = \page
>-   \def\page{%
>+\envdef\titlepage{%
>+  % Open one extra group, as we want to close it in the middle of \Etitlepage.
>+  \begingroup
>+    \parindent=0pt \textfonts
>+    % Leave some space at the very top of the page.
>+    \vglue\titlepagetopglue
>+    % No rule at page bottom unless we print one at the top with @title.
>+    \finishedtitlepagetrue
>+    %
>+    % Most title ``pages'' are actually two pages long, with space
>+    % at the top of the second.  We don't want the ragged left on the second.
>+    \let\oldpage = \page
>+    \def\page{%
>       \iffinishedtitlepage\else
>-         \finishtitlepage
>+	 \finishtitlepage
>       \fi
>-      \oldpage
>       \let\page = \oldpage
>-      \hbox{}}%
>-%   \def\page{\oldpage \hbox{}}
>+      \page
>+      \null
>+    }%
> }
> 
> \def\Etitlepage{%
>-   \iffinishedtitlepage\else
>-      \finishtitlepage
>-   \fi
>-   % It is important to do the page break before ending the group,
>-   % because the headline and footline are only empty inside the group.
>-   % If we use the new definition of \page, we always get a blank page
>-   % after the title page, which we certainly don't want.
>-   \oldpage
>-   \endgroup
>-   %
>-   % Need this before the \...aftertitlepage checks so that if they are
>-   % in effect the toc pages will come out with page numbers.
>-   \HEADINGSon
>-   %
>-   % If they want short, they certainly want long too.
>-   \ifsetshortcontentsaftertitlepage
>-     \shortcontents
>-     \contents
>-     \global\let\shortcontents = \relax
>-     \global\let\contents = \relax
>-   \fi
>-   %
>-   \ifsetcontentsaftertitlepage
>-     \contents
>-     \global\let\contents = \relax
>-     \global\let\shortcontents = \relax
>-   \fi
>-   %
>-   \ifpdf \pdfmakepagedesttrue \fi
>+    \iffinishedtitlepage\else
>+	\finishtitlepage
>+    \fi
>+    % It is important to do the page break before ending the group,
>+    % because the headline and footline are only empty inside the group.
>+    % If we use the new definition of \page, we always get a blank page
>+    % after the title page, which we certainly don't want.
>+    \oldpage
>+  \endgroup
>+  %
>+  % Need this before the \...aftertitlepage checks so that if they are
>+  % in effect the toc pages will come out with page numbers.
>+  \HEADINGSon
>+  %
>+  % If they want short, they certainly want long too.
>+  \ifsetshortcontentsaftertitlepage
>+    \shortcontents
>+    \contents
>+    \global\let\shortcontents = \relax
>+    \global\let\contents = \relax
>+  \fi
>+  %
>+  \ifsetcontentsaftertitlepage
>+    \contents
>+    \global\let\contents = \relax
>+    \global\let\shortcontents = \relax
>+  \fi
> }
> 
> \def\finishtitlepage{%
>-   \vskip4pt \hrule height 2pt width \hsize
>-   \vskip\titlepagebottomglue
>-   \finishedtitlepagetrue
>+  \vskip4pt \hrule height 2pt width \hsize
>+  \vskip\titlepagebottomglue
>+  \finishedtitlepagetrue
>+}
>+
>+%%% Macros to be used within @titlepage:
>+
>+\let\subtitlerm=\tenrm
>+\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
>+
>+\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
>+		\let\tt=\authortt}
>+
>+\parseargdef\title{%
>+  \checkenv\titlepage
>+  \leftline{\titlefonts\rm #1}
>+  % print a rule at the page bottom also.
>+  \finishedtitlepagefalse
>+  \vskip4pt \hrule height 4pt width \hsize \vskip4pt
>+}
>+
>+\parseargdef\subtitle{%
>+  \checkenv\titlepage
>+  {\subtitlefont \rightline{#1}}%
> }
> 
>+% @author should come last, but may come many times.
>+% It can also be used inside @quotation.
>+%
>+\parseargdef\author{%
>+  \def\temp{\quotation}%
>+  \ifx\thisenv\temp
>+    \def\quotationauthor{#1}% printed in \Equotation.
>+  \else
>+    \checkenv\titlepage
>+    \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
>+    {\authorfont \leftline{#1}}%
>+  \fi
>+}
>+
>+
> %%% Set up page headings and footings.
> 
> \let\thispage=\folio
>@@ -1656,7 +2445,7 @@
> \newtoks\evenfootline    % footline on even pages
> \newtoks\oddfootline     % footline on odd pages
> 
>-% Now make Tex use those variables
>+% Now make TeX use those variables
> \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
>                             \else \the\evenheadline \fi}}
> \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
>@@ -1670,43 +2459,37 @@
> % @evenfooting @thisfile||
> % @oddfooting ||@thisfile
> 
>-\def\evenheading{\parsearg\evenheadingxxx}
>-\def\oddheading{\parsearg\oddheadingxxx}
>-\def\everyheading{\parsearg\everyheadingxxx}
>-
>-\def\evenfooting{\parsearg\evenfootingxxx}
>-\def\oddfooting{\parsearg\oddfootingxxx}
>-\def\everyfooting{\parsearg\everyfootingxxx}
>-
>-{\catcode`\@=0 %
> 
>-\gdef\evenheadingxxx #1{\evenheadingyyy #1@|@|@|@|\finish}
>-\gdef\evenheadingyyy #1@|#2@|#3@|#4\finish{%
>+\def\evenheading{\parsearg\evenheadingxxx}
>+\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
>+\def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
> \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
> 
>-\gdef\oddheadingxxx #1{\oddheadingyyy #1@|@|@|@|\finish}
>-\gdef\oddheadingyyy #1@|#2@|#3@|#4\finish{%
>+\def\oddheading{\parsearg\oddheadingxxx}
>+\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
>+\def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
> \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
> 
>-\gdef\everyheadingxxx#1{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
>+\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
> 
>-\gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
>-\gdef\evenfootingyyy #1@|#2@|#3@|#4\finish{%
>+\def\evenfooting{\parsearg\evenfootingxxx}
>+\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
>+\def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
> \global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
> 
>-\gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
>-\gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
>+\def\oddfooting{\parsearg\oddfootingxxx}
>+\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
>+\def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
>   \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
>   %
>   % Leave some space for the footline.  Hopefully ok to assume
>   % @evenfooting will not be used by itself.
>-  \global\advance\pageheight by -\baselineskip
>-  \global\advance\vsize by -\baselineskip
>+  \global\advance\pageheight by -12pt
>+  \global\advance\vsize by -12pt
> }
> 
>-\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
>-%
>-}% unbind the catcode of @.
>+\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
>+
> 
> % @headings double      turns headings on for double-sided printing.
> % @headings single      turns headings on for single-sided printing.
>@@ -1720,7 +2503,7 @@
> 
> \def\headings #1 {\csname HEADINGS#1\endcsname}
> 
>-\def\HEADINGSoff{
>+\def\HEADINGSoff{%
> \global\evenheadline={\hfil} \global\evenfootline={\hfil}
> \global\oddheadline={\hfil} \global\oddfootline={\hfil}}
> \HEADINGSoff
>@@ -1729,7 +2512,7 @@
> % chapter name on inside top of right hand pages, document
> % title on inside top of left hand pages, and page numbers on outside top
> % edge of all pages.
>-\def\HEADINGSdouble{
>+\def\HEADINGSdouble{%
> \global\pageno=1
> \global\evenfootline={\hfil}
> \global\oddfootline={\hfil}
>@@ -1741,7 +2524,7 @@
> 
> % For single-sided printing, chapter title goes across top left of page,
> % page number on top right.
>-\def\HEADINGSsingle{
>+\def\HEADINGSsingle{%
> \global\pageno=1
> \global\evenfootline={\hfil}
> \global\oddfootline={\hfil}
>@@ -1788,12 +2571,11 @@
> % @settitle line...  specifies the title of the document, for headings.
> % It generates no output of its own.
> \def\thistitle{\putwordNoTitle}
>-\def\settitle{\parsearg\settitlezzz}
>-\def\settitlezzz #1{\gdef\thistitle{#1}}
>+\def\settitle{\parsearg{\gdef\thistitle}}
> 
> 
> \message{tables,}
>-% Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x).
>+% Tables -- @table, @ftable, @vtable, @item(x).
> 
> % default indentation of table text
> \newdimen\tableindent \tableindent=.8in
>@@ -1805,7 +2587,7 @@
> % used internally for \itemindent minus \itemmargin
> \newdimen\itemmax
> 
>-% Note @table, @vtable, and @vtable define @item, @itemx, etc., with
>+% Note @table, @ftable, and @vtable define @item, @itemx, etc., with
> % these defs.
> % They also define \itemindex
> % to index the item name in whatever manner is desired (perhaps none).
>@@ -1817,22 +2599,10 @@
> \def\internalBitem{\smallbreak \parsearg\itemzzz}
> \def\internalBitemx{\itemxpar \parsearg\itemzzz}
> 
>-\def\internalBxitem "#1"{\def\xitemsubtopix{#1} \smallbreak \parsearg\xitemzzz}
>-\def\internalBxitemx "#1"{\def\xitemsubtopix{#1} \itemxpar \parsearg\xitemzzz}
>-
>-\def\internalBkitem{\smallbreak \parsearg\kitemzzz}
>-\def\internalBkitemx{\itemxpar \parsearg\kitemzzz}
>-
>-\def\kitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \lastfunction}}%
>-                 \itemzzz {#1}}
>-
>-\def\xitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \xitemsubtopic}}%
>-                 \itemzzz {#1}}
>-
> \def\itemzzz #1{\begingroup %
>   \advance\hsize by -\rightskip
>   \advance\hsize by -\tableindent
>-  \setbox0=\hbox{\itemfont{#1}}%
>+  \setbox0=\hbox{\itemindicate{#1}}%
>   \itemindex{#1}%
>   \nobreak % This prevents a break before @itemx.
>   %
>@@ -1856,10 +2626,14 @@
>     % \parskip glue -- logically it's part of the @item we just started.
>     \nobreak \vskip-\parskip
>     %
>-    % Stop a page break at the \parskip glue coming up.  Unfortunately
>-    % we can't prevent a possible page break at the following
>-    % \baselineskip glue.
>-    \nobreak
>+    % Stop a page break at the \parskip glue coming up.  However, if
>+    % what follows is an environment such as @example, there will be no
>+    % \parskip glue; then the negative vskip we just inserted would
>+    % cause the example and the item to crash together.  So we use this
>+    % bizarre value of 10001 as a signal to \aboveenvbreak to insert
>+    % \parskip glue after all.  Section titles are handled this way also.
>+    % 
>+    \penalty 10001
>     \endgroup
>     \itemxneedsnegativevskipfalse
>   \else
>@@ -1878,97 +2652,106 @@
>   \fi
> }
> 
>-\def\item{\errmessage{@item while not in a table}}
>-\def\itemx{\errmessage{@itemx while not in a table}}
>-\def\kitem{\errmessage{@kitem while not in a table}}
>-\def\kitemx{\errmessage{@kitemx while not in a table}}
>-\def\xitem{\errmessage{@xitem while not in a table}}
>-\def\xitemx{\errmessage{@xitemx while not in a table}}
>-
>-% Contains a kludge to get @end[description] to work.
>-\def\description{\tablez{\dontindex}{1}{}{}{}{}}
>+\def\item{\errmessage{@item while not in a list environment}}
>+\def\itemx{\errmessage{@itemx while not in a list environment}}
> 
> % @table, @ftable, @vtable.
>-\def\table{\begingroup\inENV\obeylines\obeyspaces\tablex}
>-{\obeylines\obeyspaces%
>-\gdef\tablex #1^^M{%
>-\tabley\dontindex#1        \endtabley}}
>-
>-\def\ftable{\begingroup\inENV\obeylines\obeyspaces\ftablex}
>-{\obeylines\obeyspaces%
>-\gdef\ftablex #1^^M{%
>-\tabley\fnitemindex#1        \endtabley
>-\def\Eftable{\endgraf\afterenvbreak\endgroup}%
>-\let\Etable=\relax}}
>-
>-\def\vtable{\begingroup\inENV\obeylines\obeyspaces\vtablex}
>-{\obeylines\obeyspaces%
>-\gdef\vtablex #1^^M{%
>-\tabley\vritemindex#1        \endtabley
>-\def\Evtable{\endgraf\afterenvbreak\endgroup}%
>-\let\Etable=\relax}}
>-
>-\def\dontindex #1{}
>-\def\fnitemindex #1{\doind {fn}{\code{#1}}}%
>-\def\vritemindex #1{\doind {vr}{\code{#1}}}%
>-
>-{\obeyspaces %
>-\gdef\tabley#1#2 #3 #4 #5 #6 #7\endtabley{\endgroup%
>-\tablez{#1}{#2}{#3}{#4}{#5}{#6}}}
>-
>-\def\tablez #1#2#3#4#5#6{%
>-\aboveenvbreak %
>-\begingroup %
>-\def\Edescription{\Etable}% Necessary kludge.
>-\let\itemindex=#1%
>-\ifnum 0#3>0 \advance \leftskip by #3\mil \fi %
>-\ifnum 0#4>0 \tableindent=#4\mil \fi %
>-\ifnum 0#5>0 \advance \rightskip by #5\mil \fi %
>-\def\itemfont{#2}%
>-\itemmax=\tableindent %
>-\advance \itemmax by -\itemmargin %
>-\advance \leftskip by \tableindent %
>-\exdentamount=\tableindent
>-\parindent = 0pt
>-\parskip = \smallskipamount
>-\ifdim \parskip=0pt \parskip=2pt \fi%
>-\def\Etable{\endgraf\afterenvbreak\endgroup}%
>-\let\item = \internalBitem %
>-\let\itemx = \internalBitemx %
>-\let\kitem = \internalBkitem %
>-\let\kitemx = \internalBkitemx %
>-\let\xitem = \internalBxitem %
>-\let\xitemx = \internalBxitemx %
>+\envdef\table{%
>+  \let\itemindex\gobble
>+  \tablecheck{table}%
>+}
>+\envdef\ftable{%
>+  \def\itemindex ##1{\doind {fn}{\code{##1}}}%
>+  \tablecheck{ftable}%
>+}
>+\envdef\vtable{%
>+  \def\itemindex ##1{\doind {vr}{\code{##1}}}%
>+  \tablecheck{vtable}%
> }
>+\def\tablecheck#1{%
>+  \ifnum \the\catcode`\^^M=\active
>+    \endgroup
>+    \errmessage{This command won't work in this context; perhaps the problem is
>+      that we are \inenvironment\thisenv}%
>+    \def\next{\doignore{#1}}%
>+  \else
>+    \let\next\tablex
>+  \fi
>+  \next
>+}
>+\def\tablex#1{%
>+  \def\itemindicate{#1}%
>+  \parsearg\tabley
>+}
>+\def\tabley#1{%
>+  {%
>+    \makevalueexpandable
>+    \edef\temp{\noexpand\tablez #1\space\space\space}%
>+    \expandafter
>+  }\temp \endtablez
>+}
>+\def\tablez #1 #2 #3 #4\endtablez{%
>+  \aboveenvbreak
>+  \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
>+  \ifnum 0#2>0 \tableindent=#2\mil \fi
>+  \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
>+  \itemmax=\tableindent
>+  \advance \itemmax by -\itemmargin
>+  \advance \leftskip by \tableindent
>+  \exdentamount=\tableindent
>+  \parindent = 0pt
>+  \parskip = \smallskipamount
>+  \ifdim \parskip=0pt \parskip=2pt \fi
>+  \let\item = \internalBitem
>+  \let\itemx = \internalBitemx
>+}
>+\def\Etable{\endgraf\afterenvbreak}
>+\let\Eftable\Etable
>+\let\Evtable\Etable
>+\let\Eitemize\Etable
>+\let\Eenumerate\Etable
> 
> % This is the counter used by @enumerate, which is really @itemize
> 
> \newcount \itemno
> 
>-\def\itemize{\parsearg\itemizezzz}
>+\envdef\itemize{\parsearg\doitemize}
> 
>-\def\itemizezzz #1{%
>-  \begingroup % ended by the @end itemize
>-  \itemizey {#1}{\Eitemize}
>-}
>-
>-\def\itemizey #1#2{%
>-\aboveenvbreak %
>-\itemmax=\itemindent %
>-\advance \itemmax by -\itemmargin %
>-\advance \leftskip by \itemindent %
>-\exdentamount=\itemindent
>-\parindent = 0pt %
>-\parskip = \smallskipamount %
>-\ifdim \parskip=0pt \parskip=2pt \fi%
>-\def#2{\endgraf\afterenvbreak\endgroup}%
>-\def\itemcontents{#1}%
>-\let\item=\itemizeitem}
>+\def\doitemize#1{%
>+  \aboveenvbreak
>+  \itemmax=\itemindent
>+  \advance\itemmax by -\itemmargin
>+  \advance\leftskip by \itemindent
>+  \exdentamount=\itemindent
>+  \parindent=0pt
>+  \parskip=\smallskipamount
>+  \ifdim\parskip=0pt \parskip=2pt \fi
>+  \def\itemcontents{#1}%
>+  % @itemize with no arg is equivalent to @itemize @bullet.
>+  \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
>+  \let\item=\itemizeitem
>+}
> 
>-% Set sfcode to normal for the chars that usually have another value.
>-% These are `.?!:;,'
>-\def\frenchspacing{\sfcode46=1000 \sfcode63=1000 \sfcode33=1000
>-  \sfcode58=1000 \sfcode59=1000 \sfcode44=1000 }
>+% Definition of @item while inside @itemize and @enumerate.
>+%
>+\def\itemizeitem{%
>+  \advance\itemno by 1  % for enumerations
>+  {\let\par=\endgraf \smallbreak}% reasonable place to break
>+  {%
>+   % If the document has an @itemize directly after a section title, a
>+   % \nobreak will be last on the list, and \sectionheading will have
>+   % done a \vskip-\parskip.  In that case, we don't want to zero
>+   % parskip, or the item text will crash with the heading.  On the
>+   % other hand, when there is normal text preceding the item (as there
>+   % usually is), we do want to zero parskip, or there would be too much
>+   % space.  In that case, we won't have a \nobreak before.  At least
>+   % that's the theory.
>+   \ifnum\lastpenalty<10000 \parskip=0in \fi
>+   \noindent
>+   \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
>+   \vadjust{\penalty 1200}}% not good to break after first line of item.
>+  \flushcr
>+}
> 
> % \splitoff TOKENS\endmark defines \first to be the first token in
> % TOKENS, and \rest to be the remainder.
>@@ -1979,11 +2762,8 @@
> % or number, to specify the first label in the enumerated list.  No
> % argument is the same as `1'.
> %
>-\def\enumerate{\parsearg\enumeratezzz}
>-\def\enumeratezzz #1{\enumeratey #1  \endenumeratey}
>+\envparseargdef\enumerate{\enumeratey #1  \endenumeratey}
> \def\enumeratey #1 #2\endenumeratey{%
>-  \begingroup % ended by the @end enumerate
>-  %
>   % If we were given no argument, pretend we were given `1'.
>   \def\thearg{#1}%
>   \ifx\thearg\empty \def\thearg{1}\fi
>@@ -2054,13 +2834,13 @@
>   }%
> }
> 
>-% Call itemizey, adding a period to the first argument and supplying the
>+% Call \doitemize, adding a period to the first argument and supplying the
> % common last two arguments.  Also subtract one from the initial value in
> % \itemno, since @item increments \itemno.
> %
> \def\startenumeration#1{%
>   \advance\itemno by -1
>-  \itemizey{#1.}\Eenumerate\flushcr
>+  \doitemize{#1.}\flushcr
> }
> 
> % @alphaenumerate and @capsenumerate are abbreviations for giving an arg
>@@ -2071,16 +2851,6 @@
> \def\Ealphaenumerate{\Eenumerate}
> \def\Ecapsenumerate{\Eenumerate}
> 
>-% Definition of @item while inside @itemize.
>-
>-\def\itemizeitem{%
>-\advance\itemno by 1
>-{\let\par=\endgraf \smallbreak}%
>-\ifhmode \errmessage{In hmode at itemizeitem}\fi
>-{\parskip=0in \hskip 0pt
>-\hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
>-\vadjust{\penalty 1200}}%
>-\flushcr}
> 
> % @multitable macros
> % Amy Hendrickson, 8/18/94, 3/6/96
>@@ -2107,24 +2877,14 @@
> %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
> %   @item ...
> %   using the widest term desired in each column.
>-%
>-% For those who want to use more than one line's worth of words in
>-% the preamble, break the line within one argument and it
>-% will parse correctly, i.e.,
>-%
>-%     @multitable {Column 1 template} {Column 2 template} {Column 3
>-%      template}
>-% Not:
>-%     @multitable {Column 1 template} {Column 2 template}
>-%      {Column 3 template}
> 
> % Each new table line starts with @item, each subsequent new column
> % starts with @tab. Empty columns may be produced by supplying @tab's
> % with nothing between them for as many times as empty columns are needed,
> % ie, @tab@tab@tab will produce two empty columns.
> 
>-% @item, @tab, @multitable or @end multitable do not need to be on their
>-% own lines, but it will not hurt if they are.
>+% @item, @tab do not need to be on their own lines, but it will not hurt
>+% if they are.
> 
> % Sample multitable:
> 
>@@ -2168,13 +2928,12 @@
> \def\xcolumnfractions{\columnfractions}
> \newif\ifsetpercent
> 
>-% #1 is the part of the @columnfraction before the decimal point, which
>-% is presumably either 0 or the empty string (but we don't check, we
>-% just throw it away).  #2 is the decimal part, which we use as the
>-% percent of \hsize for this column.
>-\def\pickupwholefraction#1.#2 {%
>+% #1 is the @columnfraction, usually a decimal number like .5, but might
>+% be just 1.  We just use it, whatever it is.
>+%
>+\def\pickupwholefraction#1 {%
>   \global\advance\colcount by 1
>-  \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}%
>+  \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
>   \setuptable
> }
> 
>@@ -2191,8 +2950,8 @@
>          \let\go\pickupwholefraction
>       \else
>          \global\advance\colcount by 1
>-         \setbox0=\hbox{#1\unskip }% Add a normal word space as a separator;
>-                            % typically that is always in the input, anyway.
>+         \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
>+                   % separator; typically that is always in the input, anyway.
>          \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
>       \fi
>     \fi
>@@ -2207,18 +2966,33 @@
>   \go
> }
> 
>-% This used to have \hskip1sp.  But then the space in a template line is
>-% not enough.  That is bad.  So let's go back to just & until we
>-% encounter the problem it was intended to solve again.
>-% --karl, nathan@acm.org, 20apr99.
>-\def\tab{&}
>+% multitable-only commands.
>+%
>+% @headitem starts a heading row, which we typeset in bold.
>+% Assignments have to be global since we are inside the implicit group
>+% of an alignment entry.  Note that \everycr resets \everytab.
>+\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
>+%
>+% A \tab used to include \hskip1sp.  But then the space in a template
>+% line is not enough.  That is bad.  So let's go back to just `&' until
>+% we encounter the problem it was intended to solve again.
>+%					--karl, nathan@acm.org, 20apr99.
>+\def\tab{\checkenv\multitable &\the\everytab}%
> 
> % @multitable ... @end multitable definitions:
> %
>-\def\multitable{\parsearg\dotable}
>-\def\dotable#1{\bgroup
>+\newtoks\everytab  % insert after every tab.
>+%
>+\envdef\multitable{%
>   \vskip\parskip
>-  \let\item\crcr
>+  \startsavinginserts
>+  %
>+  % @item within a multitable starts a normal row.
>+  % We use \def instead of \let so that if one of the multitable entries
>+  % contains an @itemize, we don't choke on the \item (seen as \crcr aka
>+  % \endtemplate) expanding \doitemize.
>+  \def\item{\crcr}%
>+  %
>   \tolerance=9500
>   \hbadness=9500
>   \setmultitablespacing
>@@ -2226,81 +3000,93 @@
>   \parindent=\multitableparindent
>   \overfullrule=0pt
>   \global\colcount=0
>-  \def\Emultitable{\global\setpercentfalse\cr\egroup\egroup}%
>   %
>+  \everycr = {%
>+    \noalign{%
>+      \global\everytab={}%
>+      \global\colcount=0 % Reset the column counter.
>+      % Check for saved footnotes, etc.
>+      \checkinserts
>+      % Keeps underfull box messages off when table breaks over pages.
>+      %\filbreak
>+	% Maybe so, but it also creates really weird page breaks when the
>+	% table breaks over pages. Wouldn't \vfil be better?  Wait until the
>+	% problem manifests itself, so it can be fixed for real --karl.
>+    }%
>+  }%
>+  %
>+  \parsearg\domultitable
>+}
>+\def\domultitable#1{%
>   % To parse everything between @multitable and @item:
>   \setuptable#1 \endsetuptable
>   %
>-  % \everycr will reset column counter, \colcount, at the end of
>-  % each line. Every column entry will cause \colcount to advance by one.
>-  % The table preamble
>-  % looks at the current \colcount to find the correct column width.
>-  \everycr{\noalign{%
>-  %
>-  % \filbreak%% keeps underfull box messages off when table breaks over pages.
>-  % Maybe so, but it also creates really weird page breaks when the table
>-  % breaks over pages. Wouldn't \vfil be better?  Wait until the problem
>-  % manifests itself, so it can be fixed for real --karl.
>-    \global\colcount=0\relax}}%
>-  %
>   % This preamble sets up a generic column definition, which will
>   % be used as many times as user calls for columns.
>   % \vtop will set a single line and will also let text wrap and
>   % continue for many paragraphs if desired.
>-  \halign\bgroup&\global\advance\colcount by 1\relax
>-    \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
>-  %
>-  % In order to keep entries from bumping into each other
>-  % we will add a \leftskip of \multitablecolspace to all columns after
>-  % the first one.
>-  %
>-  % If a template has been used, we will add \multitablecolspace
>-  % to the width of each template entry.
>-  %
>-  % If the user has set preamble in terms of percent of \hsize we will
>-  % use that dimension as the width of the column, and the \leftskip
>-  % will keep entries from bumping into each other.  Table will start at
>-  % left margin and final column will justify at right margin.
>-  %
>-  % Make sure we don't inherit \rightskip from the outer environment.
>-  \rightskip=0pt
>-  \ifnum\colcount=1
>-    % The first column will be indented with the surrounding text.
>-    \advance\hsize by\leftskip
>-  \else
>-    \ifsetpercent \else
>-      % If user has not set preamble in terms of percent of \hsize
>-      % we will advance \hsize by \multitablecolspace.
>-      \advance\hsize by \multitablecolspace
>-    \fi
>-   % In either case we will make \leftskip=\multitablecolspace:
>-  \leftskip=\multitablecolspace
>-  \fi
>-  % Ignoring space at the beginning and end avoids an occasional spurious
>-  % blank line, when TeX decides to break the line at the space before the
>-  % box from the multistrut, so the strut ends up on a line by itself.
>-  % For example:
>-  % @multitable @columnfractions .11 .89
>-  % @item @code{#}
>-  % @tab Legal holiday which is valid in major parts of the whole country.
>-  % Is automatically provided with highlighting sequences respectively marking
>-  % characters.
>-  \noindent\ignorespaces##\unskip\multistrut}\cr
>-}
>-
>-\def\setmultitablespacing{% test to see if user has set \multitablelinespace.
>-% If so, do nothing. If not, give it an appropriate dimension based on
>-% current baselineskip.
>+  \halign\bgroup &%
>+    \global\advance\colcount by 1
>+    \multistrut
>+    \vtop{%
>+      % Use the current \colcount to find the correct column width:
>+      \hsize=\expandafter\csname col\the\colcount\endcsname
>+      %
>+      % In order to keep entries from bumping into each other
>+      % we will add a \leftskip of \multitablecolspace to all columns after
>+      % the first one.
>+      %
>+      % If a template has been used, we will add \multitablecolspace
>+      % to the width of each template entry.
>+      %
>+      % If the user has set preamble in terms of percent of \hsize we will
>+      % use that dimension as the width of the column, and the \leftskip
>+      % will keep entries from bumping into each other.  Table will start at
>+      % left margin and final column will justify at right margin.
>+      %
>+      % Make sure we don't inherit \rightskip from the outer environment.
>+      \rightskip=0pt
>+      \ifnum\colcount=1
>+	% The first column will be indented with the surrounding text.
>+	\advance\hsize by\leftskip
>+      \else
>+	\ifsetpercent \else
>+	  % If user has not set preamble in terms of percent of \hsize
>+	  % we will advance \hsize by \multitablecolspace.
>+	  \advance\hsize by \multitablecolspace
>+	\fi
>+       % In either case we will make \leftskip=\multitablecolspace:
>+      \leftskip=\multitablecolspace
>+      \fi
>+      % Ignoring space at the beginning and end avoids an occasional spurious
>+      % blank line, when TeX decides to break the line at the space before the
>+      % box from the multistrut, so the strut ends up on a line by itself.
>+      % For example:
>+      % @multitable @columnfractions .11 .89
>+      % @item @code{#}
>+      % @tab Legal holiday which is valid in major parts of the whole country.
>+      % Is automatically provided with highlighting sequences respectively
>+      % marking characters.
>+      \noindent\ignorespaces##\unskip\multistrut
>+    }\cr
>+}
>+\def\Emultitable{%
>+  \crcr
>+  \egroup % end the \halign
>+  \global\setpercentfalse
>+}
>+
>+\def\setmultitablespacing{%
>+  \def\multistrut{\strut}% just use the standard line spacing
>+  %
>+  % Compute \multitablelinespace (if not defined by user) for use in
>+  % \multitableparskip calculation.  We used define \multistrut based on
>+  % this, but (ironically) that caused the spacing to be off.
>+  % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
> \ifdim\multitablelinespace=0pt
> \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
> \global\advance\multitablelinespace by-\ht0
>-%% strut to put in table in case some entry doesn't have descenders,
>-%% to keep lines equally spaced
>-\let\multistrut = \strut
>-\else
>-%% FIXME: what is \box0 supposed to be?
>-\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
>-width0pt\relax} \fi
>+\fi
> %% Test to see if parskip is larger than space between lines of
> %% table. If not, do nothing.
> %%        If so, set to same dimension as multitablelinespace.
>@@ -2317,288 +3103,178 @@
> 
> 
> \message{conditionals,}
>-% Prevent errors for section commands.
>-% Used in @ignore and in failing conditionals.
>-\def\ignoresections{%
>-  \let\chapter=\relax
>-  \let\unnumbered=\relax
>-  \let\top=\relax
>-  \let\unnumberedsec=\relax
>-  \let\unnumberedsection=\relax
>-  \let\unnumberedsubsec=\relax
>-  \let\unnumberedsubsection=\relax
>-  \let\unnumberedsubsubsec=\relax
>-  \let\unnumberedsubsubsection=\relax
>-  \let\section=\relax
>-  \let\subsec=\relax
>-  \let\subsubsec=\relax
>-  \let\subsection=\relax
>-  \let\subsubsection=\relax
>-  \let\appendix=\relax
>-  \let\appendixsec=\relax
>-  \let\appendixsection=\relax
>-  \let\appendixsubsec=\relax
>-  \let\appendixsubsection=\relax
>-  \let\appendixsubsubsec=\relax
>-  \let\appendixsubsubsection=\relax
>-  \let\contents=\relax
>-  \let\smallbook=\relax
>-  \let\titlepage=\relax
>-}
>-
>-% Used in nested conditionals, where we have to parse the Texinfo source
>-% and so want to turn off most commands, in case they are used
>-% incorrectly.
>-%
>-\def\ignoremorecommands{%
>-  \let\defcodeindex = \relax
>-  \let\defcv = \relax
>-  \let\deffn = \relax
>-  \let\deffnx = \relax
>-  \let\defindex = \relax
>-  \let\defivar = \relax
>-  \let\defmac = \relax
>-  \let\defmethod = \relax
>-  \let\defop = \relax
>-  \let\defopt = \relax
>-  \let\defspec = \relax
>-  \let\deftp = \relax
>-  \let\deftypefn = \relax
>-  \let\deftypefun = \relax
>-  \let\deftypeivar = \relax
>-  \let\deftypeop = \relax
>-  \let\deftypevar = \relax
>-  \let\deftypevr = \relax
>-  \let\defun = \relax
>-  \let\defvar = \relax
>-  \let\defvr = \relax
>-  \let\ref = \relax
>-  \let\xref = \relax
>-  \let\printindex = \relax
>-  \let\pxref = \relax
>-  \let\settitle = \relax
>-  \let\setchapternewpage = \relax
>-  \let\setchapterstyle = \relax
>-  \let\everyheading = \relax
>-  \let\evenheading = \relax
>-  \let\oddheading = \relax
>-  \let\everyfooting = \relax
>-  \let\evenfooting = \relax
>-  \let\oddfooting = \relax
>-  \let\headings = \relax
>-  \let\include = \relax
>-  \let\lowersections = \relax
>-  \let\down = \relax
>-  \let\raisesections = \relax
>-  \let\up = \relax
>-  \let\set = \relax
>-  \let\clear = \relax
>-  \let\item = \relax
>-}
> 
>-% Ignore @ignore ... @end ignore.
>-%
>-\def\ignore{\doignore{ignore}}
>+% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
>+% @ifnotxml always succeed.  They currently do nothing; we don't
>+% attempt to check whether the conditionals are properly nested.  But we
>+% have to remember that they are conditionals, so that @end doesn't
>+% attempt to close an environment group.
>+%
>+\def\makecond#1{%
>+  \expandafter\let\csname #1\endcsname = \relax
>+  \expandafter\let\csname iscond.#1\endcsname = 1
>+}
>+\makecond{iftex}
>+\makecond{ifnotdocbook}
>+\makecond{ifnothtml}
>+\makecond{ifnotinfo}
>+\makecond{ifnotplaintext}
>+\makecond{ifnotxml}
> 
>-% Also ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu,
>-% @documentdescription, and @direntry text.
>+% Ignore @ignore, @ifhtml, @ifinfo, and the like.
> %
>-\def\ifinfo{\doignore{ifinfo}}
>+\def\direntry{\doignore{direntry}}
>+\def\documentdescription{\doignore{documentdescription}}
>+\def\docbook{\doignore{docbook}}
>+\def\html{\doignore{html}}
>+\def\ifdocbook{\doignore{ifdocbook}}
> \def\ifhtml{\doignore{ifhtml}}
>+\def\ifinfo{\doignore{ifinfo}}
> \def\ifnottex{\doignore{ifnottex}}
>-\def\html{\doignore{html}}
>+\def\ifplaintext{\doignore{ifplaintext}}
>+\def\ifxml{\doignore{ifxml}}
>+\def\ignore{\doignore{ignore}}
> \def\menu{\doignore{menu}}
>-\def\documentdescription{\doignore{documentdescription}}
>-\def\direntry{\doignore{direntry}}
>+\def\xml{\doignore{xml}}
> 
>-% @dircategory CATEGORY  -- specify a category of the dir file
>-% which this file should belong to.  Ignore this in TeX.
>-\let\dircategory = \comment
>-
>-% Ignore text until a line `@end #1'.
>+% Ignore text until a line `@end #1', keeping track of nested conditionals.
> %
>+% A count to remember the depth of nesting.
>+\newcount\doignorecount
>+
> \def\doignore#1{\begingroup
>-  % Don't complain about control sequences we have declared \outer.
>-  \ignoresections
>-  %
>-  % Define a command to swallow text until we reach `@end #1'.
>-  % This @ is a catcode 12 token (that is the normal catcode of @ in
>-  % this texinfo.tex file).  We change the catcode of @ below to match.
>-  \long\def\doignoretext##1@end #1{\enddoignore}%
>+  % Scan in ``verbatim'' mode:
>+  \obeylines
>+  \catcode`\@ = \other
>+  \catcode`\{ = \other
>+  \catcode`\} = \other
>   %
>   % Make sure that spaces turn into tokens that match what \doignoretext wants.
>-  \catcode32 = 10
>+  \spaceisspace
>+  %
>+  % Count number of #1's that we've seen.
>+  \doignorecount = 0
>+  %
>+  % Swallow text until we reach the matching `@end #1'.
>+  \dodoignore{#1}%
>+}
>+
>+{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
>+  \obeylines %
>   %
>-  % Ignore braces, too, so mismatched braces don't cause trouble.
>-  \catcode`\{ = 9
>-  \catcode`\} = 9
>-  %
>-  % We must not have @c interpreted as a control sequence.
>-  \catcode`\@ = 12
>-  %
>-  % Make the letter c a comment character so that the rest of the line
>-  % will be ignored. This way, the document can have (for example)
>-  %   @c @end ifinfo
>-  % and the @end ifinfo will be properly ignored.
>-  % (We've just changed @ to catcode 12.)
>-  \catcode`\c = 14
>-  %
>-  % And now expand that command.
>-  \doignoretext
>-}
>-
>-% What we do to finish off ignored text.
>-%
>-\def\enddoignore{\endgroup\ignorespaces}%
>-
>-\newif\ifwarnedobs\warnedobsfalse
>-\def\obstexwarn{%
>-  \ifwarnedobs\relax\else
>-  % We need to warn folks that they may have trouble with TeX 3.0.
>-  % This uses \immediate\write16 rather than \message to get newlines.
>-    \immediate\write16{}
>-    \immediate\write16{WARNING: for users of Unix TeX 3.0!}
>-    \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
>-    \immediate\write16{If you are running another version of TeX, relax.}
>-    \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
>-    \immediate\write16{  Then upgrade your TeX installation if you can.}
>-    \immediate\write16{  (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)}
>-    \immediate\write16{If you are stuck with version 3.0, run the}
>-    \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
>-    \immediate\write16{  to use a workaround.}
>-    \immediate\write16{}
>-    \global\warnedobstrue
>-    \fi
>-}
>-
>-% **In TeX 3.0, setting text in \nullfont hangs tex.  For a
>-% workaround (which requires the file ``dummy.tfm'' to be installed),
>-% uncomment the following line:
>-%%%%%\font\nullfont=dummy\let\obstexwarn=\relax
>-
>-% Ignore text, except that we keep track of conditional commands for
>-% purposes of nesting, up to an `@end #1' command.
>-%
>-\def\nestedignore#1{%
>-  \obstexwarn
>-  % We must actually expand the ignored text to look for the @end
>-  % command, so that nested ignore constructs work.  Thus, we put the
>-  % text into a \vbox and then do nothing with the result.  To minimize
>-  % the change of memory overflow, we follow the approach outlined on
>-  % page 401 of the TeXbook: make the current font be a dummy font.
>-  %
>-  \setbox0 = \vbox\bgroup
>-    % Don't complain about control sequences we have declared \outer.
>-    \ignoresections
>-    %
>-    % Define `@end #1' to end the box, which will in turn undefine the
>-    % @end command again.
>-    \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
>-    %
>-    % We are going to be parsing Texinfo commands.  Most cause no
>-    % trouble when they are used incorrectly, but some commands do
>-    % complicated argument parsing or otherwise get confused, so we
>-    % undefine them.
>-    %
>-    % We can't do anything about stray @-signs, unfortunately;
>-    % they'll produce `undefined control sequence' errors.
>-    \ignoremorecommands
>-    %
>-    % Set the current font to be \nullfont, a TeX primitive, and define
>-    % all the font commands to also use \nullfont.  We don't use
>-    % dummy.tfm, as suggested in the TeXbook, because not all sites
>-    % might have that installed.  Therefore, math mode will still
>-    % produce output, but that should be an extremely small amount of
>-    % stuff compared to the main input.
>-    %
>-    \nullfont
>-    \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont
>-    \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont
>-    \let\tensf=\nullfont
>-    % Similarly for index fonts.
>-    \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont
>-    \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont
>-    \let\smallsf=\nullfont
>-    % Similarly for smallexample fonts.
>-    \let\smallerrm=\nullfont \let\smallerit=\nullfont \let\smallersl=\nullfont
>-    \let\smallerbf=\nullfont \let\smallertt=\nullfont \let\smallersc=\nullfont
>-    \let\smallersf=\nullfont
>-    %
>-    % Don't complain when characters are missing from the fonts.
>-    \tracinglostchars = 0
>-    %
>-    % Don't bother to do space factor calculations.
>-    \frenchspacing
>-    %
>-    % Don't report underfull hboxes.
>-    \hbadness = 10000
>-    %
>-    % Do minimal line-breaking.
>-    \pretolerance = 10000
>-    %
>-    % Do not execute instructions in @tex
>-    \def\tex{\doignore{tex}}%
>-    % Do not execute macro definitions.
>-    % `c' is a comment character, so the word `macro' will get cut off.
>-    \def\macro{\doignore{ma}}%
>+  \gdef\dodoignore#1{%
>+    % #1 contains the command name as a string, e.g., `ifinfo'.
>+    %
>+    % Define a command to find the next `@end #1'.
>+    \long\def\doignoretext##1^^M@end #1{%
>+      \doignoretextyyy##1^^M@#1\_STOP_}%
>+    %
>+    % And this command to find another #1 command, at the beginning of a
>+    % line.  (Otherwise, we would consider a line `@c @ifset', for
>+    % example, to count as an @ifset for nesting.)
>+    \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
>+    %
>+    % And now expand that command.
>+    \doignoretext ^^M%
>+  }%
>+}
>+
>+\def\doignoreyyy#1{%
>+  \def\temp{#1}%
>+  \ifx\temp\empty			% Nothing found.
>+    \let\next\doignoretextzzz
>+  \else					% Found a nested condition, ...
>+    \advance\doignorecount by 1
>+    \let\next\doignoretextyyy		% ..., look for another.
>+    % If we're here, #1 ends with ^^M\ifinfo (for example).
>+  \fi
>+  \next #1% the token \_STOP_ is present just after this macro.
>+}
>+
>+% We have to swallow the remaining "\_STOP_".
>+%
>+\def\doignoretextzzz#1{%
>+  \ifnum\doignorecount = 0	% We have just found the outermost @end.
>+    \let\next\enddoignore
>+  \else				% Still inside a nested condition.
>+    \advance\doignorecount by -1
>+    \let\next\doignoretext      % Look for the next @end.
>+  \fi
>+  \next
>+}
>+
>+% Finish off ignored text.
>+{ \obeylines%
>+  % Ignore anything after the last `@end #1'; this matters in verbatim
>+  % environments, where otherwise the newline after an ignored conditional
>+  % would result in a blank line in the output.
>+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
> }
> 
>+
> % @set VAR sets the variable VAR to an empty value.
> % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
> %
> % Since we want to separate VAR from REST-OF-LINE (which might be
> % empty), we can't just use \parsearg; we have to insert a space of our
> % own to delimit the rest of the line, and then take it out again if we
>-% didn't need it.  Make sure the catcode of space is correct to avoid
>-% losing inside @example, for instance.
>+% didn't need it.
>+% We rely on the fact that \parsearg sets \catcode`\ =10.
> %
>-\def\set{\begingroup\catcode` =10
>-  \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
>-  \parsearg\setxxx}
>-\def\setxxx#1{\setyyy#1 \endsetyyy}
>+\parseargdef\set{\setyyy#1 \endsetyyy}
> \def\setyyy#1 #2\endsetyyy{%
>-  \def\temp{#2}%
>-  \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
>-  \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
>-  \fi
>-  \endgroup
>+  {%
>+    \makevalueexpandable
>+    \def\temp{#2}%
>+    \edef\next{\gdef\makecsname{SET#1}}%
>+    \ifx\temp\empty
>+      \next{}%
>+    \else
>+      \setzzz#2\endsetzzz
>+    \fi
>+  }%
> }
>-% Can't use \xdef to pre-expand #2 and save some time, since \temp or
>-% \next or other control sequences that we've defined might get us into
>-% an infinite loop. Consider `@set foo @cite{bar}'.
>-\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
>+% Remove the trailing space \setxxx inserted.
>+\def\setzzz#1 \endsetzzz{\next{#1}}
> 
> % @clear VAR clears (i.e., unsets) the variable VAR.
> %
>-\def\clear{\parsearg\clearxxx}
>-\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
>+\parseargdef\clear{%
>+  {%
>+    \makevalueexpandable
>+    \global\expandafter\let\csname SET#1\endcsname=\relax
>+  }%
>+}
> 
> % @value{foo} gets the text saved in variable foo.
>+\def\value{\begingroup\makevalueexpandable\valuexxx}
>+\def\valuexxx#1{\expandablevalue{#1}\endgroup}
> {
>-  \catcode`\_ = \active
>+  \catcode`\- = \active \catcode`\_ = \active
>   %
>-  % We might end up with active _ or - characters in the argument if
>-  % we're called from @code, as @code{@value{foo-bar_}}.  So \let any
>-  % such active characters to their normal equivalents.
>-  \gdef\value{\begingroup
>-    \catcode`\-=12 \catcode`\_=12
>-    \indexbreaks \let_\normalunderscore
>-    \valuexxx}
>+  \gdef\makevalueexpandable{%
>+    \let\value = \expandablevalue
>+    % We don't want these characters active, ...
>+    \catcode`\-=\other \catcode`\_=\other
>+    % ..., but we might end up with active ones in the argument if
>+    % we're called from @code, as @code{@value{foo-bar_}}, though.
>+    % So \let them to their normal equivalents.
>+    \let-\realdash \let_\normalunderscore
>+  }
> }
>-\def\valuexxx#1{\expandablevalue{#1}\endgroup}
> 
> % We have this subroutine so that we can handle at least some @value's
>-% properly in indexes (we \let\value to this in \indexdummies).  Ones
>-% whose names contain - or _ still won't work, but we can't do anything
>-% about that.  The command has to be fully expandable, since the result
>-% winds up in the index file.  This means that if the variable's value
>-% contains other Texinfo commands, it's almost certain it will fail
>-% (although perhaps we could fix that with sufficient work to do a
>-% one-level expansion on the result, instead of complete).
>+% properly in indexes (we call \makevalueexpandable in \indexdummies).
>+% The command has to be fully expandable (if the variable is set), since
>+% the result winds up in the index file.  This means that if the
>+% variable's value contains other Texinfo commands, it's almost certain
>+% it will fail (although perhaps we could fix that with sufficient work
>+% to do a one-level expansion on the result, instead of complete).
> %
> \def\expandablevalue#1{%
>   \expandafter\ifx\csname SET#1\endcsname\relax
>     {[No value for ``#1'']}%
>+    \message{Variable `#1', used in @value, is not set.}%
>   \else
>     \csname SET#1\endcsname
>   \fi
>@@ -2607,66 +3283,36 @@
> % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
> % with @set.
> %
>-\def\ifset{\parsearg\ifsetxxx}
>-\def\ifsetxxx #1{%
>-  \expandafter\ifx\csname SET#1\endcsname\relax
>-    \expandafter\ifsetfail
>-  \else
>-    \expandafter\ifsetsucceed
>-  \fi
>+% To get special treatment of `@end ifset,' call \makeond and the redefine.
>+%
>+\makecond{ifset}
>+\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
>+\def\doifset#1#2{%
>+  {%
>+    \makevalueexpandable
>+    \let\next=\empty
>+    \expandafter\ifx\csname SET#2\endcsname\relax
>+      #1% If not set, redefine \next.
>+    \fi
>+    \expandafter
>+  }\next
> }
>-\def\ifsetsucceed{\conditionalsucceed{ifset}}
>-\def\ifsetfail{\nestedignore{ifset}}
>-\defineunmatchedend{ifset}
>+\def\ifsetfail{\doignore{ifset}}
> 
> % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
> % defined with @set, or has been undefined with @clear.
> %
>-\def\ifclear{\parsearg\ifclearxxx}
>-\def\ifclearxxx #1{%
>-  \expandafter\ifx\csname SET#1\endcsname\relax
>-    \expandafter\ifclearsucceed
>-  \else
>-    \expandafter\ifclearfail
>-  \fi
>-}
>-\def\ifclearsucceed{\conditionalsucceed{ifclear}}
>-\def\ifclearfail{\nestedignore{ifclear}}
>-\defineunmatchedend{ifclear}
>-
>-% @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text
>-% following, through the first @end iftex (etc.).  Make `@end iftex'
>-% (etc.) valid only after an @iftex.
>-%
>-\def\iftex{\conditionalsucceed{iftex}}
>-\def\ifnothtml{\conditionalsucceed{ifnothtml}}
>-\def\ifnotinfo{\conditionalsucceed{ifnotinfo}}
>-\defineunmatchedend{iftex}
>-\defineunmatchedend{ifnothtml}
>-\defineunmatchedend{ifnotinfo}
>-
>-% We can't just want to start a group at @iftex (for example) and end it
>-% at @end iftex, since then @set commands inside the conditional have no
>-% effect (they'd get reverted at the end of the group).  So we must
>-% define \Eiftex to redefine itself to be its previous value.  (We can't
>-% just define it to fail again with an ``unmatched end'' error, since
>-% the @ifset might be nested.)
>-%
>-\def\conditionalsucceed#1{%
>-  \edef\temp{%
>-    % Remember the current value of \E#1.
>-    \let\nece{prevE#1} = \nece{E#1}%
>-    %
>-    % At the `@end #1', redefine \E#1 to be its previous value.
>-    \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}%
>-  }%
>-  \temp
>-}
>+% The `\else' inside the `\doifset' parameter is a trick to reuse the
>+% above code: if the variable is not set, do nothing, if it is set,
>+% then redefine \next to \ifclearfail.
>+%
>+\makecond{ifclear}
>+\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
>+\def\ifclearfail{\doignore{ifclear}}
> 
>-% We need to expand lots of \csname's, but we don't want to expand the
>-% control sequences after we've constructed them.
>-%
>-\def\nece#1{\expandafter\noexpand\csname#1\endcsname}
>+% @dircategory CATEGORY  -- specify a category of the dir file
>+% which this file should belong to.  Ignore this in TeX.
>+\let\dircategory=\comment
> 
> % @defininfoenclose.
> \let\definfoenclose=\comment
>@@ -2676,9 +3322,8 @@
> % Index generation facilities
> 
> % Define \newwrite to be identical to plain tex's \newwrite
>-% except not \outer, so it can be used within \newindex.
>-{\catcode`\@=11
>-\gdef\newwrite{\alloc@7\write\chardef\sixt@@n}}
>+% except not \outer, so it can be used within macros and \if's.
>+\edef\newwrite{\makecsname{ptexnewwrite}}
> 
> % \newindex {foo} defines an index named foo.
> % It automatically defines \fooindex such that
>@@ -2717,10 +3362,10 @@
> 
> % @synindex foo bar    makes index foo feed into index bar.
> % Do this instead of @defindex foo if you don't want it as a separate index.
>-% 
>+%
> % @syncodeindex foo bar   similar, but put all entries made for index foo
> % inside @code.
>-% 
>+%
> \def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
> \def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
> 
>@@ -2759,284 +3404,422 @@
> \def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
> \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
> 
>-% Take care of texinfo commands likely to appear in an index entry.
>-% (Must be a way to avoid doing expansion at all, and thus not have to
>-% laboriously list every single command here.)
>-% 
>+% Take care of Texinfo commands that can appear in an index entry.
>+% Since there are some commands we want to expand, and others we don't,
>+% we have to laboriously prevent expansion for those that we don't.
>+%
> \def\indexdummies{%
>-\def\ { }%
>-\def\@{@}% change to @@ when we switch to @ as escape char in aux files.
>-% Need these in case \tex is in effect and \{ is a \delimiter again.
>-% But can't use \lbracecmd and \rbracecmd because texindex assumes
>-% braces and backslashes are used only as delimiters.  
>-\let\{ = \mylbrace
>-\let\} = \myrbrace
>-\def\_{{\realbackslash _}}%
>-\normalturnoffactive
>-%
>-% Take care of the plain tex accent commands.
>-\def\,##1{\realbackslash ,{##1}}%
>-\def\"{\realbackslash "}%
>-\def\`{\realbackslash `}%
>-\def\'{\realbackslash '}%
>-\def\^{\realbackslash ^}%
>-\def\~{\realbackslash ~}%
>-\def\={\realbackslash =}%
>-\def\b{\realbackslash b}%
>-\def\c{\realbackslash c}%
>-\def\d{\realbackslash d}%
>-\def\u{\realbackslash u}%
>-\def\v{\realbackslash v}%
>-\def\H{\realbackslash H}%
>-\def\dotless##1{\realbackslash dotless {##1}}%
>-% Take care of the plain tex special European modified letters.
>-\def\AA{\realbackslash AA}%
>-\def\AE{\realbackslash AE}%
>-\def\L{\realbackslash L}%
>-\def\OE{\realbackslash OE}%
>-\def\O{\realbackslash O}%
>-\def\aa{\realbackslash aa}%
>-\def\ae{\realbackslash ae}%
>-\def\l{\realbackslash l}%
>-\def\oe{\realbackslash oe}%
>-\def\o{\realbackslash o}%
>-\def\ss{\realbackslash ss}%
>-%
>-% Although these internals commands shouldn't show up, sometimes they do.
>-\def\bf{\realbackslash bf }%
>-\def\gtr{\realbackslash gtr}%
>-\def\hat{\realbackslash hat}%
>-\def\less{\realbackslash less}%
>-%\def\rm{\realbackslash rm }%
>-\def\sf{\realbackslash sf}%
>-\def\sl{\realbackslash sl }%
>-\def\tclose##1{\realbackslash tclose {##1}}%
>-\def\tt{\realbackslash tt}%
>-%
>-\def\b##1{\realbackslash b {##1}}%
>-\def\i##1{\realbackslash i {##1}}%
>-\def\sc##1{\realbackslash sc {##1}}%
>-\def\t##1{\realbackslash t {##1}}%
>-\def\r##1{\realbackslash r {##1}}%
>-%
>-\def\TeX{\realbackslash TeX}%
>-\def\acronym##1{\realbackslash acronym {##1}}%
>-\def\cite##1{\realbackslash cite {##1}}%
>-\def\code##1{\realbackslash code {##1}}%
>-\def\command##1{\realbackslash command {##1}}%
>-\def\dfn##1{\realbackslash dfn {##1}}%
>-\def\dots{\realbackslash dots }%
>-\def\emph##1{\realbackslash emph {##1}}%
>-\def\env##1{\realbackslash env {##1}}%
>-\def\file##1{\realbackslash file {##1}}%
>-\def\kbd##1{\realbackslash kbd {##1}}%
>-\def\key##1{\realbackslash key {##1}}%
>-\def\math##1{\realbackslash math {##1}}%
>-\def\option##1{\realbackslash option {##1}}%
>-\def\samp##1{\realbackslash samp {##1}}%
>-\def\strong##1{\realbackslash strong {##1}}%
>-\def\uref##1{\realbackslash uref {##1}}%
>-\def\url##1{\realbackslash url {##1}}%
>-\def\var##1{\realbackslash var {##1}}%
>-\def\w{\realbackslash w }%
>-%
>-% These math commands don't seem likely to be used in index entries.
>-\def\copyright{\realbackslash copyright}%
>-\def\equiv{\realbackslash equiv}%
>-\def\error{\realbackslash error}%
>-\def\expansion{\realbackslash expansion}%
>-\def\point{\realbackslash point}%
>-\def\print{\realbackslash print}%
>-\def\result{\realbackslash result}%
>-%
>-% Handle some cases of @value -- where the variable name does not
>-% contain - or _, and the value does not contain any
>-% (non-fully-expandable) commands.
>-\let\value = \expandablevalue
>-%
>-\unsepspaces
>-% Turn off macro expansion
>-\turnoffmacros
>-}
>-
>-% If an index command is used in an @example environment, any spaces
>-% therein should become regular spaces in the raw index file, not the
>-% expansion of \tie (\\leavevmode \penalty \@M \ ).
>-{\obeyspaces
>- \gdef\unsepspaces{\obeyspaces\let =\space}}
>-
>-% \indexnofonts no-ops all font-change commands.
>-% This is used when outputting the strings to sort the index by.
>-\def\indexdummyfont#1{#1}
>-\def\indexdummytex{TeX}
>-\def\indexdummydots{...}
>-
>+  \escapechar = `\\     % use backslash in output files.
>+  \def\@{@}% change to @@ when we switch to @ as escape char in index files.
>+  \def\ {\realbackslash\space }%
>+  %
>+  % Need these in case \tex is in effect and \{ is a \delimiter again.
>+  % But can't use \lbracecmd and \rbracecmd because texindex assumes
>+  % braces and backslashes are used only as delimiters.
>+  \let\{ = \mylbrace
>+  \let\} = \myrbrace
>+  %
>+  % I don't entirely understand this, but when an index entry is
>+  % generated from a macro call, the \endinput which \scanmacro inserts
>+  % causes processing to be prematurely terminated.  This is,
>+  % apparently, because \indexsorttmp is fully expanded, and \endinput
>+  % is an expandable command.  The redefinition below makes \endinput
>+  % disappear altogether for that purpose -- although logging shows that
>+  % processing continues to some further point.  On the other hand, it
>+  % seems \endinput does not hurt in the printed index arg, since that
>+  % is still getting written without apparent harm.
>+  % 
>+  % Sample source (mac-idx3.tex, reported by Graham Percival to
>+  % help-texinfo, 22may06):
>+  % @macro funindex {WORD}
>+  % @findex xyz
>+  % @end macro
>+  % ...
>+  % @funindex commtest
>+  % 
>+  % The above is not enough to reproduce the bug, but it gives the flavor.
>+  % 
>+  % Sample whatsit resulting:
>+  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
>+  % 
>+  % So:
>+  \let\endinput = \empty
>+  %
>+  % Do the redefinitions.
>+  \commondummies
>+}
>+
>+% For the aux and toc files, @ is the escape character.  So we want to
>+% redefine everything using @ as the escape character (instead of
>+% \realbackslash, still used for index files).  When everything uses @,
>+% this will be simpler.
>+%
>+\def\atdummies{%
>+  \def\@{@@}%
>+  \def\ {@ }%
>+  \let\{ = \lbraceatcmd
>+  \let\} = \rbraceatcmd
>+  %
>+  % Do the redefinitions.
>+  \commondummies
>+  \otherbackslash
>+}
>+
>+% Called from \indexdummies and \atdummies.
>+%
>+\def\commondummies{%
>+  %
>+  % \definedummyword defines \#1 as \string\#1\space, thus effectively
>+  % preventing its expansion.  This is used only for control% words,
>+  % not control letters, because the \space would be incorrect for
>+  % control characters, but is needed to separate the control word
>+  % from whatever follows.
>+  %
>+  % For control letters, we have \definedummyletter, which omits the
>+  % space.
>+  %
>+  % These can be used both for control words that take an argument and
>+  % those that do not.  If it is followed by {arg} in the input, then
>+  % that will dutifully get written to the index (or wherever).
>+  %
>+  \def\definedummyword  ##1{\def##1{\string##1\space}}%
>+  \def\definedummyletter##1{\def##1{\string##1}}%
>+  \let\definedummyaccent\definedummyletter
>+  %
>+  \commondummiesnofonts
>+  %
>+  \definedummyletter\_%
>+  %
>+  % Non-English letters.
>+  \definedummyword\AA
>+  \definedummyword\AE
>+  \definedummyword\L
>+  \definedummyword\OE
>+  \definedummyword\O
>+  \definedummyword\aa
>+  \definedummyword\ae
>+  \definedummyword\l
>+  \definedummyword\oe
>+  \definedummyword\o
>+  \definedummyword\ss
>+  \definedummyword\exclamdown
>+  \definedummyword\questiondown
>+  \definedummyword\ordf
>+  \definedummyword\ordm
>+  %
>+  % Although these internal commands shouldn't show up, sometimes they do.
>+  \definedummyword\bf
>+  \definedummyword\gtr
>+  \definedummyword\hat
>+  \definedummyword\less
>+  \definedummyword\sf
>+  \definedummyword\sl
>+  \definedummyword\tclose
>+  \definedummyword\tt
>+  %
>+  \definedummyword\LaTeX
>+  \definedummyword\TeX
>+  %
>+  % Assorted special characters.
>+  \definedummyword\bullet
>+  \definedummyword\comma
>+  \definedummyword\copyright
>+  \definedummyword\registeredsymbol
>+  \definedummyword\dots
>+  \definedummyword\enddots
>+  \definedummyword\equiv
>+  \definedummyword\error
>+  \definedummyword\euro
>+  \definedummyword\expansion
>+  \definedummyword\minus
>+  \definedummyword\pounds
>+  \definedummyword\point
>+  \definedummyword\print
>+  \definedummyword\result
>+  \definedummyword\textdegree
>+  %
>+  % We want to disable all macros so that they are not expanded by \write.
>+  \macrolist
>+  %
>+  \normalturnoffactive
>+  %
>+  % Handle some cases of @value -- where it does not contain any
>+  % (non-fully-expandable) commands.
>+  \makevalueexpandable
>+}
>+
>+% \commondummiesnofonts: common to \commondummies and \indexnofonts.
>+%
>+\def\commondummiesnofonts{%
>+  % Control letters and accents.
>+  \definedummyletter\!%
>+  \definedummyaccent\"%
>+  \definedummyaccent\'%
>+  \definedummyletter\*%
>+  \definedummyaccent\,%
>+  \definedummyletter\.%
>+  \definedummyletter\/%
>+  \definedummyletter\:%
>+  \definedummyaccent\=%
>+  \definedummyletter\?%
>+  \definedummyaccent\^%
>+  \definedummyaccent\`%
>+  \definedummyaccent\~%
>+  \definedummyword\u
>+  \definedummyword\v
>+  \definedummyword\H
>+  \definedummyword\dotaccent
>+  \definedummyword\ringaccent
>+  \definedummyword\tieaccent
>+  \definedummyword\ubaraccent
>+  \definedummyword\udotaccent
>+  \definedummyword\dotless
>+  %
>+  % Texinfo font commands.
>+  \definedummyword\b
>+  \definedummyword\i
>+  \definedummyword\r
>+  \definedummyword\sc
>+  \definedummyword\t
>+  %
>+  % Commands that take arguments.
>+  \definedummyword\acronym
>+  \definedummyword\cite
>+  \definedummyword\code
>+  \definedummyword\command
>+  \definedummyword\dfn
>+  \definedummyword\emph
>+  \definedummyword\env
>+  \definedummyword\file
>+  \definedummyword\kbd
>+  \definedummyword\key
>+  \definedummyword\math
>+  \definedummyword\option
>+  \definedummyword\pxref
>+  \definedummyword\ref
>+  \definedummyword\samp
>+  \definedummyword\strong
>+  \definedummyword\tie
>+  \definedummyword\uref
>+  \definedummyword\url
>+  \definedummyword\var
>+  \definedummyword\verb
>+  \definedummyword\w
>+  \definedummyword\xref
>+}
>+
>+% \indexnofonts is used when outputting the strings to sort the index
>+% by, and when constructing control sequence names.  It eliminates all
>+% control sequences and just writes whatever the best ASCII sort string
>+% would be for a given command (usually its argument).
>+%
> \def\indexnofonts{%
>-\def\@{@}%
>-% how to handle braces?
>-\def\_{\normalunderscore}%
>-%
>-\let\,=\indexdummyfont
>-\let\"=\indexdummyfont
>-\let\`=\indexdummyfont
>-\let\'=\indexdummyfont
>-\let\^=\indexdummyfont
>-\let\~=\indexdummyfont
>-\let\==\indexdummyfont
>-\let\b=\indexdummyfont
>-\let\c=\indexdummyfont
>-\let\d=\indexdummyfont
>-\let\u=\indexdummyfont
>-\let\v=\indexdummyfont
>-\let\H=\indexdummyfont
>-\let\dotless=\indexdummyfont
>-% Take care of the plain tex special European modified letters.
>-\def\AA{AA}%
>-\def\AE{AE}%
>-\def\L{L}%
>-\def\OE{OE}%
>-\def\O{O}%
>-\def\aa{aa}%
>-\def\ae{ae}%
>-\def\l{l}%
>-\def\oe{oe}%
>-\def\o{o}%
>-\def\ss{ss}%
>-%
>-% Don't no-op \tt, since it isn't a user-level command
>-% and is used in the definitions of the active chars like <, >, |, etc.
>-% Likewise with the other plain tex font commands.
>-%\let\tt=\indexdummyfont
>-%
>-\let\b=\indexdummyfont
>-\let\i=\indexdummyfont
>-\let\r=\indexdummyfont
>-\let\sc=\indexdummyfont
>-\let\t=\indexdummyfont
>-%
>-\let\TeX=\indexdummytex
>-\let\acronym=\indexdummyfont
>-\let\cite=\indexdummyfont
>-\let\code=\indexdummyfont
>-\let\command=\indexdummyfont
>-\let\dfn=\indexdummyfont
>-\let\dots=\indexdummydots
>-\let\emph=\indexdummyfont
>-\let\env=\indexdummyfont
>-\let\file=\indexdummyfont
>-\let\kbd=\indexdummyfont
>-\let\key=\indexdummyfont
>-\let\math=\indexdummyfont
>-\let\option=\indexdummyfont
>-\let\samp=\indexdummyfont
>-\let\strong=\indexdummyfont
>-\let\uref=\indexdummyfont
>-\let\url=\indexdummyfont
>-\let\var=\indexdummyfont
>-\let\w=\indexdummyfont
>-}
>-
>-% To define \realbackslash, we must make \ not be an escape.
>-% We must first make another character (@) an escape
>-% so we do not become unable to do a definition.
>-
>-{\catcode`\@=0 \catcode`\\=\other
>- @gdef@realbackslash{\}}
>+  % Accent commands should become @asis.
>+  \def\definedummyaccent##1{\let##1\asis}%
>+  % We can just ignore other control letters.
>+  \def\definedummyletter##1{\let##1\empty}%
>+  % Hopefully, all control words can become @asis.
>+  \let\definedummyword\definedummyaccent
>+  %
>+  \commondummiesnofonts
>+  %
>+  % Don't no-op \tt, since it isn't a user-level command
>+  % and is used in the definitions of the active chars like <, >, |, etc.
>+  % Likewise with the other plain tex font commands.
>+  %\let\tt=\asis
>+  %
>+  \def\ { }%
>+  \def\@{@}%
>+  % how to handle braces?
>+  \def\_{\normalunderscore}%
>+  %
>+  % Non-English letters.
>+  \def\AA{AA}%
>+  \def\AE{AE}%
>+  \def\L{L}%
>+  \def\OE{OE}%
>+  \def\O{O}%
>+  \def\aa{aa}%
>+  \def\ae{ae}%
>+  \def\l{l}%
>+  \def\oe{oe}%
>+  \def\o{o}%
>+  \def\ss{ss}%
>+  \def\exclamdown{!}%
>+  \def\questiondown{?}%
>+  \def\ordf{a}%
>+  \def\ordm{o}%
>+  %
>+  \def\LaTeX{LaTeX}%
>+  \def\TeX{TeX}%
>+  %
>+  % Assorted special characters.
>+  % (The following {} will end up in the sort string, but that's ok.)
>+  \def\bullet{bullet}%
>+  \def\comma{,}%
>+  \def\copyright{copyright}%
>+  \def\registeredsymbol{R}%
>+  \def\dots{...}%
>+  \def\enddots{...}%
>+  \def\equiv{==}%
>+  \def\error{error}%
>+  \def\euro{euro}%
>+  \def\expansion{==>}%
>+  \def\minus{-}%
>+  \def\pounds{pounds}%
>+  \def\point{.}%
>+  \def\print{-|}%
>+  \def\result{=>}%
>+  \def\textdegree{degrees}%
>+  %
>+  % We need to get rid of all macros, leaving only the arguments (if present).
>+  % Of course this is not nearly correct, but it is the best we can do for now.
>+  % makeinfo does not expand macros in the argument to @deffn, which ends up
>+  % writing an index entry, and texindex isn't prepared for an index sort entry
>+  % that starts with \.
>+  % 
>+  % Since macro invocations are followed by braces, we can just redefine them
>+  % to take a single TeX argument.  The case of a macro invocation that
>+  % goes to end-of-line is not handled.
>+  % 
>+  \macrolist
>+}
> 
> \let\indexbackslash=0  %overridden during \printindex.
> \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
> 
>-% For \ifx comparisons.
>-\def\emptymacro{\empty}
>-
> % Most index entries go through here, but \dosubind is the general case.
>-%
>-\def\doind#1#2{\dosubind{#1}{#2}\empty}
>+% #1 is the index name, #2 is the entry text.
>+\def\doind#1#2{\dosubind{#1}{#2}{}}
> 
> % Workhorse for all \fooindexes.
> % #1 is name of index, #2 is stuff to put there, #3 is subentry --
>-% \empty if called from \doind, as we usually are.  The main exception
>-% is with defuns, which call us directly.
>+% empty if called from \doind, as we usually are (the main exception
>+% is with most defuns, which call us directly).
> %
> \def\dosubind#1#2#3{%
>+  \iflinks
>+  {%
>+    % Store the main index entry text (including the third arg).
>+    \toks0 = {#2}%
>+    % If third arg is present, precede it with a space.
>+    \def\thirdarg{#3}%
>+    \ifx\thirdarg\empty \else
>+      \toks0 = \expandafter{\the\toks0 \space #3}%
>+    \fi
>+    %
>+    \edef\writeto{\csname#1indfile\endcsname}%
>+    %
>+    \ifvmode
>+      \dosubindsanitize
>+    \else
>+      \dosubindwrite
>+    \fi
>+  }%
>+  \fi
>+}
>+
>+% Write the entry in \toks0 to the index file:
>+%
>+\def\dosubindwrite{%
>   % Put the index entry in the margin if desired.
>   \ifx\SETmarginindex\relax\else
>-    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}%
>+    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
>   \fi
>-  {%
>-    \count255=\lastpenalty
>-    {%
>-      \indexdummies % Must do this here, since \bf, etc expand at this stage
>-      \escapechar=`\\
>-      {%
>-        \let\folio = 0% We will expand all macros now EXCEPT \folio.
>-        \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
>-        % so it will be output as is; and it will print as backslash.
>-        %
>-        \def\thirdarg{#3}%
>-        %
>-        % If third arg is present, precede it with space in sort key.
>-        \ifx\thirdarg\emptymacro
>-          \let\subentry = \empty
>-        \else
>-          \def\subentry{ #3}%
>-        \fi
>-        %
>-        % First process the index entry with all font commands turned
>-        % off to get the string to sort by.
>-        {\indexnofonts \xdef\indexsorttmp{#2\subentry}}%
>-        %
>-        % Now the real index entry with the fonts.
>-        \toks0 = {#2}%
>-        %
>-        % If the third (subentry) arg is present, add it to the index
>-        % line to write.
>-        \ifx\thirdarg\emptymacro \else
>-          \toks0 = \expandafter{\the\toks0{#3}}%
>-        \fi
>-        %
>-        % Set up the complete index entry, with both the sort key and
>-        % the original text, including any font commands.  We write
>-        % three arguments to \entry to the .?? file (four in the
>-        % subentry case), texindex reduces to two when writing the .??s
>-        % sorted result.
>-        \edef\temp{%
>-          \write\csname#1indfile\endcsname{%
>-            \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
>-        }%
>-        %
>-        % If a skip is the last thing on the list now, preserve it
>-        % by backing up by \lastskip, doing the \write, then inserting
>-        % the skip again.  Otherwise, the whatsit generated by the
>-        % \write will make \lastskip zero.  The result is that sequences
>-        % like this:
>-        % @end defun
>-        % @tindex whatever
>-        % @defun ...
>-        % will have extra space inserted, because the \medbreak in the
>-        % start of the @defun won't see the skip inserted by the @end of
>-        % the previous defun.
>-        %
>-        % But don't do any of this if we're not in vertical mode.  We
>-        % don't want to do a \vskip and prematurely end a paragraph.
>-        %
>-        % Avoid page breaks due to these extra skips, too.
>-        %
>-        \iflinks
>-          \ifvmode
>-            \skip0 = \lastskip
>-            \ifdim\lastskip = 0pt \else \nobreak\vskip-\lastskip \fi
>-          \fi
>-          %
>-          \temp % do the write
>-          %
>-          %
>-          \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
>-        \fi
>-      }%
>-    }%
>-    \penalty\count255
>+  %
>+  % Remember, we are within a group.
>+  \indexdummies % Must do this here, since \bf, etc expand at this stage
>+  \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
>+      % so it will be output as is; and it will print as backslash.
>+  %
>+  % Process the index entry with all font commands turned off, to
>+  % get the string to sort by.
>+  {\indexnofonts
>+   \edef\temp{\the\toks0}% need full expansion
>+   \xdef\indexsorttmp{\temp}%
>+  }%
>+  %
>+  % Set up the complete index entry, with both the sort key and
>+  % the original text, including any font commands.  We write
>+  % three arguments to \entry to the .?? file (four in the
>+  % subentry case), texindex reduces to two when writing the .??s
>+  % sorted result.
>+  \edef\temp{%
>+    \write\writeto{%
>+      \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
>   }%
>+  \temp
>+}
>+
>+% Take care of unwanted page breaks:
>+%
>+% If a skip is the last thing on the list now, preserve it
>+% by backing up by \lastskip, doing the \write, then inserting
>+% the skip again.  Otherwise, the whatsit generated by the
>+% \write will make \lastskip zero.  The result is that sequences
>+% like this:
>+% @end defun
>+% @tindex whatever
>+% @defun ...
>+% will have extra space inserted, because the \medbreak in the
>+% start of the @defun won't see the skip inserted by the @end of
>+% the previous defun.
>+%
>+% But don't do any of this if we're not in vertical mode.  We
>+% don't want to do a \vskip and prematurely end a paragraph.
>+%
>+% Avoid page breaks due to these extra skips, too.
>+%
>+% But wait, there is a catch there:
>+% We'll have to check whether \lastskip is zero skip.  \ifdim is not
>+% sufficient for this purpose, as it ignores stretch and shrink parts
>+% of the skip.  The only way seems to be to check the textual
>+% representation of the skip.
>+%
>+% The following is almost like \def\zeroskipmacro{0.0pt} except that
>+% the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
>+%
>+\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
>+%
>+% ..., ready, GO:
>+%
>+\def\dosubindsanitize{%
>+  % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
>+  \skip0 = \lastskip
>+  \edef\lastskipmacro{\the\lastskip}%
>+  \count255 = \lastpenalty
>+  %
>+  % If \lastskip is nonzero, that means the last item was a
>+  % skip.  And since a skip is discardable, that means this
>+  % -\skip0 glue we're inserting is preceded by a
>+  % non-discardable item, therefore it is not a potential
>+  % breakpoint, therefore no \nobreak needed.
>+  \ifx\lastskipmacro\zeroskipmacro
>+  \else
>+    \vskip-\skip0
>+  \fi
>+  %
>+  \dosubindwrite
>+  %
>+  \ifx\lastskipmacro\zeroskipmacro
>+    % If \lastskip was zero, perhaps the last item was a penalty, and
>+    % perhaps it was >=10000, e.g., a \nobreak.  In that case, we want
>+    % to re-insert the same penalty (values >10000 are used for various
>+    % signals); since we just inserted a non-discardable item, any
>+    % following glue (such as a \parskip) would be a breakpoint.  For example:
>+    % 
>+    %   @deffn deffn-whatever
>+    %   @vindex index-whatever
>+    %   Description.
>+    % would allow a break between the index-whatever whatsit
>+    % and the "Description." paragraph.
>+    \ifnum\count255>9999 \penalty\count255 \fi
>+  \else
>+    % On the other hand, if we had a nonzero \lastskip,
>+    % this make-up glue would be preceded by a non-discardable item
>+    % (the whatsit from the \write), so we must insert a \nobreak.
>+    \nobreak\vskip\skip0
>+  \fi
> }
> 
> % The index entry written in the file actually looks like
>@@ -3074,13 +3857,12 @@
> % @printindex causes a particular index (the ??s file) to get printed.
> % It does not print any chapter heading (usually an @unnumbered).
> %
>-\def\printindex{\parsearg\doprintindex}
>-\def\doprintindex#1{\begingroup
>+\parseargdef\printindex{\begingroup
>   \dobreak \chapheadingskip{10000}%
>   %
>   \smallfonts \rm
>   \tolerance = 9500
>-  \indexbreaks
>+  \everypar = {}% don't want the \kern\-parindent from indentation suppression.
>   %
>   % See if the index file exists and is nonempty.
>   % Change catcode of @ here so that if the index file contains
>@@ -3107,7 +3889,7 @@
>       % Index files are almost Texinfo source, but we use \ as the escape
>       % character.  It would be better to use @, but that's too big a change
>       % to make right now.
>-      \def\indexbackslash{\rawbackslashxx}%
>+      \def\indexbackslash{\backslashcurfont}%
>       \catcode`\\ = 0
>       \escapechar = `\\
>       \begindoublecolumns
>@@ -3129,7 +3911,10 @@
>   \removelastskip
>   %
>   % We like breaks before the index initials, so insert a bonus.
>-  \penalty -300
>+  \nobreak
>+  \vskip 0pt plus 3\baselineskip
>+  \penalty 0
>+  \vskip 0pt plus -3\baselineskip
>   %
>   % Typeset the initial.  Making this add up to a whole number of
>   % baselineskips increases the chance of the dots lining up from column
>@@ -3139,84 +3924,104 @@
>   % No shrink because it confuses \balancecolumns.
>   \vskip 1.67\baselineskip plus .5\baselineskip
>   \leftline{\secbf #1}%
>-  \vskip .33\baselineskip plus .1\baselineskip
>-  %
>   % Do our best not to break after the initial.
>   \nobreak
>+  \vskip .33\baselineskip plus .1\baselineskip
> }}
> 
>-% This typesets a paragraph consisting of #1, dot leaders, and then #2
>-% flush to the right margin.  It is used for index and table of contents
>-% entries.  The paragraph is indented by \leftskip.
>-%
>-\def\entry#1#2{\begingroup
>-  %
>-  % Start a new paragraph if necessary, so our assignments below can't
>-  % affect previous text.
>-  \par
>-  %
>-  % Do not fill out the last line with white space.
>-  \parfillskip = 0in
>-  %
>-  % No extra space above this paragraph.
>-  \parskip = 0in
>-  %
>-  % Do not prefer a separate line ending with a hyphen to fewer lines.
>-  \finalhyphendemerits = 0
>-  %
>-  % \hangindent is only relevant when the entry text and page number
>-  % don't both fit on one line.  In that case, bob suggests starting the
>-  % dots pretty far over on the line.  Unfortunately, a large
>-  % indentation looks wrong when the entry text itself is broken across
>-  % lines.  So we use a small indentation and put up with long leaders.
>-  %
>-  % \hangafter is reset to 1 (which is the value we want) at the start
>-  % of each paragraph, so we need not do anything with that.
>-  \hangindent = 2em
>-  %
>-  % When the entry text needs to be broken, just fill out the first line
>-  % with blank space.
>-  \rightskip = 0pt plus1fil
>-  %
>-  % A bit of stretch before each entry for the benefit of balancing columns.
>-  \vskip 0pt plus1pt
>-  %
>-  % Start a ``paragraph'' for the index entry so the line breaking
>-  % parameters we've set above will have an effect.
>-  \noindent
>-  %
>-  % Insert the text of the index entry.  TeX will do line-breaking on it.
>-  #1%
>-  % The following is kludged to not output a line of dots in the index if
>-  % there are no page numbers.  The next person who breaks this will be
>-  % cursed by a Unix daemon.
>-  \def\tempa{{\rm }}%
>-  \def\tempb{#2}%
>-  \edef\tempc{\tempa}%
>-  \edef\tempd{\tempb}%
>-  \ifx\tempc\tempd\ \else%
>-    %
>-    % If we must, put the page number on a line of its own, and fill out
>-    % this line with blank space.  (The \hfil is overwhelmed with the
>-    % fill leaders glue in \indexdotfill if the page number does fit.)
>-    \hfil\penalty50
>-    \null\nobreak\indexdotfill % Have leaders before the page number.
>-    %
>-    % The `\ ' here is removed by the implicit \unskip that TeX does as
>-    % part of (the primitive) \par.  Without it, a spurious underfull
>-    % \hbox ensues.
>-    \ifpdf
>-      \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
>+% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
>+% then page number (#2) flushed to the right margin.  It is used for index
>+% and table of contents entries.  The paragraph is indented by \leftskip.
>+%
>+% A straightforward implementation would start like this:
>+%	\def\entry#1#2{...
>+% But this frozes the catcodes in the argument, and can cause problems to
>+% @code, which sets - active.  This problem was fixed by a kludge---
>+% ``-'' was active throughout whole index, but this isn't really right.
>+%
>+% The right solution is to prevent \entry from swallowing the whole text.
>+%                                 --kasal, 21nov03
>+\def\entry{%
>+  \begingroup
>+    %
>+    % Start a new paragraph if necessary, so our assignments below can't
>+    % affect previous text.
>+    \par
>+    %
>+    % Do not fill out the last line with white space.
>+    \parfillskip = 0in
>+    %
>+    % No extra space above this paragraph.
>+    \parskip = 0in
>+    %
>+    % Do not prefer a separate line ending with a hyphen to fewer lines.
>+    \finalhyphendemerits = 0
>+    %
>+    % \hangindent is only relevant when the entry text and page number
>+    % don't both fit on one line.  In that case, bob suggests starting the
>+    % dots pretty far over on the line.  Unfortunately, a large
>+    % indentation looks wrong when the entry text itself is broken across
>+    % lines.  So we use a small indentation and put up with long leaders.
>+    %
>+    % \hangafter is reset to 1 (which is the value we want) at the start
>+    % of each paragraph, so we need not do anything with that.
>+    \hangindent = 2em
>+    %
>+    % When the entry text needs to be broken, just fill out the first line
>+    % with blank space.
>+    \rightskip = 0pt plus1fil
>+    %
>+    % A bit of stretch before each entry for the benefit of balancing
>+    % columns.
>+    \vskip 0pt plus1pt
>+    %
>+    % Swallow the left brace of the text (first parameter):
>+    \afterassignment\doentry
>+    \let\temp =
>+}
>+\def\doentry{%
>+    \bgroup % Instead of the swallowed brace.
>+      \noindent
>+      \aftergroup\finishentry
>+      % And now comes the text of the entry.
>+}
>+\def\finishentry#1{%
>+    % #1 is the page number.
>+    %
>+    % The following is kludged to not output a line of dots in the index if
>+    % there are no page numbers.  The next person who breaks this will be
>+    % cursed by a Unix daemon.
>+    \def\tempa{{\rm }}%
>+    \def\tempb{#1}%
>+    \edef\tempc{\tempa}%
>+    \edef\tempd{\tempb}%
>+    \ifx\tempc\tempd
>+      \ %
>     \else
>-      \ #2% The page number ends the paragraph.
>+      %
>+      % If we must, put the page number on a line of its own, and fill out
>+      % this line with blank space.  (The \hfil is overwhelmed with the
>+      % fill leaders glue in \indexdotfill if the page number does fit.)
>+      \hfil\penalty50
>+      \null\nobreak\indexdotfill % Have leaders before the page number.
>+      %
>+      % The `\ ' here is removed by the implicit \unskip that TeX does as
>+      % part of (the primitive) \par.  Without it, a spurious underfull
>+      % \hbox ensues.
>+      \ifpdf
>+	\pdfgettoks#1.%
>+	\ \the\toksA
>+      \else
>+	\ #1%
>+      \fi
>     \fi
>-  \fi%
>-  \par
>-\endgroup}
>+    \par
>+  \endgroup
>+}
> 
>-% Like \dotfill except takes at least 1 em.
>+% Like plain.tex's \dotfill, except uses up at least 1 em.
> \def\indexdotfill{\cleaders
>-  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
>+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
> 
> \def\primary #1{\line{#1\hfil}}
> 
>@@ -3323,7 +4128,7 @@
>   \wd0=\hsize \wd2=\hsize
>   \hbox to\pagewidth{\box0\hfil\box2}%
> }
>-% 
>+%
> % All done with double columns.
> \def\enddoublecolumns{%
>   \output = {%
>@@ -3381,6 +4186,12 @@
> \message{sectioning,}
> % Chapters, sections, etc.
> 
>+% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
>+% sections so that we can refer to them unambiguously in the pdf
>+% outlines by their "section number".  We avoid collisions with chapter
>+% numbers by starting them at 10000.  (If a document ever has 10000
>+% chapters, we're in trouble anyway, I'm sure.)
>+\newcount\unnumberedno \unnumberedno = 10000
> \newcount\chapno
> \newcount\secno        \secno=0
> \newcount\subsecno     \subsecno=0
>@@ -3388,9 +4199,12 @@
> 
> % This counter is funny since it counts through charcodes of letters A, B, ...
> \newcount\appendixno  \appendixno = `\@
>+%
> % \def\appendixletter{\char\the\appendixno}
>-% We do the following for the sake of pdftex, which needs the actual
>+% We do the following ugly conditional instead of the above simple
>+% construct for the sake of pdftex, which needs the actual
> % letter in the expansion, not just typeset.
>+%
> \def\appendixletter{%
>   \ifnum\appendixno=`A A%
>   \else\ifnum\appendixno=`B B%
>@@ -3428,11 +4242,12 @@
> 
> % Each @chapter defines this as the name of the chapter.
> % page headings and footings can use it.  @section does likewise.
>+% However, they are not reliable, because we don't use marks.
> \def\thischapter{}
> \def\thissection{}
> 
> \newcount\absseclevel % used to calculate proper heading level
>-\newcount\secbase\secbase=0 % @raise/lowersections modify this count
>+\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
> 
> % @raisesections: treat @section as chapter, @subsection as section, etc.
> \def\raisesections{\global\advance\secbase by -1}
>@@ -3442,287 +4257,246 @@
> \def\lowersections{\global\advance\secbase by 1}
> \let\down=\lowersections % original BFox name
> 
>-% Choose a numbered-heading macro
>-% #1 is heading level if unmodified by @raisesections or @lowersections
>-% #2 is text for heading
>-\def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
>-\ifcase\absseclevel
>-  \chapterzzz{#2}
>-\or
>-  \seczzz{#2}
>-\or
>-  \numberedsubseczzz{#2}
>-\or
>-  \numberedsubsubseczzz{#2}
>-\else
>-  \ifnum \absseclevel<0
>-    \chapterzzz{#2}
>+% we only have subsub.
>+\chardef\maxseclevel = 3
>+%
>+% A numbered section within an unnumbered changes to unnumbered too.
>+% To achive this, remember the "biggest" unnum. sec. we are currently in:
>+\chardef\unmlevel = \maxseclevel
>+%
>+% Trace whether the current chapter is an appendix or not:
>+% \chapheadtype is "N" or "A", unnumbered chapters are ignored.
>+\def\chapheadtype{N}
>+
>+% Choose a heading macro
>+% #1 is heading type
>+% #2 is heading level
>+% #3 is text for heading
>+\def\genhead#1#2#3{%
>+  % Compute the abs. sec. level:
>+  \absseclevel=#2
>+  \advance\absseclevel by \secbase
>+  % Make sure \absseclevel doesn't fall outside the range:
>+  \ifnum \absseclevel < 0
>+    \absseclevel = 0
>   \else
>-    \numberedsubsubseczzz{#2}
>+    \ifnum \absseclevel > 3
>+      \absseclevel = 3
>+    \fi
>   \fi
>-\fi
>-}
>-
>-% like \numhead, but chooses appendix heading levels
>-\def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
>-\ifcase\absseclevel
>-  \appendixzzz{#2}
>-\or
>-  \appendixsectionzzz{#2}
>-\or
>-  \appendixsubseczzz{#2}
>-\or
>-  \appendixsubsubseczzz{#2}
>-\else
>-  \ifnum \absseclevel<0
>-    \appendixzzz{#2}
>+  % The heading type:
>+  \def\headtype{#1}%
>+  \if \headtype U%
>+    \ifnum \absseclevel < \unmlevel
>+      \chardef\unmlevel = \absseclevel
>+    \fi
>   \else
>-    \appendixsubsubseczzz{#2}
>+    % Check for appendix sections:
>+    \ifnum \absseclevel = 0
>+      \edef\chapheadtype{\headtype}%
>+    \else
>+      \if \headtype A\if \chapheadtype N%
>+	\errmessage{@appendix... within a non-appendix chapter}%
>+      \fi\fi
>+    \fi
>+    % Check for numbered within unnumbered:
>+    \ifnum \absseclevel > \unmlevel
>+      \def\headtype{U}%
>+    \else
>+      \chardef\unmlevel = 3
>+    \fi
>   \fi
>-\fi
>-}
>-
>-% like \numhead, but chooses numberless heading levels
>-\def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
>-\ifcase\absseclevel
>-  \unnumberedzzz{#2}
>-\or
>-  \unnumberedseczzz{#2}
>-\or
>-  \unnumberedsubseczzz{#2}
>-\or
>-  \unnumberedsubsubseczzz{#2}
>-\else
>-  \ifnum \absseclevel<0
>-    \unnumberedzzz{#2}
>+  % Now print the heading:
>+  \if \headtype U%
>+    \ifcase\absseclevel
>+	\unnumberedzzz{#3}%
>+    \or \unnumberedseczzz{#3}%
>+    \or \unnumberedsubseczzz{#3}%
>+    \or \unnumberedsubsubseczzz{#3}%
>+    \fi
>   \else
>-    \unnumberedsubsubseczzz{#2}
>+    \if \headtype A%
>+      \ifcase\absseclevel
>+	  \appendixzzz{#3}%
>+      \or \appendixsectionzzz{#3}%
>+      \or \appendixsubseczzz{#3}%
>+      \or \appendixsubsubseczzz{#3}%
>+      \fi
>+    \else
>+      \ifcase\absseclevel
>+	  \chapterzzz{#3}%
>+      \or \seczzz{#3}%
>+      \or \numberedsubseczzz{#3}%
>+      \or \numberedsubsubseczzz{#3}%
>+      \fi
>+    \fi
>   \fi
>-\fi
>+  \suppressfirstparagraphindent
> }
> 
>-% @chapter, @appendix, @unnumbered.
>-\def\thischaptername{No Chapter Title}
>-\outer\def\chapter{\parsearg\chapteryyy}
>-\def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
>-\def\chapterzzz #1{%
>-\secno=0 \subsecno=0 \subsubsecno=0
>-\global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}%
>-\chapmacro {#1}{\the\chapno}%
>-\gdef\thissection{#1}%
>-\gdef\thischaptername{#1}%
>-% We don't substitute the actual chapter name into \thischapter
>-% because we don't want its macros evaluated now.
>-\xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
>-                                  {\the\chapno}}}%
>-\temp
>-\donoderef
>-\global\let\section = \numberedsec
>-\global\let\subsection = \numberedsubsec
>-\global\let\subsubsection = \numberedsubsubsec
>-}
>-
>-\outer\def\appendix{\parsearg\appendixyyy}
>-\def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
>-\def\appendixzzz #1{%
>-\secno=0 \subsecno=0 \subsubsecno=0
>-\global\advance \appendixno by 1
>-\message{\putwordAppendix\space \appendixletter}%
>-\chapmacro {#1}{\putwordAppendix{} \appendixletter}%
>-\gdef\thissection{#1}%
>-\gdef\thischaptername{#1}%
>-\xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash appendixentry{\the\toks0}%
>-                       {\appendixletter}}}%
>-\temp
>-\appendixnoderef
>-\global\let\section = \appendixsec
>-\global\let\subsection = \appendixsubsec
>-\global\let\subsubsection = \appendixsubsubsec
>+% an interface:
>+\def\numhead{\genhead N}
>+\def\apphead{\genhead A}
>+\def\unnmhead{\genhead U}
>+
>+% @chapter, @appendix, @unnumbered.  Increment top-level counter, reset
>+% all lower-level sectioning counters to zero.
>+%
>+% Also set \chaplevelprefix, which we prepend to @float sequence numbers
>+% (e.g., figures), q.v.  By default (before any chapter), that is empty.
>+\let\chaplevelprefix = \empty
>+%
>+\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
>+\def\chapterzzz#1{%
>+  % section resetting is \global in case the chapter is in a group, such
>+  % as an @include file.
>+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
>+    \global\advance\chapno by 1
>+  %
>+  % Used for \float.
>+  \gdef\chaplevelprefix{\the\chapno.}%
>+  \resetallfloatnos
>+  %
>+  \message{\putwordChapter\space \the\chapno}%
>+  %
>+  % Write the actual heading.
>+  \chapmacro{#1}{Ynumbered}{\the\chapno}%
>+  %
>+  % So @section and the like are numbered underneath this chapter.
>+  \global\let\section = \numberedsec
>+  \global\let\subsection = \numberedsubsec
>+  \global\let\subsubsection = \numberedsubsubsec
> }
> 
>-% @centerchap is like @unnumbered, but the heading is centered.
>-\outer\def\centerchap{\parsearg\centerchapyyy}
>-\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}}
>+\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
>+\def\appendixzzz#1{%
>+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
>+    \global\advance\appendixno by 1
>+  \gdef\chaplevelprefix{\appendixletter.}%
>+  \resetallfloatnos
>+  %
>+  \def\appendixnum{\putwordAppendix\space \appendixletter}%
>+  \message{\appendixnum}%
>+  %
>+  \chapmacro{#1}{Yappendix}{\appendixletter}%
>+  %
>+  \global\let\section = \appendixsec
>+  \global\let\subsection = \appendixsubsec
>+  \global\let\subsubsection = \appendixsubsubsec
>+}
> 
>-% @top is like @unnumbered.
>-\outer\def\top{\parsearg\unnumberedyyy}
>+\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
>+\def\unnumberedzzz#1{%
>+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
>+    \global\advance\unnumberedno by 1
>+  %
>+  % Since an unnumbered has no number, no prefix for figures.
>+  \global\let\chaplevelprefix = \empty
>+  \resetallfloatnos
>+  %
>+  % This used to be simply \message{#1}, but TeX fully expands the
>+  % argument to \message.  Therefore, if #1 contained @-commands, TeX
>+  % expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
>+  % expanded @cite (which turns out to cause errors because \cite is meant
>+  % to be executed, not expanded).
>+  %
>+  % Anyway, we don't want the fully-expanded definition of @cite to appear
>+  % as a result of the \message, we just want `@cite' itself.  We use
>+  % \the<toks register> to achieve this: TeX expands \the<toks> only once,
>+  % simply yielding the contents of <toks register>.  (We also do this for
>+  % the toc entries.)
>+  \toks0 = {#1}%
>+  \message{(\the\toks0)}%
>+  %
>+  \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
>+  %
>+  \global\let\section = \unnumberedsec
>+  \global\let\subsection = \unnumberedsubsec
>+  \global\let\subsubsection = \unnumberedsubsubsec
>+}
> 
>-\outer\def\unnumbered{\parsearg\unnumberedyyy}
>-\def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
>-\def\unnumberedzzz #1{%
>-\secno=0 \subsecno=0 \subsubsecno=0
>-%
>-% This used to be simply \message{#1}, but TeX fully expands the
>-% argument to \message.  Therefore, if #1 contained @-commands, TeX
>-% expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
>-% expanded @cite (which turns out to cause errors because \cite is meant
>-% to be executed, not expanded).
>-%
>-% Anyway, we don't want the fully-expanded definition of @cite to appear
>-% as a result of the \message, we just want `@cite' itself.  We use
>-% \the<toks register> to achieve this: TeX expands \the<toks> only once,
>-% simply yielding the contents of <toks register>.  (We also do this for
>-% the toc entries.)
>-\toks0 = {#1}\message{(\the\toks0)}%
>-%
>-\unnumbchapmacro {#1}%
>-\gdef\thischapter{#1}\gdef\thissection{#1}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbchapentry{\the\toks0}}}%
>-\temp
>-\unnumbnoderef
>-\global\let\section = \unnumberedsec
>-\global\let\subsection = \unnumberedsubsec
>-\global\let\subsubsection = \unnumberedsubsubsec
>+% @centerchap is like @unnumbered, but the heading is centered.
>+\outer\parseargdef\centerchap{%
>+  % Well, we could do the following in a group, but that would break
>+  % an assumption that \chapmacro is called at the outermost level.
>+  % Thus we are safer this way:		--kasal, 24feb04
>+  \let\centerparametersmaybe = \centerparameters
>+  \unnmhead0{#1}%
>+  \let\centerparametersmaybe = \relax
> }
> 
>+% @top is like @unnumbered.
>+\let\top\unnumbered
>+
> % Sections.
>-\outer\def\numberedsec{\parsearg\secyyy}
>-\def\secyyy #1{\numhead1{#1}} % normally calls seczzz
>-\def\seczzz #1{%
>-\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
>-\gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}%
>-                                  {\the\chapno}{\the\secno}}}%
>-\temp
>-\donoderef
>-\nobreak
>-}
>-
>-\outer\def\appendixsection{\parsearg\appendixsecyyy}
>-\outer\def\appendixsec{\parsearg\appendixsecyyy}
>-\def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz
>-\def\appendixsectionzzz #1{%
>-\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
>-\gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}%
>-                                  {\appendixletter}{\the\secno}}}%
>-\temp
>-\appendixnoderef
>-\nobreak
>-}
>-
>-\outer\def\unnumberedsec{\parsearg\unnumberedsecyyy}
>-\def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz
>-\def\unnumberedseczzz #1{%
>-\plainsecheading {#1}\gdef\thissection{#1}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsecentry{\the\toks0}}}%
>-\temp
>-\unnumbnoderef
>-\nobreak
>+\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
>+\def\seczzz#1{%
>+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
>+  \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
>+}
>+
>+\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
>+\def\appendixsectionzzz#1{%
>+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
>+  \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
>+}
>+\let\appendixsec\appendixsection
>+
>+\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
>+\def\unnumberedseczzz#1{%
>+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
>+  \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
> }
> 
> % Subsections.
>-\outer\def\numberedsubsec{\parsearg\numberedsubsecyyy}
>-\def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz
>-\def\numberedsubseczzz #1{%
>-\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
>-\subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}%
>-                                    {\the\chapno}{\the\secno}{\the\subsecno}}}%
>-\temp
>-\donoderef
>-\nobreak
>-}
>-
>-\outer\def\appendixsubsec{\parsearg\appendixsubsecyyy}
>-\def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz
>-\def\appendixsubseczzz #1{%
>-\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
>-\subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}%
>-                                {\appendixletter}{\the\secno}{\the\subsecno}}}%
>-\temp
>-\appendixnoderef
>-\nobreak
>-}
>-
>-\outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
>-\def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
>-\def\unnumberedsubseczzz #1{%
>-\plainsubsecheading {#1}\gdef\thissection{#1}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsecentry%
>-                                    {\the\toks0}}}%
>-\temp
>-\unnumbnoderef
>-\nobreak
>+\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
>+\def\numberedsubseczzz#1{%
>+  \global\subsubsecno=0  \global\advance\subsecno by 1
>+  \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
>+}
>+
>+\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
>+\def\appendixsubseczzz#1{%
>+  \global\subsubsecno=0  \global\advance\subsecno by 1
>+  \sectionheading{#1}{subsec}{Yappendix}%
>+                 {\appendixletter.\the\secno.\the\subsecno}%
>+}
>+
>+\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
>+\def\unnumberedsubseczzz#1{%
>+  \global\subsubsecno=0  \global\advance\subsecno by 1
>+  \sectionheading{#1}{subsec}{Ynothing}%
>+                 {\the\unnumberedno.\the\secno.\the\subsecno}%
> }
> 
> % Subsubsections.
>-\outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy}
>-\def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz
>-\def\numberedsubsubseczzz #1{%
>-\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
>-\subsubsecheading {#1}
>-  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}%
>-  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}%
>-\temp
>-\donoderef
>-\nobreak
>-}
>-
>-\outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy}
>-\def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz
>-\def\appendixsubsubseczzz #1{%
>-\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
>-\subsubsecheading {#1}
>-  {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}%
>-  {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}%
>-\temp
>-\appendixnoderef
>-\nobreak
>-}
>-
>-\outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
>-\def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
>-\def\unnumberedsubsubseczzz #1{%
>-\plainsubsubsecheading {#1}\gdef\thissection{#1}%
>-\toks0 = {#1}%
>-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsubsecentry%
>-                                    {\the\toks0}}}%
>-\temp
>-\unnumbnoderef
>-\nobreak
>-}
>-
>-% These are variants which are not "outer", so they can appear in @ifinfo.
>-% Actually, they should now be obsolete; ordinary section commands should work.
>-\def\infotop{\parsearg\unnumberedzzz}
>-\def\infounnumbered{\parsearg\unnumberedzzz}
>-\def\infounnumberedsec{\parsearg\unnumberedseczzz}
>-\def\infounnumberedsubsec{\parsearg\unnumberedsubseczzz}
>-\def\infounnumberedsubsubsec{\parsearg\unnumberedsubsubseczzz}
>-
>-\def\infoappendix{\parsearg\appendixzzz}
>-\def\infoappendixsec{\parsearg\appendixseczzz}
>-\def\infoappendixsubsec{\parsearg\appendixsubseczzz}
>-\def\infoappendixsubsubsec{\parsearg\appendixsubsubseczzz}
>-
>-\def\infochapter{\parsearg\chapterzzz}
>-\def\infosection{\parsearg\sectionzzz}
>-\def\infosubsection{\parsearg\subsectionzzz}
>-\def\infosubsubsection{\parsearg\subsubsectionzzz}
>+\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
>+\def\numberedsubsubseczzz#1{%
>+  \global\advance\subsubsecno by 1
>+  \sectionheading{#1}{subsubsec}{Ynumbered}%
>+                 {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
>+}
>+
>+\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
>+\def\appendixsubsubseczzz#1{%
>+  \global\advance\subsubsecno by 1
>+  \sectionheading{#1}{subsubsec}{Yappendix}%
>+                 {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
>+}
>+
>+\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
>+\def\unnumberedsubsubseczzz#1{%
>+  \global\advance\subsubsecno by 1
>+  \sectionheading{#1}{subsubsec}{Ynothing}%
>+                 {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
>+}
> 
> % These macros control what the section commands do, according
> % to what kind of chapter we are in (ordinary, appendix, or unnumbered).
> % Define them by default for a numbered chapter.
>-\global\let\section = \numberedsec
>-\global\let\subsection = \numberedsubsec
>-\global\let\subsubsection = \numberedsubsubsec
>+\let\section = \numberedsec
>+\let\subsection = \numberedsubsec
>+\let\subsubsection = \numberedsubsubsec
> 
> % Define @majorheading, @heading and @subheading
> 
>@@ -3735,23 +4509,27 @@
> %          if justification is not attempted.  Hence \raggedright.
> 
> 
>-\def\majorheading{\parsearg\majorheadingzzz}
>-\def\majorheadingzzz #1{%
>-{\advance\chapheadingskip by 10pt \chapbreak }%
>-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
>-                  \parindent=0pt\raggedright
>-                  \rm #1\hfill}}\bigskip \par\penalty 200}
>-
>-\def\chapheading{\parsearg\chapheadingzzz}
>-\def\chapheadingzzz #1{\chapbreak %
>-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
>-                  \parindent=0pt\raggedright
>-                  \rm #1\hfill}}\bigskip \par\penalty 200}
>+\def\majorheading{%
>+  {\advance\chapheadingskip by 10pt \chapbreak }%
>+  \parsearg\chapheadingzzz
>+}
>+
>+\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
>+\def\chapheadingzzz#1{%
>+  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
>+                    \parindent=0pt\raggedright
>+                    \rm #1\hfill}}%
>+  \bigskip \par\penalty 200\relax
>+  \suppressfirstparagraphindent
>+}
> 
> % @heading, @subheading, @subsubheading.
>-\def\heading{\parsearg\plainsecheading}
>-\def\subheading{\parsearg\plainsubsecheading}
>-\def\subsubheading{\parsearg\plainsubsubsecheading}
>+\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
>+  \suppressfirstparagraphindent}
>+\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
>+  \suppressfirstparagraphindent}
>+\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
>+  \suppressfirstparagraphindent}
> 
> % These macros generate a chapter, section, etc. heading only
> % (including whitespace, linebreaking, etc. around it),
>@@ -3760,8 +4538,6 @@
> %%% Args are the skip and penalty (usually negative)
> \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
> 
>-\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
>-
> %%% Define plain chapter starts, and page on/off switching for it
> % Parameter controlling skip before chapter headings (if needed)
> 
>@@ -3784,7 +4560,7 @@
> \global\let\pagealignmacro=\chappager
> \global\def\HEADINGSon{\HEADINGSsingle}}
> 
>-\def\CHAPPAGodd{
>+\def\CHAPPAGodd{%
> \global\let\contentsalignmacro = \chapoddpage
> \global\let\pchapsepmacro=\chapoddpage
> \global\let\pagealignmacro=\chapoddpage
>@@ -3792,107 +4568,205 @@
> 
> \CHAPPAGon
> 
>-\def\CHAPFplain{
>-\global\let\chapmacro=\chfplain
>-\global\let\unnumbchapmacro=\unnchfplain
>-\global\let\centerchapmacro=\centerchfplain}
>-
>-% Plain chapter opening.
>-% #1 is the text, #2 the chapter number or empty if unnumbered.
>-\def\chfplain#1#2{%
>+% Chapter opening.
>+%
>+% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
>+% Yappendix, Yomitfromtoc), #3 the chapter number.
>+%
>+% To test against our argument.
>+\def\Ynothingkeyword{Ynothing}
>+\def\Yomitfromtockeyword{Yomitfromtoc}
>+\def\Yappendixkeyword{Yappendix}
>+%
>+\def\chapmacro#1#2#3{%
>   \pchapsepmacro
>   {%
>     \chapfonts \rm
>-    \def\chapnum{#2}%
>-    \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}%
>+    %
>+    % Have to define \thissection before calling \donoderef, because the
>+    % xref code eventually uses it.  On the other hand, it has to be called
>+    % after \pchapsepmacro, or the headline will change too soon.
>+    \gdef\thissection{#1}%
>+    \gdef\thischaptername{#1}%
>+    %
>+    % Only insert the separating space if we have a chapter/appendix
>+    % number, and don't print the unnumbered ``number''.
>+    \def\temptype{#2}%
>+    \ifx\temptype\Ynothingkeyword
>+      \setbox0 = \hbox{}%
>+      \def\toctype{unnchap}%
>+      \gdef\thischapternum{}%
>+      \gdef\thischapter{#1}%
>+    \else\ifx\temptype\Yomitfromtockeyword
>+      \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
>+      \def\toctype{omit}%
>+      \gdef\thischapternum{}%
>+      \gdef\thischapter{}%
>+    \else\ifx\temptype\Yappendixkeyword
>+      \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
>+      \def\toctype{app}%
>+      \xdef\thischapternum{\appendixletter}%
>+      % We don't substitute the actual chapter name into \thischapter
>+      % because we don't want its macros evaluated now.  And we don't
>+      % use \thissection because that changes with each section.
>+      %
>+      \xdef\thischapter{\putwordAppendix{} \appendixletter:
>+                        \noexpand\thischaptername}%
>+    \else
>+      \setbox0 = \hbox{#3\enspace}%
>+      \def\toctype{numchap}%
>+      \xdef\thischapternum{\the\chapno}%
>+      \xdef\thischapter{\putwordChapter{} \the\chapno:
>+                        \noexpand\thischaptername}%
>+    \fi\fi\fi
>+    %
>+    % Write the toc entry for this chapter.  Must come before the
>+    % \donoderef, because we include the current node name in the toc
>+    % entry, and \donoderef resets it to empty.
>+    \writetocentry{\toctype}{#1}{#3}%
>+    %
>+    % For pdftex, we have to write out the node definition (aka, make
>+    % the pdfdest) after any page break, but before the actual text has
>+    % been typeset.  If the destination for the pdf outline is after the
>+    % text, then jumping from the outline may wind up with the text not
>+    % being visible, for instance under high magnification.
>+    \donoderef{#2}%
>+    %
>+    % Typeset the actual heading.
>     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
>-          \hangindent = \wd0 \centerparametersmaybe
>+          \hangindent=\wd0 \centerparametersmaybe
>           \unhbox0 #1\par}%
>   }%
>   \nobreak\bigskip % no page break after a chapter title
>   \nobreak
> }
> 
>-% Plain opening for unnumbered.
>-\def\unnchfplain#1{\chfplain{#1}{}}
>-
> % @centerchap -- centered and unnumbered.
> \let\centerparametersmaybe = \relax
>-\def\centerchfplain#1{{%
>-  \def\centerparametersmaybe{%
>-    \advance\rightskip by 3\rightskip
>-    \leftskip = \rightskip
>-    \parfillskip = 0pt
>-  }%
>-  \chfplain{#1}{}%
>-}}
>+\def\centerparameters{%
>+  \advance\rightskip by 3\rightskip
>+  \leftskip = \rightskip
>+  \parfillskip = 0pt
>+}
> 
>-\CHAPFplain % The default
> 
>+% I don't think this chapter style is supported any more, so I'm not
>+% updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
>+%
>+\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
>+%
> \def\unnchfopen #1{%
> \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
>                        \parindent=0pt\raggedright
>                        \rm #1\hfill}}\bigskip \par\nobreak
> }
>-
> \def\chfopen #1#2{\chapoddpage {\chapfonts
> \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
> \par\penalty 5000 %
> }
>-
> \def\centerchfopen #1{%
> \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
>                        \parindent=0pt
>                        \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
> }
>+\def\CHAPFopen{%
>+  \global\let\chapmacro=\chfopen
>+  \global\let\centerchapmacro=\centerchfopen}
> 
>-\def\CHAPFopen{
>-\global\let\chapmacro=\chfopen
>-\global\let\unnumbchapmacro=\unnchfopen
>-\global\let\centerchapmacro=\centerchfopen}
> 
>-
>-% Section titles.
>+% Section titles.  These macros combine the section number parts and
>+% call the generic \sectionheading to do the printing.
>+%
> \newskip\secheadingskip
>-\def\secheadingbreak{\dobreak \secheadingskip {-1000}}
>-\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}}
>-\def\plainsecheading#1{\sectionheading{sec}{}{#1}}
>+\def\secheadingbreak{\dobreak \secheadingskip{-1000}}
> 
> % Subsection titles.
>-\newskip \subsecheadingskip
>-\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
>-\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}}
>-\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}}
>+\newskip\subsecheadingskip
>+\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
> 
> % Subsubsection titles.
>-\let\subsubsecheadingskip = \subsecheadingskip
>-\let\subsubsecheadingbreak = \subsecheadingbreak
>-\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}}
>-\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}}
>+\def\subsubsecheadingskip{\subsecheadingskip}
>+\def\subsubsecheadingbreak{\subsecheadingbreak}
> 
> 
>-% Print any size section title.
>+% Print any size, any type, section title.
> %
>-% #1 is the section type (sec/subsec/subsubsec), #2 is the section
>-% number (maybe empty), #3 the text.
>-\def\sectionheading#1#2#3{%
>-  {%
>-    \expandafter\advance\csname #1headingskip\endcsname by \parskip
>-    \csname #1headingbreak\endcsname
>-  }%
>+% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
>+% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
>+% section number.
>+%
>+\def\sectionheading#1#2#3#4{%
>   {%
>     % Switch to the right set of fonts.
>-    \csname #1fonts\endcsname \rm
>+    \csname #2fonts\endcsname \rm
>+    %
>+    % Insert space above the heading.
>+    \csname #2headingbreak\endcsname
>     %
>-    % Only insert the separating space if we have a section number.
>-    \def\secnum{#2}%
>-    \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}%
>+    % Only insert the space after the number if we have a section number.
>+    \def\sectionlevel{#2}%
>+    \def\temptype{#3}%
>     %
>+    \ifx\temptype\Ynothingkeyword
>+      \setbox0 = \hbox{}%
>+      \def\toctype{unn}%
>+      \gdef\thissection{#1}%
>+    \else\ifx\temptype\Yomitfromtockeyword
>+      % for @headings -- no section number, don't include in toc,
>+      % and don't redefine \thissection.
>+      \setbox0 = \hbox{}%
>+      \def\toctype{omit}%
>+      \let\sectionlevel=\empty
>+    \else\ifx\temptype\Yappendixkeyword
>+      \setbox0 = \hbox{#4\enspace}%
>+      \def\toctype{app}%
>+      \gdef\thissection{#1}%
>+    \else
>+      \setbox0 = \hbox{#4\enspace}%
>+      \def\toctype{num}%
>+      \gdef\thissection{#1}%
>+    \fi\fi\fi
>+    %
>+    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
>+    \writetocentry{\toctype\sectionlevel}{#1}{#4}%
>+    %
>+    % Write the node reference (= pdf destination for pdftex).
>+    % Again, see comments in \chapmacro.
>+    \donoderef{#3}%
>+    %
>+    % Interline glue will be inserted when the vbox is completed.
>+    % That glue will be a valid breakpoint for the page, since it'll be
>+    % preceded by a whatsit (usually from the \donoderef, or from the
>+    % \writetocentry if there was no node).  We don't want to allow that
>+    % break, since then the whatsits could end up on page n while the
>+    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
>+    \nobreak
>+    %
>+    % Output the actual section heading.
>     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
>-          \hangindent = \wd0 % zero if no section number
>-          \unhbox0 #3}%
>+          \hangindent=\wd0  % zero if no section number
>+          \unhbox0 #1}%
>   }%
>-  \ifdim\parskip<10pt \nobreak\kern10pt\nobreak\kern-\parskip\fi \nobreak
>+  % Add extra space after the heading -- half of whatever came above it.
>+  % Don't allow stretch, though.
>+  \kern .5 \csname #2headingskip\endcsname
>+  %
>+  % Do not let the kern be a potential breakpoint, as it would be if it
>+  % was followed by glue.
>+  \nobreak
>+  %
>+  % We'll almost certainly start a paragraph next, so don't let that
>+  % glue accumulate.  (Not a breakpoint because it's preceded by a
>+  % discardable item.)
>+  \vskip-\parskip
>+  % 
>+  % This is purely so the last item on the list is a known \penalty >
>+  % 10000.  This is so \startdefun can avoid allowing breakpoints after
>+  % section headings.  Otherwise, it would insert a valid breakpoint between:
>+  % 
>+  %   @section sec-whatever
>+  %   @deffn def-whatever
>+  \penalty 10001
> }
> 
> 
>@@ -3901,104 +4775,173 @@
> \newwrite\tocfile
> 
> % Write an entry to the toc file, opening it if necessary.
>-% Called from @chapter, etc.  We supply {\folio} at the end of the
>-% argument, which will end up as the last argument to the \...entry macro.
>+% Called from @chapter, etc.
> %
>-% We open the .toc file here instead of at @setfilename or any other
>-% given time so that @contents can be put in the document anywhere.
>+% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
>+% We append the current node name (if any) and page number as additional
>+% arguments for the \{chap,sec,...}entry macros which will eventually
>+% read this.  The node name is used in the pdf outlines as the
>+% destination to jump to.
>+%
>+% We open the .toc file for writing here instead of at @setfilename (or
>+% any other fixed time) so that @contents can be anywhere in the document.
>+% But if #1 is `omit', then we don't do anything.  This is used for the
>+% table of contents chapter openings themselves.
> %
> \newif\iftocfileopened
>-\def\writetocentry#1{%
>-  \iftocfileopened\else
>-    \immediate\openout\tocfile = \jobname.toc
>-    \global\tocfileopenedtrue
>+\def\omitkeyword{omit}%
>+%
>+\def\writetocentry#1#2#3{%
>+  \edef\writetoctype{#1}%
>+  \ifx\writetoctype\omitkeyword \else
>+    \iftocfileopened\else
>+      \immediate\openout\tocfile = \jobname.toc
>+      \global\tocfileopenedtrue
>+    \fi
>+    %
>+    \iflinks
>+      {\atdummies
>+       \edef\temp{%
>+         \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
>+       \temp
>+      }%
>+    \fi
>   \fi
>-  \iflinks \write\tocfile{#1{\folio}}\fi
>+  %
>+  % Tell \shipout to create a pdf destination on each page, if we're
>+  % writing pdf.  These are used in the table of contents.  We can't
>+  % just write one on every page because the title pages are numbered
>+  % 1 and 2 (the page numbers aren't printed), and so are the first
>+  % two pages of the document.  Thus, we'd have two destinations named
>+  % `1', and two named `2'.
>+  \ifpdf \global\pdfmakepagedesttrue \fi
>+}
>+
>+
>+% These characters do not print properly in the Computer Modern roman
>+% fonts, so we must take special care.  This is more or less redundant
>+% with the Texinfo input format setup at the end of this file.
>+% 
>+\def\activecatcodes{%
>+  \catcode`\"=\active
>+  \catcode`\$=\active
>+  \catcode`\<=\active
>+  \catcode`\>=\active
>+  \catcode`\\=\active
>+  \catcode`\^=\active
>+  \catcode`\_=\active
>+  \catcode`\|=\active
>+  \catcode`\~=\active
>+}
>+
>+
>+% Read the toc file, which is essentially Texinfo input.
>+\def\readtocfile{%
>+  \setupdatafile
>+  \activecatcodes
>+  \input \jobname.toc
> }
> 
> \newskip\contentsrightmargin \contentsrightmargin=1in
> \newcount\savepageno
> \newcount\lastnegativepageno \lastnegativepageno = -1
> 
>-% Finish up the main text and prepare to read what we've written
>-% to \tocfile.
>+% Prepare to read what we've written to \tocfile.
> %
> \def\startcontents#1{%
>-   % If @setchapternewpage on, and @headings double, the contents should
>-   % start on an odd page, unlike chapters.  Thus, we maintain
>-   % \contentsalignmacro in parallel with \pagealignmacro.
>-   % From: Torbjorn Granlund <tege@matematik.su.se>
>-   \contentsalignmacro
>-   \immediate\closeout\tocfile
>-   %
>-   % Don't need to put `Contents' or `Short Contents' in the headline.
>-   % It is abundantly clear what they are.
>-   \unnumbchapmacro{#1}\def\thischapter{}%
>-   \savepageno = \pageno
>-   \begingroup                  % Set up to handle contents files properly.
>-      \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
>-      % We can't do this, because then an actual ^ in a section
>-      % title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
>-      %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
>-      \raggedbottom             % Worry more about breakpoints than the bottom.
>-      \advance\hsize by -\contentsrightmargin % Don't use the full line length.
>-      %
>-      % Roman numerals for page numbers.
>-      \ifnum \pageno>0 \pageno = \lastnegativepageno \fi
>+  % If @setchapternewpage on, and @headings double, the contents should
>+  % start on an odd page, unlike chapters.  Thus, we maintain
>+  % \contentsalignmacro in parallel with \pagealignmacro.
>+  % From: Torbjorn Granlund <tege@matematik.su.se>
>+  \contentsalignmacro
>+  \immediate\closeout\tocfile
>+  %
>+  % Don't need to put `Contents' or `Short Contents' in the headline.
>+  % It is abundantly clear what they are.
>+  \def\thischapter{}%
>+  \chapmacro{#1}{Yomitfromtoc}{}%
>+  %
>+  \savepageno = \pageno
>+  \begingroup                  % Set up to handle contents files properly.
>+    \raggedbottom              % Worry more about breakpoints than the bottom.
>+    \advance\hsize by -\contentsrightmargin % Don't use the full line length.
>+    %
>+    % Roman numerals for page numbers.
>+    \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
> }
> 
> 
> % Normal (long) toc.
> \def\contents{%
>-   \startcontents{\putwordTOC}%
>-     \openin 1 \jobname.toc
>-     \ifeof 1 \else
>-       \closein 1
>-       \input \jobname.toc
>-     \fi
>-     \vfill \eject
>-     \contentsalignmacro % in case @setchapternewpage odd is in effect
>-     \pdfmakeoutlines
>-   \endgroup
>-   \lastnegativepageno = \pageno
>-   \pageno = \savepageno
>+  \startcontents{\putwordTOC}%
>+    \openin 1 \jobname.toc
>+    \ifeof 1 \else
>+      \readtocfile
>+    \fi
>+    \vfill \eject
>+    \contentsalignmacro % in case @setchapternewpage odd is in effect
>+    \ifeof 1 \else
>+      \pdfmakeoutlines
>+    \fi
>+    \closein 1
>+  \endgroup
>+  \lastnegativepageno = \pageno
>+  \global\pageno = \savepageno
> }
> 
> % And just the chapters.
> \def\summarycontents{%
>-   \startcontents{\putwordShortTOC}%
>-      %
>-      \let\chapentry = \shortchapentry
>-      \let\appendixentry = \shortappendixentry
>-      \let\unnumbchapentry = \shortunnumberedentry
>-      % We want a true roman here for the page numbers.
>-      \secfonts
>-      \let\rm=\shortcontrm \let\bf=\shortcontbf \let\sl=\shortcontsl
>-      \rm
>-      \hyphenpenalty = 10000
>-      \advance\baselineskip by 1pt % Open it up a little.
>-      \def\secentry ##1##2##3##4{}
>-      \def\unnumbsecentry ##1##2{}
>-      \def\subsecentry ##1##2##3##4##5{}
>-      \def\unnumbsubsecentry ##1##2{}
>-      \def\subsubsecentry ##1##2##3##4##5##6{}
>-      \def\unnumbsubsubsecentry ##1##2{}
>-      \openin 1 \jobname.toc
>-      \ifeof 1 \else
>-        \closein 1
>-        \input \jobname.toc
>-      \fi
>-     \vfill \eject
>-     \contentsalignmacro % in case @setchapternewpage odd is in effect
>-   \endgroup
>-   \lastnegativepageno = \pageno
>-   \pageno = \savepageno
>+  \startcontents{\putwordShortTOC}%
>+    %
>+    \let\numchapentry = \shortchapentry
>+    \let\appentry = \shortchapentry
>+    \let\unnchapentry = \shortunnchapentry
>+    % We want a true roman here for the page numbers.
>+    \secfonts
>+    \let\rm=\shortcontrm \let\bf=\shortcontbf
>+    \let\sl=\shortcontsl \let\tt=\shortconttt
>+    \rm
>+    \hyphenpenalty = 10000
>+    \advance\baselineskip by 1pt % Open it up a little.
>+    \def\numsecentry##1##2##3##4{}
>+    \let\appsecentry = \numsecentry
>+    \let\unnsecentry = \numsecentry
>+    \let\numsubsecentry = \numsecentry
>+    \let\appsubsecentry = \numsecentry
>+    \let\unnsubsecentry = \numsecentry
>+    \let\numsubsubsecentry = \numsecentry
>+    \let\appsubsubsecentry = \numsecentry
>+    \let\unnsubsubsecentry = \numsecentry
>+    \openin 1 \jobname.toc
>+    \ifeof 1 \else
>+      \readtocfile
>+    \fi
>+    \closein 1
>+    \vfill \eject
>+    \contentsalignmacro % in case @setchapternewpage odd is in effect
>+  \endgroup
>+  \lastnegativepageno = \pageno
>+  \global\pageno = \savepageno
> }
> \let\shortcontents = \summarycontents
> 
>-\ifpdf
>-  \pdfcatalog{/PageMode /UseOutlines}%
>-\fi
>+% Typeset the label for a chapter or appendix for the short contents.
>+% The arg is, e.g., `A' for an appendix, or `3' for a chapter.
>+%
>+\def\shortchaplabel#1{%
>+  % This space should be enough, since a single number is .5em, and the
>+  % widest letter (M) is 1em, at least in the Computer Modern fonts.
>+  % But use \hss just in case.
>+  % (This space doesn't include the extra space that gets added after
>+  % the label; that gets put in by \shortchapentry above.)
>+  %
>+  % We'd like to right-justify chapter numbers, but that looks strange
>+  % with appendix letters.  And right-justifying numbers and
>+  % left-justifying letters looks strange when there is less than 10
>+  % chapters.  Have to read the whole toc once to know how many chapters
>+  % there are before deciding ...
>+  \hbox to 1em{#1\hss}%
>+}
> 
> % These macros generate individual entries in the table of contents.
> % The first argument is the chapter or section name.
>@@ -4006,57 +4949,46 @@
> % The arguments in between are the chapter number, section number, ...
> 
> % Chapters, in the main contents.
>-\def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}}
>+\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
> %
> % Chapters, in the short toc.
> % See comments in \dochapentry re vbox and related settings.
>-\def\shortchapentry#1#2#3{%
>-  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}%
>+\def\shortchapentry#1#2#3#4{%
>+  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
> }
> 
> % Appendices, in the main contents.
>-\def\appendixentry#1#2#3{\dochapentry{\putwordAppendix{} #2\labelspace#1}{#3}}
>+% Need the word Appendix, and a fixed-size box.
> %
>-% Appendices, in the short toc.
>-\let\shortappendixentry = \shortchapentry
>-
>-% Typeset the label for a chapter or appendix for the short contents.
>-% The arg is, e.g., `Appendix A' for an appendix, or `3' for a chapter.
>-% We could simplify the code here by writing out an \appendixentry
>-% command in the toc file for appendices, instead of using \chapentry
>-% for both, but it doesn't seem worth it.
>+\def\appendixbox#1{%
>+  % We use M since it's probably the widest letter.
>+  \setbox0 = \hbox{\putwordAppendix{} M}%
>+  \hbox to \wd0{\putwordAppendix{} #1\hss}}
> %
>-\newdimen\shortappendixwidth
>-%
>-\def\shortchaplabel#1{%
>-  % This space should be enough, since a single number is .5em, and the
>-  % widest letter (M) is 1em, at least in the Computer Modern fonts.
>-  % But use \hss just in case.
>-  % (This space doesn't include the extra space that gets added after
>-  % the label; that gets put in by \shortchapentry above.)
>-  \dimen0 = 1em
>-  \hbox to \dimen0{#1\hss}%
>-}
>+\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
> 
> % Unnumbered chapters.
>-\def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
>-\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}}
>+\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
>+\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
> 
> % Sections.
>-\def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}}
>-\def\unnumbsecentry#1#2{\dosecentry{#1}{#2}}
>+\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
>+\let\appsecentry=\numsecentry
>+\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
> 
> % Subsections.
>-\def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}}
>-\def\unnumbsubsecentry#1#2{\dosubsecentry{#1}{#2}}
>+\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
>+\let\appsubsecentry=\numsubsecentry
>+\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
> 
> % And subsubsections.
>-\def\subsubsecentry#1#2#3#4#5#6{%
>-  \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}}
>-\def\unnumbsubsubsecentry#1#2{\dosubsubsecentry{#1}{#2}}
>+\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
>+\let\appsubsubsecentry=\numsubsubsecentry
>+\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
> 
> % This parameter controls the indentation of the various levels.
>-\newdimen\tocindent \tocindent = 3pc
>+% Same as \defaultparindent.
>+\newdimen\tocindent \tocindent = 15pt
> 
> % Now for the actual typesetting. In all these, #1 is the text and #2 is the
> % page number.
>@@ -4087,17 +5019,8 @@
>   \tocentry{#1}{\dopageno\bgroup#2\egroup}%
> \endgroup}
> 
>-% Final typesetting of a toc entry; we use the same \entry macro as for
>-% the index entries, but we want to suppress hyphenation here.  (We
>-% can't do that in the \entry macro, since index entries might consist
>-% of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
>-\def\tocentry#1#2{\begingroup
>-  \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
>-  % Do not use \turnoffactive in these arguments.  Since the toc is
>-  % typeset in cmr, characters such as _ would come out wrong; we
>-  % have to do the usual translation tricks.
>-  \entry{#1}{#2}%
>-\endgroup}
>+% We use the same \entry macro as for the index entries.
>+\let\tocentry = \entry
> 
> % Space between chapter (or whatever) number and the title.
> \def\labelspace{\hskip1em \relax}
>@@ -4107,72 +5030,61 @@
> 
> \def\chapentryfonts{\secfonts \rm}
> \def\secentryfonts{\textfonts}
>-\let\subsecentryfonts = \textfonts
>-\let\subsubsecentryfonts = \textfonts
>+\def\subsecentryfonts{\textfonts}
>+\def\subsubsecentryfonts{\textfonts}
> 
> 
> \message{environments,}
> % @foo ... @end foo.
> 
>+% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
>+%
> % Since these characters are used in examples, it should be an even number of
> % \tt widths. Each \tt character is 1en, so two makes it 1em.
>-% Furthermore, these definitions must come after we define our fonts.
>-\newbox\dblarrowbox    \newbox\longdblarrowbox
>-\newbox\pushcharbox    \newbox\bullbox
>-\newbox\equivbox       \newbox\errorbox
>-
>-%{\tentt
>-%\global\setbox\dblarrowbox = \hbox to 1em{\hfil$\Rightarrow$\hfil}
>-%\global\setbox\longdblarrowbox = \hbox to 1em{\hfil$\mapsto$\hfil}
>-%\global\setbox\pushcharbox = \hbox to 1em{\hfil$\dashv$\hfil}
>-%\global\setbox\equivbox = \hbox to 1em{\hfil$\ptexequiv$\hfil}
>-% Adapted from the manmac format (p.420 of TeXbook)
>-%\global\setbox\bullbox = \hbox to 1em{\kern.15em\vrule height .75ex width .85ex
>-%                                      depth .1ex\hfil}
>-%}
>-
>-% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
>+%
> \def\point{$\star$}
> \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
> \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
> \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
> \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
> 
>+% The @error{} command.
> % Adapted from the TeXbook's \boxit.
>+%
>+\newbox\errorbox
>+%
> {\tentt \global\dimen0 = 3em}% Width of the box.
> \dimen2 = .55pt % Thickness of rules
> % The text. (`r' is open on the right, `e' somewhat less so on the left.)
>-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
>-
>-\global\setbox\errorbox=\hbox to \dimen0{\hfil
>+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
>+%
>+\setbox\errorbox=\hbox to \dimen0{\hfil
>    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
>    \advance\hsize by -2\dimen2 % Rules.
>-   \vbox{
>+   \vbox{%
>       \hrule height\dimen2
>       \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
>          \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
>          \kern3pt\vrule width\dimen2}% Space to right.
>       \hrule height\dimen2}
>     \hfil}
>-
>-% The @error{} command.
>+%
> \def\error{\leavevmode\lower.7ex\copy\errorbox}
> 
> % @tex ... @end tex    escapes into raw Tex temporarily.
> % One exception: @ is still an escape character, so that @end tex works.
> % But \@ or @@ will get a plain tex @ character.
> 
>-\def\tex{\begingroup
>+\envdef\tex{%
>   \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
>   \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
>-  \catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie
>+  \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
>   \catcode `\%=14
>-  \catcode 43=12 % plus
>-  \catcode`\"=12
>-  \catcode`\==12
>-  \catcode`\|=12
>-  \catcode`\<=12
>-  \catcode`\>=12
>+  \catcode `\+=\other
>+  \catcode `\"=\other
>+  \catcode `\|=\other
>+  \catcode `\<=\other
>+  \catcode `\>=\other
>   \escapechar=`\\
>   %
>   \let\b=\ptexb
>@@ -4184,20 +5096,25 @@
>   \let\equiv=\ptexequiv
>   \let\!=\ptexexclam
>   \let\i=\ptexi
>+  \let\indent=\ptexindent
>+  \let\noindent=\ptexnoindent
>   \let\{=\ptexlbrace
>   \let\+=\tabalign
>   \let\}=\ptexrbrace
>+  \let\/=\ptexslash
>   \let\*=\ptexstar
>   \let\t=\ptext
>+  \let\frenchspacing=\plainfrenchspacing
>   %
>   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
>   \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
>   \def\@{@}%
>-\let\Etex=\endgroup}
>+}
>+% There is no need to define \Etex.
> 
>-% Define @lisp ... @endlisp.
>-% @lisp does a \begingroup so it can rebind things,
>-% including the definition of @endlisp (which normally is erroneous).
>+% Define @lisp ... @end lisp.
>+% @lisp environment forms a group so it can rebind things,
>+% including the definition of @end lisp (which normally is erroneous).
> 
> % Amount to narrow the margins by for @lisp.
> \newskip\lispnarrowing \lispnarrowing=0.4in
>@@ -4207,34 +5124,25 @@
> % have any width.
> \def\lisppar{\null\endgraf}
> 
>-% Make each space character in the input produce a normal interword
>-% space in the output.  Don't allow a line break at this space, as this
>-% is used only in environments like @example, where each line of input
>-% should produce a line of output anyway.
>-%
>-{\obeyspaces %
>-\gdef\sepspaces{\obeyspaces\let =\tie}}
>-
>-% Define \obeyedspace to be our active space, whatever it is.  This is
>-% for use in \parsearg.
>-{\sepspaces%
>-\global\let\obeyedspace= }
>-
> % This space is always present above and below environments.
> \newskip\envskipamount \envskipamount = 0pt
> 
> % Make spacing and below environment symmetrical.  We use \parskip here
> % to help in doing that, since in @example-like environments \parskip
> % is reset to zero; thus the \afterenvbreak inserts no space -- but the
>-% start of the next paragraph will insert \parskip
>+% start of the next paragraph will insert \parskip.
> %
> \def\aboveenvbreak{{%
>-  \ifnum\lastpenalty < 10000
>+  % =10000 instead of <10000 because of a special case in \itemzzz and
>+  % \sectionheading, q.v.
>+  \ifnum \lastpenalty=10000 \else
>     \advance\envskipamount by \parskip
>     \endgraf
>     \ifdim\lastskip<\envskipamount
>       \removelastskip
>-      \penalty-50
>+      % it's not a good place to break if the last penalty was \nobreak
>+      % or better ...
>+      \ifnum\lastpenalty<10000 \penalty-50 \fi
>       \vskip\envskipamount
>     \fi
>   \fi
>@@ -4242,7 +5150,8 @@
> 
> \let\afterenvbreak = \aboveenvbreak
> 
>-% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
>+% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
>+% also clear it, so that its embedded environments do the narrowing again.
> \let\nonarrowing=\relax
> 
> % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
>@@ -4266,199 +5175,208 @@
> %
> \newskip\lskip\newskip\rskip
> 
>-\long\def\cartouche{%
>-\begingroup
>-        \lskip=\leftskip \rskip=\rightskip
>-        \leftskip=0pt\rightskip=0pt %we want these *outside*.
>-        \cartinner=\hsize \advance\cartinner by-\lskip
>-                          \advance\cartinner by-\rskip
>-        \cartouter=\hsize
>-        \advance\cartouter by 18.4pt % allow for 3pt kerns on either
>-%                                    side, and for 6pt waste from
>-%                                    each corner char, and rule thickness
>-        \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
>-        % Flag to tell @lisp, etc., not to narrow margin.
>-        \let\nonarrowing=\comment
>-        \vbox\bgroup
>-                \baselineskip=0pt\parskip=0pt\lineskip=0pt
>-                \carttop
>-                \hbox\bgroup
>-                        \hskip\lskip
>-                        \vrule\kern3pt
>-                        \vbox\bgroup
>-                                \hsize=\cartinner
>-                                \kern3pt
>-                                \begingroup
>-                                        \baselineskip=\normbskip
>-                                        \lineskip=\normlskip
>-                                        \parskip=\normpskip
>-                                        \vskip -\parskip
>+\envdef\cartouche{%
>+  \ifhmode\par\fi  % can't be in the midst of a paragraph.
>+  \startsavinginserts
>+  \lskip=\leftskip \rskip=\rightskip
>+  \leftskip=0pt\rightskip=0pt % we want these *outside*.
>+  \cartinner=\hsize \advance\cartinner by-\lskip
>+  \advance\cartinner by-\rskip
>+  \cartouter=\hsize
>+  \advance\cartouter by 18.4pt	% allow for 3pt kerns on either
>+				% side, and for 6pt waste from
>+				% each corner char, and rule thickness
>+  \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
>+  % Flag to tell @lisp, etc., not to narrow margin.
>+  \let\nonarrowing = t%
>+  \vbox\bgroup
>+      \baselineskip=0pt\parskip=0pt\lineskip=0pt
>+      \carttop
>+      \hbox\bgroup
>+	  \hskip\lskip
>+	  \vrule\kern3pt
>+	  \vbox\bgroup
>+	      \kern3pt
>+	      \hsize=\cartinner
>+	      \baselineskip=\normbskip
>+	      \lineskip=\normlskip
>+	      \parskip=\normpskip
>+	      \vskip -\parskip
>+	      \comment % For explanation, see the end of \def\group.
>+}
> \def\Ecartouche{%
>-                                \endgroup
>-                                \kern3pt
>-                        \egroup
>-                        \kern3pt\vrule
>-                        \hskip\rskip
>-                \egroup
>-                \cartbot
>-        \egroup
>-\endgroup
>-}}
>+              \ifhmode\par\fi
>+	      \kern3pt
>+	  \egroup
>+	  \kern3pt\vrule
>+	  \hskip\rskip
>+      \egroup
>+      \cartbot
>+  \egroup
>+  \checkinserts
>+}
> 
> 
> % This macro is called at the beginning of all the @example variants,
> % inside a group.
> \def\nonfillstart{%
>   \aboveenvbreak
>-  \inENV % This group ends at the end of the body
>   \hfuzz = 12pt % Don't be fussy
>   \sepspaces % Make spaces be word-separators rather than space tokens.
>-  \singlespace
>   \let\par = \lisppar % don't ignore blank lines
>   \obeylines % each line of input is a line of output
>   \parskip = 0pt
>   \parindent = 0pt
>   \emergencystretch = 0pt % don't try to avoid overfull boxes
>-  % @cartouche defines \nonarrowing to inhibit narrowing
>-  % at next level down.
>   \ifx\nonarrowing\relax
>     \advance \leftskip by \lispnarrowing
>     \exdentamount=\lispnarrowing
>-    \let\exdent=\nofillexdent
>-    \let\nonarrowing=\relax
>+  \else
>+    \let\nonarrowing = \relax
>   \fi
>+  \let\exdent=\nofillexdent
> }
> 
>-% Define the \E... control sequence only if we are inside the particular
>-% environment, so the error checking in \end will work.
>+% If you want all examples etc. small: @set dispenvsize small.
>+% If you want even small examples the full size: @set dispenvsize nosmall.
>+% This affects the following displayed environments:
>+%    @example, @display, @format, @lisp
> %
>-% To end an @example-like environment, we first end the paragraph (via
>-% \afterenvbreak's vertical glue), and then the group.  That way we keep
>-% the zero \parskip that the environments set -- \parskip glue will be
>-% inserted at the beginning of the next paragraph in the document, after
>-% the environment.
>-%
>-\def\nonfillfinish{\afterenvbreak\endgroup}
>-
>-% @lisp: indented, narrowed, typewriter font.
>-\def\lisp{\begingroup
>-  \nonfillstart
>-  \let\Elisp = \nonfillfinish
>-  \tt
>-  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
>-  \gobble       % eat return
>+\def\smallword{small}
>+\def\nosmallword{nosmall}
>+\let\SETdispenvsize\relax
>+\def\setnormaldispenv{%
>+  \ifx\SETdispenvsize\smallword
>+    \smallexamplefonts \rm
>+  \fi
>+}
>+\def\setsmalldispenv{%
>+  \ifx\SETdispenvsize\nosmallword
>+  \else
>+    \smallexamplefonts \rm
>+  \fi
> }
> 
>-% @example: Same as @lisp.
>-\def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp}
>-
>-% @small... is usually equivalent to the non-small (@smallbook
>-% redefines).  We must call \example (or whatever) last in the
>-% definition, since it reads the return following the @example (or
>-% whatever) command.
>-%
>-% This actually allows (for example) @end display inside an
>-% @smalldisplay.  Too bad, but makeinfo will catch the error anyway.
>-%
>-\def\smalldisplay{\begingroup\def\Esmalldisplay{\nonfillfinish\endgroup}\display}
>-\def\smallexample{\begingroup\def\Esmallexample{\nonfillfinish\endgroup}\lisp}
>-\def\smallformat{\begingroup\def\Esmallformat{\nonfillfinish\endgroup}\format}
>-\def\smalllisp{\begingroup\def\Esmalllisp{\nonfillfinish\endgroup}\lisp}
>+% We often define two environments, @foo and @smallfoo.
>+% Let's do it by one command:
>+\def\makedispenv #1#2{
>+  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
>+  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
>+  \expandafter\let\csname E#1\endcsname \afterenvbreak
>+  \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
>+}
> 
>-% Real @smallexample and @smalllisp (when @smallbook): use smaller fonts.
>-% Originally contributed by Pavel@xerox.
>-\def\smalllispx{\begingroup
>-  \def\Esmalllisp{\nonfillfinish\endgroup}%
>-  \def\Esmallexample{\nonfillfinish\endgroup}%
>-  \smallexamplefonts
>-  \lisp
>+% Define two synonyms:
>+\def\maketwodispenvs #1#2#3{
>+  \makedispenv{#1}{#3}
>+  \makedispenv{#2}{#3}
> }
> 
>-% @display: same as @lisp except keep current font.
>+% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
>+%
>+% @smallexample and @smalllisp: use smaller fonts.
>+% Originally contributed by Pavel@xerox.
> %
>-\def\display{\begingroup
>+\maketwodispenvs {lisp}{example}{%
>   \nonfillstart
>-  \let\Edisplay = \nonfillfinish
>-  \gobble
>+  \tt\quoteexpand
>+  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
>+  \gobble       % eat return
> }
>+% @display/@smalldisplay: same as @lisp except keep current font.
> %
>-% @smalldisplay (when @smallbook): @display plus smaller fonts.
>-%
>-\def\smalldisplayx{\begingroup
>-  \def\Esmalldisplay{\nonfillfinish\endgroup}%
>-  \smallexamplefonts \rm
>-  \display
>+\makedispenv {display}{%
>+  \nonfillstart
>+  \gobble
> }
> 
>-% @format: same as @display except don't narrow margins.
>+% @format/@smallformat: same as @display except don't narrow margins.
> %
>-\def\format{\begingroup
>-  \let\nonarrowing = t
>+\makedispenv{format}{%
>+  \let\nonarrowing = t%
>   \nonfillstart
>-  \let\Eformat = \nonfillfinish
>   \gobble
> }
>-%
>-% @smallformat (when @smallbook): @format plus smaller fonts.
>-%
>-\def\smallformatx{\begingroup
>-  \def\Esmallformat{\nonfillfinish\endgroup}%
>-  \smallexamplefonts \rm
>-  \format
>-}
> 
>-% @flushleft (same as @format).
>-%
>-\def\flushleft{\begingroup \def\Eflushleft{\nonfillfinish\endgroup}\format}
>+% @flushleft: same as @format, but doesn't obey \SETdispenvsize.
>+\envdef\flushleft{%
>+  \let\nonarrowing = t%
>+  \nonfillstart
>+  \gobble
>+}
>+\let\Eflushleft = \afterenvbreak
> 
> % @flushright.
> %
>-\def\flushright{\begingroup
>-  \let\nonarrowing = t
>+\envdef\flushright{%
>+  \let\nonarrowing = t%
>   \nonfillstart
>-  \let\Eflushright = \nonfillfinish
>   \advance\leftskip by 0pt plus 1fill
>   \gobble
> }
>+\let\Eflushright = \afterenvbreak
> 
> 
> % @quotation does normal linebreaking (hence we can't use \nonfillstart)
>-% and narrows the margins.
>+% and narrows the margins.  We keep \parskip nonzero in general, since
>+% we're doing normal filling.  So, when using \aboveenvbreak and
>+% \afterenvbreak, temporarily make \parskip 0.
> %
>-\def\quotation{%
>-  \begingroup\inENV %This group ends at the end of the @quotation body
>+\envdef\quotation{%
>   {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
>-  \singlespace
>   \parindent=0pt
>-  % We have retained a nonzero parskip for the environment, since we're
>-  % doing normal filling. So to avoid extra space below the environment...
>-  \def\Equotation{\parskip = 0pt \nonfillfinish}%
>   %
>   % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
>   \ifx\nonarrowing\relax
>     \advance\leftskip by \lispnarrowing
>     \advance\rightskip by \lispnarrowing
>     \exdentamount = \lispnarrowing
>+  \else
>     \let\nonarrowing = \relax
>   \fi
>+  \parsearg\quotationlabel
>+}
>+
>+% We have retained a nonzero parskip for the environment, since we're
>+% doing normal filling.
>+%
>+\def\Equotation{%
>+  \par
>+  \ifx\quotationauthor\undefined\else
>+    % indent a bit.
>+    \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
>+  \fi
>+  {\parskip=0pt \afterenvbreak}%
>+}
>+
>+% If we're given an argument, typeset it in bold with a colon after.
>+\def\quotationlabel#1{%
>+  \def\temp{#1}%
>+  \ifx\temp\empty \else
>+    {\bf #1: }%
>+  \fi
> }
> 
> 
> % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
>-% If we want to allow any <char> as delimiter, 
>+% If we want to allow any <char> as delimiter,
> % we need the curly braces so that makeinfo sees the @verb command, eg:
> % `@verbx...x' would look like the '@verbx' command.  --janneke@gnu.org
> %
> % [Knuth]: Donald Ervin Knuth, 1996.  The TeXbook.
> %
>-% [Knuth] p. 344; only we need to do '@' too
>+% [Knuth] p.344; only we need to do the other characters Texinfo sets
>+% active too.  Otherwise, they get lost as the first character on a
>+% verbatim line.
> \def\dospecials{%
>-  \do\ \do\\\do\@\do\{\do\}\do\$\do\&%
>-  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~}
>+  \do\ \do\\\do\{\do\}\do\$\do\&%
>+  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
>+  \do\<\do\>\do\|\do\@\do+\do\"%
>+}
> %
> % [Knuth] p. 380
> \def\uncatcodespecials{%
>-  \def\do##1{\catcode`##1=12}\dospecials}
>+  \def\do##1{\catcode`##1=\other}\dospecials}
> %
> % [Knuth] pp. 380,381,391
> % Disable Spanish ligatures ?` and !` of \tt font
>@@ -4492,6 +5410,34 @@
> \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
> %
> \def\starttabbox{\setbox0=\hbox\bgroup}
>+
>+% Allow an option to not replace quotes with a regular directed right
>+% quote/apostrophe (char 0x27), but instead use the undirected quote
>+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
>+% the default, but it works for pasting with more pdf viewers (at least
>+% evince), the lilypond developers report.  xpdf does work with the
>+% regular 0x27.  
>+% 
>+\def\codequoteright{%
>+  \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
>+    '%
>+  \else
>+    \char'15
>+  \fi
>+}
>+%
>+% and a similar option for the left quote char vs. a grave accent.
>+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
>+% the code environments to do likewise.
>+% 
>+\def\codequoteleft{%
>+  \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
>+    `%
>+  \else
>+    \char'22
>+  \fi
>+}
>+%
> \begingroup
>   \catcode`\^^I=\active
>   \gdef\tabexpand{%
>@@ -4504,13 +5450,25 @@
>       \wd0=\dimen0 \box0 \starttabbox
>     }%
>   }
>+  \catcode`\'=\active
>+  \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
>+  %
>+  \catcode`\`=\active
>+  \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
>+  %
>+  \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
> \endgroup
>+
>+% start the verbatim environment.
> \def\setupverbatim{%
>+  \let\nonarrowing = t%
>+  \nonfillstart
>   % Easiest (and conventionally used) font for verbatim
>   \tt
>   \def\par{\leavevmode\egroup\box0\endgraf}%
>   \catcode`\`=\active
>   \tabexpand
>+  \quoteexpand
>   % Respect line breaks,
>   % print special symbols as themselves, and
>   % make each space count
>@@ -4519,15 +5477,15 @@
>   \everypar{\starttabbox}%
> }
> 
>-% Do the @verb magic: verbatim text is quoted by unique 
>-% delimiter characters.  Before first delimiter expect a 
>+% Do the @verb magic: verbatim text is quoted by unique
>+% delimiter characters.  Before first delimiter expect a
> % right brace, after last delimiter expect closing brace:
> %
> %    \def\doverb'{'<char>#1<char>'}'{#1}
> %
> % [Knuth] p. 382; only eat outer {}
> \begingroup
>-  \catcode`[=1\catcode`]=2\catcode`\{=12\catcode`\}=12
>+  \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
>   \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
> \endgroup
> %
>@@ -4539,619 +5497,395 @@
> %
> %     \def\doverbatim#1@end verbatim{#1}
> %
>-% For Texinfo it's a lot easier than for LaTeX, 
>+% For Texinfo it's a lot easier than for LaTeX,
> % because texinfo's \verbatim doesn't stop at '\end{verbatim}':
>-% we need not redefine '\', '{' and '}'
>+% we need not redefine '\', '{' and '}'.
> %
> % Inspired by LaTeX's verbatim command set [latex.ltx]
>-%% Include LaTeX hack for completeness -- never know
>-%% \begingroup
>-%% \catcode`|=0 \catcode`[=1
>-%% \catcode`]=2\catcode`\{=12\catcode`\}=12\catcode`\ =\active
>-%% \catcode`\\=12|gdef|doverbatim#1@end verbatim[
>-%% #1|endgroup|def|Everbatim[]|end[verbatim]]
>-%% |endgroup
>+%
> \begingroup
>   \catcode`\ =\active
>-  \gdef\doverbatim#1@end verbatim{#1\end{verbatim}}
>+  \obeylines %
>+  % ignore everything up to the first ^^M, that's the newline at the end
>+  % of the @verbatim input line itself.  Otherwise we get an extra blank
>+  % line in the output.
>+  \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}%
>+  % We really want {...\end verbatim} in the body of the macro, but
>+  % without the active space; thus we have to use \xdef and \gobble.
> \endgroup
> %
>-\def\verbatim{%
>-  \def\Everbatim{\nonfillfinish\endgroup}%
>-  \begingroup
>-    \nonfillstart
>-    \advance\leftskip by -\defbodyindent
>-    \begingroup\setupverbatim\doverbatim
>+\envdef\verbatim{%
>+    \setupverbatim\doverbatim
> }
>+\let\Everbatim = \afterenvbreak
>+
> 
> % @verbatiminclude FILE - insert text of file in verbatim environment.
> %
>-% Allow normal characters that we make active in the argument (a file name).
>-\def\verbatiminclude{%
>-  \begingroup
>-    \catcode`\\=12
>-    \catcode`~=12
>-    \catcode`^=12
>-    \catcode`_=12
>-    \catcode`|=12
>-    \catcode`<=12
>-    \catcode`>=12
>-    \catcode`+=12
>-    \parsearg\doverbatiminclude
>-}
>-\def\setupverbatiminclude{%
>-  \begingroup
>-    \nonfillstart
>-    \advance\leftskip by -\defbodyindent
>-    \begingroup\setupverbatim
>-}
>+\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
> %
> \def\doverbatiminclude#1{%
>-     % Restore active chars for included file.
>-  \endgroup
>-  \begingroup
>-  \def\thisfile{#1}%
>-  \expandafter\expandafter\setupverbatiminclude\input\thisfile
>-  \endgroup\nonfillfinish\endgroup
>+  {%
>+    \makevalueexpandable
>+    \setupverbatim
>+    \input #1
>+    \afterenvbreak
>+  }%
> }
> 
>+% @copying ... @end copying.
>+% Save the text away for @insertcopying later.
>+%
>+% We save the uninterpreted tokens, rather than creating a box.
>+% Saving the text in a box would be much easier, but then all the
>+% typesetting commands (@smallbook, font changes, etc.) have to be done
>+% beforehand -- and a) we want @copying to be done first in the source
>+% file; b) letting users define the frontmatter in as flexible order as
>+% possible is very desirable.
>+%
>+\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
>+\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
>+%
>+\def\insertcopying{%
>+  \begingroup
>+    \parindent = 0pt  % paragraph indentation looks wrong on title page
>+    \scanexp\copyingtext
>+  \endgroup
>+}
> 
> \message{defuns,}
> % @defun etc.
> 
>-% Allow user to change definition object font (\df) internally
>-\def\setdeffont #1 {\csname DEF#1\endcsname}
>-
> \newskip\defbodyindent \defbodyindent=.4in
> \newskip\defargsindent \defargsindent=50pt
>-\newskip\deftypemargin \deftypemargin=12pt
> \newskip\deflastargmargin \deflastargmargin=18pt
> 
>-\newcount\parencount
>-% define \functionparens, which makes ( and ) and & do special things.
>-% \functionparens affects the group it is contained in.
>-\def\activeparens{%
>-\catcode`$=\active \catcode`$=\active \catcode`\&=\active
>-\catcode`\[=\active \catcode`\]=\active}
>-
>-% Make control sequences which act like normal parenthesis chars.
>-\let\lparen = ( \let\rparen = )
>-
>-{\activeparens % Now, smart parens don't turn on until &foo (see \amprm)
>-
>-% Be sure that we always have a definition for `(', etc.  For example,
>-% if the fn name has parens in it, \boldbrax will not be in effect yet,
>-% so TeX would otherwise complain about undefined control sequence.
>-\global\let(=\lparen \global\let)=\rparen
>-\global\let[=\lbrack \global\let]=\rbrack
>-
>-\gdef\functionparens{\boldbrax\let&=\amprm\parencount=0 }
>-\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
>-% This is used to turn on special parens
>-% but make & act ordinary (given that it's active).
>-\gdef\boldbraxnoamp{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb\let&=\ampnr}
>-
>-% Definitions of (, ) and & used in args for functions.
>-% This is the definition of ( outside of all parentheses.
>-\gdef\oprm#1 {{\rm\char`$}#1 \bf \let(=\opnested
>-  \global\advance\parencount by 1
>-}
>-%
>-% This is the definition of ( when already inside a level of parens.
>-\gdef\opnested{\char`\(\global\advance\parencount by 1 }
>-%
>-\gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0.
>-  % also in that case restore the outer-level definition of (.
>-  \ifnum \parencount=1 {\rm \char `$}\sl \let(=\oprm \else \char `\) \fi
>-  \global\advance \parencount by -1 }
>-% If we encounter &foo, then turn on ()-hacking afterwards
>-\gdef\amprm#1 {{\rm\&#1}\let(=\oprm \let)=\clrm\ }
>-%
>-\gdef\normalparens{\boldbrax\let&=\ampnr}
>-} % End of definition inside \activeparens
>-%% These parens (in \boldbrax) actually are a little bolder than the
>-%% contained text.  This is especially needed for [ and ]
>-\def\opnr{{\sf\char`$}\global\advance\parencount by 1 }
>-\def\clnr{{\sf\char`$}\global\advance\parencount by -1 }
>-\let\ampnr = \&
>-\def\lbrb{{\bf\char`\[}}
>-\def\rbrb{{\bf\char`\]}}
>-
>-% Active &'s sneak into the index arguments, so make sure it's defined.
>-{
>-  \catcode`& = 13
>-  \global\let& = \ampnr
>-}
>-
>-% First, defname, which formats the header line itself.
>-% #1 should be the function name.
>-% #2 should be the type of definition, such as "Function".
>-
>-\def\defname #1#2{%
>-% Get the values of \leftskip and \rightskip as they were
>-% outside the @def...
>-\dimen2=\leftskip
>-\advance\dimen2 by -\defbodyindent
>-\noindent
>-\setbox0=\hbox{\hskip \deflastargmargin{\rm #2}\hskip \deftypemargin}%
>-\dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line
>-\dimen1=\hsize \advance \dimen1 by -\defargsindent %size for continuations
>-\parshape 2 0in \dimen0 \defargsindent \dimen1
>-% Now output arg 2 ("Function" or some such)
>-% ending at \deftypemargin from the right margin,
>-% but stuck inside a box of width 0 so it does not interfere with linebreaking
>-{% Adjust \hsize to exclude the ambient margins,
>-% so that \rightline will obey them.
>-\advance \hsize by -\dimen2
>-\rlap{\rightline{{\rm #2}\hskip -1.25pc }}}%
>-% Make all lines underfull and no complaints:
>-\tolerance=10000 \hbadness=10000
>-\advance\leftskip by -\defbodyindent
>-\exdentamount=\defbodyindent
>-{\df #1}\enskip        % Generate function name
>-}
>-
>-% Actually process the body of a definition
>-% #1 should be the terminating control sequence, such as \Edefun.
>-% #2 should be the "another name" control sequence, such as \defunx.
>-% #3 should be the control sequence that actually processes the header,
>-%    such as \defunheader.
>-
>-\def\defparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
>-\medbreak %
>-% Define the end token that this defining construct specifies
>-% so that it will exit this group.
>-\def#1{\endgraf\endgroup\medbreak}%
>-\def#2{\begingroup\obeylines\activeparens\spacesplit#3}%
>-\parindent=0in
>-\advance\leftskip by \defbodyindent
>-\exdentamount=\defbodyindent
>-\begingroup %
>-\catcode 61=\active % 61 is `='
>-\obeylines\activeparens\spacesplit#3}
>-
>-% #1 is the \E... control sequence to end the definition (which we define).
>-% #2 is the \...x control sequence for consecutive fns (which we define).
>-% #3 is the control sequence to call to resume processing.
>-% #4, delimited by the space, is the class name.
>-%
>-\def\defmethparsebody#1#2#3#4 {\begingroup\inENV %
>-\medbreak %
>-% Define the end token that this defining construct specifies
>-% so that it will exit this group.
>-\def#1{\endgraf\endgroup\medbreak}%
>-\def#2##1 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}}}%
>-\parindent=0in
>-\advance\leftskip by \defbodyindent
>-\exdentamount=\defbodyindent
>-\begingroup\obeylines\activeparens\spacesplit{#3{#4}}}
>-
>-% Used for @deftypemethod and @deftypeivar.
>-% #1 is the \E... control sequence to end the definition (which we define).
>-% #2 is the \...x control sequence for consecutive fns (which we define).
>-% #3 is the control sequence to call to resume processing.
>-% #4, delimited by a space, is the class name.
>-% #5 is the method's return type.
>-%
>-\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV
>-  \medbreak
>-  \def#1{\endgraf\endgroup\medbreak}%
>-  \def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}%
>-  \parindent=0in
>-  \advance\leftskip by \defbodyindent
>-  \exdentamount=\defbodyindent
>-  \begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}}
>-
>-% Used for @deftypeop.  The change from \deftypemethparsebody is an
>-% extra argument at the beginning which is the `category', instead of it
>-% being the hardwired string `Method' or `Instance Variable'.  We have
>-% to account for this both in the \...x definition and in parsing the
>-% input at hand.  Thus also need a control sequence (passed as #5) for
>-% the \E... definition to assign the category name to.
>-% 
>-\def\deftypeopparsebody#1#2#3#4#5 #6 {\begingroup\inENV
>-  \medbreak
>-  \def#1{\endgraf\endgroup\medbreak}%
>-  \def#2##1 ##2 ##3 {%
>-    \def#4{##1}%
>-    \begingroup\obeylines\activeparens\spacesplit{#3{##2}{##3}}}%
>-  \parindent=0in
>-  \advance\leftskip by \defbodyindent
>-  \exdentamount=\defbodyindent
>-  \begingroup\obeylines\activeparens\spacesplit{#3{#5}{#6}}}
>-
>-\def\defopparsebody #1#2#3#4#5 {\begingroup\inENV %
>-\medbreak %
>-% Define the end token that this defining construct specifies
>-% so that it will exit this group.
>-\def#1{\endgraf\endgroup\medbreak}%
>-\def#2##1 ##2 {\def#4{##1}%
>-\begingroup\obeylines\activeparens\spacesplit{#3{##2}}}%
>-\parindent=0in
>-\advance\leftskip by \defbodyindent
>-\exdentamount=\defbodyindent
>-\begingroup\obeylines\activeparens\spacesplit{#3{#5}}}
>-
>-% These parsing functions are similar to the preceding ones
>-% except that they do not make parens into active characters.
>-% These are used for "variables" since they have no arguments.
>-
>-\def\defvarparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
>-\medbreak %
>-% Define the end token that this defining construct specifies
>-% so that it will exit this group.
>-\def#1{\endgraf\endgroup\medbreak}%
>-\def#2{\begingroup\obeylines\spacesplit#3}%
>-\parindent=0in
>-\advance\leftskip by \defbodyindent
>-\exdentamount=\defbodyindent
>-\begingroup %
>-\catcode 61=\active %
>-\obeylines\spacesplit#3}
>-
>-% This is used for \def{tp,vr}parsebody.  It could probably be used for
>-% some of the others, too, with some judicious conditionals.
>-%
>-\def\parsebodycommon#1#2#3{%
>-  \begingroup\inENV %
>-  \medbreak %
>-  % Define the end token that this defining construct specifies
>-  % so that it will exit this group.
>-  \def#1{\endgraf\endgroup\medbreak}%
>-  \def#2##1 {\begingroup\obeylines\spacesplit{#3{##1}}}%
>+% Start the processing of @deffn:
>+\def\startdefun{%
>+  \ifnum\lastpenalty<10000
>+    \medbreak
>+  \else
>+    % If there are two @def commands in a row, we'll have a \nobreak,
>+    % which is there to keep the function description together with its
>+    % header.  But if there's nothing but headers, we need to allow a
>+    % break somewhere.  Check specifically for penalty 10002, inserted
>+    % by \defargscommonending, instead of 10000, since the sectioning
>+    % commands also insert a nobreak penalty, and we don't want to allow
>+    % a break between a section heading and a defun.
>+    % 
>+    \ifnum\lastpenalty=10002 \penalty2000 \fi
>+    %
>+    % Similarly, after a section heading, do not allow a break.
>+    % But do insert the glue.
>+    \medskip  % preceded by discardable penalty, so not a breakpoint
>+  \fi
>+  %
>   \parindent=0in
>   \advance\leftskip by \defbodyindent
>   \exdentamount=\defbodyindent
>-  \begingroup\obeylines
> }
> 
>-\def\defvrparsebody#1#2#3#4 {%
>-  \parsebodycommon{#1}{#2}{#3}%
>-  \spacesplit{#3{#4}}%
>+\def\dodefunx#1{%
>+  % First, check whether we are in the right environment:
>+  \checkenv#1%
>+  %
>+  % As above, allow line break if we have multiple x headers in a row.
>+  % It's not a great place, though.
>+  \ifnum\lastpenalty=10002 \penalty3000 \fi
>+  %
>+  % And now, it's time to reuse the body of the original defun:
>+  \expandafter\gobbledefun#1%
> }
>+\def\gobbledefun#1\startdefun{}
> 
>-% This loses on `@deftp {Data Type} {struct termios}' -- it thinks the
>-% type is just `struct', because we lose the braces in `{struct
>-% termios}' when \spacesplit reads its undelimited argument.  Sigh.
>-% \let\deftpparsebody=\defvrparsebody
>+% \printdefunline \deffnheader{text}
> %
>-% So, to get around this, we put \empty in with the type name.  That
>-% way, TeX won't find exactly `{...}' as an undelimited argument, and
>-% won't strip off the braces.
>-%
>-\def\deftpparsebody #1#2#3#4 {%
>-  \parsebodycommon{#1}{#2}{#3}%
>-  \spacesplit{\parsetpheaderline{#3{#4}}}\empty
>+\def\printdefunline#1#2{%
>+  \begingroup
>+    % call \deffnheader:
>+    #1#2 \endheader
>+    % common ending:
>+    \interlinepenalty = 10000
>+    \advance\rightskip by 0pt plus 1fil
>+    \endgraf
>+    \nobreak\vskip -\parskip
>+    \penalty 10002  % signal to \startdefun and \dodefunx
>+    % Some of the @defun-type tags do not enable magic parentheses,
>+    % rendering the following check redundant.  But we don't optimize.
>+    \checkparencounts
>+  \endgroup
> }
> 
>-% Fine, but then we have to eventually remove the \empty *and* the
>-% braces (if any).  That's what this does.
>-%
>-\def\removeemptybraces\empty#1\relax{#1}
>+\def\Edefun{\endgraf\medbreak}
> 
>-% After \spacesplit has done its work, this is called -- #1 is the final
>-% thing to call, #2 the type name (which starts with \empty), and #3
>-% (which might be empty) the arguments.
>+% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
>+% the only thing remainnig is to define \deffnheader.
> %
>-\def\parsetpheaderline#1#2#3{%
>-  #1{\removeemptybraces#2\relax}{#3}%
>-}%
>-
>-\def\defopvarparsebody #1#2#3#4#5 {\begingroup\inENV %
>-\medbreak %
>-% Define the end token that this defining construct specifies
>-% so that it will exit this group.
>-\def#1{\endgraf\endgroup\medbreak}%
>-\def#2##1 ##2 {\def#4{##1}%
>-\begingroup\obeylines\spacesplit{#3{##2}}}%
>-\parindent=0in
>-\advance\leftskip by \defbodyindent
>-\exdentamount=\defbodyindent
>-\begingroup\obeylines\spacesplit{#3{#5}}}
>-
>-% Split up #2 at the first space token.
>-% call #1 with two arguments:
>-%  the first is all of #2 before the space token,
>-%  the second is all of #2 after that space token.
>-% If #2 contains no space token, all of it is passed as the first arg
>-% and the second is passed as empty.
>-
>-{\obeylines
>-\gdef\spacesplit#1#2^^M{\endgroup\spacesplitfoo{#1}#2 \relax\spacesplitfoo}%
>-\long\gdef\spacesplitfoo#1#2 #3#4\spacesplitfoo{%
>-\ifx\relax #3%
>-#1{#2}{}\else #1{#2}{#3#4}\fi}}
>-
>-% So much for the things common to all kinds of definitions.
>-
>-% Define @defun.
>-
>-% First, define the processing that is wanted for arguments of \defun
>-% Use this to expand the args and terminate the paragraph they make up
>-
>-\def\defunargs#1{\functionparens \sl
>-% Expand, preventing hyphenation at `-' chars.
>-% Note that groups don't affect changes in \hyphenchar.
>-% Set the font temporarily and use \font in case \setfont made \tensl a macro.
>-{\tensl\hyphenchar\font=0}%
>-#1%
>-{\tensl\hyphenchar\font=45}%
>-\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
>-\interlinepenalty=10000
>-\advance\rightskip by 0pt plus 1fil
>-\endgraf\nobreak\vskip -\parskip\nobreak
>-}
>-
>-\def\deftypefunargs #1{%
>-% Expand, preventing hyphenation at `-' chars.
>-% Note that groups don't affect changes in \hyphenchar.
>-% Use \boldbraxnoamp, not \functionparens, so that & is not special.
>-\boldbraxnoamp
>-\tclose{#1}% avoid \code because of side effects on active chars
>-\interlinepenalty=10000
>-\advance\rightskip by 0pt plus 1fil
>-\endgraf\nobreak\vskip -\parskip\nobreak
>-}
>-
>-% Do complete processing of one @defun or @defunx line already parsed.
>-
>-% @deffn Command forward-char nchars
>-
>-\def\deffn{\defmethparsebody\Edeffn\deffnx\deffnheader}
>-
>-\def\deffnheader #1#2#3{\doind {fn}{\code{#2}}%
>-\begingroup\defname {#2}{#1}\defunargs{#3}\endgroup %
>-\catcode 61=\other % Turn off change made in \defparsebody
>-}
>-
>-% @defun == @deffn Function
>-
>-\def\defun{\defparsebody\Edefun\defunx\defunheader}
>-
>-\def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
>-\begingroup\defname {#1}{\putwordDeffunc}%
>-\defunargs {#2}\endgroup %
>-\catcode 61=\other % Turn off change made in \defparsebody
>-}
>-
>-% @deftypefun int foobar (int @var{foo}, float @var{bar})
>-
>-\def\deftypefun{\defparsebody\Edeftypefun\deftypefunx\deftypefunheader}
>-
>-% #1 is the data type.  #2 is the name and args.
>-\def\deftypefunheader #1#2{\deftypefunheaderx{#1}#2 \relax}
>-% #1 is the data type, #2 the name, #3 the args.
>-\def\deftypefunheaderx #1#2 #3\relax{%
>-\doind {fn}{\code{#2}}% Make entry in function index
>-\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypefun}%
>-\deftypefunargs {#3}\endgroup %
>-\catcode 61=\other % Turn off change made in \defparsebody
>-}
>-
>-% @deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar})
>-
>-\def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
>-
>-% \defheaderxcond#1\relax$.$
>-% puts #1 in @code, followed by a space, but does nothing if #1 is null.
>-\def\defheaderxcond#1#2$.${\ifx#1\relax\else\code{#1#2} \fi}
>-
>-% #1 is the classification.  #2 is the data type.  #3 is the name and args.
>-\def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}
>-% #1 is the classification, #2 the data type, #3 the name, #4 the args.
>-\def\deftypefnheaderx #1#2#3 #4\relax{%
>-\doind {fn}{\code{#3}}% Make entry in function index
>-\begingroup
>-\normalparens % notably, turn off `&' magic, which prevents
>-%               at least some C++ text from working
>-\defname {\defheaderxcond#2\relax$.$#3}{#1}%
>-\deftypefunargs {#4}\endgroup %
>-\catcode 61=\other % Turn off change made in \defparsebody
>+\def\makedefun#1{%
>+  \expandafter\let\csname E#1\endcsname = \Edefun
>+  \edef\temp{\noexpand\domakedefun
>+    \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
>+  \temp
> }
> 
>-% @defmac == @deffn Macro
>-
>-\def\defmac{\defparsebody\Edefmac\defmacx\defmacheader}
>-
>-\def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
>-\begingroup\defname {#1}{\putwordDefmac}%
>-\defunargs {#2}\endgroup %
>-\catcode 61=\other % Turn off change made in \defparsebody
>+% \domakedefun \deffn \deffnx \deffnheader
>+%
>+% Define \deffn and \deffnx, without parameters.
>+% \deffnheader has to be defined explicitly.
>+%
>+\def\domakedefun#1#2#3{%
>+  \envdef#1{%
>+    \startdefun
>+    \parseargusing\activeparens{\printdefunline#3}%
>+  }%
>+  \def#2{\dodefunx#1}%
>+  \def#3%
> }
> 
>-% @defspec == @deffn Special Form
>+%%% Untyped functions:
> 
>-\def\defspec{\defparsebody\Edefspec\defspecx\defspecheader}
>+% @deffn category name args
>+\makedefun{deffn}{\deffngeneral{}}
> 
>-\def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
>-\begingroup\defname {#1}{\putwordDefspec}%
>-\defunargs {#2}\endgroup %
>-\catcode 61=\other % Turn off change made in \defparsebody
>-}
>+% @deffn category class name args
>+\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
> 
>-% @defop CATEGORY CLASS OPERATION ARG...
>-%
>-\def\defop #1 {\def\defoptype{#1}%
>-\defopparsebody\Edefop\defopx\defopheader\defoptype}
>-%
>-\def\defopheader#1#2#3{%
>-\dosubind {fn}{\code{#2}}{\putwordon\ #1}% Make entry in function index
>-\begingroup\defname {#2}{\defoptype\ \putwordon\ #1}%
>-\defunargs {#3}\endgroup %
>-}
>+% \defopon {category on}class name args
>+\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
> 
>-% @deftypeop CATEGORY CLASS TYPE OPERATION ARG...
>+% \deffngeneral {subind}category name args
> %
>-\def\deftypeop #1 {\def\deftypeopcategory{#1}%
>-  \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader
>-                       \deftypeopcategory}
>-%
>-% #1 is the class name, #2 the data type, #3 the operation name, #4 the args.
>-\def\deftypeopheader#1#2#3#4{%
>-  \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
>-  \begingroup
>-    \defname{\defheaderxcond#2\relax$.$#3}
>-            {\deftypeopcategory\ \putwordon\ \code{#1}}%
>-    \deftypefunargs{#4}%
>-  \endgroup
>+\def\deffngeneral#1#2 #3 #4\endheader{%
>+  % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
>+  \dosubind{fn}{\code{#3}}{#1}%
>+  \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
> }
> 
>-% @deftypemethod CLASS TYPE METHOD ARG...
>-%
>-\def\deftypemethod{%
>-  \deftypemethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader}
>-%
>-% #1 is the class name, #2 the data type, #3 the method name, #4 the args.
>-\def\deftypemethodheader#1#2#3#4{%
>-  \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
>-  \begingroup
>-    \defname{\defheaderxcond#2\relax$.$#3}{\putwordMethodon\ \code{#1}}%
>-    \deftypefunargs{#4}%
>-  \endgroup
>-}
>+%%% Typed functions:
> 
>-% @deftypeivar CLASS TYPE VARNAME
>-%
>-\def\deftypeivar{%
>-  \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader}
>-%
>-% #1 is the class name, #2 the data type, #3 the variable name.
>-\def\deftypeivarheader#1#2#3{%
>-  \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
>-  \begingroup
>-    \defname{\defheaderxcond#2\relax$.$#3}
>-            {\putwordInstanceVariableof\ \code{#1}}%
>-    \defvarargs{#3}%
>-  \endgroup
>-}
>+% @deftypefn category type name args
>+\makedefun{deftypefn}{\deftypefngeneral{}}
> 
>-% @defmethod == @defop Method
>-%
>-\def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}
>+% @deftypeop category class type name args
>+\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
>+
>+% \deftypeopon {category on}class type name args
>+\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
>+
>+% \deftypefngeneral {subind}category type name args
> %
>-% #1 is the class name, #2 the method name, #3 the args.
>-\def\defmethodheader#1#2#3{%
>-  \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% entry in function index
>-  \begingroup
>-    \defname{#2}{\putwordMethodon\ \code{#1}}%
>-    \defunargs{#3}%
>-  \endgroup
>+\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
>+  \dosubind{fn}{\code{#4}}{#1}%
>+  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
> }
> 
>-% @defcv {Class Option} foo-class foo-flag
>+%%% Typed variables:
> 
>-\def\defcv #1 {\def\defcvtype{#1}%
>-\defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype}
>+% @deftypevr category type var args
>+\makedefun{deftypevr}{\deftypecvgeneral{}}
> 
>-\def\defcvarheader #1#2#3{%
>-\dosubind {vr}{\code{#2}}{\putwordof\ #1}% Make entry in var index
>-\begingroup\defname {#2}{\defcvtype\ \putwordof\ #1}%
>-\defvarargs {#3}\endgroup %
>-}
>+% @deftypecv category class type var args
>+\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
> 
>-% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME
>-%
>-\def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
>+% \deftypecvof {category of}class type var args
>+\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
>+
>+% \deftypecvgeneral {subind}category type var args
> %
>-\def\defivarheader#1#2#3{%
>-  \dosubind {vr}{\code{#2}}{\putwordof\ #1}% entry in var index
>-  \begingroup
>-    \defname{#2}{\putwordInstanceVariableof\ #1}%
>-    \defvarargs{#3}%
>-  \endgroup
>+\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
>+  \dosubind{vr}{\code{#4}}{#1}%
>+  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
> }
> 
>-% @defvar
>-% First, define the processing that is wanted for arguments of @defvar.
>-% This is actually simple: just print them in roman.
>-% This must expand the args and terminate the paragraph they make up
>-\def\defvarargs #1{\normalparens #1%
>-\interlinepenalty=10000
>-\endgraf\nobreak\vskip -\parskip\nobreak}
>-
>-% @defvr Counter foo-count
>-
>-\def\defvr{\defvrparsebody\Edefvr\defvrx\defvrheader}
>+%%% Untyped variables:
> 
>-\def\defvrheader #1#2#3{\doind {vr}{\code{#2}}%
>-\begingroup\defname {#2}{#1}\defvarargs{#3}\endgroup}
>+% @defvr category var args
>+\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
> 
>-% @defvar == @defvr Variable
>+% @defcv category class var args
>+\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
> 
>-\def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader}
>+% \defcvof {category of}class var args
>+\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
> 
>-\def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
>-\begingroup\defname {#1}{\putwordDefvar}%
>-\defvarargs {#2}\endgroup %
>+%%% Type:
>+% @deftp category name args
>+\makedefun{deftp}#1 #2 #3\endheader{%
>+  \doind{tp}{\code{#2}}%
>+  \defname{#1}{}{#2}\defunargs{#3\unskip}%
> }
> 
>-% @defopt == @defvr {User Option}
>+% Remaining @defun-like shortcuts:
>+\makedefun{defun}{\deffnheader{\putwordDeffunc} }
>+\makedefun{defmac}{\deffnheader{\putwordDefmac} }
>+\makedefun{defspec}{\deffnheader{\putwordDefspec} }
>+\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
>+\makedefun{defvar}{\defvrheader{\putwordDefvar} }
>+\makedefun{defopt}{\defvrheader{\putwordDefopt} }
>+\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
>+\makedefun{defmethod}{\defopon\putwordMethodon}
>+\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
>+\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
>+\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
> 
>-\def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader}
>-
>-\def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
>-\begingroup\defname {#1}{\putwordDefopt}%
>-\defvarargs {#2}\endgroup %
>+% \defname, which formats the name of the @def (not the args).
>+% #1 is the category, such as "Function".
>+% #2 is the return type, if any.
>+% #3 is the function name.
>+%
>+% We are followed by (but not passed) the arguments, if any.
>+%
>+\def\defname#1#2#3{%
>+  % Get the values of \leftskip and \rightskip as they were outside the @def...
>+  \advance\leftskip by -\defbodyindent
>+  %
>+  % How we'll format the type name.  Putting it in brackets helps
>+  % distinguish it from the body text that may end up on the next line
>+  % just below it.
>+  \def\temp{#1}%
>+  \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
>+  %
>+  % Figure out line sizes for the paragraph shape.
>+  % The first line needs space for \box0; but if \rightskip is nonzero,
>+  % we need only space for the part of \box0 which exceeds it:
>+  \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
>+  % The continuations:
>+  \dimen2=\hsize  \advance\dimen2 by -\defargsindent
>+  % (plain.tex says that \dimen1 should be used only as global.)
>+  \parshape 2 0in \dimen0 \defargsindent \dimen2
>+  %
>+  % Put the type name to the right margin.
>+  \noindent
>+  \hbox to 0pt{%
>+    \hfil\box0 \kern-\hsize
>+    % \hsize has to be shortened this way:
>+    \kern\leftskip
>+    % Intentionally do not respect \rightskip, since we need the space.
>+  }%
>+  %
>+  % Allow all lines to be underfull without complaint:
>+  \tolerance=10000 \hbadness=10000
>+  \exdentamount=\defbodyindent
>+  {%
>+    % defun fonts. We use typewriter by default (used to be bold) because:
>+    % . we're printing identifiers, they should be in tt in principle.
>+    % . in languages with many accents, such as Czech or French, it's
>+    %   common to leave accents off identifiers.  The result looks ok in
>+    %   tt, but exceedingly strange in rm.
>+    % . we don't want -- and --- to be treated as ligatures.
>+    % . this still does not fix the ?` and !` ligatures, but so far no
>+    %   one has made identifiers using them :).
>+    \df \tt
>+    \def\temp{#2}% return value type
>+    \ifx\temp\empty\else \tclose{\temp} \fi
>+    #3% output function name
>+  }%
>+  {\rm\enskip}% hskip 0.5 em of \tenrm
>+  %
>+  \boldbrax
>+  % arguments will be output next, if any.
> }
> 
>-% @deftypevar int foobar
>-
>-\def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader}
>+% Print arguments in slanted roman (not ttsl), inconsistently with using
>+% tt for the name.  This is because literal text is sometimes needed in
>+% the argument list (groff manual), and ttsl and tt are not very
>+% distinguishable.  Prevent hyphenation at `-' chars.
>+%
>+\def\defunargs#1{%
>+  % use sl by default (not ttsl),
>+  % tt for the names.
>+  \df \sl \hyphenchar\font=0
>+  %
>+  % On the other hand, if an argument has two dashes (for instance), we
>+  % want a way to get ttsl.  Let's try @var for that.
>+  \let\var=\ttslanted
>+  #1%
>+  \sl\hyphenchar\font=45
>+}
> 
>-% #1 is the data type.  #2 is the name, perhaps followed by text that
>-% is actually part of the data type, which should not be put into the index.
>-\def\deftypevarheader #1#2{%
>-\dovarind#2 \relax% Make entry in variables index
>-\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypevar}%
>-\interlinepenalty=10000
>-\endgraf\nobreak\vskip -\parskip\nobreak
>-\endgroup}
>-\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}}
>+% We want ()&[] to print specially on the defun line.
>+%
>+\def\activeparens{%
>+  \catcode`$=\active \catcode`$=\active
>+  \catcode`\[=\active \catcode`\]=\active
>+  \catcode`\&=\active
>+}
> 
>-% @deftypevr {Global Flag} int enable
>+% Make control sequences which act like normal parenthesis chars.
>+\let\lparen = ( \let\rparen = )
> 
>-\def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
>+% Be sure that we always have a definition for `(', etc.  For example,
>+% if the fn name has parens in it, \boldbrax will not be in effect yet,
>+% so TeX would otherwise complain about undefined control sequence.
>+{
>+  \activeparens
>+  \global\let(=\lparen \global\let)=\rparen
>+  \global\let[=\lbrack \global\let]=\rbrack
>+  \global\let& = \&
> 
>-\def\deftypevrheader #1#2#3{\dovarind#3 \relax%
>-\begingroup\defname {\defheaderxcond#2\relax$.$#3}{#1}
>-\interlinepenalty=10000
>-\endgraf\nobreak\vskip -\parskip\nobreak
>-\endgroup}
>+  \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
>+  \gdef\magicamp{\let&=\amprm}
>+}
> 
>-% Now define @deftp
>-% Args are printed in bold, a slight difference from @defvar.
>+\newcount\parencount
> 
>-\def\deftpargs #1{\bf \defvarargs{#1}}
>+% If we encounter &foo, then turn on ()-hacking afterwards
>+\newif\ifampseen
>+\def\amprm#1 {\ampseentrue{\bf\&#1 }}
> 
>-% @deftp Class window height width ...
>+\def\parenfont{%
>+  \ifampseen
>+    % At the first level, print parens in roman,
>+    % otherwise use the default font.
>+    \ifnum \parencount=1 \rm \fi
>+  \else
>+    % The \sf parens (in \boldbrax) actually are a little bolder than
>+    % the contained text.  This is especially needed for [ and ] .
>+    \sf
>+  \fi
>+}
>+\def\infirstlevel#1{%
>+  \ifampseen
>+    \ifnum\parencount=1
>+      #1%
>+    \fi
>+  \fi
>+}
>+\def\bfafterword#1 {#1 \bf}
> 
>-\def\deftp{\deftpparsebody\Edeftp\deftpx\deftpheader}
>+\def\opnr{%
>+  \global\advance\parencount by 1
>+  {\parenfont(}%
>+  \infirstlevel \bfafterword
>+}
>+\def\clnr{%
>+  {\parenfont)}%
>+  \infirstlevel \sl
>+  \global\advance\parencount by -1
>+}
> 
>-\def\deftpheader #1#2#3{\doind {tp}{\code{#2}}%
>-\begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup}
>+\newcount\brackcount
>+\def\lbrb{%
>+  \global\advance\brackcount by 1
>+  {\bf[}%
>+}
>+\def\rbrb{%
>+  {\bf]}%
>+  \global\advance\brackcount by -1
>+}
> 
>-% These definitions are used if you use @defunx (etc.)
>-% anywhere other than immediately after a @defun or @defunx.
>-% 
>-\def\defcvx#1 {\errmessage{@defcvx in invalid context}}
>-\def\deffnx#1 {\errmessage{@deffnx in invalid context}}
>-\def\defivarx#1 {\errmessage{@defivarx in invalid context}}
>-\def\defmacx#1 {\errmessage{@defmacx in invalid context}}
>-\def\defmethodx#1 {\errmessage{@defmethodx in invalid context}}
>-\def\defoptx #1 {\errmessage{@defoptx in invalid context}}
>-\def\defopx#1 {\errmessage{@defopx in invalid context}}
>-\def\defspecx#1 {\errmessage{@defspecx in invalid context}}
>-\def\deftpx#1 {\errmessage{@deftpx in invalid context}}
>-\def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}}
>-\def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}}
>-\def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}}
>-\def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}}
>-\def\deftypeopx#1 {\errmessage{@deftypeopx in invalid context}}
>-\def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}}
>-\def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}}
>-\def\defunx#1 {\errmessage{@defunx in invalid context}}
>-\def\defvarx#1 {\errmessage{@defvarx in invalid context}}
>-\def\defvrx#1 {\errmessage{@defvrx in invalid context}}
>+\def\checkparencounts{%
>+  \ifnum\parencount=0 \else \badparencount \fi
>+  \ifnum\brackcount=0 \else \badbrackcount \fi
>+}
>+\def\badparencount{%
>+  \errmessage{Unbalanced parentheses in @def}%
>+  \global\parencount=0
>+}
>+\def\badbrackcount{%
>+  \errmessage{Unbalanced square braces in @def}%
>+  \global\brackcount=0
>+}
> 
> 
> \message{macros,}
>@@ -5160,42 +5894,68 @@
> % To do this right we need a feature of e-TeX, \scantokens,
> % which we arrange to emulate with a temporary file in ordinary TeX.
> \ifx\eTeXversion\undefined
>- \newwrite\macscribble
>- \def\scanmacro#1{%
>-   \begingroup \newlinechar`\^^M
>-   % Undo catcode changes of \startcontents and \doprintindex
>-   \catcode`\@=0 \catcode`\\=12 \escapechar=`\@
>-   % Append \endinput to make sure that TeX does not see the ending newline.
>-   \toks0={#1\endinput}%
>-   \immediate\openout\macscribble=\jobname.tmp
>-   \immediate\write\macscribble{\the\toks0}%
>-   \immediate\closeout\macscribble
>-   \let\xeatspaces\eatspaces
>-   \input \jobname.tmp
>-   \endgroup
>-}
>-\else
>-\def\scanmacro#1{%
>-\begingroup \newlinechar`\^^M
>-% Undo catcode changes of \startcontents and \doprintindex
>-\catcode`\@=0 \catcode`\\=12 \escapechar=`\@
>-\let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup}
>+  \newwrite\macscribble
>+  \def\scantokens#1{%
>+    \toks0={#1}%
>+    \immediate\openout\macscribble=\jobname.tmp
>+    \immediate\write\macscribble{\the\toks0}%
>+    \immediate\closeout\macscribble
>+    \input \jobname.tmp
>+  }
> \fi
> 
>+\def\scanmacro#1{%
>+  \begingroup
>+    \newlinechar`\^^M
>+    \let\xeatspaces\eatspaces
>+    % Undo catcode changes of \startcontents and \doprintindex
>+    % When called from @insertcopying or (short)caption, we need active
>+    % backslash to get it printed correctly.  Previously, we had
>+    % \catcode`\\=\other instead.  We'll see whether a problem appears
>+    % with macro expansion.				--kasal, 19aug04
>+    \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
>+    % ... and \example
>+    \spaceisspace
>+    %
>+    % Append \endinput to make sure that TeX does not see the ending newline.
>+    % I've verified that it is necessary both for e-TeX and for ordinary TeX
>+    %							--kasal, 29nov03
>+    \scantokens{#1\endinput}%
>+  \endgroup
>+}
>+
>+\def\scanexp#1{%
>+  \edef\temp{\noexpand\scanmacro{#1}}%
>+  \temp
>+}
>+
> \newcount\paramno   % Count of parameters
> \newtoks\macname    % Macro name
> \newif\ifrecursive  % Is it recursive?
>-\def\macrolist{}    % List of all defined macros in the form
>-                    % \do\macro1\do\macro2...
>+
>+% List of all defined macros in the form
>+%    \definedummyword\macro1\definedummyword\macro2...
>+% Currently is also contains all @aliases; the list can be split
>+% if there is a need.
>+\def\macrolist{}
>+
>+% Add the macro to \macrolist
>+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
>+\def\addtomacrolistxxx#1{%
>+     \toks0 = \expandafter{\macrolist\definedummyword#1}%
>+     \xdef\macrolist{\the\toks0}%
>+}
> 
> % Utility routines.
>-% Thisdoes \let #1 = #2, except with \csnames.
>+% This does \let #1 = #2, with \csnames; that is,
>+%   \let \csname#1\endcsname = \csname#2\endcsname
>+% (except of course we have to play expansion games).
>+% 
> \def\cslet#1#2{%
>-\expandafter\expandafter
>-\expandafter\let
>-\expandafter\expandafter
>-\csname#1\endcsname
>-\csname#2\endcsname}
>+  \expandafter\let
>+  \csname#1\expandafter\endcsname
>+  \csname#2\endcsname
>+}
> 
> % Trim leading and trailing spaces off a string.
> % Concepts from aro-bend problem 15 (see CTAN).
>@@ -5208,7 +5968,7 @@
> }
> 
> % Trim a single trailing ^^M off a string.
>-{\catcode`\^^M=12\catcode`\Q=3%
>+{\catcode`\^^M=\other \catcode`\Q=3%
> \gdef\eatcr #1{\eatcra #1Q^^MQ}%
> \gdef\eatcra#1^^MQ{\eatcrb#1Q}%
> \gdef\eatcrb#1Q#2Q{#1}%
>@@ -5222,30 +5982,36 @@
> % done by  making ^^M (\endlinechar) catcode 12 when reading the macro
> % body, and then making it the \newlinechar in \scanmacro.
> 
>+\def\scanctxt{%
>+  \catcode`\"=\other
>+  \catcode`\+=\other
>+  \catcode`\<=\other
>+  \catcode`\>=\other
>+  \catcode`\@=\other
>+  \catcode`\^=\other
>+  \catcode`\_=\other
>+  \catcode`\|=\other
>+  \catcode`\~=\other
>+}
>+
>+\def\scanargctxt{%
>+  \scanctxt
>+  \catcode`\\=\other
>+  \catcode`\^^M=\other
>+}
>+
> \def\macrobodyctxt{%
>-  \catcode`\~=12
>-  \catcode`\^=12
>-  \catcode`\_=12
>-  \catcode`\|=12
>-  \catcode`\<=12
>-  \catcode`\>=12
>-  \catcode`\+=12
>-  \catcode`\{=12
>-  \catcode`\}=12
>-  \catcode`\@=12
>-  \catcode`\^^M=12
>-  \usembodybackslash}
>+  \scanctxt
>+  \catcode`\{=\other
>+  \catcode`\}=\other
>+  \catcode`\^^M=\other
>+  \usembodybackslash
>+}
> 
> \def\macroargctxt{%
>-  \catcode`\~=12
>-  \catcode`\^=12
>-  \catcode`\_=12
>-  \catcode`\|=12
>-  \catcode`\<=12
>-  \catcode`\>=12
>-  \catcode`\+=12
>-  \catcode`\@=12
>-  \catcode`\\=12}
>+  \scanctxt
>+  \catcode`\\=\other
>+}
> 
> % \mbodybackslash is the definition of \ in @macro bodies.
> % It maps \foo\ => \csname macarg.foo\endcsname => #N
>@@ -5273,45 +6039,42 @@
>      \message{Warning: redefining \the\macname}%
>   \else
>      \expandafter\ifx\csname \the\macname\endcsname \relax
>-     \else \errmessage{The name \the\macname\space is reserved}\fi
>+     \else \errmessage{Macro name \the\macname\space already defined}\fi
>      \global\cslet{macsave.\the\macname}{\the\macname}%
>      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
>-     % Add the macroname to \macrolist
>-     \toks0 = \expandafter{\macrolist\do}%
>-     \xdef\macrolist{\the\toks0
>-       \expandafter\noexpand\csname\the\macname\endcsname}%
>+     \addtomacrolist{\the\macname}%
>   \fi
>   \begingroup \macrobodyctxt
>   \ifrecursive \expandafter\parsermacbody
>   \else \expandafter\parsemacbody
>   \fi}
> 
>-\def\unmacro{\parsearg\unmacroxxx}
>-\def\unmacroxxx#1{%
>+\parseargdef\unmacro{%
>   \if1\csname ismacro.#1\endcsname
>     \global\cslet{#1}{macsave.#1}%
>     \global\expandafter\let \csname ismacro.#1\endcsname=0%
>-    % Remove the macro name from \macrolist
>+    % Remove the macro name from \macrolist:
>     \begingroup
>-      \edef\tempa{\expandafter\noexpand\csname#1\endcsname}%
>-      \def\do##1{%
>-        \def\tempb{##1}%
>-        \ifx\tempa\tempb
>-          % remove this
>-        \else
>-          \toks0 = \expandafter{\newmacrolist\do}%
>-          \edef\newmacrolist{\the\toks0\expandafter\noexpand\tempa}%
>-        \fi}%
>-      \def\newmacrolist{}%
>-      % Execute macro list to define \newmacrolist
>-      \macrolist
>-      \global\let\macrolist\newmacrolist
>+      \expandafter\let\csname#1\endcsname \relax
>+      \let\definedummyword\unmacrodo
>+      \xdef\macrolist{\macrolist}%
>     \endgroup
>   \else
>     \errmessage{Macro #1 not defined}%
>   \fi
> }
> 
>+% Called by \do from \dounmacro on each macro.  The idea is to omit any
>+% macro definitions that have been changed to \relax.
>+%
>+\def\unmacrodo#1{%
>+  \ifx #1\relax
>+    % remove this
>+  \else
>+    \noexpand\definedummyword \noexpand#1%
>+  \fi
>+}
>+
> % This makes use of the obscure feature that if the last token of a
> % <parameter list> is #, then the preceding argument is delimited by
> % an opening brace, and that opening brace is not consumed.
>@@ -5421,31 +6184,29 @@
> % {.  If so it reads up to the closing }, if not, it reads the whole
> % line.  Whatever was read is then fed to the next control sequence
> % as an argument (by \parsebrace or \parsearg)
>-\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
>+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
> \def\braceorlinexxx{%
>   \ifx\nchar\bgroup\else
>     \expandafter\parsearg
>-  \fi \next}
>-
>-% We mant to disable all macros during \shipout so that they are not
>-% expanded by \write.
>-\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
>-  \edef\next{\macrolist}\expandafter\endgroup\next}
>+  \fi \macnamexxx}
> 
> 
> % @alias.
> % We need some trickery to remove the optional spaces around the equal
> % sign.  Just make them active and then expand them all to nothing.
>-\def\alias{\begingroup\obeyspaces\parsearg\aliasxxx}
>+\def\alias{\parseargusing\obeyspaces\aliasxxx}
> \def\aliasxxx #1{\aliasyyy#1\relax}
>-\def\aliasyyy #1=#2\relax{\ignoreactivespaces
>-\edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=%
>-           \expandafter\noexpand\csname#2\endcsname}%
>-\expandafter\endgroup\next}
>+\def\aliasyyy #1=#2\relax{%
>+  {%
>+    \expandafter\let\obeyedspace=\empty
>+    \addtomacrolist{#1}%
>+    \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
>+  }%
>+  \next
>+}
> 
> 
> \message{cross references,}
>-% @xref etc.
> 
> \newwrite\auxfile
> 
>@@ -5457,56 +6218,68 @@
> \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
>   node \samp{\ignorespaces#1{}}}
> 
>-% @node's job is to define \lastnode.
>-\def\node{\ENVcheck\parsearg\nodezzz}
>-\def\nodezzz#1{\nodexxx [#1,]}
>-\def\nodexxx[#1,#2]{\gdef\lastnode{#1}}
>+% @node's only job in TeX is to define \lastnode, which is used in
>+% cross-references.  The @node line might or might not have commas, and
>+% might or might not have spaces before the first comma, like:
>+% @node foo , bar , ...
>+% We don't want such trailing spaces in the node name.
>+%
>+\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
>+%
>+% also remove a trailing comma, in case of something like this:
>+% @node Help-Cross,  ,  , Cross-refs
>+\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
>+\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
>+
> \let\nwnode=\node
>-\let\lastnode=\relax
>+\let\lastnode=\empty
> 
>-% The sectioning commands (@chapter, etc.) call these.
>-\def\donoderef{%
>-  \ifx\lastnode\relax\else
>-    \expandafter\expandafter\expandafter\setref{\lastnode}%
>-      {Ysectionnumberandtype}%
>-    \global\let\lastnode=\relax
>-  \fi
>-}
>-\def\unnumbnoderef{%
>-  \ifx\lastnode\relax\else
>-    \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}%
>-    \global\let\lastnode=\relax
>-  \fi
>-}
>-\def\appendixnoderef{%
>-  \ifx\lastnode\relax\else
>-    \expandafter\expandafter\expandafter\setref{\lastnode}%
>-      {Yappendixletterandtype}%
>-    \global\let\lastnode=\relax
>+% Write a cross-reference definition for the current node.  #1 is the
>+% type (Ynumbered, Yappendix, Ynothing).
>+%
>+\def\donoderef#1{%
>+  \ifx\lastnode\empty\else
>+    \setref{\lastnode}{#1}%
>+    \global\let\lastnode=\empty
>   \fi
> }
> 
>-
> % @anchor{NAME} -- define xref target at arbitrary point.
> %
> \newcount\savesfregister
>-\gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
>-\gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
>-\gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
>-
>-% \setref{NAME}{SNT} defines a cross-reference point NAME, namely
>-% NAME-title, NAME-pg, and NAME-SNT.  Called from \foonoderef.  We have
>-% to set \indexdummies so commands such as @code in a section title
>-% aren't expanded.  It would be nicer not to expand the titles in the
>-% first place, but there's so many layers that that is hard to do.
> %
>-\def\setref#1#2{{%
>-  \indexdummies
>+\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
>+\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
>+\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
>+
>+% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
>+% anchor), which consists of three parts:
>+% 1) NAME-title - the current sectioning name taken from \thissection,
>+%                 or the anchor name.
>+% 2) NAME-snt   - section number and type, passed as the SNT arg, or
>+%                 empty for anchors.
>+% 3) NAME-pg    - the page number.
>+%
>+% This is called from \donoderef, \anchor, and \dofloat.  In the case of
>+% floats, there is an additional part, which is not written here:
>+% 4) NAME-lof   - the text as it should appear in a @listoffloats.
>+%
>+\def\setref#1#2{%
>   \pdfmkdest{#1}%
>-  \dosetq{#1-title}{Ytitle}%
>-  \dosetq{#1-pg}{Ypagenumber}%
>-  \dosetq{#1-snt}{#2}%
>-}}
>+  \iflinks
>+    {%
>+      \atdummies  % preserve commands, but don't expand them
>+      \edef\writexrdef##1##2{%
>+	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
>+	  ##1}{##2}}% these are parameters of \writexrdef
>+      }%
>+      \toks0 = \expandafter{\thissection}%
>+      \immediate \writexrdef{title}{\the\toks0 }%
>+      \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
>+      \writexrdef{pg}{\folio}% will be written later, during \shipout
>+    }%
>+  \fi
>+}
> 
> % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
> % the node name, #2 the name of the Info cross-reference, #3 the printed
>@@ -5519,137 +6292,159 @@
> \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
>   \unsepspaces
>   \def\printedmanual{\ignorespaces #5}%
>-  \def\printednodename{\ignorespaces #3}%
>-  \setbox1=\hbox{\printedmanual}%
>-  \setbox0=\hbox{\printednodename}%
>+  \def\printedrefname{\ignorespaces #3}%
>+  \setbox1=\hbox{\printedmanual\unskip}%
>+  \setbox0=\hbox{\printedrefname\unskip}%
>   \ifdim \wd0 = 0pt
>     % No printed node name was explicitly given.
>     \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
>       % Use the node name inside the square brackets.
>-      \def\printednodename{\ignorespaces #1}%
>+      \def\printedrefname{\ignorespaces #1}%
>     \else
>       % Use the actual chapter/section title appear inside
>       % the square brackets.  Use the real section title if we have it.
>       \ifdim \wd1 > 0pt
>         % It is in another manual, so we don't have it.
>-        \def\printednodename{\ignorespaces #1}%
>+        \def\printedrefname{\ignorespaces #1}%
>       \else
>         \ifhavexrefs
>           % We know the real title if we have the xref values.
>-          \def\printednodename{\refx{#1-title}{}}%
>+          \def\printedrefname{\refx{#1-title}{}}%
>         \else
>           % Otherwise just copy the Info node name.
>-          \def\printednodename{\ignorespaces #1}%
>+          \def\printedrefname{\ignorespaces #1}%
>         \fi%
>       \fi
>     \fi
>   \fi
>   %
>-  % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
>-  % insert empty discretionaries after hyphens, which means that it will
>-  % not find a line break at a hyphen in a node names.  Since some manuals
>-  % are best written with fairly long node names, containing hyphens, this
>-  % is a loss.  Therefore, we give the text of the node name again, so it
>-  % is as if TeX is seeing it for the first time.
>+  % Make link in pdf output.
>   \ifpdf
>     \leavevmode
>     \getfilename{#4}%
>-    {\normalturnoffactive
>+    {\turnoffactive
>+     % See comments at \activebackslashdouble.
>+     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
>+      \backslashparens\pdfxrefdest}%
>+     %
>      \ifnum\filenamelength>0
>        \startlink attr{/Border [0 0 0]}%
>-         goto file{\the\filename.pdf} name{#1}%
>+         goto file{\the\filename.pdf} name{\pdfxrefdest}%
>      \else
>        \startlink attr{/Border [0 0 0]}%
>-         goto name{#1}%
>+         goto name{\pdfmkpgn{\pdfxrefdest}}%
>      \fi
>     }%
>     \linkcolor
>   \fi
>   %
>-  \ifdim \wd1 > 0pt
>-    \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}%
>+  % Float references are printed completely differently: "Figure 1.2"
>+  % instead of "[somenode], p.3".  We distinguish them by the
>+  % LABEL-title being set to a magic string.
>+  {%
>+    % Have to otherify everything special to allow the \csname to
>+    % include an _ in the xref name, etc.
>+    \indexnofonts
>+    \turnoffactive
>+    \expandafter\global\expandafter\let\expandafter\Xthisreftitle
>+      \csname XR#1-title\endcsname
>+  }%
>+  \iffloat\Xthisreftitle
>+    % If the user specified the print name (third arg) to the ref,
>+    % print it instead of our usual "Figure 1.2".
>+    \ifdim\wd0 = 0pt
>+      \refx{#1-snt}{}%
>+    \else
>+      \printedrefname
>+    \fi
>+    %
>+    % if the user also gave the printed manual name (fifth arg), append
>+    % "in MANUALNAME".
>+    \ifdim \wd1 > 0pt
>+      \space \putwordin{} \cite{\printedmanual}%
>+    \fi
>   \else
>-    % _ (for example) has to be the character _ for the purposes of the
>-    % control sequence corresponding to the node, but it has to expand
>-    % into the usual \leavevmode...\vrule stuff for purposes of
>-    % printing. So we \turnoffactive for the \refx-snt, back on for the
>-    % printing, back off for the \refx-pg.
>-    {\normalturnoffactive
>-     % Only output a following space if the -snt ref is nonempty; for
>-     % @unnumbered and @anchor, it won't be.
>-     \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
>-     \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
>-    }%
>-    % [mynode],
>-    [\printednodename],\space
>-    % page 3
>-    \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
>+    % node/anchor (non-float) references.
>+    %
>+    % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
>+    % insert empty discretionaries after hyphens, which means that it will
>+    % not find a line break at a hyphen in a node names.  Since some manuals
>+    % are best written with fairly long node names, containing hyphens, this
>+    % is a loss.  Therefore, we give the text of the node name again, so it
>+    % is as if TeX is seeing it for the first time.
>+    \ifdim \wd1 > 0pt
>+      \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
>+    \else
>+      % _ (for example) has to be the character _ for the purposes of the
>+      % control sequence corresponding to the node, but it has to expand
>+      % into the usual \leavevmode...\vrule stuff for purposes of
>+      % printing. So we \turnoffactive for the \refx-snt, back on for the
>+      % printing, back off for the \refx-pg.
>+      {\turnoffactive
>+       % Only output a following space if the -snt ref is nonempty; for
>+       % @unnumbered and @anchor, it won't be.
>+       \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
>+       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
>+      }%
>+      % output the `[mynode]' via a macro so it can be overridden.
>+      \xrefprintnodename\printedrefname
>+      %
>+      % But we always want a comma and a space:
>+      ,\space
>+      %
>+      % output the `page 3'.
>+      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
>+    \fi
>   \fi
>   \endlink
> \endgroup}
> 
>-% \dosetq is the interface for calls from other macros
>-
>-% Use \normalturnoffactive so that punctuation chars such as underscore
>-% and backslash work in node names.  (\turnoffactive doesn't do \.)
>-\def\dosetq#1#2{%
>-  {\let\folio=0%
>-   \normalturnoffactive
>-   \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}%
>-   \iflinks
>-     \next
>-   \fi
>-  }%
>-}
>-
>-% \internalsetq {foo}{page} expands into
>-% CHARACTERS 'xrdef {foo}{...expansion of \Ypage...}
>-% When the aux file is read, ' is the escape character
>-
>-\def\internalsetq #1#2{'xrdef {#1}{\csname #2\endcsname}}
>-
>-% Things to be expanded by \internalsetq
>-
>-\def\Ypagenumber{\folio}
>-
>-\def\Ytitle{\thissection}
>-
>-\def\Ynothing{}
>-
>-\def\Ysectionnumberandtype{%
>-\ifnum\secno=0 \putwordChapter\xreftie\the\chapno %
>-\else \ifnum \subsecno=0 \putwordSection\xreftie\the\chapno.\the\secno %
>-\else \ifnum \subsubsecno=0 %
>-\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno %
>-\else %
>-\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno %
>-\fi \fi \fi }
>-
>-\def\Yappendixletterandtype{%
>-\ifnum\secno=0 \putwordAppendix\xreftie'char\the\appendixno{}%
>-\else \ifnum \subsecno=0 \putwordSection\xreftie'char\the\appendixno.\the\secno %
>-\else \ifnum \subsubsecno=0 %
>-\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno %
>-\else %
>-\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
>-\fi \fi \fi }
>-
>-\gdef\xreftie{'tie}
>+% This macro is called from \xrefX for the `[nodename]' part of xref
>+% output.  It's a separate macro only so it can be changed more easily,
>+% since square brackets don't work well in some documents.  Particularly
>+% one that Bob is working on :).
>+%
>+\def\xrefprintnodename#1{[#1]}
> 
>-% Use TeX 3.0's \inputlineno to get the line number, for better error
>-% messages, but if we're using an old version of TeX, don't do anything.
>+% Things referred to by \setref.
> %
>-\ifx\inputlineno\thisisundefined
>-  \let\linenumber = \empty % Non-3.0.
>-\else
>-  \def\linenumber{\the\inputlineno:\space}
>-\fi
>+\def\Ynothing{}
>+\def\Yomitfromtoc{}
>+\def\Ynumbered{%
>+  \ifnum\secno=0
>+    \putwordChapter@tie \the\chapno
>+  \else \ifnum\subsecno=0
>+    \putwordSection@tie \the\chapno.\the\secno
>+  \else \ifnum\subsubsecno=0
>+    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno
>+  \else
>+    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
>+  \fi\fi\fi
>+}
>+\def\Yappendix{%
>+  \ifnum\secno=0
>+     \putwordAppendix@tie @char\the\appendixno{}%
>+  \else \ifnum\subsecno=0
>+     \putwordSection@tie @char\the\appendixno.\the\secno
>+  \else \ifnum\subsubsecno=0
>+    \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno
>+  \else
>+    \putwordSection@tie
>+      @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
>+  \fi\fi\fi
>+}
> 
> % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
> % If its value is nonempty, SUFFIX is output afterward.
>-
>+%
> \def\refx#1#2{%
>-  \expandafter\ifx\csname X#1\endcsname\relax
>+  {%
>+    \indexnofonts
>+    \otherbackslash
>+    \expandafter\global\expandafter\let\expandafter\thisrefX
>+      \csname XR#1\endcsname
>+  }%
>+  \ifx\thisrefX\relax
>     % If not defined, say something at least.
>     \angleleft un\-de\-fined\angleright
>     \iflinks
>@@ -5664,22 +6459,50 @@
>     \fi
>   \else
>     % It's defined, so just use it.
>-    \csname X#1\endcsname
>+    \thisrefX
>   \fi
>   #2% Output the suffix in any case.
> }
> 
>-% This is the macro invoked by entries in the aux file.
>-%
>-\def\xrdef#1{\begingroup
>-  % Reenable \ as an escape while reading the second argument.
>-  \catcode`\\ = 0
>-  \afterassignment\endgroup
>-  \expandafter\gdef\csname X#1\endcsname
>+% This is the macro invoked by entries in the aux file.  Usually it's
>+% just a \def (we prepend XR to the control sequence name to avoid
>+% collisions).  But if this is a float type, we have more work to do.
>+%
>+\def\xrdef#1#2{%
>+  \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
>+  %
>+  % Was that xref control sequence that we just defined for a float?
>+  \expandafter\iffloat\csname XR#1\endcsname
>+    % it was a float, and we have the (safe) float type in \iffloattype.
>+    \expandafter\let\expandafter\floatlist
>+      \csname floatlist\iffloattype\endcsname
>+    %
>+    % Is this the first time we've seen this float type?
>+    \expandafter\ifx\floatlist\relax
>+      \toks0 = {\do}% yes, so just \do
>+    \else
>+      % had it before, so preserve previous elements in list.
>+      \toks0 = \expandafter{\floatlist\do}%
>+    \fi
>+    %
>+    % Remember this xref in the control sequence \floatlistFLOATTYPE,
>+    % for later use in \listoffloats.
>+    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
>+  \fi
> }
> 
> % Read the last existing aux file, if any.  No error if none exists.
>-\def\readauxfile{\begingroup
>+%
>+\def\tryauxfile{%
>+  \openin 1 \jobname.aux
>+  \ifeof 1 \else
>+    \readdatafile{aux}%
>+    \global\havexrefstrue
>+  \fi
>+  \closein 1
>+}
>+
>+\def\setupdatafile{%
>   \catcode`\^^@=\other
>   \catcode`\^^A=\other
>   \catcode`\^^B=\other
>@@ -5707,9 +6530,7 @@
>   \catcode`\^^]=\other
>   \catcode`\^^^=\other
>   \catcode`\^^_=\other
>-  \catcode`\@=\other
>-  \catcode`\^=\other
>-  % It was suggested to define this as 7, which would allow ^^e4 etc.
>+  % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
>   % in xref tags, i.e., node names.  But since ^^e4 notation isn't
>   % supported in the main text, it doesn't seem desirable.  Furthermore,
>   % that is not enough: for node names that actually contain a ^
>@@ -5722,6 +6543,9 @@
>   % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
>   % and then to call \auxhat in \setq.
>   %
>+  \catcode`\^=\other
>+  %
>+  % Special characters.  Should be turned off anyway, but...
>   \catcode`\~=\other
>   \catcode`\[=\other
>   \catcode`\]=\other
>@@ -5733,41 +6557,42 @@
>   \catcode`\$=\other
>   \catcode`\#=\other
>   \catcode`\&=\other
>+  \catcode`\%=\other
>   \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
>-  % Make the characters 128-255 be printing characters
>+  %
>+  % This is to support \ in node names and titles, since the \
>+  % characters end up in a \csname.  It's easier than
>+  % leaving it active and making its active definition an actual \
>+  % character.  What I don't understand is why it works in the *value*
>+  % of the xrdef.  Seems like it should be a catcode12 \, and that
>+  % should not typeset properly.  But it works, so I'm moving on for
>+  % now.  --karl, 15jan04.
>+  \catcode`\\=\other
>+  %
>+  % Make the characters 128-255 be printing characters.
>   {%
>-    \count 1=128
>+    \count1=128
>     \def\loop{%
>-      \catcode\count 1=\other
>-      \advance\count 1 by 1
>-      \ifnum \count 1<256 \loop \fi
>+      \catcode\count1=\other
>+      \advance\count1 by 1
>+      \ifnum \count1<256 \loop \fi
>     }%
>   }%
>-  % The aux file uses ' as the escape (for now).
>-  % Turn off \ as an escape so we do not lose on
>-  % entries which were dumped with control sequences in their names.
>-  % For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
>-  % Reference to such entries still does not work the way one would wish,
>-  % but at least they do not bomb out when the aux file is read in.
>+  %
>+  % @ is our escape character in .aux files, and we need braces.
>   \catcode`\{=1
>   \catcode`\}=2
>-  \catcode`\%=\other
>-  \catcode`\'=0
>-  \catcode`\\=\other
>-  %
>-  \openin 1 \jobname.aux
>-  \ifeof 1 \else
>-    \closein 1
>-    \input \jobname.aux
>-    \global\havexrefstrue
>-    \global\warnedobstrue
>-  \fi
>-  % Open the new aux file.  TeX will close it automatically at exit.
>-  \openout\auxfile=\jobname.aux
>-\endgroup}
>+  \catcode`\@=0
>+}
> 
>+\def\readdatafile#1{%
>+\begingroup
>+  \setupdatafile
>+  \input\jobname.#1
>+\endgroup}
> 
>-% Footnotes.
>+\message{insertions,}
>+% including footnotes.
> 
> \newcount \footnoteno
> 
>@@ -5781,37 +6606,39 @@
> % @footnotestyle is meaningful for info output only.
> \let\footnotestyle=\comment
> 
>-\let\ptexfootnote=\footnote
>-
> {\catcode `\@=11
> %
> % Auto-number footnotes.  Otherwise like plain.
> \gdef\footnote{%
>+  \let\indent=\ptexindent
>+  \let\noindent=\ptexnoindent
>   \global\advance\footnoteno by \@ne
>   \edef\thisfootno{$^{\the\footnoteno}$}%
>   %
>   % In case the footnote comes at the end of a sentence, preserve the
>   % extra spacing after we do the footnote number.
>   \let\@sf\empty
>-  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\/\fi
>+  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
>   %
>   % Remove inadvertent blank space before typesetting the footnote number.
>   \unskip
>   \thisfootno\@sf
>-  \footnotezzz
>+  \dofootnote
> }%
> 
> % Don't bother with the trickery in plain.tex to not require the
> % footnote text as a parameter.  Our footnotes don't need to be so general.
> %
>-% Oh yes, they do; otherwise, @ifset and anything else that uses
>-% \parseargline fail inside footnotes because the tokens are fixed when
>+% Oh yes, they do; otherwise, @ifset (and anything else that uses
>+% \parseargline) fails inside footnotes because the tokens are fixed when
> % the footnote is read.  --karl, 16nov96.
> %
>-\long\gdef\footnotezzz{\insert\footins\bgroup
>+\gdef\dofootnote{%
>+  \insert\footins\bgroup
>   % We want to typeset this text as a normal paragraph, even if the
>   % footnote reference occurs in (for example) a display environment.
>   % So reset some parameters.
>+  \hsize=\pagewidth
>   \interlinepenalty\interfootnotelinepenalty
>   \splittopskip\ht\strutbox % top baseline for broken footnotes
>   \splitmaxdepth\dp\strutbox
>@@ -5841,48 +6668,68 @@
>   \footstrut
>   \futurelet\next\fo@t
> }
>-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
>-  \else\let\next\f@t\fi \next}
>-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
>-\def\f@t#1{#1\@foot}
>-\def\@foot{\strut\par\egroup}
>-
> }%end \catcode `\@=11
> 
>-% @| inserts a changebar to the left of the current line.  It should
>-% surround any changed text.  This approach does *not* work if the
>-% change spans more than two lines of output.  To handle that, we would
>-% have adopt a much more difficult approach (putting marks into the main
>-% vertical list for the beginning and end of each change).
>-%
>-\def\|{%
>-  % \vadjust can only be used in horizontal mode.
>-  \leavevmode
>-  %
>-  % Append this vertical mode material after the current line in the output.
>-  \vadjust{%
>-    % We want to insert a rule with the height and depth of the current
>-    % leading; that is exactly what \strutbox is supposed to record.
>-    \vskip-\baselineskip
>-    %
>-    % \vadjust-items are inserted at the left edge of the type.  So
>-    % the \llap here moves out into the left-hand margin.
>-    \llap{%
>-      %
>-      % For a thicker or thinner bar, change the `1pt'.
>-      \vrule height\baselineskip width1pt
>-      %
>-      % This is the space between the bar and the text.
>-      \hskip 12pt
>-    }%
>-  }%
>+% In case a @footnote appears in a vbox, save the footnote text and create
>+% the real \insert just after the vbox finished.  Otherwise, the insertion
>+% would be lost.
>+% Similarily, if a @footnote appears inside an alignment, save the footnote
>+% text to a box and make the \insert when a row of the table is finished.
>+% And the same can be done for other insert classes.  --kasal, 16nov03.
>+
>+% Replace the \insert primitive by a cheating macro.
>+% Deeper inside, just make sure that the saved insertions are not spilled
>+% out prematurely.
>+%
>+\def\startsavinginserts{%
>+  \ifx \insert\ptexinsert
>+    \let\insert\saveinsert
>+  \else
>+    \let\checkinserts\relax
>+  \fi
> }
> 
>-% For a final copy, take out the rectangles
>-% that mark overfull boxes (in case you have decided
>-% that the text looks ok even though it passes the margin).
>+% This \insert replacement works for both \insert\footins{foo} and
>+% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
> %
>-\def\finalout{\overfullrule=0pt}
>+\def\saveinsert#1{%
>+  \edef\next{\noexpand\savetobox \makeSAVEname#1}%
>+  \afterassignment\next
>+  % swallow the left brace
>+  \let\temp =
>+}
>+\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
>+\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
>+
>+\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
>+
>+\def\placesaveins#1{%
>+  \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
>+    {\box#1}%
>+}
>+
>+% eat @SAVE -- beware, all of them have catcode \other:
>+{
>+  \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials  %  ;-)
>+  \gdef\gobblesave @SAVE{}
>+}
>+
>+% initialization:
>+\def\newsaveins #1{%
>+  \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
>+  \next
>+}
>+\def\newsaveinsX #1{%
>+  \csname newbox\endcsname #1%
>+  \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
>+    \checksaveins #1}%
>+}
>+
>+% initialize:
>+\let\checkinserts\empty
>+\newsaveins\footins
>+\newsaveins\margin
>+
> 
> % @image.  We use the macros from epsf.tex to support this.
> % If epsf.tex is not installed and @image is used, we complain.
>@@ -5892,12 +6739,12 @@
> % undone and the next image would fail.
> \openin 1 = epsf.tex
> \ifeof 1 \else
>-  \closein 1
>-  % Do not bother showing banner with post-v2.7 epsf.tex (available in
>-  % doc/epsf.tex until it shows up on ctan).
>+  % Do not bother showing banner with epsf.tex v2.7k (available in
>+  % doc/epsf.tex and on ctan).
>   \def\epsfannounce{\toks0 = }%
>   \input epsf.tex
> \fi
>+\closein 1
> %
> % We will only complain once about lack of epsf.tex.
> \newif\ifwarnednoepsf
>@@ -5933,10 +6780,10 @@
>     \nobreak\bigskip
>     % Usually we'll have text after the image which will insert
>     % \parskip glue, so insert it here too to equalize the space
>-    % above and below. 
>+    % above and below.
>     \nobreak\vskip\parskip
>     \nobreak
>-    \line\bgroup\hss
>+    \line\bgroup
>   \fi
>   %
>   % Output the image.
>@@ -5949,10 +6796,275 @@
>     \epsfbox{#1.eps}%
>   \fi
>   %
>-  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
>+  \ifimagevmode \egroup \bigbreak \fi  % space after the image
> \endgroup}
> 
> 
>+% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
>+% etc.  We don't actually implement floating yet, we always include the
>+% float "here".  But it seemed the best name for the future.
>+%
>+\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
>+
>+% There may be a space before second and/or third parameter; delete it.
>+\def\eatcommaspace#1, {#1,}
>+
>+% #1 is the optional FLOATTYPE, the text label for this float, typically
>+% "Figure", "Table", "Example", etc.  Can't contain commas.  If omitted,
>+% this float will not be numbered and cannot be referred to.
>+%
>+% #2 is the optional xref label.  Also must be present for the float to
>+% be referable.
>+%
>+% #3 is the optional positioning argument; for now, it is ignored.  It
>+% will somehow specify the positions allowed to float to (here, top, bottom).
>+%
>+% We keep a separate counter for each FLOATTYPE, which we reset at each
>+% chapter-level command.
>+\let\resetallfloatnos=\empty
>+%
>+\def\dofloat#1,#2,#3,#4\finish{%
>+  \let\thiscaption=\empty
>+  \let\thisshortcaption=\empty
>+  %
>+  % don't lose footnotes inside @float.
>+  %
>+  % BEWARE: when the floats start float, we have to issue warning whenever an
>+  % insert appears inside a float which could possibly float. --kasal, 26may04
>+  %
>+  \startsavinginserts
>+  %
>+  % We can't be used inside a paragraph.
>+  \par
>+  %
>+  \vtop\bgroup
>+    \def\floattype{#1}%
>+    \def\floatlabel{#2}%
>+    \def\floatloc{#3}% we do nothing with this yet.
>+    %
>+    \ifx\floattype\empty
>+      \let\safefloattype=\empty
>+    \else
>+      {%
>+        % the floattype might have accents or other special characters,
>+        % but we need to use it in a control sequence name.
>+        \indexnofonts
>+        \turnoffactive
>+        \xdef\safefloattype{\floattype}%
>+      }%
>+    \fi
>+    %
>+    % If label is given but no type, we handle that as the empty type.
>+    \ifx\floatlabel\empty \else
>+      % We want each FLOATTYPE to be numbered separately (Figure 1,
>+      % Table 1, Figure 2, ...).  (And if no label, no number.)
>+      %
>+      \expandafter\getfloatno\csname\safefloattype floatno\endcsname
>+      \global\advance\floatno by 1
>+      %
>+      {%
>+        % This magic value for \thissection is output by \setref as the
>+        % XREFLABEL-title value.  \xrefX uses it to distinguish float
>+        % labels (which have a completely different output format) from
>+        % node and anchor labels.  And \xrdef uses it to construct the
>+        % lists of floats.
>+        %
>+        \edef\thissection{\floatmagic=\safefloattype}%
>+        \setref{\floatlabel}{Yfloat}%
>+      }%
>+    \fi
>+    %
>+    % start with \parskip glue, I guess.
>+    \vskip\parskip
>+    %
>+    % Don't suppress indentation if a float happens to start a section.
>+    \restorefirstparagraphindent
>+}
>+
>+% we have these possibilities:
>+% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
>+% @float Foo,lbl & no caption:    Foo 1.1
>+% @float Foo & @caption{Cap}:     Foo: Cap
>+% @float Foo & no caption:        Foo
>+% @float ,lbl & Caption{Cap}:     1.1: Cap
>+% @float ,lbl & no caption:       1.1
>+% @float & @caption{Cap}:         Cap
>+% @float & no caption:
>+%
>+\def\Efloat{%
>+    \let\floatident = \empty
>+    %
>+    % In all cases, if we have a float type, it comes first.
>+    \ifx\floattype\empty \else \def\floatident{\floattype}\fi
>+    %
>+    % If we have an xref label, the number comes next.
>+    \ifx\floatlabel\empty \else
>+      \ifx\floattype\empty \else % if also had float type, need tie first.
>+        \appendtomacro\floatident{\tie}%
>+      \fi
>+      % the number.
>+      \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
>+    \fi
>+    %
>+    % Start the printed caption with what we've constructed in
>+    % \floatident, but keep it separate; we need \floatident again.
>+    \let\captionline = \floatident
>+    %
>+    \ifx\thiscaption\empty \else
>+      \ifx\floatident\empty \else
>+	\appendtomacro\captionline{: }% had ident, so need a colon between
>+      \fi
>+      %
>+      % caption text.
>+      \appendtomacro\captionline{\scanexp\thiscaption}%
>+    \fi
>+    %
>+    % If we have anything to print, print it, with space before.
>+    % Eventually this needs to become an \insert.
>+    \ifx\captionline\empty \else
>+      \vskip.5\parskip
>+      \captionline
>+      %
>+      % Space below caption.
>+      \vskip\parskip
>+    \fi
>+    %
>+    % If have an xref label, write the list of floats info.  Do this
>+    % after the caption, to avoid chance of it being a breakpoint.
>+    \ifx\floatlabel\empty \else
>+      % Write the text that goes in the lof to the aux file as
>+      % \floatlabel-lof.  Besides \floatident, we include the short
>+      % caption if specified, else the full caption if specified, else nothing.
>+      {%
>+        \atdummies
>+        %
>+        % since we read the caption text in the macro world, where ^^M
>+        % is turned into a normal character, we have to scan it back, so
>+        % we don't write the literal three characters "^^M" into the aux file.
>+	\scanexp{%
>+	  \xdef\noexpand\gtemp{%
>+	    \ifx\thisshortcaption\empty
>+	      \thiscaption
>+	    \else
>+	      \thisshortcaption
>+	    \fi
>+	  }%
>+	}%
>+        \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
>+	  \ifx\gtemp\empty \else : \gtemp \fi}}%
>+      }%
>+    \fi
>+  \egroup  % end of \vtop
>+  %
>+  % place the captured inserts
>+  %
>+  % BEWARE: when the floats start floating, we have to issue warning
>+  % whenever an insert appears inside a float which could possibly
>+  % float. --kasal, 26may04
>+  %
>+  \checkinserts
>+}
>+
>+% Append the tokens #2 to the definition of macro #1, not expanding either.
>+%
>+\def\appendtomacro#1#2{%
>+  \expandafter\def\expandafter#1\expandafter{#1#2}%
>+}
>+
>+% @caption, @shortcaption
>+%
>+\def\caption{\docaption\thiscaption}
>+\def\shortcaption{\docaption\thisshortcaption}
>+\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
>+\def\defcaption#1#2{\egroup \def#1{#2}}
>+
>+% The parameter is the control sequence identifying the counter we are
>+% going to use.  Create it if it doesn't exist and assign it to \floatno.
>+\def\getfloatno#1{%
>+  \ifx#1\relax
>+      % Haven't seen this figure type before.
>+      \csname newcount\endcsname #1%
>+      %
>+      % Remember to reset this floatno at the next chap.
>+      \expandafter\gdef\expandafter\resetallfloatnos
>+        \expandafter{\resetallfloatnos #1=0 }%
>+  \fi
>+  \let\floatno#1%
>+}
>+
>+% \setref calls this to get the XREFLABEL-snt value.  We want an @xref
>+% to the FLOATLABEL to expand to "Figure 3.1".  We call \setref when we
>+% first read the @float command.
>+%
>+\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
>+
>+% Magic string used for the XREFLABEL-title value, so \xrefX can
>+% distinguish floats from other xref types.
>+\def\floatmagic{!!float!!}
>+
>+% #1 is the control sequence we are passed; we expand into a conditional
>+% which is true if #1 represents a float ref.  That is, the magic
>+% \thissection value which we \setref above.
>+%
>+\def\iffloat#1{\expandafter\doiffloat#1==\finish}
>+%
>+% #1 is (maybe) the \floatmagic string.  If so, #2 will be the
>+% (safe) float type for this float.  We set \iffloattype to #2.
>+%
>+\def\doiffloat#1=#2=#3\finish{%
>+  \def\temp{#1}%
>+  \def\iffloattype{#2}%
>+  \ifx\temp\floatmagic
>+}
>+
>+% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
>+%
>+\parseargdef\listoffloats{%
>+  \def\floattype{#1}% floattype
>+  {%
>+    % the floattype might have accents or other special characters,
>+    % but we need to use it in a control sequence name.
>+    \indexnofonts
>+    \turnoffactive
>+    \xdef\safefloattype{\floattype}%
>+  }%
>+  %
>+  % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
>+  \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
>+    \ifhavexrefs
>+      % if the user said @listoffloats foo but never @float foo.
>+      \message{\linenumber No `\safefloattype' floats to list.}%
>+    \fi
>+  \else
>+    \begingroup
>+      \leftskip=\tocindent  % indent these entries like a toc
>+      \let\do=\listoffloatsdo
>+      \csname floatlist\safefloattype\endcsname
>+    \endgroup
>+  \fi
>+}
>+
>+% This is called on each entry in a list of floats.  We're passed the
>+% xref label, in the form LABEL-title, which is how we save it in the
>+% aux file.  We strip off the -title and look up \XRLABEL-lof, which
>+% has the text we're supposed to typeset here.
>+%
>+% Figures without xref labels will not be included in the list (since
>+% they won't appear in the aux file).
>+%
>+\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
>+\def\listoffloatsdoentry#1-title\finish{{%
>+  % Can't fully expand XR#1-lof because it can contain anything.  Just
>+  % pass the control sequence.  On the other hand, XR#1-pg is just the
>+  % page number, and we want to fully expand that so we can get a link
>+  % in pdf output.
>+  \toksA = \expandafter{\csname XR#1-lof\endcsname}%
>+  %
>+  % use the same \entry macro we use to generate the TOC and index.
>+  \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
>+  \writeentry
>+}}
>+
> \message{localization,}
> % and i18n.
> 
>@@ -5961,19 +7073,17 @@
> % properly.  Single argument is the language abbreviation.
> % It would be nice if we could set up a hyphenation file here.
> %
>-\def\documentlanguage{\parsearg\dodocumentlanguage}
>-\def\dodocumentlanguage#1{%
>+\parseargdef\documentlanguage{%
>   \tex % read txi-??.tex file in plain TeX.
>-  % Read the file if it exists.
>-  \openin 1 txi-#1.tex
>-  \ifeof1
>-    \errhelp = \nolanghelp
>-    \errmessage{Cannot read language file txi-#1.tex}%
>-    \let\temp = \relax
>-  \else
>-    \def\temp{\input txi-#1.tex }%
>-  \fi
>-  \temp
>+    % Read the file if it exists.
>+    \openin 1 txi-#1.tex
>+    \ifeof 1
>+      \errhelp = \nolanghelp
>+      \errmessage{Cannot read language file txi-#1.tex}%
>+    \else
>+      \input txi-#1.tex
>+    \fi
>+    \closein 1
>   \endgroup
> }
> \newhelp\nolanghelp{The given language definition file cannot be found or
>@@ -6018,12 +7128,14 @@
>   \fi
> }
> 
>-% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
>-% 4) hoffset; 5) binding offset; 6) topskip.  We also call
>-% \setleading{\textleading}, so the caller should define \textleading.
>-% The caller should also set \parskip.
>+% Parameters in order: 1) textheight; 2) textwidth;
>+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
>+% 7) physical page height; 8) physical page width.
>+%
>+% We also call \setleading{\textleading}, so the caller should define
>+% \textleading.  The caller should also set \parskip.
> %
>-\def\internalpagesizes#1#2#3#4#5#6{%
>+\def\internalpagesizes#1#2#3#4#5#6#7#8{%
>   \voffset = #3\relax
>   \topskip = #6\relax
>   \splittopskip = \topskip
>@@ -6042,55 +7154,88 @@
>   \normaloffset = #4\relax
>   \bindingoffset = #5\relax
>   %
>+  \ifpdf
>+    \pdfpageheight #7\relax
>+    \pdfpagewidth #8\relax
>+  \fi
>+  %
>   \setleading{\textleading}
>   %
>   \parindent = \defaultparindent
>   \setemergencystretch
> }
> 
>-% Use `small' versions.
>-% 
>-\def\smallenvironments{%
>-  \let\smalldisplay = \smalldisplayx
>-  \let\smallexample = \smalllispx
>-  \let\smallformat = \smallformatx
>-  \let\smalllisp = \smalllispx
>-}
>-
> % @letterpaper (the default).
> \def\letterpaper{{\globaldefs = 1
>   \parskip = 3pt plus 2pt minus 1pt
>   \textleading = 13.2pt
>   %
>   % If page is nothing but text, make it come out even.
>-  \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}%
>+  \internalpagesizes{46\baselineskip}{6in}%
>+                    {\voffset}{.25in}%
>+                    {\bindingoffset}{36pt}%
>+                    {11in}{8.5in}%
> }}
> 
>-% Use @smallbook to reset parameters for 7x9.5 (or so) format.
>+% Use @smallbook to reset parameters for 7x9.25 trim size.
> \def\smallbook{{\globaldefs = 1
>   \parskip = 2pt plus 1pt
>   \textleading = 12pt
>   %
>-  \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}%
>+  \internalpagesizes{7.5in}{5in}%
>+                    {\voffset}{.25in}%
>+                    {\bindingoffset}{16pt}%
>+                    {9.25in}{7in}%
>   %
>   \lispnarrowing = 0.3in
>   \tolerance = 700
>   \hfuzz = 1pt
>   \contentsrightmargin = 0pt
>-  \deftypemargin = 0pt
>   \defbodyindent = .5cm
>-  \smallenvironments
>+}}
>+
>+% Use @smallerbook to reset parameters for 6x9 trim size.
>+% (Just testing, parameters still in flux.)
>+\def\smallerbook{{\globaldefs = 1
>+  \parskip = 1.5pt plus 1pt
>+  \textleading = 12pt
>+  %
>+  \internalpagesizes{7.4in}{4.8in}%
>+                    {-.2in}{-.4in}%
>+                    {0pt}{14pt}%
>+                    {9in}{6in}%
>+  %
>+  \lispnarrowing = 0.25in
>+  \tolerance = 700
>+  \hfuzz = 1pt
>+  \contentsrightmargin = 0pt
>+  \defbodyindent = .4cm
> }}
> 
> % Use @afourpaper to print on European A4 paper.
> \def\afourpaper{{\globaldefs = 1
>   \parskip = 3pt plus 2pt minus 1pt
>-  \textleading = 12pt
>+  \textleading = 13.2pt
>   %
>-  \internalpagesizes{53\baselineskip}{160mm}{\voffset}{4mm}{\bindingoffset}{44pt}%
>+  % Double-side printing via postscript on Laserjet 4050
>+  % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
>+  % To change the settings for a different printer or situation, adjust
>+  % \normaloffset until the front-side and back-side texts align.  Then
>+  % do the same for \bindingoffset.  You can set these for testing in
>+  % your texinfo source file like this:
>+  % @tex
>+  % \global\normaloffset = -6mm
>+  % \global\bindingoffset = 10mm
>+  % @end tex
>+  \internalpagesizes{51\baselineskip}{160mm}
>+                    {\voffset}{\hoffset}%
>+                    {\bindingoffset}{44pt}%
>+                    {297mm}{210mm}%
>   %
>   \tolerance = 700
>   \hfuzz = 1pt
>+  \contentsrightmargin = 0pt
>+  \defbodyindent = 5mm
> }}
> 
> % Use @afivepaper to print on European A5 paper.
>@@ -6100,44 +7245,46 @@
>   \parskip = 2pt plus 1pt minus 0.1pt
>   \textleading = 12.5pt
>   %
>-  \internalpagesizes{166mm}{120mm}{\voffset}{-8mm}{\bindingoffset}{8pt}%
>+  \internalpagesizes{160mm}{120mm}%
>+                    {\voffset}{\hoffset}%
>+                    {\bindingoffset}{8pt}%
>+                    {210mm}{148mm}%
>   %
>   \lispnarrowing = 0.2in
>   \tolerance = 800
>   \hfuzz = 1.2pt
>-  \contentsrightmargin = 0mm
>-  \deftypemargin = 0pt
>+  \contentsrightmargin = 0pt
>   \defbodyindent = 2mm
>   \tableindent = 12mm
>-  %
>-  \smallenvironments
> }}
> 
>-% A specific text layout, 24x15cm overall, intended for A4 paper.  Top margin
>-% 29mm, hence bottom margin 28mm, nominal side margin 3cm.
>+% A specific text layout, 24x15cm overall, intended for A4 paper.
> \def\afourlatex{{\globaldefs = 1
>-  \textleading = 13.6pt
>-  %
>   \afourpaper
>-  \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}%
>+  \internalpagesizes{237mm}{150mm}%
>+                    {\voffset}{4.6mm}%
>+                    {\bindingoffset}{7mm}%
>+                    {297mm}{210mm}%
>   %
>-  % Must explicitly reset to 0 because we call \afourpaper, apparently,
>-  % although this does not entirely make sense.
>+  % Must explicitly reset to 0 because we call \afourpaper.
>   \globaldefs = 0
> }}
> 
>-% Use @afourwide to print on European A4 paper in wide format.
>-\def\afourwide{%
>+% Use @afourwide to print on A4 paper in landscape format.
>+\def\afourwide{{\globaldefs = 1
>   \afourpaper
>-  \internalpagesizes{6.5in}{9.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}%
>-}
>+  \internalpagesizes{241mm}{165mm}%
>+                    {\voffset}{-2.95mm}%
>+                    {\bindingoffset}{7mm}%
>+                    {297mm}{210mm}%
>+  \globaldefs = 0
>+}}
> 
> % @pagesizes TEXTHEIGHT[,TEXTWIDTH]
> % Perhaps we should allow setting the margins, \topskip, \parskip,
> % and/or leading, also. Or perhaps we should compute them somehow.
> %
>-\def\pagesizes{\parsearg\pagesizesxxx}
>-\def\pagesizesxxx#1{\pagesizesyyy #1,,\finish}
>+\parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
> \def\pagesizesyyy#1,#2,#3\finish{{%
>   \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
>   \globaldefs = 1
>@@ -6145,7 +7292,16 @@
>   \parskip = 3pt plus 2pt minus 1pt
>   \setleading{\textleading}%
>   %
>-  \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}%
>+  \dimen0 = #1
>+  \advance\dimen0 by \voffset
>+  %
>+  \dimen2 = \hsize
>+  \advance\dimen2 by \normaloffset
>+  %
>+  \internalpagesizes{#1}{\hsize}%
>+                    {\voffset}{\normaloffset}%
>+                    {\bindingoffset}{44pt}%
>+                    {\dimen0}{\dimen2}%
> }}
> 
> % Set default to letter.
>@@ -6175,8 +7331,8 @@
> \def\normalplus{+}
> \def\normaldollar{$}%$ font-lock fix
> 
>-% This macro is used to make a character print one way in ttfont
>-% where it can probably just be output, and another way in other fonts,
>+% This macro is used to make a character print one way in \tt
>+% (where it can probably be output as-is), and another way in other fonts,
> % where something hairier probably needs to be done.
> %
> % #1 is what to print if we are indeed using \tt; #2 is what to print
>@@ -6208,8 +7364,9 @@
> 
> \catcode`\_=\active
> \def_{\ifusingtt\normalunderscore\_}
>+\let\realunder=_
> % Subroutine for the previous macro.
>-\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}}
>+\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
> 
> \catcode`\|=\active
> \def|{{\tt\char124}}
>@@ -6223,15 +7380,6 @@
> \def+{{\tt \char 43}}
> \catcode`\$=\active
> \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
>-%\catcode 27=\active
>-%\def^^[{$\diamondsuit$}
>-
>-% Set up an active definition for =, but don't enable it most of the time.
>-{\catcode`\==\active
>-\global\def={{\tt \char 61}}}
>-
>-\catcode`+=\active
>-\catcode`\_=\active
> 
> % If a .fmt file is being used, characters that might appear in a file
> % name cannot be active until we have parsed the command line.
>@@ -6239,46 +7387,53 @@
> % \otherifyactive is called near the end of this file.
> \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
> 
>-\catcode`\@=0
>+% Used sometimes to turn off (effectively) the active characters even after
>+% parsing them.
>+\def\turnoffactive{%
>+  \normalturnoffactive
>+  \otherbackslash
>+}
> 
>-% \rawbackslashxx output one backslash character in current font
>-\global\chardef\rawbackslashxx=`\\
>-%{\catcode`\\=\other
>-%@gdef@rawbackslashxx{\}}
>-
>-% \rawbackslash redefines \ as input to do \rawbackslashxx.
>-{\catcode`\\=\active
>-@gdef@rawbackslash{@let\=@rawbackslashxx }}
>+\catcode`\@=0
> 
>-% \normalbackslash outputs one backslash in fixed width font.
>-\def\normalbackslash{{\tt\rawbackslashxx}}
>+% \backslashcurfont outputs one backslash character in current font,
>+% as in \char`\\.
>+\global\chardef\backslashcurfont=`\\
>+\global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
>+
>+% \realbackslash is an actual character `\' with catcode other, and
>+% \doublebackslash is two of them (for the pdf outlines).
>+{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
> 
>-% \catcode 17=0   % Define control-q
>+% In texinfo, backslash is an active character; it prints the backslash
>+% in fixed width font.
> \catcode`\\=\active
>+@def@normalbackslash{{@tt@backslashcurfont}}
>+% On startup, @fixbackslash assigns:
>+%  @let \ = @normalbackslash
>+
>+% \rawbackslash defines an active \ to do \backslashcurfont.
>+% \otherbackslash defines an active \ to be a literal `\' character with
>+% catcode other.
>+@gdef@rawbackslash{@let\=@backslashcurfont}
>+@gdef@otherbackslash{@let\=@realbackslash}
> 
>-% Used sometimes to turn off (effectively) the active characters
>-% even after parsing them.
>-@def@turnoffactive{@let"=@normaldoublequote
>-@let\=@realbackslash
>-@let~=@normaltilde
>-@let^=@normalcaret
>-@let_=@normalunderscore
>-@let|=@normalverticalbar
>-@let<=@normalless
>-@let>=@normalgreater
>-@let+=@normalplus
>-@let$=@normaldollar}%$ font-lock fix
>-
>-@def@normalturnoffactive{@let"=@normaldoublequote
>-@let\=@normalbackslash
>-@let~=@normaltilde
>-@let^=@normalcaret
>-@let_=@normalunderscore
>-@let|=@normalverticalbar
>-@let<=@normalless
>-@let>=@normalgreater
>-@let+=@normalplus
>-@let$=@normaldollar}%$ font-lock fix
>+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
>+% the literal character `\'.
>+% 
>+@def@normalturnoffactive{%
>+  @let\=@normalbackslash
>+  @let"=@normaldoublequote
>+  @let~=@normaltilde
>+  @let^=@normalcaret
>+  @let_=@normalunderscore
>+  @let|=@normalverticalbar
>+  @let<=@normalless
>+  @let>=@normalgreater
>+  @let+=@normalplus
>+  @let$=@normaldollar %$ font-lock fix
>+  @unsepspaces
>+}
> 
> % Make _ and + \other characters, temporarily.
> % This is canceled by @fixbackslash.
>@@ -6292,9 +7447,9 @@
> @global@let\ = @eatinput
> 
> % On the other hand, perhaps the file did not have a `\input texinfo'. Then
>-% the first `\{ in the file would cause an error. This macro tries to fix
>+% the first `\' in the file would cause an error. This macro tries to fix
> % that, assuming it is called before the first `\' could plausibly occur.
>-% Also back turn on active characters that might appear in the input
>+% Also turn back on active characters that might appear in the input
> % file name, in case not using a pre-dumped format.
> %
> @gdef@fixbackslash{%
>@@ -6306,15 +7461,11 @@
> % Say @foo, not \foo, in error messages.
> @escapechar = `@@
> 
>-% These look ok in all fonts, so just make them not special.  
>+% These look ok in all fonts, so just make them not special.
> @catcode`@& = @other
> @catcode`@# = @other
> @catcode`@% = @other
> 
>-@c Set initial fonts.
>-@textfonts
>-@rm
>-
> 
> @c Local variables:
> @c eval: (add-hook 'write-file-hooks 'time-stamp)
>@@ -6323,3 +7474,9 @@
> @c time-stamp-format: "%:y-%02m-%02d.%02H"
> @c time-stamp-end: "}"
> @c End:
>+
>+@c vim:sw=2:
>+
>+@ignore
>+   arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
>+@end ignore
>diff -uNr vamos-0.5.5.orig/configure vamos-0.5.5/configure
>--- vamos-0.5.5.orig/configure	2005-10-29 22:27:42.000000000 +0200
>+++ vamos-0.5.5/configure	2007-06-25 18:03:02.000000000 +0200
>@@ -1,27 +1,56 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
>-# Generated by GNU Autoconf 2.59 for vamos 0.5.5.
>+# Generated by GNU Autoconf 2.61 for vamos 0.5.5.
> #
> # Report bugs to <snick-a-doo@comcast.net>.
> #
>-# Copyright (C) 2003 Free Software Foundation, Inc.
>+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
>+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
> # This configure script is free software; the Free Software Foundation
> # gives unlimited permission to copy, distribute and modify it.
> ## --------------------- ##
> ## M4sh Initialization.  ##
> ## --------------------- ##
> 
>-# Be Bourne compatible
>+# Be more Bourne compatible
>+DUALCASE=1; export DUALCASE # for MKS sh
> if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>   emulate sh
>   NULLCMD=:
>   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
>   # is contrary to our usage.  Disable this feature.
>   alias -g '${1+"$@"}'='"$@"'
>-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
>-  set -o posix
>+  setopt NO_GLOB_SUBST
>+else
>+  case `(set -o) 2>/dev/null` in
>+  *posix*) set -o posix ;;
>+esac
>+
>+fi
>+
>+
>+
>+
>+# PATH needs CR
>+# Avoid depending upon Character Ranges.
>+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
>+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
>+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
>+as_cr_digits='0123456789'
>+as_cr_alnum=$as_cr_Letters$as_cr_digits
>+
>+# The user is always right.
>+if test "${PATH_SEPARATOR+set}" != set; then
>+  echo "#! /bin/sh" >conf$$.sh
>+  echo  "exit 0"   >>conf$$.sh
>+  chmod +x conf$$.sh
>+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
>+    PATH_SEPARATOR=';'
>+  else
>+    PATH_SEPARATOR=:
>+  fi
>+  rm -f conf$$.sh
> fi
>-DUALCASE=1; export DUALCASE # for MKS sh
> 
> # Support unset when possible.
> if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
>@@ -31,8 +60,43 @@
> fi
> 
> 
>+# IFS
>+# We need space, tab and new line, in precisely that order.  Quoting is
>+# there to prevent editors from complaining about space-tab.
>+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
>+# splitting by setting IFS to empty value.)
>+as_nl='
>+'
>+IFS=" ""	$as_nl"
>+
>+# Find who we are.  Look in the path if we contain no directory separator.
>+case $0 in
>+  *[\\/]* ) as_myself=$0 ;;
>+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH
>+do
>+  IFS=$as_save_IFS
>+  test -z "$as_dir" && as_dir=.
>+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
>+done
>+IFS=$as_save_IFS
>+
>+     ;;
>+esac
>+# We did not find ourselves, most probably we were run as `sh COMMAND'
>+# in which case we are not to be found in the path.
>+if test "x$as_myself" = x; then
>+  as_myself=$0
>+fi
>+if test ! -f "$as_myself"; then
>+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
>+  { (exit 1); exit 1; }
>+fi
>+
> # Work around bugs in pre-3.0 UWIN ksh.
>-$as_unset ENV MAIL MAILPATH
>+for as_var in ENV MAIL MAILPATH
>+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
>+done
> PS1='$ '
> PS2='> '
> PS4='+ '
>@@ -46,18 +110,19 @@
>   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
>     eval $as_var=C; export $as_var
>   else
>-    $as_unset $as_var
>+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
>   fi
> done
> 
> # Required to use basename.
>-if expr a : '$a$' >/dev/null 2>&1; then
>+if expr a : '$a$' >/dev/null 2>&1 &&
>+   test "X`expr 00001 : '.*$...$'`" = X001; then
>   as_expr=expr
> else
>   as_expr=false
> fi
> 
>-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
>+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
>   as_basename=basename
> else
>   as_basename=false
>@@ -65,157 +130,388 @@
> 
> 
> # Name of the executable.
>-as_me=`$as_basename "$0" ||
>+as_me=`$as_basename -- "$0" ||
> $as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
> 	 X"$0" : 'X$//$$' \| \
>-	 X"$0" : 'X$/$$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
> echo X/"$0" |
>-    sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }
>-  	  /^X\/$\/\/$$/{ s//\1/; q; }
>-  	  /^X\/$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>+    sed '/^.*\/$[^/][^/]*$\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X\/$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X\/$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
> 
>+# CDPATH.
>+$as_unset CDPATH
> 
>-# PATH needs CR, and LINENO needs CR and PATH.
>-# Avoid depending upon Character Ranges.
>-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
>-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
>-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
>-as_cr_digits='0123456789'
>-as_cr_alnum=$as_cr_Letters$as_cr_digits
> 
>-# The user is always right.
>-if test "${PATH_SEPARATOR+set}" != set; then
>-  echo "#! /bin/sh" >conf$$.sh
>-  echo  "exit 0"   >>conf$$.sh
>-  chmod +x conf$$.sh
>-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
>-    PATH_SEPARATOR=';'
>-  else
>-    PATH_SEPARATOR=:
>-  fi
>-  rm -f conf$$.sh
>+if test "x$CONFIG_SHELL" = x; then
>+  if (eval ":") 2>/dev/null; then
>+  as_have_required=yes
>+else
>+  as_have_required=no
>+fi
>+
>+  if test $as_have_required = yes && 	 (eval ":
>+(as_func_return () {
>+  (exit \$1)
>+}
>+as_func_success () {
>+  as_func_return 0
>+}
>+as_func_failure () {
>+  as_func_return 1
>+}
>+as_func_ret_success () {
>+  return 0
>+}
>+as_func_ret_failure () {
>+  return 1
>+}
>+
>+exitcode=0
>+if as_func_success; then
>+  :
>+else
>+  exitcode=1
>+  echo as_func_success failed.
> fi
> 
>+if as_func_failure; then
>+  exitcode=1
>+  echo as_func_failure succeeded.
>+fi
> 
>-  as_lineno_1=$LINENO
>-  as_lineno_2=$LINENO
>-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
>-  test "x$as_lineno_1" != "x$as_lineno_2" &&
>-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
>-  # Find who we are.  Look in the path if we contain no path at all
>-  # relative or not.
>-  case $0 in
>-    *[\\/]* ) as_myself=$0 ;;
>-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>-for as_dir in $PATH
>-do
>-  IFS=$as_save_IFS
>-  test -z "$as_dir" && as_dir=.
>-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
>-done
>+if as_func_ret_success; then
>+  :
>+else
>+  exitcode=1
>+  echo as_func_ret_success failed.
>+fi
> 
>-       ;;
>-  esac
>-  # We did not find ourselves, most probably we were run as `sh COMMAND'
>-  # in which case we are not to be found in the path.
>-  if test "x$as_myself" = x; then
>-    as_myself=$0
>-  fi
>-  if test ! -f "$as_myself"; then
>-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
>-   { (exit 1); exit 1; }; }
>-  fi
>-  case $CONFIG_SHELL in
>-  '')
>+if as_func_ret_failure; then
>+  exitcode=1
>+  echo as_func_ret_failure succeeded.
>+fi
>+
>+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
>+  :
>+else
>+  exitcode=1
>+  echo positional parameters were not saved.
>+fi
>+
>+test \$exitcode = 0) || { (exit 1); exit 1; }
>+
>+(
>+  as_lineno_1=\$LINENO
>+  as_lineno_2=\$LINENO
>+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
>+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
>+") 2> /dev/null; then
>+  :
>+else
>+  as_candidate_shells=
>     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
> do
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>-  for as_base in sh bash ksh sh5; do
>-	 case $as_dir in
>+  case $as_dir in
> 	 /*)
>-	   if ("$as_dir/$as_base" -c '
>+	   for as_base in sh bash ksh sh5; do
>+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
>+	   done;;
>+       esac
>+done
>+IFS=$as_save_IFS
>+
>+
>+      for as_shell in $as_candidate_shells $SHELL; do
>+	 # Try only shells that exist, to save several forks.
>+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
>+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
>+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>+  emulate sh
>+  NULLCMD=:
>+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
>+  # is contrary to our usage.  Disable this feature.
>+  alias -g '${1+"$@"}'='"$@"'
>+  setopt NO_GLOB_SUBST
>+else
>+  case `(set -o) 2>/dev/null` in
>+  *posix*) set -o posix ;;
>+esac
>+
>+fi
>+
>+
>+:
>+_ASEOF
>+}; then
>+  CONFIG_SHELL=$as_shell
>+	       as_have_required=yes
>+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
>+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>+  emulate sh
>+  NULLCMD=:
>+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
>+  # is contrary to our usage.  Disable this feature.
>+  alias -g '${1+"$@"}'='"$@"'
>+  setopt NO_GLOB_SUBST
>+else
>+  case `(set -o) 2>/dev/null` in
>+  *posix*) set -o posix ;;
>+esac
>+
>+fi
>+
>+
>+:
>+(as_func_return () {
>+  (exit $1)
>+}
>+as_func_success () {
>+  as_func_return 0
>+}
>+as_func_failure () {
>+  as_func_return 1
>+}
>+as_func_ret_success () {
>+  return 0
>+}
>+as_func_ret_failure () {
>+  return 1
>+}
>+
>+exitcode=0
>+if as_func_success; then
>+  :
>+else
>+  exitcode=1
>+  echo as_func_success failed.
>+fi
>+
>+if as_func_failure; then
>+  exitcode=1
>+  echo as_func_failure succeeded.
>+fi
>+
>+if as_func_ret_success; then
>+  :
>+else
>+  exitcode=1
>+  echo as_func_ret_success failed.
>+fi
>+
>+if as_func_ret_failure; then
>+  exitcode=1
>+  echo as_func_ret_failure succeeded.
>+fi
>+
>+if ( set x; as_func_ret_success y && test x = "$1" ); then
>+  :
>+else
>+  exitcode=1
>+  echo positional parameters were not saved.
>+fi
>+
>+test $exitcode = 0) || { (exit 1); exit 1; }
>+
>+(
>   as_lineno_1=$LINENO
>   as_lineno_2=$LINENO
>-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
>   test "x$as_lineno_1" != "x$as_lineno_2" &&
>-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
>-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
>-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
>-	     CONFIG_SHELL=$as_dir/$as_base
>-	     export CONFIG_SHELL
>-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
>-	   fi;;
>-	 esac
>-       done
>-done
>-;;
>-  esac
>+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
>+
>+_ASEOF
>+}; then
>+  break
>+fi
>+
>+fi
>+
>+      done
>+
>+      if test "x$CONFIG_SHELL" != x; then
>+  for as_var in BASH_ENV ENV
>+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
>+        done
>+        export CONFIG_SHELL
>+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
>+fi
>+
>+
>+    if test $as_have_required = no; then
>+  echo This script requires a shell more modern than all the
>+      echo shells that I found on your system.  Please install a
>+      echo modern shell, or manually run the script under such a
>+      echo shell if you do have one.
>+      { (exit 1); exit 1; }
>+fi
>+
>+
>+fi
>+
>+fi
>+
>+
>+
>+(eval "as_func_return () {
>+  (exit \$1)
>+}
>+as_func_success () {
>+  as_func_return 0
>+}
>+as_func_failure () {
>+  as_func_return 1
>+}
>+as_func_ret_success () {
>+  return 0
>+}
>+as_func_ret_failure () {
>+  return 1
>+}
>+
>+exitcode=0
>+if as_func_success; then
>+  :
>+else
>+  exitcode=1
>+  echo as_func_success failed.
>+fi
>+
>+if as_func_failure; then
>+  exitcode=1
>+  echo as_func_failure succeeded.
>+fi
>+
>+if as_func_ret_success; then
>+  :
>+else
>+  exitcode=1
>+  echo as_func_ret_success failed.
>+fi
>+
>+if as_func_ret_failure; then
>+  exitcode=1
>+  echo as_func_ret_failure succeeded.
>+fi
>+
>+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
>+  :
>+else
>+  exitcode=1
>+  echo positional parameters were not saved.
>+fi
>+
>+test \$exitcode = 0") || {
>+  echo No shell found that supports shell functions.
>+  echo Please tell autoconf@gnu.org about your system,
>+  echo including any error possibly output before this
>+  echo message
>+}
>+
>+
>+
>+  as_lineno_1=$LINENO
>+  as_lineno_2=$LINENO
>+  test "x$as_lineno_1" != "x$as_lineno_2" &&
>+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
> 
>   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
>   # uniformly replaced by the line number.  The first 'sed' inserts a
>-  # line-number line before each line; the second 'sed' does the real
>-  # work.  The second script uses 'N' to pair each line-number line
>-  # with the numbered line, and appends trailing '-' during
>-  # substitution so that $LINENO is not a special case at line end.
>+  # line-number line after each line using $LINENO; the second 'sed'
>+  # does the real work.  The second script uses 'N' to pair each
>+  # line-number line with the line containing $LINENO, and appends
>+  # trailing '-' during substitution so that $LINENO is not a special
>+  # case at line end.
>   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
>-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
>-  sed '=' <$as_myself |
>+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
>+  # E. McMahon (1931-1989) for sed's syntax.  :-)
>+  sed -n '
>+    p
>+    /[$]LINENO/=
>+  ' <$as_myself |
>     sed '
>+      s/[$]LINENO.*/&-/
>+      t lineno
>+      b
>+      :lineno
>       N
>-      s,$,-,
>-      : loop
>-      s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,
>+      :loop
>+      s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/
>       t loop
>-      s,-$,,
>-      s,^['$as_cr_digits']*\n,,
>+      s/-\n.*//
>     ' >$as_me.lineno &&
>-  chmod +x $as_me.lineno ||
>+  chmod +x "$as_me.lineno" ||
>     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
>    { (exit 1); exit 1; }; }
> 
>   # Don't try to exec as it changes $[0], causing all sort of problems
>   # (the dirname of $[0] is not the place where we might find the
>-  # original and so on.  Autoconf is especially sensible to this).
>-  . ./$as_me.lineno
>+  # original and so on.  Autoconf is especially sensitive to this).
>+  . "./$as_me.lineno"
>   # Exit status is that of the last command.
>   exit
> }
> 
> 
>-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
>-  *c*,-n*) ECHO_N= ECHO_C='
>-' ECHO_T='	' ;;
>-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
>-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
>+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
>+  as_dirname=dirname
>+else
>+  as_dirname=false
>+fi
>+
>+ECHO_C= ECHO_N= ECHO_T=
>+case `echo -n x` in
>+-n*)
>+  case `echo 'x\c'` in
>+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
>+  *)   ECHO_C='\c';;
>+  esac;;
>+*)
>+  ECHO_N='-n';;
> esac
> 
>-if expr a : '$a$' >/dev/null 2>&1; then
>+if expr a : '$a$' >/dev/null 2>&1 &&
>+   test "X`expr 00001 : '.*$...$'`" = X001; then
>   as_expr=expr
> else
>   as_expr=false
> fi
> 
> rm -f conf$$ conf$$.exe conf$$.file
>+if test -d conf$$.dir; then
>+  rm -f conf$$.dir/conf$$.file
>+else
>+  rm -f conf$$.dir
>+  mkdir conf$$.dir
>+fi
> echo >conf$$.file
> if ln -s conf$$.file conf$$ 2>/dev/null; then
>-  # We could just check for DJGPP; but this test a) works b) is more generic
>-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
>-  if test -f conf$$.exe; then
>-    # Don't use ln at all; we don't have any links
>+  as_ln_s='ln -s'
>+  # ... 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'.
>+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
>     as_ln_s='cp -p'
>-  else
>-    as_ln_s='ln -s'
>-  fi
> elif ln conf$$.file conf$$ 2>/dev/null; then
>   as_ln_s=ln
> else
>   as_ln_s='cp -p'
> fi
>-rm -f conf$$ conf$$.exe conf$$.file
>+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
>+rmdir conf$$.dir 2>/dev/null
> 
> if mkdir -p . 2>/dev/null; then
>   as_mkdir_p=:
>@@ -224,7 +520,28 @@
>   as_mkdir_p=false
> fi
> 
>-as_executable_p="test -f"
>+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
> 
> # 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'"
>@@ -233,26 +550,6 @@
> as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
> 
> 
>-# IFS
>-# We need space, tab and new line, in precisely that order.
>-as_nl='
>-'
>-IFS=" 	$as_nl"
>-
>-# CDPATH.
>-$as_unset CDPATH
>-
>-
>-# Find the correct PATH separator.  Usually this is `:', but
>-# DJGPP uses `;' like DOS.
>-if test "X${PATH_SEPARATOR+set}" != Xset; then
>-  UNAME=${UNAME-`uname 2>/dev/null`}
>-  case X$UNAME in
>-    *-DOS) lt_cv_sys_path_separator=';' ;;
>-    *)     lt_cv_sys_path_separator=':' ;;
>-  esac
>-  PATH_SEPARATOR=$lt_cv_sys_path_separator
>-fi
> 
> 
> # Check that we are running under the correct shell.
>@@ -272,7 +569,7 @@
> elif test "X$1" = X--fallback-echo; then
>   # Avoid inline document here, it may be left over
>   :
>-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
>+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
>   # Yippee, $echo works!
>   :
> else
>@@ -284,22 +581,22 @@
>   # used as fallback echo
>   shift
>   cat <<EOF
>-
>+$*
> EOF
>   exit 0
> fi
> 
> # The HP-UX ksh and POSIX shell print the target directory to stdout
> # if CDPATH is set.
>-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> 
> if test -z "$ECHO"; then
> if test "X${echo_test_string+set}" != Xset; then
> # find a string as large as possible, as long as the shell can cope with it
>   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
>     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
>-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
>-       echo_test_string="`eval $cmd`" &&
>+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
>+       echo_test_string=`eval $cmd` &&
>        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
>     then
>       break
>@@ -318,8 +615,9 @@
>   #
>   # So, first we look for a working echo in the user's PATH.
> 
>-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>   for dir in $PATH /usr/ucb; do
>+    IFS="$lt_save_ifs"
>     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
>        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
>        echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
>@@ -328,7 +626,7 @@
>       break
>     fi
>   done
>-  IFS="$save_ifs"
>+  IFS="$lt_save_ifs"
> 
>   if test "X$echo" = Xecho; then
>     # We didn't find a better echo, so look for alternatives.
>@@ -402,29 +700,31 @@
> 
> 
> 
>+
>+tagnames=${tagnames+${tagnames},}CXX
>+
>+tagnames=${tagnames+${tagnames},}F77
>+
>+exec 7<&0 </dev/null 6>&1
>+
> # Name of the host.
> # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
> # so uname gets run too.
> ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
> 
>-exec 6>&1
>-
> #
> # Initializations.
> #
> ac_default_prefix=/usr/local
>+ac_clean_files=
> ac_config_libobj_dir=.
>+LIBOBJS=
> cross_compiling=no
> subdirs=
> MFLAGS=
> MAKEFLAGS=
> SHELL=${CONFIG_SHELL-/bin/sh}
> 
>-# Maximum number of lines to put in a shell here document.
>-# This variable seems obsolete.  It should probably be removed, and
>-# only ac_max_sed_lines should be used.
>-: ${ac_max_here_lines=38}
>-
> # Identity of this package.
> PACKAGE_NAME='vamos'
> PACKAGE_TARNAME='vamos'
>@@ -436,42 +736,170 @@
> # Factoring default headers for most tests.
> ac_includes_default="\
> #include <stdio.h>
>-#if HAVE_SYS_TYPES_H
>+#ifdef HAVE_SYS_TYPES_H
> # include <sys/types.h>
> #endif
>-#if HAVE_SYS_STAT_H
>+#ifdef HAVE_SYS_STAT_H
> # include <sys/stat.h>
> #endif
>-#if STDC_HEADERS
>+#ifdef STDC_HEADERS
> # include <stdlib.h>
> # include <stddef.h>
> #else
>-# if HAVE_STDLIB_H
>+# ifdef HAVE_STDLIB_H
> #  include <stdlib.h>
> # endif
> #endif
>-#if HAVE_STRING_H
>-# if !STDC_HEADERS && HAVE_MEMORY_H
>+#ifdef HAVE_STRING_H
>+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
> #  include <memory.h>
> # endif
> # include <string.h>
> #endif
>-#if HAVE_STRINGS_H
>+#ifdef HAVE_STRINGS_H
> # include <strings.h>
> #endif
>-#if HAVE_INTTYPES_H
>+#ifdef HAVE_INTTYPES_H
> # include <inttypes.h>
>-#else
>-# if HAVE_STDINT_H
>-#  include <stdint.h>
>-# endif
> #endif
>-#if HAVE_UNISTD_H
>+#ifdef HAVE_STDINT_H
>+# include <stdint.h>
>+#endif
>+#ifdef HAVE_UNISTD_H
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ENABLE_XMESA_FX_TRUE ENABLE_XMESA_FX_FALSE DO_UNIT_TESTS_TRUE DO_UNIT_TESTS_FALSE LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL
>+PATH_SEPARATOR
>+PACKAGE_NAME
>+PACKAGE_TARNAME
>+PACKAGE_VERSION
>+PACKAGE_STRING
>+PACKAGE_BUGREPORT
>+exec_prefix
>+prefix
>+program_transform_name
>+bindir
>+sbindir
>+libexecdir
>+datarootdir
>+datadir
>+sysconfdir
>+sharedstatedir
>+localstatedir
>+includedir
>+oldincludedir
>+docdir
>+infodir
>+htmldir
>+dvidir
>+pdfdir
>+psdir
>+libdir
>+localedir
>+mandir
>+DEFS
>+ECHO_C
>+ECHO_N
>+ECHO_T
>+LIBS
>+build_alias
>+host_alias
>+target_alias
>+INSTALL_PROGRAM
>+INSTALL_SCRIPT
>+INSTALL_DATA
>+am__isrc
>+CYGPATH_W
>+PACKAGE
>+VERSION
>+ACLOCAL
>+AUTOCONF
>+AUTOMAKE
>+AUTOHEADER
>+MAKEINFO
>+install_sh
>+STRIP
>+INSTALL_STRIP_PROGRAM
>+mkdir_p
>+AWK
>+SET_MAKE
>+am__leading_dot
>+AMTAR
>+am__tar
>+am__untar
>+CXX
>+CXXFLAGS
>+LDFLAGS
>+CPPFLAGS
>+ac_ct_CXX
>+EXEEXT
>+OBJEXT
>+DEPDIR
>+am__include
>+am__quote
>+AMDEP_TRUE
>+AMDEP_FALSE
>+AMDEPBACKSLASH
>+CXXDEPMODE
>+am__fastdepCXX_TRUE
>+am__fastdepCXX_FALSE
>+build
>+build_cpu
>+build_vendor
>+build_os
>+host
>+host_cpu
>+host_vendor
>+host_os
>+CC
>+CFLAGS
>+ac_ct_CC
>+CCDEPMODE
>+am__fastdepCC_TRUE
>+am__fastdepCC_FALSE
>+SED
>+GREP
>+EGREP
>+LN_S
>+ECHO
>+AR
>+RANLIB
>+CPP
>+CXXCPP
>+F77
>+FFLAGS
>+ac_ct_F77
>+LIBTOOL
>+XMKMF
>+X_CFLAGS
>+X_PRE_LIBS
>+X_LIBS
>+X_EXTRA_LIBS
>+ENABLE_XMESA_FX_TRUE
>+ENABLE_XMESA_FX_FALSE
>+DO_UNIT_TESTS_TRUE
>+DO_UNIT_TESTS_FALSE
>+LIBOBJS
>+LTLIBOBJS'
> ac_subst_files=''
>+      ac_precious_vars='build_alias
>+host_alias
>+target_alias
>+CXX
>+CXXFLAGS
>+LDFLAGS
>+LIBS
>+CPPFLAGS
>+CCC
>+CC
>+CFLAGS
>+CPP
>+CXXCPP
>+F77
>+FFLAGS
>+XMKMF'
>+
> 
> # Initialize some variables set by options.
> ac_init_help=
>@@ -498,34 +926,48 @@
> # and all the variables that are supposed to be based on exec_prefix
> # by default will actually change.
> # Use braces instead of parens because sh, perl, etc. also accept them.
>+# (The list follows the same order as the GNU Coding Standards.)
> bindir='${exec_prefix}/bin'
> sbindir='${exec_prefix}/sbin'
> libexecdir='${exec_prefix}/libexec'
>-datadir='${prefix}/share'
>+datarootdir='${prefix}/share'
>+datadir='${datarootdir}'
> sysconfdir='${prefix}/etc'
> sharedstatedir='${prefix}/com'
> localstatedir='${prefix}/var'
>-libdir='${exec_prefix}/lib'
> includedir='${prefix}/include'
> oldincludedir='/usr/include'
>-infodir='${prefix}/info'
>-mandir='${prefix}/man'
>+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
>+infodir='${datarootdir}/info'
>+htmldir='${docdir}'
>+dvidir='${docdir}'
>+pdfdir='${docdir}'
>+psdir='${docdir}'
>+libdir='${exec_prefix}/lib'
>+localedir='${datarootdir}/locale'
>+mandir='${datarootdir}/man'
> 
> ac_prev=
>+ac_dashdash=
> for ac_option
> do
>   # If the previous option needs an argument, assign it.
>   if test -n "$ac_prev"; then
>-    eval "$ac_prev=\$ac_option"
>+    eval $ac_prev=\$ac_option
>     ac_prev=
>     continue
>   fi
> 
>-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=$.*$'`
>+  case $ac_option in
>+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
>+  *)	ac_optarg=yes ;;
>+  esac
> 
>   # Accept the important Cygnus configure options, so we can diagnose typos.
> 
>-  case $ac_option in
>+  case $ac_dashdash$ac_option in
>+  --)
>+    ac_dashdash=yes ;;
> 
>   -bindir | --bindir | --bindi | --bind | --bin | --bi)
>     ac_prev=bindir ;;
>@@ -547,33 +989,45 @@
>   --config-cache | -C)
>     cache_file=config.cache ;;
> 
>-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
>+  -datadir | --datadir | --datadi | --datad)
>     ac_prev=datadir ;;
>-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
>-  | --da=*)
>+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
>     datadir=$ac_optarg ;;
> 
>+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
>+  | --dataroo | --dataro | --datar)
>+    ac_prev=datarootdir ;;
>+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
>+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
>+    datarootdir=$ac_optarg ;;
>+
>   -disable-* | --disable-*)
>     ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'`
>     # Reject names that are not valid shell variable names.
>-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
>    { (exit 1); exit 1; }; }
>-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
>-    eval "enable_$ac_feature=no" ;;
>+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
>+    eval enable_$ac_feature=no ;;
>+
>+  -docdir | --docdir | --docdi | --doc | --do)
>+    ac_prev=docdir ;;
>+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
>+    docdir=$ac_optarg ;;
>+
>+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
>+    ac_prev=dvidir ;;
>+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
>+    dvidir=$ac_optarg ;;
> 
>   -enable-* | --enable-*)
>     ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
>     # Reject names that are not valid shell variable names.
>-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
>    { (exit 1); exit 1; }; }
>-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
>-    case $ac_option in
>-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
>-      *) ac_optarg=yes ;;
>-    esac
>-    eval "enable_$ac_feature='$ac_optarg'" ;;
>+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
>+    eval enable_$ac_feature=\$ac_optarg ;;
> 
>   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
>   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
>@@ -600,6 +1054,12 @@
>   -host=* | --host=* | --hos=* | --ho=*)
>     host_alias=$ac_optarg ;;
> 
>+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
>+    ac_prev=htmldir ;;
>+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
>+  | --ht=*)
>+    htmldir=$ac_optarg ;;
>+
>   -includedir | --includedir | --includedi | --included | --include \
>   | --includ | --inclu | --incl | --inc)
>     ac_prev=includedir ;;
>@@ -624,13 +1084,16 @@
>   | --libexe=* | --libex=* | --libe=*)
>     libexecdir=$ac_optarg ;;
> 
>+  -localedir | --localedir | --localedi | --localed | --locale)
>+    ac_prev=localedir ;;
>+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
>+    localedir=$ac_optarg ;;
>+
>   -localstatedir | --localstatedir | --localstatedi | --localstated \
>-  | --localstate | --localstat | --localsta | --localst \
>-  | --locals | --local | --loca | --loc | --lo)
>+  | --localstate | --localstat | --localsta | --localst | --locals)
>     ac_prev=localstatedir ;;
>   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
>-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
>-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
>+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
>     localstatedir=$ac_optarg ;;
> 
>   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
>@@ -695,6 +1158,16 @@
>   | --progr-tra=* | --program-tr=* | --program-t=*)
>     program_transform_name=$ac_optarg ;;
> 
>+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
>+    ac_prev=pdfdir ;;
>+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
>+    pdfdir=$ac_optarg ;;
>+
>+  -psdir | --psdir | --psdi | --psd | --ps)
>+    ac_prev=psdir ;;
>+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
>+    psdir=$ac_optarg ;;
>+
>   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
>   | -silent | --silent | --silen | --sile | --sil)
>     silent=yes ;;
>@@ -747,24 +1220,20 @@
>   -with-* | --with-*)
>     ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
>     # Reject names that are not valid shell variable names.
>-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid package name: $ac_package" >&2
>    { (exit 1); exit 1; }; }
>-    ac_package=`echo $ac_package| sed 's/-/_/g'`
>-    case $ac_option in
>-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
>-      *) ac_optarg=yes ;;
>-    esac
>-    eval "with_$ac_package='$ac_optarg'" ;;
>+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
>+    eval with_$ac_package=\$ac_optarg ;;
> 
>   -without-* | --without-*)
>     ac_package=`expr "x$ac_option" : 'x-*without-$.*$'`
>     # Reject names that are not valid shell variable names.
>-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid package name: $ac_package" >&2
>    { (exit 1); exit 1; }; }
>-    ac_package=`echo $ac_package | sed 's/-/_/g'`
>-    eval "with_$ac_package=no" ;;
>+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
>+    eval with_$ac_package=no ;;
> 
>   --x)
>     # Obsolete; use --with-x.
>@@ -795,8 +1264,7 @@
>     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
>    { (exit 1); exit 1; }; }
>-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
>-    eval "$ac_envvar='$ac_optarg'"
>+    eval $ac_envvar=\$ac_optarg
>     export $ac_envvar ;;
> 
>   *)
>@@ -816,27 +1284,19 @@
>    { (exit 1); exit 1; }; }
> fi
> 
>-# Be sure to have absolute paths.
>-for ac_var in exec_prefix prefix
>+# Be sure to have absolute directory names.
>+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
>+		datadir sysconfdir sharedstatedir localstatedir includedir \
>+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
>+		libdir localedir mandir
> do
>-  eval ac_val=$`echo $ac_var`
>+  eval ac_val=\$$ac_var
>   case $ac_val in
>-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
>-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
>-   { (exit 1); exit 1; }; };;
>-  esac
>-done
>-
>-# Be sure to have absolute paths.
>-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
>-	      localstatedir libdir includedir oldincludedir infodir mandir
>-do
>-  eval ac_val=$`echo $ac_var`
>-  case $ac_val in
>-    [\\/$]* | ?:[\\/]* ) ;;
>-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
>-   { (exit 1); exit 1; }; };;
>+    [\\/$]* | ?:[\\/]* )  continue;;
>+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
>   esac
>+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
>+   { (exit 1); exit 1; }; }
> done
> 
> # There might be people who depend on the old broken behavior: `$host'
>@@ -863,86 +1323,76 @@
> test "$silent" = yes && exec 6>/dev/null
> 
> 
>+ac_pwd=`pwd` && test -n "$ac_pwd" &&
>+ac_ls_di=`ls -di .` &&
>+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
>+  { echo "$as_me: error: Working directory cannot be determined" >&2
>+   { (exit 1); exit 1; }; }
>+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
>+  { echo "$as_me: error: pwd does not report name of working directory" >&2
>+   { (exit 1); exit 1; }; }
>+
>+
> # Find the source files, if location was not specified.
> if test -z "$srcdir"; then
>   ac_srcdir_defaulted=yes
>-  # Try the directory containing this script, then its parent.
>-  ac_confdir=`(dirname "$0") 2>/dev/null ||
>+  # Try the directory containing this script, then the parent directory.
>+  ac_confdir=`$as_dirname -- "$0" ||
> $as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
> 	 X"$0" : 'X$//$[^/]' \| \
> 	 X"$0" : 'X$//$$' \| \
>-	 X"$0" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
> echo X"$0" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$[^/].*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
>   srcdir=$ac_confdir
>-  if test ! -r $srcdir/$ac_unique_file; then
>+  if test ! -r "$srcdir/$ac_unique_file"; then
>     srcdir=..
>   fi
> else
>   ac_srcdir_defaulted=no
> fi
>-if test ! -r $srcdir/$ac_unique_file; then
>-  if test "$ac_srcdir_defaulted" = yes; then
>-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
>-   { (exit 1); exit 1; }; }
>-  else
>-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
>+if test ! -r "$srcdir/$ac_unique_file"; then
>+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
>+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
>    { (exit 1); exit 1; }; }
>-  fi
> fi
>-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
>-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
>-   { (exit 1); exit 1; }; }
>-srcdir=`echo "$srcdir" | sed 's%$[^\\/]$[\\/]*$%\1%'`
>-ac_env_build_alias_set=${build_alias+set}
>-ac_env_build_alias_value=$build_alias
>-ac_cv_env_build_alias_set=${build_alias+set}
>-ac_cv_env_build_alias_value=$build_alias
>-ac_env_host_alias_set=${host_alias+set}
>-ac_env_host_alias_value=$host_alias
>-ac_cv_env_host_alias_set=${host_alias+set}
>-ac_cv_env_host_alias_value=$host_alias
>-ac_env_target_alias_set=${target_alias+set}
>-ac_env_target_alias_value=$target_alias
>-ac_cv_env_target_alias_set=${target_alias+set}
>-ac_cv_env_target_alias_value=$target_alias
>-ac_env_CXX_set=${CXX+set}
>-ac_env_CXX_value=$CXX
>-ac_cv_env_CXX_set=${CXX+set}
>-ac_cv_env_CXX_value=$CXX
>-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
>-ac_env_CXXFLAGS_value=$CXXFLAGS
>-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
>-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
>-ac_env_LDFLAGS_set=${LDFLAGS+set}
>-ac_env_LDFLAGS_value=$LDFLAGS
>-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
>-ac_cv_env_LDFLAGS_value=$LDFLAGS
>-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
>-ac_env_CPPFLAGS_value=$CPPFLAGS
>-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
>-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
>-ac_env_CC_set=${CC+set}
>-ac_env_CC_value=$CC
>-ac_cv_env_CC_set=${CC+set}
>-ac_cv_env_CC_value=$CC
>-ac_env_CFLAGS_set=${CFLAGS+set}
>-ac_env_CFLAGS_value=$CFLAGS
>-ac_cv_env_CFLAGS_set=${CFLAGS+set}
>-ac_cv_env_CFLAGS_value=$CFLAGS
>-ac_env_CPP_set=${CPP+set}
>-ac_env_CPP_value=$CPP
>-ac_cv_env_CPP_set=${CPP+set}
>-ac_cv_env_CPP_value=$CPP
>-ac_env_CXXCPP_set=${CXXCPP+set}
>-ac_env_CXXCPP_value=$CXXCPP
>-ac_cv_env_CXXCPP_set=${CXXCPP+set}
>-ac_cv_env_CXXCPP_value=$CXXCPP
>+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
>+ac_abs_confdir=`(
>+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
>+   { (exit 1); exit 1; }; }
>+	pwd)`
>+# When building in place, set srcdir=.
>+if test "$ac_abs_confdir" = "$ac_pwd"; then
>+  srcdir=.
>+fi
>+# Remove unnecessary trailing slashes from srcdir.
>+# Double slashes in file names in object file debugging info
>+# mess up M-x gdb in Emacs.
>+case $srcdir in
>+*/) srcdir=`expr "X$srcdir" : 'X$.*[^/]$' \| "X$srcdir" : 'X$.*$'`;;
>+esac
>+for ac_var in $ac_precious_vars; do
>+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
>+  eval ac_env_${ac_var}_value=\$${ac_var}
>+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
>+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
>+done
> 
> #
> # Report the --help message.
>@@ -971,9 +1421,6 @@
>   -n, --no-create         do not create output files
>       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
> 
>-_ACEOF
>-
>-  cat <<_ACEOF
> Installation directories:
>   --prefix=PREFIX         install architecture-independent files in PREFIX
> 			  [$ac_default_prefix]
>@@ -991,15 +1438,22 @@
>   --bindir=DIR           user executables [EPREFIX/bin]
>   --sbindir=DIR          system admin executables [EPREFIX/sbin]
>   --libexecdir=DIR       program executables [EPREFIX/libexec]
>-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
>   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
>   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
>   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
>   --libdir=DIR           object code libraries [EPREFIX/lib]
>   --includedir=DIR       C header files [PREFIX/include]
>   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
>-  --infodir=DIR          info documentation [PREFIX/info]
>-  --mandir=DIR           man documentation [PREFIX/man]
>+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
>+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
>+  --infodir=DIR          info documentation [DATAROOTDIR/info]
>+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
>+  --mandir=DIR           man documentation [DATAROOTDIR/man]
>+  --docdir=DIR           documentation root [DATAROOTDIR/doc/vamos]
>+  --htmldir=DIR          html documentation [DOCDIR]
>+  --dvidir=DIR           dvi documentation [DOCDIR]
>+  --pdfdir=DIR           pdf documentation [DOCDIR]
>+  --psdir=DIR            ps documentation [DOCDIR]
> _ACEOF
> 
>   cat <<\_ACEOF
>@@ -1029,18 +1483,21 @@
>   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
>   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
>   --enable-unit-tests  build and execute unit tests
>-  --disable-dependency-tracking Speeds up one-time builds
>-  --enable-dependency-tracking  Do not reject slow dependency extractors
>-  --enable-shared=PKGS  build shared libraries default=yes
>-  --enable-static=PKGS  build static libraries default=yes
>-  --enable-fast-install=PKGS  optimize for fast installation default=yes
>+  --disable-dependency-tracking  speeds up one-time build
>+  --enable-dependency-tracking   do not reject slow dependency extractors
>+  --enable-shared[=PKGS]  build shared libraries [default=yes]
>+  --enable-static[=PKGS]  build static libraries [default=yes]
>+  --enable-fast-install[=PKGS]
>+                          optimize for fast installation [default=yes]
>   --disable-libtool-lock  avoid locking (might break parallel builds)
> 
> Optional Packages:
>   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
>   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
>-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
>-  --with-pic              try to use only PIC/non-PIC objects default=use both
>+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
>+  --with-pic              try to use only PIC/non-PIC objects [default=use
>+                          both]
>+  --with-tags[=TAGS]      include additional configurations [automatic]
>   --with-x                use the X Window System
> 
> Some influential environment variables:
>@@ -1048,132 +1505,102 @@
>   CXXFLAGS    C++ compiler flags
>   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
>               nonstandard directory <lib dir>
>-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
>-              headers in a nonstandard directory <include 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
>+              you have headers in a nonstandard directory <include dir>
>   CC          C compiler command
>   CFLAGS      C compiler flags
>   CPP         C preprocessor
>   CXXCPP      C++ preprocessor
>+  F77         Fortran 77 compiler command
>+  FFLAGS      Fortran 77 compiler flags
>+  XMKMF       Path to xmkmf, Makefile generator for X Window System
> 
> Use these variables to override the choices made by `configure' or to help
> it to find libraries and programs with nonstandard names/locations.
> 
> Report bugs to <snick-a-doo@comcast.net>.
> _ACEOF
>+ac_status=$?
> fi
> 
> if test "$ac_init_help" = "recursive"; then
>   # If there are subdirs, report their specific --help.
>-  ac_popdir=`pwd`
>   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
>-    test -d $ac_dir || continue
>+    test -d "$ac_dir" || continue
>     ac_builddir=.
> 
>-if test "$ac_dir" != .; then
>+case "$ac_dir" in
>+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
>+*)
>   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
>-  # A "../" for each directory in $ac_dir_suffix.
>-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
>-else
>-  ac_dir_suffix= ac_top_builddir=
>-fi
>+  # A ".." for each directory in $ac_dir_suffix.
>+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
>+  case $ac_top_builddir_sub in
>+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
>+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
>+  esac ;;
>+esac
>+ac_abs_top_builddir=$ac_pwd
>+ac_abs_builddir=$ac_pwd$ac_dir_suffix
>+# for backward compatibility:
>+ac_top_builddir=$ac_top_build_prefix
> 
> case $srcdir in
>-  .)  # No --srcdir option.  We are building in place.
>+  .)  # We are building in place.
>     ac_srcdir=.
>-    if test -z "$ac_top_builddir"; then
>-       ac_top_srcdir=.
>-    else
>-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
>-    fi ;;
>-  [\\/]* | ?:[\\/]* )  # Absolute path.
>+    ac_top_srcdir=$ac_top_builddir_sub
>+    ac_abs_top_srcdir=$ac_pwd ;;
>+  [\\/]* | ?:[\\/]* )  # Absolute name.
>     ac_srcdir=$srcdir$ac_dir_suffix;
>-    ac_top_srcdir=$srcdir ;;
>-  *) # Relative path.
>-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
>-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
>-esac
>-
>-# Do not use `cd foo && pwd` to compute absolute paths, because
>-# the directories may not exist.
>-case `pwd` in
>-.) ac_abs_builddir="$ac_dir";;
>-*)
>-  case "$ac_dir" in
>-  .) ac_abs_builddir=`pwd`;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
>-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_top_builddir=${ac_top_builddir}.;;
>-*)
>-  case ${ac_top_builddir}. in
>-  .) ac_abs_top_builddir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
>-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_srcdir=$ac_srcdir;;
>-*)
>-  case $ac_srcdir in
>-  .) ac_abs_srcdir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
>-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_top_srcdir=$ac_top_srcdir;;
>-*)
>-  case $ac_top_srcdir in
>-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
>-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
>-  esac;;
>+    ac_top_srcdir=$srcdir
>+    ac_abs_top_srcdir=$srcdir ;;
>+  *) # Relative name.
>+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
>+    ac_top_srcdir=$ac_top_build_prefix$srcdir
>+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
> esac
>+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> 
>-    cd $ac_dir
>-    # Check for guested configure; otherwise get Cygnus style configure.
>-    if test -f $ac_srcdir/configure.gnu; then
>-      echo
>-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
>-    elif test -f $ac_srcdir/configure; then
>-      echo
>-      $SHELL $ac_srcdir/configure  --help=recursive
>-    elif test -f $ac_srcdir/configure.ac ||
>-	   test -f $ac_srcdir/configure.in; then
>-      echo
>-      $ac_configure --help
>+    cd "$ac_dir" || { ac_status=$?; continue; }
>+    # Check for guested configure.
>+    if test -f "$ac_srcdir/configure.gnu"; then
>+      echo &&
>+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
>+    elif test -f "$ac_srcdir/configure"; then
>+      echo &&
>+      $SHELL "$ac_srcdir/configure" --help=recursive
>     else
>       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
>-    fi
>-    cd $ac_popdir
>+    fi || ac_status=$?
>+    cd "$ac_pwd" || { ac_status=$?; break; }
>   done
> fi
> 
>-test -n "$ac_init_help" && exit 0
>+test -n "$ac_init_help" && exit $ac_status
> if $ac_init_version; then
>   cat <<\_ACEOF
> vamos configure 0.5.5
>-generated by GNU Autoconf 2.59
>+generated by GNU Autoconf 2.61
> 
>-Copyright (C) 2003 Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
> This configure script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it.
> _ACEOF
>-  exit 0
>+  exit
> fi
>-exec 5>config.log
>-cat >&5 <<_ACEOF
>+cat >config.log <<_ACEOF
> This file contains any messages produced by compilers while
> running configure, to aid debugging if configure makes a mistake.
> 
> It was created by vamos $as_me 0.5.5, which was
>-generated by GNU Autoconf 2.59.  Invocation command line was
>+generated by GNU Autoconf 2.61.  Invocation command line was
> 
>   $ $0 $@
> 
> _ACEOF
>+exec 5>>config.log
> {
> cat <<_ASUNAME
> ## --------- ##
>@@ -1192,7 +1619,7 @@
> /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
> /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
> /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
>-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
>+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
> /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
> /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
> /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
>@@ -1206,6 +1633,7 @@
>   test -z "$as_dir" && as_dir=.
>   echo "PATH: $as_dir"
> done
>+IFS=$as_save_IFS
> 
> } >&5
> 
>@@ -1227,7 +1655,6 @@
> ac_configure_args=
> ac_configure_args0=
> ac_configure_args1=
>-ac_sep=
> ac_must_keep_next=false
> for ac_pass in 1 2
> do
>@@ -1238,7 +1665,7 @@
>     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
>     | -silent | --silent | --silen | --sile | --sil)
>       continue ;;
>-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*)
>+    *\'*)
>       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
>     esac
>     case $ac_pass in
>@@ -1260,9 +1687,7 @@
> 	  -* ) ac_must_keep_next=true ;;
> 	esac
>       fi
>-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
>-      # Get rid of the leading space.
>-      ac_sep=" "
>+      ac_configure_args="$ac_configure_args '$ac_arg'"
>       ;;
>     esac
>   done
>@@ -1273,8 +1698,8 @@
> # When interrupted or exit'd, cleanup temporary files, and complete
> # config.log.  We remove comments because anyway the quotes in there
> # would cause problems or look ugly.
>-# WARNING: Be sure not to use single quotes in there, as some shells,
>-# such as our DU 5.0 friend, will then `close' the trap.
>+# WARNING: Use '\'' to represent an apostrophe within the trap.
>+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
> trap 'exit_status=$?
>   # Save into config.log some information that might help in debugging.
>   {
>@@ -1287,20 +1712,34 @@
> _ASBOX
>     echo
>     # The following way of writing the cache mishandles newlines in values,
>-{
>+(
>+  for ac_var in `(set) 2>&1 | sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'\''`; do
>+    eval ac_val=\$$ac_var
>+    case $ac_val in #(
>+    *${as_nl}*)
>+      case $ac_var in #(
>+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
>+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
>+      esac
>+      case $ac_var in #(
>+      _ | IFS | as_nl) ;; #(
>+      *) $as_unset $ac_var ;;
>+      esac ;;
>+    esac
>+  done
>   (set) 2>&1 |
>-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
>-    *ac_space=\ *)
>+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
>+    *${as_nl}ac_space=\ *)
>       sed -n \
>-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
>-	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='"'"'\\2'"'"'/p"
>-      ;;
>+	"s/'\''/'\''\\\\'\'''\''/g;
>+	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\''\\2'\''/p"
>+      ;; #(
>     *)
>-      sed -n \
>-	"s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"
>+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
>       ;;
>-    esac;
>-}
>+    esac |
>+    sort
>+)
>     echo
> 
>     cat <<\_ASBOX
>@@ -1311,22 +1750,28 @@
>     echo
>     for ac_var in $ac_subst_vars
>     do
>-      eval ac_val=$`echo $ac_var`
>-      echo "$ac_var='"'"'$ac_val'"'"'"
>+      eval ac_val=\$$ac_var
>+      case $ac_val in
>+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
>+      esac
>+      echo "$ac_var='\''$ac_val'\''"
>     done | sort
>     echo
> 
>     if test -n "$ac_subst_files"; then
>       cat <<\_ASBOX
>-## ------------- ##
>-## Output files. ##
>-## ------------- ##
>+## ------------------- ##
>+## File substitutions. ##
>+## ------------------- ##
> _ASBOX
>       echo
>       for ac_var in $ac_subst_files
>       do
>-	eval ac_val=$`echo $ac_var`
>-	echo "$ac_var='"'"'$ac_val'"'"'"
>+	eval ac_val=\$$ac_var
>+	case $ac_val in
>+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
>+	esac
>+	echo "$ac_var='\''$ac_val'\''"
>       done | sort
>       echo
>     fi
>@@ -1338,26 +1783,24 @@
> ## ----------- ##
> _ASBOX
>       echo
>-      sed "/^$/d" confdefs.h | sort
>+      cat confdefs.h
>       echo
>     fi
>     test "$ac_signal" != 0 &&
>       echo "$as_me: caught signal $ac_signal"
>     echo "$as_me: exit $exit_status"
>   } >&5
>-  rm -f core *.core &&
>-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
>+  rm -f core *.core core.conftest.* &&
>+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
>     exit $exit_status
>-     ' 0
>+' 0
> for ac_signal in 1 2 13 15; do
>   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
> done
> ac_signal=0
> 
> # confdefs.h avoids OS command line length limits that DEFS can exceed.
>-rm -rf conftest* confdefs.h
>-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
>-echo >confdefs.h
>+rm -f -r conftest* confdefs.h
> 
> # Predefined preprocessor variables.
> 
>@@ -1388,14 +1831,17 @@
> 
> # Let the site file select an alternate cache file if it wants to.
> # Prefer explicitly selected file to automatically selected ones.
>-if test -z "$CONFIG_SITE"; then
>-  if test "x$prefix" != xNONE; then
>-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
>-  else
>-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
>-  fi
>+if test -n "$CONFIG_SITE"; then
>+  set x "$CONFIG_SITE"
>+elif test "x$prefix" != xNONE; then
>+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
>+else
>+  set x "$ac_default_prefix/share/config.site" \
>+	"$ac_default_prefix/etc/config.site"
> fi
>-for ac_site_file in $CONFIG_SITE; do
>+shift
>+for ac_site_file
>+do
>   if test -r "$ac_site_file"; then
>     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
> echo "$as_me: loading site script $ac_site_file" >&6;}
>@@ -1411,8 +1857,8 @@
>     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
> echo "$as_me: loading cache $cache_file" >&6;}
>     case $cache_file in
>-      [\\/]* | ?:[\\/]* ) . $cache_file;;
>-      *)                      . ./$cache_file;;
>+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
>+      *)                      . "./$cache_file";;
>     esac
>   fi
> else
>@@ -1424,12 +1870,11 @@
> # Check that the precious variables saved in the cache have kept the same
> # value.
> ac_cache_corrupted=false
>-for ac_var in `(set) 2>&1 |
>-	       sed -n 's/^ac_env_$[a-zA-Z_0-9]*$_set=.*/\1/p'`; do
>+for ac_var in $ac_precious_vars; do
>   eval ac_old_set=\$ac_cv_env_${ac_var}_set
>   eval ac_new_set=\$ac_env_${ac_var}_set
>-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
>-  eval ac_new_val="\$ac_env_${ac_var}_value"
>+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
>+  eval ac_new_val=\$ac_env_${ac_var}_value
>   case $ac_old_set,$ac_new_set in
>     set,)
>       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
>@@ -1454,8 +1899,7 @@
>   # Pass precious variables to config.status.
>   if test "$ac_new_set" = set; then
>     case $ac_new_val in
>-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*)
>-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
>+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
>     *) ac_arg=$ac_var=$ac_new_val ;;
>     esac
>     case " $ac_configure_args " in
>@@ -1472,12 +1916,6 @@
>    { (exit 1); exit 1; }; }
> 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
>-
> 
> 
> 
>@@ -1502,36 +1940,48 @@
> 
> 
> 
>+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
> 
> 
> 
> ac_aux_dir=
>-for ac_dir in config $srcdir/config; do
>-  if test -f $ac_dir/install-sh; then
>+for ac_dir in config "$srcdir"/config; do
>+  if test -f "$ac_dir/install-sh"; then
>     ac_aux_dir=$ac_dir
>     ac_install_sh="$ac_aux_dir/install-sh -c"
>     break
>-  elif test -f $ac_dir/install.sh; then
>+  elif test -f "$ac_dir/install.sh"; then
>     ac_aux_dir=$ac_dir
>     ac_install_sh="$ac_aux_dir/install.sh -c"
>     break
>-  elif test -f $ac_dir/shtool; then
>+  elif test -f "$ac_dir/shtool"; then
>     ac_aux_dir=$ac_dir
>     ac_install_sh="$ac_aux_dir/shtool install -c"
>     break
>   fi
> done
> if test -z "$ac_aux_dir"; then
>-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
>-echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
>+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
>+echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
>    { (exit 1); exit 1; }; }
> fi
>-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
>-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
>-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
>+
>+# These three variables are undocumented and unsupported,
>+# and are intended to be withdrawn in a future Autoconf release.
>+# They can cause serious problems if a builder's source tree is in a directory
>+# whose full name contains unusual characters.
>+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
>+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
>+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
> 
> 
>-am__api_version="1.7"
>+
>+am__api_version='1.10'
>+
> # Find a good install program.  We prefer a C program (faster),
> # so one script is as good as another.  But avoid the broken or
> # incompatible versions:
>@@ -1545,8 +1995,8 @@
> # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
> # OS/2's system install, which has a completely different semantic
> # ./install, which can be erroneously created by make from ./install.sh.
>-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
>-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
>+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
> if test -z "$INSTALL"; then
> if test "${ac_cv_path_install+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
>@@ -1568,7 +2018,7 @@
>     # by default.
>     for ac_prog in ginstall scoinst install; do
>       for ac_exec_ext in '' $ac_executable_extensions; do
>-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
>+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
>@@ -1587,21 +2037,22 @@
>     ;;
> esac
> done
>+IFS=$as_save_IFS
> 
> 
> fi
>   if test "${ac_cv_path_install+set}" = set; then
>     INSTALL=$ac_cv_path_install
>   else
>-    # As a last resort, use the slow shell script.  We don't cache a
>-    # path for INSTALL within a source directory, because that will
>+    # As a last resort, use the slow shell script.  Don't cache a
>+    # value for INSTALL within a source directory, because that will
>     # break other packages using the cache if that directory is
>-    # removed, or if the path is relative.
>+    # removed, or if the value is a relative name.
>     INSTALL=$ac_install_sh
>   fi
> fi
>-echo "$as_me:$LINENO: result: $INSTALL" >&5
>-echo "${ECHO_T}$INSTALL" >&6
>+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
>+echo "${ECHO_T}$INSTALL" >&6; }
> 
> # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
> # It thinks the first close brace ends the variable substitution.
>@@ -1611,8 +2062,8 @@
> 
> test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
> 
>-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
>-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
>+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
> # Just in case
> sleep 1
> echo timestamp > conftest.file
>@@ -1654,21 +2105,20 @@
> Check your system clock" >&2;}
>    { (exit 1); exit 1; }; }
> fi
>-echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>+{ echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
> test "$program_prefix" != NONE &&
>-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
>+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
> # Use a double $ so make ignores it.
> test "$program_suffix" != NONE &&
>-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
>+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
> # Double any \ or $.  echo might interpret backslashes.
> # By default was `s,x,x', remove it if useless.
> cat <<\_ACEOF >conftest.sed
> s/[\\$]/&&/g;s/;s,x,x,$//
> _ACEOF
> program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
>-rm conftest.sed
>-
>+rm -f conftest.sed
> 
> # expand $ac_aux_dir to an absolute path
> am_aux_dir=`cd $ac_aux_dir && pwd`
>@@ -1683,12 +2133,60 @@
> echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
> fi
> 
>+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
>+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
>+if test -z "$MKDIR_P"; then
>+  if test "${ac_cv_path_mkdir+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
>+do
>+  IFS=$as_save_IFS
>+  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
>+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
>+	     'mkdir (GNU coreutils) '* | \
>+	     'mkdir (coreutils) '* | \
>+	     'mkdir (fileutils) '4.1*)
>+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
>+	       break 3;;
>+	   esac
>+	 done
>+       done
>+done
>+IFS=$as_save_IFS
>+
>+fi
>+
>+  if test "${ac_cv_path_mkdir+set}" = set; then
>+    MKDIR_P="$ac_cv_path_mkdir -p"
>+  else
>+    # As a last resort, use the slow shell script.  Don't cache a
>+    # value for MKDIR_P within a source directory, because that will
>+    # break other packages using the cache if that directory is
>+    # removed, or if the value is a relative name.
>+    test -d ./--version && rmdir ./--version
>+    MKDIR_P="$ac_install_sh -d"
>+  fi
>+fi
>+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
>+echo "${ECHO_T}$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.
> set dummy $ac_prog; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_AWK+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -1701,54 +2199,57 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_AWK="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> AWK=$ac_cv_prog_AWK
> if test -n "$AWK"; then
>-  echo "$as_me:$LINENO: result: $AWK" >&5
>-echo "${ECHO_T}$AWK" >&6
>+  { echo "$as_me:$LINENO: result: $AWK" >&5
>+echo "${ECHO_T}$AWK" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
>   test -n "$AWK" && break
> done
> 
>-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
>-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
>-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
>-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
>+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
>+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
>+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
>+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   cat >conftest.make <<\_ACEOF
>+SHELL = /bin/sh
> all:
>-	@echo 'ac_maketemp="$(MAKE)"'
>+	@echo '@@@%%%=$(MAKE)=@@@%%%'
> _ACEOF
> # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
>-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
>-if test -n "$ac_maketemp"; then
>-  eval ac_cv_prog_make_${ac_make}_set=yes
>-else
>-  eval ac_cv_prog_make_${ac_make}_set=no
>-fi
>+case `${MAKE-make} -f conftest.make 2>/dev/null` in
>+  *@@@%%%=?*=@@@%%%*)
>+    eval ac_cv_prog_make_${ac_make}_set=yes;;
>+  *)
>+    eval ac_cv_prog_make_${ac_make}_set=no;;
>+esac
> rm -f conftest.make
> fi
>-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
>-  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
>+  { echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
>   SET_MAKE=
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>   SET_MAKE="MAKE=${MAKE-make}"
> fi
> 
>@@ -1761,12 +2262,16 @@
> fi
> rmdir .tst 2>/dev/null
> 
>- # test to see if srcdir already configured
>-if test "`cd $srcdir && pwd`" != "`pwd`" &&
>-   test -f $srcdir/config.status; then
>-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
>+if test "`cd $srcdir && pwd`" != "`pwd`"; then
>+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
>+  # is not polluted with repeated "-I."
>+  am__isrc=' -I$(srcdir)'
>+  # test to see if srcdir already configured
>+  if test -f $srcdir/config.status; then
>+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
> echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
>    { (exit 1); exit 1; }; }
>+  fi
> fi
> 
> # test whether we have cygpath
>@@ -1809,10 +2314,7 @@
> 
> MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
> 
>-
>-AMTAR=${AMTAR-"${am_missing_run}tar"}
>-
>-install_sh=${install_sh-"$am_aux_dir/install-sh"}
>+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
> 
> # Installed binaries are usually stripped using `strip' when the user
> # run `make install-strip'.  However `strip' might not be the right
>@@ -1822,8 +2324,8 @@
>   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.
> set dummy ${ac_tool_prefix}strip; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_STRIP+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -1836,32 +2338,34 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> STRIP=$ac_cv_prog_STRIP
> if test -n "$STRIP"; then
>-  echo "$as_me:$LINENO: result: $STRIP" >&5
>-echo "${ECHO_T}$STRIP" >&6
>+  { echo "$as_me:$LINENO: result: $STRIP" >&5
>+echo "${ECHO_T}$STRIP" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
> fi
> if test -z "$ac_cv_prog_STRIP"; then
>   ac_ct_STRIP=$STRIP
>   # Extract the first word of "strip", so it can be a program name with args.
> set dummy strip; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -1874,44 +2378,64 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_STRIP="strip"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
>-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
> fi
> fi
> ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
> if test -n "$ac_ct_STRIP"; then
>-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
>-echo "${ECHO_T}$ac_ct_STRIP" >&6
>+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
>+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>-  STRIP=$ac_ct_STRIP
>+  if test "x$ac_ct_STRIP" = x; then
>+    STRIP=":"
>+  else
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    STRIP=$ac_ct_STRIP
>+  fi
> else
>   STRIP="$ac_cv_prog_STRIP"
> fi
> 
> fi
>-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
>+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
> 
> # We need awk for the "check" target.  The system "awk" is bad on
> # some platforms.
>+# Always define AMTAR for backward compatibility.
>+
>+AMTAR=${AMTAR-"${am_missing_run}tar"}
>+
>+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
> 
> 
> 
> 
>-# Check whether --enable-unit_tests or --disable-unit_tests was given.
>+
>+
>+# Check whether --enable-unit_tests was given.
> if test "${enable_unit_tests+set}" = set; then
>-  enableval="$enable_unit_tests"
>-  case "${enableval}" in
>+  enableval=$enable_unit_tests; case "${enableval}" in
>        yes) unit_tests=true;;
>        no) unit_tests=false;;
>        *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-unit-tests" >&5
>@@ -1920,20 +2444,25 @@
>      esac
> else
>   unit_tests=true
>-fi;
>+fi
>+
> 
>-ac_ext=cc
>+ac_ext=cpp
> ac_cpp='$CXXCPP $CPPFLAGS'
> ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
> ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>-if test -n "$ac_tool_prefix"; then
>-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
>+if test -z "$CXX"; then
>+  if test -n "$CCC"; then
>+    CXX=$CCC
>+  else
>+    if test -n "$ac_tool_prefix"; then
>+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
>   do
>     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
> set dummy $ac_tool_prefix$ac_prog; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_CXX+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -1946,36 +2475,38 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> CXX=$ac_cv_prog_CXX
> if test -n "$CXX"; then
>-  echo "$as_me:$LINENO: result: $CXX" >&5
>-echo "${ECHO_T}$CXX" >&6
>+  { echo "$as_me:$LINENO: result: $CXX" >&5
>+echo "${ECHO_T}$CXX" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
>     test -n "$CXX" && break
>   done
> fi
> if test -z "$CXX"; then
>   ac_ct_CXX=$CXX
>-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
>+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
> do
>   # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -1988,49 +2519,79 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_CXX="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
> if test -n "$ac_ct_CXX"; then
>-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
>-echo "${ECHO_T}$ac_ct_CXX" >&6
>+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
>+echo "${ECHO_T}$ac_ct_CXX" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
>   test -n "$ac_ct_CXX" && break
> done
>-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
> 
>-  CXX=$ac_ct_CXX
>+  if test "x$ac_ct_CXX" = x; then
>+    CXX="g++"
>+  else
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    CXX=$ac_ct_CXX
>+  fi
> fi
> 
>-
>+  fi
>+fi
> # Provide some information about the compiler.
>-echo "$as_me:$LINENO:" \
>-     "checking for C++ compiler version" >&5
>+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
> ac_compiler=`set X $ac_compile; echo $2`
>-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
>-  (eval $ac_compiler --version </dev/null >&5) 2>&5
>+{ (ac_try="$ac_compiler --version >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler --version >&5") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }
>-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
>-  (eval $ac_compiler -v </dev/null >&5) 2>&5
>+{ (ac_try="$ac_compiler -v >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler -v >&5") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }
>-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
>-  (eval $ac_compiler -V </dev/null >&5) 2>&5
>+{ (ac_try="$ac_compiler -V >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler -V >&5") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }
>@@ -2055,47 +2616,77 @@
> # 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.
>-echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
>-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
>+echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; }
> ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
>-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
>-  (eval $ac_link_default) 2>&5
>+#
>+# List of possible output files, starting from the most likely.
>+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
>+# only as a last resort.  b.out is created by i960 compilers.
>+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
>+#
>+# The IRIX 6 linker writes into existing files which may not be
>+# executable, retaining their permissions.  Remove them first so a
>+# subsequent execution test works.
>+ac_rmfiles=
>+for ac_file in $ac_files
>+do
>+  case $ac_file in
>+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
>+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
>+  esac
>+done
>+rm -f $ac_rmfiles
>+
>+if { (ac_try="$ac_link_default"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link_default") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-  # Find the output, starting from the most likely.  This scheme is
>-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
>-# resort.
>-
>-# Be careful to initialize this variable, since it used to be cached.
>-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
>-ac_cv_exeext=
>-# b.out is created by i960 compilers.
>-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
>+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
>+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
>+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
>+# so that the user can short-circuit this test for compilers unknown to
>+# Autoconf.
>+for ac_file in $ac_files ''
> do
>   test -f "$ac_file" || continue
>   case $ac_file in
>-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
>-	;;
>-    conftest.$ac_ext )
>-	# This is the source file.
>+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
> 	;;
>     [ab].out )
> 	# We found the default executable, but exeext='' is most
> 	# certainly right.
> 	break;;
>     *.* )
>-	ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
>-	# FIXME: I believe we export ac_cv_exeext for Libtool,
>-	# but it would be cool to find out if it's true.  Does anybody
>-	# maintain Libtool? --akim.
>-	export ac_cv_exeext
>+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
>+	then :; else
>+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
>+	fi
>+	# We set ac_cv_exeext here because the later test for it is not
>+	# safe: cross compilers may not add the suffix if given an `-o'
>+	# argument, so we may need to know it at that point already.
>+	# Even if this section looks crufty: it has the advantage of
>+	# actually working.
> 	break;;
>     * )
> 	break;;
>   esac
> done
>+test "$ac_cv_exeext" = no && ac_cv_exeext=
>+
> else
>+  ac_file=''
>+fi
>+
>+{ echo "$as_me:$LINENO: result: $ac_file" >&5
>+echo "${ECHO_T}$ac_file" >&6; }
>+if test -z "$ac_file"; then
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>@@ -2107,19 +2698,21 @@
> fi
> 
> ac_exeext=$ac_cv_exeext
>-echo "$as_me:$LINENO: result: $ac_file" >&5
>-echo "${ECHO_T}$ac_file" >&6
> 
>-# Check the compiler produces executables we can run.  If not, either
>+# Check that the compiler produces executables we can run.  If not, either
> # the compiler is broken, or we cross compile.
>-echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
>-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
>+echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
> # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
> # If not cross compiling, check that we can run a simple program.
> if test "$cross_compiling" != yes; then
>   if { ac_try='./$ac_file'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>+  { (case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_try") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; }; then
>@@ -2138,22 +2731,27 @@
>     fi
>   fi
> fi
>-echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>+{ echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
> 
> rm -f a.out a.exe conftest$ac_cv_exeext b.out
> ac_clean_files=$ac_clean_files_save
>-# Check the compiler produces executables we can run.  If not, either
>+# Check that the compiler produces executables we can run.  If not, either
> # the compiler is broken, or we cross compile.
>-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
>-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
>-echo "$as_me:$LINENO: result: $cross_compiling" >&5
>-echo "${ECHO_T}$cross_compiling" >&6
>-
>-echo "$as_me:$LINENO: checking for suffix of executables" >&5
>-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
>+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
>+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
>+echo "${ECHO_T}$cross_compiling" >&6; }
>+
>+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
>+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>@@ -2164,9 +2762,8 @@
> for ac_file in conftest.exe conftest conftest.*; do
>   test -f "$ac_file" || continue
>   case $ac_file in
>-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
>+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
>     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
>-	  export ac_cv_exeext
> 	  break;;
>     * ) break;;
>   esac
>@@ -2180,14 +2777,14 @@
> fi
> 
> rm -f conftest$ac_cv_exeext
>-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
>-echo "${ECHO_T}$ac_cv_exeext" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
>+echo "${ECHO_T}$ac_cv_exeext" >&6; }
> 
> rm -f conftest.$ac_ext
> EXEEXT=$ac_cv_exeext
> ac_exeext=$EXEEXT
>-echo "$as_me:$LINENO: checking for suffix of object files" >&5
>-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
>+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
> if test "${ac_cv_objext+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -2207,14 +2804,20 @@
> }
> _ACEOF
> rm -f conftest.o conftest.obj
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>&5
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
>+  for ac_file in conftest.o conftest.obj conftest.*; do
>+  test -f "$ac_file" || continue;
>   case $ac_file in
>-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
>+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
>     *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
>        break;;
>   esac
>@@ -2232,12 +2835,12 @@
> 
> rm -f conftest.$ac_cv_objext conftest.$ac_ext
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
>-echo "${ECHO_T}$ac_cv_objext" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
>+echo "${ECHO_T}$ac_cv_objext" >&6; }
> OBJEXT=$ac_cv_objext
> ac_objext=$OBJEXT
>-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
>-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
>+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
> if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -2260,50 +2863,49 @@
> }
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_compiler_gnu=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_compiler_gnu=no
>+	ac_compiler_gnu=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
> 
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
>-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
>+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
> GXX=`test $ac_compiler_gnu = yes && echo yes`
> ac_test_CXXFLAGS=${CXXFLAGS+set}
> ac_save_CXXFLAGS=$CXXFLAGS
>-CXXFLAGS="-g"
>-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
>-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
>+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
> if test "${ac_cv_prog_cxx_g+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  cat >conftest.$ac_ext <<_ACEOF
>+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
>+   ac_cxx_werror_flag=yes
>+   ac_cv_prog_cxx_g=no
>+   CXXFLAGS="-g"
>+   cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
>@@ -2319,159 +2921,133 @@
> }
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_cv_prog_cxx_g=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_prog_cxx_g=no
>-fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
>-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
>-if test "$ac_test_CXXFLAGS" = set; then
>-  CXXFLAGS=$ac_save_CXXFLAGS
>-elif test $ac_cv_prog_cxx_g = yes; then
>-  if test "$GXX" = yes; then
>-    CXXFLAGS="-g -O2"
>-  else
>-    CXXFLAGS="-g"
>-  fi
>-else
>-  if test "$GXX" = yes; then
>-    CXXFLAGS="-O2"
>-  else
>-    CXXFLAGS=
>-  fi
>-fi
>-for ac_declaration in \
>-   '' \
>-   'extern "C" void std::exit (int) throw (); using std::exit;' \
>-   'extern "C" void std::exit (int); using std::exit;' \
>-   'extern "C" void exit (int) throw ();' \
>-   'extern "C" void exit (int);' \
>-   'void exit (int);'
>-do
>-  cat >conftest.$ac_ext <<_ACEOF
>+	CXXFLAGS=""
>+      cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
>-$ac_declaration
>-#include <stdlib.h>
>+
> int
> main ()
> {
>-exit (42);
>+
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   :
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-continue
>-fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-  cat >conftest.$ac_ext <<_ACEOF
>+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
>+	 CXXFLAGS="-g"
>+	 cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
>-$ac_declaration
>+
> int
> main ()
> {
>-exit (42);
>+
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  break
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>+  ac_cv_prog_cxx_g=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>+
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-done
>-rm -f conftest*
>-if test -n "$ac_declaration"; then
>-  echo '#ifdef __cplusplus' >>confdefs.h
>-  echo $ac_declaration      >>confdefs.h
>-  echo '#endif'             >>confdefs.h
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
> 
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
>+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
>+if test "$ac_test_CXXFLAGS" = set; then
>+  CXXFLAGS=$ac_save_CXXFLAGS
>+elif test $ac_cv_prog_cxx_g = yes; then
>+  if test "$GXX" = yes; then
>+    CXXFLAGS="-g -O2"
>+  else
>+    CXXFLAGS="-g"
>+  fi
>+else
>+  if test "$GXX" = yes; then
>+    CXXFLAGS="-O2"
>+  else
>+    CXXFLAGS=
>+  fi
>+fi
> ac_ext=c
> ac_cpp='$CPP $CPPFLAGS'
> ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>@@ -2479,7 +3055,7 @@
> ac_compiler_gnu=$ac_cv_c_compiler_gnu
> DEPDIR="${am__leading_dot}deps"
> 
>-          ac_config_commands="$ac_config_commands depfiles"
>+ac_config_commands="$ac_config_commands depfiles"
> 
> 
> am_make=${MAKE-make}
>@@ -2489,8 +3065,8 @@
> .PHONY: am__doit
> END
> # If we don't find an include directive, just comment out the code.
>-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
>-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
>+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
> am__include="#"
> am__quote=
> _am_result=none
>@@ -2517,22 +3093,20 @@
> fi
> 
> 
>-echo "$as_me:$LINENO: result: $_am_result" >&5
>-echo "${ECHO_T}$_am_result" >&6
>+{ echo "$as_me:$LINENO: result: $_am_result" >&5
>+echo "${ECHO_T}$_am_result" >&6; }
> rm -f confinc confmf
> 
>-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
>+# Check whether --enable-dependency-tracking was given.
> if test "${enable_dependency_tracking+set}" = set; then
>-  enableval="$enable_dependency_tracking"
>+  enableval=$enable_dependency_tracking;
>+fi
> 
>-fi;
> if test "x$enable_dependency_tracking" != xno; then
>   am_depcomp="$ac_aux_dir/depcomp"
>   AMDEPBACKSLASH='\'
> fi
>-
>-
>-if test "x$enable_dependency_tracking" != xno; then
>+ if test "x$enable_dependency_tracking" != xno; then
>   AMDEP_TRUE=
>   AMDEP_FALSE='#'
> else
>@@ -2542,11 +3116,10 @@
> 
> 
> 
>-
> depcc="$CXX"  am_compiler_list=
> 
>-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
>-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
>+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
> if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -2584,7 +3157,9 @@
>     : > sub/conftest.c
>     for i in 1 2 3 4 5 6; do
>       echo '#include "conftst'$i'.h"' >> sub/conftest.c
>-      : > sub/conftst$i.h
>+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
>+      # Solaris 8's {/usr,}/bin/sh.
>+      touch sub/conftst$i.h
>     done
>     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
> 
>@@ -2608,13 +3183,19 @@
>        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
>        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>          >/dev/null 2>conftest.err &&
>+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
>        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
>        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
>        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
>       # icc doesn't choke on unknown options, it will just issue warnings
>-      # (even with -Werror).  So we grep stderr for any message
>-      # that says an option was ignored.
>-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
>+      # or remarks (even with -Werror).  So we grep stderr for any message
>+      # that says an option was ignored or not supported.
>+      # When given -MP, icc 7.0 and 7.1 complain thusly:
>+      #   icc: Command line warning: ignoring option '-M'; no argument required
>+      # The diagnosis changed in icc 8.0:
>+      #   icc: Command line remark: option '-MP' not supported
>+      if (grep 'ignoring option' conftest.err ||
>+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
>         am_cv_CXX_dependencies_compiler_type=$depmode
>         break
>       fi
>@@ -2628,13 +3209,11 @@
> fi
> 
> fi
>-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
>-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
>+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
>+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
> CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
> 
>-
>-
>-if
>+ if
>   test "x$enable_dependency_tracking" != xno \
>   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
>   am__fastdepCXX_TRUE=
>@@ -2658,8 +3237,8 @@
> # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
> # OS/2's system install, which has a completely different semantic
> # ./install, which can be erroneously created by make from ./install.sh.
>-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
>-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
>+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
> if test -z "$INSTALL"; then
> if test "${ac_cv_path_install+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
>@@ -2681,7 +3260,7 @@
>     # by default.
>     for ac_prog in ginstall scoinst install; do
>       for ac_exec_ext in '' $ac_executable_extensions; do
>-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
>+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
>@@ -2700,21 +3279,22 @@
>     ;;
> esac
> done
>+IFS=$as_save_IFS
> 
> 
> fi
>   if test "${ac_cv_path_install+set}" = set; then
>     INSTALL=$ac_cv_path_install
>   else
>-    # As a last resort, use the slow shell script.  We don't cache a
>-    # path for INSTALL within a source directory, because that will
>+    # As a last resort, use the slow shell script.  Don't cache a
>+    # value for INSTALL within a source directory, because that will
>     # break other packages using the cache if that directory is
>-    # removed, or if the path is relative.
>+    # removed, or if the value is a relative name.
>     INSTALL=$ac_install_sh
>   fi
> fi
>-echo "$as_me:$LINENO: result: $INSTALL" >&5
>-echo "${ECHO_T}$INSTALL" >&6
>+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
>+echo "${ECHO_T}$INSTALL" >&6; }
> 
> # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
> # It thinks the first close brace ends the variable substitution.
>@@ -2724,154 +3304,190 @@
> 
> test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
> 
>-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
>-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
>-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
>-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
>+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
>+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
>+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
>+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   cat >conftest.make <<\_ACEOF
>+SHELL = /bin/sh
> all:
>-	@echo 'ac_maketemp="$(MAKE)"'
>+	@echo '@@@%%%=$(MAKE)=@@@%%%'
> _ACEOF
> # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
>-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
>-if test -n "$ac_maketemp"; then
>-  eval ac_cv_prog_make_${ac_make}_set=yes
>-else
>-  eval ac_cv_prog_make_${ac_make}_set=no
>-fi
>+case `${MAKE-make} -f conftest.make 2>/dev/null` in
>+  *@@@%%%=?*=@@@%%%*)
>+    eval ac_cv_prog_make_${ac_make}_set=yes;;
>+  *)
>+    eval ac_cv_prog_make_${ac_make}_set=no;;
>+esac
> rm -f conftest.make
> fi
>-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
>-  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
>+  { echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
>   SET_MAKE=
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>   SET_MAKE="MAKE=${MAKE-make}"
> fi
> 
> 
>-# Check whether --enable-shared or --disable-shared was given.
>+# Check whether --enable-shared was given.
> if test "${enable_shared+set}" = set; then
>-  enableval="$enable_shared"
>-  p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_shared=yes ;;
>-no) enable_shared=no ;;
>-*)
>-  enable_shared=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_shared=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac
>+  enableval=$enable_shared; p=${PACKAGE-default}
>+    case $enableval in
>+    yes) enable_shared=yes ;;
>+    no) enable_shared=no ;;
>+    *)
>+      enable_shared=no
>+      # Look at the argument we got.  We use all the common list separators.
>+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+      for pkg in $enableval; do
>+	IFS="$lt_save_ifs"
>+	if test "X$pkg" = "X$p"; then
>+	  enable_shared=yes
>+	fi
>+      done
>+      IFS="$lt_save_ifs"
>+      ;;
>+    esac
> else
>   enable_shared=yes
>-fi;
>-# Check whether --enable-static or --disable-static was given.
>+fi
>+
>+
>+# Check whether --enable-static was given.
> if test "${enable_static+set}" = set; then
>-  enableval="$enable_static"
>-  p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_static=yes ;;
>-no) enable_static=no ;;
>-*)
>-  enable_static=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_static=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac
>-else
>-  enable_static=yes
>-fi;
>-# Check whether --enable-fast-install or --disable-fast-install was given.
>-if test "${enable_fast_install+set}" = set; then
>-  enableval="$enable_fast_install"
>-  p=${PACKAGE-default}
>-case $enableval in
>-yes) enable_fast_install=yes ;;
>-no) enable_fast_install=no ;;
>-*)
>-  enable_fast_install=no
>-  # Look at the argument we got.  We use all the common list separators.
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
>-  for pkg in $enableval; do
>-    if test "X$pkg" = "X$p"; then
>-      enable_fast_install=yes
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  ;;
>-esac
>+  enableval=$enable_static; p=${PACKAGE-default}
>+    case $enableval in
>+    yes) enable_static=yes ;;
>+    no) enable_static=no ;;
>+    *)
>+     enable_static=no
>+      # Look at the argument we got.  We use all the common list separators.
>+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+      for pkg in $enableval; do
>+	IFS="$lt_save_ifs"
>+	if test "X$pkg" = "X$p"; then
>+	  enable_static=yes
>+	fi
>+      done
>+      IFS="$lt_save_ifs"
>+      ;;
>+    esac
>+else
>+  enable_static=yes
>+fi
>+
>+
>+# Check whether --enable-fast-install was given.
>+if test "${enable_fast_install+set}" = set; then
>+  enableval=$enable_fast_install; p=${PACKAGE-default}
>+    case $enableval in
>+    yes) enable_fast_install=yes ;;
>+    no) enable_fast_install=no ;;
>+    *)
>+      enable_fast_install=no
>+      # Look at the argument we got.  We use all the common list separators.
>+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+      for pkg in $enableval; do
>+	IFS="$lt_save_ifs"
>+	if test "X$pkg" = "X$p"; then
>+	  enable_fast_install=yes
>+	fi
>+      done
>+      IFS="$lt_save_ifs"
>+      ;;
>+    esac
> else
>   enable_fast_install=yes
>-fi;
>+fi
>+
>+
> # Make sure we can run config.sub.
>-$ac_config_sub sun4 >/dev/null 2>&1 ||
>-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
>-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
>+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
>+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
>+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
>    { (exit 1); exit 1; }; }
> 
>-echo "$as_me:$LINENO: checking build system type" >&5
>-echo $ECHO_N "checking build system type... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking build system type" >&5
>+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
> if test "${ac_cv_build+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  ac_cv_build_alias=$build_alias
>-test -z "$ac_cv_build_alias" &&
>-  ac_cv_build_alias=`$ac_config_guess`
>-test -z "$ac_cv_build_alias" &&
>+  ac_build_alias=$build_alias
>+test "x$ac_build_alias" = x &&
>+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
>+test "x$ac_build_alias" = x &&
>   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
> echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
>    { (exit 1); exit 1; }; }
>-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
>-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
>-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
>+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
>+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
>+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
>    { (exit 1); exit 1; }; }
> 
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
>-echo "${ECHO_T}$ac_cv_build" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
>+echo "${ECHO_T}$ac_cv_build" >&6; }
>+case $ac_cv_build in
>+*-*-*) ;;
>+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
>+echo "$as_me: error: invalid value of canonical build" >&2;}
>+   { (exit 1); exit 1; }; };;
>+esac
> build=$ac_cv_build
>-build_cpu=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
>-build_vendor=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
>-build_os=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
>+ac_save_IFS=$IFS; IFS='-'
>+set x $ac_cv_build
>+shift
>+build_cpu=$1
>+build_vendor=$2
>+shift; shift
>+# Remember, the first character of IFS is used to create $*,
>+# except with old shells:
>+build_os=$*
>+IFS=$ac_save_IFS
>+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
> 
> 
>-echo "$as_me:$LINENO: checking host system type" >&5
>-echo $ECHO_N "checking host system type... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking host system type" >&5
>+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
> if test "${ac_cv_host+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  ac_cv_host_alias=$host_alias
>-test -z "$ac_cv_host_alias" &&
>-  ac_cv_host_alias=$ac_cv_build_alias
>-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
>-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
>-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
>+  if test "x$host_alias" = x; then
>+  ac_cv_host=$ac_cv_build
>+else
>+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
>+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
>+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
>    { (exit 1); exit 1; }; }
>+fi
> 
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
>-echo "${ECHO_T}$ac_cv_host" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
>+echo "${ECHO_T}$ac_cv_host" >&6; }
>+case $ac_cv_host in
>+*-*-*) ;;
>+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
>+echo "$as_me: error: invalid value of canonical host" >&2;}
>+   { (exit 1); exit 1; }; };;
>+esac
> host=$ac_cv_host
>-host_cpu=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
>-host_vendor=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
>-host_os=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
>+ac_save_IFS=$IFS; IFS='-'
>+set x $ac_cv_host
>+shift
>+host_cpu=$1
>+host_vendor=$2
>+shift; shift
>+# Remember, the first character of IFS is used to create $*,
>+# except with old shells:
>+host_os=$*
>+IFS=$ac_save_IFS
>+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
> 
> 
> ac_ext=c
>@@ -2882,8 +3498,8 @@
> if test -n "$ac_tool_prefix"; then
>   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
> set dummy ${ac_tool_prefix}gcc; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_CC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -2896,32 +3512,34 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CC="${ac_tool_prefix}gcc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
>-  echo "$as_me:$LINENO: result: $CC" >&5
>-echo "${ECHO_T}$CC" >&6
>+  { echo "$as_me:$LINENO: result: $CC" >&5
>+echo "${ECHO_T}$CC" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
> fi
> if test -z "$ac_cv_prog_CC"; then
>   ac_ct_CC=$CC
>   # Extract the first word of "gcc", so it can be a program name with args.
> set dummy gcc; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -2934,36 +3552,51 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_CC="gcc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> ac_ct_CC=$ac_cv_prog_ac_ct_CC
> if test -n "$ac_ct_CC"; then
>-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
>-echo "${ECHO_T}$ac_ct_CC" >&6
>+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
>+echo "${ECHO_T}$ac_ct_CC" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>-  CC=$ac_ct_CC
>+  if test "x$ac_ct_CC" = x; then
>+    CC=""
>+  else
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    CC=$ac_ct_CC
>+  fi
> else
>   CC="$ac_cv_prog_CC"
> fi
> 
> if test -z "$CC"; then
>-  if test -n "$ac_tool_prefix"; then
>-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
>+          if test -n "$ac_tool_prefix"; then
>+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
> set dummy ${ac_tool_prefix}cc; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_CC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -2976,74 +3609,34 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CC="${ac_tool_prefix}cc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
>-  echo "$as_me:$LINENO: result: $CC" >&5
>-echo "${ECHO_T}$CC" >&6
>-else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>-fi
>-
>-fi
>-if test -z "$ac_cv_prog_CC"; then
>-  ac_ct_CC=$CC
>-  # Extract the first word of "cc", so it can be a program name with args.
>-set dummy cc; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  if test -n "$ac_ct_CC"; then
>-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
>-else
>-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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>-    ac_cv_prog_ac_ct_CC="cc"
>-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>-    break 2
>-  fi
>-done
>-done
>-
>-fi
>-fi
>-ac_ct_CC=$ac_cv_prog_ac_ct_CC
>-if test -n "$ac_ct_CC"; then
>-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
>-echo "${ECHO_T}$ac_ct_CC" >&6
>+  { echo "$as_me:$LINENO: result: $CC" >&5
>+echo "${ECHO_T}$CC" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>-  CC=$ac_ct_CC
>-else
>-  CC="$ac_cv_prog_CC"
>-fi
> 
>+  fi
> fi
> if test -z "$CC"; then
>   # Extract the first word of "cc", so it can be a program name with args.
> set dummy cc; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_CC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -3057,7 +3650,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -3068,6 +3661,7 @@
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> if test $ac_prog_rejected = yes; then
>   # We found a bogon in the path, so make sure we never use it.
>@@ -3085,22 +3679,23 @@
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
>-  echo "$as_me:$LINENO: result: $CC" >&5
>-echo "${ECHO_T}$CC" >&6
>+  { echo "$as_me:$LINENO: result: $CC" >&5
>+echo "${ECHO_T}$CC" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
> fi
> if test -z "$CC"; then
>   if test -n "$ac_tool_prefix"; then
>-  for ac_prog in cl
>+  for ac_prog in cl.exe
>   do
>     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
> set dummy $ac_tool_prefix$ac_prog; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_CC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -3113,36 +3708,38 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
>-  echo "$as_me:$LINENO: result: $CC" >&5
>-echo "${ECHO_T}$CC" >&6
>+  { echo "$as_me:$LINENO: result: $CC" >&5
>+echo "${ECHO_T}$CC" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
>     test -n "$CC" && break
>   done
> fi
> if test -z "$CC"; then
>   ac_ct_CC=$CC
>-  for ac_prog in cl
>+  for ac_prog in cl.exe
> do
>   # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -3155,29 +3752,45 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_CC="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
> ac_ct_CC=$ac_cv_prog_ac_ct_CC
> if test -n "$ac_ct_CC"; then
>-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
>-echo "${ECHO_T}$ac_ct_CC" >&6
>+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
>+echo "${ECHO_T}$ac_ct_CC" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
>   test -n "$ac_ct_CC" && break
> done
> 
>-  CC=$ac_ct_CC
>+  if test "x$ac_ct_CC" = x; then
>+    CC=""
>+  else
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    CC=$ac_ct_CC
>+  fi
> fi
> 
> fi
>@@ -3190,27 +3803,41 @@
>    { (exit 1); exit 1; }; }
> 
> # Provide some information about the compiler.
>-echo "$as_me:$LINENO:" \
>-     "checking for C compiler version" >&5
>+echo "$as_me:$LINENO: checking for C compiler version" >&5
> ac_compiler=`set X $ac_compile; echo $2`
>-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
>-  (eval $ac_compiler --version </dev/null >&5) 2>&5
>+{ (ac_try="$ac_compiler --version >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler --version >&5") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }
>-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
>-  (eval $ac_compiler -v </dev/null >&5) 2>&5
>+{ (ac_try="$ac_compiler -v >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler -v >&5") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }
>-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
>-  (eval $ac_compiler -V </dev/null >&5) 2>&5
>+{ (ac_try="$ac_compiler -V >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler -V >&5") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }
> 
>-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
>-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
>+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
> if test "${ac_cv_c_compiler_gnu+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -3233,50 +3860,49 @@
> }
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_compiler_gnu=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_compiler_gnu=no
>+	ac_compiler_gnu=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> ac_cv_c_compiler_gnu=$ac_compiler_gnu
> 
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
>-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
>+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
> GCC=`test $ac_compiler_gnu = yes && echo yes`
> ac_test_CFLAGS=${CFLAGS+set}
> ac_save_CFLAGS=$CFLAGS
>-CFLAGS="-g"
>-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
>-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
>+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
> if test "${ac_cv_prog_cc_g+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  cat >conftest.$ac_ext <<_ACEOF
>+  ac_save_c_werror_flag=$ac_c_werror_flag
>+   ac_c_werror_flag=yes
>+   ac_cv_prog_cc_g=no
>+   CFLAGS="-g"
>+   cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
>@@ -3292,38 +3918,118 @@
> }
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>+  ac_cv_prog_cc_g=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	CFLAGS=""
>+      cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+
>+int
>+main ()
>+{
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>+  :
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_c_werror_flag=$ac_save_c_werror_flag
>+	 CFLAGS="-g"
>+	 cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+
>+int
>+main ()
>+{
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_cv_prog_cc_g=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_prog_cc_g=no
>+
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+   ac_c_werror_flag=$ac_save_c_werror_flag
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
>-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
>+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
> if test "$ac_test_CFLAGS" = set; then
>   CFLAGS=$ac_save_CFLAGS
> elif test $ac_cv_prog_cc_g = yes; then
>@@ -3339,12 +4045,12 @@
>     CFLAGS=
>   fi
> fi
>-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
>-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
>-if test "${ac_cv_prog_cc_stdc+set}" = set; then
>+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
>+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_cc_c89+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  ac_cv_prog_cc_stdc=no
>+  ac_cv_prog_cc_c89=no
> ac_save_CC=$CC
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
>@@ -3378,12 +4084,17 @@
> /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
>    function prototypes and stuff, but not '\xHH' hex character constants.
>    These don't provoke an error unfortunately, instead are silently treated
>-   as 'x'.  The following induces an error, until -std1 is added to get
>+   as 'x'.  The following induces an error, until -std is added to get
>    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
>    array size at least.  It's necessary to write '\x00'==0 to get something
>-   that's true only with -std1.  */
>+   that's true only with -std.  */
> int osf4_cc_array ['\x00' == 0 ? 1 : -1];
> 
>+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
>+   inside strings and character constants.  */
>+#define FOO(x) 'x'
>+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
>+
> int test (int i, double x);
> struct s1 {int (*f) (int a);};
> struct s2 {int (*f) (double a);};
>@@ -3398,205 +4109,57 @@
>   return 0;
> }
> _ACEOF
>-# Don't try gcc -ansi; that turns off useful extensions and
>-# breaks some systems' header files.
>-# AIX			-qlanglvl=ansi
>-# Ultrix and OSF/1	-std1
>-# HP-UX 10.20 and later	-Ae
>-# HP-UX older versions	-Aa -D_HPUX_SOURCE
>-# SVR4			-Xc -D__EXTENSIONS__
>-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
>+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
>+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
> do
>   CC="$ac_save_CC $ac_arg"
>   rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_prog_cc_stdc=$ac_arg
>-break
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>+  ac_cv_prog_cc_c89=$ac_arg
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>+
> fi
>-rm -f conftest.err conftest.$ac_objext
>+
>+rm -f core conftest.err conftest.$ac_objext
>+  test "x$ac_cv_prog_cc_c89" != "xno" && break
> done
>-rm -f conftest.$ac_ext conftest.$ac_objext
>+rm -f conftest.$ac_ext
> CC=$ac_save_CC
> 
> fi
>-
>-case "x$ac_cv_prog_cc_stdc" in
>-  x|xno)
>-    echo "$as_me:$LINENO: result: none needed" >&5
>-echo "${ECHO_T}none needed" >&6 ;;
>+# AC_CACHE_VAL
>+case "x$ac_cv_prog_cc_c89" in
>+  x)
>+    { echo "$as_me:$LINENO: result: none needed" >&5
>+echo "${ECHO_T}none needed" >&6; } ;;
>+  xno)
>+    { echo "$as_me:$LINENO: result: unsupported" >&5
>+echo "${ECHO_T}unsupported" >&6; } ;;
>   *)
>-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
>-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
>-    CC="$CC $ac_cv_prog_cc_stdc" ;;
>+    CC="$CC $ac_cv_prog_cc_c89"
>+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
>+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
> esac
> 
>-# Some people use a C++ compiler to compile C.  Since we use `exit',
>-# in C++ we need to declare it.  In case someone uses the same compiler
>-# for both compiling C and C++ we need to have the C++ compiler decide
>-# the declaration of exit, since it's the most demanding environment.
>-cat >conftest.$ac_ext <<_ACEOF
>-#ifndef __cplusplus
>-  choke me
>-#endif
>-_ACEOF
>-rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  for ac_declaration in \
>-   '' \
>-   'extern "C" void std::exit (int) throw (); using std::exit;' \
>-   'extern "C" void std::exit (int); using std::exit;' \
>-   'extern "C" void exit (int) throw ();' \
>-   'extern "C" void exit (int);' \
>-   'void exit (int);'
>-do
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-$ac_declaration
>-#include <stdlib.h>
>-int
>-main ()
>-{
>-exit (42);
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  :
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-continue
>-fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-$ac_declaration
>-int
>-main ()
>-{
>-exit (42);
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  break
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-done
>-rm -f conftest*
>-if test -n "$ac_declaration"; then
>-  echo '#ifdef __cplusplus' >>confdefs.h
>-  echo $ac_declaration      >>confdefs.h
>-  echo '#endif'             >>confdefs.h
>-fi
>-
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
> 
>-fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
> ac_ext=c
> ac_cpp='$CPP $CPPFLAGS'
> ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>@@ -3605,8 +4168,8 @@
> 
> depcc="$CC"   am_compiler_list=
> 
>-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
>-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
>+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
> if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -3644,7 +4207,9 @@
>     : > sub/conftest.c
>     for i in 1 2 3 4 5 6; do
>       echo '#include "conftst'$i'.h"' >> sub/conftest.c
>-      : > sub/conftst$i.h
>+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
>+      # Solaris 8's {/usr,}/bin/sh.
>+      touch sub/conftst$i.h
>     done
>     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
> 
>@@ -3668,13 +4233,19 @@
>        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
>        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>          >/dev/null 2>conftest.err &&
>+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
>        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
>        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
>        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
>       # icc doesn't choke on unknown options, it will just issue warnings
>-      # (even with -Werror).  So we grep stderr for any message
>-      # that says an option was ignored.
>-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
>+      # or remarks (even with -Werror).  So we grep stderr for any message
>+      # that says an option was ignored or not supported.
>+      # When given -MP, icc 7.0 and 7.1 complain thusly:
>+      #   icc: Command line warning: ignoring option '-M'; no argument required
>+      # The diagnosis changed in icc 8.0:
>+      #   icc: Command line remark: option '-MP' not supported
>+      if (grep 'ignoring option' conftest.err ||
>+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
>         am_cv_CC_dependencies_compiler_type=$depmode
>         break
>       fi
>@@ -3688,13 +4259,11 @@
> fi
> 
> fi
>-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
>-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
>+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
>+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
> CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
> 
>-
>-
>-if
>+ if
>   test "x$enable_dependency_tracking" != xno \
>   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
>   am__fastdepCC_TRUE=
>@@ -3705,30 +4274,240 @@
> fi
> 
> 
>-# Find the correct PATH separator.  Usually this is `:', but
>-# DJGPP uses `;' like DOS.
>-if test "X${PATH_SEPARATOR+set}" != Xset; then
>-  UNAME=${UNAME-`uname 2>/dev/null`}
>-  case X$UNAME in
>-    *-DOS) lt_cv_sys_path_separator=';' ;;
>-    *)     lt_cv_sys_path_separator=':' ;;
>-  esac
>-  PATH_SEPARATOR=$lt_cv_sys_path_separator
>-fi
>-
>-
>-# Check whether --with-gnu-ld or --without-gnu-ld was given.
>-if test "${with_gnu_ld+set}" = set; then
>-  withval="$with_gnu_ld"
>-  test "$withval" = no || with_gnu_ld=yes
>+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
>+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
>+if test "${lt_cv_path_SED+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  with_gnu_ld=no
>-fi;
>-ac_prog=ld
>+  # Loop through the user's path and test for sed and gsed.
>+# Then use that list of sed's as ones to test for truncation.
>+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH
>+do
>+  IFS=$as_save_IFS
>+  test -z "$as_dir" && as_dir=.
>+  for lt_ac_prog in sed gsed; do
>+    for ac_exec_ext in '' $ac_executable_extensions; do
>+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
>+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
>+      fi
>+    done
>+  done
>+done
>+IFS=$as_save_IFS
>+lt_ac_max=0
>+lt_ac_count=0
>+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
>+# along with /bin/sed that truncates output.
>+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
>+  test ! -f $lt_ac_sed && continue
>+  cat /dev/null > conftest.in
>+  lt_ac_count=0
>+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
>+  # Check for GNU sed and select it if it is found.
>+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
>+    lt_cv_path_SED=$lt_ac_sed
>+    break
>+  fi
>+  while true; do
>+    cat conftest.in conftest.in >conftest.tmp
>+    mv conftest.tmp conftest.in
>+    cp conftest.in conftest.nl
>+    echo >>conftest.nl
>+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
>+    cmp -s conftest.out conftest.nl || break
>+    # 10000 chars as input seems more than enough
>+    test $lt_ac_count -gt 10 && break
>+    lt_ac_count=`expr $lt_ac_count + 1`
>+    if test $lt_ac_count -gt $lt_ac_max; then
>+      lt_ac_max=$lt_ac_count
>+      lt_cv_path_SED=$lt_ac_sed
>+    fi
>+  done
>+done
>+
>+fi
>+
>+SED=$lt_cv_path_SED
>+
>+{ echo "$as_me:$LINENO: result: $SED" >&5
>+echo "${ECHO_T}$SED" >&6; }
>+
>+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
>+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
>+if test "${ac_cv_path_GREP+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  # Extract the first word of "grep ggrep" to use in msg output
>+if test -z "$GREP"; then
>+set dummy grep ggrep; ac_prog_name=$2
>+if test "${ac_cv_path_GREP+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_path_GREP_found=false
>+# Loop through the user's path and test for each of PROGNAME-LIST
>+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
>+do
>+  IFS=$as_save_IFS
>+  test -z "$as_dir" && as_dir=.
>+  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
>+    # 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
>+*GNU*)
>+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
>+*)
>+  ac_count=0
>+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
>+  while :
>+  do
>+    cat "conftest.in" "conftest.in" >"conftest.tmp"
>+    mv "conftest.tmp" "conftest.in"
>+    cp "conftest.in" "conftest.nl"
>+    echo 'GREP' >> "conftest.nl"
>+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
>+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
>+    ac_count=`expr $ac_count + 1`
>+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
>+      # Best one so far, save it but keep looking for a better one
>+      ac_cv_path_GREP="$ac_path_GREP"
>+      ac_path_GREP_max=$ac_count
>+    fi
>+    # 10*(2^10) chars as input seems more than enough
>+    test $ac_count -gt 10 && break
>+  done
>+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
>+esac
>+
>+
>+    $ac_path_GREP_found && break 3
>+  done
>+done
>+
>+done
>+IFS=$as_save_IFS
>+
>+
>+fi
>+
>+GREP="$ac_cv_path_GREP"
>+if test -z "$GREP"; then
>+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
>+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
>+   { (exit 1); exit 1; }; }
>+fi
>+
>+else
>+  ac_cv_path_GREP=$GREP
>+fi
>+
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
>+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
>+ GREP="$ac_cv_path_GREP"
>+
>+
>+{ echo "$as_me:$LINENO: checking for egrep" >&5
>+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
>+if test "${ac_cv_path_EGREP+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
>+   then ac_cv_path_EGREP="$GREP -E"
>+   else
>+     # Extract the first word of "egrep" to use in msg output
>+if test -z "$EGREP"; then
>+set dummy egrep; ac_prog_name=$2
>+if test "${ac_cv_path_EGREP+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_path_EGREP_found=false
>+# Loop through the user's path and test for each of PROGNAME-LIST
>+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
>+do
>+  IFS=$as_save_IFS
>+  test -z "$as_dir" && as_dir=.
>+  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
>+    # 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
>+*GNU*)
>+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
>+*)
>+  ac_count=0
>+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
>+  while :
>+  do
>+    cat "conftest.in" "conftest.in" >"conftest.tmp"
>+    mv "conftest.tmp" "conftest.in"
>+    cp "conftest.in" "conftest.nl"
>+    echo 'EGREP' >> "conftest.nl"
>+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
>+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
>+    ac_count=`expr $ac_count + 1`
>+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
>+      # Best one so far, save it but keep looking for a better one
>+      ac_cv_path_EGREP="$ac_path_EGREP"
>+      ac_path_EGREP_max=$ac_count
>+    fi
>+    # 10*(2^10) chars as input seems more than enough
>+    test $ac_count -gt 10 && break
>+  done
>+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
>+esac
>+
>+
>+    $ac_path_EGREP_found && break 3
>+  done
>+done
>+
>+done
>+IFS=$as_save_IFS
>+
>+
>+fi
>+
>+EGREP="$ac_cv_path_EGREP"
>+if test -z "$EGREP"; then
>+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
>+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
>+   { (exit 1); exit 1; }; }
>+fi
>+
>+else
>+  ac_cv_path_EGREP=$EGREP
>+fi
>+
>+
>+   fi
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
>+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
>+ EGREP="$ac_cv_path_EGREP"
>+
>+
>+
>+# Check whether --with-gnu-ld was given.
>+if test "${with_gnu_ld+set}" = set; then
>+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
>+else
>+  with_gnu_ld=no
>+fi
>+
>+ac_prog=ld
> if test "$GCC" = yes; then
>   # Check if gcc -print-prog-name=ld gives a path.
>-  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
>-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
>+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
>   case $host in
>   *-*-mingw*)
>     # gcc leaves a trailing carriage return which upsets mingw
>@@ -3738,12 +4517,12 @@
>   esac
>   case $ac_prog in
>     # Accept absolute paths.
>-    [\\/]* | [A-Za-z]:[\\/]*)
>+    [\\/]* | ?:[\\/]*)
>       re_direlt='/[^/][^/]*/\.\./'
>-      # Canonicalize the path of ld
>-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
>+      # Canonicalize the pathname of ld
>+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
>       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
>-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
>+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
>       done
>       test -z "$LD" && LD="$ac_prog"
>       ;;
>@@ -3757,32 +4536,36 @@
>     ;;
>   esac
> elif test "$with_gnu_ld" = yes; then
>-  echo "$as_me:$LINENO: checking for GNU ld" >&5
>-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
>+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
> else
>-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
>-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
>+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
> fi
> if test "${lt_cv_path_LD+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   if test -z "$LD"; then
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>   for ac_dir in $PATH; do
>+    IFS="$lt_save_ifs"
>     test -z "$ac_dir" && ac_dir=.
>     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>       lt_cv_path_LD="$ac_dir/$ac_prog"
>       # Check to see if the program is GNU ld.  I'd rather use --version,
>-      # but apparently some GNU ld's only accept -v.
>+      # but apparently some variants of GNU ld only accept -v.
>       # Break only if it was the GNU/non-GNU ld that we prefer.
>-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
>+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
>+      *GNU* | *'with BFD'*)
> 	test "$with_gnu_ld" != no && break
>-      else
>+	;;
>+      *)
> 	test "$with_gnu_ld" != yes && break
>-      fi
>+	;;
>+      esac
>     fi
>   done
>-  IFS="$ac_save_ifs"
>+  IFS="$lt_save_ifs"
> else
>   lt_cv_path_LD="$LD" # Let the user override the test with a path.
> fi
>@@ -3790,46 +4573,62 @@
> 
> LD="$lt_cv_path_LD"
> if test -n "$LD"; then
>-  echo "$as_me:$LINENO: result: $LD" >&5
>-echo "${ECHO_T}$LD" >&6
>+  { echo "$as_me:$LINENO: result: $LD" >&5
>+echo "${ECHO_T}$LD" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
> echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
>    { (exit 1); exit 1; }; }
>-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
>-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
>+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
> if test "${lt_cv_prog_gnu_ld+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
>-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
>+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
>+case `$LD -v 2>&1 </dev/null` in
>+*GNU* | *'with BFD'*)
>   lt_cv_prog_gnu_ld=yes
>-else
>+  ;;
>+*)
>   lt_cv_prog_gnu_ld=no
>+  ;;
>+esac
> fi
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
>-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
>+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
> with_gnu_ld=$lt_cv_prog_gnu_ld
> 
> 
>-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
>-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
>+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
> if test "${lt_cv_ld_reload_flag+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   lt_cv_ld_reload_flag='-r'
> fi
>-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
>-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
>+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
>+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
> reload_flag=$lt_cv_ld_reload_flag
>-test -n "$reload_flag" && reload_flag=" $reload_flag"
>+case $reload_flag in
>+"" | " "*) ;;
>+*) reload_flag=" $reload_flag" ;;
>+esac
>+reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+case $host_os in
>+  darwin*)
>+    if test "$GCC" = yes; then
>+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
>+    else
>+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+    fi
>+    ;;
>+esac
> 
>-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
>-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
>+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
> if test "${lt_cv_path_NM+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -3837,49 +4636,63 @@
>   # Let the user override the test.
>   lt_cv_path_NM="$NM"
> else
>-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
>-    test -z "$ac_dir" && ac_dir=.
>-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
>-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
>-      # Check to see if the nm accepts a BSD-compat flag.
>-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
>-      #   nm: unknown option "B" ignored
>-      # Tru64's nm complains that /dev/null is an invalid object file
>-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
>-	lt_cv_path_NM="$tmp_nm -B"
>-	break
>-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
>-	lt_cv_path_NM="$tmp_nm -p"
>-	break
>-      else
>-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
>-	continue # so that we can try to find one that supports BSD flags
>+  lt_nm_to_check="${ac_tool_prefix}nm"
>+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
>+    lt_nm_to_check="$lt_nm_to_check nm"
>+  fi
>+  for lt_tmp_nm in $lt_nm_to_check; do
>+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
>+      IFS="$lt_save_ifs"
>+      test -z "$ac_dir" && ac_dir=.
>+      tmp_nm="$ac_dir/$lt_tmp_nm"
>+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
>+	# Check to see if the nm accepts a BSD-compat flag.
>+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
>+	#   nm: unknown option "B" ignored
>+	# Tru64's nm complains that /dev/null is an invalid object file
>+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
>+	*/dev/null* | *'Invalid file or object type'*)
>+	  lt_cv_path_NM="$tmp_nm -B"
>+	  break
>+	  ;;
>+	*)
>+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
>+	  */dev/null*)
>+	    lt_cv_path_NM="$tmp_nm -p"
>+	    break
>+	    ;;
>+	  *)
>+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
>+	    continue # so that we can try to find one that supports BSD flags
>+	    ;;
>+	  esac
>+	  ;;
>+	esac
>       fi
>-    fi
>+    done
>+    IFS="$lt_save_ifs"
>   done
>-  IFS="$ac_save_ifs"
>   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
> fi
> fi
>-
>+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
>+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
> NM="$lt_cv_path_NM"
>-echo "$as_me:$LINENO: result: $NM" >&5
>-echo "${ECHO_T}$NM" >&6
> 
>-echo "$as_me:$LINENO: checking whether ln -s works" >&5
>-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
>+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
> LN_S=$as_ln_s
> if test "$LN_S" = "ln -s"; then
>-  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>+  { echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
>-echo "${ECHO_T}no, using $LN_S" >&6
>+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
>+echo "${ECHO_T}no, using $LN_S" >&6; }
> fi
> 
>-echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5
>-echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
>+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
> if test "${lt_cv_deplibs_check_method+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -3893,7 +4706,7 @@
> # 'pass_all' -- all dependencies passed with no checks.
> # 'test_compile' -- check by making test program.
> # 'file_magic [[regex]]' -- check by looking for files in library path
>-# which responds to the $file_magic_cmd with a given egrep regex.
>+# which responds to the $file_magic_cmd with a given extended regex.
> # If you have `file' or equivalent on your system and you're not sure
> # whether `pass_all' will *always* work, you probably want this one.
> 
>@@ -3906,37 +4719,36 @@
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-bsdi4*)
>+bsdi[45]*)
>   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
>   lt_cv_file_magic_cmd='/usr/bin/file -L'
>   lt_cv_file_magic_test_file=/shlib/libc.so
>   ;;
> 
>-cygwin* | mingw* | pw32*)
>+cygwin*)
>+  # func_win32_libid is a shell function defined in ltmain.sh
>+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
>+  lt_cv_file_magic_cmd='func_win32_libid'
>+  ;;
>+
>+mingw* | pw32*)
>+  # Base MSYS/MinGW do not provide the 'file' command needed by
>+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
>   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
>   lt_cv_file_magic_cmd='$OBJDUMP -f'
>   ;;
> 
> darwin* | rhapsody*)
>-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
>-  lt_cv_file_magic_cmd='/usr/bin/file -L'
>-  case "$host_os" in
>-  rhapsody* | darwin1.[012])
>-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
>-    ;;
>-  *) # Darwin 1.3 on
>-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
>-    ;;
>-  esac
>+  lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-freebsd*)
>+freebsd* | kfreebsd*-gnu | dragonfly*)
>   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>     case $host_cpu in
>     i*86 )
>       # Not sure whether the presence of OpenBSD here was a mistake.
>       # Let's accept both of them until this is cleared up.
>-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
>+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
>       lt_cv_file_magic_cmd=/usr/bin/file
>       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>       ;;
>@@ -3950,50 +4762,49 @@
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-hpux10.20*|hpux11*)
>-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
>+hpux10.20* | hpux11*)
>   lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
>-  ;;
>-
>-irix5* | irix6*)
>-  case $host_os in
>-  irix5*)
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
>+  case $host_cpu in
>+  ia64*)
>+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
>+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
>+    ;;
>+  hppa*64*)
>+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
>+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
>     ;;
>   *)
>-    case $LD in
>-    *-32|*"-32 ") libmagic=32-bit;;
>-    *-n32|*"-n32 ") libmagic=N32;;
>-    *-64|*"-64 ") libmagic=64-bit;;
>-    *) libmagic=never-match;;
>-    esac
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
>+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
>+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
>     ;;
>   esac
>-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
>+  ;;
>+
>+interix3*)
>+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
>+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
>+  ;;
>+
>+irix5* | irix6* | nonstopux*)
>+  case $LD in
>+  *-32|*"-32 ") libmagic=32-bit;;
>+  *-n32|*"-n32 ") libmagic=N32;;
>+  *-64|*"-64 ") libmagic=64-bit;;
>+  *) libmagic=never-match;;
>+  esac
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
> # This must be Linux ELF.
>-linux-gnu*)
>-  case $host_cpu in
>-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
>-    lt_cv_deplibs_check_method=pass_all ;;
>-  *)
>-    # glibc up to 2.1.1 does not perform some relocations on ARM
>-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
>-  esac
>-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
>+linux*)
>+  lt_cv_deplibs_check_method=pass_all
>   ;;
> 
> netbsd*)
>   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
>+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
>   else
>-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
>+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
>   fi
>   ;;
> 
>@@ -4003,37 +4814,27 @@
>   lt_cv_file_magic_test_file=/usr/lib/libnls.so
>   ;;
> 
>+nto-qnx*)
>+  lt_cv_deplibs_check_method=unknown
>+  ;;
>+
> openbsd*)
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
>+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
>   else
>-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
>+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
>   fi
>   ;;
> 
> osf3* | osf4* | osf5*)
>-  # this will be overridden with pass_all, but let us keep it just in case
>-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
>-  lt_cv_file_magic_test_file=/shlib/libc.so
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-sco3.2v5*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
> solaris*)
>   lt_cv_deplibs_check_method=pass_all
>-  lt_cv_file_magic_test_file=/lib/libc.so
>   ;;
> 
>-sysv5uw[78]* | sysv4*uw2*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+sysv4 | sysv4.3*)
>   case $host_vendor in
>   motorola)
>     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
>@@ -4051,225 +4852,257 @@
>     lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
>     lt_cv_file_magic_test_file=/lib/libc.so
>     ;;
>+  siemens)
>+    lt_cv_deplibs_check_method=pass_all
>+    ;;
>+  pc)
>+    lt_cv_deplibs_check_method=pass_all
>+    ;;
>   esac
>   ;;
>+
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  lt_cv_deplibs_check_method=pass_all
>+  ;;
> esac
> 
> fi
>-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
>-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
>+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
>+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
> file_magic_cmd=$lt_cv_file_magic_cmd
> deplibs_check_method=$lt_cv_deplibs_check_method
>+test -z "$deplibs_check_method" && deplibs_check_method=unknown
> 
> 
> 
> 
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
> 
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
> 
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
> 
> 
>-# Check for command to grab the raw symbol name followed by C symbol from nm.
>-echo "$as_me:$LINENO: checking command to parse $NM output" >&5
>-echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
>-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-
>-# These are sane defaults that work on at least a few old systems.
>-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
>-
>-# Character class describing NM global symbol codes.
>-symcode='[BCDEGRST]'
>-
>-# Regexp to match symbols that can be accessed directly from C.
>-sympat='$[_A-Za-z][_A-Za-z0-9]*$'
>-
>-# Transform the above into a raw symbol and a C symbol.
>-symxfrm='\1 \2\3 \3'
>-
>-# Transform an extracted symbol line into a proper C declaration
>-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern char \1;/p'"
>-
>-# Transform an extracted symbol line into symbol name and symbol address
>-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>-
>-# Define system-specific variables.
>-case $host_os in
>-aix*)
>-  symcode='[BCDT]'
>-  ;;
>-cygwin* | mingw* | pw32*)
>-  symcode='[ABCDGISTW]'
>-  ;;
>-hpux*) # Its linker distinguishes data from code symbols
>-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern char \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>-  ;;
>-irix*)
>-  symcode='[BCDEGRST]'
>-  ;;
>-solaris* | sysv5*)
>-  symcode='[BDT]'
>-  ;;
>-sysv4)
>-  symcode='[DFNSTU]'
>-  ;;
>-esac
>-
>-# Handle CRLF in mingw tool chain
>-opt_cr=
>-case $host_os in
>-mingw*)
>-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
>-  ;;
>-esac
>-
>-# If we're using GNU nm, then use its standard symbol codes.
>-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
>-  symcode='[ABCDGISTW]'
>+# Check whether --enable-libtool-lock was given.
>+if test "${enable_libtool_lock+set}" = set; then
>+  enableval=$enable_libtool_lock;
> fi
> 
>-# Try without a prefix undercore, then with it.
>-for ac_symprfx in "" "_"; do
>-
>-  # Write the raw and C identifiers.
>-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]$$symcode$symcode*$[ 	][ 	]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'"
>-
>-  # Check to see that the pipe works correctly.
>-  pipe_works=no
>-  rm -f conftest*
>-  cat > conftest.$ac_ext <<EOF
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-char nm_test_var;
>-void nm_test_func(){}
>-#ifdef __cplusplus
>-}
>-#endif
>-int main(){nm_test_var='a';nm_test_func();return(0);}
>-EOF
>+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
> 
>+# Some flags need to be propagated to the compiler or linker for good
>+# libtool support.
>+case $host in
>+ia64-*-hpux*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>   (eval $ac_compile) 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-    # Now try to grab the symbols.
>-    nlist=conftest.nm
>-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
>-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
>+    case `/usr/bin/file conftest.$ac_objext` in
>+    *ELF-32*)
>+      HPUX_IA64_MODE="32"
>+      ;;
>+    *ELF-64*)
>+      HPUX_IA64_MODE="64"
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
>+*-*-irix6*)
>+  # Find out which ABI we are using.
>+  echo '#line 4920 "configure"' > conftest.$ac_ext
>+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s "$nlist"; then
>-      # Try sorting and uniquifying the output.
>-      if sort "$nlist" | uniq > "$nlist"T; then
>-	mv -f "$nlist"T "$nlist"
>-      else
>-	rm -f "$nlist"T
>-      fi
>+  (exit $ac_status); }; then
>+   if test "$lt_cv_prog_gnu_ld" = yes; then
>+    case `/usr/bin/file conftest.$ac_objext` in
>+    *32-bit*)
>+      LD="${LD-ld} -melf32bsmip"
>+      ;;
>+    *N32*)
>+      LD="${LD-ld} -melf32bmipn32"
>+      ;;
>+    *64-bit*)
>+      LD="${LD-ld} -melf64bmip"
>+      ;;
>+    esac
>+   else
>+    case `/usr/bin/file conftest.$ac_objext` in
>+    *32-bit*)
>+      LD="${LD-ld} -32"
>+      ;;
>+    *N32*)
>+      LD="${LD-ld} -n32"
>+      ;;
>+    *64-bit*)
>+      LD="${LD-ld} -64"
>+      ;;
>+    esac
>+   fi
>+  fi
>+  rm -rf conftest*
>+  ;;
> 
>-      # Make sure that we snagged all the symbols we need.
>-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
>-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
>-	  cat <<EOF > conftest.$ac_ext
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+    case `/usr/bin/file conftest.o` in
>+    *32-bit*)
>+      case $host in
>+        x86_64-*linux*)
>+          LD="${LD-ld} -m elf_i386"
>+          ;;
>+        ppc64-*linux*|powerpc64-*linux*)
>+          LD="${LD-ld} -m elf32ppclinux"
>+          ;;
>+        s390x-*linux*)
>+          LD="${LD-ld} -m elf_s390"
>+          ;;
>+        sparc64-*linux*)
>+          LD="${LD-ld} -m elf32_sparc"
>+          ;;
>+      esac
>+      ;;
>+    *64-bit*)
>+      case $host in
>+        x86_64-*linux*)
>+          LD="${LD-ld} -m elf_x86_64"
>+          ;;
>+        ppc*-*linux*|powerpc*-*linux*)
>+          LD="${LD-ld} -m elf64ppc"
>+          ;;
>+        s390*-*linux*)
>+          LD="${LD-ld} -m elf64_s390"
>+          ;;
>+        sparc*-*linux*)
>+          LD="${LD-ld} -m elf64_sparc"
>+          ;;
>+      esac
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
> 
>-EOF
>-	  # Now generate the symbol file.
>-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
>+*-*-sco3.2v5*)
>+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
>+  SAVE_CFLAGS="$CFLAGS"
>+  CFLAGS="$CFLAGS -belf"
>+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
>+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
>+if test "${lt_cv_cc_needs_belf+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  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
> 
>-	  cat <<EOF >> conftest.$ac_ext
>-#if defined (__STDC__) && __STDC__
>-# define lt_ptr void *
>-#else
>-# define lt_ptr char *
>-# define const
>-#endif
>+     cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
> 
>-/* The mapping between symbol names and symbols. */
>-const struct {
>-  const char *name;
>-  lt_ptr address;
>-}
>-lt_preloaded_symbols[] =
>+int
>+main ()
> {
>-EOF
>-	  sed "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
>-	  cat <<\EOF >> conftest.$ac_ext
>-  {0, (lt_ptr) 0}
>-};
> 
>-#ifdef __cplusplus
>+  ;
>+  return 0;
> }
>-#endif
>-EOF
>-	  # Now try linking the two files.
>-	  mv conftest.$ac_objext conftstm.$ac_objext
>-	  save_LIBS="$LIBS"
>-	  save_CFLAGS="$CFLAGS"
>-	  LIBS="conftstm.$ac_objext"
>-	  CFLAGS="$CFLAGS$no_builtin_flag"
>-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s conftest; then
>-	    pipe_works=yes
>-	  fi
>-	  LIBS="$save_LIBS"
>-	  CFLAGS="$save_CFLAGS"
>-	else
>-	  echo "cannot find nm_test_func in $nlist" >&5
>-	fi
>-      else
>-	echo "cannot find nm_test_var in $nlist" >&5
>-      fi
>-    else
>-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
>-    fi
>-  else
>-    echo "$progname: failed program was:" >&5
>-    cat conftest.$ac_ext >&5
>-  fi
>-  rm -f conftest* conftst*
>-
>-  # Do not use the global_symbol_pipe unless it works.
>-  if test "$pipe_works" = yes; then
>-    break
>-  else
>-    lt_cv_sys_global_symbol_pipe=
>-  fi
>-done
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  lt_cv_cc_needs_belf=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
> 
>+	lt_cv_cc_needs_belf=no
> fi
> 
>-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
>-if test -z "$lt_cv_sys_global_symbol_pipe"; then
>-  global_symbol_to_cdecl=
>-  global_symbol_to_c_name_address=
>-else
>-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
>-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
>-fi
>-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
>-then
>-  echo "$as_me:$LINENO: result: failed" >&5
>-echo "${ECHO_T}failed" >&6
>-else
>-  echo "$as_me:$LINENO: result: ok" >&5
>-echo "${ECHO_T}ok" >&6
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+     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
>+
> fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
>+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
>+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
>+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
>+    CFLAGS="$SAVE_CFLAGS"
>+  fi
>+  ;;
>+sparc*-*solaris*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+    case `/usr/bin/file conftest.o` in
>+    *64-bit*)
>+      case $lt_cv_prog_gnu_ld in
>+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
>+      *)    LD="${LD-ld} -64" ;;
>+      esac
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
>+
>+
>+esac
>+
>+need_locks="$enable_libtool_lock"
>+
> 
> 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
>-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
>-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
>+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
> # On Suns, sometimes $CPP names a directory.
> if test -n "$CPP" && test -d "$CPP"; then
>   CPP=
>@@ -4303,24 +5136,22 @@
> #endif
> 		     Syntax error
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   :
> else
>   echo "$as_me: failed program was:" >&5
>@@ -4329,9 +5160,10 @@
>   # Broken: fails on valid input.
> continue
> fi
>+
> rm -f conftest.err conftest.$ac_ext
> 
>-  # OK, works on sane cases.  Now check whether non-existent headers
>+  # OK, works on sane cases.  Now check whether nonexistent headers
>   # can be detected and how.
>   cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
>@@ -4341,24 +5173,22 @@
> /* end confdefs.h.  */
> #include <ac_nonexistent.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   # Broken: success on invalid input.
> continue
> else
>@@ -4369,6 +5199,7 @@
> ac_preproc_ok=:
> break
> fi
>+
> rm -f conftest.err conftest.$ac_ext
> 
> done
>@@ -4386,8 +5217,8 @@
> else
>   ac_cv_prog_CPP=$CPP
> fi
>-echo "$as_me:$LINENO: result: $CPP" >&5
>-echo "${ECHO_T}$CPP" >&6
>+{ echo "$as_me:$LINENO: result: $CPP" >&5
>+echo "${ECHO_T}$CPP" >&6; }
> ac_preproc_ok=false
> for ac_c_preproc_warn_flag in '' yes
> do
>@@ -4410,24 +5241,22 @@
> #endif
> 		     Syntax error
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   :
> else
>   echo "$as_me: failed program was:" >&5
>@@ -4436,9 +5265,10 @@
>   # Broken: fails on valid input.
> continue
> fi
>+
> rm -f conftest.err conftest.$ac_ext
> 
>-  # OK, works on sane cases.  Now check whether non-existent headers
>+  # OK, works on sane cases.  Now check whether nonexistent headers
>   # can be detected and how.
>   cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
>@@ -4448,24 +5278,22 @@
> /* end confdefs.h.  */
> #include <ac_nonexistent.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   # Broken: success on invalid input.
> continue
> else
>@@ -4476,6 +5304,7 @@
> ac_preproc_ok=:
> break
> fi
>+
> rm -f conftest.err conftest.$ac_ext
> 
> done
>@@ -4498,23 +5327,8 @@
> ac_compiler_gnu=$ac_cv_c_compiler_gnu
> 
> 
>-echo "$as_me:$LINENO: checking for egrep" >&5
>-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
>-if test "${ac_cv_prog_egrep+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
>-    then ac_cv_prog_egrep='grep -E'
>-    else ac_cv_prog_egrep='egrep'
>-    fi
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
>-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
>- EGREP=$ac_cv_prog_egrep
>-
>-
>-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
>-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
>+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
> if test "${ac_cv_header_stdc+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -4538,35 +5352,31 @@
> }
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_cv_header_stdc=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_header_stdc=no
>+	ac_cv_header_stdc=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> 
> if test $ac_cv_header_stdc = yes; then
>   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
>@@ -4622,6 +5432,7 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> #include <ctype.h>
>+#include <stdlib.h>
> #if ((' ' & 0x0FF) == 0x020)
> # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
> # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
>@@ -4641,18 +5452,27 @@
>   for (i = 0; i < 256; i++)
>     if (XOR (islower (i), ISLOWER (i))
> 	|| toupper (i) != TOUPPER (i))
>-      exit(2);
>-  exit (0);
>+      return 2;
>+  return 0;
> }
> _ACEOF
> rm -f conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>+  { (case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_try") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; }; then
>@@ -4665,12 +5485,14 @@
> ( exit $ac_status )
> ac_cv_header_stdc=no
> fi
>-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
>+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
> fi
>+
>+
> fi
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
>-echo "${ECHO_T}$ac_cv_header_stdc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
>+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
> if test $ac_cv_header_stdc = yes; then
> 
> cat >>confdefs.h <<\_ACEOF
>@@ -4693,9 +5515,9 @@
> 		  inttypes.h stdint.h unistd.h
> do
> as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>-echo "$as_me:$LINENO: checking for $ac_header" >&5
>-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   cat >conftest.$ac_ext <<_ACEOF
>@@ -4709,38 +5531,35 @@
> #include <$ac_header>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   eval "$as_ac_Header=yes"
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-eval "$as_ac_Header=no"
>+	eval "$as_ac_Header=no"
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
>-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+ac_res=`eval echo '${'$as_ac_Header'}'`
>+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
>+echo "${ECHO_T}$ac_res" >&6; }
> if test `eval echo '${'$as_ac_Header'}'` = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
>@@ -4755,18 +5574,19 @@
> for ac_header in dlfcn.h
> do
> as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>-  echo "$as_me:$LINENO: checking for $ac_header" >&5
>-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+ac_res=`eval echo '${'$as_ac_Header'}'`
>+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
>+echo "${ECHO_T}$ac_res" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking $ac_header usability" >&5
>-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
>+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -4777,41 +5597,37 @@
> #include <$ac_header>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking $ac_header presence" >&5
>-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
>+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -4820,24 +5636,22 @@
> /* end confdefs.h.  */
> #include <$ac_header>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -4845,9 +5659,10 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
> case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
>@@ -4871,25 +5686,24 @@
> echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for $ac_header" >&5
>-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   eval "$as_ac_Header=\$ac_header_preproc"
> fi
>-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+ac_res=`eval echo '${'$as_ac_Header'}'`
>+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
>+echo "${ECHO_T}$ac_res" >&6; }
> 
> fi
> if test `eval echo '${'$as_ac_Header'}'` = yes; then
>@@ -4903,157 +5717,254 @@
> 
> 
> 
>-
>-
>-# Only perform the check for file, if the check method requires it
>-case $deplibs_check_method in
>-file_magic*)
>-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
>-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
>-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
>-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
>+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
>+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
>+    (test "X$CXX" != "Xg++"))) ; then
>+  ac_ext=cpp
>+ac_cpp='$CXXCPP $CPPFLAGS'
>+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
>+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
>+if test -z "$CXXCPP"; then
>+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  case $MAGIC_CMD in
>-  /*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
>-  ;;
>-  ?:/*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
>-  ;;
>-  *)
>-  ac_save_MAGIC_CMD="$MAGIC_CMD"
>-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
>-  ac_dummy="/usr/bin:$PATH"
>-  for ac_dir in $ac_dummy; do
>-    test -z "$ac_dir" && ac_dir=.
>-    if test -f $ac_dir/${ac_tool_prefix}file; then
>-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
>-      if test -n "$file_magic_test_file"; then
>-	case $deplibs_check_method in
>-	"file_magic "*)
>-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
>-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>-	    egrep "$file_magic_regex" > /dev/null; then
>-	    :
>-	  else
>-	    cat <<EOF 1>&2
>+      # Double quotes because CXXCPP needs to be expanded
>+    for CXXCPP in "$CXX -E" "/lib/cpp"
>+    do
>+      ac_preproc_ok=false
>+for ac_cxx_preproc_warn_flag in '' yes
>+do
>+  # Use a header file that comes with gcc, so configuring glibc
>+  # with a fresh cross-compiler works.
>+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>+  # <limits.h> exists even on freestanding compilers.
>+  # On the NeXT, cc -E runs the code through the compiler's parser,
>+  # not just through cpp. "Syntax error" is here to catch this case.
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#ifdef __STDC__
>+# include <limits.h>
>+#else
>+# include <assert.h>
>+#endif
>+		     Syntax error
>+_ACEOF
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>+  :
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
> 
>-*** Warning: the command libtool uses to detect shared libraries,
>-*** $file_magic_cmd, produces output that libtool cannot recognize.
>-*** The result is that libtool may fail to recognize shared libraries
>-*** as such.  This will affect the creation of libtool libraries that
>-*** depend on shared libraries, but programs linked with such libtool
>-*** libraries will work regardless of this problem.  Nevertheless, you
>-*** may want to report the problem to your system manager and/or to
>-*** bug-libtool@gnu.org
>+  # Broken: fails on valid input.
>+continue
>+fi
> 
>-EOF
>-	  fi ;;
>-	esac
>-      fi
>-      break
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  MAGIC_CMD="$ac_save_MAGIC_CMD"
>-  ;;
>+rm -f conftest.err conftest.$ac_ext
>+
>+  # OK, works on sane cases.  Now check whether nonexistent headers
>+  # can be detected and how.
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <ac_nonexistent.h>
>+_ACEOF
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
> esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>+  # Broken: success on invalid input.
>+continue
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+  # Passes both tests.
>+ac_preproc_ok=:
>+break
> fi
> 
>-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-if test -n "$MAGIC_CMD"; then
>-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
>-echo "${ECHO_T}$MAGIC_CMD" >&6
>-else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+rm -f conftest.err conftest.$ac_ext
>+
>+done
>+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
>+rm -f conftest.err conftest.$ac_ext
>+if $ac_preproc_ok; then
>+  break
> fi
> 
>-if test -z "$lt_cv_path_MAGIC_CMD"; then
>-  if test -n "$ac_tool_prefix"; then
>-    echo "$as_me:$LINENO: checking for file" >&5
>-echo $ECHO_N "checking for file... $ECHO_C" >&6
>-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>+    done
>+    ac_cv_prog_CXXCPP=$CXXCPP
>+
>+fi
>+  CXXCPP=$ac_cv_prog_CXXCPP
> else
>-  case $MAGIC_CMD in
>-  /*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
>-  ;;
>-  ?:/*)
>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
>-  ;;
>-  *)
>-  ac_save_MAGIC_CMD="$MAGIC_CMD"
>-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
>-  ac_dummy="/usr/bin:$PATH"
>-  for ac_dir in $ac_dummy; do
>-    test -z "$ac_dir" && ac_dir=.
>-    if test -f $ac_dir/file; then
>-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
>-      if test -n "$file_magic_test_file"; then
>-	case $deplibs_check_method in
>-	"file_magic "*)
>-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
>-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>-	    egrep "$file_magic_regex" > /dev/null; then
>-	    :
>-	  else
>-	    cat <<EOF 1>&2
>+  ac_cv_prog_CXXCPP=$CXXCPP
>+fi
>+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
>+echo "${ECHO_T}$CXXCPP" >&6; }
>+ac_preproc_ok=false
>+for ac_cxx_preproc_warn_flag in '' yes
>+do
>+  # Use a header file that comes with gcc, so configuring glibc
>+  # with a fresh cross-compiler works.
>+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>+  # <limits.h> exists even on freestanding compilers.
>+  # On the NeXT, cc -E runs the code through the compiler's parser,
>+  # not just through cpp. "Syntax error" is here to catch this case.
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#ifdef __STDC__
>+# include <limits.h>
>+#else
>+# include <assert.h>
>+#endif
>+		     Syntax error
>+_ACEOF
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>+  :
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
> 
>-*** Warning: the command libtool uses to detect shared libraries,
>-*** $file_magic_cmd, produces output that libtool cannot recognize.
>-*** The result is that libtool may fail to recognize shared libraries
>-*** as such.  This will affect the creation of libtool libraries that
>-*** depend on shared libraries, but programs linked with such libtool
>-*** libraries will work regardless of this problem.  Nevertheless, you
>-*** may want to report the problem to your system manager and/or to
>-*** bug-libtool@gnu.org
>+  # Broken: fails on valid input.
>+continue
>+fi
> 
>-EOF
>-	  fi ;;
>-	esac
>-      fi
>-      break
>-    fi
>-  done
>-  IFS="$ac_save_ifs"
>-  MAGIC_CMD="$ac_save_MAGIC_CMD"
>-  ;;
>+rm -f conftest.err conftest.$ac_ext
>+
>+  # OK, works on sane cases.  Now check whether nonexistent headers
>+  # can be detected and how.
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <ac_nonexistent.h>
>+_ACEOF
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
> esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>+  # Broken: success on invalid input.
>+continue
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+  # Passes both tests.
>+ac_preproc_ok=:
>+break
> fi
> 
>-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>-if test -n "$MAGIC_CMD"; then
>-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
>-echo "${ECHO_T}$MAGIC_CMD" >&6
>+rm -f conftest.err conftest.$ac_ext
>+
>+done
>+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
>+rm -f conftest.err conftest.$ac_ext
>+if $ac_preproc_ok; then
>+  :
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
>+See \`config.log' for more details." >&5
>+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
>+See \`config.log' for more details." >&2;}
>+   { (exit 1); exit 1; }; }
> fi
> 
>-  else
>-    MAGIC_CMD=:
>-  fi
>+ac_ext=cpp
>+ac_cpp='$CXXCPP $CPPFLAGS'
>+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>+
> fi
> 
>-  fi
>-  ;;
>-esac
> 
>+ac_ext=f
>+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
>+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
> if test -n "$ac_tool_prefix"; then
>-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
>-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>-if test "${ac_cv_prog_RANLIB+set}" = set; then
>+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
>+  do
>+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
>+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_F77+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  if test -n "$RANLIB"; then
>-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
>+  if test -n "$F77"; then
>+  ac_cv_prog_F77="$F77" # Let the user override the test.
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
>@@ -5061,37 +5972,43 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
> fi
> fi
>-RANLIB=$ac_cv_prog_RANLIB
>-if test -n "$RANLIB"; then
>-  echo "$as_me:$LINENO: result: $RANLIB" >&5
>-echo "${ECHO_T}$RANLIB" >&6
>+F77=$ac_cv_prog_F77
>+if test -n "$F77"; then
>+  { echo "$as_me:$LINENO: result: $F77" >&5
>+echo "${ECHO_T}$F77" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>+
>+    test -n "$F77" && break
>+  done
> fi
>-if test -z "$ac_cv_prog_RANLIB"; then
>-  ac_ct_RANLIB=$RANLIB
>-  # Extract the first word of "ranlib", so it can be a program name with args.
>-set dummy ranlib; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
>+if test -z "$F77"; then
>+  ac_ct_F77=$F77
>+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
>+do
>+  # Extract the first word of "$ac_prog", so it can be a program name with args.
>+set dummy $ac_prog; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  if test -n "$ac_ct_RANLIB"; then
>-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
>+  if test -n "$ac_ct_F77"; then
>+  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
>@@ -5099,2891 +6016,12973 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>-    ac_cv_prog_ac_ct_RANLIB="ranlib"
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_ac_ct_F77="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
>+IFS=$as_save_IFS
> 
>-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
> fi
> fi
>-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
>-if test -n "$ac_ct_RANLIB"; then
>-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
>-echo "${ECHO_T}$ac_ct_RANLIB" >&6
>+ac_ct_F77=$ac_cv_prog_ac_ct_F77
>+if test -n "$ac_ct_F77"; then
>+  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
>+echo "${ECHO_T}$ac_ct_F77" >&6; }
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>-  RANLIB=$ac_ct_RANLIB
>-else
>-  RANLIB="$ac_cv_prog_RANLIB"
>-fi
> 
>-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.
>-set dummy ${ac_tool_prefix}strip; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>-if test "${ac_cv_prog_STRIP+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  if test -n "$STRIP"; then
>-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
>-else
>-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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
>-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>-    break 2
>-  fi
>+  test -n "$ac_ct_F77" && break
> done
>-done
>-
>-fi
>-fi
>-STRIP=$ac_cv_prog_STRIP
>-if test -n "$STRIP"; then
>-  echo "$as_me:$LINENO: result: $STRIP" >&5
>-echo "${ECHO_T}$STRIP" >&6
>-else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>-fi
> 
>-fi
>-if test -z "$ac_cv_prog_STRIP"; then
>-  ac_ct_STRIP=$STRIP
>-  # Extract the first word of "strip", so it can be a program name with args.
>-set dummy strip; ac_word=$2
>-echo "$as_me:$LINENO: checking for $ac_word" >&5
>-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
>-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  if test -n "$ac_ct_STRIP"; then
>-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
>-else
>-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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>-    ac_cv_prog_ac_ct_STRIP="strip"
>-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>-    break 2
>+  if test "x$ac_ct_F77" = x; then
>+    F77=""
>+  else
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    F77=$ac_ct_F77
>   fi
>-done
>-done
>-
>-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
>-fi
>-fi
>-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
>-if test -n "$ac_ct_STRIP"; then
>-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
>-echo "${ECHO_T}$ac_ct_STRIP" >&6
>-else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
> fi
> 
>-  STRIP=$ac_ct_STRIP
>-else
>-  STRIP="$ac_cv_prog_STRIP"
>-fi
>-
>-
>-enable_dlopen=no
>-enable_win32_dll=no
>-
>-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
>-if test "${enable_libtool_lock+set}" = set; then
>-  enableval="$enable_libtool_lock"
>-
>-fi;
>-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
> 
>-# Some flags need to be propagated to the compiler or linker for good
>-# libtool support.
>-case $host in
>-*-*-irix6*)
>-  # Find out which ABI we are using.
>-  echo '#line 5223 "configure"' > conftest.$ac_ext
>-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>&5
>+# Provide some information about the compiler.
>+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
>+ac_compiler=`set X $ac_compile; echo $2`
>+{ (ac_try="$ac_compiler --version >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler --version >&5") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; then
>-    case `/usr/bin/file conftest.$ac_objext` in
>-    *32-bit*)
>-      LD="${LD-ld} -32"
>-      ;;
>-    *N32*)
>-      LD="${LD-ld} -n32"
>-      ;;
>-    *64-bit*)
>-      LD="${LD-ld} -64"
>-      ;;
>-    esac
>-  fi
>-  rm -rf conftest*
>-  ;;
>+  (exit $ac_status); }
>+{ (ac_try="$ac_compiler -v >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler -v >&5") 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }
>+{ (ac_try="$ac_compiler -V >&5"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compiler -V >&5") 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }
>+rm -f a.out
> 
>-*-*-sco3.2v5*)
>-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
>-  SAVE_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -belf"
>-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
>-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
>-if test "${lt_cv_cc_needs_belf+set}" = set; then
>+# If we don't use `.F' as extension, the preprocessor is not run on the
>+# input file.  (Note that this only needs to work for GNU compilers.)
>+ac_save_ext=$ac_ext
>+ac_ext=F
>+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
>+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
>+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>+  cat >conftest.$ac_ext <<_ACEOF
>+      program main
>+#ifndef __GNUC__
>+       choke me
>+#endif
> 
>+      end
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_f77_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>+  ac_compiler_gnu=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
> 
>-     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
>+	ac_compiler_gnu=no
>+fi
> 
>-     cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
> 
>-int
>-main ()
>-{
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
>+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
>+ac_ext=$ac_save_ext
>+ac_test_FFLAGS=${FFLAGS+set}
>+ac_save_FFLAGS=$FFLAGS
>+FFLAGS=
>+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
>+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_f77_g+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  FFLAGS=-g
>+cat >conftest.$ac_ext <<_ACEOF
>+      program main
> 
>-  ;
>-  return 0;
>-}
>+      end
> _ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+rm -f conftest.$ac_objext
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  lt_cv_cc_needs_belf=yes
>+  (exit $ac_status); } && {
>+	 test -z "$ac_f77_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>+  ac_cv_prog_f77_g=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-lt_cv_cc_needs_belf=no
>+	ac_cv_prog_f77_g=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-     ac_ext=c
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
>+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
>+if test "$ac_test_FFLAGS" = set; then
>+  FFLAGS=$ac_save_FFLAGS
>+elif test $ac_cv_prog_f77_g = yes; then
>+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
>+    FFLAGS="-g -O2"
>+  else
>+    FFLAGS="-g"
>+  fi
>+else
>+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
>+    FFLAGS="-O2"
>+  else
>+    FFLAGS=
>+  fi
>+fi
>+
>+G77=`test $ac_compiler_gnu = yes && echo yes`
>+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
> 
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
>-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
>-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
>-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
>-    CFLAGS="$SAVE_CFLAGS"
>-  fi
>-  ;;
> 
> 
>-esac
>+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
> 
>-# Sed substitution that helps us do robust quoting.  It backslashifies
>-# metacharacters that are still active within double-quoted strings.
>-Xsed='sed -e s/^X//'
>-sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g'
>+# find the maximum length of command line arguments
>+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
>+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
>+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+    i=0
>+  teststring="ABCD"
>+
>+  case $build_os in
>+  msdosdjgpp*)
>+    # On DJGPP, this test can blow up pretty badly due to problems in libc
>+    # (any single argument exceeding 2000 bytes causes a buffer overrun
>+    # during glob expansion).  Even if it were fixed, the result of this
>+    # check would be larger than it should be.
>+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
>+    ;;
>+
>+  gnu*)
>+    # Under GNU Hurd, this test is not required because there is
>+    # no limit to the length of command line arguments.
>+    # Libtool will interpret -1 as no limit whatsoever
>+    lt_cv_sys_max_cmd_len=-1;
>+    ;;
>+
>+  cygwin* | mingw*)
>+    # On Win9x/ME, this test blows up -- it succeeds, but takes
>+    # about 5 minutes as the teststring grows exponentially.
>+    # Worse, since 9x/ME are not pre-emptively multitasking,
>+    # you end up with a "frozen" computer, even though with patience
>+    # the test eventually succeeds (with a max line length of 256k).
>+    # Instead, let's just punt: use the minimum linelength reported by
>+    # all of the supported platforms: 8192 (on NT/2K/XP).
>+    lt_cv_sys_max_cmd_len=8192;
>+    ;;
> 
>-# Same as above, but do not quote variable references.
>-double_quote_subst='s/$[\\"\\`\\\\]$/\\\1/g'
>+  amigaos*)
>+    # On AmigaOS with pdksh, this test takes hours, literally.
>+    # So we just punt and use a minimum line length of 8192.
>+    lt_cv_sys_max_cmd_len=8192;
>+    ;;
> 
>-# Sed substitution to delay expansion of an escaped shell variable in a
>-# double_quote_subst'ed string.
>-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
>+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
>+    # This has been around since 386BSD, at least.  Likely further.
>+    if test -x /sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
>+    elif test -x /usr/sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
>+    else
>+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
>+    fi
>+    # And add a safety zone
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
>+    ;;
>+
>+  interix*)
>+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
>+    lt_cv_sys_max_cmd_len=196608
>+    ;;
>+
>+  osf*)
>+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
>+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
>+    # nice to cause kernel panics so lets avoid the loop below.
>+    # First set a reasonable default.
>+    lt_cv_sys_max_cmd_len=16384
>+    #
>+    if test -x /sbin/sysconfig; then
>+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
>+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
>+      esac
>+    fi
>+    ;;
>+  sco3.2v5*)
>+    lt_cv_sys_max_cmd_len=102400
>+    ;;
>+  sysv5* | sco5v6* | sysv4.2uw2*)
>+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
>+    if test -n "$kargmax"; then
>+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
>+    else
>+      lt_cv_sys_max_cmd_len=32768
>+    fi
>+    ;;
>+  *)
>+    # If test is not a shell built-in, we'll probably end up computing a
>+    # maximum length that is only half of the actual maximum length, but
>+    # we can't tell.
>+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
>+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
>+	       = "XX$teststring") >/dev/null 2>&1 &&
>+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
>+	    lt_cv_sys_max_cmd_len=$new_result &&
>+	    test $i != 17 # 1/2 MB should be enough
>+    do
>+      i=`expr $i + 1`
>+      teststring=$teststring$teststring
>+    done
>+    teststring=
>+    # Add a significant safety factor because C++ compilers can tack on massive
>+    # amounts of additional arguments before passing them to the linker.
>+    # It appears as though 1/2 is a usable value.
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
>+    ;;
>+  esac
> 
>-# Constants:
>-rm="rm -f"
>+fi
> 
>-# Global variables:
>-default_ofile=libtool
>-can_build_shared=yes
>+if test -n $lt_cv_sys_max_cmd_len ; then
>+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
>+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: none" >&5
>+echo "${ECHO_T}none" >&6; }
>+fi
> 
>-# All known linkers require a `.a' archive for static linking (except M$VC,
>-# which needs '.lib').
>-libext=a
>-ltmain="$ac_aux_dir/ltmain.sh"
>-ofile="$default_ofile"
>-with_gnu_ld="$lt_cv_prog_gnu_ld"
>-need_locks="$enable_libtool_lock"
> 
>-old_CC="$CC"
>-old_CFLAGS="$CFLAGS"
> 
>-# Set sane defaults for various variables
>-test -z "$AR" && AR=ar
>-test -z "$AR_FLAGS" && AR_FLAGS=cru
>-test -z "$AS" && AS=as
>-test -z "$CC" && CC=cc
>-test -z "$DLLTOOL" && DLLTOOL=dlltool
>-test -z "$LD" && LD=ld
>-test -z "$LN_S" && LN_S="ln -s"
>-test -z "$MAGIC_CMD" && MAGIC_CMD=file
>-test -z "$NM" && NM=nm
>-test -z "$OBJDUMP" && OBJDUMP=objdump
>-test -z "$RANLIB" && RANLIB=:
>-test -z "$STRIP" && STRIP=:
>-test -z "$ac_objext" && ac_objext=o
> 
>-if test x"$host" != x"$build"; then
>-  ac_tool_prefix=${host_alias}-
>+# Check for command to grab the raw symbol name followed by C symbol from nm.
>+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
>+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
>+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  ac_tool_prefix=
>-fi
>-
>-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
>-case $host_os in
>-linux-gnu*) ;;
>-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
>-esac
> 
>-case $host_os in
>-aix3*)
>-  # AIX sometimes has problems with the GCC collect2 program.  For some
>-  # reason, if we set the COLLECT_NAMES environment variable, the problems
>-  # vanish in a puff of smoke.
>-  if test "X${COLLECT_NAMES+set}" != Xset; then
>-    COLLECT_NAMES=
>-    export COLLECT_NAMES
>-  fi
>-  ;;
>-esac
>+# These are sane defaults that work on at least a few old systems.
>+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
> 
>-# Determine commands to create old-style static archives.
>-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
>-old_postinstall_cmds='chmod 644 $oldlib'
>-old_postuninstall_cmds=
>+# Character class describing NM global symbol codes.
>+symcode='[BCDEGRST]'
> 
>-if test -n "$RANLIB"; then
>-  case $host_os in
>-  openbsd*)
>-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
>-    ;;
>-  *)
>-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
>-    ;;
>-  esac
>-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
>-fi
>-
>-# Allow CC to be a program name with arguments.
>-set dummy $CC
>-compiler="$2"
>-
>-echo "$as_me:$LINENO: checking for objdir" >&5
>-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
>-rm -f .libs 2>/dev/null
>-mkdir .libs 2>/dev/null
>-if test -d .libs; then
>-  objdir=.libs
>-else
>-  # MS-DOS does not allow filenames that begin with a dot.
>-  objdir=_libs
>-fi
>-rmdir .libs 2>/dev/null
>-echo "$as_me:$LINENO: result: $objdir" >&5
>-echo "${ECHO_T}$objdir" >&6
>-
>-
>-
>-# Check whether --with-pic or --without-pic was given.
>-if test "${with_pic+set}" = set; then
>-  withval="$with_pic"
>-  pic_mode="$withval"
>-else
>-  pic_mode=default
>-fi;
>-test -z "$pic_mode" && pic_mode=default
>-
>-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
>-# in isolation, and that seeing it set (from the cache) indicates that
>-# the associated values are set (in the cache) correctly too.
>-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
>-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
>-if test "${lt_cv_prog_cc_pic+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-   lt_cv_prog_cc_pic=
>-  lt_cv_prog_cc_shlib=
>-  lt_cv_prog_cc_wl=
>-  lt_cv_prog_cc_static=
>-  lt_cv_prog_cc_no_builtin=
>-  lt_cv_prog_cc_can_build_shared=$can_build_shared
>+# Regexp to match symbols that can be accessed directly from C.
>+sympat='$[_A-Za-z][_A-Za-z0-9]*$'
> 
>-  if test "$GCC" = yes; then
>-    lt_cv_prog_cc_wl='-Wl,'
>-    lt_cv_prog_cc_static='-static'
>+# Transform an extracted symbol line into a proper C declaration
>+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'"
> 
>-    case $host_os in
>-    aix*)
>-      # Below there is a dirty hack to force normal static linking with -ldl
>-      # The problem is because libdl dynamically linked with both libc and
>-      # libC (AIX C++ library), which obviously doesn't included in libraries
>-      # list by gcc. This cause undefined symbols with -static flags.
>-      # This hack allows C programs to be linked with "-static -ldl", but
>-      # not sure about C++ programs.
>-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
>-      ;;
>-    amigaos*)
>-      # FIXME: we need at least 68020 code to build shared libraries, but
>-      # adding the `-m68020' flag to GCC prevents building anything better,
>-      # like `-m68040'.
>-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
>-      ;;
>-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
>-      # PIC is the default for these OSes.
>-      ;;
>-    darwin* | rhapsody*)
>-      # PIC is the default on this platform
>-      # Common symbols not allowed in MH_DYLIB files
>-      lt_cv_prog_cc_pic='-fno-common'
>-      ;;
>-    cygwin* | mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
>-      ;;
>-    sysv4*MP*)
>-      if test -d /usr/nec; then
>-	 lt_cv_prog_cc_pic=-Kconform_pic
>-      fi
>-      ;;
>-    *)
>-      lt_cv_prog_cc_pic='-fPIC'
>-      ;;
>-    esac
>-  else
>-    # PORTME Check for PIC flags for the system compiler.
>-    case $host_os in
>-    aix3* | aix4* | aix5*)
>-      lt_cv_prog_cc_wl='-Wl,'
>-      # All AIX code is PIC.
>-      if test "$host_cpu" = ia64; then
>-	# AIX 5 now supports IA64 processor
>-	lt_cv_prog_cc_static='-Bstatic'
>-      else
>-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
>-      fi
>-      ;;
>+# Transform an extracted symbol line into symbol name and symbol address
>+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
> 
>-    hpux9* | hpux10* | hpux11*)
>-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
>-      lt_cv_prog_cc_pic='+Z'
>-      ;;
>+# Define system-specific variables.
>+case $host_os in
>+aix*)
>+  symcode='[BCDT]'
>+  ;;
>+cygwin* | mingw* | pw32*)
>+  symcode='[ABCDGISTW]'
>+  ;;
>+hpux*) # Its linker distinguishes data from code symbols
>+  if test "$host_cpu" = ia64; then
>+    symcode='[ABCDEGRST]'
>+  fi
>+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>+  ;;
>+linux*)
>+  if test "$host_cpu" = ia64; then
>+    symcode='[ABCDGIRSTW]'
>+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>+  fi
>+  ;;
>+irix* | nonstopux*)
>+  symcode='[BCDEGRST]'
>+  ;;
>+osf*)
>+  symcode='[BCDEGQRST]'
>+  ;;
>+solaris*)
>+  symcode='[BDRT]'
>+  ;;
>+sco3.2v5*)
>+  symcode='[DT]'
>+  ;;
>+sysv4.2uw2*)
>+  symcode='[DT]'
>+  ;;
>+sysv5* | sco5v6* | unixware* | OpenUNIX*)
>+  symcode='[ABDT]'
>+  ;;
>+sysv4)
>+  symcode='[DFNSTU]'
>+  ;;
>+esac
> 
>-    irix5* | irix6*)
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static='-non_shared'
>-      # PIC (with -KPIC) is the default.
>-      ;;
>+# Handle CRLF in mingw tool chain
>+opt_cr=
>+case $build_os in
>+mingw*)
>+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
>+  ;;
>+esac
> 
>-    cygwin* | mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
>-      ;;
>+# If we're using GNU nm, then use its standard symbol codes.
>+case `$NM -V 2>&1` in
>+*GNU* | *'with BFD'*)
>+  symcode='[ABCDGIRSTW]' ;;
>+esac
> 
>-    newsos6)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      ;;
>+# Try without a prefix undercore, then with it.
>+for ac_symprfx in "" "_"; do
> 
>-    osf3* | osf4* | osf5*)
>-      # All OSF/1 code is PIC.
>-      lt_cv_prog_cc_wl='-Wl,'
>-      lt_cv_prog_cc_static='-non_shared'
>-      ;;
>+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
>+  symxfrm="\\1 $ac_symprfx\\2 \\2"
> 
>-    sco3.2v5*)
>-      lt_cv_prog_cc_pic='-Kpic'
>-      lt_cv_prog_cc_static='-dn'
>-      lt_cv_prog_cc_shlib='-belf'
>-      ;;
>+  # Write the raw and C identifiers.
>+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]$$symcode$symcode*$[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
> 
>-    solaris*)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      lt_cv_prog_cc_wl='-Wl,'
>-      ;;
>+  # Check to see that the pipe works correctly.
>+  pipe_works=no
> 
>-    sunos4*)
>-      lt_cv_prog_cc_pic='-PIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      lt_cv_prog_cc_wl='-Qoption ld '
>-      ;;
>+  rm -f conftest*
>+  cat > conftest.$ac_ext <<EOF
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+char nm_test_var;
>+void nm_test_func(){}
>+#ifdef __cplusplus
>+}
>+#endif
>+int main(){nm_test_var='a';nm_test_func();return(0);}
>+EOF
> 
>-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-      lt_cv_prog_cc_pic='-KPIC'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      if test "x$host_vendor" = xsni; then
>-	lt_cv_prog_cc_wl='-LD'
>+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+    # Now try to grab the symbols.
>+    nlist=conftest.nm
>+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
>+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && test -s "$nlist"; then
>+      # Try sorting and uniquifying the output.
>+      if sort "$nlist" | uniq > "$nlist"T; then
>+	mv -f "$nlist"T "$nlist"
>       else
>-	lt_cv_prog_cc_wl='-Wl,'
>-      fi
>-      ;;
>-
>-    uts4*)
>-      lt_cv_prog_cc_pic='-pic'
>-      lt_cv_prog_cc_static='-Bstatic'
>-      ;;
>-
>-    sysv4*MP*)
>-      if test -d /usr/nec ;then
>-	lt_cv_prog_cc_pic='-Kconform_pic'
>-	lt_cv_prog_cc_static='-Bstatic'
>+	rm -f "$nlist"T
>       fi
>-      ;;
>-
>-    *)
>-      lt_cv_prog_cc_can_build_shared=no
>-      ;;
>-    esac
>-  fi
> 
>-fi
>+      # Make sure that we snagged all the symbols we need.
>+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
>+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
>+	  cat <<EOF > conftest.$ac_ext
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
> 
>-if test -z "$lt_cv_prog_cc_pic"; then
>-  echo "$as_me:$LINENO: result: none" >&5
>-echo "${ECHO_T}none" >&6
>-else
>-  echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5
>-echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
>+EOF
>+	  # Now generate the symbol file.
>+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
> 
>-  # Check to make sure the pic_flag actually works.
>-  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
>-echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
>-  if test "${lt_cv_prog_cc_pic_works+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-      save_CFLAGS="$CFLAGS"
>-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
>-    cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+	  cat <<EOF >> conftest.$ac_ext
>+#if defined (__STDC__) && __STDC__
>+# define lt_ptr_t void *
>+#else
>+# define lt_ptr_t char *
>+# define const
>+#endif
> 
>-int
>-main ()
>+/* The mapping between symbol names and symbols. */
>+const struct {
>+  const char *name;
>+  lt_ptr_t address;
>+}
>+lt_preloaded_symbols[] =
> {
>+EOF
>+	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
>+	  cat <<\EOF >> conftest.$ac_ext
>+  {0, (lt_ptr_t) 0}
>+};
> 
>-  ;
>-  return 0;
>+#ifdef __cplusplus
> }
>-_ACEOF
>-rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>+#endif
>+EOF
>+	  # Now try linking the two files.
>+	  mv conftest.$ac_objext conftstm.$ac_objext
>+	  lt_save_LIBS="$LIBS"
>+	  lt_save_CFLAGS="$CFLAGS"
>+	  LIBS="conftstm.$ac_objext"
>+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
>+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>+  (eval $ac_link) 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-        case $host_os in
>-      hpux9* | hpux10* | hpux11*)
>-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
>-	# they create non-PIC objects.  So, if there were any warnings, we
>-	# assume that PIC is not supported.
>-	if test -s conftest.err; then
>-	  lt_cv_prog_cc_pic_works=no
>+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
>+	    pipe_works=yes
>+	  fi
>+	  LIBS="$lt_save_LIBS"
>+	  CFLAGS="$lt_save_CFLAGS"
> 	else
>-	  lt_cv_prog_cc_pic_works=yes
>+	  echo "cannot find nm_test_func in $nlist" >&5
> 	fi
>-	;;
>-      *)
>-	lt_cv_prog_cc_pic_works=yes
>-	;;
>-      esac
>-
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-      lt_cv_prog_cc_pic_works=no
>-
>-fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-    CFLAGS="$save_CFLAGS"
>-
>-fi
>-
>-
>-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
>-    lt_cv_prog_cc_pic=
>-    lt_cv_prog_cc_can_build_shared=no
>+      else
>+	echo "cannot find nm_test_var in $nlist" >&5
>+      fi
>+    else
>+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
>+    fi
>   else
>-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
>+    echo "$progname: failed program was:" >&5
>+    cat conftest.$ac_ext >&5
>   fi
>+  rm -f conftest* conftst*
> 
>-  echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5
>-echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
>-fi
>-
>-# Check for any special shared library compilation flags.
>-if test -n "$lt_cv_prog_cc_shlib"; then
>-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
>-echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
>-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
>+  # Do not use the global_symbol_pipe unless it works.
>+  if test "$pipe_works" = yes; then
>+    break
>   else
>-   { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
>-echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
>-    lt_cv_prog_cc_can_build_shared=no
>+    lt_cv_sys_global_symbol_pipe=
>   fi
>+done
>+
> fi
> 
>-echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
>-echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
>-if test "${lt_cv_prog_cc_static_works+set}" = set; then
>+if test -z "$lt_cv_sys_global_symbol_pipe"; then
>+  lt_cv_sys_global_symbol_to_cdecl=
>+fi
>+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
>+  { echo "$as_me:$LINENO: result: failed" >&5
>+echo "${ECHO_T}failed" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: ok" >&5
>+echo "${ECHO_T}ok" >&6; }
>+fi
>+
>+{ echo "$as_me:$LINENO: checking for objdir" >&5
>+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
>+if test "${lt_cv_objdir+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-    lt_cv_prog_cc_static_works=no
>-  save_LDFLAGS="$LDFLAGS"
>-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+  rm -f .libs 2>/dev/null
>+mkdir .libs 2>/dev/null
>+if test -d .libs; then
>+  lt_cv_objdir=.libs
>+else
>+  # MS-DOS does not allow filenames that begin with a dot.
>+  lt_cv_objdir=_libs
>+fi
>+rmdir .libs 2>/dev/null
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
>+echo "${ECHO_T}$lt_cv_objdir" >&6; }
>+objdir=$lt_cv_objdir
> 
>-int
>-main ()
>-{
> 
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  lt_cv_prog_cc_static_works=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
> 
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-  LDFLAGS="$save_LDFLAGS"
> 
>-fi
> 
>+case $host_os in
>+aix3*)
>+  # AIX sometimes has problems with the GCC collect2 program.  For some
>+  # reason, if we set the COLLECT_NAMES environment variable, the problems
>+  # vanish in a puff of smoke.
>+  if test "X${COLLECT_NAMES+set}" != Xset; then
>+    COLLECT_NAMES=
>+    export COLLECT_NAMES
>+  fi
>+  ;;
>+esac
> 
>-# Belt *and* braces to stop my trousers falling down:
>-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
>-echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5
>-echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
>+# Sed substitution that helps us do robust quoting.  It backslashifies
>+# metacharacters that are still active within double-quoted strings.
>+Xsed='sed -e 1s/^X//'
>+sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g'
> 
>-pic_flag="$lt_cv_prog_cc_pic"
>-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
>-wl="$lt_cv_prog_cc_wl"
>-link_static_flag="$lt_cv_prog_cc_static"
>-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
>-can_build_shared="$lt_cv_prog_cc_can_build_shared"
>+# Same as above, but do not quote variable references.
>+double_quote_subst='s/$[\\"\\`\\\\]$/\\\1/g'
> 
>+# Sed substitution to delay expansion of an escaped shell variable in a
>+# double_quote_subst'ed string.
>+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
> 
>-# Check to see if options -o and -c are simultaneously supported by compiler
>-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
>-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
>-if test "${lt_cv_compiler_c_o+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>+# Sed substitution to avoid accidental globbing in evaled expressions
>+no_glob_subst='s/\*/\\\*/g'
> 
>-$rm -r conftest 2>/dev/null
>-mkdir conftest
>-cd conftest
>-echo "int some_variable = 0;" > conftest.$ac_ext
>-mkdir out
>-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
>-# that will create temporary files in the current directory regardless of
>-# the output directory.  Thus, making CWD read-only will cause this test
>-# to fail, enabling locking or at least warning the user not to do parallel
>-# builds.
>-chmod -w .
>-save_CFLAGS="$CFLAGS"
>-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
>-compiler_c_o=no
>-if { (eval echo configure:5785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
>-  # The compiler can only warn and ignore the option if not recognized
>-  # So say no if there are warnings
>-  if test -s out/conftest.err; then
>-    lt_cv_compiler_c_o=no
>-  else
>-    lt_cv_compiler_c_o=yes
>-  fi
>-else
>-  # Append any errors to the config.log.
>-  cat out/conftest.err 1>&5
>-  lt_cv_compiler_c_o=no
>-fi
>-CFLAGS="$save_CFLAGS"
>-chmod u+w .
>-$rm conftest* out/*
>-rmdir out
>-cd ..
>-rmdir conftest
>-$rm -r conftest 2>/dev/null
>+# Constants:
>+rm="rm -f"
> 
>-fi
>+# Global variables:
>+default_ofile=libtool
>+can_build_shared=yes
> 
>-compiler_c_o=$lt_cv_compiler_c_o
>-echo "$as_me:$LINENO: result: $compiler_c_o" >&5
>-echo "${ECHO_T}$compiler_c_o" >&6
>+# All known linkers require a `.a' archive for static linking (except MSVC,
>+# which needs '.lib').
>+libext=a
>+ltmain="$ac_aux_dir/ltmain.sh"
>+ofile="$default_ofile"
>+with_gnu_ld="$lt_cv_prog_gnu_ld"
> 
>-if test x"$compiler_c_o" = x"yes"; then
>-  # Check to see if we can write to a .lo
>-  echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5
>-echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
>-  if test "${lt_cv_compiler_o_lo+set}" = set; then
>+if test -n "$ac_tool_prefix"; then
>+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
>+set dummy ${ac_tool_prefix}ar; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_AR+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>+  if test -n "$AR"; then
>+  ac_cv_prog_AR="$AR" # Let the user override the test.
>+else
>+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_AR="${ac_tool_prefix}ar"
>+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>+    break 2
>+  fi
>+done
>+done
>+IFS=$as_save_IFS
> 
>-  lt_cv_compiler_o_lo=no
>-  save_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -c -o conftest.lo"
>-  save_objext="$ac_objext"
>-  ac_objext=lo
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+fi
>+fi
>+AR=$ac_cv_prog_AR
>+if test -n "$AR"; then
>+  { echo "$as_me:$LINENO: result: $AR" >&5
>+echo "${ECHO_T}$AR" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
> 
>-int
>-main ()
>-{
>-int some_variable = 0;
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-      # The compiler can only warn and ignore the option if not recognized
>-    # So say no if there are warnings
>-    if test -s conftest.err; then
>-      lt_cv_compiler_o_lo=no
>-    else
>-      lt_cv_compiler_o_lo=yes
>-    fi
> 
>+fi
>+if test -z "$ac_cv_prog_AR"; then
>+  ac_ct_AR=$AR
>+  # Extract the first word of "ar", so it can be a program name with args.
>+set dummy ar; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+  if test -n "$ac_ct_AR"; then
>+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
>+else
>+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_ac_ct_AR="ar"
>+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>+    break 2
>+  fi
>+done
>+done
>+IFS=$as_save_IFS
> 
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-  ac_objext="$save_objext"
>-  CFLAGS="$save_CFLAGS"
>-
> fi
>-
>-  compiler_o_lo=$lt_cv_compiler_o_lo
>-  echo "$as_me:$LINENO: result: $compiler_o_lo" >&5
>-echo "${ECHO_T}$compiler_o_lo" >&6
>+ac_ct_AR=$ac_cv_prog_ac_ct_AR
>+if test -n "$ac_ct_AR"; then
>+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
>+echo "${ECHO_T}$ac_ct_AR" >&6; }
> else
>-  compiler_o_lo=no
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
> fi
> 
>-# Check to see if we can do hard links to lock some files if needed
>-hard_links="nottested"
>-if test "$compiler_c_o" = no && test "$need_locks" != no; then
>-  # do not overwrite the value of need_locks provided by the user
>-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
>-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
>-  hard_links=yes
>-  $rm conftest*
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  touch conftest.a
>-  ln conftest.a conftest.b 2>&5 || hard_links=no
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  echo "$as_me:$LINENO: result: $hard_links" >&5
>-echo "${ECHO_T}$hard_links" >&6
>-  if test "$hard_links" = no; then
>-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
>-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
>-    need_locks=warn
>+  if test "x$ac_ct_AR" = x; then
>+    AR="false"
>+  else
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    AR=$ac_ct_AR
>   fi
> else
>-  need_locks=no
>+  AR="$ac_cv_prog_AR"
> fi
> 
>-if test "$GCC" = yes; then
>-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
>-  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
>-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
>-  echo "int some_variable = 0;" > conftest.$ac_ext
>-  save_CFLAGS="$CFLAGS"
>-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
>-  compiler_rtti_exceptions=no
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+if test -n "$ac_tool_prefix"; then
>+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
>+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_RANLIB+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  if test -n "$RANLIB"; then
>+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
>+else
>+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
>+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>+    break 2
>+  fi
>+done
>+done
>+IFS=$as_save_IFS
> 
>-int
>-main ()
>-{
>-int some_variable = 0;
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-      # The compiler can only warn and ignore the option if not recognized
>-    # So say no if there are warnings
>-    if test -s conftest.err; then
>-      compiler_rtti_exceptions=no
>-    else
>-      compiler_rtti_exceptions=yes
>-    fi
>+fi
>+fi
>+RANLIB=$ac_cv_prog_RANLIB
>+if test -n "$RANLIB"; then
>+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
>+echo "${ECHO_T}$RANLIB" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
> 
>+
>+fi
>+if test -z "$ac_cv_prog_RANLIB"; then
>+  ac_ct_RANLIB=$RANLIB
>+  # Extract the first word of "ranlib", so it can be a program name with args.
>+set dummy ranlib; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+  if test -n "$ac_ct_RANLIB"; then
>+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
>+else
>+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_ac_ct_RANLIB="ranlib"
>+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>+    break 2
>+  fi
>+done
>+done
>+IFS=$as_save_IFS
> 
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-  CFLAGS="$save_CFLAGS"
>-  echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5
>-echo "${ECHO_T}$compiler_rtti_exceptions" >&6
>+fi
>+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
>+if test -n "$ac_ct_RANLIB"; then
>+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
>+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
> 
>-  if test "$compiler_rtti_exceptions" = "yes"; then
>-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
>+  if test "x$ac_ct_RANLIB" = x; then
>+    RANLIB=":"
>   else
>-    no_builtin_flag=' -fno-builtin'
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    RANLIB=$ac_ct_RANLIB
>   fi
>+else
>+  RANLIB="$ac_cv_prog_RANLIB"
> fi
> 
>-# See if the linker supports building shared libraries.
>-echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5
>-echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
>-
>-allow_undefined_flag=
>-no_undefined_flag=
>-need_lib_prefix=unknown
>-need_version=unknown
>-# when you set need_version to no, make sure it does not cause -set_version
>-# flags to be left without arguments
>-archive_cmds=
>-archive_expsym_cmds=
>-old_archive_from_new_cmds=
>-old_archive_from_expsyms_cmds=
>-export_dynamic_flag_spec=
>-whole_archive_flag_spec=
>-thread_safe_flag_spec=
>-hardcode_into_libs=no
>-hardcode_libdir_flag_spec=
>-hardcode_libdir_separator=
>-hardcode_direct=no
>-hardcode_minus_L=no
>-hardcode_shlibpath_var=unsupported
>-runpath_var=
>-link_all_deplibs=unknown
>-always_export_symbols=no
>-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
>-# include_expsyms should be a list of space-separated symbols to be *always*
>-# included in the symbol list
>-include_expsyms=
>-# exclude_expsyms can be an egrep regular expression of symbols to exclude
>-# it will be wrapped by ` (' and `)$', so one must not match beginning or
>-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>-# as well as any symbol that contains `d'.
>-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
>-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>-# platforms (ab)use it in PIC code, but their linkers get confused if
>-# the symbol is explicitly referenced.  Since portable code cannot
>-# rely on this symbol name, it's probably fine to never include it in
>-# preloaded symbol tables.
>-extract_expsyms_cmds=
>-
>-case $host_os in
>-cygwin* | mingw* | pw32*)
>-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
>-  # When not using gcc, we currently assume that we are using
>-  # Microsoft Visual C++.
>-  if test "$GCC" != yes; then
>-    with_gnu_ld=no
>-  fi
>-  ;;
>-openbsd*)
>-  with_gnu_ld=no
>-  ;;
>-esac
>+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.
>+set dummy ${ac_tool_prefix}strip; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_STRIP+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  if test -n "$STRIP"; then
>+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
>+else
>+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
>+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>+    break 2
>+  fi
>+done
>+done
>+IFS=$as_save_IFS
> 
>-ld_shlibs=yes
>-if test "$with_gnu_ld" = yes; then
>-  # If archive_cmds runs LD, not CC, wlarc should be empty
>-  wlarc='${wl}'
>+fi
>+fi
>+STRIP=$ac_cv_prog_STRIP
>+if test -n "$STRIP"; then
>+  { echo "$as_me:$LINENO: result: $STRIP" >&5
>+echo "${ECHO_T}$STRIP" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
> 
>-  # See if GNU ld supports shared libraries.
>-  case $host_os in
>-  aix3* | aix4* | aix5*)
>-    # On AIX, the GNU linker is very broken
>-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
>-    ld_shlibs=no
>-    cat <<EOF 1>&2
> 
>-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>-*** to be unable to reliably create shared libraries on AIX.
>-*** Therefore, libtool is disabling shared libraries support.  If you
>-*** really care for shared libraries, you may want to modify your PATH
>-*** so that a non-GNU linker is found, and then restart.
>+fi
>+if test -z "$ac_cv_prog_STRIP"; then
>+  ac_ct_STRIP=$STRIP
>+  # Extract the first word of "strip", so it can be a program name with args.
>+set dummy strip; ac_word=$2
>+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
>+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
>+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  if test -n "$ac_ct_STRIP"; then
>+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
>+else
>+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>+    ac_cv_prog_ac_ct_STRIP="strip"
>+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>+    break 2
>+  fi
>+done
>+done
>+IFS=$as_save_IFS
> 
>-EOF
>-    ;;
>+fi
>+fi
>+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
>+if test -n "$ac_ct_STRIP"; then
>+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
>+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
> 
>-  amigaos*)
>-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-
>-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>-    # that the semantics of dynamic libraries on AmigaOS, at least up
>-    # to version 4, is to share data among multiple programs linked
>-    # with the same dynamic library.  Since this doesn't match the
>-    # behavior of shared libraries on other platforms, we can use
>-    # them.
>-    ld_shlibs=no
>-    ;;
>+  if test "x$ac_ct_STRIP" = x; then
>+    STRIP=":"
>+  else
>+    case $cross_compiling:$ac_tool_warned in
>+yes:)
>+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&5
>+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
>+whose name does not start with the host triplet.  If you think this
>+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
>+ac_tool_warned=yes ;;
>+esac
>+    STRIP=$ac_ct_STRIP
>+  fi
>+else
>+  STRIP="$ac_cv_prog_STRIP"
>+fi
> 
>-  beos*)
>-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      allow_undefined_flag=unsupported
>-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>-      # support --undefined.  This deserves some investigation.  FIXME
>-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-    else
>-      ld_shlibs=no
>-    fi
>-    ;;
> 
>-  cygwin* | mingw* | pw32*)
>-    # hardcode_libdir_flag_spec is actually meaningless, as there is
>-    # no search path for DLLs.
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    allow_undefined_flag=unsupported
>-    always_export_symbols=yes
>-
>-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
>-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
>-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
>-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
>-      else $CC -o impgen impgen.c ; fi)~
>-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
>-
>-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
>-
>-    # cygwin and mingw dlls have different entry points and sets of symbols
>-    # to exclude.
>-    # FIXME: what about values for MSVC?
>-    dll_entry=__cygwin_dll_entry@12
>-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
>-    case $host_os in
>-    mingw*)
>-      # mingw values
>-      dll_entry=_DllMainCRTStartup@12
>-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
>-      ;;
>-    esac
>+old_CC="$CC"
>+old_CFLAGS="$CFLAGS"
> 
>-    # mingw and cygwin differ, and it's simplest to just exclude the union
>-    # of the two symbol sets.
>-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
>-
>-    # recent cygwin and mingw systems supply a stub DllMain which the user
>-    # can override, but on older systems we have to supply one (in ltdll.c)
>-    if test "x$lt_cv_need_dllmain" = "xyes"; then
>-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
>-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
>-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
>-    else
>-      ltdll_obj=
>-      ltdll_cmds=
>-    fi
>+# Set sane defaults for various variables
>+test -z "$AR" && AR=ar
>+test -z "$AR_FLAGS" && AR_FLAGS=cru
>+test -z "$AS" && AS=as
>+test -z "$CC" && CC=cc
>+test -z "$LTCC" && LTCC=$CC
>+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
>+test -z "$DLLTOOL" && DLLTOOL=dlltool
>+test -z "$LD" && LD=ld
>+test -z "$LN_S" && LN_S="ln -s"
>+test -z "$MAGIC_CMD" && MAGIC_CMD=file
>+test -z "$NM" && NM=nm
>+test -z "$SED" && SED=sed
>+test -z "$OBJDUMP" && OBJDUMP=objdump
>+test -z "$RANLIB" && RANLIB=:
>+test -z "$STRIP" && STRIP=:
>+test -z "$ac_objext" && ac_objext=o
> 
>-    # Extract the symbol export list from an `--export-all' def file,
>-    # then regenerate the def file from the symbol export list, so that
>-    # the compiled dll only exports the symbol export list.
>-    # Be careful not to strip the DATA tag left be newer dlltools.
>-    export_symbols_cmds="$ltdll_cmds"'
>-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
>-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
>-
>-    # If the export-symbols file already is a .def file (1st line
>-    # is EXPORTS), use it as is.
>-    # If DATA tags from a recent dlltool are present, honour them!
>-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
>-	cp $export_symbols $output_objdir/$soname-def;
>-      else
>-	echo EXPORTS > $output_objdir/$soname-def;
>-	_lt_hint=1;
>-	cat $export_symbols | while read symbol; do
>-	 set dummy \$symbol;
>-	 case \$# in
>-	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
>-	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
>-	 esac;
>-	 _lt_hint=`expr 1 + \$_lt_hint`;
>-	done;
>-      fi~
>-      '"$ltdll_cmds"'
>-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
>-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
>-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
>-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
>-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
>-    ;;
>+# Determine commands to create old-style static archives.
>+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
>+old_postinstall_cmds='chmod 644 $oldlib'
>+old_postuninstall_cmds=
> 
>-  netbsd*)
>-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>-      wlarc=
>-    else
>-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    fi
>+if test -n "$RANLIB"; then
>+  case $host_os in
>+  openbsd*)
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
>     ;;
>+  *)
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
>+    ;;
>+  esac
>+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
>+fi
> 
>-  solaris* | sysv5*)
>-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
>-      ld_shlibs=no
>-      cat <<EOF 1>&2
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
> 
>-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>-*** create shared libraries on Solaris systems.  Therefore, libtool
>-*** is disabling shared libraries support.  We urge you to upgrade GNU
>-*** binutils to release 2.9.1 or newer.  Another option is to modify
>-*** your PATH or compiler configuration so that the native linker is
>-*** used, and then restart.
> 
>-EOF
>-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    else
>-      ld_shlibs=no
>-    fi
>-    ;;
>+# Only perform the check for file, if the check method requires it
>+case $deplibs_check_method in
>+file_magic*)
>+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
>+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
>+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
>+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  case $MAGIC_CMD in
>+[\\/*] |  ?:[\\/]*)
>+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
>+  ;;
>+*)
>+  lt_save_MAGIC_CMD="$MAGIC_CMD"
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
>+  for ac_dir in $ac_dummy; do
>+    IFS="$lt_save_ifs"
>+    test -z "$ac_dir" && ac_dir=.
>+    if test -f $ac_dir/${ac_tool_prefix}file; then
>+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
>+      if test -n "$file_magic_test_file"; then
>+	case $deplibs_check_method in
>+	"file_magic "*)
>+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
>+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>+	    $EGREP "$file_magic_regex" > /dev/null; then
>+	    :
>+	  else
>+	    cat <<EOF 1>&2
> 
>-  sunos4*)
>-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-    wlarc=
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+*** Warning: the command libtool uses to detect shared libraries,
>+*** $file_magic_cmd, produces output that libtool cannot recognize.
>+*** The result is that libtool may fail to recognize shared libraries
>+*** as such.  This will affect the creation of libtool libraries that
>+*** depend on shared libraries, but programs linked with such libtool
>+*** libraries will work regardless of this problem.  Nevertheless, you
>+*** may want to report the problem to your system manager and/or to
>+*** bug-libtool@gnu.org
> 
>-  *)
>-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-    else
>-      ld_shlibs=no
>+EOF
>+	  fi ;;
>+	esac
>+      fi
>+      break
>     fi
>-    ;;
>-  esac
>+  done
>+  IFS="$lt_save_ifs"
>+  MAGIC_CMD="$lt_save_MAGIC_CMD"
>+  ;;
>+esac
>+fi
> 
>-  if test "$ld_shlibs" = yes; then
>-    runpath_var=LD_RUN_PATH
>-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
>-    export_dynamic_flag_spec='${wl}--export-dynamic'
>-    case $host_os in
>-    cygwin* | mingw* | pw32*)
>-      # dlltool doesn't understand --whole-archive et. al.
>-      whole_archive_flag_spec=
>-      ;;
>-    *)
>-      # ancient GNU ld didn't support --whole-archive et. al.
>-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
>-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>-      else
>-	whole_archive_flag_spec=
>-      fi
>-      ;;
>-    esac
>-  fi
>+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>+if test -n "$MAGIC_CMD"; then
>+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
>+echo "${ECHO_T}$MAGIC_CMD" >&6; }
> else
>-  # PORTME fill in a description of your system's linker (not GNU ld)
>-  case $host_os in
>-  aix3*)
>-    allow_undefined_flag=unsupported
>-    always_export_symbols=yes
>-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>-    # Note: this linker hardcodes the directories in LIBPATH if there
>-    # are no directories specified by -L.
>-    hardcode_minus_L=yes
>-    if test "$GCC" = yes && test -z "$link_static_flag"; then
>-      # Neither direct hardcoding nor static linking is supported with a
>-      # broken collect2.
>-      hardcode_direct=unsupported
>-    fi
>-    ;;
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
> 
>-  aix4* | aix5*)
>-    if test "$host_cpu" = ia64; then
>-      # On IA64, the linker does run time linking by default, so we don't
>-      # have to do anything special.
>-      aix_use_runtimelinking=no
>-      exp_sym_flag='-Bexport'
>-      no_entry_flag=""
>-    else
>-      aix_use_runtimelinking=no
>+if test -z "$lt_cv_path_MAGIC_CMD"; then
>+  if test -n "$ac_tool_prefix"; then
>+    { echo "$as_me:$LINENO: checking for file" >&5
>+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
>+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  case $MAGIC_CMD in
>+[\\/*] |  ?:[\\/]*)
>+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
>+  ;;
>+*)
>+  lt_save_MAGIC_CMD="$MAGIC_CMD"
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
>+  for ac_dir in $ac_dummy; do
>+    IFS="$lt_save_ifs"
>+    test -z "$ac_dir" && ac_dir=.
>+    if test -f $ac_dir/file; then
>+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
>+      if test -n "$file_magic_test_file"; then
>+	case $deplibs_check_method in
>+	"file_magic "*)
>+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
>+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>+	    $EGREP "$file_magic_regex" > /dev/null; then
>+	    :
>+	  else
>+	    cat <<EOF 1>&2
> 
>-      # Test if we are trying to use run time linking or normal
>-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
>-      # need to do runtime linking.
>-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
>-	for ld_flag in $LDFLAGS; do
>-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>-	    aix_use_runtimelinking=yes
>-	    break
>-	  fi
>-	done
>-      esac
>+*** Warning: the command libtool uses to detect shared libraries,
>+*** $file_magic_cmd, produces output that libtool cannot recognize.
>+*** The result is that libtool may fail to recognize shared libraries
>+*** as such.  This will affect the creation of libtool libraries that
>+*** depend on shared libraries, but programs linked with such libtool
>+*** libraries will work regardless of this problem.  Nevertheless, you
>+*** may want to report the problem to your system manager and/or to
>+*** bug-libtool@gnu.org
> 
>-      exp_sym_flag='-bexport'
>-      no_entry_flag='-bnoentry'
>-    fi
>-
>-    # When large executables or shared objects are built, AIX ld can
>-    # have problems creating the table of contents.  If linking a library
>-    # or program results in "error TOC overflow" add -mminimal-toc to
>-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>-
>-    hardcode_direct=yes
>-    archive_cmds=''
>-    hardcode_libdir_separator=':'
>-    if test "$GCC" = yes; then
>-      case $host_os in aix4.[012]|aix4.[012].*)
>-	collect2name=`${CC} -print-prog-name=collect2`
>-	if test -f "$collect2name" && \
>-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
>-	then
>-	  # We have reworked collect2
>-	  hardcode_direct=yes
>-	else
>-	  # We have old collect2
>-	  hardcode_direct=unsupported
>-	  # It fails to find uninstalled libraries when the uninstalled
>-	  # path is not listed in the libpath.  Setting hardcode_minus_L
>-	  # to unsupported forces relinking
>-	  hardcode_minus_L=yes
>-	  hardcode_libdir_flag_spec='-L$libdir'
>-	  hardcode_libdir_separator=
>-	fi
>-      esac
>-
>-      shared_flag='-shared'
>-    else
>-      # not using gcc
>-      if test "$host_cpu" = ia64; then
>-	shared_flag='${wl}-G'
>-      else
>-	if test "$aix_use_runtimelinking" = yes; then
>-	  shared_flag='${wl}-G'
>-	else
>-	  shared_flag='${wl}-bM:SRE'
>-	fi
>+EOF
>+	  fi ;;
>+	esac
>       fi
>+      break
>     fi
>+  done
>+  IFS="$lt_save_ifs"
>+  MAGIC_CMD="$lt_save_MAGIC_CMD"
>+  ;;
>+esac
>+fi
> 
>-    # It seems that -bexpall can do strange things, so it is better to
>-    # generate a list of symbols to export.
>-    always_export_symbols=yes
>-    if test "$aix_use_runtimelinking" = yes; then
>-      # Warning - without using the other runtime loading flags (-brtl),
>-      # -berok will link without error, but may produce a broken library.
>-      allow_undefined_flag='-berok'
>-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
>-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>-    else
>-      if test "$host_cpu" = ia64; then
>-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
>-	allow_undefined_flag="-z nodefs"
>-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>-      else
>-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
>-	# Warning - without using the other run time loading flags,
>-	# -berok will link without error, but may produce a broken library.
>-	allow_undefined_flag='${wl}-berok'
>-	# This is a bit strange, but is similar to how AIX traditionally builds
>-	# it's shared libraries.
>-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
>-      fi
>-    fi
>-    ;;
>+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>+if test -n "$MAGIC_CMD"; then
>+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
>+echo "${ECHO_T}$MAGIC_CMD" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
> 
>-  amigaos*)
>-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-    # see comment about different semantics on the GNU ld section
>-    ld_shlibs=no
>-    ;;
>+  else
>+    MAGIC_CMD=:
>+  fi
>+fi
> 
>-  cygwin* | mingw* | pw32*)
>-    # When not using gcc, we currently assume that we are using
>-    # Microsoft Visual C++.
>-    # hardcode_libdir_flag_spec is actually meaningless, as there is
>-    # no search path for DLLs.
>-    hardcode_libdir_flag_spec=' '
>-    allow_undefined_flag=unsupported
>-    # Tell ltmain to make .lib files, not .a files.
>-    libext=lib
>-    # FIXME: Setting linknames here is a bad hack.
>-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
>-    # The linker will automatically build a .lib file if we build a DLL.
>-    old_archive_from_new_cmds='true'
>-    # FIXME: Should let the user specify the lib program.
>-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
>-    fix_srcfile_path='`cygpath -w "$srcfile"`'
>-    ;;
>-
>-  darwin* | rhapsody*)
>-    case "$host_os" in
>-    rhapsody* | darwin1.[012])
>-      allow_undefined_flag='-undefined suppress'
>-      ;;
>-    *) # Darwin 1.3 on
>-      allow_undefined_flag='-flat_namespace -undefined suppress'
>-      ;;
>-    esac
>-    # FIXME: Relying on posixy $() will cause problems for
>-    #        cross-compilation, but unfortunately the echo tests do not
>-    #        yet detect zsh echo's removal of \ escapes.
>-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
>-    # We need to add '_' to the symbols in $export_symbols first
>-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    whole_archive_flag_spec='-all_load $convenience'
>-    ;;
>-
>-  freebsd1*)
>-    ld_shlibs=no
>-    ;;
>-
>-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>-  # support.  Future versions do this automatically, but an explicit c++rt0.o
>-  # does not break anything, and helps significantly (at the cost of a little
>-  # extra space).
>-  freebsd2.2*)
>-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+  fi
>+  ;;
>+esac
> 
>-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
>-  freebsd2*)
>-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+enable_dlopen=no
>+enable_win32_dll=no
> 
>-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>-  freebsd*)
>-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+# Check whether --enable-libtool-lock was given.
>+if test "${enable_libtool_lock+set}" = set; then
>+  enableval=$enable_libtool_lock;
>+fi
> 
>-  hpux9* | hpux10* | hpux11*)
>-    case $host_os in
>-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
>-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
>-    esac
>-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes # Not in the search PATH, but as the default
>-			 # location of the library.
>-    export_dynamic_flag_spec='${wl}-E'
>-    ;;
>+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
> 
>-  irix5* | irix6*)
>-    if test "$GCC" = yes; then
>-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-    else
>-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-    fi
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    link_all_deplibs=yes
>-    ;;
> 
>-  netbsd*)
>-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
>-    else
>-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
>-    fi
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+# Check whether --with-pic was given.
>+if test "${with_pic+set}" = set; then
>+  withval=$with_pic; pic_mode="$withval"
>+else
>+  pic_mode=default
>+fi
> 
>-  newsos6)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    hardcode_shlibpath_var=no
>-    ;;
>+test -z "$pic_mode" && pic_mode=default
> 
>-  openbsd*)
>-    hardcode_direct=yes
>-    hardcode_shlibpath_var=no
>-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>-      export_dynamic_flag_spec='${wl}-E'
>-    else
>-      case "$host_os" in
>-      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
>-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-	hardcode_libdir_flag_spec='-R$libdir'
>-        ;;
>-      *)
>-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
>-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>-        ;;
>-      esac
>-    fi
>-    ;;
>+# Use C for the default configuration in the libtool script
>+tagname=
>+lt_save_CC="$CC"
>+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
> 
>-  os2*)
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_minus_L=yes
>-    allow_undefined_flag=unsupported
>-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
>-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
>-    ;;
> 
>-  osf3*)
>-    if test "$GCC" = yes; then
>-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-    else
>-      allow_undefined_flag=' -expect_unresolved \*'
>-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-    fi
>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    hardcode_libdir_separator=:
>-    ;;
>+# Source file extension for C test sources.
>+ac_ext=c
> 
>-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
>-    if test "$GCC" = yes; then
>-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>-    else
>-      allow_undefined_flag=' -expect_unresolved \*'
>-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
>+# Object file extension for compiled C test sources.
>+objext=o
>+objext=$objext
> 
>-      #Both c and cxx compiler support -rpath directly
>-      hardcode_libdir_flag_spec='-rpath $libdir'
>-    fi
>-    hardcode_libdir_separator=:
>-    ;;
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="int some_variable = 0;\n"
> 
>-  sco3.2v5*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_shlibpath_var=no
>-    runpath_var=LD_RUN_PATH
>-    hardcode_runpath_var=yes
>-    export_dynamic_flag_spec='${wl}-Bexport'
>-    ;;
>+# Code to be used in simple link tests
>+lt_simple_link_test_code='int main(){return(0);}\n'
> 
>-  solaris*)
>-    # gcc --version < 3.0 without binutils cannot create self contained
>-    # shared libraries reliably, requiring libgcc.a to resolve some of
>-    # the object symbols generated in some cases.  Libraries that use
>-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
>-    # a copy of libgcc.a into every shared library to guarantee resolving
>-    # such symbols causes other problems:  According to Tim Van Holder
>-    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
>-    # (to the application) exception stack for one thing.
>-    no_undefined_flag=' -z defs'
>-    if test "$GCC" = yes; then
>-      case `$CC --version 2>/dev/null` in
>-      [12].*)
>-	cat <<EOF 1>&2
> 
>-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
>-*** create self contained shared libraries on Solaris systems, without
>-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
>-*** -no-undefined support, which will at least allow you to build shared
>-*** libraries.  However, you may find that when you link such libraries
>-*** into an application without using GCC, you have to manually add
>-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
>-*** upgrade to a newer version of GCC.  Another option is to rebuild your
>-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
> 
>-EOF
>-        no_undefined_flag=
>-	;;
>-      esac
>-    fi
>-    # $CC -shared without GNU ld will not create a library from C++
>-    # object files and a static libstdc++, better avoid it by now
>-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-    hardcode_libdir_flag_spec='-R$libdir'
>-    hardcode_shlibpath_var=no
>-    case $host_os in
>-    solaris2.[0-5] | solaris2.[0-5].*) ;;
>-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
>-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
>-    esac
>-    link_all_deplibs=yes
>-    ;;
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
> 
>-  sunos4*)
>-    if test "x$host_vendor" = xsequent; then
>-      # Use $CC to link under sequent, because it throws in some extra .o
>-      # files that make .init and .fini sections work.
>-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
>-    else
>-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
>-    fi
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_direct=yes
>-    hardcode_minus_L=yes
>-    hardcode_shlibpath_var=no
>-    ;;
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
> 
>-  sysv4)
>-    if test "x$host_vendor" = xsno; then
>-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct=yes # is this really true???
>-    else
>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
>-    fi
>-    runpath_var='LD_RUN_PATH'
>-    hardcode_shlibpath_var=no
>-    ;;
> 
>-  sysv4.3*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_shlibpath_var=no
>-    export_dynamic_flag_spec='-Bexport'
>-    ;;
>-
>-  sysv5*)
>-    no_undefined_flag=' -z text'
>-    # $CC -shared without GNU ld will not create a library from C++
>-    # object files and a static libstdc++, better avoid it by now
>-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-    hardcode_libdir_flag_spec=
>-    hardcode_shlibpath_var=no
>-    runpath_var='LD_RUN_PATH'
>-    ;;
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
> 
>-  uts4*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_shlibpath_var=no
>-    ;;
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
> 
>-  dgux*)
>-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_libdir_flag_spec='-L$libdir'
>-    hardcode_shlibpath_var=no
>-    ;;
> 
>-  sysv4*MP*)
>-    if test -d /usr/nec; then
>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_shlibpath_var=no
>-      runpath_var=LD_RUN_PATH
>-      hardcode_runpath_var=yes
>-      ld_shlibs=yes
>-    fi
>-    ;;
> 
>-  sysv4.2uw2*)
>-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>-    hardcode_direct=yes
>-    hardcode_minus_L=no
>-    hardcode_shlibpath_var=no
>-    hardcode_runpath_var=yes
>-    runpath_var=LD_RUN_PATH
>-    ;;
>+lt_prog_compiler_no_builtin_flag=
> 
>-  sysv5uw7* | unixware7*)
>-    no_undefined_flag='${wl}-z ${wl}text'
>-    if test "$GCC" = yes; then
>-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>-    else
>-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>-    fi
>-    runpath_var='LD_RUN_PATH'
>-    hardcode_shlibpath_var=no
>-    ;;
>+if test "$GCC" = yes; then
>+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
> 
>-  *)
>-    ld_shlibs=no
>-    ;;
>-  esac
>-fi
>-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
>-echo "${ECHO_T}$ld_shlibs" >&6
>-test "$ld_shlibs" = no && can_build_shared=no
> 
>-# Check hardcoding attributes.
>-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
>-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
>-hardcode_action=
>-if test -n "$hardcode_libdir_flag_spec" || \
>-   test -n "$runpath_var"; then
>+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
>+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
>+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_cv_prog_compiler_rtti_exceptions=no
>+  ac_outfile=conftest.$ac_objext
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="-fno-rtti -fno-exceptions"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:7179: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&5
>+   echo "$as_me:7183: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       lt_cv_prog_compiler_rtti_exceptions=yes
>+     fi
>+   fi
>+   $rm conftest*
> 
>-  # We can hardcode non-existant directories.
>-  if test "$hardcode_direct" != no &&
>-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>-     # have to relink, otherwise we might link with an installed library
>-     # when we should be linking with a yet-to-be-installed one
>-     ## test "$hardcode_shlibpath_var" != no &&
>-     test "$hardcode_minus_L" != no; then
>-    # Linking always hardcodes the temporary library directory.
>-    hardcode_action=relink
>-  else
>-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>-    hardcode_action=immediate
>-  fi
>-else
>-  # We cannot hardcode anything, or else we can only hardcode existing
>-  # directories.
>-  hardcode_action=unsupported
> fi
>-echo "$as_me:$LINENO: result: $hardcode_action" >&5
>-echo "${ECHO_T}$hardcode_action" >&6
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
>+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
> 
>-striplib=
>-old_striplib=
>-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
>-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
>-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>-  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
>+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
> else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+    :
> fi
> 
>-reload_cmds='$LD$reload_flag -o $output$reload_objs'
>-test -z "$deplibs_check_method" && deplibs_check_method=unknown
>+fi
> 
>-# PORTME Fill in your ld.so characteristics
>-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
>-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
>-library_names_spec=
>-libname_spec='lib$name'
>-soname_spec=
>-postinstall_cmds=
>-postuninstall_cmds=
>-finish_cmds=
>-finish_eval=
>-shlibpath_var=
>-shlibpath_overrides_runpath=unknown
>-version_type=none
>-dynamic_linker="$host_os ld.so"
>-sys_lib_dlsearch_path_spec="/lib /usr/lib"
>-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
>+lt_prog_compiler_wl=
>+lt_prog_compiler_pic=
>+lt_prog_compiler_static=
> 
>-case $host_os in
>-aix3*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
>-  shlibpath_var=LIBPATH
>+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
>+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
> 
>-  # AIX has no versioning support, so we append a major version to the name.
>-  soname_spec='${libname}${release}.so$major'
>-  ;;
>+  if test "$GCC" = yes; then
>+    lt_prog_compiler_wl='-Wl,'
>+    lt_prog_compiler_static='-static'
> 
>-aix4* | aix5*)
>-  version_type=linux
>-  if test "$host_cpu" = ia64; then
>-    # AIX 5 supports IA64
>-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
>-    shlibpath_var=LD_LIBRARY_PATH
>-  else
>-    # With GCC up to 2.95.x, collect2 would create an import file
>-    # for dependence libraries.  The import file would start with
>-    # the line `#! .'.  This would cause the generated library to
>-    # depend on `.', always an invalid library.  This was fixed in
>-    # development snapshots of GCC prior to 3.0.
>     case $host_os in
>-      aix4 | aix4.[01] | aix4.[01].*)
>-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>-	     echo ' yes '
>-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>-	  :
>-	else
>-	  can_build_shared=no
>-	fi
>-	;;
>-    esac
>-    # AIX (on Power*) has no versioning support, so currently we can
>-    # not hardcode correct soname into executable. Probably we can
>-    # add versioning support to collect2, so additional links can
>-    # be useful in future.
>-    if test "$aix_use_runtimelinking" = yes; then
>-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>-      # instead of lib<name>.a to let people know that these are not
>-      # typical AIX shared libraries.
>-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-    else
>-      # We preserve .a as extension for shared libraries through AIX4.2
>-      # and later when we are not doing run time linking.
>-      library_names_spec='${libname}${release}.a $libname.a'
>-      soname_spec='${libname}${release}.so$major'
>-    fi
>-    shlibpath_var=LIBPATH
>-  fi
>-  ;;
>+      aix*)
>+      # All AIX code is PIC.
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	lt_prog_compiler_static='-Bstatic'
>+      fi
>+      ;;
> 
>-amigaos*)
>-  library_names_spec='$libname.ixlibrary $libname.a'
>-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
>-  ;;
>+    amigaos*)
>+      # FIXME: we need at least 68020 code to build shared libraries, but
>+      # adding the `-m68020' flag to GCC prevents building anything better,
>+      # like `-m68040'.
>+      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
>+      ;;
> 
>-beos*)
>-  library_names_spec='${libname}.so'
>-  dynamic_linker="$host_os ld.so"
>-  shlibpath_var=LIBRARY_PATH
>-  ;;
>+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>+      # PIC is the default for these OSes.
>+      ;;
> 
>-bsdi4*)
>-  version_type=linux
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>-  export_dynamic_flag_spec=-rdynamic
>-  # the default ld.so.conf also contains /usr/contrib/lib and
>-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>-  # libtool to hard-code these into programs
>-  ;;
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic='-DDLL_EXPORT'
>+      ;;
> 
>-cygwin* | mingw* | pw32*)
>-  version_type=windows
>-  need_version=no
>-  need_lib_prefix=no
>-  case $GCC,$host_os in
>-  yes,cygwin*)
>-    library_names_spec='$libname.dll.a'
>-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
>-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
>-      dldir=$destdir/`dirname \$dlpath`~
>-      test -d \$dldir || mkdir -p \$dldir~
>-      $install_prog .libs/$dlname \$dldir/$dlname'
>-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
>-      dlpath=$dir/\$dldll~
>-       $rm \$dlpath'
>-    ;;
>-  yes,mingw*)
>-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
>-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
>-    ;;
>-  yes,pw32*)
>-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
>-    ;;
>-  *)
>-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
>-    ;;
>-  esac
>-  dynamic_linker='Win32 ld.exe'
>-  # FIXME: first we should search . and the directory the executable is in
>-  shlibpath_var=PATH
>-  ;;
>+    darwin* | rhapsody*)
>+      # PIC is the default on this platform
>+      # Common symbols not allowed in MH_DYLIB files
>+      lt_prog_compiler_pic='-fno-common'
>+      ;;
> 
>-darwin* | rhapsody*)
>-  dynamic_linker="$host_os dyld"
>-  version_type=darwin
>-  need_lib_prefix=no
>-  need_version=no
>-  # FIXME: Relying on posixy $() will cause problems for
>-  #        cross-compilation, but unfortunately the echo tests do not
>-  #        yet detect zsh echo's removal of \ escapes.
>-  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
>-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
>-  shlibpath_overrides_runpath=yes
>-  shlibpath_var=DYLD_LIBRARY_PATH
>-  ;;
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
> 
>-freebsd1*)
>-  dynamic_linker=no
>-  ;;
>+    msdosdjgpp*)
>+      # Just because we use GCC doesn't mean we suddenly get shared libraries
>+      # on systems that don't support them.
>+      lt_prog_compiler_can_build_shared=no
>+      enable_shared=no
>+      ;;
> 
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>-  version_type=freebsd-$objformat
>-  case $version_type in
>-    freebsd-elf*)
>-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
>-      need_version=no
>-      need_lib_prefix=no
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	lt_prog_compiler_pic=-Kconform_pic
>+      fi
>       ;;
>-    freebsd-*)
>-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
>-      need_version=yes
>+
>+    hpux*)
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	lt_prog_compiler_pic='-fPIC'
>+	;;
>+      esac
>       ;;
>-  esac
>-  shlibpath_var=LD_LIBRARY_PATH
>-  case $host_os in
>-  freebsd2*)
>-    shlibpath_overrides_runpath=yes
>-    ;;
>-  *)
>-    shlibpath_overrides_runpath=no
>-    hardcode_into_libs=yes
>-    ;;
>-  esac
>-  ;;
> 
>-gnu*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  hardcode_into_libs=yes
>-  ;;
>+    *)
>+      lt_prog_compiler_pic='-fPIC'
>+      ;;
>+    esac
>+  else
>+    # PORTME Check for flag to pass linker flags through the system compiler.
>+    case $host_os in
>+    aix*)
>+      lt_prog_compiler_wl='-Wl,'
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	lt_prog_compiler_static='-Bstatic'
>+      else
>+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
>+      fi
>+      ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         lt_prog_compiler_pic='-qnocommon'
>+         lt_prog_compiler_wl='-Wl,'
>+         ;;
>+       esac
>+       ;;
> 
>-hpux9* | hpux10* | hpux11*)
>-  # Give a soname corresponding to the major version so that dld.sl refuses to
>-  # link against other versions.
>-  dynamic_linker="$host_os dld.sl"
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  shlibpath_var=SHLIB_PATH
>-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
>-  soname_spec='${libname}${release}.sl$major'
>-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>-  postinstall_cmds='chmod 555 $lib'
>-  ;;
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic='-DDLL_EXPORT'
>+      ;;
> 
>-irix5* | irix6*)
>-  version_type=irix
>-  need_lib_prefix=no
>-  need_version=no
>-  soname_spec='${libname}${release}.so$major'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
>-  case $host_os in
>-  irix5*)
>-    libsuff= shlibsuff=
>-    ;;
>-  *)
>-    case $LD in # libtool.m4 will add one of these switches to LD
>-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
>-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
>-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
>-    *) libsuff= shlibsuff= libmagic=never-match;;
>-    esac
>-    ;;
>-  esac
>-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>-  shlibpath_overrides_runpath=no
>-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>-  ;;
>+    hpux9* | hpux10* | hpux11*)
>+      lt_prog_compiler_wl='-Wl,'
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	lt_prog_compiler_pic='+Z'
>+	;;
>+      esac
>+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
>+      lt_prog_compiler_static='${wl}-a ${wl}archive'
>+      ;;
> 
>-# No shared lib support for Linux oldld, aout, or coff.
>-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
>-  dynamic_linker=no
>-  ;;
>+    irix5* | irix6* | nonstopux*)
>+      lt_prog_compiler_wl='-Wl,'
>+      # PIC (with -KPIC) is the default.
>+      lt_prog_compiler_static='-non_shared'
>+      ;;
> 
>-# This must be Linux ELF.
>-linux-gnu*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=no
>-  # This implies no fast_install, which is unacceptable.
>-  # Some rework will be needed to allow for fast_install
>-  # before this can be enabled.
>-  hardcode_into_libs=yes
>+    newsos6)
>+      lt_prog_compiler_pic='-KPIC'
>+      lt_prog_compiler_static='-Bstatic'
>+      ;;
> 
>-  # We used to test for /lib/ld.so.1 and disable shared libraries on
>-  # powerpc, because MkLinux only supported shared libraries with the
>-  # GNU dynamic linker.  Since this was broken with cross compilers,
>-  # most powerpc-linux boxes support dynamic linking these days and
>-  # people can always --disable-shared, the test was removed, and we
>-  # assume the GNU/Linux dynamic linker is in use.
>-  dynamic_linker='GNU/Linux ld.so'
>-  ;;
>+    linux*)
>+      case $cc_basename in
>+      icc* | ecc*)
>+	lt_prog_compiler_wl='-Wl,'
>+	lt_prog_compiler_pic='-KPIC'
>+	lt_prog_compiler_static='-static'
>+        ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+	# which looks to be a dead project)
>+	lt_prog_compiler_wl='-Wl,'
>+	lt_prog_compiler_pic='-fpic'
>+	lt_prog_compiler_static='-Bstatic'
>+        ;;
>+      ccc*)
>+        lt_prog_compiler_wl='-Wl,'
>+        # All Alpha code is PIC.
>+        lt_prog_compiler_static='-non_shared'
>+        ;;
>+      esac
>+      ;;
> 
>-netbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-    dynamic_linker='NetBSD (a.out) ld.so'
>-  else
>-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
>-    soname_spec='${libname}${release}.so$major'
>-    dynamic_linker='NetBSD ld.elf_so'
>-  fi
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>-  ;;
>+    osf3* | osf4* | osf5*)
>+      lt_prog_compiler_wl='-Wl,'
>+      # All OSF/1 code is PIC.
>+      lt_prog_compiler_static='-non_shared'
>+      ;;
> 
>-newsos6)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  ;;
>+    solaris*)
>+      lt_prog_compiler_pic='-KPIC'
>+      lt_prog_compiler_static='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+	lt_prog_compiler_wl='-Qoption ld ';;
>+      *)
>+	lt_prog_compiler_wl='-Wl,';;
>+      esac
>+      ;;
> 
>-openbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    case "$host_os" in
>-    openbsd2.[89] | openbsd2.[89].*)
>-      shlibpath_overrides_runpath=no
>+    sunos4*)
>+      lt_prog_compiler_wl='-Qoption ld '
>+      lt_prog_compiler_pic='-PIC'
>+      lt_prog_compiler_static='-Bstatic'
>+      ;;
>+
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>+      lt_prog_compiler_wl='-Wl,'
>+      lt_prog_compiler_pic='-KPIC'
>+      lt_prog_compiler_static='-Bstatic'
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec ;then
>+	lt_prog_compiler_pic='-Kconform_pic'
>+	lt_prog_compiler_static='-Bstatic'
>+      fi
>+      ;;
>+
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      lt_prog_compiler_wl='-Wl,'
>+      lt_prog_compiler_pic='-KPIC'
>+      lt_prog_compiler_static='-Bstatic'
>+      ;;
>+
>+    unicos*)
>+      lt_prog_compiler_wl='-Wl,'
>+      lt_prog_compiler_can_build_shared=no
>       ;;
>+
>+    uts4*)
>+      lt_prog_compiler_pic='-pic'
>+      lt_prog_compiler_static='-Bstatic'
>+      ;;
>+
>     *)
>-      shlibpath_overrides_runpath=yes
>+      lt_prog_compiler_can_build_shared=no
>       ;;
>     esac
>-  else
>-    shlibpath_overrides_runpath=yes
>   fi
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
> 
>-os2*)
>-  libname_spec='$name'
>-  need_lib_prefix=no
>-  library_names_spec='$libname.dll $libname.a'
>-  dynamic_linker='OS/2 ld.exe'
>-  shlibpath_var=LIBPATH
>-  ;;
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
> 
>-osf3* | osf4* | osf5*)
>-  version_type=osf
>-  need_version=no
>-  soname_spec='${libname}${release}.so'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>-  ;;
>+#
>+# Check to make sure the PIC flag actually works.
>+#
>+if test -n "$lt_prog_compiler_pic"; then
> 
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}.so$major'
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
>+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_pic_works+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_pic_works=no
>+  ac_outfile=conftest.$ac_objext
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:7447: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&5
>+   echo "$as_me:7451: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       lt_prog_compiler_pic_works=yes
>+     fi
>+   fi
>+   $rm conftest*
> 
>-solaris*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>-  # ldd complains unless libraries are executable
>-  postinstall_cmds='chmod +x $lib'
>-  ;;
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
> 
>-sunos4*)
>-  version_type=sunos
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
>-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  if test "$with_gnu_ld" = yes; then
>-    need_lib_prefix=no
>-  fi
>-  need_version=yes
>-  ;;
>+if test x"$lt_prog_compiler_pic_works" = xyes; then
>+    case $lt_prog_compiler_pic in
>+     "" | " "*) ;;
>+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
>+     esac
>+else
>+    lt_prog_compiler_pic=
>+     lt_prog_compiler_can_build_shared=no
>+fi
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  case $host_vendor in
>-    sni)
>-      shlibpath_overrides_runpath=no
>-      ;;
>-    motorola)
>-      need_lib_prefix=no
>-      need_version=no
>-      shlibpath_overrides_runpath=no
>-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>-      ;;
>-  esac
>-  ;;
>+fi
>+case $host_os in
>+  # For platforms which do not support PIC, -DPIC is meaningless:
>+  *djgpp*)
>+    lt_prog_compiler_pic=
>+    ;;
>+  *)
>+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
>+    ;;
>+esac
> 
>-uts4*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
>+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_static_works+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_static_works=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works=yes
>+       fi
>+     else
>+       lt_prog_compiler_static_works=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
> 
>-dgux*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
>-  soname_spec='${libname}${release}.so$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
> 
>-sysv4*MP*)
>-  if test -d /usr/nec ;then
>-    version_type=linux
>-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
>-    soname_spec='$libname.so.$major'
>-    shlibpath_var=LD_LIBRARY_PATH
>-  fi
>-  ;;
>+if test x"$lt_prog_compiler_static_works" = xyes; then
>+    :
>+else
>+    lt_prog_compiler_static=
>+fi
> 
>-*)
>-  dynamic_linker=no
>-  ;;
>-esac
>-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
>-echo "${ECHO_T}$dynamic_linker" >&6
>-test "$dynamic_linker" = no && can_build_shared=no
> 
>-# Report the final consequences.
>-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
>-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
>-echo "$as_me:$LINENO: result: $can_build_shared" >&5
>-echo "${ECHO_T}$can_build_shared" >&6
>+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
>+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
>+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_cv_prog_compiler_c_o=no
>+   $rm -r conftest 2>/dev/null
>+   mkdir conftest
>+   cd conftest
>+   mkdir out
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+   lt_compiler_flag="-o out/conftest2.$ac_objext"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:7551: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>out/conftest.err)
>+   ac_status=$?
>+   cat out/conftest.err >&5
>+   echo "$as_me:7555: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
>+   then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>+       lt_cv_prog_compiler_c_o=yes
>+     fi
>+   fi
>+   chmod u+w . 2>&5
>+   $rm conftest*
>+   # SGI C++ compiler will create directory out/ii_files/ for
>+   # template instantiation
>+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>+   $rm out/* && rmdir out
>+   cd ..
>+   rmdir conftest
>+   $rm conftest*
> 
>-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
>-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
>-test "$can_build_shared" = "no" && enable_shared=no
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
>+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
> 
>-# On AIX, shared libraries and static libraries use the same namespace, and
>-# are all built from PIC.
>-case "$host_os" in
>-aix3*)
>-  test "$enable_shared" = yes && enable_static=no
>-  if test -n "$RANLIB"; then
>-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
>-    postinstall_cmds='$RANLIB $lib'
>-  fi
>-  ;;
> 
>-aix4*)
>-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>-    test "$enable_shared" = yes && enable_static=no
>+hard_links="nottested"
>+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
>+  # do not overwrite the value of need_locks provided by the user
>+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
>+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
>+  hard_links=yes
>+  $rm conftest*
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  touch conftest.a
>+  ln conftest.a conftest.b 2>&5 || hard_links=no
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  { echo "$as_me:$LINENO: result: $hard_links" >&5
>+echo "${ECHO_T}$hard_links" >&6; }
>+  if test "$hard_links" = no; then
>+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
>+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
>+    need_locks=warn
>   fi
>-  ;;
>-esac
>-echo "$as_me:$LINENO: result: $enable_shared" >&5
>-echo "${ECHO_T}$enable_shared" >&6
>-
>-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
>-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
>-# Make sure either enable_shared or enable_static is yes.
>-test "$enable_shared" = yes || enable_static=yes
>-echo "$as_me:$LINENO: result: $enable_static" >&5
>-echo "${ECHO_T}$enable_static" >&6
>-
>-if test "$hardcode_action" = relink; then
>-  # Fast installation is not supported
>-  enable_fast_install=no
>-elif test "$shlibpath_overrides_runpath" = yes ||
>-     test "$enable_shared" = no; then
>-  # Fast installation is not necessary
>-  enable_fast_install=needless
>+else
>+  need_locks=no
> fi
> 
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
>+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
> 
>-if test "x$enable_dlopen" != xyes; then
>-  enable_dlopen=unknown
>-  enable_dlopen_self=unknown
>-  enable_dlopen_self_static=unknown
>-else
>-  lt_cv_dlopen=no
>-  lt_cv_dlopen_libs=
>+  runpath_var=
>+  allow_undefined_flag=
>+  enable_shared_with_static_runtimes=no
>+  archive_cmds=
>+  archive_expsym_cmds=
>+  old_archive_From_new_cmds=
>+  old_archive_from_expsyms_cmds=
>+  export_dynamic_flag_spec=
>+  whole_archive_flag_spec=
>+  thread_safe_flag_spec=
>+  hardcode_libdir_flag_spec=
>+  hardcode_libdir_flag_spec_ld=
>+  hardcode_libdir_separator=
>+  hardcode_direct=no
>+  hardcode_minus_L=no
>+  hardcode_shlibpath_var=unsupported
>+  link_all_deplibs=unknown
>+  hardcode_automatic=no
>+  module_cmds=
>+  module_expsym_cmds=
>+  always_export_symbols=no
>+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  # include_expsyms should be a list of space-separated symbols to be *always*
>+  # included in the symbol list
>+  include_expsyms=
>+  # exclude_expsyms can be an extended regexp of symbols to exclude
>+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
>+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>+  # as well as any symbol that contains `d'.
>+  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
>+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>+  # platforms (ab)use it in PIC code, but their linkers get confused if
>+  # the symbol is explicitly referenced.  Since portable code cannot
>+  # rely on this symbol name, it's probably fine to never include it in
>+  # preloaded symbol tables.
>+  extract_expsyms_cmds=
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
> 
>   case $host_os in
>-  beos*)
>-    lt_cv_dlopen="load_add_on"
>-    lt_cv_dlopen_libs=
>-    lt_cv_dlopen_self=yes
>+  cygwin* | mingw* | pw32*)
>+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
>+    # When not using gcc, we currently assume that we are using
>+    # Microsoft Visual C++.
>+    if test "$GCC" != yes; then
>+      with_gnu_ld=no
>+    fi
>+    ;;
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>+  openbsd*)
>+    with_gnu_ld=no
>     ;;
>+  esac
> 
>-  cygwin* | mingw* | pw32*)
>-    lt_cv_dlopen="LoadLibrary"
>-    lt_cv_dlopen_libs=
>-   ;;
>+  ld_shlibs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    # If archive_cmds runs LD, not CC, wlarc should be empty
>+    wlarc='${wl}'
> 
>-  *)
>-    echo "$as_me:$LINENO: checking for shl_load" >&5
>-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
>-if test "${ac_cv_func_shl_load+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
>-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>-#define shl_load innocuous_shl_load
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
>+    export_dynamic_flag_spec='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+  	whole_archive_flag_spec=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
> 
>-/* System header to define __stub macros and hopefully few prototypes,
>-    which can conflict with char shl_load (); below.
>-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-    <limits.h> exists even on freestanding compilers.  */
>+    # See if GNU ld supports shared libraries.
>+    case $host_os in
>+    aix3* | aix4* | aix5*)
>+      # On AIX/PPC, the GNU linker is very broken
>+      if test "$host_cpu" != ia64; then
>+	ld_shlibs=no
>+	cat <<EOF 1>&2
> 
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>+*** to be unable to reliably create shared libraries on AIX.
>+*** Therefore, libtool is disabling shared libraries support.  If you
>+*** really care for shared libraries, you may want to modify your PATH
>+*** so that a non-GNU linker is found, and then restart.
> 
>-#undef shl_load
>+EOF
>+      fi
>+      ;;
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-{
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char shl_load ();
>-/* The GNU C library defines this for functions which it implements
>-    to always fail with ENOSYS.  Some functions are actually named
>-    something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_shl_load) || defined (__stub___shl_load)
>-choke me
>-#else
>-char (*f) () = shl_load;
>-#endif
>-#ifdef __cplusplus
>-}
>-#endif
>+    amigaos*)
>+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      hardcode_libdir_flag_spec='-L$libdir'
>+      hardcode_minus_L=yes
>+
>+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>+      # that the semantics of dynamic libraries on AmigaOS, at least up
>+      # to version 4, is to share data among multiple programs linked
>+      # with the same dynamic library.  Since this doesn't match the
>+      # behavior of shared libraries on other platforms, we can't use
>+      # them.
>+      ld_shlibs=no
>+      ;;
> 
>-int
>-main ()
>-{
>-return f != shl_load;
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_func_shl_load=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+    beos*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	allow_undefined_flag=unsupported
>+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+	# support --undefined.  This deserves some investigation.  FIXME
>+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+      else
>+	ld_shlibs=no
>+      fi
>+      ;;
> 
>-ac_cv_func_shl_load=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
>-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
>-if test $ac_cv_func_shl_load = yes; then
>-  lt_cv_dlopen="shl_load"
>-else
>-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
>-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
>-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+    cygwin* | mingw* | pw32*)
>+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
>+      # as there is no search path for DLLs.
>+      hardcode_libdir_flag_spec='-L$libdir'
>+      allow_undefined_flag=unsupported
>+      always_export_symbols=no
>+      enable_shared_with_static_runtimes=yes
>+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>+
>+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+	# If the export-symbols file already is a .def file (1st line
>+	# is EXPORTS), use it as is; otherwise, prepend...
>+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>+	  cp $export_symbols $output_objdir/$soname.def;
>+	else
>+	  echo EXPORTS > $output_objdir/$soname.def;
>+	  cat $export_symbols >> $output_objdir/$soname.def;
>+	fi~
>+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+      else
>+	ld_shlibs=no
>+      fi
>+      ;;
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char shl_load ();
>-int
>-main ()
>-{
>-shl_load ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dld_shl_load=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+    interix3*)
>+      hardcode_direct=no
>+      hardcode_shlibpath_var=no
>+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>+      export_dynamic_flag_spec='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      ;;
> 
>-ac_cv_lib_dld_shl_load=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
>-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
>-if test $ac_cv_lib_dld_shl_load = yes; then
>-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen" >&5
>-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
>-if test "${ac_cv_func_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  cat >conftest.$ac_ext <<_ACEOF
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	tmp_addflag=
>+	case $cc_basename,$host_cpu in
>+	pgcc*)				# Portland Group C compiler
>+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag'
>+	  ;;
>+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
>+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag -Mnomain' ;;
>+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
>+	  tmp_addflag=' -i_dynamic' ;;
>+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
>+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
>+	ifc* | ifort*)			# Intel Fortran compiler
>+	  tmp_addflag=' -nofor_main' ;;
>+	esac
>+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+
>+	if test $supports_anon_versioning = yes; then
>+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+	fi
>+      else
>+	ld_shlibs=no
>+      fi
>+      ;;
>+
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>+	wlarc=
>+      else
>+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      fi
>+      ;;
>+
>+    solaris*)
>+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>+	ld_shlibs=no
>+	cat <<EOF 1>&2
>+
>+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>+*** create shared libraries on Solaris systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.9.1 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+EOF
>+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	ld_shlibs=no
>+      fi
>+      ;;
>+
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
>+	ld_shlibs=no
>+	cat <<_LT_EOF 1>&2
>+
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+_LT_EOF
>+	;;
>+	*)
>+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>+	  else
>+	    ld_shlibs=no
>+	  fi
>+	;;
>+      esac
>+      ;;
>+
>+    sunos4*)
>+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      wlarc=
>+      hardcode_direct=yes
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    *)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	ld_shlibs=no
>+      fi
>+      ;;
>+    esac
>+
>+    if test "$ld_shlibs" = no; then
>+      runpath_var=
>+      hardcode_libdir_flag_spec=
>+      export_dynamic_flag_spec=
>+      whole_archive_flag_spec=
>+    fi
>+  else
>+    # PORTME fill in a description of your system's linker (not GNU ld)
>+    case $host_os in
>+    aix3*)
>+      allow_undefined_flag=unsupported
>+      always_export_symbols=yes
>+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>+      # Note: this linker hardcodes the directories in LIBPATH if there
>+      # are no directories specified by -L.
>+      hardcode_minus_L=yes
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>+	# Neither direct hardcoding nor static linking is supported with a
>+	# broken collect2.
>+	hardcode_direct=unsupported
>+      fi
>+      ;;
>+
>+    aix4* | aix5*)
>+      if test "$host_cpu" = ia64; then
>+	# On IA64, the linker does run time linking by default, so we don't
>+	# have to do anything special.
>+	aix_use_runtimelinking=no
>+	exp_sym_flag='-Bexport'
>+	no_entry_flag=""
>+      else
>+	# If we're using GNU nm, then we don't want the "-C" option.
>+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
>+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+	else
>+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+	fi
>+	aix_use_runtimelinking=no
>+
>+	# Test if we are trying to use run time linking or normal
>+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
>+	# need to do runtime linking.
>+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
>+	  for ld_flag in $LDFLAGS; do
>+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>+  	    aix_use_runtimelinking=yes
>+  	    break
>+  	  fi
>+	  done
>+	  ;;
>+	esac
>+
>+	exp_sym_flag='-bexport'
>+	no_entry_flag='-bnoentry'
>+      fi
>+
>+      # When large executables or shared objects are built, AIX ld can
>+      # have problems creating the table of contents.  If linking a library
>+      # or program results in "error TOC overflow" add -mminimal-toc to
>+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>+
>+      archive_cmds=''
>+      hardcode_direct=yes
>+      hardcode_libdir_separator=':'
>+      link_all_deplibs=yes
>+
>+      if test "$GCC" = yes; then
>+	case $host_os in aix4.[012]|aix4.[012].*)
>+	# We only want to do this on AIX 4.2 and lower, the check
>+	# below for broken collect2 doesn't work under 4.3+
>+	  collect2name=`${CC} -print-prog-name=collect2`
>+	  if test -f "$collect2name" && \
>+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
>+	  then
>+  	  # We have reworked collect2
>+  	  hardcode_direct=yes
>+	  else
>+  	  # We have old collect2
>+  	  hardcode_direct=unsupported
>+  	  # It fails to find uninstalled libraries when the uninstalled
>+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
>+  	  # to unsupported forces relinking
>+  	  hardcode_minus_L=yes
>+  	  hardcode_libdir_flag_spec='-L$libdir'
>+  	  hardcode_libdir_separator=
>+	  fi
>+	  ;;
>+	esac
>+	shared_flag='-shared'
>+	if test "$aix_use_runtimelinking" = yes; then
>+	  shared_flag="$shared_flag "'${wl}-G'
>+	fi
>+      else
>+	# not using gcc
>+	if test "$host_cpu" = ia64; then
>+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>+  	# chokes on -Wl,-G. The following line is correct:
>+	  shared_flag='-G'
>+	else
>+	  if test "$aix_use_runtimelinking" = yes; then
>+	    shared_flag='${wl}-G'
>+	  else
>+	    shared_flag='${wl}-bM:SRE'
>+	  fi
>+	fi
>+      fi
>+
>+      # It seems that -bexpall does not export symbols beginning with
>+      # underscore (_), so it is better to generate a list of symbols to export.
>+      always_export_symbols=yes
>+      if test "$aix_use_runtimelinking" = yes; then
>+	# Warning - without using the other runtime loading flags (-brtl),
>+	# -berok will link without error, but may produce a broken library.
>+	allow_undefined_flag='-berok'
>+       # Determine the default libpath from the value encoded in an empty executable.
>+       cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
>-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
>-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>-#define dlopen innocuous_dlopen
>-
>-/* System header to define __stub macros and hopefully few prototypes,
>-    which can conflict with char dlopen (); below.
>-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-    <limits.h> exists even on freestanding compilers.  */
>-
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>-
>-#undef dlopen
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-{
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-/* The GNU C library defines this for functions which it implements
>-    to always fail with ENOSYS.  Some functions are actually named
>-    something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_dlopen) || defined (__stub___dlopen)
>-choke me
>-#else
>-char (*f) () = dlopen;
>-#endif
>-#ifdef __cplusplus
>-}
>-#endif
> 
> int
> main ()
> {
>-return f != dlopen;
>+
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_func_dlopen=yes
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_func_dlopen=no
>+
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
>-if test $ac_cv_func_dlopen = yes; then
>-  lt_cv_dlopen="dlopen"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
>-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
>-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldl  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+       else
>+	if test "$host_cpu" = ia64; then
>+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
>+	  allow_undefined_flag="-z nodefs"
>+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>+	else
>+	 # Determine the default libpath from the value encoded in an empty executable.
>+	 cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
> int
> main ()
> {
>-dlopen ();
>+
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dl_dlopen=yes
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_dl_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
>-if test $ac_cv_lib_dl_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
>-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
>-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-lsvld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-int
>-main ()
>-{
>-dlopen ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_svld_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	  # Warning - without using the other run time loading flags,
>+	  # -berok will link without error, but may produce a broken library.
>+	  no_undefined_flag=' ${wl}-bernotok'
>+	  allow_undefined_flag=' ${wl}-berok'
>+	  # Exported symbols can be pulled into shared objects from archives
>+	  whole_archive_flag_spec='$convenience'
>+	  archive_cmds_need_lc=yes
>+	  # This is similar to how AIX traditionally builds its shared libraries.
>+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+	fi
>+      fi
>+      ;;
>+
>+    amigaos*)
>+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      hardcode_libdir_flag_spec='-L$libdir'
>+      hardcode_minus_L=yes
>+      # see comment about different semantics on the GNU ld section
>+      ld_shlibs=no
>+      ;;
>+
>+    bsdi[45]*)
>+      export_dynamic_flag_spec=-rdynamic
>+      ;;
>+
>+    cygwin* | mingw* | pw32*)
>+      # When not using gcc, we currently assume that we are using
>+      # Microsoft Visual C++.
>+      # hardcode_libdir_flag_spec is actually meaningless, as there is
>+      # no search path for DLLs.
>+      hardcode_libdir_flag_spec=' '
>+      allow_undefined_flag=unsupported
>+      # Tell ltmain to make .lib files, not .a files.
>+      libext=lib
>+      # Tell ltmain to make .dll files, not .so files.
>+      shrext_cmds=".dll"
>+      # FIXME: Setting linknames here is a bad hack.
>+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
>+      # The linker will automatically build a .lib file if we build a DLL.
>+      old_archive_From_new_cmds='true'
>+      # FIXME: Should let the user specify the lib program.
>+      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
>+      fix_srcfile_path='`cygpath -w "$srcfile"`'
>+      enable_shared_with_static_runtimes=yes
>+      ;;
>+
>+    darwin* | rhapsody*)
>+      case $host_os in
>+        rhapsody* | darwin1.[012])
>+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
>+         ;;
>+       *) # Darwin 1.3 on
>+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+         else
>+           case ${MACOSX_DEPLOYMENT_TARGET} in
>+             10.[012])
>+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+               ;;
>+             10.*)
>+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
>+               ;;
>+           esac
>+         fi
>+         ;;
>+      esac
>+      archive_cmds_need_lc=no
>+      hardcode_direct=no
>+      hardcode_automatic=yes
>+      hardcode_shlibpath_var=unsupported
>+      whole_archive_flag_spec=''
>+      link_all_deplibs=yes
>+    if test "$GCC" = yes ; then
>+    	output_verbose_link_cmd='echo'
>+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+    else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>+         ld_shlibs=no
>+          ;;
>+      esac
>+    fi
>+      ;;
>+
>+    dgux*)
>+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_libdir_flag_spec='-L$libdir'
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    freebsd1*)
>+      ld_shlibs=no
>+      ;;
>+
>+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>+    # support.  Future versions do this automatically, but an explicit c++rt0.o
>+    # does not break anything, and helps significantly (at the cost of a little
>+    # extra space).
>+    freebsd2.2*)
>+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
>+      hardcode_libdir_flag_spec='-R$libdir'
>+      hardcode_direct=yes
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
>+    freebsd2*)
>+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_direct=yes
>+      hardcode_minus_L=yes
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>+      hardcode_libdir_flag_spec='-R$libdir'
>+      hardcode_direct=yes
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    hpux9*)
>+      if test "$GCC" = yes; then
>+	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      else
>+	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      fi
>+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>+      hardcode_libdir_separator=:
>+      hardcode_direct=yes
>+
>+      # hardcode_minus_L: Not really in the search PATH,
>+      # but as the default location of the library.
>+      hardcode_minus_L=yes
>+      export_dynamic_flag_spec='${wl}-E'
>+      ;;
>+
>+    hpux10*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>+	hardcode_libdir_separator=:
>+
>+	hardcode_direct=yes
>+	export_dynamic_flag_spec='${wl}-E'
>+
>+	# hardcode_minus_L: Not really in the search PATH,
>+	# but as the default location of the library.
>+	hardcode_minus_L=yes
>+      fi
>+      ;;
>+
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	case $host_cpu in
>+	hppa*64*)
>+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      else
>+	case $host_cpu in
>+	hppa*64*)
>+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>+	hardcode_libdir_separator=:
>+
>+	case $host_cpu in
>+	hppa*64*|ia64*)
>+	  hardcode_libdir_flag_spec_ld='+b $libdir'
>+	  hardcode_direct=no
>+	  hardcode_shlibpath_var=no
>+	  ;;
>+	*)
>+	  hardcode_direct=yes
>+	  export_dynamic_flag_spec='${wl}-E'
>+
>+	  # hardcode_minus_L: Not really in the search PATH,
>+	  # but as the default location of the library.
>+	  hardcode_minus_L=yes
>+	  ;;
>+	esac
>+      fi
>+      ;;
>+
>+    irix5* | irix6* | nonstopux*)
>+      if test "$GCC" = yes; then
>+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	hardcode_libdir_flag_spec_ld='-rpath $libdir'
>+      fi
>+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator=:
>+      link_all_deplibs=yes
>+      ;;
>+
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
>+      else
>+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
>+      fi
>+      hardcode_libdir_flag_spec='-R$libdir'
>+      hardcode_direct=yes
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    newsos6)
>+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_direct=yes
>+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator=:
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    openbsd*)
>+      hardcode_direct=yes
>+      hardcode_shlibpath_var=no
>+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>+	export_dynamic_flag_spec='${wl}-E'
>+      else
>+       case $host_os in
>+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
>+	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+	   hardcode_libdir_flag_spec='-R$libdir'
>+	   ;;
>+	 *)
>+	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>+	   ;;
>+       esac
>+      fi
>+      ;;
>+
>+    os2*)
>+      hardcode_libdir_flag_spec='-L$libdir'
>+      hardcode_minus_L=yes
>+      allow_undefined_flag=unsupported
>+      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
>+      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
>+      ;;
>+
>+    osf3*)
>+      if test "$GCC" = yes; then
>+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	allow_undefined_flag=' -expect_unresolved \*'
>+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+      fi
>+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator=:
>+      ;;
>+
>+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
>+      if test "$GCC" = yes; then
>+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
>+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
>+      else
>+	allow_undefined_flag=' -expect_unresolved \*'
>+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
>+
>+	# Both c and cxx compiler support -rpath directly
>+	hardcode_libdir_flag_spec='-rpath $libdir'
>+      fi
>+      hardcode_libdir_separator=:
>+      ;;
>+
>+    solaris*)
>+      no_undefined_flag=' -z text'
>+      if test "$GCC" = yes; then
>+	wlarc='${wl}'
>+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>+      else
>+	wlarc=''
>+	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>+      fi
>+      hardcode_libdir_flag_spec='-R$libdir'
>+      hardcode_shlibpath_var=no
>+      case $host_os in
>+      solaris2.[0-5] | solaris2.[0-5].*) ;;
>+      *)
>+ 	# The compiler driver will combine linker options so we
>+ 	# cannot just pass the convience library names through
>+ 	# without $wl, iff we do not link with $LD.
>+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
>+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
>+ 	case $wlarc in
>+ 	'')
>+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
>+ 	*)
>+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+ 	esac ;;
>+      esac
>+      link_all_deplibs=yes
>+      ;;
>+
>+    sunos4*)
>+      if test "x$host_vendor" = xsequent; then
>+	# Use $CC to link under sequent, because it throws in some extra .o
>+	# files that make .init and .fini sections work.
>+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      hardcode_libdir_flag_spec='-L$libdir'
>+      hardcode_direct=yes
>+      hardcode_minus_L=yes
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    sysv4)
>+      case $host_vendor in
>+	sni)
>+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  hardcode_direct=yes # is this really true???
>+	;;
>+	siemens)
>+	  ## LD is ld it makes a PLAMLIB
>+	  ## CC just makes a GrossModule.
>+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>+	  reload_cmds='$CC -r -o $output$reload_objs'
>+	  hardcode_direct=no
>+        ;;
>+	motorola)
>+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
>+	;;
>+      esac
>+      runpath_var='LD_RUN_PATH'
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    sysv4.3*)
>+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_shlibpath_var=no
>+      export_dynamic_flag_spec='-Bexport'
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	hardcode_shlibpath_var=no
>+	runpath_var=LD_RUN_PATH
>+	hardcode_runpath_var=yes
>+	ld_shlibs=yes
>+      fi
>+      ;;
>+
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
>+      no_undefined_flag='${wl}-z,text'
>+      archive_cmds_need_lc=no
>+      hardcode_shlibpath_var=no
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
>+
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      no_undefined_flag='${wl}-z,text'
>+      allow_undefined_flag='${wl}-z,nodefs'
>+      archive_cmds_need_lc=no
>+      hardcode_shlibpath_var=no
>+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      hardcode_libdir_separator=':'
>+      link_all_deplibs=yes
>+      export_dynamic_flag_spec='${wl}-Bexport'
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
>+
>+    uts4*)
>+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_libdir_flag_spec='-L$libdir'
>+      hardcode_shlibpath_var=no
>+      ;;
>+
>+    *)
>+      ld_shlibs=no
>+      ;;
>+    esac
>+  fi
>+
>+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
>+echo "${ECHO_T}$ld_shlibs" >&6; }
>+test "$ld_shlibs" = no && can_build_shared=no
>+
>+#
>+# Do we need to explicitly link libc?
>+#
>+case "x$archive_cmds_need_lc" in
>+x|xyes)
>+  # Assume -lc should be added
>+  archive_cmds_need_lc=yes
>+
>+  if test "$enable_shared" = yes && test "$GCC" = yes; then
>+    case $archive_cmds in
>+    *'~'*)
>+      # FIXME: we may have to deal with multi-command sequences.
>+      ;;
>+    '$CC '*)
>+      # Test whether the compiler implicitly links with -lc since on some
>+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
>+      # to ld, don't add -lc before -lgcc.
>+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
>+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
>+      $rm conftest*
>+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } 2>conftest.err; then
>+        soname=conftest
>+        lib=conftest
>+        libobjs=conftest.$ac_objext
>+        deplibs=
>+        wl=$lt_prog_compiler_wl
>+	pic_flag=$lt_prog_compiler_pic
>+        compiler_flags=-v
>+        linker_flags=-v
>+        verstring=
>+        output_objdir=.
>+        libname=conftest
>+        lt_save_allow_undefined_flag=$allow_undefined_flag
>+        allow_undefined_flag=
>+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
>+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }
>+        then
>+	  archive_cmds_need_lc=no
>+        else
>+	  archive_cmds_need_lc=yes
>+        fi
>+        allow_undefined_flag=$lt_save_allow_undefined_flag
>+      else
>+        cat conftest.err 1>&5
>+      fi
>+      $rm conftest*
>+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
>+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
>+      ;;
>+    esac
>+  fi
>+  ;;
>+esac
>+
>+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
>+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
>+library_names_spec=
>+libname_spec='lib$name'
>+soname_spec=
>+shrext_cmds=".so"
>+postinstall_cmds=
>+postuninstall_cmds=
>+finish_cmds=
>+finish_eval=
>+shlibpath_var=
>+shlibpath_overrides_runpath=unknown
>+version_type=none
>+dynamic_linker="$host_os ld.so"
>+sys_lib_dlsearch_path_spec="/lib /usr/lib"
>+if test "$GCC" = yes; then
>+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
>+    # if the path contains ";" then we assume it to be the separator
>+    # otherwise default to the standard path separator (i.e. ":") - it is
>+    # assumed that no part of a normal pathname contains ";" but that should
>+    # okay in the real world where ";" in dirpaths is itself problematic.
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+  else
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+  fi
>+else
>+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
>+fi
>+need_lib_prefix=unknown
>+hardcode_into_libs=no
>+
>+# when you set need_version to no, make sure it does not cause -set_version
>+# flags to be left without arguments
>+need_version=unknown
>+
>+case $host_os in
>+aix3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
>+  shlibpath_var=LIBPATH
>+
>+  # AIX 3 has no versioning support, so we append a major version to the name.
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  ;;
>+
>+aix4* | aix5*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  hardcode_into_libs=yes
>+  if test "$host_cpu" = ia64; then
>+    # AIX 5 supports IA64
>+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  else
>+    # With GCC up to 2.95.x, collect2 would create an import file
>+    # for dependence libraries.  The import file would start with
>+    # the line `#! .'.  This would cause the generated library to
>+    # depend on `.', always an invalid library.  This was fixed in
>+    # development snapshots of GCC prior to 3.0.
>+    case $host_os in
>+      aix4 | aix4.[01] | aix4.[01].*)
>+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>+	   echo ' yes '
>+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>+	:
>+      else
>+	can_build_shared=no
>+      fi
>+      ;;
>+    esac
>+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
>+    # soname into executable. Probably we can add versioning support to
>+    # collect2, so additional links can be useful in future.
>+    if test "$aix_use_runtimelinking" = yes; then
>+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>+      # instead of lib<name>.a to let people know that these are not
>+      # typical AIX shared libraries.
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    else
>+      # We preserve .a as extension for shared libraries through AIX4.2
>+      # and later when we are not doing run time linking.
>+      library_names_spec='${libname}${release}.a $libname.a'
>+      soname_spec='${libname}${release}${shared_ext}$major'
>+    fi
>+    shlibpath_var=LIBPATH
>+  fi
>+  ;;
>+
>+amigaos*)
>+  library_names_spec='$libname.ixlibrary $libname.a'
>+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
>+  ;;
>+
>+beos*)
>+  library_names_spec='${libname}${shared_ext}'
>+  dynamic_linker="$host_os ld.so"
>+  shlibpath_var=LIBRARY_PATH
>+  ;;
>+
>+bsdi[45]*)
>+  version_type=linux
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>+  # the default ld.so.conf also contains /usr/contrib/lib and
>+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>+  # libtool to hard-code these into programs
>+  ;;
>+
>+cygwin* | mingw* | pw32*)
>+  version_type=windows
>+  shrext_cmds=".dll"
>+  need_version=no
>+  need_lib_prefix=no
>+
>+  case $GCC,$host_os in
>+  yes,cygwin* | yes,mingw* | yes,pw32*)
>+    library_names_spec='$libname.dll.a'
>+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
>+    postinstall_cmds='base_file=`basename \${file}`~
>+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
>+      dldir=$destdir/`dirname \$dlpath`~
>+      test -d \$dldir || mkdir -p \$dldir~
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>+      dlpath=$dir/\$dldll~
>+       $rm \$dlpath'
>+    shlibpath_overrides_runpath=yes
>+
>+    case $host_os in
>+    cygwin*)
>+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
>+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
>+      ;;
>+    mingw*)
>+      # MinGW DLLs use traditional 'lib' prefix
>+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
>+        # It is most probably a Windows format PATH printed by
>+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
>+        # path with ; separators, and with drive letters. We can handle the
>+        # drive letters (cygwin fileutils understands them), so leave them,
>+        # especially as we might pass files found there to a mingw objdump,
>+        # which wouldn't understand a cygwinified path. Ahh.
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+      else
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+      fi
>+      ;;
>+    pw32*)
>+      # pw32 DLLs use 'pw' prefix rather than 'lib'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      ;;
>+    esac
>+    ;;
>+
>+  *)
>+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
>+    ;;
>+  esac
>+  dynamic_linker='Win32 ld.exe'
>+  # FIXME: first we should search . and the directory the executable is in
>+  shlibpath_var=PATH
>+  ;;
>+
>+darwin* | rhapsody*)
>+  dynamic_linker="$host_os dyld"
>+  version_type=darwin
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>+  soname_spec='${libname}${release}${major}$shared_ext'
>+  shlibpath_overrides_runpath=yes
>+  shlibpath_var=DYLD_LIBRARY_PATH
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>+  if test "$GCC" = yes; then
>+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>+  else
>+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
>+  ;;
>+
>+dgux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+freebsd1*)
>+  dynamic_linker=no
>+  ;;
>+
>+kfreebsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>+  version_type=freebsd-$objformat
>+  case $version_type in
>+    freebsd-elf*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+      need_version=no
>+      need_lib_prefix=no
>+      ;;
>+    freebsd-*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
>+      need_version=yes
>+      ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_os in
>+  freebsd2*)
>+    shlibpath_overrides_runpath=yes
>+    ;;
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>+    shlibpath_overrides_runpath=no
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  esac
>+  ;;
>+
>+gnu*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  ;;
>+
>+hpux9* | hpux10* | hpux11*)
>+  # Give a soname corresponding to the major version so that dld.sl refuses to
>+  # link against other versions.
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  case $host_cpu in
>+  ia64*)
>+    shrext_cmds='.so'
>+    hardcode_into_libs=yes
>+    dynamic_linker="$host_os dld.so"
>+    shlibpath_var=LD_LIBRARY_PATH
>+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    if test "X$HPUX_IA64_MODE" = X32; then
>+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
>+    else
>+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
>+    fi
>+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+    ;;
>+   hppa*64*)
>+     shrext_cmds='.sl'
>+     hardcode_into_libs=yes
>+     dynamic_linker="$host_os dld.sl"
>+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
>+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+     soname_spec='${libname}${release}${shared_ext}$major'
>+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
>+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+     ;;
>+   *)
>+    shrext_cmds='.sl'
>+    dynamic_linker="$host_os dld.sl"
>+    shlibpath_var=SHLIB_PATH
>+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    ;;
>+  esac
>+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>+  postinstall_cmds='chmod 555 $lib'
>+  ;;
>+
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
>+irix5* | irix6* | nonstopux*)
>+  case $host_os in
>+    nonstopux*) version_type=nonstopux ;;
>+    *)
>+	if test "$lt_cv_prog_gnu_ld" = yes; then
>+		version_type=linux
>+	else
>+		version_type=irix
>+	fi ;;
>+  esac
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  case $host_os in
>+  irix5* | nonstopux*)
>+    libsuff= shlibsuff=
>+    ;;
>+  *)
>+    case $LD in # libtool.m4 will add one of these switches to LD
>+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
>+      libsuff= shlibsuff= libmagic=32-bit;;
>+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
>+      libsuff=32 shlibsuff=N32 libmagic=N32;;
>+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
>+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
>+    *) libsuff= shlibsuff= libmagic=never-match;;
>+    esac
>+    ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>+  shlibpath_overrides_runpath=no
>+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>+  hardcode_into_libs=yes
>+  ;;
>+
>+# No shared lib support for Linux oldld, aout, or coff.
>+linux*oldld* | linux*aout* | linux*coff*)
>+  dynamic_linker=no
>+  ;;
>+
>+# This must be Linux ELF.
>+linux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  # This implies no fast_install, which is unacceptable.
>+  # Some rework will be needed to allow for fast_install
>+  # before this can be enabled.
>+  hardcode_into_libs=yes
>+
>+  # find out which ABI we are using
>+  libsuff=
>+  case "$host_cpu" in
>+  x86_64*|s390x*|powerpc64*)
>+    echo '#line 9016 "configure"' > conftest.$ac_ext
>+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+      case `/usr/bin/file conftest.$ac_objext` in
>+      *64-bit*)
>+        libsuff=64
>+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>+        ;;
>+      esac
>+    fi
>+    rm -rf conftest*
>+    ;;
>+  esac
>+
>+  # Append ld.so.conf contents to the search path
>+  if test -f /etc/ld.so.conf; then
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+  fi
>+
>+  # We used to test for /lib/ld.so.1 and disable shared libraries on
>+  # powerpc, because MkLinux only supported shared libraries with the
>+  # GNU dynamic linker.  Since this was broken with cross compilers,
>+  # most powerpc-linux boxes support dynamic linking these days and
>+  # people can always --disable-shared, the test was removed, and we
>+  # assume the GNU/Linux dynamic linker is in use.
>+  dynamic_linker='GNU/Linux ld.so'
>+  ;;
>+
>+knetbsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+netbsd*)
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+    dynamic_linker='NetBSD (a.out) ld.so'
>+  else
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    dynamic_linker='NetBSD ld.elf_so'
>+  fi
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  ;;
>+
>+newsos6)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+nto-qnx*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+openbsd*)
>+  version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>+  need_lib_prefix=no
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+    case $host_os in
>+      openbsd2.[89] | openbsd2.[89].*)
>+	shlibpath_overrides_runpath=no
>+	;;
>+      *)
>+	shlibpath_overrides_runpath=yes
>+	;;
>+      esac
>+  else
>+    shlibpath_overrides_runpath=yes
>+  fi
>+  ;;
>+
>+os2*)
>+  libname_spec='$name'
>+  shrext_cmds=".dll"
>+  need_lib_prefix=no
>+  library_names_spec='$libname${shared_ext} $libname.a'
>+  dynamic_linker='OS/2 ld.exe'
>+  shlibpath_var=LIBPATH
>+  ;;
>+
>+osf3* | osf4* | osf5*)
>+  version_type=osf
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>+  ;;
>+
>+solaris*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  # ldd complains unless libraries are executable
>+  postinstall_cmds='chmod +x $lib'
>+  ;;
>+
>+sunos4*)
>+  version_type=sunos
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  if test "$with_gnu_ld" = yes; then
>+    need_lib_prefix=no
>+  fi
>+  need_version=yes
>+  ;;
>+
>+sysv4 | sysv4.3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_vendor in
>+    sni)
>+      shlibpath_overrides_runpath=no
>+      need_lib_prefix=no
>+      export_dynamic_flag_spec='${wl}-Blargedynsym'
>+      runpath_var=LD_RUN_PATH
>+      ;;
>+    siemens)
>+      need_lib_prefix=no
>+      ;;
>+    motorola)
>+      need_lib_prefix=no
>+      need_version=no
>+      shlibpath_overrides_runpath=no
>+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>+      ;;
>+  esac
>+  ;;
>+
>+sysv4*MP*)
>+  if test -d /usr/nec ;then
>+    version_type=linux
>+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
>+    soname_spec='$libname${shared_ext}.$major'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  fi
>+  ;;
>+
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+	;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
>+uts4*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+*)
>+  dynamic_linker=no
>+  ;;
>+esac
>+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
>+echo "${ECHO_T}$dynamic_linker" >&6; }
>+test "$dynamic_linker" = no && can_build_shared=no
>+
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+
>+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
>+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
>+hardcode_action=
>+if test -n "$hardcode_libdir_flag_spec" || \
>+   test -n "$runpath_var" || \
>+   test "X$hardcode_automatic" = "Xyes" ; then
>+
>+  # We can hardcode non-existant directories.
>+  if test "$hardcode_direct" != no &&
>+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>+     # have to relink, otherwise we might link with an installed library
>+     # when we should be linking with a yet-to-be-installed one
>+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
>+     test "$hardcode_minus_L" != no; then
>+    # Linking always hardcodes the temporary library directory.
>+    hardcode_action=relink
>+  else
>+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>+    hardcode_action=immediate
>+  fi
>+else
>+  # We cannot hardcode anything, or else we can only hardcode existing
>+  # directories.
>+  hardcode_action=unsupported
>+fi
>+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
>+echo "${ECHO_T}$hardcode_action" >&6; }
>+
>+if test "$hardcode_action" = relink; then
>+  # Fast installation is not supported
>+  enable_fast_install=no
>+elif test "$shlibpath_overrides_runpath" = yes ||
>+     test "$enable_shared" = no; then
>+  # Fast installation is not necessary
>+  enable_fast_install=needless
>+fi
>+
>+striplib=
>+old_striplib=
>+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
>+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
>+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>+  { echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
>+else
>+# FIXME - insert some real tests, host_os isn't really good enough
>+  case $host_os in
>+   darwin*)
>+       if test -n "$STRIP" ; then
>+         striplib="$STRIP -x"
>+         { echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
>+       else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
>+       ;;
>+   *)
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+    ;;
>+  esac
>+fi
>+
>+if test "x$enable_dlopen" != xyes; then
>+  enable_dlopen=unknown
>+  enable_dlopen_self=unknown
>+  enable_dlopen_self_static=unknown
>+else
>+  lt_cv_dlopen=no
>+  lt_cv_dlopen_libs=
>+
>+  case $host_os in
>+  beos*)
>+    lt_cv_dlopen="load_add_on"
>+    lt_cv_dlopen_libs=
>+    lt_cv_dlopen_self=yes
>+    ;;
>+
>+  mingw* | pw32*)
>+    lt_cv_dlopen="LoadLibrary"
>+    lt_cv_dlopen_libs=
>+   ;;
>+
>+  cygwin*)
>+    lt_cv_dlopen="dlopen"
>+    lt_cv_dlopen_libs=
>+   ;;
>+
>+  darwin*)
>+  # if libdl is installed we need to link against it
>+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
>+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
>+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_check_lib_save_LIBS=$LIBS
>+LIBS="-ldl  $LIBS"
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* 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 dlopen ();
>+int
>+main ()
>+{
>+return dlopen ();
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  ac_cv_lib_dl_dlopen=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_lib_dl_dlopen=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+LIBS=$ac_check_lib_save_LIBS
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
>+if test $ac_cv_lib_dl_dlopen = yes; then
>+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>+else
>+
>+    lt_cv_dlopen="dyld"
>+    lt_cv_dlopen_libs=
>+    lt_cv_dlopen_self=yes
>+
>+fi
>+
>+   ;;
>+
>+  *)
>+    { echo "$as_me:$LINENO: checking for shl_load" >&5
>+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
>+if test "${ac_cv_func_shl_load+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
>+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>+#define shl_load innocuous_shl_load
>+
>+/* System header to define __stub macros and hopefully few prototypes,
>+    which can conflict with char shl_load (); below.
>+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>+    <limits.h> exists even on freestanding compilers.  */
>+
>+#ifdef __STDC__
>+# include <limits.h>
>+#else
>+# include <assert.h>
>+#endif
>+
>+#undef shl_load
>+
>+/* 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 ();
>+/* The GNU C library defines this for functions which it implements
>+    to always fail with ENOSYS.  Some functions are actually named
>+    something starting with __ and the normal name is an alias.  */
>+#if defined __stub_shl_load || defined __stub___shl_load
>+choke me
>+#endif
>+
>+int
>+main ()
>+{
>+return shl_load ();
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  ac_cv_func_shl_load=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_func_shl_load=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
>+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
>+if test $ac_cv_func_shl_load = yes; then
>+  lt_cv_dlopen="shl_load"
>+else
>+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
>+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
>+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_check_lib_save_LIBS=$LIBS
>+LIBS="-ldld  $LIBS"
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* 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
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  ac_cv_lib_dld_shl_load=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_lib_dld_shl_load=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+LIBS=$ac_check_lib_save_LIBS
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
>+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
>+if test $ac_cv_lib_dld_shl_load = yes; then
>+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
>+else
>+  { echo "$as_me:$LINENO: checking for dlopen" >&5
>+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
>+if test "${ac_cv_func_dlopen+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
>+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>+#define dlopen innocuous_dlopen
>+
>+/* System header to define __stub macros and hopefully few prototypes,
>+    which can conflict with char dlopen (); below.
>+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>+    <limits.h> exists even on freestanding compilers.  */
>+
>+#ifdef __STDC__
>+# include <limits.h>
>+#else
>+# include <assert.h>
>+#endif
>+
>+#undef dlopen
>+
>+/* 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 dlopen ();
>+/* The GNU C library defines this for functions which it implements
>+    to always fail with ENOSYS.  Some functions are actually named
>+    something starting with __ and the normal name is an alias.  */
>+#if defined __stub_dlopen || defined __stub___dlopen
>+choke me
>+#endif
>+
>+int
>+main ()
>+{
>+return dlopen ();
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  ac_cv_func_dlopen=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_func_dlopen=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
>+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
>+if test $ac_cv_func_dlopen = yes; then
>+  lt_cv_dlopen="dlopen"
>+else
>+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
>+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
>+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_check_lib_save_LIBS=$LIBS
>+LIBS="-ldl  $LIBS"
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* 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 dlopen ();
>+int
>+main ()
>+{
>+return dlopen ();
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  ac_cv_lib_dl_dlopen=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_lib_dl_dlopen=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+LIBS=$ac_check_lib_save_LIBS
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
>+if test $ac_cv_lib_dl_dlopen = yes; then
>+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>+else
>+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
>+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
>+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_check_lib_save_LIBS=$LIBS
>+LIBS="-lsvld  $LIBS"
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* 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 dlopen ();
>+int
>+main ()
>+{
>+return dlopen ();
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  ac_cv_lib_svld_dlopen=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_lib_svld_dlopen=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+LIBS=$ac_check_lib_save_LIBS
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
>+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
>+if test $ac_cv_lib_svld_dlopen = yes; then
>+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
>+else
>+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
>+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
>+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_check_lib_save_LIBS=$LIBS
>+LIBS="-ldld  $LIBS"
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* 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 dld_link ();
>+int
>+main ()
>+{
>+return dld_link ();
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  ac_cv_lib_dld_dld_link=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_lib_dld_dld_link=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+LIBS=$ac_check_lib_save_LIBS
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
>+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
>+if test $ac_cv_lib_dld_dld_link = yes; then
>+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
>+fi
>+
>+
>+fi
>+
>+
>+fi
>+
>+
>+fi
>+
>+
>+fi
>+
>+
>+fi
>+
>+    ;;
>+  esac
>+
>+  if test "x$lt_cv_dlopen" != xno; then
>+    enable_dlopen=yes
>+  else
>+    enable_dlopen=no
>+  fi
>+
>+  case $lt_cv_dlopen in
>+  dlopen)
>+    save_CPPFLAGS="$CPPFLAGS"
>+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
>+
>+    save_LDFLAGS="$LDFLAGS"
>+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>+
>+    save_LIBS="$LIBS"
>+    LIBS="$lt_cv_dlopen_libs $LIBS"
>+
>+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
>+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
>+if test "${lt_cv_dlopen_self+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  	  if test "$cross_compiling" = yes; then :
>+  lt_cv_dlopen_self=cross
>+else
>+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>+  lt_status=$lt_dlunknown
>+  cat > conftest.$ac_ext <<EOF
>+#line 9880 "configure"
>+#include "confdefs.h"
>+
>+#if HAVE_DLFCN_H
>+#include <dlfcn.h>
>+#endif
>+
>+#include <stdio.h>
>+
>+#ifdef RTLD_GLOBAL
>+#  define LT_DLGLOBAL		RTLD_GLOBAL
>+#else
>+#  ifdef DL_GLOBAL
>+#    define LT_DLGLOBAL		DL_GLOBAL
>+#  else
>+#    define LT_DLGLOBAL		0
>+#  endif
>+#endif
>+
>+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
>+   find out it does not work in some platform. */
>+#ifndef LT_DLLAZY_OR_NOW
>+#  ifdef RTLD_LAZY
>+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
>+#  else
>+#    ifdef DL_LAZY
>+#      define LT_DLLAZY_OR_NOW		DL_LAZY
>+#    else
>+#      ifdef RTLD_NOW
>+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
>+#      else
>+#        ifdef DL_NOW
>+#          define LT_DLLAZY_OR_NOW	DL_NOW
>+#        else
>+#          define LT_DLLAZY_OR_NOW	0
>+#        endif
>+#      endif
>+#    endif
>+#  endif
>+#endif
>+
>+#ifdef __cplusplus
>+extern "C" void exit (int);
>+#endif
>+
>+void fnord() { int i=42;}
>+int main ()
>+{
>+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>+  int status = $lt_dlunknown;
>+
>+  if (self)
>+    {
>+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>+      /* dlclose (self); */
>+    }
>+  else
>+    puts (dlerror ());
>+
>+    exit (status);
>+}
>+EOF
>+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>+  (eval $ac_link) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>+    (./conftest; exit; ) >&5 2>/dev/null
>+    lt_status=$?
>+    case x$lt_status in
>+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
>+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
>+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
>+    esac
>+  else :
>+    # compilation failed
>+    lt_cv_dlopen_self=no
>+  fi
>+fi
>+rm -fr conftest*
>+
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
>+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
>+
>+    if test "x$lt_cv_dlopen_self" = xyes; then
>+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
>+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
>+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
>+if test "${lt_cv_dlopen_self_static+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  	  if test "$cross_compiling" = yes; then :
>+  lt_cv_dlopen_self_static=cross
>+else
>+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>+  lt_status=$lt_dlunknown
>+  cat > conftest.$ac_ext <<EOF
>+#line 9980 "configure"
>+#include "confdefs.h"
>+
>+#if HAVE_DLFCN_H
>+#include <dlfcn.h>
>+#endif
>+
>+#include <stdio.h>
>+
>+#ifdef RTLD_GLOBAL
>+#  define LT_DLGLOBAL		RTLD_GLOBAL
>+#else
>+#  ifdef DL_GLOBAL
>+#    define LT_DLGLOBAL		DL_GLOBAL
>+#  else
>+#    define LT_DLGLOBAL		0
>+#  endif
>+#endif
>+
>+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
>+   find out it does not work in some platform. */
>+#ifndef LT_DLLAZY_OR_NOW
>+#  ifdef RTLD_LAZY
>+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
>+#  else
>+#    ifdef DL_LAZY
>+#      define LT_DLLAZY_OR_NOW		DL_LAZY
>+#    else
>+#      ifdef RTLD_NOW
>+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
>+#      else
>+#        ifdef DL_NOW
>+#          define LT_DLLAZY_OR_NOW	DL_NOW
>+#        else
>+#          define LT_DLLAZY_OR_NOW	0
>+#        endif
>+#      endif
>+#    endif
>+#  endif
>+#endif
>+
>+#ifdef __cplusplus
>+extern "C" void exit (int);
>+#endif
>+
>+void fnord() { int i=42;}
>+int main ()
>+{
>+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>+  int status = $lt_dlunknown;
>+
>+  if (self)
>+    {
>+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>+      /* dlclose (self); */
>+    }
>+  else
>+    puts (dlerror ());
>+
>+    exit (status);
>+}
>+EOF
>+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>+  (eval $ac_link) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>+    (./conftest; exit; ) >&5 2>/dev/null
>+    lt_status=$?
>+    case x$lt_status in
>+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
>+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
>+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
>+    esac
>+  else :
>+    # compilation failed
>+    lt_cv_dlopen_self_static=no
>+  fi
>+fi
>+rm -fr conftest*
>+
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
>+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
>+    fi
>+
>+    CPPFLAGS="$save_CPPFLAGS"
>+    LDFLAGS="$save_LDFLAGS"
>+    LIBS="$save_LIBS"
>+    ;;
>+  esac
>+
>+  case $lt_cv_dlopen_self in
>+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
>+  *) enable_dlopen_self=unknown ;;
>+  esac
>+
>+  case $lt_cv_dlopen_self_static in
>+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
>+  *) enable_dlopen_self_static=unknown ;;
>+  esac
>+fi
>+
>+
>+# Report which library types will actually be built
>+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
>+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
>+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
>+echo "${ECHO_T}$can_build_shared" >&6; }
>+
>+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
>+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
>+test "$can_build_shared" = "no" && enable_shared=no
>+
>+# On AIX, shared libraries and static libraries use the same namespace, and
>+# are all built from PIC.
>+case $host_os in
>+aix3*)
>+  test "$enable_shared" = yes && enable_static=no
>+  if test -n "$RANLIB"; then
>+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
>+    postinstall_cmds='$RANLIB $lib'
>+  fi
>+  ;;
>+
>+aix4* | aix5*)
>+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>+    test "$enable_shared" = yes && enable_static=no
>+  fi
>+    ;;
>+esac
>+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
>+echo "${ECHO_T}$enable_shared" >&6; }
>+
>+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
>+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
>+# Make sure either enable_shared or enable_static is yes.
>+test "$enable_shared" = yes || enable_static=yes
>+{ echo "$as_me:$LINENO: result: $enable_static" >&5
>+echo "${ECHO_T}$enable_static" >&6; }
>+
>+# The else clause should only fire when bootstrapping the
>+# libtool distribution, otherwise you forgot to ship ltmain.sh
>+# with your package, and you will get complaints that there are
>+# no rules to generate ltmain.sh.
>+if test -f "$ltmain"; then
>+  # See if we are running on zsh, and set the options which allow our commands through
>+  # without removal of \ escapes.
>+  if test -n "${ZSH_VERSION+set}" ; then
>+    setopt NO_GLOB_SUBST
>+  fi
>+  # Now quote all the things that may contain metacharacters while being
>+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>+  # variables and quote the copies for generation of the libtool script.
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>+    SED SHELL STRIP \
>+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>+    deplibs_check_method reload_flag reload_cmds need_locks \
>+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>+    lt_cv_sys_global_symbol_to_c_name_address \
>+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>+    old_postinstall_cmds old_postuninstall_cmds \
>+    compiler \
>+    CC \
>+    LD \
>+    lt_prog_compiler_wl \
>+    lt_prog_compiler_pic \
>+    lt_prog_compiler_static \
>+    lt_prog_compiler_no_builtin_flag \
>+    export_dynamic_flag_spec \
>+    thread_safe_flag_spec \
>+    whole_archive_flag_spec \
>+    enable_shared_with_static_runtimes \
>+    old_archive_cmds \
>+    old_archive_from_new_cmds \
>+    predep_objects \
>+    postdep_objects \
>+    predeps \
>+    postdeps \
>+    compiler_lib_search_path \
>+    archive_cmds \
>+    archive_expsym_cmds \
>+    postinstall_cmds \
>+    postuninstall_cmds \
>+    old_archive_from_expsyms_cmds \
>+    allow_undefined_flag \
>+    no_undefined_flag \
>+    export_symbols_cmds \
>+    hardcode_libdir_flag_spec \
>+    hardcode_libdir_flag_spec_ld \
>+    hardcode_libdir_separator \
>+    hardcode_automatic \
>+    module_cmds \
>+    module_expsym_cmds \
>+    lt_cv_prog_compiler_c_o \
>+    exclude_expsyms \
>+    include_expsyms; do
>+
>+    case $var in
>+    old_archive_cmds | \
>+    old_archive_from_new_cmds | \
>+    archive_cmds | \
>+    archive_expsym_cmds | \
>+    module_cmds | \
>+    module_expsym_cmds | \
>+    old_archive_from_expsyms_cmds | \
>+    export_symbols_cmds | \
>+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>+    postinstall_cmds | postuninstall_cmds | \
>+    old_postinstall_cmds | old_postuninstall_cmds | \
>+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>+      # Double-quote double-evaled strings.
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>+      ;;
>+    *)
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>+      ;;
>+    esac
>+  done
>+
>+  case $lt_echo in
>+  *'\$0 --fallback-echo"')
>+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
>+    ;;
>+  esac
>+
>+cfgfile="${ofile}T"
>+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
>+  $rm -f "$cfgfile"
>+  { echo "$as_me:$LINENO: creating $ofile" >&5
>+echo "$as_me: creating $ofile" >&6;}
>+
>+  cat <<__EOF__ >> "$cfgfile"
>+#! $SHELL
>+
>+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
>+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
>+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
>+#
>+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
>+# Free Software Foundation, Inc.
>+#
>+# This file is part of GNU Libtool:
>+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
>+#
>+# This program is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 2 of the License, or
>+# (at your option) any later version.
>+#
>+# This program is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+# General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>+#
>+# As a special exception to the GNU General Public License, if you
>+# distribute this file as part of a program that contains a
>+# configuration script generated by Autoconf, you may include it under
>+# the same distribution terms that you use for the rest of that program.
>+
>+# A sed program that does not truncate output.
>+SED=$lt_SED
>+
>+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
>+Xsed="$SED -e 1s/^X//"
>+
>+# The HP-UX ksh and POSIX shell print the target directory to stdout
>+# if CDPATH is set.
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
>+
>+# The names of the tagged configurations supported by this script.
>+available_tags=
>+
>+# ### BEGIN LIBTOOL CONFIG
>+
>+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>+
>+# Shell to use when invoking shell scripts.
>+SHELL=$lt_SHELL
>+
>+# Whether or not to build shared libraries.
>+build_libtool_libs=$enable_shared
>+
>+# Whether or not to build static libraries.
>+build_old_libs=$enable_static
>+
>+# Whether or not to add -lc for building shared libraries.
>+build_libtool_need_lc=$archive_cmds_need_lc
>+
>+# Whether or not to disallow shared libs when runtime libs are static
>+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
>+
>+# Whether or not to optimize for fast installation.
>+fast_install=$enable_fast_install
>+
>+# The host system.
>+host_alias=$host_alias
>+host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
>+
>+# An echo program that does not interpret backslashes.
>+echo=$lt_echo
>+
>+# The archiver.
>+AR=$lt_AR
>+AR_FLAGS=$lt_AR_FLAGS
>+
>+# A C compiler.
>+LTCC=$lt_LTCC
>+
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
>+# A language-specific compiler.
>+CC=$lt_compiler
>+
>+# Is the compiler the GNU C compiler?
>+with_gcc=$GCC
>+
>+# An ERE matcher.
>+EGREP=$lt_EGREP
>+
>+# The linker used to build libraries.
>+LD=$lt_LD
>+
>+# Whether we need hard or soft links.
>+LN_S=$lt_LN_S
>+
>+# A BSD-compatible nm program.
>+NM=$lt_NM
>+
>+# A symbol stripping program
>+STRIP=$lt_STRIP
>+
>+# Used to examine libraries when file_magic_cmd begins "file"
>+MAGIC_CMD=$MAGIC_CMD
>+
>+# Used on cygwin: DLL creation program.
>+DLLTOOL="$DLLTOOL"
>+
>+# Used on cygwin: object dumper.
>+OBJDUMP="$OBJDUMP"
>+
>+# Used on cygwin: assembler.
>+AS="$AS"
>+
>+# The name of the directory that contains temporary libtool files.
>+objdir=$objdir
>+
>+# How to create reloadable object files.
>+reload_flag=$lt_reload_flag
>+reload_cmds=$lt_reload_cmds
>+
>+# How to pass a linker flag through the compiler.
>+wl=$lt_lt_prog_compiler_wl
>+
>+# Object file suffix (normally "o").
>+objext="$ac_objext"
>+
>+# Old archive suffix (normally "a").
>+libext="$libext"
>+
>+# Shared library suffix (normally ".so").
>+shrext_cmds='$shrext_cmds'
>+
>+# Executable file suffix (normally "").
>+exeext="$exeext"
>+
>+# Additional compiler flags for building library objects.
>+pic_flag=$lt_lt_prog_compiler_pic
>+pic_mode=$pic_mode
>+
>+# What is the maximum length of a command?
>+max_cmd_len=$lt_cv_sys_max_cmd_len
>+
>+# Does compiler simultaneously support -c and -o options?
>+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
>+
>+# Must we lock files when doing compilation?
>+need_locks=$lt_need_locks
>+
>+# Do we need the lib prefix for modules?
>+need_lib_prefix=$need_lib_prefix
>+
>+# Do we need a version for libraries?
>+need_version=$need_version
>+
>+# Whether dlopen is supported.
>+dlopen_support=$enable_dlopen
>+
>+# Whether dlopen of programs is supported.
>+dlopen_self=$enable_dlopen_self
>+
>+# Whether dlopen of statically linked programs is supported.
>+dlopen_self_static=$enable_dlopen_self_static
>+
>+# Compiler flag to prevent dynamic linking.
>+link_static_flag=$lt_lt_prog_compiler_static
>+
>+# Compiler flag to turn off builtin functions.
>+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
>+
>+# Compiler flag to allow reflexive dlopens.
>+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
>+
>+# Compiler flag to generate shared objects directly from archives.
>+whole_archive_flag_spec=$lt_whole_archive_flag_spec
>+
>+# Compiler flag to generate thread-safe objects.
>+thread_safe_flag_spec=$lt_thread_safe_flag_spec
>+
>+# Library versioning type.
>+version_type=$version_type
>+
>+# Format of library name prefix.
>+libname_spec=$lt_libname_spec
>+
>+# List of archive names.  First name is the real one, the rest are links.
>+# The last name is the one that the linker finds with -lNAME.
>+library_names_spec=$lt_library_names_spec
>+
>+# The coded name of the library, if different from the real name.
>+soname_spec=$lt_soname_spec
>+
>+# Commands used to build and install an old-style archive.
>+RANLIB=$lt_RANLIB
>+old_archive_cmds=$lt_old_archive_cmds
>+old_postinstall_cmds=$lt_old_postinstall_cmds
>+old_postuninstall_cmds=$lt_old_postuninstall_cmds
>+
>+# Create an old-style archive from a shared archive.
>+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
>+
>+# Create a temporary old-style archive to link instead of a shared archive.
>+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
>+
>+# Commands used to build and install a shared archive.
>+archive_cmds=$lt_archive_cmds
>+archive_expsym_cmds=$lt_archive_expsym_cmds
>+postinstall_cmds=$lt_postinstall_cmds
>+postuninstall_cmds=$lt_postuninstall_cmds
>+
>+# Commands used to build a loadable module (assumed same as above if empty)
>+module_cmds=$lt_module_cmds
>+module_expsym_cmds=$lt_module_expsym_cmds
>+
>+# Commands to strip libraries.
>+old_striplib=$lt_old_striplib
>+striplib=$lt_striplib
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predep_objects=$lt_predep_objects
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdep_objects=$lt_postdep_objects
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predeps=$lt_predeps
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdeps=$lt_postdeps
>+
>+# The library search path used internally by the compiler when linking
>+# a shared library.
>+compiler_lib_search_path=$lt_compiler_lib_search_path
>+
>+# Method to check whether dependent libraries are shared objects.
>+deplibs_check_method=$lt_deplibs_check_method
>+
>+# Command to use when deplibs_check_method == file_magic.
>+file_magic_cmd=$lt_file_magic_cmd
>+
>+# Flag that allows shared libraries with undefined symbols to be built.
>+allow_undefined_flag=$lt_allow_undefined_flag
>+
>+# Flag that forces no undefined symbols.
>+no_undefined_flag=$lt_no_undefined_flag
>+
>+# Commands used to finish a libtool library installation in a directory.
>+finish_cmds=$lt_finish_cmds
>+
>+# Same as above, but a single script fragment to be evaled but not shown.
>+finish_eval=$lt_finish_eval
>+
>+# Take the output of nm and produce a listing of raw symbols and C names.
>+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
>+
>+# Transform the output of nm in a proper C declaration
>+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
>+
>+# Transform the output of nm in a C name address pair
>+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
>+
>+# This is the shared library runtime path variable.
>+runpath_var=$runpath_var
>+
>+# This is the shared library path variable.
>+shlibpath_var=$shlibpath_var
>+
>+# Is shlibpath searched before the hard-coded library search path?
>+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
>+
>+# How to hardcode a shared library path into an executable.
>+hardcode_action=$hardcode_action
>+
>+# Whether we should hardcode library paths into libraries.
>+hardcode_into_libs=$hardcode_into_libs
>+
>+# Flag to hardcode \$libdir into a binary during linking.
>+# This must work even if \$libdir does not exist.
>+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
>+
>+# If ld is used when linking, flag to hardcode \$libdir into
>+# a binary during linking. This must work even if \$libdir does
>+# not exist.
>+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
>+
>+# Whether we need a single -rpath flag with a separated argument.
>+hardcode_libdir_separator=$lt_hardcode_libdir_separator
>+
>+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_direct=$hardcode_direct
>+
>+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_minus_L=$hardcode_minus_L
>+
>+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
>+# the resulting binary.
>+hardcode_shlibpath_var=$hardcode_shlibpath_var
>+
>+# Set to yes if building a shared library automatically hardcodes DIR into the library
>+# and all subsequent libraries and executables linked against it.
>+hardcode_automatic=$hardcode_automatic
>+
>+# Variables whose values should be saved in libtool wrapper scripts and
>+# restored at relink time.
>+variables_saved_for_relink="$variables_saved_for_relink"
>+
>+# Whether libtool must link a program against all its dependency libraries.
>+link_all_deplibs=$link_all_deplibs
>+
>+# Compile-time system search path for libraries
>+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>+
>+# Run-time system search path for libraries
>+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
>+
>+# Fix the shell variable \$srcfile for the compiler.
>+fix_srcfile_path="$fix_srcfile_path"
>+
>+# Set to yes if exported symbols are required.
>+always_export_symbols=$always_export_symbols
>+
>+# The commands to list exported symbols.
>+export_symbols_cmds=$lt_export_symbols_cmds
>+
>+# The commands to extract the exported symbol list from a shared archive.
>+extract_expsyms_cmds=$lt_extract_expsyms_cmds
>+
>+# Symbols that should not be listed in the preloaded symbols.
>+exclude_expsyms=$lt_exclude_expsyms
>+
>+# Symbols that must always be exported.
>+include_expsyms=$lt_include_expsyms
>+
>+# ### END LIBTOOL CONFIG
>+
>+__EOF__
>+
>+
>+  case $host_os in
>+  aix3*)
>+    cat <<\EOF >> "$cfgfile"
>+
>+# AIX sometimes has problems with the GCC collect2 program.  For some
>+# reason, if we set the COLLECT_NAMES environment variable, the problems
>+# vanish in a puff of smoke.
>+if test "X${COLLECT_NAMES+set}" != Xset; then
>+  COLLECT_NAMES=
>+  export COLLECT_NAMES
>+fi
>+EOF
>+    ;;
>+  esac
>+
>+  # We use sed instead of cat because bash on DJGPP gets confused if
>+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
>+  # text mode, it properly converts lines to CR/LF.  This bash problem
>+  # is reportedly fixed, but why not run on old versions too?
>+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
>+
>+  mv -f "$cfgfile" "$ofile" || \
>+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
>+  chmod +x "$ofile"
>+
>+else
>+  # If there is no Makefile yet, we rely on a make rule to execute
>+  # `config.status --recheck' to rerun these tests and create the
>+  # libtool script then.
>+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>+  if test -f "$ltmain_in"; then
>+    test -f Makefile && make "$ltmain"
>+  fi
>+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
>+
>+CC="$lt_save_CC"
>+
>+
>+# Check whether --with-tags was given.
>+if test "${with_tags+set}" = set; then
>+  withval=$with_tags; tagnames="$withval"
>+fi
>+
>+
>+if test -f "$ltmain" && test -n "$tagnames"; then
>+  if test ! -f "${ofile}"; then
>+    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
>+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
>+  fi
>+
>+  if test -z "$LTCC"; then
>+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
>+    if test -z "$LTCC"; then
>+      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
>+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
>+    else
>+      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
>+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
>+    fi
>+  fi
>+  if test -z "$LTCFLAGS"; then
>+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
>+  fi
>+
>+  # Extract list of available tagged configurations in $ofile.
>+  # Note that this assumes the entire list is on one line.
>+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=$.*$$/\1/' -e 's/\"//g'`
>+
>+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
>+  for tagname in $tagnames; do
>+    IFS="$lt_save_ifs"
>+    # Check whether tagname contains only valid characters
>+    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
>+    "") ;;
>+    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
>+echo "$as_me: error: invalid tag name: $tagname" >&2;}
>+   { (exit 1); exit 1; }; }
>+	;;
>+    esac
>+
>+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
>+    then
>+      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
>+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
>+   { (exit 1); exit 1; }; }
>+    fi
>+
>+    # Update the list of available tags.
>+    if test -n "$tagname"; then
>+      echo appending configuration tag \"$tagname\" to $ofile
>+
>+      case $tagname in
>+      CXX)
>+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
>+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
>+	    (test "X$CXX" != "Xg++"))) ; then
>+	  ac_ext=cpp
>+ac_cpp='$CXXCPP $CPPFLAGS'
>+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>+
>+
>+
>+
>+archive_cmds_need_lc_CXX=no
>+allow_undefined_flag_CXX=
>+always_export_symbols_CXX=no
>+archive_expsym_cmds_CXX=
>+export_dynamic_flag_spec_CXX=
>+hardcode_direct_CXX=no
>+hardcode_libdir_flag_spec_CXX=
>+hardcode_libdir_flag_spec_ld_CXX=
>+hardcode_libdir_separator_CXX=
>+hardcode_minus_L_CXX=no
>+hardcode_shlibpath_var_CXX=unsupported
>+hardcode_automatic_CXX=no
>+module_cmds_CXX=
>+module_expsym_cmds_CXX=
>+link_all_deplibs_CXX=unknown
>+old_archive_cmds_CXX=$old_archive_cmds
>+no_undefined_flag_CXX=
>+whole_archive_flag_spec_CXX=
>+enable_shared_with_static_runtimes_CXX=no
>+
>+# Dependencies to place before and after the object being linked:
>+predep_objects_CXX=
>+postdep_objects_CXX=
>+predeps_CXX=
>+postdeps_CXX=
>+compiler_lib_search_path_CXX=
>+
>+# Source file extension for C++ test sources.
>+ac_ext=cpp
>+
>+# Object file extension for compiled C++ test sources.
>+objext=o
>+objext_CXX=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="int some_variable = 0;\n"
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
>+
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>+
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
>+
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
>+
>+
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+
>+# Allow CC to be a program name with arguments.
>+lt_save_CC=$CC
>+lt_save_LD=$LD
>+lt_save_GCC=$GCC
>+GCC=$GXX
>+lt_save_with_gnu_ld=$with_gnu_ld
>+lt_save_path_LD=$lt_cv_path_LD
>+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
>+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
>+else
>+  $as_unset lt_cv_prog_gnu_ld
>+fi
>+if test -n "${lt_cv_path_LDCXX+set}"; then
>+  lt_cv_path_LD=$lt_cv_path_LDCXX
>+else
>+  $as_unset lt_cv_path_LD
>+fi
>+test -z "${LDCXX+set}" || LD=$LDCXX
>+CC=${CXX-"c++"}
>+compiler=$CC
>+compiler_CXX=$CC
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
>+
>+# We don't want -fno-exception wen compiling C++ code, so set the
>+# no_builtin_flag separately
>+if test "$GXX" = yes; then
>+  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
>+else
>+  lt_prog_compiler_no_builtin_flag_CXX=
>+fi
>+
>+if test "$GXX" = yes; then
>+  # Set up default GNU C++ configuration
>+
>+
>+# Check whether --with-gnu-ld was given.
>+if test "${with_gnu_ld+set}" = set; then
>+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
>+else
>+  with_gnu_ld=no
>+fi
>+
>+ac_prog=ld
>+if test "$GCC" = yes; then
>+  # Check if gcc -print-prog-name=ld gives a path.
>+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
>+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
>+  case $host in
>+  *-*-mingw*)
>+    # gcc leaves a trailing carriage return which upsets mingw
>+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
>+  *)
>+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
>+  esac
>+  case $ac_prog in
>+    # Accept absolute paths.
>+    [\\/]* | ?:[\\/]*)
>+      re_direlt='/[^/][^/]*/\.\./'
>+      # Canonicalize the pathname of ld
>+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
>+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
>+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
>+      done
>+      test -z "$LD" && LD="$ac_prog"
>+      ;;
>+  "")
>+    # If it fails, then pretend we aren't using GCC.
>+    ac_prog=ld
>+    ;;
>+  *)
>+    # If it is relative, then search for the first ld in PATH.
>+    with_gnu_ld=unknown
>+    ;;
>+  esac
>+elif test "$with_gnu_ld" = yes; then
>+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
>+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
>+else
>+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
>+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
>+fi
>+if test "${lt_cv_path_LD+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  if test -z "$LD"; then
>+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>+  for ac_dir in $PATH; do
>+    IFS="$lt_save_ifs"
>+    test -z "$ac_dir" && ac_dir=.
>+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>+      lt_cv_path_LD="$ac_dir/$ac_prog"
>+      # Check to see if the program is GNU ld.  I'd rather use --version,
>+      # but apparently some variants of GNU ld only accept -v.
>+      # Break only if it was the GNU/non-GNU ld that we prefer.
>+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
>+      *GNU* | *'with BFD'*)
>+	test "$with_gnu_ld" != no && break
>+	;;
>+      *)
>+	test "$with_gnu_ld" != yes && break
>+	;;
>+      esac
>+    fi
>+  done
>+  IFS="$lt_save_ifs"
>+else
>+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
>+fi
>+fi
>+
>+LD="$lt_cv_path_LD"
>+if test -n "$LD"; then
>+  { echo "$as_me:$LINENO: result: $LD" >&5
>+echo "${ECHO_T}$LD" >&6; }
>+else
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+fi
>+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
>+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
>+   { (exit 1); exit 1; }; }
>+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
>+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
>+if test "${lt_cv_prog_gnu_ld+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
>+case `$LD -v 2>&1 </dev/null` in
>+*GNU* | *'with BFD'*)
>+  lt_cv_prog_gnu_ld=yes
>+  ;;
>+*)
>+  lt_cv_prog_gnu_ld=no
>+  ;;
>+esac
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
>+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
>+with_gnu_ld=$lt_cv_prog_gnu_ld
>+
>+
>+
>+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
>+  # archiving commands below assume that GNU ld is being used.
>+  if test "$with_gnu_ld" = yes; then
>+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+
>+    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
>+    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
>+
>+    # If archive_cmds runs LD, not CC, wlarc should be empty
>+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
>+    #     investigate it a little bit more. (MM)
>+    wlarc='${wl}'
>+
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
>+	grep 'no-whole-archive' > /dev/null; then
>+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+    else
>+      whole_archive_flag_spec_CXX=
>+    fi
>+  else
>+    with_gnu_ld=no
>+    wlarc=
>+
>+    # A generic and very simple default shared library creation
>+    # command for GNU C++ for the case where it uses the native
>+    # linker, instead of GNU ld.  If possible, this setting should
>+    # overridden to take advantage of the native linker features on
>+    # the platform it is being used on.
>+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
>+  fi
>+
>+  # Commands to make compiler produce verbose output that lists
>+  # what "hidden" libraries, object files and flags are used when
>+  # linking a shared library.
>+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
>+
>+else
>+  GXX=no
>+  with_gnu_ld=no
>+  wlarc=
>+fi
>+
>+# PORTME: fill in a description of your system's C++ link characteristics
>+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
>+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
>+ld_shlibs_CXX=yes
>+case $host_os in
>+  aix3*)
>+    # FIXME: insert proper C++ library support
>+    ld_shlibs_CXX=no
>+    ;;
>+  aix4* | aix5*)
>+    if test "$host_cpu" = ia64; then
>+      # On IA64, the linker does run time linking by default, so we don't
>+      # have to do anything special.
>+      aix_use_runtimelinking=no
>+      exp_sym_flag='-Bexport'
>+      no_entry_flag=""
>+    else
>+      aix_use_runtimelinking=no
>+
>+      # Test if we are trying to use run time linking or normal
>+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
>+      # need to do runtime linking.
>+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
>+	for ld_flag in $LDFLAGS; do
>+	  case $ld_flag in
>+	  *-brtl*)
>+	    aix_use_runtimelinking=yes
>+	    break
>+	    ;;
>+	  esac
>+	done
>+	;;
>+      esac
>+
>+      exp_sym_flag='-bexport'
>+      no_entry_flag='-bnoentry'
>+    fi
>+
>+    # When large executables or shared objects are built, AIX ld can
>+    # have problems creating the table of contents.  If linking a library
>+    # or program results in "error TOC overflow" add -mminimal-toc to
>+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>+
>+    archive_cmds_CXX=''
>+    hardcode_direct_CXX=yes
>+    hardcode_libdir_separator_CXX=':'
>+    link_all_deplibs_CXX=yes
>+
>+    if test "$GXX" = yes; then
>+      case $host_os in aix4.[012]|aix4.[012].*)
>+      # We only want to do this on AIX 4.2 and lower, the check
>+      # below for broken collect2 doesn't work under 4.3+
>+	collect2name=`${CC} -print-prog-name=collect2`
>+	if test -f "$collect2name" && \
>+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
>+	then
>+	  # We have reworked collect2
>+	  hardcode_direct_CXX=yes
>+	else
>+	  # We have old collect2
>+	  hardcode_direct_CXX=unsupported
>+	  # It fails to find uninstalled libraries when the uninstalled
>+	  # path is not listed in the libpath.  Setting hardcode_minus_L
>+	  # to unsupported forces relinking
>+	  hardcode_minus_L_CXX=yes
>+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
>+	  hardcode_libdir_separator_CXX=
>+	fi
>+	;;
>+      esac
>+      shared_flag='-shared'
>+      if test "$aix_use_runtimelinking" = yes; then
>+	shared_flag="$shared_flag "'${wl}-G'
>+      fi
>+    else
>+      # not using gcc
>+      if test "$host_cpu" = ia64; then
>+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>+	# chokes on -Wl,-G. The following line is correct:
>+	shared_flag='-G'
>+      else
>+	if test "$aix_use_runtimelinking" = yes; then
>+	  shared_flag='${wl}-G'
>+	else
>+	  shared_flag='${wl}-bM:SRE'
>+	fi
>+      fi
>+    fi
>+
>+    # It seems that -bexpall does not export symbols beginning with
>+    # underscore (_), so it is better to generate a list of symbols to export.
>+    always_export_symbols_CXX=yes
>+    if test "$aix_use_runtimelinking" = yes; then
>+      # Warning - without using the other runtime loading flags (-brtl),
>+      # -berok will link without error, but may produce a broken library.
>+      allow_undefined_flag_CXX='-berok'
>+      # Determine the default libpath from the value encoded in an empty executable.
>+      cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+
>+int
>+main ()
>+{
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
>+
>+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+     else
>+      if test "$host_cpu" = ia64; then
>+	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
>+	allow_undefined_flag_CXX="-z nodefs"
>+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>+      else
>+	# Determine the default libpath from the value encoded in an empty executable.
>+	cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+
>+int
>+main ()
>+{
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	# Warning - without using the other run time loading flags,
>+	# -berok will link without error, but may produce a broken library.
>+	no_undefined_flag_CXX=' ${wl}-bernotok'
>+	allow_undefined_flag_CXX=' ${wl}-berok'
>+	# Exported symbols can be pulled into shared objects from archives
>+	whole_archive_flag_spec_CXX='$convenience'
>+	archive_cmds_need_lc_CXX=yes
>+	# This is similar to how AIX traditionally builds its shared libraries.
>+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+      fi
>+    fi
>+    ;;
>+
>+  beos*)
>+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+      allow_undefined_flag_CXX=unsupported
>+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+      # support --undefined.  This deserves some investigation.  FIXME
>+      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+    else
>+      ld_shlibs_CXX=no
>+    fi
>+    ;;
>+
>+  chorus*)
>+    case $cc_basename in
>+      *)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+    esac
>+    ;;
>+
>+  cygwin* | mingw* | pw32*)
>+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
>+    # as there is no search path for DLLs.
>+    hardcode_libdir_flag_spec_CXX='-L$libdir'
>+    allow_undefined_flag_CXX=unsupported
>+    always_export_symbols_CXX=no
>+    enable_shared_with_static_runtimes_CXX=yes
>+
>+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+      # If the export-symbols file already is a .def file (1st line
>+      # is EXPORTS), use it as is; otherwise, prepend...
>+      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>+	cp $export_symbols $output_objdir/$soname.def;
>+      else
>+	echo EXPORTS > $output_objdir/$soname.def;
>+	cat $export_symbols >> $output_objdir/$soname.def;
>+      fi~
>+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+    else
>+      ld_shlibs_CXX=no
>+    fi
>+  ;;
>+      darwin* | rhapsody*)
>+        case $host_os in
>+        rhapsody* | darwin1.[012])
>+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
>+         ;;
>+       *) # Darwin 1.3 on
>+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+         else
>+           case ${MACOSX_DEPLOYMENT_TARGET} in
>+             10.[012])
>+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+               ;;
>+             10.*)
>+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
>+               ;;
>+           esac
>+         fi
>+         ;;
>+        esac
>+      archive_cmds_need_lc_CXX=no
>+      hardcode_direct_CXX=no
>+      hardcode_automatic_CXX=yes
>+      hardcode_shlibpath_var_CXX=unsupported
>+      whole_archive_flag_spec_CXX=''
>+      link_all_deplibs_CXX=yes
>+
>+    if test "$GXX" = yes ; then
>+      lt_int_apple_cc_single_mod=no
>+      output_verbose_link_cmd='echo'
>+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
>+       lt_int_apple_cc_single_mod=yes
>+      fi
>+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      else
>+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+        fi
>+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          else
>+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          fi
>+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>+         ld_shlibs_CXX=no
>+          ;;
>+      esac
>+      fi
>+        ;;
>+
>+  dgux*)
>+    case $cc_basename in
>+      ec++*)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      ghcx*)
>+	# Green Hills C++ Compiler
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+    esac
>+    ;;
>+  freebsd[12]*)
>+    # C++ shared libraries reported to be fairly broken before switch to ELF
>+    ld_shlibs_CXX=no
>+    ;;
>+  freebsd-elf*)
>+    archive_cmds_need_lc_CXX=no
>+    ;;
>+  freebsd* | kfreebsd*-gnu | dragonfly*)
>+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
>+    # conventions
>+    ld_shlibs_CXX=yes
>+    ;;
>+  gnu*)
>+    ;;
>+  hpux9*)
>+    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
>+    hardcode_libdir_separator_CXX=:
>+    export_dynamic_flag_spec_CXX='${wl}-E'
>+    hardcode_direct_CXX=yes
>+    hardcode_minus_L_CXX=yes # Not in the search PATH,
>+				# but as the default
>+				# location of the library.
>+
>+    case $cc_basename in
>+    CC*)
>+      # FIXME: insert proper C++ library support
>+      ld_shlibs_CXX=no
>+      ;;
>+    aCC*)
>+      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      # Commands to make compiler produce verbose output that lists
>+      # what "hidden" libraries, object files and flags are used when
>+      # linking a shared library.
>+      #
>+      # There doesn't appear to be a way to prevent this compiler from
>+      # explicitly linking system object files so we need to strip them
>+      # from the output so that they don't get included in the library
>+      # dependencies.
>+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+      ;;
>+    *)
>+      if test "$GXX" = yes; then
>+        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      else
>+        # FIXME: insert proper C++ library support
>+        ld_shlibs_CXX=no
>+      fi
>+      ;;
>+    esac
>+    ;;
>+  hpux10*|hpux11*)
>+    if test $with_gnu_ld = no; then
>+      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
>+      hardcode_libdir_separator_CXX=:
>+
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
>+        ;;
>+      *)
>+	export_dynamic_flag_spec_CXX='${wl}-E'
>+        ;;
>+      esac
>+    fi
>+    case $host_cpu in
>+    hppa*64*|ia64*)
>+      hardcode_direct_CXX=no
>+      hardcode_shlibpath_var_CXX=no
>+      ;;
>+    *)
>+      hardcode_direct_CXX=yes
>+      hardcode_minus_L_CXX=yes # Not in the search PATH,
>+					      # but as the default
>+					      # location of the library.
>+      ;;
>+    esac
>+
>+    case $cc_basename in
>+      CC*)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      aCC*)
>+	case $host_cpu in
>+	hppa*64*)
>+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	  ;;
>+	*)
>+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	  ;;
>+	esac
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+      *)
>+	if test "$GXX" = yes; then
>+	  if test $with_gnu_ld = no; then
>+	    case $host_cpu in
>+	    hppa*64*)
>+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	      ;;
>+	    ia64*)
>+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	      ;;
>+	    *)
>+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	      ;;
>+	    esac
>+	  fi
>+	else
>+	  # FIXME: insert proper C++ library support
>+	  ld_shlibs_CXX=no
>+	fi
>+	;;
>+    esac
>+    ;;
>+  interix3*)
>+    hardcode_direct_CXX=no
>+    hardcode_shlibpath_var_CXX=no
>+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>+    export_dynamic_flag_spec_CXX='${wl}-E'
>+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+    # Instead, shared libraries are loaded at an image base (0x10000000 by
>+    # default) and relocated if they conflict, which is a slow very memory
>+    # consuming and fragmenting process.  To avoid this, we pick a random,
>+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    ;;
>+  irix5* | irix6*)
>+    case $cc_basename in
>+      CC*)
>+	# SGI C++
>+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+
>+	# Archives containing C++ object files must be created using
>+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
>+	# necessary to make sure instantiated templates are included
>+	# in the archive.
>+	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
>+	;;
>+      *)
>+	if test "$GXX" = yes; then
>+	  if test "$with_gnu_ld" = no; then
>+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+	  else
>+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
>+	  fi
>+	fi
>+	link_all_deplibs_CXX=yes
>+	;;
>+    esac
>+    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
>+    hardcode_libdir_separator_CXX=:
>+    ;;
>+  linux*)
>+    case $cc_basename in
>+      KCC*)
>+	# Kuck and Associates, Inc. (KAI) C++ Compiler
>+
>+	# KCC will only create a shared library if the output file
>+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
>+	# to its proper name (with version) after linking.
>+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$[^()0-9A-Za-z{}]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
>+	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$[^()0-9A-Za-z{}]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+
>+	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
>+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
>+
>+	# Archives containing C++ object files must be created using
>+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
>+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
>+	;;
>+      icpc*)
>+	# Intel C++
>+	with_gnu_ld=yes
>+	# version 8.0 and above of icpc choke on multiply defined symbols
>+	# if we add $predep_objects and $postdep_objects, however 7.1 and
>+	# earlier do not add the objects themselves.
>+	case `$CC -V 2>&1` in
>+	*"Version 7."*)
>+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+	  ;;
>+	*)  # Version 8.0 or newer
>+	  tmp_idyn=
>+	  case $host_cpu in
>+	    ia64*) tmp_idyn=' -i_dynamic';;
>+	  esac
>+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+	  ;;
>+	esac
>+	archive_cmds_need_lc_CXX=no
>+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
>+	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
>+	;;
>+      pgCC*)
>+        # Portland Group C++ compiler
>+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
>+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
>+
>+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
>+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
>+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+        ;;
>+      cxx*)
>+	# Compaq C++
>+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
>+
>+	runpath_var=LD_RUN_PATH
>+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
>+	hardcode_libdir_separator_CXX=:
>+
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+    esac
>+    ;;
>+  lynxos*)
>+    # FIXME: insert proper C++ library support
>+    ld_shlibs_CXX=no
>+    ;;
>+  m88k*)
>+    # FIXME: insert proper C++ library support
>+    ld_shlibs_CXX=no
>+    ;;
>+  mvs*)
>+    case $cc_basename in
>+      cxx*)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+    esac
>+    ;;
>+  netbsd*)
>+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
>+      wlarc=
>+      hardcode_libdir_flag_spec_CXX='-R$libdir'
>+      hardcode_direct_CXX=yes
>+      hardcode_shlibpath_var_CXX=no
>+    fi
>+    # Workaround some broken pre-1.5 toolchains
>+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
>+    ;;
>+  openbsd2*)
>+    # C++ shared libraries are fairly broken
>+    ld_shlibs_CXX=no
>+    ;;
>+  openbsd*)
>+    hardcode_direct_CXX=yes
>+    hardcode_shlibpath_var_CXX=no
>+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
>+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
>+      export_dynamic_flag_spec_CXX='${wl}-E'
>+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+    fi
>+    output_verbose_link_cmd='echo'
>+    ;;
>+  osf3*)
>+    case $cc_basename in
>+      KCC*)
>+	# Kuck and Associates, Inc. (KAI) C++ Compiler
>+
>+	# KCC will only create a shared library if the output file
>+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
>+	# to its proper name (with version) after linking.
>+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$[^()0-9A-Za-z{}]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
>+
>+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>+	hardcode_libdir_separator_CXX=:
>+
>+	# Archives containing C++ object files must be created using
>+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
>+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
>+
>+	;;
>+      RCC*)
>+	# Rational C++ 2.4.1
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      cxx*)
>+	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
>+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+
>+	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
>+	hardcode_libdir_separator_CXX=:
>+
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+      *)
>+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
>+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+
>+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
>+	  hardcode_libdir_separator_CXX=:
>+
>+	  # Commands to make compiler produce verbose output that lists
>+	  # what "hidden" libraries, object files and flags are used when
>+	  # linking a shared library.
>+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
>+
>+	else
>+	  # FIXME: insert proper C++ library support
>+	  ld_shlibs_CXX=no
>+	fi
>+	;;
>+    esac
>+    ;;
>+  osf4* | osf5*)
>+    case $cc_basename in
>+      KCC*)
>+	# Kuck and Associates, Inc. (KAI) C++ Compiler
>+
>+	# KCC will only create a shared library if the output file
>+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
>+	# to its proper name (with version) after linking.
>+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$[^()0-9A-Za-z{}]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
>+
>+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>+	hardcode_libdir_separator_CXX=:
>+
>+	# Archives containing C++ object files must be created using
>+	# the KAI C++ compiler.
>+	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
>+	;;
>+      RCC*)
>+	# Rational C++ 2.4.1
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      cxx*)
>+	allow_undefined_flag_CXX=' -expect_unresolved \*'
>+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
>+	  echo "-hidden">> $lib.exp~
>+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
>+	  $rm $lib.exp'
>+
>+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
>+	hardcode_libdir_separator_CXX=:
>+
>+	# Commands to make compiler produce verbose output that lists
>+	# what "hidden" libraries, object files and flags are used when
>+	# linking a shared library.
>+	#
>+	# There doesn't appear to be a way to prevent this compiler from
>+	# explicitly linking system object files so we need to strip them
>+	# from the output so that they don't get included in the library
>+	# dependencies.
>+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+	;;
>+      *)
>+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
>+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+
>+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
>+	  hardcode_libdir_separator_CXX=:
>+
>+	  # Commands to make compiler produce verbose output that lists
>+	  # what "hidden" libraries, object files and flags are used when
>+	  # linking a shared library.
>+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
>+
>+	else
>+	  # FIXME: insert proper C++ library support
>+	  ld_shlibs_CXX=no
>+	fi
>+	;;
>+    esac
>+    ;;
>+  psos*)
>+    # FIXME: insert proper C++ library support
>+    ld_shlibs_CXX=no
>+    ;;
>+  sunos4*)
>+    case $cc_basename in
>+      CC*)
>+	# Sun C++ 4.x
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      lcc*)
>+	# Lucid
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+    esac
>+    ;;
>+  solaris*)
>+    case $cc_basename in
>+      CC*)
>+	# Sun C++ 4.2, 5.x and Centerline C++
>+        archive_cmds_need_lc_CXX=yes
>+	no_undefined_flag_CXX=' -zdefs'
>+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+
>+	hardcode_libdir_flag_spec_CXX='-R$libdir'
>+	hardcode_shlibpath_var_CXX=no
>+	case $host_os in
>+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
>+	  *)
>+	    # The C++ compiler is used as linker so we must use $wl
>+	    # flag to pass the commands to the underlying system
>+	    # linker. We must also pass each convience library through
>+	    # to the system linker between allextract/defaultextract.
>+	    # The C++ compiler will combine linker options so we
>+	    # cannot just pass the convience library names through
>+	    # without $wl.
>+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
>+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
>+	    ;;
>+	esac
>+	link_all_deplibs_CXX=yes
>+
>+	output_verbose_link_cmd='echo'
>+
>+	# Archives containing C++ object files must be created using
>+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
>+	# necessary to make sure instantiated templates are included
>+	# in the archive.
>+	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
>+	;;
>+      gcx*)
>+	# Green Hills C++ Compiler
>+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
>+
>+	# The C++ compiler must be used to create the archive.
>+	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
>+	;;
>+      *)
>+	# GNU C++ compiler with Solaris linker
>+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>+	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
>+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
>+	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
>+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+
>+	    # Commands to make compiler produce verbose output that lists
>+	    # what "hidden" libraries, object files and flags are used when
>+	    # linking a shared library.
>+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
>+	  else
>+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
>+	    # platform.
>+	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
>+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+
>+	    # Commands to make compiler produce verbose output that lists
>+	    # what "hidden" libraries, object files and flags are used when
>+	    # linking a shared library.
>+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
>+	  fi
>+
>+	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
>+	fi
>+	;;
>+    esac
>+    ;;
>+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
>+    no_undefined_flag_CXX='${wl}-z,text'
>+    archive_cmds_need_lc_CXX=no
>+    hardcode_shlibpath_var_CXX=no
>+    runpath_var='LD_RUN_PATH'
>+
>+    case $cc_basename in
>+      CC*)
>+	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+      *)
>+	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+    esac
>+    ;;
>+  sysv5* | sco3.2v5* | sco5v6*)
>+    # Note: We can NOT use -z defs as we might desire, because we do not
>+    # link with -lc, and that would cause any symbols used from libc to
>+    # always be unresolved, which means just about no library would
>+    # ever link correctly.  If we're not using GNU ld we use -z text
>+    # though, which does catch some bad symbols but isn't as heavy-handed
>+    # as -z defs.
>+    # For security reasons, it is highly recommended that you always
>+    # use absolute paths for naming shared libraries, and exclude the
>+    # DT_RUNPATH tag from executables and libraries.  But doing so
>+    # requires that you compile everything twice, which is a pain.
>+    # So that behaviour is only enabled if SCOABSPATH is set to a
>+    # non-empty value in the environment.  Most likely only useful for
>+    # creating official distributions of packages.
>+    # This is a hack until libtool officially supports absolute path
>+    # names for shared libraries.
>+    no_undefined_flag_CXX='${wl}-z,text'
>+    allow_undefined_flag_CXX='${wl}-z,nodefs'
>+    archive_cmds_need_lc_CXX=no
>+    hardcode_shlibpath_var_CXX=no
>+    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+    hardcode_libdir_separator_CXX=':'
>+    link_all_deplibs_CXX=yes
>+    export_dynamic_flag_spec_CXX='${wl}-Bexport'
>+    runpath_var='LD_RUN_PATH'
>+
>+    case $cc_basename in
>+      CC*)
>+	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+      *)
>+	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	;;
>+    esac
>+    ;;
>+  tandem*)
>+    case $cc_basename in
>+      NCC*)
>+	# NonStop-UX NCC 3.20
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+      *)
>+	# FIXME: insert proper C++ library support
>+	ld_shlibs_CXX=no
>+	;;
>+    esac
>+    ;;
>+  vxworks*)
>+    # FIXME: insert proper C++ library support
>+    ld_shlibs_CXX=no
>+    ;;
>+  *)
>+    # FIXME: insert proper C++ library support
>+    ld_shlibs_CXX=no
>+    ;;
>+esac
>+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
>+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
>+test "$ld_shlibs_CXX" = no && can_build_shared=no
>+
>+GCC_CXX="$GXX"
>+LD_CXX="$LD"
>+
>+
>+cat > conftest.$ac_ext <<EOF
>+class Foo
>+{
>+public:
>+  Foo (void) { a = 0; }
>+private:
>+  int a;
>+};
>+EOF
>+
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+  # Parse the compiler output and extract the necessary
>+  # objects, libraries and library flags.
>+
>+  # Sentinel used to keep track of whether or not we are before
>+  # the conftest object file.
>+  pre_test_object_deps_done=no
>+
>+  # The `*' in the case matches for architectures that use `case' in
>+  # $output_verbose_cmd can trigger glob expansion during the loop
>+  # eval without this substitution.
>+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
>+
>+  for p in `eval $output_verbose_link_cmd`; do
>+    case $p in
>+
>+    -L* | -R* | -l*)
>+       # Some compilers place space between "-{L,R}" and the path.
>+       # Remove the space.
>+       if test $p = "-L" \
>+	  || test $p = "-R"; then
>+	 prev=$p
>+	 continue
>+       else
>+	 prev=
>+       fi
>+
>+       if test "$pre_test_object_deps_done" = no; then
>+	 case $p in
>+	 -L* | -R*)
>+	   # Internal compiler library paths should come after those
>+	   # provided the user.  The postdeps already come after the
>+	   # user supplied libs so there is no need to process them.
>+	   if test -z "$compiler_lib_search_path_CXX"; then
>+	     compiler_lib_search_path_CXX="${prev}${p}"
>+	   else
>+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
>+	   fi
>+	   ;;
>+	 # The "-l" case would never come before the object being
>+	 # linked, so don't bother handling this case.
>+	 esac
>+       else
>+	 if test -z "$postdeps_CXX"; then
>+	   postdeps_CXX="${prev}${p}"
>+	 else
>+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
>+	 fi
>+       fi
>+       ;;
>+
>+    *.$objext)
>+       # This assumes that the test object file only shows up
>+       # once in the compiler output.
>+       if test "$p" = "conftest.$objext"; then
>+	 pre_test_object_deps_done=yes
>+	 continue
>+       fi
>+
>+       if test "$pre_test_object_deps_done" = no; then
>+	 if test -z "$predep_objects_CXX"; then
>+	   predep_objects_CXX="$p"
>+	 else
>+	   predep_objects_CXX="$predep_objects_CXX $p"
>+	 fi
>+       else
>+	 if test -z "$postdep_objects_CXX"; then
>+	   postdep_objects_CXX="$p"
>+	 else
>+	   postdep_objects_CXX="$postdep_objects_CXX $p"
>+	 fi
>+       fi
>+       ;;
>+
>+    *) ;; # Ignore the rest.
>+
>+    esac
>+  done
>+
>+  # Clean up.
>+  rm -f a.out a.exe
>+else
>+  echo "libtool.m4: error: problem compiling CXX test program"
>+fi
>+
>+$rm -f confest.$objext
>+
>+# PORTME: override above test on systems where it is broken
>+case $host_os in
>+interix3*)
>+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
>+  # hack all around it, let's just trust "g++" to DTRT.
>+  predep_objects_CXX=
>+  postdep_objects_CXX=
>+  postdeps_CXX=
>+  ;;
>+
>+solaris*)
>+  case $cc_basename in
>+  CC*)
>+    # Adding this requires a known-good setup of shared libraries for
>+    # Sun compiler versions before 5.6, else PIC objects from an old
>+    # archive will be linked into the output, leading to subtle bugs.
>+    postdeps_CXX='-lCstd -lCrun'
>+    ;;
>+  esac
>+  ;;
>+esac
>+
>+
>+case " $postdeps_CXX " in
>+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
>+esac
>+
>+lt_prog_compiler_wl_CXX=
>+lt_prog_compiler_pic_CXX=
>+lt_prog_compiler_static_CXX=
>+
>+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
>+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
>+
>+  # C++ specific cases for pic, static, wl, etc.
>+  if test "$GXX" = yes; then
>+    lt_prog_compiler_wl_CXX='-Wl,'
>+    lt_prog_compiler_static_CXX='-static'
>+
>+    case $host_os in
>+    aix*)
>+      # All AIX code is PIC.
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	lt_prog_compiler_static_CXX='-Bstatic'
>+      fi
>+      ;;
>+    amigaos*)
>+      # FIXME: we need at least 68020 code to build shared libraries, but
>+      # adding the `-m68020' flag to GCC prevents building anything better,
>+      # like `-m68040'.
>+      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
>+      ;;
>+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>+      # PIC is the default for these OSes.
>+      ;;
>+    mingw* | os2* | pw32*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
>+      ;;
>+    darwin* | rhapsody*)
>+      # PIC is the default on this platform
>+      # Common symbols not allowed in MH_DYLIB files
>+      lt_prog_compiler_pic_CXX='-fno-common'
>+      ;;
>+    *djgpp*)
>+      # DJGPP does not support shared libraries at all
>+      lt_prog_compiler_pic_CXX=
>+      ;;
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	lt_prog_compiler_pic_CXX=-Kconform_pic
>+      fi
>+      ;;
>+    hpux*)
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	;;
>+      *)
>+	lt_prog_compiler_pic_CXX='-fPIC'
>+	;;
>+      esac
>+      ;;
>+    *)
>+      lt_prog_compiler_pic_CXX='-fPIC'
>+      ;;
>+    esac
>+  else
>+    case $host_os in
>+      aix4* | aix5*)
>+	# All AIX code is PIC.
>+	if test "$host_cpu" = ia64; then
>+	  # AIX 5 now supports IA64 processor
>+	  lt_prog_compiler_static_CXX='-Bstatic'
>+	else
>+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
>+	fi
>+	;;
>+      chorus*)
>+	case $cc_basename in
>+	cxch68*)
>+	  # Green Hills C++ Compiler
>+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
>+	  ;;
>+	esac
>+	;;
>+       darwin*)
>+         # PIC is the default on this platform
>+         # Common symbols not allowed in MH_DYLIB files
>+         case $cc_basename in
>+           xlc*)
>+           lt_prog_compiler_pic_CXX='-qnocommon'
>+           lt_prog_compiler_wl_CXX='-Wl,'
>+           ;;
>+         esac
>+       ;;
>+      dgux*)
>+	case $cc_basename in
>+	  ec++*)
>+	    lt_prog_compiler_pic_CXX='-KPIC'
>+	    ;;
>+	  ghcx*)
>+	    # Green Hills C++ Compiler
>+	    lt_prog_compiler_pic_CXX='-pic'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      freebsd* | kfreebsd*-gnu | dragonfly*)
>+	# FreeBSD uses GNU C++
>+	;;
>+      hpux9* | hpux10* | hpux11*)
>+	case $cc_basename in
>+	  CC*)
>+	    lt_prog_compiler_wl_CXX='-Wl,'
>+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
>+	    if test "$host_cpu" != ia64; then
>+	      lt_prog_compiler_pic_CXX='+Z'
>+	    fi
>+	    ;;
>+	  aCC*)
>+	    lt_prog_compiler_wl_CXX='-Wl,'
>+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
>+	    case $host_cpu in
>+	    hppa*64*|ia64*)
>+	      # +Z the default
>+	      ;;
>+	    *)
>+	      lt_prog_compiler_pic_CXX='+Z'
>+	      ;;
>+	    esac
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      interix*)
>+	# This is c89, which is MS Visual C++ (no shared libs)
>+	# Anyone wants to do a port?
>+	;;
>+      irix5* | irix6* | nonstopux*)
>+	case $cc_basename in
>+	  CC*)
>+	    lt_prog_compiler_wl_CXX='-Wl,'
>+	    lt_prog_compiler_static_CXX='-non_shared'
>+	    # CC pic flag -KPIC is the default.
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      linux*)
>+	case $cc_basename in
>+	  KCC*)
>+	    # KAI C++ Compiler
>+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
>+	    lt_prog_compiler_pic_CXX='-fPIC'
>+	    ;;
>+	  icpc* | ecpc*)
>+	    # Intel C++
>+	    lt_prog_compiler_wl_CXX='-Wl,'
>+	    lt_prog_compiler_pic_CXX='-KPIC'
>+	    lt_prog_compiler_static_CXX='-static'
>+	    ;;
>+	  pgCC*)
>+	    # Portland Group C++ compiler.
>+	    lt_prog_compiler_wl_CXX='-Wl,'
>+	    lt_prog_compiler_pic_CXX='-fpic'
>+	    lt_prog_compiler_static_CXX='-Bstatic'
>+	    ;;
>+	  cxx*)
>+	    # Compaq C++
>+	    # Make sure the PIC flag is empty.  It appears that all Alpha
>+	    # Linux and Compaq Tru64 Unix objects are PIC.
>+	    lt_prog_compiler_pic_CXX=
>+	    lt_prog_compiler_static_CXX='-non_shared'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      lynxos*)
>+	;;
>+      m88k*)
>+	;;
>+      mvs*)
>+	case $cc_basename in
>+	  cxx*)
>+	    lt_prog_compiler_pic_CXX='-W c,exportall'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      netbsd*)
>+	;;
>+      osf3* | osf4* | osf5*)
>+	case $cc_basename in
>+	  KCC*)
>+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
>+	    ;;
>+	  RCC*)
>+	    # Rational C++ 2.4.1
>+	    lt_prog_compiler_pic_CXX='-pic'
>+	    ;;
>+	  cxx*)
>+	    # Digital/Compaq C++
>+	    lt_prog_compiler_wl_CXX='-Wl,'
>+	    # Make sure the PIC flag is empty.  It appears that all Alpha
>+	    # Linux and Compaq Tru64 Unix objects are PIC.
>+	    lt_prog_compiler_pic_CXX=
>+	    lt_prog_compiler_static_CXX='-non_shared'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      psos*)
>+	;;
>+      solaris*)
>+	case $cc_basename in
>+	  CC*)
>+	    # Sun C++ 4.2, 5.x and Centerline C++
>+	    lt_prog_compiler_pic_CXX='-KPIC'
>+	    lt_prog_compiler_static_CXX='-Bstatic'
>+	    lt_prog_compiler_wl_CXX='-Qoption ld '
>+	    ;;
>+	  gcx*)
>+	    # Green Hills C++ Compiler
>+	    lt_prog_compiler_pic_CXX='-PIC'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      sunos4*)
>+	case $cc_basename in
>+	  CC*)
>+	    # Sun C++ 4.x
>+	    lt_prog_compiler_pic_CXX='-pic'
>+	    lt_prog_compiler_static_CXX='-Bstatic'
>+	    ;;
>+	  lcc*)
>+	    # Lucid
>+	    lt_prog_compiler_pic_CXX='-pic'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      tandem*)
>+	case $cc_basename in
>+	  NCC*)
>+	    # NonStop-UX NCC 3.20
>+	    lt_prog_compiler_pic_CXX='-KPIC'
>+	    ;;
>+	  *)
>+	    ;;
>+	esac
>+	;;
>+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+	case $cc_basename in
>+	  CC*)
>+	    lt_prog_compiler_wl_CXX='-Wl,'
>+	    lt_prog_compiler_pic_CXX='-KPIC'
>+	    lt_prog_compiler_static_CXX='-Bstatic'
>+	    ;;
>+	esac
>+	;;
>+      vxworks*)
>+	;;
>+      *)
>+	lt_prog_compiler_can_build_shared_CXX=no
>+	;;
>+    esac
>+  fi
>+
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
>+
>+#
>+# Check to make sure the PIC flag actually works.
>+#
>+if test -n "$lt_prog_compiler_pic_CXX"; then
>+
>+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
>+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_pic_works_CXX=no
>+  ac_outfile=conftest.$ac_objext
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:12316: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&5
>+   echo "$as_me:12320: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       lt_prog_compiler_pic_works_CXX=yes
>+     fi
>+   fi
>+   $rm conftest*
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
>+
>+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
>+    case $lt_prog_compiler_pic_CXX in
>+     "" | " "*) ;;
>+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
>+     esac
>+else
>+    lt_prog_compiler_pic_CXX=
>+     lt_prog_compiler_can_build_shared_CXX=no
>+fi
>+
>+fi
>+case $host_os in
>+  # For platforms which do not support PIC, -DPIC is meaningless:
>+  *djgpp*)
>+    lt_prog_compiler_pic_CXX=
>+    ;;
>+  *)
>+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
>+    ;;
>+esac
>+
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
>+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_static_works_CXX=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works_CXX=yes
>+       fi
>+     else
>+       lt_prog_compiler_static_works_CXX=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
>+
>+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
>+    :
>+else
>+    lt_prog_compiler_static_CXX=
>+fi
>+
>+
>+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
>+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
>+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_cv_prog_compiler_c_o_CXX=no
>+   $rm -r conftest 2>/dev/null
>+   mkdir conftest
>+   cd conftest
>+   mkdir out
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+   lt_compiler_flag="-o out/conftest2.$ac_objext"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:12420: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>out/conftest.err)
>+   ac_status=$?
>+   cat out/conftest.err >&5
>+   echo "$as_me:12424: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
>+   then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>+       lt_cv_prog_compiler_c_o_CXX=yes
>+     fi
>+   fi
>+   chmod u+w . 2>&5
>+   $rm conftest*
>+   # SGI C++ compiler will create directory out/ii_files/ for
>+   # template instantiation
>+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>+   $rm out/* && rmdir out
>+   cd ..
>+   rmdir conftest
>+   $rm conftest*
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
>+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
>+
>+
>+hard_links="nottested"
>+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
>+  # do not overwrite the value of need_locks provided by the user
>+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
>+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
>+  hard_links=yes
>+  $rm conftest*
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  touch conftest.a
>+  ln conftest.a conftest.b 2>&5 || hard_links=no
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  { echo "$as_me:$LINENO: result: $hard_links" >&5
>+echo "${ECHO_T}$hard_links" >&6; }
>+  if test "$hard_links" = no; then
>+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
>+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
>+    need_locks=warn
>+  fi
>+else
>+  need_locks=no
>+fi
>+
>+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
>+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
>+
>+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  case $host_os in
>+  aix4* | aix5*)
>+    # If we're using GNU nm, then we don't want the "-C" option.
>+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
>+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+    else
>+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+    fi
>+    ;;
>+  pw32*)
>+    export_symbols_cmds_CXX="$ltdll_cmds"
>+  ;;
>+  cygwin* | mingw*)
>+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[^ ]*$ [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>+  ;;
>+  *)
>+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  ;;
>+  esac
>+
>+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
>+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
>+test "$ld_shlibs_CXX" = no && can_build_shared=no
>+
>+#
>+# Do we need to explicitly link libc?
>+#
>+case "x$archive_cmds_need_lc_CXX" in
>+x|xyes)
>+  # Assume -lc should be added
>+  archive_cmds_need_lc_CXX=yes
>+
>+  if test "$enable_shared" = yes && test "$GCC" = yes; then
>+    case $archive_cmds_CXX in
>+    *'~'*)
>+      # FIXME: we may have to deal with multi-command sequences.
>+      ;;
>+    '$CC '*)
>+      # Test whether the compiler implicitly links with -lc since on some
>+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
>+      # to ld, don't add -lc before -lgcc.
>+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
>+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
>+      $rm conftest*
>+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } 2>conftest.err; then
>+        soname=conftest
>+        lib=conftest
>+        libobjs=conftest.$ac_objext
>+        deplibs=
>+        wl=$lt_prog_compiler_wl_CXX
>+	pic_flag=$lt_prog_compiler_pic_CXX
>+        compiler_flags=-v
>+        linker_flags=-v
>+        verstring=
>+        output_objdir=.
>+        libname=conftest
>+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
>+        allow_undefined_flag_CXX=
>+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
>+  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }
>+        then
>+	  archive_cmds_need_lc_CXX=no
>+        else
>+	  archive_cmds_need_lc_CXX=yes
>+        fi
>+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
>+      else
>+        cat conftest.err 1>&5
>+      fi
>+      $rm conftest*
>+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
>+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
>+      ;;
>+    esac
>+  fi
>+  ;;
>+esac
>+
>+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
>+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
>+library_names_spec=
>+libname_spec='lib$name'
>+soname_spec=
>+shrext_cmds=".so"
>+postinstall_cmds=
>+postuninstall_cmds=
>+finish_cmds=
>+finish_eval=
>+shlibpath_var=
>+shlibpath_overrides_runpath=unknown
>+version_type=none
>+dynamic_linker="$host_os ld.so"
>+sys_lib_dlsearch_path_spec="/lib /usr/lib"
>+if test "$GCC" = yes; then
>+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
>+    # if the path contains ";" then we assume it to be the separator
>+    # otherwise default to the standard path separator (i.e. ":") - it is
>+    # assumed that no part of a normal pathname contains ";" but that should
>+    # okay in the real world where ";" in dirpaths is itself problematic.
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+  else
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+  fi
>+else
>+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
>+fi
>+need_lib_prefix=unknown
>+hardcode_into_libs=no
>+
>+# when you set need_version to no, make sure it does not cause -set_version
>+# flags to be left without arguments
>+need_version=unknown
>+
>+case $host_os in
>+aix3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
>+  shlibpath_var=LIBPATH
>+
>+  # AIX 3 has no versioning support, so we append a major version to the name.
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  ;;
>+
>+aix4* | aix5*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  hardcode_into_libs=yes
>+  if test "$host_cpu" = ia64; then
>+    # AIX 5 supports IA64
>+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  else
>+    # With GCC up to 2.95.x, collect2 would create an import file
>+    # for dependence libraries.  The import file would start with
>+    # the line `#! .'.  This would cause the generated library to
>+    # depend on `.', always an invalid library.  This was fixed in
>+    # development snapshots of GCC prior to 3.0.
>+    case $host_os in
>+      aix4 | aix4.[01] | aix4.[01].*)
>+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>+	   echo ' yes '
>+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>+	:
>+      else
>+	can_build_shared=no
>+      fi
>+      ;;
>+    esac
>+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
>+    # soname into executable. Probably we can add versioning support to
>+    # collect2, so additional links can be useful in future.
>+    if test "$aix_use_runtimelinking" = yes; then
>+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>+      # instead of lib<name>.a to let people know that these are not
>+      # typical AIX shared libraries.
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    else
>+      # We preserve .a as extension for shared libraries through AIX4.2
>+      # and later when we are not doing run time linking.
>+      library_names_spec='${libname}${release}.a $libname.a'
>+      soname_spec='${libname}${release}${shared_ext}$major'
>+    fi
>+    shlibpath_var=LIBPATH
>+  fi
>+  ;;
>+
>+amigaos*)
>+  library_names_spec='$libname.ixlibrary $libname.a'
>+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
>+  ;;
>+
>+beos*)
>+  library_names_spec='${libname}${shared_ext}'
>+  dynamic_linker="$host_os ld.so"
>+  shlibpath_var=LIBRARY_PATH
>+  ;;
>+
>+bsdi[45]*)
>+  version_type=linux
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>+  # the default ld.so.conf also contains /usr/contrib/lib and
>+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>+  # libtool to hard-code these into programs
>+  ;;
>+
>+cygwin* | mingw* | pw32*)
>+  version_type=windows
>+  shrext_cmds=".dll"
>+  need_version=no
>+  need_lib_prefix=no
>+
>+  case $GCC,$host_os in
>+  yes,cygwin* | yes,mingw* | yes,pw32*)
>+    library_names_spec='$libname.dll.a'
>+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
>+    postinstall_cmds='base_file=`basename \${file}`~
>+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
>+      dldir=$destdir/`dirname \$dlpath`~
>+      test -d \$dldir || mkdir -p \$dldir~
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>+      dlpath=$dir/\$dldll~
>+       $rm \$dlpath'
>+    shlibpath_overrides_runpath=yes
>+
>+    case $host_os in
>+    cygwin*)
>+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
>+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
>+      ;;
>+    mingw*)
>+      # MinGW DLLs use traditional 'lib' prefix
>+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
>+        # It is most probably a Windows format PATH printed by
>+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
>+        # path with ; separators, and with drive letters. We can handle the
>+        # drive letters (cygwin fileutils understands them), so leave them,
>+        # especially as we might pass files found there to a mingw objdump,
>+        # which wouldn't understand a cygwinified path. Ahh.
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+      else
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+      fi
>+      ;;
>+    pw32*)
>+      # pw32 DLLs use 'pw' prefix rather than 'lib'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      ;;
>+    esac
>+    ;;
>+
>+  *)
>+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
>+    ;;
>+  esac
>+  dynamic_linker='Win32 ld.exe'
>+  # FIXME: first we should search . and the directory the executable is in
>+  shlibpath_var=PATH
>+  ;;
>+
>+darwin* | rhapsody*)
>+  dynamic_linker="$host_os dyld"
>+  version_type=darwin
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>+  soname_spec='${libname}${release}${major}$shared_ext'
>+  shlibpath_overrides_runpath=yes
>+  shlibpath_var=DYLD_LIBRARY_PATH
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>+  if test "$GCC" = yes; then
>+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>+  else
>+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
>+  ;;
>+
>+dgux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+freebsd1*)
>+  dynamic_linker=no
>+  ;;
>+
>+kfreebsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>+  version_type=freebsd-$objformat
>+  case $version_type in
>+    freebsd-elf*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+      need_version=no
>+      need_lib_prefix=no
>+      ;;
>+    freebsd-*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
>+      need_version=yes
>+      ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_os in
>+  freebsd2*)
>+    shlibpath_overrides_runpath=yes
>+    ;;
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>+    shlibpath_overrides_runpath=no
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  esac
>+  ;;
>+
>+gnu*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  ;;
>+
>+hpux9* | hpux10* | hpux11*)
>+  # Give a soname corresponding to the major version so that dld.sl refuses to
>+  # link against other versions.
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  case $host_cpu in
>+  ia64*)
>+    shrext_cmds='.so'
>+    hardcode_into_libs=yes
>+    dynamic_linker="$host_os dld.so"
>+    shlibpath_var=LD_LIBRARY_PATH
>+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    if test "X$HPUX_IA64_MODE" = X32; then
>+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
>+    else
>+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
>+    fi
>+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+    ;;
>+   hppa*64*)
>+     shrext_cmds='.sl'
>+     hardcode_into_libs=yes
>+     dynamic_linker="$host_os dld.sl"
>+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
>+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+     soname_spec='${libname}${release}${shared_ext}$major'
>+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
>+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+     ;;
>+   *)
>+    shrext_cmds='.sl'
>+    dynamic_linker="$host_os dld.sl"
>+    shlibpath_var=SHLIB_PATH
>+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    ;;
>+  esac
>+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>+  postinstall_cmds='chmod 555 $lib'
>+  ;;
>+
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
>+irix5* | irix6* | nonstopux*)
>+  case $host_os in
>+    nonstopux*) version_type=nonstopux ;;
>+    *)
>+	if test "$lt_cv_prog_gnu_ld" = yes; then
>+		version_type=linux
>+	else
>+		version_type=irix
>+	fi ;;
>+  esac
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  case $host_os in
>+  irix5* | nonstopux*)
>+    libsuff= shlibsuff=
>+    ;;
>+  *)
>+    case $LD in # libtool.m4 will add one of these switches to LD
>+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
>+      libsuff= shlibsuff= libmagic=32-bit;;
>+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
>+      libsuff=32 shlibsuff=N32 libmagic=N32;;
>+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
>+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
>+    *) libsuff= shlibsuff= libmagic=never-match;;
>+    esac
>+    ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>+  shlibpath_overrides_runpath=no
>+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>+  hardcode_into_libs=yes
>+  ;;
>+
>+# No shared lib support for Linux oldld, aout, or coff.
>+linux*oldld* | linux*aout* | linux*coff*)
>+  dynamic_linker=no
>+  ;;
>+
>+# This must be Linux ELF.
>+linux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  # This implies no fast_install, which is unacceptable.
>+  # Some rework will be needed to allow for fast_install
>+  # before this can be enabled.
>+  hardcode_into_libs=yes
>+
>+  # find out which ABI we are using
>+  libsuff=
>+  case "$host_cpu" in
>+  x86_64*|s390x*|powerpc64*)
>+    echo '#line 12956 "configure"' > conftest.$ac_ext
>+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+      case `/usr/bin/file conftest.$ac_objext` in
>+      *64-bit*)
>+        libsuff=64
>+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>+        ;;
>+      esac
>+    fi
>+    rm -rf conftest*
>+    ;;
>+  esac
>+
>+  # Append ld.so.conf contents to the search path
>+  if test -f /etc/ld.so.conf; then
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+  fi
>+
>+  # We used to test for /lib/ld.so.1 and disable shared libraries on
>+  # powerpc, because MkLinux only supported shared libraries with the
>+  # GNU dynamic linker.  Since this was broken with cross compilers,
>+  # most powerpc-linux boxes support dynamic linking these days and
>+  # people can always --disable-shared, the test was removed, and we
>+  # assume the GNU/Linux dynamic linker is in use.
>+  dynamic_linker='GNU/Linux ld.so'
>+  ;;
>+
>+knetbsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+netbsd*)
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+    dynamic_linker='NetBSD (a.out) ld.so'
>+  else
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    dynamic_linker='NetBSD ld.elf_so'
>+  fi
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  ;;
>+
>+newsos6)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+nto-qnx*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+openbsd*)
>+  version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>+  need_lib_prefix=no
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+    case $host_os in
>+      openbsd2.[89] | openbsd2.[89].*)
>+	shlibpath_overrides_runpath=no
>+	;;
>+      *)
>+	shlibpath_overrides_runpath=yes
>+	;;
>+      esac
>+  else
>+    shlibpath_overrides_runpath=yes
>+  fi
>+  ;;
>+
>+os2*)
>+  libname_spec='$name'
>+  shrext_cmds=".dll"
>+  need_lib_prefix=no
>+  library_names_spec='$libname${shared_ext} $libname.a'
>+  dynamic_linker='OS/2 ld.exe'
>+  shlibpath_var=LIBPATH
>+  ;;
>+
>+osf3* | osf4* | osf5*)
>+  version_type=osf
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>+  ;;
>+
>+solaris*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  # ldd complains unless libraries are executable
>+  postinstall_cmds='chmod +x $lib'
>+  ;;
>+
>+sunos4*)
>+  version_type=sunos
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  if test "$with_gnu_ld" = yes; then
>+    need_lib_prefix=no
>+  fi
>+  need_version=yes
>+  ;;
>+
>+sysv4 | sysv4.3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_vendor in
>+    sni)
>+      shlibpath_overrides_runpath=no
>+      need_lib_prefix=no
>+      export_dynamic_flag_spec='${wl}-Blargedynsym'
>+      runpath_var=LD_RUN_PATH
>+      ;;
>+    siemens)
>+      need_lib_prefix=no
>+      ;;
>+    motorola)
>+      need_lib_prefix=no
>+      need_version=no
>+      shlibpath_overrides_runpath=no
>+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>+      ;;
>+  esac
>+  ;;
>+
>+sysv4*MP*)
>+  if test -d /usr/nec ;then
>+    version_type=linux
>+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
>+    soname_spec='$libname${shared_ext}.$major'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  fi
>+  ;;
>+
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+	;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
>+uts4*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+*)
>+  dynamic_linker=no
>+  ;;
>+esac
>+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
>+echo "${ECHO_T}$dynamic_linker" >&6; }
>+test "$dynamic_linker" = no && can_build_shared=no
>+
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+
>+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
>+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
>+hardcode_action_CXX=
>+if test -n "$hardcode_libdir_flag_spec_CXX" || \
>+   test -n "$runpath_var_CXX" || \
>+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
>+
>+  # We can hardcode non-existant directories.
>+  if test "$hardcode_direct_CXX" != no &&
>+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>+     # have to relink, otherwise we might link with an installed library
>+     # when we should be linking with a yet-to-be-installed one
>+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
>+     test "$hardcode_minus_L_CXX" != no; then
>+    # Linking always hardcodes the temporary library directory.
>+    hardcode_action_CXX=relink
>+  else
>+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>+    hardcode_action_CXX=immediate
>+  fi
>+else
>+  # We cannot hardcode anything, or else we can only hardcode existing
>+  # directories.
>+  hardcode_action_CXX=unsupported
>+fi
>+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
>+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
>+
>+if test "$hardcode_action_CXX" = relink; then
>+  # Fast installation is not supported
>+  enable_fast_install=no
>+elif test "$shlibpath_overrides_runpath" = yes ||
>+     test "$enable_shared" = no; then
>+  # Fast installation is not necessary
>+  enable_fast_install=needless
>+fi
>+
>+
>+# The else clause should only fire when bootstrapping the
>+# libtool distribution, otherwise you forgot to ship ltmain.sh
>+# with your package, and you will get complaints that there are
>+# no rules to generate ltmain.sh.
>+if test -f "$ltmain"; then
>+  # See if we are running on zsh, and set the options which allow our commands through
>+  # without removal of \ escapes.
>+  if test -n "${ZSH_VERSION+set}" ; then
>+    setopt NO_GLOB_SUBST
>+  fi
>+  # Now quote all the things that may contain metacharacters while being
>+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>+  # variables and quote the copies for generation of the libtool script.
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>+    SED SHELL STRIP \
>+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>+    deplibs_check_method reload_flag reload_cmds need_locks \
>+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>+    lt_cv_sys_global_symbol_to_c_name_address \
>+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>+    old_postinstall_cmds old_postuninstall_cmds \
>+    compiler_CXX \
>+    CC_CXX \
>+    LD_CXX \
>+    lt_prog_compiler_wl_CXX \
>+    lt_prog_compiler_pic_CXX \
>+    lt_prog_compiler_static_CXX \
>+    lt_prog_compiler_no_builtin_flag_CXX \
>+    export_dynamic_flag_spec_CXX \
>+    thread_safe_flag_spec_CXX \
>+    whole_archive_flag_spec_CXX \
>+    enable_shared_with_static_runtimes_CXX \
>+    old_archive_cmds_CXX \
>+    old_archive_from_new_cmds_CXX \
>+    predep_objects_CXX \
>+    postdep_objects_CXX \
>+    predeps_CXX \
>+    postdeps_CXX \
>+    compiler_lib_search_path_CXX \
>+    archive_cmds_CXX \
>+    archive_expsym_cmds_CXX \
>+    postinstall_cmds_CXX \
>+    postuninstall_cmds_CXX \
>+    old_archive_from_expsyms_cmds_CXX \
>+    allow_undefined_flag_CXX \
>+    no_undefined_flag_CXX \
>+    export_symbols_cmds_CXX \
>+    hardcode_libdir_flag_spec_CXX \
>+    hardcode_libdir_flag_spec_ld_CXX \
>+    hardcode_libdir_separator_CXX \
>+    hardcode_automatic_CXX \
>+    module_cmds_CXX \
>+    module_expsym_cmds_CXX \
>+    lt_cv_prog_compiler_c_o_CXX \
>+    exclude_expsyms_CXX \
>+    include_expsyms_CXX; do
>+
>+    case $var in
>+    old_archive_cmds_CXX | \
>+    old_archive_from_new_cmds_CXX | \
>+    archive_cmds_CXX | \
>+    archive_expsym_cmds_CXX | \
>+    module_cmds_CXX | \
>+    module_expsym_cmds_CXX | \
>+    old_archive_from_expsyms_cmds_CXX | \
>+    export_symbols_cmds_CXX | \
>+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>+    postinstall_cmds | postuninstall_cmds | \
>+    old_postinstall_cmds | old_postuninstall_cmds | \
>+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>+      # Double-quote double-evaled strings.
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>+      ;;
>+    *)
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>+      ;;
>+    esac
>+  done
>+
>+  case $lt_echo in
>+  *'\$0 --fallback-echo"')
>+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
>+    ;;
>+  esac
>+
>+cfgfile="$ofile"
>+
>+  cat <<__EOF__ >> "$cfgfile"
>+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
>+
>+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>+
>+# Shell to use when invoking shell scripts.
>+SHELL=$lt_SHELL
>+
>+# Whether or not to build shared libraries.
>+build_libtool_libs=$enable_shared
>+
>+# Whether or not to build static libraries.
>+build_old_libs=$enable_static
>+
>+# Whether or not to add -lc for building shared libraries.
>+build_libtool_need_lc=$archive_cmds_need_lc_CXX
>+
>+# Whether or not to disallow shared libs when runtime libs are static
>+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
>+
>+# Whether or not to optimize for fast installation.
>+fast_install=$enable_fast_install
>+
>+# The host system.
>+host_alias=$host_alias
>+host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
>+
>+# An echo program that does not interpret backslashes.
>+echo=$lt_echo
>+
>+# The archiver.
>+AR=$lt_AR
>+AR_FLAGS=$lt_AR_FLAGS
>+
>+# A C compiler.
>+LTCC=$lt_LTCC
>+
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
>+# A language-specific compiler.
>+CC=$lt_compiler_CXX
>+
>+# Is the compiler the GNU C compiler?
>+with_gcc=$GCC_CXX
>+
>+# An ERE matcher.
>+EGREP=$lt_EGREP
>+
>+# The linker used to build libraries.
>+LD=$lt_LD_CXX
>+
>+# Whether we need hard or soft links.
>+LN_S=$lt_LN_S
>+
>+# A BSD-compatible nm program.
>+NM=$lt_NM
>+
>+# A symbol stripping program
>+STRIP=$lt_STRIP
>+
>+# Used to examine libraries when file_magic_cmd begins "file"
>+MAGIC_CMD=$MAGIC_CMD
>+
>+# Used on cygwin: DLL creation program.
>+DLLTOOL="$DLLTOOL"
>+
>+# Used on cygwin: object dumper.
>+OBJDUMP="$OBJDUMP"
>+
>+# Used on cygwin: assembler.
>+AS="$AS"
>+
>+# The name of the directory that contains temporary libtool files.
>+objdir=$objdir
>+
>+# How to create reloadable object files.
>+reload_flag=$lt_reload_flag
>+reload_cmds=$lt_reload_cmds
>+
>+# How to pass a linker flag through the compiler.
>+wl=$lt_lt_prog_compiler_wl_CXX
>+
>+# Object file suffix (normally "o").
>+objext="$ac_objext"
>+
>+# Old archive suffix (normally "a").
>+libext="$libext"
>+
>+# Shared library suffix (normally ".so").
>+shrext_cmds='$shrext_cmds'
>+
>+# Executable file suffix (normally "").
>+exeext="$exeext"
>+
>+# Additional compiler flags for building library objects.
>+pic_flag=$lt_lt_prog_compiler_pic_CXX
>+pic_mode=$pic_mode
>+
>+# What is the maximum length of a command?
>+max_cmd_len=$lt_cv_sys_max_cmd_len
>+
>+# Does compiler simultaneously support -c and -o options?
>+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
>+
>+# Must we lock files when doing compilation?
>+need_locks=$lt_need_locks
>+
>+# Do we need the lib prefix for modules?
>+need_lib_prefix=$need_lib_prefix
>+
>+# Do we need a version for libraries?
>+need_version=$need_version
>+
>+# Whether dlopen is supported.
>+dlopen_support=$enable_dlopen
>+
>+# Whether dlopen of programs is supported.
>+dlopen_self=$enable_dlopen_self
>+
>+# Whether dlopen of statically linked programs is supported.
>+dlopen_self_static=$enable_dlopen_self_static
>+
>+# Compiler flag to prevent dynamic linking.
>+link_static_flag=$lt_lt_prog_compiler_static_CXX
>+
>+# Compiler flag to turn off builtin functions.
>+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
>+
>+# Compiler flag to allow reflexive dlopens.
>+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
>+
>+# Compiler flag to generate shared objects directly from archives.
>+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
>+
>+# Compiler flag to generate thread-safe objects.
>+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
>+
>+# Library versioning type.
>+version_type=$version_type
>+
>+# Format of library name prefix.
>+libname_spec=$lt_libname_spec
>+
>+# List of archive names.  First name is the real one, the rest are links.
>+# The last name is the one that the linker finds with -lNAME.
>+library_names_spec=$lt_library_names_spec
>+
>+# The coded name of the library, if different from the real name.
>+soname_spec=$lt_soname_spec
>+
>+# Commands used to build and install an old-style archive.
>+RANLIB=$lt_RANLIB
>+old_archive_cmds=$lt_old_archive_cmds_CXX
>+old_postinstall_cmds=$lt_old_postinstall_cmds
>+old_postuninstall_cmds=$lt_old_postuninstall_cmds
>+
>+# Create an old-style archive from a shared archive.
>+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
>+
>+# Create a temporary old-style archive to link instead of a shared archive.
>+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
>+
>+# Commands used to build and install a shared archive.
>+archive_cmds=$lt_archive_cmds_CXX
>+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
>+postinstall_cmds=$lt_postinstall_cmds
>+postuninstall_cmds=$lt_postuninstall_cmds
>+
>+# Commands used to build a loadable module (assumed same as above if empty)
>+module_cmds=$lt_module_cmds_CXX
>+module_expsym_cmds=$lt_module_expsym_cmds_CXX
>+
>+# Commands to strip libraries.
>+old_striplib=$lt_old_striplib
>+striplib=$lt_striplib
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predep_objects=$lt_predep_objects_CXX
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdep_objects=$lt_postdep_objects_CXX
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predeps=$lt_predeps_CXX
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdeps=$lt_postdeps_CXX
>+
>+# The library search path used internally by the compiler when linking
>+# a shared library.
>+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
>+
>+# Method to check whether dependent libraries are shared objects.
>+deplibs_check_method=$lt_deplibs_check_method
>+
>+# Command to use when deplibs_check_method == file_magic.
>+file_magic_cmd=$lt_file_magic_cmd
>+
>+# Flag that allows shared libraries with undefined symbols to be built.
>+allow_undefined_flag=$lt_allow_undefined_flag_CXX
>+
>+# Flag that forces no undefined symbols.
>+no_undefined_flag=$lt_no_undefined_flag_CXX
>+
>+# Commands used to finish a libtool library installation in a directory.
>+finish_cmds=$lt_finish_cmds
>+
>+# Same as above, but a single script fragment to be evaled but not shown.
>+finish_eval=$lt_finish_eval
>+
>+# Take the output of nm and produce a listing of raw symbols and C names.
>+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
>+
>+# Transform the output of nm in a proper C declaration
>+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
>+
>+# Transform the output of nm in a C name address pair
>+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
>+
>+# This is the shared library runtime path variable.
>+runpath_var=$runpath_var
>+
>+# This is the shared library path variable.
>+shlibpath_var=$shlibpath_var
>+
>+# Is shlibpath searched before the hard-coded library search path?
>+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
>+
>+# How to hardcode a shared library path into an executable.
>+hardcode_action=$hardcode_action_CXX
>+
>+# Whether we should hardcode library paths into libraries.
>+hardcode_into_libs=$hardcode_into_libs
>+
>+# Flag to hardcode \$libdir into a binary during linking.
>+# This must work even if \$libdir does not exist.
>+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
>+
>+# If ld is used when linking, flag to hardcode \$libdir into
>+# a binary during linking. This must work even if \$libdir does
>+# not exist.
>+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
>+
>+# Whether we need a single -rpath flag with a separated argument.
>+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
>+
>+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_direct=$hardcode_direct_CXX
>+
>+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_minus_L=$hardcode_minus_L_CXX
>+
>+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
>+# the resulting binary.
>+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
>+
>+# Set to yes if building a shared library automatically hardcodes DIR into the library
>+# and all subsequent libraries and executables linked against it.
>+hardcode_automatic=$hardcode_automatic_CXX
>+
>+# Variables whose values should be saved in libtool wrapper scripts and
>+# restored at relink time.
>+variables_saved_for_relink="$variables_saved_for_relink"
>+
>+# Whether libtool must link a program against all its dependency libraries.
>+link_all_deplibs=$link_all_deplibs_CXX
>+
>+# Compile-time system search path for libraries
>+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>+
>+# Run-time system search path for libraries
>+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
>+
>+# Fix the shell variable \$srcfile for the compiler.
>+fix_srcfile_path="$fix_srcfile_path_CXX"
>+
>+# Set to yes if exported symbols are required.
>+always_export_symbols=$always_export_symbols_CXX
>+
>+# The commands to list exported symbols.
>+export_symbols_cmds=$lt_export_symbols_cmds_CXX
>+
>+# The commands to extract the exported symbol list from a shared archive.
>+extract_expsyms_cmds=$lt_extract_expsyms_cmds
>+
>+# Symbols that should not be listed in the preloaded symbols.
>+exclude_expsyms=$lt_exclude_expsyms_CXX
>+
>+# Symbols that must always be exported.
>+include_expsyms=$lt_include_expsyms_CXX
>+
>+# ### END LIBTOOL TAG CONFIG: $tagname
>+
>+__EOF__
>+
>+
>+else
>+  # If there is no Makefile yet, we rely on a make rule to execute
>+  # `config.status --recheck' to rerun these tests and create the
>+  # libtool script then.
>+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>+  if test -f "$ltmain_in"; then
>+    test -f Makefile && make "$ltmain"
>+  fi
>+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
>+
>+CC=$lt_save_CC
>+LDCXX=$LD
>+LD=$lt_save_LD
>+GCC=$lt_save_GCC
>+with_gnu_ldcxx=$with_gnu_ld
>+with_gnu_ld=$lt_save_with_gnu_ld
>+lt_cv_path_LDCXX=$lt_cv_path_LD
>+lt_cv_path_LD=$lt_save_path_LD
>+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
>+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
>+
>+	else
>+	  tagname=""
>+	fi
>+	;;
>+
>+      F77)
>+	if test -n "$F77" && test "X$F77" != "Xno"; then
>+
>+ac_ext=f
>+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
>+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
>+
>+
>+archive_cmds_need_lc_F77=no
>+allow_undefined_flag_F77=
>+always_export_symbols_F77=no
>+archive_expsym_cmds_F77=
>+export_dynamic_flag_spec_F77=
>+hardcode_direct_F77=no
>+hardcode_libdir_flag_spec_F77=
>+hardcode_libdir_flag_spec_ld_F77=
>+hardcode_libdir_separator_F77=
>+hardcode_minus_L_F77=no
>+hardcode_automatic_F77=no
>+module_cmds_F77=
>+module_expsym_cmds_F77=
>+link_all_deplibs_F77=unknown
>+old_archive_cmds_F77=$old_archive_cmds
>+no_undefined_flag_F77=
>+whole_archive_flag_spec_F77=
>+enable_shared_with_static_runtimes_F77=no
>+
>+# Source file extension for f77 test sources.
>+ac_ext=f
>+
>+# Object file extension for compiled f77 test sources.
>+objext=o
>+objext_F77=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code="      program t\n      end\n"
>+
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>+
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
>+
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
>+
>+
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+
>+# Allow CC to be a program name with arguments.
>+lt_save_CC="$CC"
>+CC=${F77-"f77"}
>+compiler=$CC
>+compiler_F77=$CC
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
>+
>+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
>+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
>+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
>+echo "${ECHO_T}$can_build_shared" >&6; }
>+
>+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
>+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
>+test "$can_build_shared" = "no" && enable_shared=no
>+
>+# On AIX, shared libraries and static libraries use the same namespace, and
>+# are all built from PIC.
>+case $host_os in
>+aix3*)
>+  test "$enable_shared" = yes && enable_static=no
>+  if test -n "$RANLIB"; then
>+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
>+    postinstall_cmds='$RANLIB $lib'
>+  fi
>+  ;;
>+aix4* | aix5*)
>+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>+    test "$enable_shared" = yes && enable_static=no
>+  fi
>+  ;;
>+esac
>+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
>+echo "${ECHO_T}$enable_shared" >&6; }
>+
>+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
>+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
>+# Make sure either enable_shared or enable_static is yes.
>+test "$enable_shared" = yes || enable_static=yes
>+{ echo "$as_me:$LINENO: result: $enable_static" >&5
>+echo "${ECHO_T}$enable_static" >&6; }
>+
>+GCC_F77="$G77"
>+LD_F77="$LD"
>+
>+lt_prog_compiler_wl_F77=
>+lt_prog_compiler_pic_F77=
>+lt_prog_compiler_static_F77=
>+
>+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
>+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
>+
>+  if test "$GCC" = yes; then
>+    lt_prog_compiler_wl_F77='-Wl,'
>+    lt_prog_compiler_static_F77='-static'
>+
>+    case $host_os in
>+      aix*)
>+      # All AIX code is PIC.
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	lt_prog_compiler_static_F77='-Bstatic'
>+      fi
>+      ;;
>+
>+    amigaos*)
>+      # FIXME: we need at least 68020 code to build shared libraries, but
>+      # adding the `-m68020' flag to GCC prevents building anything better,
>+      # like `-m68040'.
>+      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
>+      ;;
>+
>+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>+      # PIC is the default for these OSes.
>+      ;;
>+
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
>+      ;;
>+
>+    darwin* | rhapsody*)
>+      # PIC is the default on this platform
>+      # Common symbols not allowed in MH_DYLIB files
>+      lt_prog_compiler_pic_F77='-fno-common'
>+      ;;
>+
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>+
>+    msdosdjgpp*)
>+      # Just because we use GCC doesn't mean we suddenly get shared libraries
>+      # on systems that don't support them.
>+      lt_prog_compiler_can_build_shared_F77=no
>+      enable_shared=no
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	lt_prog_compiler_pic_F77=-Kconform_pic
>+      fi
>+      ;;
>+
>+    hpux*)
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	lt_prog_compiler_pic_F77='-fPIC'
>+	;;
>+      esac
>+      ;;
>+
>+    *)
>+      lt_prog_compiler_pic_F77='-fPIC'
>+      ;;
>+    esac
>+  else
>+    # PORTME Check for flag to pass linker flags through the system compiler.
>+    case $host_os in
>+    aix*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	lt_prog_compiler_static_F77='-Bstatic'
>+      else
>+	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
>+      fi
>+      ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         lt_prog_compiler_pic_F77='-qnocommon'
>+         lt_prog_compiler_wl_F77='-Wl,'
>+         ;;
>+       esac
>+       ;;
>+
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
>+      ;;
>+
>+    hpux9* | hpux10* | hpux11*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	lt_prog_compiler_pic_F77='+Z'
>+	;;
>+      esac
>+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
>+      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
>+      ;;
>+
>+    irix5* | irix6* | nonstopux*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      # PIC (with -KPIC) is the default.
>+      lt_prog_compiler_static_F77='-non_shared'
>+      ;;
>+
>+    newsos6)
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
>+
>+    linux*)
>+      case $cc_basename in
>+      icc* | ecc*)
>+	lt_prog_compiler_wl_F77='-Wl,'
>+	lt_prog_compiler_pic_F77='-KPIC'
>+	lt_prog_compiler_static_F77='-static'
>+        ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+	# which looks to be a dead project)
>+	lt_prog_compiler_wl_F77='-Wl,'
>+	lt_prog_compiler_pic_F77='-fpic'
>+	lt_prog_compiler_static_F77='-Bstatic'
>+        ;;
>+      ccc*)
>+        lt_prog_compiler_wl_F77='-Wl,'
>+        # All Alpha code is PIC.
>+        lt_prog_compiler_static_F77='-non_shared'
>+        ;;
>+      esac
>+      ;;
>+
>+    osf3* | osf4* | osf5*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      # All OSF/1 code is PIC.
>+      lt_prog_compiler_static_F77='-non_shared'
>+      ;;
>+
>+    solaris*)
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+	lt_prog_compiler_wl_F77='-Qoption ld ';;
>+      *)
>+	lt_prog_compiler_wl_F77='-Wl,';;
>+      esac
>+      ;;
>+
>+    sunos4*)
>+      lt_prog_compiler_wl_F77='-Qoption ld '
>+      lt_prog_compiler_pic_F77='-PIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
>+
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec ;then
>+	lt_prog_compiler_pic_F77='-Kconform_pic'
>+	lt_prog_compiler_static_F77='-Bstatic'
>+      fi
>+      ;;
>+
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
>+
>+    unicos*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      lt_prog_compiler_can_build_shared_F77=no
>+      ;;
>+
>+    uts4*)
>+      lt_prog_compiler_pic_F77='-pic'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
>+
>+    *)
>+      lt_prog_compiler_can_build_shared_F77=no
>+      ;;
>+    esac
>+  fi
>+
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
>+
>+#
>+# Check to make sure the PIC flag actually works.
>+#
>+if test -n "$lt_prog_compiler_pic_F77"; then
>+
>+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
>+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_pic_works_F77=no
>+  ac_outfile=conftest.$ac_objext
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="$lt_prog_compiler_pic_F77"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:14011: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&5
>+   echo "$as_me:14015: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       lt_prog_compiler_pic_works_F77=yes
>+     fi
>+   fi
>+   $rm conftest*
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
>+
>+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
>+    case $lt_prog_compiler_pic_F77 in
>+     "" | " "*) ;;
>+     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
>+     esac
>+else
>+    lt_prog_compiler_pic_F77=
>+     lt_prog_compiler_can_build_shared_F77=no
>+fi
>+
>+fi
>+case $host_os in
>+  # For platforms which do not support PIC, -DPIC is meaningless:
>+  *djgpp*)
>+    lt_prog_compiler_pic_F77=
>+    ;;
>+  *)
>+    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
>+    ;;
>+esac
>+
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
>+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_static_works_F77=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works_F77=yes
>+       fi
>+     else
>+       lt_prog_compiler_static_works_F77=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
>+
>+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
>+    :
>+else
>+    lt_prog_compiler_static_F77=
>+fi
>+
>+
>+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
>+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
>+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_cv_prog_compiler_c_o_F77=no
>+   $rm -r conftest 2>/dev/null
>+   mkdir conftest
>+   cd conftest
>+   mkdir out
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+   lt_compiler_flag="-o out/conftest2.$ac_objext"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:14115: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>out/conftest.err)
>+   ac_status=$?
>+   cat out/conftest.err >&5
>+   echo "$as_me:14119: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
>+   then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>+       lt_cv_prog_compiler_c_o_F77=yes
>+     fi
>+   fi
>+   chmod u+w . 2>&5
>+   $rm conftest*
>+   # SGI C++ compiler will create directory out/ii_files/ for
>+   # template instantiation
>+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>+   $rm out/* && rmdir out
>+   cd ..
>+   rmdir conftest
>+   $rm conftest*
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
>+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
>+
>+
>+hard_links="nottested"
>+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
>+  # do not overwrite the value of need_locks provided by the user
>+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
>+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
>+  hard_links=yes
>+  $rm conftest*
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  touch conftest.a
>+  ln conftest.a conftest.b 2>&5 || hard_links=no
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  { echo "$as_me:$LINENO: result: $hard_links" >&5
>+echo "${ECHO_T}$hard_links" >&6; }
>+  if test "$hard_links" = no; then
>+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
>+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
>+    need_locks=warn
>+  fi
>+else
>+  need_locks=no
>+fi
>+
>+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
>+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
>+
>+  runpath_var=
>+  allow_undefined_flag_F77=
>+  enable_shared_with_static_runtimes_F77=no
>+  archive_cmds_F77=
>+  archive_expsym_cmds_F77=
>+  old_archive_From_new_cmds_F77=
>+  old_archive_from_expsyms_cmds_F77=
>+  export_dynamic_flag_spec_F77=
>+  whole_archive_flag_spec_F77=
>+  thread_safe_flag_spec_F77=
>+  hardcode_libdir_flag_spec_F77=
>+  hardcode_libdir_flag_spec_ld_F77=
>+  hardcode_libdir_separator_F77=
>+  hardcode_direct_F77=no
>+  hardcode_minus_L_F77=no
>+  hardcode_shlibpath_var_F77=unsupported
>+  link_all_deplibs_F77=unknown
>+  hardcode_automatic_F77=no
>+  module_cmds_F77=
>+  module_expsym_cmds_F77=
>+  always_export_symbols_F77=no
>+  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  # include_expsyms should be a list of space-separated symbols to be *always*
>+  # included in the symbol list
>+  include_expsyms_F77=
>+  # exclude_expsyms can be an extended regexp of symbols to exclude
>+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
>+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>+  # as well as any symbol that contains `d'.
>+  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
>+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>+  # platforms (ab)use it in PIC code, but their linkers get confused if
>+  # the symbol is explicitly referenced.  Since portable code cannot
>+  # rely on this symbol name, it's probably fine to never include it in
>+  # preloaded symbol tables.
>+  extract_expsyms_cmds=
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
>+  case $host_os in
>+  cygwin* | mingw* | pw32*)
>+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
>+    # When not using gcc, we currently assume that we are using
>+    # Microsoft Visual C++.
>+    if test "$GCC" != yes; then
>+      with_gnu_ld=no
>+    fi
>+    ;;
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>+  openbsd*)
>+    with_gnu_ld=no
>+    ;;
>+  esac
>+
>+  ld_shlibs_F77=yes
>+  if test "$with_gnu_ld" = yes; then
>+    # If archive_cmds runs LD, not CC, wlarc should be empty
>+    wlarc='${wl}'
>+
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
>+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+  	whole_archive_flag_spec_F77=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
>+
>+    # See if GNU ld supports shared libraries.
>+    case $host_os in
>+    aix3* | aix4* | aix5*)
>+      # On AIX/PPC, the GNU linker is very broken
>+      if test "$host_cpu" != ia64; then
>+	ld_shlibs_F77=no
>+	cat <<EOF 1>&2
>+
>+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>+*** to be unable to reliably create shared libraries on AIX.
>+*** Therefore, libtool is disabling shared libraries support.  If you
>+*** really care for shared libraries, you may want to modify your PATH
>+*** so that a non-GNU linker is found, and then restart.
>+
>+EOF
>+      fi
>+      ;;
>+
>+    amigaos*)
>+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      hardcode_minus_L_F77=yes
>+
>+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>+      # that the semantics of dynamic libraries on AmigaOS, at least up
>+      # to version 4, is to share data among multiple programs linked
>+      # with the same dynamic library.  Since this doesn't match the
>+      # behavior of shared libraries on other platforms, we can't use
>+      # them.
>+      ld_shlibs_F77=no
>+      ;;
>+
>+    beos*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	allow_undefined_flag_F77=unsupported
>+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+	# support --undefined.  This deserves some investigation.  FIXME
>+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+      else
>+	ld_shlibs_F77=no
>+      fi
>+      ;;
>+
>+    cygwin* | mingw* | pw32*)
>+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
>+      # as there is no search path for DLLs.
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      allow_undefined_flag_F77=unsupported
>+      always_export_symbols_F77=no
>+      enable_shared_with_static_runtimes_F77=yes
>+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>+
>+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+	# If the export-symbols file already is a .def file (1st line
>+	# is EXPORTS), use it as is; otherwise, prepend...
>+	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>+	  cp $export_symbols $output_objdir/$soname.def;
>+	else
>+	  echo EXPORTS > $output_objdir/$soname.def;
>+	  cat $export_symbols >> $output_objdir/$soname.def;
>+	fi~
>+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+      else
>+	ld_shlibs_F77=no
>+      fi
>+      ;;
>+
>+    interix3*)
>+      hardcode_direct_F77=no
>+      hardcode_shlibpath_var_F77=no
>+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
>+      export_dynamic_flag_spec_F77='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      ;;
>+
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	tmp_addflag=
>+	case $cc_basename,$host_cpu in
>+	pgcc*)				# Portland Group C compiler
>+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag'
>+	  ;;
>+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
>+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag -Mnomain' ;;
>+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
>+	  tmp_addflag=' -i_dynamic' ;;
>+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
>+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
>+	ifc* | ifort*)			# Intel Fortran compiler
>+	  tmp_addflag=' -nofor_main' ;;
>+	esac
>+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+
>+	if test $supports_anon_versioning = yes; then
>+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+	fi
>+      else
>+	ld_shlibs_F77=no
>+      fi
>+      ;;
>+
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>+	wlarc=
>+      else
>+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      fi
>+      ;;
>+
>+    solaris*)
>+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>+	ld_shlibs_F77=no
>+	cat <<EOF 1>&2
>+
>+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>+*** create shared libraries on Solaris systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.9.1 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+EOF
>+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	ld_shlibs_F77=no
>+      fi
>+      ;;
>+
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
>+	ld_shlibs_F77=no
>+	cat <<_LT_EOF 1>&2
>+
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+_LT_EOF
>+	;;
>+	*)
>+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>+	  else
>+	    ld_shlibs_F77=no
>+	  fi
>+	;;
>+      esac
>+      ;;
>+
>+    sunos4*)
>+      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      wlarc=
>+      hardcode_direct_F77=yes
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    *)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	ld_shlibs_F77=no
>+      fi
>+      ;;
>+    esac
>+
>+    if test "$ld_shlibs_F77" = no; then
>+      runpath_var=
>+      hardcode_libdir_flag_spec_F77=
>+      export_dynamic_flag_spec_F77=
>+      whole_archive_flag_spec_F77=
>+    fi
>+  else
>+    # PORTME fill in a description of your system's linker (not GNU ld)
>+    case $host_os in
>+    aix3*)
>+      allow_undefined_flag_F77=unsupported
>+      always_export_symbols_F77=yes
>+      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>+      # Note: this linker hardcodes the directories in LIBPATH if there
>+      # are no directories specified by -L.
>+      hardcode_minus_L_F77=yes
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>+	# Neither direct hardcoding nor static linking is supported with a
>+	# broken collect2.
>+	hardcode_direct_F77=unsupported
>+      fi
>+      ;;
>+
>+    aix4* | aix5*)
>+      if test "$host_cpu" = ia64; then
>+	# On IA64, the linker does run time linking by default, so we don't
>+	# have to do anything special.
>+	aix_use_runtimelinking=no
>+	exp_sym_flag='-Bexport'
>+	no_entry_flag=""
>+      else
>+	# If we're using GNU nm, then we don't want the "-C" option.
>+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
>+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>+	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+	else
>+	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+	fi
>+	aix_use_runtimelinking=no
>+
>+	# Test if we are trying to use run time linking or normal
>+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
>+	# need to do runtime linking.
>+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
>+	  for ld_flag in $LDFLAGS; do
>+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>+  	    aix_use_runtimelinking=yes
>+  	    break
>+  	  fi
>+	  done
>+	  ;;
>+	esac
>+
>+	exp_sym_flag='-bexport'
>+	no_entry_flag='-bnoentry'
>+      fi
>+
>+      # When large executables or shared objects are built, AIX ld can
>+      # have problems creating the table of contents.  If linking a library
>+      # or program results in "error TOC overflow" add -mminimal-toc to
>+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>+
>+      archive_cmds_F77=''
>+      hardcode_direct_F77=yes
>+      hardcode_libdir_separator_F77=':'
>+      link_all_deplibs_F77=yes
>+
>+      if test "$GCC" = yes; then
>+	case $host_os in aix4.[012]|aix4.[012].*)
>+	# We only want to do this on AIX 4.2 and lower, the check
>+	# below for broken collect2 doesn't work under 4.3+
>+	  collect2name=`${CC} -print-prog-name=collect2`
>+	  if test -f "$collect2name" && \
>+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
>+	  then
>+  	  # We have reworked collect2
>+  	  hardcode_direct_F77=yes
>+	  else
>+  	  # We have old collect2
>+  	  hardcode_direct_F77=unsupported
>+  	  # It fails to find uninstalled libraries when the uninstalled
>+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
>+  	  # to unsupported forces relinking
>+  	  hardcode_minus_L_F77=yes
>+  	  hardcode_libdir_flag_spec_F77='-L$libdir'
>+  	  hardcode_libdir_separator_F77=
>+	  fi
>+	  ;;
>+	esac
>+	shared_flag='-shared'
>+	if test "$aix_use_runtimelinking" = yes; then
>+	  shared_flag="$shared_flag "'${wl}-G'
>+	fi
>+      else
>+	# not using gcc
>+	if test "$host_cpu" = ia64; then
>+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>+  	# chokes on -Wl,-G. The following line is correct:
>+	  shared_flag='-G'
>+	else
>+	  if test "$aix_use_runtimelinking" = yes; then
>+	    shared_flag='${wl}-G'
>+	  else
>+	    shared_flag='${wl}-bM:SRE'
>+	  fi
>+	fi
>+      fi
>+
>+      # It seems that -bexpall does not export symbols beginning with
>+      # underscore (_), so it is better to generate a list of symbols to export.
>+      always_export_symbols_F77=yes
>+      if test "$aix_use_runtimelinking" = yes; then
>+	# Warning - without using the other runtime loading flags (-brtl),
>+	# -berok will link without error, but may produce a broken library.
>+	allow_undefined_flag_F77='-berok'
>+       # Determine the default libpath from the value encoded in an empty executable.
>+       cat >conftest.$ac_ext <<_ACEOF
>+      program main
>+
>+      end
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_f77_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+       else
>+	if test "$host_cpu" = ia64; then
>+	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
>+	  allow_undefined_flag_F77="-z nodefs"
>+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>+	else
>+	 # Determine the default libpath from the value encoded in an empty executable.
>+	 cat >conftest.$ac_ext <<_ACEOF
>+      program main
>+
>+      end
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_f77_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	  # Warning - without using the other run time loading flags,
>+	  # -berok will link without error, but may produce a broken library.
>+	  no_undefined_flag_F77=' ${wl}-bernotok'
>+	  allow_undefined_flag_F77=' ${wl}-berok'
>+	  # Exported symbols can be pulled into shared objects from archives
>+	  whole_archive_flag_spec_F77='$convenience'
>+	  archive_cmds_need_lc_F77=yes
>+	  # This is similar to how AIX traditionally builds its shared libraries.
>+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+	fi
>+      fi
>+      ;;
>+
>+    amigaos*)
>+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      hardcode_minus_L_F77=yes
>+      # see comment about different semantics on the GNU ld section
>+      ld_shlibs_F77=no
>+      ;;
>+
>+    bsdi[45]*)
>+      export_dynamic_flag_spec_F77=-rdynamic
>+      ;;
>+
>+    cygwin* | mingw* | pw32*)
>+      # When not using gcc, we currently assume that we are using
>+      # Microsoft Visual C++.
>+      # hardcode_libdir_flag_spec is actually meaningless, as there is
>+      # no search path for DLLs.
>+      hardcode_libdir_flag_spec_F77=' '
>+      allow_undefined_flag_F77=unsupported
>+      # Tell ltmain to make .lib files, not .a files.
>+      libext=lib
>+      # Tell ltmain to make .dll files, not .so files.
>+      shrext_cmds=".dll"
>+      # FIXME: Setting linknames here is a bad hack.
>+      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
>+      # The linker will automatically build a .lib file if we build a DLL.
>+      old_archive_From_new_cmds_F77='true'
>+      # FIXME: Should let the user specify the lib program.
>+      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
>+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
>+      enable_shared_with_static_runtimes_F77=yes
>+      ;;
>+
>+    darwin* | rhapsody*)
>+      case $host_os in
>+        rhapsody* | darwin1.[012])
>+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
>+         ;;
>+       *) # Darwin 1.3 on
>+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+         else
>+           case ${MACOSX_DEPLOYMENT_TARGET} in
>+             10.[012])
>+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+               ;;
>+             10.*)
>+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
>+               ;;
>+           esac
>+         fi
>+         ;;
>+      esac
>+      archive_cmds_need_lc_F77=no
>+      hardcode_direct_F77=no
>+      hardcode_automatic_F77=yes
>+      hardcode_shlibpath_var_F77=unsupported
>+      whole_archive_flag_spec_F77=''
>+      link_all_deplibs_F77=yes
>+    if test "$GCC" = yes ; then
>+    	output_verbose_link_cmd='echo'
>+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+    else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>+         ld_shlibs_F77=no
>+          ;;
>+      esac
>+    fi
>+      ;;
>+
>+    dgux*)
>+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    freebsd1*)
>+      ld_shlibs_F77=no
>+      ;;
>+
>+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>+    # support.  Future versions do this automatically, but an explicit c++rt0.o
>+    # does not break anything, and helps significantly (at the cost of a little
>+    # extra space).
>+    freebsd2.2*)
>+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
>+      hardcode_libdir_flag_spec_F77='-R$libdir'
>+      hardcode_direct_F77=yes
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
>+    freebsd2*)
>+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_direct_F77=yes
>+      hardcode_minus_L_F77=yes
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>+      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>+      hardcode_libdir_flag_spec_F77='-R$libdir'
>+      hardcode_direct_F77=yes
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    hpux9*)
>+      if test "$GCC" = yes; then
>+	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      else
>+	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      fi
>+      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
>+      hardcode_libdir_separator_F77=:
>+      hardcode_direct_F77=yes
>+
>+      # hardcode_minus_L: Not really in the search PATH,
>+      # but as the default location of the library.
>+      hardcode_minus_L_F77=yes
>+      export_dynamic_flag_spec_F77='${wl}-E'
>+      ;;
>+
>+    hpux10*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
>+	hardcode_libdir_separator_F77=:
>+
>+	hardcode_direct_F77=yes
>+	export_dynamic_flag_spec_F77='${wl}-E'
>+
>+	# hardcode_minus_L: Not really in the search PATH,
>+	# but as the default location of the library.
>+	hardcode_minus_L_F77=yes
>+      fi
>+      ;;
>+
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	case $host_cpu in
>+	hppa*64*)
>+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      else
>+	case $host_cpu in
>+	hppa*64*)
>+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
>+	hardcode_libdir_separator_F77=:
>+
>+	case $host_cpu in
>+	hppa*64*|ia64*)
>+	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
>+	  hardcode_direct_F77=no
>+	  hardcode_shlibpath_var_F77=no
>+	  ;;
>+	*)
>+	  hardcode_direct_F77=yes
>+	  export_dynamic_flag_spec_F77='${wl}-E'
>+
>+	  # hardcode_minus_L: Not really in the search PATH,
>+	  # but as the default location of the library.
>+	  hardcode_minus_L_F77=yes
>+	  ;;
>+	esac
>+      fi
>+      ;;
>+
>+    irix5* | irix6* | nonstopux*)
>+      if test "$GCC" = yes; then
>+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
>+      fi
>+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator_F77=:
>+      link_all_deplibs_F77=yes
>+      ;;
>+
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
>+      else
>+	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
>+      fi
>+      hardcode_libdir_flag_spec_F77='-R$libdir'
>+      hardcode_direct_F77=yes
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    newsos6)
>+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_direct_F77=yes
>+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator_F77=:
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    openbsd*)
>+      hardcode_direct_F77=yes
>+      hardcode_shlibpath_var_F77=no
>+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>+	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
>+	export_dynamic_flag_spec_F77='${wl}-E'
>+      else
>+       case $host_os in
>+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
>+	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+	   hardcode_libdir_flag_spec_F77='-R$libdir'
>+	   ;;
>+	 *)
>+	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
>+	   ;;
>+       esac
>+      fi
>+      ;;
>+
>+    os2*)
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      hardcode_minus_L_F77=yes
>+      allow_undefined_flag_F77=unsupported
>+      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
>+      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
>+      ;;
>+
>+    osf3*)
>+      if test "$GCC" = yes; then
>+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
>+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	allow_undefined_flag_F77=' -expect_unresolved \*'
>+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+      fi
>+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator_F77=:
>+      ;;
>+
>+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
>+      if test "$GCC" = yes; then
>+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
>+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
>+      else
>+	allow_undefined_flag_F77=' -expect_unresolved \*'
>+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
>+
>+	# Both c and cxx compiler support -rpath directly
>+	hardcode_libdir_flag_spec_F77='-rpath $libdir'
>+      fi
>+      hardcode_libdir_separator_F77=:
>+      ;;
>+
>+    solaris*)
>+      no_undefined_flag_F77=' -z text'
>+      if test "$GCC" = yes; then
>+	wlarc='${wl}'
>+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>+      else
>+	wlarc=''
>+	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>+      fi
>+      hardcode_libdir_flag_spec_F77='-R$libdir'
>+      hardcode_shlibpath_var_F77=no
>+      case $host_os in
>+      solaris2.[0-5] | solaris2.[0-5].*) ;;
>+      *)
>+ 	# The compiler driver will combine linker options so we
>+ 	# cannot just pass the convience library names through
>+ 	# without $wl, iff we do not link with $LD.
>+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
>+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
>+ 	case $wlarc in
>+ 	'')
>+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
>+ 	*)
>+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+ 	esac ;;
>+      esac
>+      link_all_deplibs_F77=yes
>+      ;;
>+
>+    sunos4*)
>+      if test "x$host_vendor" = xsequent; then
>+	# Use $CC to link under sequent, because it throws in some extra .o
>+	# files that make .init and .fini sections work.
>+	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      hardcode_direct_F77=yes
>+      hardcode_minus_L_F77=yes
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    sysv4)
>+      case $host_vendor in
>+	sni)
>+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  hardcode_direct_F77=yes # is this really true???
>+	;;
>+	siemens)
>+	  ## LD is ld it makes a PLAMLIB
>+	  ## CC just makes a GrossModule.
>+	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>+	  reload_cmds_F77='$CC -r -o $output$reload_objs'
>+	  hardcode_direct_F77=no
>+        ;;
>+	motorola)
>+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
>+	;;
>+      esac
>+      runpath_var='LD_RUN_PATH'
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    sysv4.3*)
>+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_shlibpath_var_F77=no
>+      export_dynamic_flag_spec_F77='-Bexport'
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	hardcode_shlibpath_var_F77=no
>+	runpath_var=LD_RUN_PATH
>+	hardcode_runpath_var=yes
>+	ld_shlibs_F77=yes
>+      fi
>+      ;;
>+
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
>+      no_undefined_flag_F77='${wl}-z,text'
>+      archive_cmds_need_lc_F77=no
>+      hardcode_shlibpath_var_F77=no
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
>+
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      no_undefined_flag_F77='${wl}-z,text'
>+      allow_undefined_flag_F77='${wl}-z,nodefs'
>+      archive_cmds_need_lc_F77=no
>+      hardcode_shlibpath_var_F77=no
>+      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      hardcode_libdir_separator_F77=':'
>+      link_all_deplibs_F77=yes
>+      export_dynamic_flag_spec_F77='${wl}-Bexport'
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
>+
>+    uts4*)
>+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      hardcode_shlibpath_var_F77=no
>+      ;;
>+
>+    *)
>+      ld_shlibs_F77=no
>+      ;;
>+    esac
>+  fi
>+
>+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
>+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
>+test "$ld_shlibs_F77" = no && can_build_shared=no
>+
>+#
>+# Do we need to explicitly link libc?
>+#
>+case "x$archive_cmds_need_lc_F77" in
>+x|xyes)
>+  # Assume -lc should be added
>+  archive_cmds_need_lc_F77=yes
>+
>+  if test "$enable_shared" = yes && test "$GCC" = yes; then
>+    case $archive_cmds_F77 in
>+    *'~'*)
>+      # FIXME: we may have to deal with multi-command sequences.
>+      ;;
>+    '$CC '*)
>+      # Test whether the compiler implicitly links with -lc since on some
>+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
>+      # to ld, don't add -lc before -lgcc.
>+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
>+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
>+      $rm conftest*
>+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } 2>conftest.err; then
>+        soname=conftest
>+        lib=conftest
>+        libobjs=conftest.$ac_objext
>+        deplibs=
>+        wl=$lt_prog_compiler_wl_F77
>+	pic_flag=$lt_prog_compiler_pic_F77
>+        compiler_flags=-v
>+        linker_flags=-v
>+        verstring=
>+        output_objdir=.
>+        libname=conftest
>+        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
>+        allow_undefined_flag_F77=
>+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
>+  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }
>+        then
>+	  archive_cmds_need_lc_F77=no
>+        else
>+	  archive_cmds_need_lc_F77=yes
>+        fi
>+        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
>+      else
>+        cat conftest.err 1>&5
>+      fi
>+      $rm conftest*
>+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
>+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
>+      ;;
>+    esac
>+  fi
>+  ;;
>+esac
>+
>+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
>+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
>+library_names_spec=
>+libname_spec='lib$name'
>+soname_spec=
>+shrext_cmds=".so"
>+postinstall_cmds=
>+postuninstall_cmds=
>+finish_cmds=
>+finish_eval=
>+shlibpath_var=
>+shlibpath_overrides_runpath=unknown
>+version_type=none
>+dynamic_linker="$host_os ld.so"
>+sys_lib_dlsearch_path_spec="/lib /usr/lib"
>+if test "$GCC" = yes; then
>+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
>+    # if the path contains ";" then we assume it to be the separator
>+    # otherwise default to the standard path separator (i.e. ":") - it is
>+    # assumed that no part of a normal pathname contains ";" but that should
>+    # okay in the real world where ";" in dirpaths is itself problematic.
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+  else
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+  fi
>+else
>+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
>+fi
>+need_lib_prefix=unknown
>+hardcode_into_libs=no
>+
>+# when you set need_version to no, make sure it does not cause -set_version
>+# flags to be left without arguments
>+need_version=unknown
>+
>+case $host_os in
>+aix3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
>+  shlibpath_var=LIBPATH
>+
>+  # AIX 3 has no versioning support, so we append a major version to the name.
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  ;;
>+
>+aix4* | aix5*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  hardcode_into_libs=yes
>+  if test "$host_cpu" = ia64; then
>+    # AIX 5 supports IA64
>+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  else
>+    # With GCC up to 2.95.x, collect2 would create an import file
>+    # for dependence libraries.  The import file would start with
>+    # the line `#! .'.  This would cause the generated library to
>+    # depend on `.', always an invalid library.  This was fixed in
>+    # development snapshots of GCC prior to 3.0.
>+    case $host_os in
>+      aix4 | aix4.[01] | aix4.[01].*)
>+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>+	   echo ' yes '
>+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>+	:
>+      else
>+	can_build_shared=no
>+      fi
>+      ;;
>+    esac
>+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
>+    # soname into executable. Probably we can add versioning support to
>+    # collect2, so additional links can be useful in future.
>+    if test "$aix_use_runtimelinking" = yes; then
>+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>+      # instead of lib<name>.a to let people know that these are not
>+      # typical AIX shared libraries.
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    else
>+      # We preserve .a as extension for shared libraries through AIX4.2
>+      # and later when we are not doing run time linking.
>+      library_names_spec='${libname}${release}.a $libname.a'
>+      soname_spec='${libname}${release}${shared_ext}$major'
>+    fi
>+    shlibpath_var=LIBPATH
>+  fi
>+  ;;
>+
>+amigaos*)
>+  library_names_spec='$libname.ixlibrary $libname.a'
>+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
>+  ;;
>+
>+beos*)
>+  library_names_spec='${libname}${shared_ext}'
>+  dynamic_linker="$host_os ld.so"
>+  shlibpath_var=LIBRARY_PATH
>+  ;;
>+
>+bsdi[45]*)
>+  version_type=linux
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>+  # the default ld.so.conf also contains /usr/contrib/lib and
>+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>+  # libtool to hard-code these into programs
>+  ;;
>+
>+cygwin* | mingw* | pw32*)
>+  version_type=windows
>+  shrext_cmds=".dll"
>+  need_version=no
>+  need_lib_prefix=no
>+
>+  case $GCC,$host_os in
>+  yes,cygwin* | yes,mingw* | yes,pw32*)
>+    library_names_spec='$libname.dll.a'
>+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
>+    postinstall_cmds='base_file=`basename \${file}`~
>+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
>+      dldir=$destdir/`dirname \$dlpath`~
>+      test -d \$dldir || mkdir -p \$dldir~
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>+      dlpath=$dir/\$dldll~
>+       $rm \$dlpath'
>+    shlibpath_overrides_runpath=yes
>+
>+    case $host_os in
>+    cygwin*)
>+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
>+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
>+      ;;
>+    mingw*)
>+      # MinGW DLLs use traditional 'lib' prefix
>+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
>+        # It is most probably a Windows format PATH printed by
>+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
>+        # path with ; separators, and with drive letters. We can handle the
>+        # drive letters (cygwin fileutils understands them), so leave them,
>+        # especially as we might pass files found there to a mingw objdump,
>+        # which wouldn't understand a cygwinified path. Ahh.
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+      else
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+      fi
>+      ;;
>+    pw32*)
>+      # pw32 DLLs use 'pw' prefix rather than 'lib'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      ;;
>+    esac
>+    ;;
>+
>+  *)
>+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
>+    ;;
>+  esac
>+  dynamic_linker='Win32 ld.exe'
>+  # FIXME: first we should search . and the directory the executable is in
>+  shlibpath_var=PATH
>+  ;;
>+
>+darwin* | rhapsody*)
>+  dynamic_linker="$host_os dyld"
>+  version_type=darwin
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>+  soname_spec='${libname}${release}${major}$shared_ext'
>+  shlibpath_overrides_runpath=yes
>+  shlibpath_var=DYLD_LIBRARY_PATH
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>+  if test "$GCC" = yes; then
>+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>+  else
>+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
>+  ;;
>+
>+dgux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+freebsd1*)
>+  dynamic_linker=no
>+  ;;
>+
>+kfreebsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>+  version_type=freebsd-$objformat
>+  case $version_type in
>+    freebsd-elf*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+      need_version=no
>+      need_lib_prefix=no
>+      ;;
>+    freebsd-*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
>+      need_version=yes
>+      ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_os in
>+  freebsd2*)
>+    shlibpath_overrides_runpath=yes
>+    ;;
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>+    shlibpath_overrides_runpath=no
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  esac
>+  ;;
>+
>+gnu*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  ;;
>+
>+hpux9* | hpux10* | hpux11*)
>+  # Give a soname corresponding to the major version so that dld.sl refuses to
>+  # link against other versions.
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  case $host_cpu in
>+  ia64*)
>+    shrext_cmds='.so'
>+    hardcode_into_libs=yes
>+    dynamic_linker="$host_os dld.so"
>+    shlibpath_var=LD_LIBRARY_PATH
>+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    if test "X$HPUX_IA64_MODE" = X32; then
>+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
>+    else
>+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
>+    fi
>+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+    ;;
>+   hppa*64*)
>+     shrext_cmds='.sl'
>+     hardcode_into_libs=yes
>+     dynamic_linker="$host_os dld.sl"
>+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
>+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+     soname_spec='${libname}${release}${shared_ext}$major'
>+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
>+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+     ;;
>+   *)
>+    shrext_cmds='.sl'
>+    dynamic_linker="$host_os dld.sl"
>+    shlibpath_var=SHLIB_PATH
>+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    ;;
>+  esac
>+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>+  postinstall_cmds='chmod 555 $lib'
>+  ;;
>+
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
>+irix5* | irix6* | nonstopux*)
>+  case $host_os in
>+    nonstopux*) version_type=nonstopux ;;
>+    *)
>+	if test "$lt_cv_prog_gnu_ld" = yes; then
>+		version_type=linux
>+	else
>+		version_type=irix
>+	fi ;;
>+  esac
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  case $host_os in
>+  irix5* | nonstopux*)
>+    libsuff= shlibsuff=
>+    ;;
>+  *)
>+    case $LD in # libtool.m4 will add one of these switches to LD
>+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
>+      libsuff= shlibsuff= libmagic=32-bit;;
>+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
>+      libsuff=32 shlibsuff=N32 libmagic=N32;;
>+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
>+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
>+    *) libsuff= shlibsuff= libmagic=never-match;;
>+    esac
>+    ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>+  shlibpath_overrides_runpath=no
>+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>+  hardcode_into_libs=yes
>+  ;;
>+
>+# No shared lib support for Linux oldld, aout, or coff.
>+linux*oldld* | linux*aout* | linux*coff*)
>+  dynamic_linker=no
>+  ;;
>+
>+# This must be Linux ELF.
>+linux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  # This implies no fast_install, which is unacceptable.
>+  # Some rework will be needed to allow for fast_install
>+  # before this can be enabled.
>+  hardcode_into_libs=yes
>+
>+  # find out which ABI we are using
>+  libsuff=
>+  case "$host_cpu" in
>+  x86_64*|s390x*|powerpc64*)
>+    echo '#line 15560 "configure"' > conftest.$ac_ext
>+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+      case `/usr/bin/file conftest.$ac_objext` in
>+      *64-bit*)
>+        libsuff=64
>+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>+        ;;
>+      esac
>+    fi
>+    rm -rf conftest*
>+    ;;
>+  esac
>+
>+  # Append ld.so.conf contents to the search path
>+  if test -f /etc/ld.so.conf; then
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+  fi
>+
>+  # We used to test for /lib/ld.so.1 and disable shared libraries on
>+  # powerpc, because MkLinux only supported shared libraries with the
>+  # GNU dynamic linker.  Since this was broken with cross compilers,
>+  # most powerpc-linux boxes support dynamic linking these days and
>+  # people can always --disable-shared, the test was removed, and we
>+  # assume the GNU/Linux dynamic linker is in use.
>+  dynamic_linker='GNU/Linux ld.so'
>+  ;;
>+
>+knetbsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+netbsd*)
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+    dynamic_linker='NetBSD (a.out) ld.so'
>+  else
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    dynamic_linker='NetBSD ld.elf_so'
>+  fi
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  ;;
>+
>+newsos6)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+nto-qnx*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+openbsd*)
>+  version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>+  need_lib_prefix=no
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+    case $host_os in
>+      openbsd2.[89] | openbsd2.[89].*)
>+	shlibpath_overrides_runpath=no
>+	;;
>+      *)
>+	shlibpath_overrides_runpath=yes
>+	;;
>+      esac
>+  else
>+    shlibpath_overrides_runpath=yes
>+  fi
>+  ;;
>+
>+os2*)
>+  libname_spec='$name'
>+  shrext_cmds=".dll"
>+  need_lib_prefix=no
>+  library_names_spec='$libname${shared_ext} $libname.a'
>+  dynamic_linker='OS/2 ld.exe'
>+  shlibpath_var=LIBPATH
>+  ;;
>+
>+osf3* | osf4* | osf5*)
>+  version_type=osf
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>+  ;;
>+
>+solaris*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  # ldd complains unless libraries are executable
>+  postinstall_cmds='chmod +x $lib'
>+  ;;
>+
>+sunos4*)
>+  version_type=sunos
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  if test "$with_gnu_ld" = yes; then
>+    need_lib_prefix=no
>+  fi
>+  need_version=yes
>+  ;;
>+
>+sysv4 | sysv4.3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_vendor in
>+    sni)
>+      shlibpath_overrides_runpath=no
>+      need_lib_prefix=no
>+      export_dynamic_flag_spec='${wl}-Blargedynsym'
>+      runpath_var=LD_RUN_PATH
>+      ;;
>+    siemens)
>+      need_lib_prefix=no
>+      ;;
>+    motorola)
>+      need_lib_prefix=no
>+      need_version=no
>+      shlibpath_overrides_runpath=no
>+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>+      ;;
>+  esac
>+  ;;
>+
>+sysv4*MP*)
>+  if test -d /usr/nec ;then
>+    version_type=linux
>+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
>+    soname_spec='$libname${shared_ext}.$major'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  fi
>+  ;;
>+
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+	;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
>+uts4*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+*)
>+  dynamic_linker=no
>+  ;;
>+esac
>+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
>+echo "${ECHO_T}$dynamic_linker" >&6; }
>+test "$dynamic_linker" = no && can_build_shared=no
>+
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+
>+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
>+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
>+hardcode_action_F77=
>+if test -n "$hardcode_libdir_flag_spec_F77" || \
>+   test -n "$runpath_var_F77" || \
>+   test "X$hardcode_automatic_F77" = "Xyes" ; then
>+
>+  # We can hardcode non-existant directories.
>+  if test "$hardcode_direct_F77" != no &&
>+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>+     # have to relink, otherwise we might link with an installed library
>+     # when we should be linking with a yet-to-be-installed one
>+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
>+     test "$hardcode_minus_L_F77" != no; then
>+    # Linking always hardcodes the temporary library directory.
>+    hardcode_action_F77=relink
>+  else
>+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>+    hardcode_action_F77=immediate
>+  fi
>+else
>+  # We cannot hardcode anything, or else we can only hardcode existing
>+  # directories.
>+  hardcode_action_F77=unsupported
>+fi
>+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
>+echo "${ECHO_T}$hardcode_action_F77" >&6; }
>+
>+if test "$hardcode_action_F77" = relink; then
>+  # Fast installation is not supported
>+  enable_fast_install=no
>+elif test "$shlibpath_overrides_runpath" = yes ||
>+     test "$enable_shared" = no; then
>+  # Fast installation is not necessary
>+  enable_fast_install=needless
>+fi
>+
>+
>+# The else clause should only fire when bootstrapping the
>+# libtool distribution, otherwise you forgot to ship ltmain.sh
>+# with your package, and you will get complaints that there are
>+# no rules to generate ltmain.sh.
>+if test -f "$ltmain"; then
>+  # See if we are running on zsh, and set the options which allow our commands through
>+  # without removal of \ escapes.
>+  if test -n "${ZSH_VERSION+set}" ; then
>+    setopt NO_GLOB_SUBST
>+  fi
>+  # Now quote all the things that may contain metacharacters while being
>+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>+  # variables and quote the copies for generation of the libtool script.
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>+    SED SHELL STRIP \
>+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>+    deplibs_check_method reload_flag reload_cmds need_locks \
>+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>+    lt_cv_sys_global_symbol_to_c_name_address \
>+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>+    old_postinstall_cmds old_postuninstall_cmds \
>+    compiler_F77 \
>+    CC_F77 \
>+    LD_F77 \
>+    lt_prog_compiler_wl_F77 \
>+    lt_prog_compiler_pic_F77 \
>+    lt_prog_compiler_static_F77 \
>+    lt_prog_compiler_no_builtin_flag_F77 \
>+    export_dynamic_flag_spec_F77 \
>+    thread_safe_flag_spec_F77 \
>+    whole_archive_flag_spec_F77 \
>+    enable_shared_with_static_runtimes_F77 \
>+    old_archive_cmds_F77 \
>+    old_archive_from_new_cmds_F77 \
>+    predep_objects_F77 \
>+    postdep_objects_F77 \
>+    predeps_F77 \
>+    postdeps_F77 \
>+    compiler_lib_search_path_F77 \
>+    archive_cmds_F77 \
>+    archive_expsym_cmds_F77 \
>+    postinstall_cmds_F77 \
>+    postuninstall_cmds_F77 \
>+    old_archive_from_expsyms_cmds_F77 \
>+    allow_undefined_flag_F77 \
>+    no_undefined_flag_F77 \
>+    export_symbols_cmds_F77 \
>+    hardcode_libdir_flag_spec_F77 \
>+    hardcode_libdir_flag_spec_ld_F77 \
>+    hardcode_libdir_separator_F77 \
>+    hardcode_automatic_F77 \
>+    module_cmds_F77 \
>+    module_expsym_cmds_F77 \
>+    lt_cv_prog_compiler_c_o_F77 \
>+    exclude_expsyms_F77 \
>+    include_expsyms_F77; do
>+
>+    case $var in
>+    old_archive_cmds_F77 | \
>+    old_archive_from_new_cmds_F77 | \
>+    archive_cmds_F77 | \
>+    archive_expsym_cmds_F77 | \
>+    module_cmds_F77 | \
>+    module_expsym_cmds_F77 | \
>+    old_archive_from_expsyms_cmds_F77 | \
>+    export_symbols_cmds_F77 | \
>+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>+    postinstall_cmds | postuninstall_cmds | \
>+    old_postinstall_cmds | old_postuninstall_cmds | \
>+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>+      # Double-quote double-evaled strings.
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>+      ;;
>+    *)
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>+      ;;
>+    esac
>+  done
>+
>+  case $lt_echo in
>+  *'\$0 --fallback-echo"')
>+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
>+    ;;
>+  esac
>+
>+cfgfile="$ofile"
>+
>+  cat <<__EOF__ >> "$cfgfile"
>+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
>+
>+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>+
>+# Shell to use when invoking shell scripts.
>+SHELL=$lt_SHELL
>+
>+# Whether or not to build shared libraries.
>+build_libtool_libs=$enable_shared
>+
>+# Whether or not to build static libraries.
>+build_old_libs=$enable_static
>+
>+# Whether or not to add -lc for building shared libraries.
>+build_libtool_need_lc=$archive_cmds_need_lc_F77
>+
>+# Whether or not to disallow shared libs when runtime libs are static
>+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
>+
>+# Whether or not to optimize for fast installation.
>+fast_install=$enable_fast_install
>+
>+# The host system.
>+host_alias=$host_alias
>+host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
>+
>+# An echo program that does not interpret backslashes.
>+echo=$lt_echo
>+
>+# The archiver.
>+AR=$lt_AR
>+AR_FLAGS=$lt_AR_FLAGS
>+
>+# A C compiler.
>+LTCC=$lt_LTCC
>+
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
>+# A language-specific compiler.
>+CC=$lt_compiler_F77
>+
>+# Is the compiler the GNU C compiler?
>+with_gcc=$GCC_F77
>+
>+# An ERE matcher.
>+EGREP=$lt_EGREP
>+
>+# The linker used to build libraries.
>+LD=$lt_LD_F77
>+
>+# Whether we need hard or soft links.
>+LN_S=$lt_LN_S
>+
>+# A BSD-compatible nm program.
>+NM=$lt_NM
>+
>+# A symbol stripping program
>+STRIP=$lt_STRIP
>+
>+# Used to examine libraries when file_magic_cmd begins "file"
>+MAGIC_CMD=$MAGIC_CMD
>+
>+# Used on cygwin: DLL creation program.
>+DLLTOOL="$DLLTOOL"
>+
>+# Used on cygwin: object dumper.
>+OBJDUMP="$OBJDUMP"
>+
>+# Used on cygwin: assembler.
>+AS="$AS"
>+
>+# The name of the directory that contains temporary libtool files.
>+objdir=$objdir
>+
>+# How to create reloadable object files.
>+reload_flag=$lt_reload_flag
>+reload_cmds=$lt_reload_cmds
>+
>+# How to pass a linker flag through the compiler.
>+wl=$lt_lt_prog_compiler_wl_F77
>+
>+# Object file suffix (normally "o").
>+objext="$ac_objext"
>+
>+# Old archive suffix (normally "a").
>+libext="$libext"
>+
>+# Shared library suffix (normally ".so").
>+shrext_cmds='$shrext_cmds'
>+
>+# Executable file suffix (normally "").
>+exeext="$exeext"
>+
>+# Additional compiler flags for building library objects.
>+pic_flag=$lt_lt_prog_compiler_pic_F77
>+pic_mode=$pic_mode
>+
>+# What is the maximum length of a command?
>+max_cmd_len=$lt_cv_sys_max_cmd_len
>+
>+# Does compiler simultaneously support -c and -o options?
>+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
>+
>+# Must we lock files when doing compilation?
>+need_locks=$lt_need_locks
>+
>+# Do we need the lib prefix for modules?
>+need_lib_prefix=$need_lib_prefix
>+
>+# Do we need a version for libraries?
>+need_version=$need_version
>+
>+# Whether dlopen is supported.
>+dlopen_support=$enable_dlopen
>+
>+# Whether dlopen of programs is supported.
>+dlopen_self=$enable_dlopen_self
>+
>+# Whether dlopen of statically linked programs is supported.
>+dlopen_self_static=$enable_dlopen_self_static
>+
>+# Compiler flag to prevent dynamic linking.
>+link_static_flag=$lt_lt_prog_compiler_static_F77
>+
>+# Compiler flag to turn off builtin functions.
>+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
>+
>+# Compiler flag to allow reflexive dlopens.
>+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
>+
>+# Compiler flag to generate shared objects directly from archives.
>+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
>+
>+# Compiler flag to generate thread-safe objects.
>+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
>+
>+# Library versioning type.
>+version_type=$version_type
>+
>+# Format of library name prefix.
>+libname_spec=$lt_libname_spec
>+
>+# List of archive names.  First name is the real one, the rest are links.
>+# The last name is the one that the linker finds with -lNAME.
>+library_names_spec=$lt_library_names_spec
>+
>+# The coded name of the library, if different from the real name.
>+soname_spec=$lt_soname_spec
>+
>+# Commands used to build and install an old-style archive.
>+RANLIB=$lt_RANLIB
>+old_archive_cmds=$lt_old_archive_cmds_F77
>+old_postinstall_cmds=$lt_old_postinstall_cmds
>+old_postuninstall_cmds=$lt_old_postuninstall_cmds
>+
>+# Create an old-style archive from a shared archive.
>+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
>+
>+# Create a temporary old-style archive to link instead of a shared archive.
>+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
>+
>+# Commands used to build and install a shared archive.
>+archive_cmds=$lt_archive_cmds_F77
>+archive_expsym_cmds=$lt_archive_expsym_cmds_F77
>+postinstall_cmds=$lt_postinstall_cmds
>+postuninstall_cmds=$lt_postuninstall_cmds
>+
>+# Commands used to build a loadable module (assumed same as above if empty)
>+module_cmds=$lt_module_cmds_F77
>+module_expsym_cmds=$lt_module_expsym_cmds_F77
>+
>+# Commands to strip libraries.
>+old_striplib=$lt_old_striplib
>+striplib=$lt_striplib
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predep_objects=$lt_predep_objects_F77
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdep_objects=$lt_postdep_objects_F77
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predeps=$lt_predeps_F77
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdeps=$lt_postdeps_F77
>+
>+# The library search path used internally by the compiler when linking
>+# a shared library.
>+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
>+
>+# Method to check whether dependent libraries are shared objects.
>+deplibs_check_method=$lt_deplibs_check_method
>+
>+# Command to use when deplibs_check_method == file_magic.
>+file_magic_cmd=$lt_file_magic_cmd
>+
>+# Flag that allows shared libraries with undefined symbols to be built.
>+allow_undefined_flag=$lt_allow_undefined_flag_F77
>+
>+# Flag that forces no undefined symbols.
>+no_undefined_flag=$lt_no_undefined_flag_F77
>+
>+# Commands used to finish a libtool library installation in a directory.
>+finish_cmds=$lt_finish_cmds
>+
>+# Same as above, but a single script fragment to be evaled but not shown.
>+finish_eval=$lt_finish_eval
>+
>+# Take the output of nm and produce a listing of raw symbols and C names.
>+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
>+
>+# Transform the output of nm in a proper C declaration
>+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
>+
>+# Transform the output of nm in a C name address pair
>+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
>+
>+# This is the shared library runtime path variable.
>+runpath_var=$runpath_var
>+
>+# This is the shared library path variable.
>+shlibpath_var=$shlibpath_var
>+
>+# Is shlibpath searched before the hard-coded library search path?
>+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
>+
>+# How to hardcode a shared library path into an executable.
>+hardcode_action=$hardcode_action_F77
>+
>+# Whether we should hardcode library paths into libraries.
>+hardcode_into_libs=$hardcode_into_libs
>+
>+# Flag to hardcode \$libdir into a binary during linking.
>+# This must work even if \$libdir does not exist.
>+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
>+
>+# If ld is used when linking, flag to hardcode \$libdir into
>+# a binary during linking. This must work even if \$libdir does
>+# not exist.
>+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
>+
>+# Whether we need a single -rpath flag with a separated argument.
>+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
>+
>+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_direct=$hardcode_direct_F77
>+
>+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_minus_L=$hardcode_minus_L_F77
>+
>+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
>+# the resulting binary.
>+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
>+
>+# Set to yes if building a shared library automatically hardcodes DIR into the library
>+# and all subsequent libraries and executables linked against it.
>+hardcode_automatic=$hardcode_automatic_F77
>+
>+# Variables whose values should be saved in libtool wrapper scripts and
>+# restored at relink time.
>+variables_saved_for_relink="$variables_saved_for_relink"
>+
>+# Whether libtool must link a program against all its dependency libraries.
>+link_all_deplibs=$link_all_deplibs_F77
>+
>+# Compile-time system search path for libraries
>+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>+
>+# Run-time system search path for libraries
>+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
>+
>+# Fix the shell variable \$srcfile for the compiler.
>+fix_srcfile_path="$fix_srcfile_path_F77"
>+
>+# Set to yes if exported symbols are required.
>+always_export_symbols=$always_export_symbols_F77
>+
>+# The commands to list exported symbols.
>+export_symbols_cmds=$lt_export_symbols_cmds_F77
>+
>+# The commands to extract the exported symbol list from a shared archive.
>+extract_expsyms_cmds=$lt_extract_expsyms_cmds
>+
>+# Symbols that should not be listed in the preloaded symbols.
>+exclude_expsyms=$lt_exclude_expsyms_F77
>+
>+# Symbols that must always be exported.
>+include_expsyms=$lt_include_expsyms_F77
>+
>+# ### END LIBTOOL TAG CONFIG: $tagname
>+
>+__EOF__
>+
>+
>+else
>+  # If there is no Makefile yet, we rely on a make rule to execute
>+  # `config.status --recheck' to rerun these tests and create the
>+  # libtool script then.
>+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>+  if test -f "$ltmain_in"; then
>+    test -f Makefile && make "$ltmain"
>+  fi
>+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
>+
>+CC="$lt_save_CC"
>+
>+	else
>+	  tagname=""
>+	fi
>+	;;
>+
>+      GCJ)
>+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
>+
>+
>+# Source file extension for Java test sources.
>+ac_ext=java
>+
>+# Object file extension for compiled Java test sources.
>+objext=o
>+objext_GCJ=$objext
>+
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="class foo {}\n"
>+
>+# Code to be used in simple link tests
>+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
>+
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>+
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
>+
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
>+
>+
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+
>+# Allow CC to be a program name with arguments.
>+lt_save_CC="$CC"
>+CC=${GCJ-"gcj"}
>+compiler=$CC
>+compiler_GCJ=$CC
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
>+
>+# GCJ did not exist at the time GCC didn't implicitly link libc in.
>+archive_cmds_need_lc_GCJ=no
>+
>+old_archive_cmds_GCJ=$old_archive_cmds
>+
>+
>+lt_prog_compiler_no_builtin_flag_GCJ=
>+
>+if test "$GCC" = yes; then
>+  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
>+
>+
>+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
>+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
>+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_cv_prog_compiler_rtti_exceptions=no
>+  ac_outfile=conftest.$ac_objext
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="-fno-rtti -fno-exceptions"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:16334: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&5
>+   echo "$as_me:16338: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       lt_cv_prog_compiler_rtti_exceptions=yes
>+     fi
>+   fi
>+   $rm conftest*
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
>+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
>+
>+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
>+    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
>+else
>+    :
>+fi
>+
>+fi
>+
>+lt_prog_compiler_wl_GCJ=
>+lt_prog_compiler_pic_GCJ=
>+lt_prog_compiler_static_GCJ=
>+
>+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
>+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
>+
>+  if test "$GCC" = yes; then
>+    lt_prog_compiler_wl_GCJ='-Wl,'
>+    lt_prog_compiler_static_GCJ='-static'
>+
>+    case $host_os in
>+      aix*)
>+      # All AIX code is PIC.
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	lt_prog_compiler_static_GCJ='-Bstatic'
>+      fi
>+      ;;
>+
>+    amigaos*)
>+      # FIXME: we need at least 68020 code to build shared libraries, but
>+      # adding the `-m68020' flag to GCC prevents building anything better,
>+      # like `-m68040'.
>+      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
>+      ;;
>+
>+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>+      # PIC is the default for these OSes.
>+      ;;
>+
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
>+      ;;
>+
>+    darwin* | rhapsody*)
>+      # PIC is the default on this platform
>+      # Common symbols not allowed in MH_DYLIB files
>+      lt_prog_compiler_pic_GCJ='-fno-common'
>+      ;;
>+
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>+
>+    msdosdjgpp*)
>+      # Just because we use GCC doesn't mean we suddenly get shared libraries
>+      # on systems that don't support them.
>+      lt_prog_compiler_can_build_shared_GCJ=no
>+      enable_shared=no
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	lt_prog_compiler_pic_GCJ=-Kconform_pic
>+      fi
>+      ;;
>+
>+    hpux*)
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	lt_prog_compiler_pic_GCJ='-fPIC'
>+	;;
>+      esac
>+      ;;
>+
>+    *)
>+      lt_prog_compiler_pic_GCJ='-fPIC'
>+      ;;
>+    esac
>+  else
>+    # PORTME Check for flag to pass linker flags through the system compiler.
>+    case $host_os in
>+    aix*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      if test "$host_cpu" = ia64; then
>+	# AIX 5 now supports IA64 processor
>+	lt_prog_compiler_static_GCJ='-Bstatic'
>+      else
>+	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
>+      fi
>+      ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         lt_prog_compiler_pic_GCJ='-qnocommon'
>+         lt_prog_compiler_wl_GCJ='-Wl,'
>+         ;;
>+       esac
>+       ;;
>+
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
>+      ;;
>+
>+    hpux9* | hpux10* | hpux11*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+	# +Z the default
>+	;;
>+      *)
>+	lt_prog_compiler_pic_GCJ='+Z'
>+	;;
>+      esac
>+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
>+      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
>+      ;;
>+
>+    irix5* | irix6* | nonstopux*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      # PIC (with -KPIC) is the default.
>+      lt_prog_compiler_static_GCJ='-non_shared'
>+      ;;
>+
>+    newsos6)
>+      lt_prog_compiler_pic_GCJ='-KPIC'
>+      lt_prog_compiler_static_GCJ='-Bstatic'
>+      ;;
>+
>+    linux*)
>+      case $cc_basename in
>+      icc* | ecc*)
>+	lt_prog_compiler_wl_GCJ='-Wl,'
>+	lt_prog_compiler_pic_GCJ='-KPIC'
>+	lt_prog_compiler_static_GCJ='-static'
>+        ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+	# which looks to be a dead project)
>+	lt_prog_compiler_wl_GCJ='-Wl,'
>+	lt_prog_compiler_pic_GCJ='-fpic'
>+	lt_prog_compiler_static_GCJ='-Bstatic'
>+        ;;
>+      ccc*)
>+        lt_prog_compiler_wl_GCJ='-Wl,'
>+        # All Alpha code is PIC.
>+        lt_prog_compiler_static_GCJ='-non_shared'
>+        ;;
>+      esac
>+      ;;
>+
>+    osf3* | osf4* | osf5*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      # All OSF/1 code is PIC.
>+      lt_prog_compiler_static_GCJ='-non_shared'
>+      ;;
>+
>+    solaris*)
>+      lt_prog_compiler_pic_GCJ='-KPIC'
>+      lt_prog_compiler_static_GCJ='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
>+      *)
>+	lt_prog_compiler_wl_GCJ='-Wl,';;
>+      esac
>+      ;;
>+
>+    sunos4*)
>+      lt_prog_compiler_wl_GCJ='-Qoption ld '
>+      lt_prog_compiler_pic_GCJ='-PIC'
>+      lt_prog_compiler_static_GCJ='-Bstatic'
>+      ;;
>+
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      lt_prog_compiler_pic_GCJ='-KPIC'
>+      lt_prog_compiler_static_GCJ='-Bstatic'
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec ;then
>+	lt_prog_compiler_pic_GCJ='-Kconform_pic'
>+	lt_prog_compiler_static_GCJ='-Bstatic'
>+      fi
>+      ;;
>+
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      lt_prog_compiler_pic_GCJ='-KPIC'
>+      lt_prog_compiler_static_GCJ='-Bstatic'
>+      ;;
>+
>+    unicos*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      lt_prog_compiler_can_build_shared_GCJ=no
>+      ;;
>+
>+    uts4*)
>+      lt_prog_compiler_pic_GCJ='-pic'
>+      lt_prog_compiler_static_GCJ='-Bstatic'
>+      ;;
>+
>+    *)
>+      lt_prog_compiler_can_build_shared_GCJ=no
>+      ;;
>+    esac
>+  fi
>+
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
>+
>+#
>+# Check to make sure the PIC flag actually works.
>+#
>+if test -n "$lt_prog_compiler_pic_GCJ"; then
>+
>+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
>+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_pic_works_GCJ=no
>+  ac_outfile=conftest.$ac_objext
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:16602: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&5
>+   echo "$as_me:16606: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       lt_prog_compiler_pic_works_GCJ=yes
>+     fi
>+   fi
>+   $rm conftest*
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
>+
>+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
>+    case $lt_prog_compiler_pic_GCJ in
>+     "" | " "*) ;;
>+     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
>+     esac
>+else
>+    lt_prog_compiler_pic_GCJ=
>+     lt_prog_compiler_can_build_shared_GCJ=no
>+fi
>+
>+fi
>+case $host_os in
>+  # For platforms which do not support PIC, -DPIC is meaningless:
>+  *djgpp*)
>+    lt_prog_compiler_pic_GCJ=
>+    ;;
>+  *)
>+    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
>+    ;;
>+esac
>+
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
>+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
>+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_static_works_GCJ=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works_GCJ=yes
>+       fi
>+     else
>+       lt_prog_compiler_static_works_GCJ=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
>+
>+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
>+    :
>+else
>+    lt_prog_compiler_static_GCJ=
>+fi
>+
>+
>+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
>+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
>+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_cv_prog_compiler_c_o_GCJ=no
>+   $rm -r conftest 2>/dev/null
>+   mkdir conftest
>+   cd conftest
>+   mkdir out
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+   lt_compiler_flag="-o out/conftest2.$ac_objext"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:16706: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>out/conftest.err)
>+   ac_status=$?
>+   cat out/conftest.err >&5
>+   echo "$as_me:16710: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
>+   then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>+       lt_cv_prog_compiler_c_o_GCJ=yes
>+     fi
>+   fi
>+   chmod u+w . 2>&5
>+   $rm conftest*
>+   # SGI C++ compiler will create directory out/ii_files/ for
>+   # template instantiation
>+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>+   $rm out/* && rmdir out
>+   cd ..
>+   rmdir conftest
>+   $rm conftest*
>+
>+fi
>+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
>+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
>+
>+
>+hard_links="nottested"
>+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
>+  # do not overwrite the value of need_locks provided by the user
>+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
>+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
>+  hard_links=yes
>+  $rm conftest*
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  touch conftest.a
>+  ln conftest.a conftest.b 2>&5 || hard_links=no
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  { echo "$as_me:$LINENO: result: $hard_links" >&5
>+echo "${ECHO_T}$hard_links" >&6; }
>+  if test "$hard_links" = no; then
>+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
>+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
>+    need_locks=warn
>+  fi
>+else
>+  need_locks=no
>+fi
>+
>+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
>+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
>+
>+  runpath_var=
>+  allow_undefined_flag_GCJ=
>+  enable_shared_with_static_runtimes_GCJ=no
>+  archive_cmds_GCJ=
>+  archive_expsym_cmds_GCJ=
>+  old_archive_From_new_cmds_GCJ=
>+  old_archive_from_expsyms_cmds_GCJ=
>+  export_dynamic_flag_spec_GCJ=
>+  whole_archive_flag_spec_GCJ=
>+  thread_safe_flag_spec_GCJ=
>+  hardcode_libdir_flag_spec_GCJ=
>+  hardcode_libdir_flag_spec_ld_GCJ=
>+  hardcode_libdir_separator_GCJ=
>+  hardcode_direct_GCJ=no
>+  hardcode_minus_L_GCJ=no
>+  hardcode_shlibpath_var_GCJ=unsupported
>+  link_all_deplibs_GCJ=unknown
>+  hardcode_automatic_GCJ=no
>+  module_cmds_GCJ=
>+  module_expsym_cmds_GCJ=
>+  always_export_symbols_GCJ=no
>+  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  # include_expsyms should be a list of space-separated symbols to be *always*
>+  # included in the symbol list
>+  include_expsyms_GCJ=
>+  # exclude_expsyms can be an extended regexp of symbols to exclude
>+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
>+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>+  # as well as any symbol that contains `d'.
>+  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
>+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>+  # platforms (ab)use it in PIC code, but their linkers get confused if
>+  # the symbol is explicitly referenced.  Since portable code cannot
>+  # rely on this symbol name, it's probably fine to never include it in
>+  # preloaded symbol tables.
>+  extract_expsyms_cmds=
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
>+  case $host_os in
>+  cygwin* | mingw* | pw32*)
>+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
>+    # When not using gcc, we currently assume that we are using
>+    # Microsoft Visual C++.
>+    if test "$GCC" != yes; then
>+      with_gnu_ld=no
>+    fi
>+    ;;
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>+  openbsd*)
>+    with_gnu_ld=no
>+    ;;
>+  esac
>+
>+  ld_shlibs_GCJ=yes
>+  if test "$with_gnu_ld" = yes; then
>+    # If archive_cmds runs LD, not CC, wlarc should be empty
>+    wlarc='${wl}'
>+
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
>+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+  	whole_archive_flag_spec_GCJ=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
>+
>+    # See if GNU ld supports shared libraries.
>+    case $host_os in
>+    aix3* | aix4* | aix5*)
>+      # On AIX/PPC, the GNU linker is very broken
>+      if test "$host_cpu" != ia64; then
>+	ld_shlibs_GCJ=no
>+	cat <<EOF 1>&2
>+
>+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>+*** to be unable to reliably create shared libraries on AIX.
>+*** Therefore, libtool is disabling shared libraries support.  If you
>+*** really care for shared libraries, you may want to modify your PATH
>+*** so that a non-GNU linker is found, and then restart.
>+
>+EOF
>+      fi
>+      ;;
>+
>+    amigaos*)
>+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+      hardcode_minus_L_GCJ=yes
>+
>+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>+      # that the semantics of dynamic libraries on AmigaOS, at least up
>+      # to version 4, is to share data among multiple programs linked
>+      # with the same dynamic library.  Since this doesn't match the
>+      # behavior of shared libraries on other platforms, we can't use
>+      # them.
>+      ld_shlibs_GCJ=no
>+      ;;
>+
>+    beos*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	allow_undefined_flag_GCJ=unsupported
>+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+	# support --undefined.  This deserves some investigation.  FIXME
>+	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+      else
>+	ld_shlibs_GCJ=no
>+      fi
>+      ;;
>+
>+    cygwin* | mingw* | pw32*)
>+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
>+      # as there is no search path for DLLs.
>+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+      allow_undefined_flag_GCJ=unsupported
>+      always_export_symbols_GCJ=no
>+      enable_shared_with_static_runtimes_GCJ=yes
>+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>+
>+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+	# If the export-symbols file already is a .def file (1st line
>+	# is EXPORTS), use it as is; otherwise, prepend...
>+	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>+	  cp $export_symbols $output_objdir/$soname.def;
>+	else
>+	  echo EXPORTS > $output_objdir/$soname.def;
>+	  cat $export_symbols >> $output_objdir/$soname.def;
>+	fi~
>+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+      else
>+	ld_shlibs_GCJ=no
>+      fi
>+      ;;
>+
>+    interix3*)
>+      hardcode_direct_GCJ=no
>+      hardcode_shlibpath_var_GCJ=no
>+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
>+      export_dynamic_flag_spec_GCJ='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      ;;
>+
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	tmp_addflag=
>+	case $cc_basename,$host_cpu in
>+	pgcc*)				# Portland Group C compiler
>+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag'
>+	  ;;
>+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
>+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+	  tmp_addflag=' $pic_flag -Mnomain' ;;
>+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
>+	  tmp_addflag=' -i_dynamic' ;;
>+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
>+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
>+	ifc* | ifort*)			# Intel Fortran compiler
>+	  tmp_addflag=' -nofor_main' ;;
>+	esac
>+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+
>+	if test $supports_anon_versioning = yes; then
>+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+	fi
>+      else
>+	ld_shlibs_GCJ=no
>+      fi
>+      ;;
>+
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>+	wlarc=
>+      else
>+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      fi
>+      ;;
>+
>+    solaris*)
>+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>+	ld_shlibs_GCJ=no
>+	cat <<EOF 1>&2
>+
>+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>+*** create shared libraries on Solaris systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.9.1 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+EOF
>+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	ld_shlibs_GCJ=no
>+      fi
>+      ;;
>+
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
>+	ld_shlibs_GCJ=no
>+	cat <<_LT_EOF 1>&2
>+
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+_LT_EOF
>+	;;
>+	*)
>+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>+	  else
>+	    ld_shlibs_GCJ=no
>+	  fi
>+	;;
>+      esac
>+      ;;
>+
>+    sunos4*)
>+      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      wlarc=
>+      hardcode_direct_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    *)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+	ld_shlibs_GCJ=no
>+      fi
>+      ;;
>+    esac
>+
>+    if test "$ld_shlibs_GCJ" = no; then
>+      runpath_var=
>+      hardcode_libdir_flag_spec_GCJ=
>+      export_dynamic_flag_spec_GCJ=
>+      whole_archive_flag_spec_GCJ=
>+    fi
>+  else
>+    # PORTME fill in a description of your system's linker (not GNU ld)
>+    case $host_os in
>+    aix3*)
>+      allow_undefined_flag_GCJ=unsupported
>+      always_export_symbols_GCJ=yes
>+      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>+      # Note: this linker hardcodes the directories in LIBPATH if there
>+      # are no directories specified by -L.
>+      hardcode_minus_L_GCJ=yes
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>+	# Neither direct hardcoding nor static linking is supported with a
>+	# broken collect2.
>+	hardcode_direct_GCJ=unsupported
>+      fi
>+      ;;
>+
>+    aix4* | aix5*)
>+      if test "$host_cpu" = ia64; then
>+	# On IA64, the linker does run time linking by default, so we don't
>+	# have to do anything special.
>+	aix_use_runtimelinking=no
>+	exp_sym_flag='-Bexport'
>+	no_entry_flag=""
>+      else
>+	# If we're using GNU nm, then we don't want the "-C" option.
>+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
>+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>+	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+	else
>+	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+	fi
>+	aix_use_runtimelinking=no
>+
>+	# Test if we are trying to use run time linking or normal
>+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
>+	# need to do runtime linking.
>+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
>+	  for ld_flag in $LDFLAGS; do
>+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>+  	    aix_use_runtimelinking=yes
>+  	    break
>+  	  fi
>+	  done
>+	  ;;
>+	esac
>+
>+	exp_sym_flag='-bexport'
>+	no_entry_flag='-bnoentry'
>+      fi
>+
>+      # When large executables or shared objects are built, AIX ld can
>+      # have problems creating the table of contents.  If linking a library
>+      # or program results in "error TOC overflow" add -mminimal-toc to
>+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>+
>+      archive_cmds_GCJ=''
>+      hardcode_direct_GCJ=yes
>+      hardcode_libdir_separator_GCJ=':'
>+      link_all_deplibs_GCJ=yes
>+
>+      if test "$GCC" = yes; then
>+	case $host_os in aix4.[012]|aix4.[012].*)
>+	# We only want to do this on AIX 4.2 and lower, the check
>+	# below for broken collect2 doesn't work under 4.3+
>+	  collect2name=`${CC} -print-prog-name=collect2`
>+	  if test -f "$collect2name" && \
>+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
>+	  then
>+  	  # We have reworked collect2
>+  	  hardcode_direct_GCJ=yes
>+	  else
>+  	  # We have old collect2
>+  	  hardcode_direct_GCJ=unsupported
>+  	  # It fails to find uninstalled libraries when the uninstalled
>+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
>+  	  # to unsupported forces relinking
>+  	  hardcode_minus_L_GCJ=yes
>+  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+  	  hardcode_libdir_separator_GCJ=
>+	  fi
>+	  ;;
>+	esac
>+	shared_flag='-shared'
>+	if test "$aix_use_runtimelinking" = yes; then
>+	  shared_flag="$shared_flag "'${wl}-G'
>+	fi
>+      else
>+	# not using gcc
>+	if test "$host_cpu" = ia64; then
>+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>+  	# chokes on -Wl,-G. The following line is correct:
>+	  shared_flag='-G'
>+	else
>+	  if test "$aix_use_runtimelinking" = yes; then
>+	    shared_flag='${wl}-G'
>+	  else
>+	    shared_flag='${wl}-bM:SRE'
>+	  fi
>+	fi
>+      fi
>+
>+      # It seems that -bexpall does not export symbols beginning with
>+      # underscore (_), so it is better to generate a list of symbols to export.
>+      always_export_symbols_GCJ=yes
>+      if test "$aix_use_runtimelinking" = yes; then
>+	# Warning - without using the other runtime loading flags (-brtl),
>+	# -berok will link without error, but may produce a broken library.
>+	allow_undefined_flag_GCJ='-berok'
>+       # Determine the default libpath from the value encoded in an empty executable.
>+       cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+
>+int
>+main ()
>+{
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+       else
>+	if test "$host_cpu" = ia64; then
>+	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
>+	  allow_undefined_flag_GCJ="-z nodefs"
>+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>+	else
>+	 # Determine the default libpath from the value encoded in an empty executable.
>+	 cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+
>+int
>+main ()
>+{
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext conftest$ac_exeext
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+
>+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`
>+# Check for a 64-bit object if we didn't find anything.
>+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
>+}'`; fi
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>+
>+	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
>+	  # Warning - without using the other run time loading flags,
>+	  # -berok will link without error, but may produce a broken library.
>+	  no_undefined_flag_GCJ=' ${wl}-bernotok'
>+	  allow_undefined_flag_GCJ=' ${wl}-berok'
>+	  # Exported symbols can be pulled into shared objects from archives
>+	  whole_archive_flag_spec_GCJ='$convenience'
>+	  archive_cmds_need_lc_GCJ=yes
>+	  # This is similar to how AIX traditionally builds its shared libraries.
>+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+	fi
>+      fi
>+      ;;
>+
>+    amigaos*)
>+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+      hardcode_minus_L_GCJ=yes
>+      # see comment about different semantics on the GNU ld section
>+      ld_shlibs_GCJ=no
>+      ;;
>+
>+    bsdi[45]*)
>+      export_dynamic_flag_spec_GCJ=-rdynamic
>+      ;;
>+
>+    cygwin* | mingw* | pw32*)
>+      # When not using gcc, we currently assume that we are using
>+      # Microsoft Visual C++.
>+      # hardcode_libdir_flag_spec is actually meaningless, as there is
>+      # no search path for DLLs.
>+      hardcode_libdir_flag_spec_GCJ=' '
>+      allow_undefined_flag_GCJ=unsupported
>+      # Tell ltmain to make .lib files, not .a files.
>+      libext=lib
>+      # Tell ltmain to make .dll files, not .so files.
>+      shrext_cmds=".dll"
>+      # FIXME: Setting linknames here is a bad hack.
>+      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
>+      # The linker will automatically build a .lib file if we build a DLL.
>+      old_archive_From_new_cmds_GCJ='true'
>+      # FIXME: Should let the user specify the lib program.
>+      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
>+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
>+      enable_shared_with_static_runtimes_GCJ=yes
>+      ;;
>+
>+    darwin* | rhapsody*)
>+      case $host_os in
>+        rhapsody* | darwin1.[012])
>+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
>+         ;;
>+       *) # Darwin 1.3 on
>+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+         else
>+           case ${MACOSX_DEPLOYMENT_TARGET} in
>+             10.[012])
>+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>+               ;;
>+             10.*)
>+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
>+               ;;
>+           esac
>+         fi
>+         ;;
>+      esac
>+      archive_cmds_need_lc_GCJ=no
>+      hardcode_direct_GCJ=no
>+      hardcode_automatic_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=unsupported
>+      whole_archive_flag_spec_GCJ=''
>+      link_all_deplibs_GCJ=yes
>+    if test "$GCC" = yes ; then
>+    	output_verbose_link_cmd='echo'
>+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+    else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>+         ld_shlibs_GCJ=no
>+          ;;
>+      esac
>+    fi
>+      ;;
>+
>+    dgux*)
>+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    freebsd1*)
>+      ld_shlibs_GCJ=no
>+      ;;
>+
>+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
>+    # support.  Future versions do this automatically, but an explicit c++rt0.o
>+    # does not break anything, and helps significantly (at the cost of a little
>+    # extra space).
>+    freebsd2.2*)
>+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
>+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
>+      hardcode_direct_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
>+    freebsd2*)
>+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_direct_GCJ=yes
>+      hardcode_minus_L_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
>+      hardcode_direct_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    hpux9*)
>+      if test "$GCC" = yes; then
>+	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      else
>+	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>+      fi
>+      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
>+      hardcode_libdir_separator_GCJ=:
>+      hardcode_direct_GCJ=yes
>+
>+      # hardcode_minus_L: Not really in the search PATH,
>+      # but as the default location of the library.
>+      hardcode_minus_L_GCJ=yes
>+      export_dynamic_flag_spec_GCJ='${wl}-E'
>+      ;;
>+
>+    hpux10*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
>+	hardcode_libdir_separator_GCJ=:
>+
>+	hardcode_direct_GCJ=yes
>+	export_dynamic_flag_spec_GCJ='${wl}-E'
>+
>+	# hardcode_minus_L: Not really in the search PATH,
>+	# but as the default location of the library.
>+	hardcode_minus_L_GCJ=yes
>+      fi
>+      ;;
>+
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+	case $host_cpu in
>+	hppa*64*)
>+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      else
>+	case $host_cpu in
>+	hppa*64*)
>+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	ia64*)
>+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	*)
>+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+	  ;;
>+	esac
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
>+	hardcode_libdir_separator_GCJ=:
>+
>+	case $host_cpu in
>+	hppa*64*|ia64*)
>+	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
>+	  hardcode_direct_GCJ=no
>+	  hardcode_shlibpath_var_GCJ=no
>+	  ;;
>+	*)
>+	  hardcode_direct_GCJ=yes
>+	  export_dynamic_flag_spec_GCJ='${wl}-E'
>+
>+	  # hardcode_minus_L: Not really in the search PATH,
>+	  # but as the default location of the library.
>+	  hardcode_minus_L_GCJ=yes
>+	  ;;
>+	esac
>+      fi
>+      ;;
>+
>+    irix5* | irix6* | nonstopux*)
>+      if test "$GCC" = yes; then
>+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
>+      fi
>+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator_GCJ=:
>+      link_all_deplibs_GCJ=yes
>+      ;;
>+
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
>+      else
>+	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
>+      fi
>+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
>+      hardcode_direct_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    newsos6)
>+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_direct_GCJ=yes
>+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator_GCJ=:
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    openbsd*)
>+      hardcode_direct_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=no
>+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
>+	export_dynamic_flag_spec_GCJ='${wl}-E'
>+      else
>+       case $host_os in
>+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
>+	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
>+	   ;;
>+	 *)
>+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
>+	   ;;
>+       esac
>+      fi
>+      ;;
>+
>+    os2*)
>+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+      hardcode_minus_L_GCJ=yes
>+      allow_undefined_flag_GCJ=unsupported
>+      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
>+      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
>+      ;;
>+
>+    osf3*)
>+      if test "$GCC" = yes; then
>+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
>+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+      else
>+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
>+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+      fi
>+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
>+      hardcode_libdir_separator_GCJ=:
>+      ;;
>+
>+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
>+      if test "$GCC" = yes; then
>+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
>+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
>+      else
>+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
>+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>+	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
>+
>+	# Both c and cxx compiler support -rpath directly
>+	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
>+      fi
>+      hardcode_libdir_separator_GCJ=:
>+      ;;
>+
>+    solaris*)
>+      no_undefined_flag_GCJ=' -z text'
>+      if test "$GCC" = yes; then
>+	wlarc='${wl}'
>+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>+      else
>+	wlarc=''
>+	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>+      fi
>+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
>+      hardcode_shlibpath_var_GCJ=no
>+      case $host_os in
>+      solaris2.[0-5] | solaris2.[0-5].*) ;;
>+      *)
>+ 	# The compiler driver will combine linker options so we
>+ 	# cannot just pass the convience library names through
>+ 	# without $wl, iff we do not link with $LD.
>+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
>+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
>+ 	case $wlarc in
>+ 	'')
>+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
>+ 	*)
>+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+ 	esac ;;
>+      esac
>+      link_all_deplibs_GCJ=yes
>+      ;;
>+
>+    sunos4*)
>+      if test "x$host_vendor" = xsequent; then
>+	# Use $CC to link under sequent, because it throws in some extra .o
>+	# files that make .init and .fini sections work.
>+	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+      hardcode_direct_GCJ=yes
>+      hardcode_minus_L_GCJ=yes
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    sysv4)
>+      case $host_vendor in
>+	sni)
>+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  hardcode_direct_GCJ=yes # is this really true???
>+	;;
>+	siemens)
>+	  ## LD is ld it makes a PLAMLIB
>+	  ## CC just makes a GrossModule.
>+	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>+	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
>+	  hardcode_direct_GCJ=no
>+        ;;
>+	motorola)
>+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
>+	;;
>+      esac
>+      runpath_var='LD_RUN_PATH'
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    sysv4.3*)
>+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_shlibpath_var_GCJ=no
>+      export_dynamic_flag_spec_GCJ='-Bexport'
>+      ;;
>+
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+	hardcode_shlibpath_var_GCJ=no
>+	runpath_var=LD_RUN_PATH
>+	hardcode_runpath_var=yes
>+	ld_shlibs_GCJ=yes
>+      fi
>+      ;;
>+
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
>+      no_undefined_flag_GCJ='${wl}-z,text'
>+      archive_cmds_need_lc_GCJ=no
>+      hardcode_shlibpath_var_GCJ=no
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
>+
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      no_undefined_flag_GCJ='${wl}-z,text'
>+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
>+      archive_cmds_need_lc_GCJ=no
>+      hardcode_shlibpath_var_GCJ=no
>+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      hardcode_libdir_separator_GCJ=':'
>+      link_all_deplibs_GCJ=yes
>+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
>+      runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
>+
>+    uts4*)
>+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
>+      hardcode_shlibpath_var_GCJ=no
>+      ;;
>+
>+    *)
>+      ld_shlibs_GCJ=no
>+      ;;
>+    esac
>+  fi
>+
>+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
>+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
>+test "$ld_shlibs_GCJ" = no && can_build_shared=no
>+
>+#
>+# Do we need to explicitly link libc?
>+#
>+case "x$archive_cmds_need_lc_GCJ" in
>+x|xyes)
>+  # Assume -lc should be added
>+  archive_cmds_need_lc_GCJ=yes
>+
>+  if test "$enable_shared" = yes && test "$GCC" = yes; then
>+    case $archive_cmds_GCJ in
>+    *'~'*)
>+      # FIXME: we may have to deal with multi-command sequences.
>+      ;;
>+    '$CC '*)
>+      # Test whether the compiler implicitly links with -lc since on some
>+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
>+      # to ld, don't add -lc before -lgcc.
>+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
>+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
>+      $rm conftest*
>+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+
>+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } 2>conftest.err; then
>+        soname=conftest
>+        lib=conftest
>+        libobjs=conftest.$ac_objext
>+        deplibs=
>+        wl=$lt_prog_compiler_wl_GCJ
>+	pic_flag=$lt_prog_compiler_pic_GCJ
>+        compiler_flags=-v
>+        linker_flags=-v
>+        verstring=
>+        output_objdir=.
>+        libname=conftest
>+        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
>+        allow_undefined_flag_GCJ=
>+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
>+  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }
>+        then
>+	  archive_cmds_need_lc_GCJ=no
>+        else
>+	  archive_cmds_need_lc_GCJ=yes
>+        fi
>+        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
>+      else
>+        cat conftest.err 1>&5
>+      fi
>+      $rm conftest*
>+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
>+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
>+      ;;
>+    esac
>+  fi
>+  ;;
>+esac
>+
>+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
>+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
>+library_names_spec=
>+libname_spec='lib$name'
>+soname_spec=
>+shrext_cmds=".so"
>+postinstall_cmds=
>+postuninstall_cmds=
>+finish_cmds=
>+finish_eval=
>+shlibpath_var=
>+shlibpath_overrides_runpath=unknown
>+version_type=none
>+dynamic_linker="$host_os ld.so"
>+sys_lib_dlsearch_path_spec="/lib /usr/lib"
>+if test "$GCC" = yes; then
>+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
>+    # if the path contains ";" then we assume it to be the separator
>+    # otherwise default to the standard path separator (i.e. ":") - it is
>+    # assumed that no part of a normal pathname contains ";" but that should
>+    # okay in the real world where ";" in dirpaths is itself problematic.
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+  else
>+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+  fi
>+else
>+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
>+fi
>+need_lib_prefix=unknown
>+hardcode_into_libs=no
>+
>+# when you set need_version to no, make sure it does not cause -set_version
>+# flags to be left without arguments
>+need_version=unknown
>+
>+case $host_os in
>+aix3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
>+  shlibpath_var=LIBPATH
>+
>+  # AIX 3 has no versioning support, so we append a major version to the name.
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  ;;
>+
>+aix4* | aix5*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  hardcode_into_libs=yes
>+  if test "$host_cpu" = ia64; then
>+    # AIX 5 supports IA64
>+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  else
>+    # With GCC up to 2.95.x, collect2 would create an import file
>+    # for dependence libraries.  The import file would start with
>+    # the line `#! .'.  This would cause the generated library to
>+    # depend on `.', always an invalid library.  This was fixed in
>+    # development snapshots of GCC prior to 3.0.
>+    case $host_os in
>+      aix4 | aix4.[01] | aix4.[01].*)
>+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
>+	   echo ' yes '
>+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
>+	:
>+      else
>+	can_build_shared=no
>+      fi
>+      ;;
>+    esac
>+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
>+    # soname into executable. Probably we can add versioning support to
>+    # collect2, so additional links can be useful in future.
>+    if test "$aix_use_runtimelinking" = yes; then
>+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
>+      # instead of lib<name>.a to let people know that these are not
>+      # typical AIX shared libraries.
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    else
>+      # We preserve .a as extension for shared libraries through AIX4.2
>+      # and later when we are not doing run time linking.
>+      library_names_spec='${libname}${release}.a $libname.a'
>+      soname_spec='${libname}${release}${shared_ext}$major'
>+    fi
>+    shlibpath_var=LIBPATH
>+  fi
>+  ;;
>+
>+amigaos*)
>+  library_names_spec='$libname.ixlibrary $libname.a'
>+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
>+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
>+  ;;
>+
>+beos*)
>+  library_names_spec='${libname}${shared_ext}'
>+  dynamic_linker="$host_os ld.so"
>+  shlibpath_var=LIBRARY_PATH
>+  ;;
>+
>+bsdi[45]*)
>+  version_type=linux
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
>+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
>+  # the default ld.so.conf also contains /usr/contrib/lib and
>+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
>+  # libtool to hard-code these into programs
>+  ;;
>+
>+cygwin* | mingw* | pw32*)
>+  version_type=windows
>+  shrext_cmds=".dll"
>+  need_version=no
>+  need_lib_prefix=no
>+
>+  case $GCC,$host_os in
>+  yes,cygwin* | yes,mingw* | yes,pw32*)
>+    library_names_spec='$libname.dll.a'
>+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
>+    postinstall_cmds='base_file=`basename \${file}`~
>+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
>+      dldir=$destdir/`dirname \$dlpath`~
>+      test -d \$dldir || mkdir -p \$dldir~
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>+      dlpath=$dir/\$dldll~
>+       $rm \$dlpath'
>+    shlibpath_overrides_runpath=yes
>+
>+    case $host_os in
>+    cygwin*)
>+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
>+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
>+      ;;
>+    mingw*)
>+      # MinGW DLLs use traditional 'lib' prefix
>+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
>+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
>+        # It is most probably a Windows format PATH printed by
>+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
>+        # path with ; separators, and with drive letters. We can handle the
>+        # drive letters (cygwin fileutils understands them), so leave them,
>+        # especially as we might pass files found there to a mingw objdump,
>+        # which wouldn't understand a cygwinified path. Ahh.
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
>+      else
>+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
>+      fi
>+      ;;
>+    pw32*)
>+      # pw32 DLLs use 'pw' prefix rather than 'lib'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>+      ;;
>+    esac
>+    ;;
>+
>+  *)
>+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
>+    ;;
>+  esac
>+  dynamic_linker='Win32 ld.exe'
>+  # FIXME: first we should search . and the directory the executable is in
>+  shlibpath_var=PATH
>+  ;;
>+
>+darwin* | rhapsody*)
>+  dynamic_linker="$host_os dyld"
>+  version_type=darwin
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>+  soname_spec='${libname}${release}${major}$shared_ext'
>+  shlibpath_overrides_runpath=yes
>+  shlibpath_var=DYLD_LIBRARY_PATH
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>+  if test "$GCC" = yes; then
>+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>+  else
>+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
>+  ;;
>+
>+dgux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+freebsd1*)
>+  dynamic_linker=no
>+  ;;
>+
>+kfreebsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>+  version_type=freebsd-$objformat
>+  case $version_type in
>+    freebsd-elf*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+      need_version=no
>+      need_lib_prefix=no
>+      ;;
>+    freebsd-*)
>+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
>+      need_version=yes
>+      ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_os in
>+  freebsd2*)
>+    shlibpath_overrides_runpath=yes
>+    ;;
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>+    shlibpath_overrides_runpath=no
>+    hardcode_into_libs=yes
>+    ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>+  esac
>+  ;;
>+
>+gnu*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  ;;
>+
>+hpux9* | hpux10* | hpux11*)
>+  # Give a soname corresponding to the major version so that dld.sl refuses to
>+  # link against other versions.
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  case $host_cpu in
>+  ia64*)
>+    shrext_cmds='.so'
>+    hardcode_into_libs=yes
>+    dynamic_linker="$host_os dld.so"
>+    shlibpath_var=LD_LIBRARY_PATH
>+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    if test "X$HPUX_IA64_MODE" = X32; then
>+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
>+    else
>+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
>+    fi
>+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+    ;;
>+   hppa*64*)
>+     shrext_cmds='.sl'
>+     hardcode_into_libs=yes
>+     dynamic_linker="$host_os dld.sl"
>+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
>+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
>+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+     soname_spec='${libname}${release}${shared_ext}$major'
>+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
>+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>+     ;;
>+   *)
>+    shrext_cmds='.sl'
>+    dynamic_linker="$host_os dld.sl"
>+    shlibpath_var=SHLIB_PATH
>+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    ;;
>+  esac
>+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>+  postinstall_cmds='chmod 555 $lib'
>+  ;;
>+
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
>+irix5* | irix6* | nonstopux*)
>+  case $host_os in
>+    nonstopux*) version_type=nonstopux ;;
>+    *)
>+	if test "$lt_cv_prog_gnu_ld" = yes; then
>+		version_type=linux
>+	else
>+		version_type=irix
>+	fi ;;
>+  esac
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  case $host_os in
>+  irix5* | nonstopux*)
>+    libsuff= shlibsuff=
>+    ;;
>+  *)
>+    case $LD in # libtool.m4 will add one of these switches to LD
>+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
>+      libsuff= shlibsuff= libmagic=32-bit;;
>+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
>+      libsuff=32 shlibsuff=N32 libmagic=N32;;
>+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
>+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
>+    *) libsuff= shlibsuff= libmagic=never-match;;
>+    esac
>+    ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>+  shlibpath_overrides_runpath=no
>+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>+  hardcode_into_libs=yes
>+  ;;
>+
>+# No shared lib support for Linux oldld, aout, or coff.
>+linux*oldld* | linux*aout* | linux*coff*)
>+  dynamic_linker=no
>+  ;;
>+
>+# This must be Linux ELF.
>+linux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  # This implies no fast_install, which is unacceptable.
>+  # Some rework will be needed to allow for fast_install
>+  # before this can be enabled.
>+  hardcode_into_libs=yes
>+
>+  # find out which ABI we are using
>+  libsuff=
>+  case "$host_cpu" in
>+  x86_64*|s390x*|powerpc64*)
>+    echo '#line 18171 "configure"' > conftest.$ac_ext
>+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+      case `/usr/bin/file conftest.$ac_objext` in
>+      *64-bit*)
>+        libsuff=64
>+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>+        ;;
>+      esac
>+    fi
>+    rm -rf conftest*
>+    ;;
>+  esac
>+
>+  # Append ld.so.conf contents to the search path
>+  if test -f /etc/ld.so.conf; then
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+  fi
>+
>+  # We used to test for /lib/ld.so.1 and disable shared libraries on
>+  # powerpc, because MkLinux only supported shared libraries with the
>+  # GNU dynamic linker.  Since this was broken with cross compilers,
>+  # most powerpc-linux boxes support dynamic linking these days and
>+  # people can always --disable-shared, the test was removed, and we
>+  # assume the GNU/Linux dynamic linker is in use.
>+  dynamic_linker='GNU/Linux ld.so'
>+  ;;
>+
>+knetbsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>+  ;;
>+
>+netbsd*)
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+    dynamic_linker='NetBSD (a.out) ld.so'
>+  else
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    dynamic_linker='NetBSD ld.elf_so'
>+  fi
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  ;;
>+
>+newsos6)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+nto-qnx*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
>+
>+openbsd*)
>+  version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>+  need_lib_prefix=no
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+    case $host_os in
>+      openbsd2.[89] | openbsd2.[89].*)
>+	shlibpath_overrides_runpath=no
>+	;;
>+      *)
>+	shlibpath_overrides_runpath=yes
>+	;;
>+      esac
>+  else
>+    shlibpath_overrides_runpath=yes
>+  fi
>+  ;;
>+
>+os2*)
>+  libname_spec='$name'
>+  shrext_cmds=".dll"
>+  need_lib_prefix=no
>+  library_names_spec='$libname${shared_ext} $libname.a'
>+  dynamic_linker='OS/2 ld.exe'
>+  shlibpath_var=LIBPATH
>+  ;;
>+
>+osf3* | osf4* | osf5*)
>+  version_type=osf
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>+  ;;
>+
>+solaris*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  # ldd complains unless libraries are executable
>+  postinstall_cmds='chmod +x $lib'
>+  ;;
>+
>+sunos4*)
>+  version_type=sunos
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  if test "$with_gnu_ld" = yes; then
>+    need_lib_prefix=no
>+  fi
>+  need_version=yes
>+  ;;
>+
>+sysv4 | sysv4.3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_vendor in
>+    sni)
>+      shlibpath_overrides_runpath=no
>+      need_lib_prefix=no
>+      export_dynamic_flag_spec='${wl}-Blargedynsym'
>+      runpath_var=LD_RUN_PATH
>+      ;;
>+    siemens)
>+      need_lib_prefix=no
>+      ;;
>+    motorola)
>+      need_lib_prefix=no
>+      need_version=no
>+      shlibpath_overrides_runpath=no
>+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>+      ;;
>+  esac
>+  ;;
>+
>+sysv4*MP*)
>+  if test -d /usr/nec ;then
>+    version_type=linux
>+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
>+    soname_spec='$libname${shared_ext}.$major'
>+    shlibpath_var=LD_LIBRARY_PATH
>+  fi
>+  ;;
>+
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+	;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
>+uts4*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
>+
>+*)
>+  dynamic_linker=no
>+  ;;
>+esac
>+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
>+echo "${ECHO_T}$dynamic_linker" >&6; }
>+test "$dynamic_linker" = no && can_build_shared=no
>+
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+
>+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
>+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
>+hardcode_action_GCJ=
>+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
>+   test -n "$runpath_var_GCJ" || \
>+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
>+
>+  # We can hardcode non-existant directories.
>+  if test "$hardcode_direct_GCJ" != no &&
>+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>+     # have to relink, otherwise we might link with an installed library
>+     # when we should be linking with a yet-to-be-installed one
>+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
>+     test "$hardcode_minus_L_GCJ" != no; then
>+    # Linking always hardcodes the temporary library directory.
>+    hardcode_action_GCJ=relink
>+  else
>+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>+    hardcode_action_GCJ=immediate
>+  fi
>+else
>+  # We cannot hardcode anything, or else we can only hardcode existing
>+  # directories.
>+  hardcode_action_GCJ=unsupported
>+fi
>+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
>+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
>+
>+if test "$hardcode_action_GCJ" = relink; then
>+  # Fast installation is not supported
>+  enable_fast_install=no
>+elif test "$shlibpath_overrides_runpath" = yes ||
>+     test "$enable_shared" = no; then
>+  # Fast installation is not necessary
>+  enable_fast_install=needless
>+fi
>+
>+
>+# The else clause should only fire when bootstrapping the
>+# libtool distribution, otherwise you forgot to ship ltmain.sh
>+# with your package, and you will get complaints that there are
>+# no rules to generate ltmain.sh.
>+if test -f "$ltmain"; then
>+  # See if we are running on zsh, and set the options which allow our commands through
>+  # without removal of \ escapes.
>+  if test -n "${ZSH_VERSION+set}" ; then
>+    setopt NO_GLOB_SUBST
>+  fi
>+  # Now quote all the things that may contain metacharacters while being
>+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>+  # variables and quote the copies for generation of the libtool script.
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>+    SED SHELL STRIP \
>+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>+    deplibs_check_method reload_flag reload_cmds need_locks \
>+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>+    lt_cv_sys_global_symbol_to_c_name_address \
>+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>+    old_postinstall_cmds old_postuninstall_cmds \
>+    compiler_GCJ \
>+    CC_GCJ \
>+    LD_GCJ \
>+    lt_prog_compiler_wl_GCJ \
>+    lt_prog_compiler_pic_GCJ \
>+    lt_prog_compiler_static_GCJ \
>+    lt_prog_compiler_no_builtin_flag_GCJ \
>+    export_dynamic_flag_spec_GCJ \
>+    thread_safe_flag_spec_GCJ \
>+    whole_archive_flag_spec_GCJ \
>+    enable_shared_with_static_runtimes_GCJ \
>+    old_archive_cmds_GCJ \
>+    old_archive_from_new_cmds_GCJ \
>+    predep_objects_GCJ \
>+    postdep_objects_GCJ \
>+    predeps_GCJ \
>+    postdeps_GCJ \
>+    compiler_lib_search_path_GCJ \
>+    archive_cmds_GCJ \
>+    archive_expsym_cmds_GCJ \
>+    postinstall_cmds_GCJ \
>+    postuninstall_cmds_GCJ \
>+    old_archive_from_expsyms_cmds_GCJ \
>+    allow_undefined_flag_GCJ \
>+    no_undefined_flag_GCJ \
>+    export_symbols_cmds_GCJ \
>+    hardcode_libdir_flag_spec_GCJ \
>+    hardcode_libdir_flag_spec_ld_GCJ \
>+    hardcode_libdir_separator_GCJ \
>+    hardcode_automatic_GCJ \
>+    module_cmds_GCJ \
>+    module_expsym_cmds_GCJ \
>+    lt_cv_prog_compiler_c_o_GCJ \
>+    exclude_expsyms_GCJ \
>+    include_expsyms_GCJ; do
>+
>+    case $var in
>+    old_archive_cmds_GCJ | \
>+    old_archive_from_new_cmds_GCJ | \
>+    archive_cmds_GCJ | \
>+    archive_expsym_cmds_GCJ | \
>+    module_cmds_GCJ | \
>+    module_expsym_cmds_GCJ | \
>+    old_archive_from_expsyms_cmds_GCJ | \
>+    export_symbols_cmds_GCJ | \
>+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>+    postinstall_cmds | postuninstall_cmds | \
>+    old_postinstall_cmds | old_postuninstall_cmds | \
>+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>+      # Double-quote double-evaled strings.
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>+      ;;
>+    *)
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>+      ;;
>+    esac
>+  done
>+
>+  case $lt_echo in
>+  *'\$0 --fallback-echo"')
>+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
>+    ;;
>+  esac
>+
>+cfgfile="$ofile"
>+
>+  cat <<__EOF__ >> "$cfgfile"
>+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
>+
>+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>+
>+# Shell to use when invoking shell scripts.
>+SHELL=$lt_SHELL
>+
>+# Whether or not to build shared libraries.
>+build_libtool_libs=$enable_shared
>+
>+# Whether or not to build static libraries.
>+build_old_libs=$enable_static
>+
>+# Whether or not to add -lc for building shared libraries.
>+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
>+
>+# Whether or not to disallow shared libs when runtime libs are static
>+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
>+
>+# Whether or not to optimize for fast installation.
>+fast_install=$enable_fast_install
>+
>+# The host system.
>+host_alias=$host_alias
>+host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
>+
>+# An echo program that does not interpret backslashes.
>+echo=$lt_echo
>+
>+# The archiver.
>+AR=$lt_AR
>+AR_FLAGS=$lt_AR_FLAGS
>+
>+# A C compiler.
>+LTCC=$lt_LTCC
>+
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
>+# A language-specific compiler.
>+CC=$lt_compiler_GCJ
>+
>+# Is the compiler the GNU C compiler?
>+with_gcc=$GCC_GCJ
>+
>+# An ERE matcher.
>+EGREP=$lt_EGREP
>+
>+# The linker used to build libraries.
>+LD=$lt_LD_GCJ
>+
>+# Whether we need hard or soft links.
>+LN_S=$lt_LN_S
>+
>+# A BSD-compatible nm program.
>+NM=$lt_NM
>+
>+# A symbol stripping program
>+STRIP=$lt_STRIP
>+
>+# Used to examine libraries when file_magic_cmd begins "file"
>+MAGIC_CMD=$MAGIC_CMD
>+
>+# Used on cygwin: DLL creation program.
>+DLLTOOL="$DLLTOOL"
>+
>+# Used on cygwin: object dumper.
>+OBJDUMP="$OBJDUMP"
>+
>+# Used on cygwin: assembler.
>+AS="$AS"
>+
>+# The name of the directory that contains temporary libtool files.
>+objdir=$objdir
>+
>+# How to create reloadable object files.
>+reload_flag=$lt_reload_flag
>+reload_cmds=$lt_reload_cmds
>+
>+# How to pass a linker flag through the compiler.
>+wl=$lt_lt_prog_compiler_wl_GCJ
>+
>+# Object file suffix (normally "o").
>+objext="$ac_objext"
>+
>+# Old archive suffix (normally "a").
>+libext="$libext"
>+
>+# Shared library suffix (normally ".so").
>+shrext_cmds='$shrext_cmds'
>+
>+# Executable file suffix (normally "").
>+exeext="$exeext"
>+
>+# Additional compiler flags for building library objects.
>+pic_flag=$lt_lt_prog_compiler_pic_GCJ
>+pic_mode=$pic_mode
>+
>+# What is the maximum length of a command?
>+max_cmd_len=$lt_cv_sys_max_cmd_len
>+
>+# Does compiler simultaneously support -c and -o options?
>+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
>+
>+# Must we lock files when doing compilation?
>+need_locks=$lt_need_locks
>+
>+# Do we need the lib prefix for modules?
>+need_lib_prefix=$need_lib_prefix
>+
>+# Do we need a version for libraries?
>+need_version=$need_version
>+
>+# Whether dlopen is supported.
>+dlopen_support=$enable_dlopen
>+
>+# Whether dlopen of programs is supported.
>+dlopen_self=$enable_dlopen_self
>+
>+# Whether dlopen of statically linked programs is supported.
>+dlopen_self_static=$enable_dlopen_self_static
>+
>+# Compiler flag to prevent dynamic linking.
>+link_static_flag=$lt_lt_prog_compiler_static_GCJ
>+
>+# Compiler flag to turn off builtin functions.
>+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
>+
>+# Compiler flag to allow reflexive dlopens.
>+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
>+
>+# Compiler flag to generate shared objects directly from archives.
>+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
>+
>+# Compiler flag to generate thread-safe objects.
>+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
>+
>+# Library versioning type.
>+version_type=$version_type
>+
>+# Format of library name prefix.
>+libname_spec=$lt_libname_spec
>+
>+# List of archive names.  First name is the real one, the rest are links.
>+# The last name is the one that the linker finds with -lNAME.
>+library_names_spec=$lt_library_names_spec
>+
>+# The coded name of the library, if different from the real name.
>+soname_spec=$lt_soname_spec
>+
>+# Commands used to build and install an old-style archive.
>+RANLIB=$lt_RANLIB
>+old_archive_cmds=$lt_old_archive_cmds_GCJ
>+old_postinstall_cmds=$lt_old_postinstall_cmds
>+old_postuninstall_cmds=$lt_old_postuninstall_cmds
>+
>+# Create an old-style archive from a shared archive.
>+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
>+
>+# Create a temporary old-style archive to link instead of a shared archive.
>+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
>+
>+# Commands used to build and install a shared archive.
>+archive_cmds=$lt_archive_cmds_GCJ
>+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
>+postinstall_cmds=$lt_postinstall_cmds
>+postuninstall_cmds=$lt_postuninstall_cmds
> 
>-ac_cv_lib_svld_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
>-if test $ac_cv_lib_svld_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
>-else
>-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
>-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
>-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+# Commands used to build a loadable module (assumed same as above if empty)
>+module_cmds=$lt_module_cmds_GCJ
>+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dld_link ();
>-int
>-main ()
>-{
>-dld_link ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dld_dld_link=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# Commands to strip libraries.
>+old_striplib=$lt_old_striplib
>+striplib=$lt_striplib
> 
>-ac_cv_lib_dld_dld_link=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
>-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
>-if test $ac_cv_lib_dld_dld_link = yes; then
>-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
>-fi
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predep_objects=$lt_predep_objects_GCJ
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdep_objects=$lt_postdep_objects_GCJ
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predeps=$lt_predeps_GCJ
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdeps=$lt_postdeps_GCJ
>+
>+# The library search path used internally by the compiler when linking
>+# a shared library.
>+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
> 
>+# Method to check whether dependent libraries are shared objects.
>+deplibs_check_method=$lt_deplibs_check_method
> 
>-fi
>+# Command to use when deplibs_check_method == file_magic.
>+file_magic_cmd=$lt_file_magic_cmd
> 
>+# Flag that allows shared libraries with undefined symbols to be built.
>+allow_undefined_flag=$lt_allow_undefined_flag_GCJ
> 
>-fi
>+# Flag that forces no undefined symbols.
>+no_undefined_flag=$lt_no_undefined_flag_GCJ
> 
>+# Commands used to finish a libtool library installation in a directory.
>+finish_cmds=$lt_finish_cmds
> 
>-fi
>+# Same as above, but a single script fragment to be evaled but not shown.
>+finish_eval=$lt_finish_eval
> 
>+# Take the output of nm and produce a listing of raw symbols and C names.
>+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
> 
>-fi
>+# Transform the output of nm in a proper C declaration
>+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
> 
>+# Transform the output of nm in a C name address pair
>+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
> 
>-fi
>+# This is the shared library runtime path variable.
>+runpath_var=$runpath_var
> 
>-    ;;
>-  esac
>+# This is the shared library path variable.
>+shlibpath_var=$shlibpath_var
> 
>-  if test "x$lt_cv_dlopen" != xno; then
>-    enable_dlopen=yes
>-  else
>-    enable_dlopen=no
>-  fi
>+# Is shlibpath searched before the hard-coded library search path?
>+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
> 
>-  case $lt_cv_dlopen in
>-  dlopen)
>-    save_CPPFLAGS="$CPPFLAGS"
>-        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
>+# How to hardcode a shared library path into an executable.
>+hardcode_action=$hardcode_action_GCJ
> 
>-    save_LDFLAGS="$LDFLAGS"
>-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>+# Whether we should hardcode library paths into libraries.
>+hardcode_into_libs=$hardcode_into_libs
> 
>-    save_LIBS="$LIBS"
>-    LIBS="$lt_cv_dlopen_libs $LIBS"
>+# Flag to hardcode \$libdir into a binary during linking.
>+# This must work even if \$libdir does not exist.
>+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
> 
>-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
>-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
>-if test "${lt_cv_dlopen_self+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  	  if test "$cross_compiling" = yes; then :
>-  lt_cv_dlopen_self=cross
>-else
>-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>-  lt_status=$lt_dlunknown
>-  cat > conftest.$ac_ext <<EOF
>-#line 7682 "configure"
>-#include "confdefs.h"
>+# If ld is used when linking, flag to hardcode \$libdir into
>+# a binary during linking. This must work even if \$libdir does
>+# not exist.
>+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
> 
>-#if HAVE_DLFCN_H
>-#include <dlfcn.h>
>-#endif
>+# Whether we need a single -rpath flag with a separated argument.
>+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
> 
>-#include <stdio.h>
>+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_direct=$hardcode_direct_GCJ
> 
>-#ifdef RTLD_GLOBAL
>-#  define LT_DLGLOBAL		RTLD_GLOBAL
>-#else
>-#  ifdef DL_GLOBAL
>-#    define LT_DLGLOBAL		DL_GLOBAL
>-#  else
>-#    define LT_DLGLOBAL		0
>-#  endif
>-#endif
>+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_minus_L=$hardcode_minus_L_GCJ
> 
>-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
>-   find out it does not work in some platform. */
>-#ifndef LT_DLLAZY_OR_NOW
>-#  ifdef RTLD_LAZY
>-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
>-#  else
>-#    ifdef DL_LAZY
>-#      define LT_DLLAZY_OR_NOW		DL_LAZY
>-#    else
>-#      ifdef RTLD_NOW
>-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
>-#      else
>-#        ifdef DL_NOW
>-#          define LT_DLLAZY_OR_NOW	DL_NOW
>-#        else
>-#          define LT_DLLAZY_OR_NOW	0
>-#        endif
>-#      endif
>-#    endif
>-#  endif
>-#endif
>+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
>+# the resulting binary.
>+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
> 
>-#ifdef __cplusplus
>-extern "C" void exit (int);
>-#endif
>+# Set to yes if building a shared library automatically hardcodes DIR into the library
>+# and all subsequent libraries and executables linked against it.
>+hardcode_automatic=$hardcode_automatic_GCJ
> 
>-void fnord() { int i=42;}
>-int main ()
>-{
>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>-  int status = $lt_dlunknown;
>+# Variables whose values should be saved in libtool wrapper scripts and
>+# restored at relink time.
>+variables_saved_for_relink="$variables_saved_for_relink"
> 
>-  if (self)
>-    {
>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>-      /* dlclose (self); */
>-    }
>+# Whether libtool must link a program against all its dependency libraries.
>+link_all_deplibs=$link_all_deplibs_GCJ
> 
>-    exit (status);
>-}
>-EOF
>-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>-    lt_status=$?
>-    case x$lt_status in
>-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
>-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
>-    esac
>-  else :
>-    # compilation failed
>-    lt_cv_dlopen_self=no
>-  fi
>-fi
>-rm -fr conftest*
>+# Compile-time system search path for libraries
>+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>+
>+# Run-time system search path for libraries
>+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
>+
>+# Fix the shell variable \$srcfile for the compiler.
>+fix_srcfile_path="$fix_srcfile_path_GCJ"
>+
>+# Set to yes if exported symbols are required.
>+always_export_symbols=$always_export_symbols_GCJ
>+
>+# The commands to list exported symbols.
>+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
>+
>+# The commands to extract the exported symbol list from a shared archive.
>+extract_expsyms_cmds=$lt_extract_expsyms_cmds
>+
>+# Symbols that should not be listed in the preloaded symbols.
>+exclude_expsyms=$lt_exclude_expsyms_GCJ
> 
>+# Symbols that must always be exported.
>+include_expsyms=$lt_include_expsyms_GCJ
>+
>+# ### END LIBTOOL TAG CONFIG: $tagname
>+
>+__EOF__
> 
>+
>+else
>+  # If there is no Makefile yet, we rely on a make rule to execute
>+  # `config.status --recheck' to rerun these tests and create the
>+  # libtool script then.
>+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>+  if test -f "$ltmain_in"; then
>+    test -f Makefile && make "$ltmain"
>+  fi
> fi
>-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
>-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
> 
>-    if test "x$lt_cv_dlopen_self" = xyes; then
>-      LDFLAGS="$LDFLAGS $link_static_flag"
>-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
>-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
>-if test "${lt_cv_dlopen_self_static+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  	  if test "$cross_compiling" = yes; then :
>-  lt_cv_dlopen_self_static=cross
>-else
>-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>-  lt_status=$lt_dlunknown
>-  cat > conftest.$ac_ext <<EOF
>-#line 7780 "configure"
>-#include "confdefs.h"
> 
>-#if HAVE_DLFCN_H
>-#include <dlfcn.h>
>-#endif
>+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
> 
>-#include <stdio.h>
>+CC="$lt_save_CC"
> 
>-#ifdef RTLD_GLOBAL
>-#  define LT_DLGLOBAL		RTLD_GLOBAL
>-#else
>-#  ifdef DL_GLOBAL
>-#    define LT_DLGLOBAL		DL_GLOBAL
>-#  else
>-#    define LT_DLGLOBAL		0
>-#  endif
>-#endif
>+	else
>+	  tagname=""
>+	fi
>+	;;
> 
>-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
>-   find out it does not work in some platform. */
>-#ifndef LT_DLLAZY_OR_NOW
>-#  ifdef RTLD_LAZY
>-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
>-#  else
>-#    ifdef DL_LAZY
>-#      define LT_DLLAZY_OR_NOW		DL_LAZY
>-#    else
>-#      ifdef RTLD_NOW
>-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
>-#      else
>-#        ifdef DL_NOW
>-#          define LT_DLLAZY_OR_NOW	DL_NOW
>-#        else
>-#          define LT_DLLAZY_OR_NOW	0
>-#        endif
>-#      endif
>-#    endif
>-#  endif
>-#endif
>+      RC)
> 
>-#ifdef __cplusplus
>-extern "C" void exit (int);
>-#endif
> 
>-void fnord() { int i=42;}
>-int main ()
>-{
>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>-  int status = $lt_dlunknown;
>+# Source file extension for RC test sources.
>+ac_ext=rc
> 
>-  if (self)
>-    {
>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>-      /* dlclose (self); */
>-    }
>+# Object file extension for compiled RC test sources.
>+objext=o
>+objext_RC=$objext
> 
>-    exit (status);
>-}
>-EOF
>-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>-    lt_status=$?
>-    case x$lt_status in
>-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
>-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
>-    esac
>-  else :
>-    # compilation failed
>-    lt_cv_dlopen_self_static=no
>-  fi
>-fi
>-rm -fr conftest*
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
> 
>+# Code to be used in simple link tests
>+lt_simple_link_test_code="$lt_simple_compile_test_code"
> 
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
>-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
>-    fi
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
> 
>-    CPPFLAGS="$save_CPPFLAGS"
>-    LDFLAGS="$save_LDFLAGS"
>-    LIBS="$save_LIBS"
>-    ;;
>-  esac
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
> 
>-  case $lt_cv_dlopen_self in
>-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
>-  *) enable_dlopen_self=unknown ;;
>-  esac
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
> 
>-  case $lt_cv_dlopen_self_static in
>-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
>-  *) enable_dlopen_self_static=unknown ;;
>-  esac
>-fi
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
> 
> 
>-if test "$enable_shared" = yes && test "$GCC" = yes; then
>-  case $archive_cmds in
>-  *'~'*)
>-    # FIXME: we may have to deal with multi-command sequences.
>-    ;;
>-  '$CC '*)
>-    # Test whether the compiler implicitly links with -lc since on some
>-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
>-    # to ld, don't add -lc before -lgcc.
>-    echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
>-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
>-    if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  $rm conftest*
>-    echo 'static int dummy;' > conftest.$ac_ext
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
> 
>-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; then
>-      soname=conftest
>-      lib=conftest
>-      libobjs=conftest.$ac_objext
>-      deplibs=
>-      wl=$lt_cv_prog_cc_wl
>-      compiler_flags=-v
>-      linker_flags=-v
>-      verstring=
>-      output_objdir=.
>-      libname=conftest
>-      save_allow_undefined_flag=$allow_undefined_flag
>-      allow_undefined_flag=
>-      if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
>-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }
>-      then
>-	lt_cv_archive_cmds_need_lc=no
>-      else
>-	lt_cv_archive_cmds_need_lc=yes
>-      fi
>-      allow_undefined_flag=$save_allow_undefined_flag
>-    else
>-      cat conftest.err 1>&5
>-    fi
>-fi
> 
>-    echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
>-echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
>-    ;;
>+# Allow CC to be a program name with arguments.
>+lt_save_CC="$CC"
>+CC=${RC-"windres"}
>+compiler=$CC
>+compiler_RC=$CC
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>   esac
>-fi
>-need_lc=${lt_cv_archive_cmds_need_lc-yes}
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
>+lt_cv_prog_compiler_c_o_RC=yes
> 
>-# The second clause should only fire when bootstrapping the
>+# The else clause should only fire when bootstrapping the
> # libtool distribution, otherwise you forgot to ship ltmain.sh
> # with your package, and you will get complaints that there are
> # no rules to generate ltmain.sh.
> if test -f "$ltmain"; then
>-  :
>-else
>-  # If there is no Makefile yet, we rely on a make rule to execute
>-  # `config.status --recheck' to rerun these tests and create the
>-  # libtool script then.
>-  test -f Makefile && make "$ltmain"
>-fi
>-
>-if test -f "$ltmain"; then
>-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
>-  $rm -f "${ofile}T"
>-
>-  echo creating $ofile
>-
>+  # See if we are running on zsh, and set the options which allow our commands through
>+  # without removal of \ escapes.
>+  if test -n "${ZSH_VERSION+set}" ; then
>+    setopt NO_GLOB_SUBST
>+  fi
>   # Now quote all the things that may contain metacharacters while being
>   # careful not to overquote the AC_SUBSTed values.  We take copies of the
>   # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS \
>-    AR AR_FLAGS CC LD LN_S NM SHELL \
>-    reload_flag reload_cmds wl \
>-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
>-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
>-    library_names_spec soname_spec \
>-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
>-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
>-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
>-    old_striplib striplib file_magic_cmd export_symbols_cmds \
>-    deplibs_check_method allow_undefined_flag no_undefined_flag \
>-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
>-    global_symbol_to_c_name_address \
>-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>+    SED SHELL STRIP \
>+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>+    deplibs_check_method reload_flag reload_cmds need_locks \
>+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>+    lt_cv_sys_global_symbol_to_c_name_address \
>     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
>+    old_postinstall_cmds old_postuninstall_cmds \
>+    compiler_RC \
>+    CC_RC \
>+    LD_RC \
>+    lt_prog_compiler_wl_RC \
>+    lt_prog_compiler_pic_RC \
>+    lt_prog_compiler_static_RC \
>+    lt_prog_compiler_no_builtin_flag_RC \
>+    export_dynamic_flag_spec_RC \
>+    thread_safe_flag_spec_RC \
>+    whole_archive_flag_spec_RC \
>+    enable_shared_with_static_runtimes_RC \
>+    old_archive_cmds_RC \
>+    old_archive_from_new_cmds_RC \
>+    predep_objects_RC \
>+    postdep_objects_RC \
>+    predeps_RC \
>+    postdeps_RC \
>+    compiler_lib_search_path_RC \
>+    archive_cmds_RC \
>+    archive_expsym_cmds_RC \
>+    postinstall_cmds_RC \
>+    postuninstall_cmds_RC \
>+    old_archive_from_expsyms_cmds_RC \
>+    allow_undefined_flag_RC \
>+    no_undefined_flag_RC \
>+    export_symbols_cmds_RC \
>+    hardcode_libdir_flag_spec_RC \
>+    hardcode_libdir_flag_spec_ld_RC \
>+    hardcode_libdir_separator_RC \
>+    hardcode_automatic_RC \
>+    module_cmds_RC \
>+    module_expsym_cmds_RC \
>+    lt_cv_prog_compiler_c_o_RC \
>+    exclude_expsyms_RC \
>+    include_expsyms_RC; do
> 
>     case $var in
>-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
>-    old_postinstall_cmds | old_postuninstall_cmds | \
>-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
>-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
>+    old_archive_cmds_RC | \
>+    old_archive_from_new_cmds_RC | \
>+    archive_cmds_RC | \
>+    archive_expsym_cmds_RC | \
>+    module_cmds_RC | \
>+    module_expsym_cmds_RC | \
>+    old_archive_from_expsyms_cmds_RC | \
>+    export_symbols_cmds_RC | \
>+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>     postinstall_cmds | postuninstall_cmds | \
>-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>+    old_postinstall_cmds | old_postuninstall_cmds | \
>+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>       # Double-quote double-evaled strings.
>       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>       ;;
>@@ -7993,43 +18992,16 @@
>     esac
>   done
> 
>-  cat <<__EOF__ > "${ofile}T"
>-#! $SHELL
>-
>-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
>-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
>-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
>-#
>-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
>-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
>-#
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2 of the License, or
>-# (at your option) any later version.
>-#
>-# This program is distributed in the hope that it will be useful, but
>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-# General Public License for more details.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-#
>-# As a special exception to the GNU General Public License, if you
>-# distribute this file as part of a program that contains a
>-# configuration script generated by Autoconf, you may include it under
>-# the same distribution terms that you use for the rest of that program.
>-
>-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
>-Xsed="sed -e s/^X//"
>+  case $lt_echo in
>+  *'\$0 --fallback-echo"')
>+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
>+    ;;
>+  esac
> 
>-# The HP-UX ksh and POSIX shell print the target directory to stdout
>-# if CDPATH is set.
>-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>+cfgfile="$ofile"
> 
>-# ### BEGIN LIBTOOL CONFIG
>+  cat <<__EOF__ >> "$cfgfile"
>+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
> 
> # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
> 
>@@ -8043,7 +19015,10 @@
> build_old_libs=$enable_static
> 
> # Whether or not to add -lc for building shared libraries.
>-build_libtool_need_lc=$need_lc
>+build_libtool_need_lc=$archive_cmds_need_lc_RC
>+
>+# Whether or not to disallow shared libs when runtime libs are static
>+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
> 
> # Whether or not to optimize for fast installation.
> fast_install=$enable_fast_install
>@@ -8051,6 +19026,12 @@
> # The host system.
> host_alias=$host_alias
> host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
> 
> # An echo program that does not interpret backslashes.
> echo=$lt_echo
>@@ -8059,14 +19040,23 @@
> AR=$lt_AR
> AR_FLAGS=$lt_AR_FLAGS
> 
>-# The default C compiler.
>-CC=$lt_CC
>+# A C compiler.
>+LTCC=$lt_LTCC
>+
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
>+# A language-specific compiler.
>+CC=$lt_compiler_RC
> 
> # Is the compiler the GNU C compiler?
>-with_gcc=$GCC
>+with_gcc=$GCC_RC
>+
>+# An ERE matcher.
>+EGREP=$lt_EGREP
> 
> # The linker used to build libraries.
>-LD=$lt_LD
>+LD=$lt_LD_RC
> 
> # Whether we need hard or soft links.
> LN_S=$lt_LN_S
>@@ -8075,7 +19065,7 @@
> NM=$lt_NM
> 
> # A symbol stripping program
>-STRIP=$STRIP
>+STRIP=$lt_STRIP
> 
> # Used to examine libraries when file_magic_cmd begins "file"
> MAGIC_CMD=$MAGIC_CMD
>@@ -8097,7 +19087,7 @@
> reload_cmds=$lt_reload_cmds
> 
> # How to pass a linker flag through the compiler.
>-wl=$lt_wl
>+wl=$lt_lt_prog_compiler_wl_RC
> 
> # Object file suffix (normally "o").
> objext="$ac_objext"
>@@ -8105,20 +19095,23 @@
> # Old archive suffix (normally "a").
> libext="$libext"
> 
>+# Shared library suffix (normally ".so").
>+shrext_cmds='$shrext_cmds'
>+
> # Executable file suffix (normally "").
> exeext="$exeext"
> 
> # Additional compiler flags for building library objects.
>-pic_flag=$lt_pic_flag
>+pic_flag=$lt_lt_prog_compiler_pic_RC
> pic_mode=$pic_mode
> 
>-# Does compiler simultaneously support -c and -o options?
>-compiler_c_o=$lt_compiler_c_o
>+# What is the maximum length of a command?
>+max_cmd_len=$lt_cv_sys_max_cmd_len
> 
>-# Can we write directly to a .lo ?
>-compiler_o_lo=$lt_compiler_o_lo
>+# Does compiler simultaneously support -c and -o options?
>+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
> 
>-# Must we lock files when doing compilation ?
>+# Must we lock files when doing compilation?
> need_locks=$lt_need_locks
> 
> # Do we need the lib prefix for modules?
>@@ -8137,19 +19130,19 @@
> dlopen_self_static=$enable_dlopen_self_static
> 
> # Compiler flag to prevent dynamic linking.
>-link_static_flag=$lt_link_static_flag
>+link_static_flag=$lt_lt_prog_compiler_static_RC
> 
> # Compiler flag to turn off builtin functions.
>-no_builtin_flag=$lt_no_builtin_flag
>+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
> 
> # Compiler flag to allow reflexive dlopens.
>-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
>+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
> 
> # Compiler flag to generate shared objects directly from archives.
>-whole_archive_flag_spec=$lt_whole_archive_flag_spec
>+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
> 
> # Compiler flag to generate thread-safe objects.
>-thread_safe_flag_spec=$lt_thread_safe_flag_spec
>+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
> 
> # Library versioning type.
> version_type=$version_type
>@@ -8166,26 +19159,50 @@
> 
> # Commands used to build and install an old-style archive.
> RANLIB=$lt_RANLIB
>-old_archive_cmds=$lt_old_archive_cmds
>+old_archive_cmds=$lt_old_archive_cmds_RC
> old_postinstall_cmds=$lt_old_postinstall_cmds
> old_postuninstall_cmds=$lt_old_postuninstall_cmds
> 
> # Create an old-style archive from a shared archive.
>-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
>+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
> 
> # Create a temporary old-style archive to link instead of a shared archive.
>-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
>+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
> 
> # Commands used to build and install a shared archive.
>-archive_cmds=$lt_archive_cmds
>-archive_expsym_cmds=$lt_archive_expsym_cmds
>+archive_cmds=$lt_archive_cmds_RC
>+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
> postinstall_cmds=$lt_postinstall_cmds
> postuninstall_cmds=$lt_postuninstall_cmds
> 
>+# Commands used to build a loadable module (assumed same as above if empty)
>+module_cmds=$lt_module_cmds_RC
>+module_expsym_cmds=$lt_module_expsym_cmds_RC
>+
> # Commands to strip libraries.
> old_striplib=$lt_old_striplib
> striplib=$lt_striplib
> 
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predep_objects=$lt_predep_objects_RC
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdep_objects=$lt_postdep_objects_RC
>+
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predeps=$lt_predeps_RC
>+
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdeps=$lt_postdeps_RC
>+
>+# The library search path used internally by the compiler when linking
>+# a shared library.
>+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
>+
> # Method to check whether dependent libraries are shared objects.
> deplibs_check_method=$lt_deplibs_check_method
> 
>@@ -8193,10 +19210,10 @@
> file_magic_cmd=$lt_file_magic_cmd
> 
> # Flag that allows shared libraries with undefined symbols to be built.
>-allow_undefined_flag=$lt_allow_undefined_flag
>+allow_undefined_flag=$lt_allow_undefined_flag_RC
> 
> # Flag that forces no undefined symbols.
>-no_undefined_flag=$lt_no_undefined_flag
>+no_undefined_flag=$lt_no_undefined_flag_RC
> 
> # Commands used to finish a libtool library installation in a directory.
> finish_cmds=$lt_finish_cmds
>@@ -8205,13 +19222,13 @@
> finish_eval=$lt_finish_eval
> 
> # Take the output of nm and produce a listing of raw symbols and C names.
>-global_symbol_pipe=$lt_global_symbol_pipe
>+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
> 
> # Transform the output of nm in a proper C declaration
>-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
>+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
> 
> # Transform the output of nm in a C name address pair
>-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
>+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
> 
> # This is the shared library runtime path variable.
> runpath_var=$runpath_var
>@@ -8223,36 +19240,45 @@
> shlibpath_overrides_runpath=$shlibpath_overrides_runpath
> 
> # How to hardcode a shared library path into an executable.
>-hardcode_action=$hardcode_action
>+hardcode_action=$hardcode_action_RC
> 
> # Whether we should hardcode library paths into libraries.
> hardcode_into_libs=$hardcode_into_libs
> 
> # Flag to hardcode \$libdir into a binary during linking.
> # This must work even if \$libdir does not exist.
>-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
>+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
>+
>+# If ld is used when linking, flag to hardcode \$libdir into
>+# a binary during linking. This must work even if \$libdir does
>+# not exist.
>+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
> 
> # Whether we need a single -rpath flag with a separated argument.
>-hardcode_libdir_separator=$lt_hardcode_libdir_separator
>+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
> 
>-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
>+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
> # resulting binary.
>-hardcode_direct=$hardcode_direct
>+hardcode_direct=$hardcode_direct_RC
> 
> # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
> # resulting binary.
>-hardcode_minus_L=$hardcode_minus_L
>+hardcode_minus_L=$hardcode_minus_L_RC
> 
> # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
> # the resulting binary.
>-hardcode_shlibpath_var=$hardcode_shlibpath_var
>+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
>+
>+# Set to yes if building a shared library automatically hardcodes DIR into the library
>+# and all subsequent libraries and executables linked against it.
>+hardcode_automatic=$hardcode_automatic_RC
> 
> # Variables whose values should be saved in libtool wrapper scripts and
> # restored at relink time.
> variables_saved_for_relink="$variables_saved_for_relink"
> 
> # Whether libtool must link a program against all its dependency libraries.
>-link_all_deplibs=$link_all_deplibs
>+link_all_deplibs=$link_all_deplibs_RC
> 
> # Compile-time system search path for libraries
> sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>@@ -8261,285 +19287,149 @@
> sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
> 
> # Fix the shell variable \$srcfile for the compiler.
>-fix_srcfile_path="$fix_srcfile_path"
>+fix_srcfile_path="$fix_srcfile_path_RC"
> 
> # Set to yes if exported symbols are required.
>-always_export_symbols=$always_export_symbols
>+always_export_symbols=$always_export_symbols_RC
> 
> # The commands to list exported symbols.
>-export_symbols_cmds=$lt_export_symbols_cmds
>+export_symbols_cmds=$lt_export_symbols_cmds_RC
>+
>+# The commands to extract the exported symbol list from a shared archive.
>+extract_expsyms_cmds=$lt_extract_expsyms_cmds
>+
>+# Symbols that should not be listed in the preloaded symbols.
>+exclude_expsyms=$lt_exclude_expsyms_RC
>+
>+# Symbols that must always be exported.
>+include_expsyms=$lt_include_expsyms_RC
>+
>+# ### END LIBTOOL TAG CONFIG: $tagname
>+
>+__EOF__
>+
>+
>+else
>+  # If there is no Makefile yet, we rely on a make rule to execute
>+  # `config.status --recheck' to rerun these tests and create the
>+  # libtool script then.
>+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>+  if test -f "$ltmain_in"; then
>+    test -f Makefile && make "$ltmain"
>+  fi
>+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
>+
>+CC="$lt_save_CC"
>+
>+	;;
>+
>+      *)
>+	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
>+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
>+   { (exit 1); exit 1; }; }
>+	;;
>+      esac
>+
>+      # Append the new tag name to the list of available tags.
>+      if test -n "$tagname" ; then
>+      available_tags="$available_tags $tagname"
>+    fi
>+    fi
>+  done
>+  IFS="$lt_save_ifs"
>+
>+  # Now substitute the updated list of available tags.
>+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
>+    mv "${ofile}T" "$ofile"
>+    chmod +x "$ofile"
>+  else
>+    rm -f "${ofile}T"
>+    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
>+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
>+   { (exit 1); exit 1; }; }
>+  fi
>+fi
>+
>+
>+
>+# This can be used to rebuild libtool when needed
>+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>+
>+# Always use our own libtool.
>+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>+
>+# Prevent multiple expansion
> 
>-# The commands to extract the exported symbol list from a shared archive.
>-extract_expsyms_cmds=$lt_extract_expsyms_cmds
> 
>-# Symbols that should not be listed in the preloaded symbols.
>-exclude_expsyms=$lt_exclude_expsyms
> 
>-# Symbols that must always be exported.
>-include_expsyms=$lt_include_expsyms
> 
>-# ### END LIBTOOL CONFIG
> 
>-__EOF__
> 
>-  case $host_os in
>-  aix3*)
>-    cat <<\EOF >> "${ofile}T"
> 
>-# AIX sometimes has problems with the GCC collect2 program.  For some
>-# reason, if we set the COLLECT_NAMES environment variable, the problems
>-# vanish in a puff of smoke.
>-if test "X${COLLECT_NAMES+set}" != Xset; then
>-  COLLECT_NAMES=
>-  export COLLECT_NAMES
>-fi
>-EOF
>-    ;;
>-  esac
> 
>-  case $host_os in
>-  cygwin* | mingw* | pw32* | os2*)
>-    cat <<'EOF' >> "${ofile}T"
>-      # This is a source program that is used to create dlls on Windows
>-      # Don't remove nor modify the starting and closing comments
>-# /* ltdll.c starts here */
>-# #define WIN32_LEAN_AND_MEAN
>-# #include <windows.h>
>-# #undef WIN32_LEAN_AND_MEAN
>-# #include <stdio.h>
>-#
>-# #ifndef __CYGWIN__
>-# #  ifdef __CYGWIN32__
>-# #    define __CYGWIN__ __CYGWIN32__
>-# #  endif
>-# #endif
>-#
>-# #ifdef __cplusplus
>-# extern "C" {
>-# #endif
>-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
>-# #ifdef __cplusplus
>-# }
>-# #endif
>-#
>-# #ifdef __CYGWIN__
>-# #include <cygwin/cygwin_dll.h>
>-# DECLARE_CYGWIN_DLL( DllMain );
>-# #endif
>-# HINSTANCE __hDllInstance_base;
>-#
>-# BOOL APIENTRY
>-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
>-# {
>-#   __hDllInstance_base = hInst;
>-#   return TRUE;
>-# }
>-# /* ltdll.c ends here */
>-	# This is a source program that is used to create import libraries
>-	# on Windows for dlls which lack them. Don't remove nor modify the
>-	# starting and closing comments
>-# /* impgen.c starts here */
>-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
>-#
>-#  This file is part of GNU libtool.
>-#
>-#  This program is free software; you can redistribute it and/or modify
>-#  it under the terms of the GNU General Public License as published by
>-#  the Free Software Foundation; either version 2 of the License, or
>-#  (at your option) any later version.
>-#
>-#  This program is distributed in the hope that it will be useful,
>-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
>-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-#  GNU General Public License for more details.
>-#
>-#  You should have received a copy of the GNU General Public License
>-#  along with this program; if not, write to the Free Software
>-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-#  */
>-#
>-# #include <stdio.h>		/* for printf() */
>-# #include <unistd.h>		/* for open(), lseek(), read() */
>-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
>-# #include <string.h>		/* for strdup() */
>-#
>-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
>-# #ifndef O_BINARY
>-# #define O_BINARY 0
>-# #endif
>-#
>-# static unsigned int
>-# pe_get16 (fd, offset)
>-#      int fd;
>-#      int offset;
>-# {
>-#   unsigned char b[2];
>-#   lseek (fd, offset, SEEK_SET);
>-#   read (fd, b, 2);
>-#   return b[0] + (b[1]<<8);
>-# }
>-#
>-# static unsigned int
>-# pe_get32 (fd, offset)
>-#     int fd;
>-#     int offset;
>-# {
>-#   unsigned char b[4];
>-#   lseek (fd, offset, SEEK_SET);
>-#   read (fd, b, 4);
>-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
>-# }
>-#
>-# static unsigned int
>-# pe_as32 (ptr)
>-#      void *ptr;
>-# {
>-#   unsigned char *b = ptr;
>-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
>-# }
>-#
>-# int
>-# main (argc, argv)
>-#     int argc;
>-#     char *argv[];
>-# {
>-#     int dll;
>-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
>-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
>-#     unsigned long name_rvas, nexp;
>-#     unsigned char *expdata, *erva;
>-#     char *filename, *dll_name;
>-#
>-#     filename = argv[1];
>-#
>-#     dll = open(filename, O_RDONLY|O_BINARY);
>-#     if (dll < 1)
>-# 	return 1;
>-#
>-#     dll_name = filename;
>-#
>-#     for (i=0; filename[i]; i++)
>-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
>-# 	    dll_name = filename + i +1;
>-#
>-#     pe_header_offset = pe_get32 (dll, 0x3c);
>-#     opthdr_ofs = pe_header_offset + 4 + 20;
>-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
>-#
>-#     if (num_entries < 1) /* no exports */
>-# 	return 1;
>-#
>-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
>-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
>-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
>-#     secptr = (pe_header_offset + 4 + 20 +
>-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
>-#
>-#     expptr = 0;
>-#     for (i = 0; i < nsections; i++)
>-#     {
>-# 	char sname[8];
>-# 	unsigned long secptr1 = secptr + 40 * i;
>-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
>-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
>-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
>-# 	lseek(dll, secptr1, SEEK_SET);
>-# 	read(dll, sname, 8);
>-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
>-# 	{
>-# 	    expptr = fptr + (export_rva - vaddr);
>-# 	    if (export_rva + export_size > vaddr + vsize)
>-# 		export_size = vsize - (export_rva - vaddr);
>-# 	    break;
>-# 	}
>-#     }
>-#
>-#     expdata = (unsigned char*)malloc(export_size);
>-#     lseek (dll, expptr, SEEK_SET);
>-#     read (dll, expdata, export_size);
>-#     erva = expdata - export_rva;
>-#
>-#     nexp = pe_as32 (expdata+24);
>-#     name_rvas = pe_as32 (expdata+32);
>-#
>-#     printf ("EXPORTS\n");
>-#     for (i = 0; i<nexp; i++)
>-#     {
>-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
>-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
>-#     }
>-#
>-#     return 0;
>-# }
>-# /* impgen.c ends here */
> 
>-EOF
>-    ;;
>-  esac
> 
>-  # We use sed instead of cat because bash on DJGPP gets confused if
>-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
>-  # text mode, it properly converts lines to CR/LF.  This bash problem
>-  # is reportedly fixed, but why not run on old versions too?
>-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
> 
>-  mv -f "${ofile}T" "$ofile" || \
>-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
>-  chmod +x "$ofile"
>-fi
> 
> 
> 
> 
> 
>-# This can be used to rebuild libtool when needed
>-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
> 
>-# Always use our own libtool.
>-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
> 
>-# Prevent multiple expansion
> 
> 
> 
>-echo "$as_me:$LINENO: checking for X" >&5
>-echo $ECHO_N "checking for X... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for X" >&5
>+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
> 
> 
>-# Check whether --with-x or --without-x was given.
>+# Check whether --with-x was given.
> if test "${with_x+set}" = set; then
>-  withval="$with_x"
>+  withval=$with_x;
>+fi
> 
>-fi;
> # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
> if test "x$with_x" = xno; then
>   # The user explicitly disabled X.
>   have_x=disabled
> else
>-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
>-    # Both variables are already set.
>-    have_x=yes
>-  else
>-    if test "${ac_cv_have_x+set}" = set; then
>+  case $x_includes,$x_libraries in #(
>+    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
>+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
>+   { (exit 1); exit 1; }; };; #(
>+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   # One or both of the vars are not set, and there is no cached value.
> ac_x_includes=no ac_x_libraries=no
>-rm -fr conftest.dir
>+rm -f -r conftest.dir
> if mkdir conftest.dir; then
>   cd conftest.dir
>-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
>   cat >Imakefile <<'_ACEOF'
>-acfindx:
>-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
>+incroot:
>+	@echo incroot='${INCROOT}'
>+usrlibdir:
>+	@echo usrlibdir='${USRLIBDIR}'
>+libdir:
>+	@echo libdir='${LIBDIR}'
> _ACEOF
>-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
>+  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.
>-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
>+    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
>     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
>     for ac_extension in a so sl; do
>-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
>-	 test -f $ac_im_libdir/libX11.$ac_extension; then
>+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
>+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
> 	ac_im_usrlibdir=$ac_im_libdir; break
>       fi
>     done
>@@ -8547,7 +19437,7 @@
>     # bogus both because they are the default anyway, and because
>     # using them would break gcc on systems where it needs fixed includes.
>     case $ac_im_incroot in
>-	/usr/include) ;;
>+	/usr/include) ac_x_includes= ;;
> 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
>     esac
>     case $ac_im_usrlibdir in
>@@ -8556,7 +19446,7 @@
>     esac
>   fi
>   cd ..
>-  rm -fr conftest.dir
>+  rm -f -r conftest.dir
> fi
> 
> # Standard set of common directories for X headers.
>@@ -8597,7 +19487,7 @@
> /usr/openwin/share/include'
> 
> if test "$ac_x_includes" = no; then
>-  # Guess where to find include files, by looking for Intrinsic.h.
>+  # Guess where to find include files, by looking for Xlib.h.
>   # First, try using that file with no special directory specified.
>   cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
>@@ -8605,26 +19495,24 @@
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
>-#include <X11/Intrinsic.h>
>+#include <X11/Xlib.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   # We can compile using X headers with no special include directory.
> ac_x_includes=
> else
>@@ -8632,12 +19520,13 @@
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>   for ac_dir in $ac_x_header_dirs; do
>-  if test -r "$ac_dir/X11/Intrinsic.h"; then
>+  if test -r "$ac_dir/X11/Xlib.h"; then
>     ac_x_includes=$ac_dir
>     break
>   fi
> done
> fi
>+
> rm -f conftest.err conftest.$ac_ext
> fi # $ac_x_includes = no
> 
>@@ -8646,44 +19535,40 @@
>   # See if we find them without any special options.
>   # Don't add to $LIBS permanently.
>   ac_save_LIBS=$LIBS
>-  LIBS="-lXt $LIBS"
>+  LIBS="-lX11 $LIBS"
>   cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
>-#include <X11/Intrinsic.h>
>+#include <X11/Xlib.h>
> int
> main ()
> {
>-XtMalloc (0)
>+XrmInitialize ()
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   LIBS=$ac_save_LIBS
> # We can link X programs with no special library path.
> ac_x_libraries=
>@@ -8691,63 +19576,67 @@
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-LIBS=$ac_save_LIBS
>+	LIBS=$ac_save_LIBS
> for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
> do
>   # Don't even attempt the hair of trying to link an X program!
>   for ac_extension in a so sl; do
>-    if test -r $ac_dir/libXt.$ac_extension; then
>+    if test -r "$ac_dir/libX11.$ac_extension"; then
>       ac_x_libraries=$ac_dir
>       break 2
>     fi
>   done
> done
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> fi # $ac_x_libraries = no
> 
>-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
>-  # Didn't find X anywhere.  Cache the known absence of X.
>-  ac_cv_have_x="have_x=no"
>-else
>-  # Record where we found X for the cache.
>-  ac_cv_have_x="have_x=yes \
>-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
>-fi
>+case $ac_x_includes,$ac_x_libraries in #(
>+  no,* | *,no | *\'*)
>+    # Didn't find X, or a directory has "'" in its name.
>+    ac_cv_have_x="have_x=no";; #(
>+  *)
>+    # Record where we found X for the cache.
>+    ac_cv_have_x="have_x=yes\
>+	ac_x_includes='$ac_x_includes'\
>+	ac_x_libraries='$ac_x_libraries'"
>+esac
> fi
>-
>-  fi
>+;; #(
>+    *) have_x=yes;;
>+  esac
>   eval "$ac_cv_have_x"
> fi # $with_x != no
> 
> if test "$have_x" != yes; then
>-  echo "$as_me:$LINENO: result: $have_x" >&5
>-echo "${ECHO_T}$have_x" >&6
>+  { echo "$as_me:$LINENO: result: $have_x" >&5
>+echo "${ECHO_T}$have_x" >&6; }
>   no_x=yes
> else
>   # If each of the values was on the command line, it overrides each guess.
>   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
>   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
>   # Update the cache value to reflect the command line values.
>-  ac_cv_have_x="have_x=yes \
>-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
>-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
>-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
>+  ac_cv_have_x="have_x=yes\
>+	ac_x_includes='$x_includes'\
>+	ac_x_libraries='$x_libraries'"
>+  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
>+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
> fi
> 
> 
> 
>-ac_ext=cc
>+ac_ext=cpp
> ac_cpp='$CXXCPP $CPPFLAGS'
> ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
> ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
> 
> 
>-
>-echo "$as_me:$LINENO: checking for ulInit in -lplibul" >&5
>-echo $ECHO_N "checking for ulInit in -lplibul... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for ulInit in -lplibul" >&5
>+echo $ECHO_N "checking for ulInit in -lplibul... $ECHO_C" >&6; }
> if test "${ac_cv_lib_plibul_ulInit+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -8760,56 +19649,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char ulInit ();
> int
> main ()
> {
>-ulInit ();
>+return ulInit ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_plibul_ulInit=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_plibul_ulInit=no
>+	ac_cv_lib_plibul_ulInit=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_plibul_ulInit" >&5
>-echo "${ECHO_T}$ac_cv_lib_plibul_ulInit" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_plibul_ulInit" >&5
>+echo "${ECHO_T}$ac_cv_lib_plibul_ulInit" >&6; }
> if test $ac_cv_lib_plibul_ulInit = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBPLIBUL 1
>@@ -8830,253 +19716,23 @@
> else
> 	{ { echo "$as_me:$LINENO: error: libsigc++ >= v1.2.0 is required." >&5
> echo "$as_me: error: libsigc++ >= v1.2.0 is required." >&2;}
>-   { (exit 1); exit 1; }; }
>-fi
>-
>-
>-ac_ext=cc
>-ac_cpp='$CXXCPP $CPPFLAGS'
>-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
>-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
>-if test -z "$CXXCPP"; then
>-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-      # Double quotes because CXXCPP needs to be expanded
>-    for CXXCPP in "$CXX -E" "/lib/cpp"
>-    do
>-      ac_preproc_ok=false
>-for ac_cxx_preproc_warn_flag in '' yes
>-do
>-  # Use a header file that comes with gcc, so configuring glibc
>-  # with a fresh cross-compiler works.
>-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-  # <limits.h> exists even on freestanding compilers.
>-  # On the NeXT, cc -E runs the code through the compiler's parser,
>-  # not just through cpp. "Syntax error" is here to catch this case.
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>-		     Syntax error
>-_ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>-  :
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-  # Broken: fails on valid input.
>-continue
>-fi
>-rm -f conftest.err conftest.$ac_ext
>-
>-  # OK, works on sane cases.  Now check whether non-existent headers
>-  # can be detected and how.
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-#include <ac_nonexistent.h>
>-_ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>-  # Broken: success on invalid input.
>-continue
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-  # Passes both tests.
>-ac_preproc_ok=:
>-break
>-fi
>-rm -f conftest.err conftest.$ac_ext
>-
>-done
>-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
>-rm -f conftest.err conftest.$ac_ext
>-if $ac_preproc_ok; then
>-  break
>-fi
>-
>-    done
>-    ac_cv_prog_CXXCPP=$CXXCPP
>-
>-fi
>-  CXXCPP=$ac_cv_prog_CXXCPP
>-else
>-  ac_cv_prog_CXXCPP=$CXXCPP
>-fi
>-echo "$as_me:$LINENO: result: $CXXCPP" >&5
>-echo "${ECHO_T}$CXXCPP" >&6
>-ac_preproc_ok=false
>-for ac_cxx_preproc_warn_flag in '' yes
>-do
>-  # Use a header file that comes with gcc, so configuring glibc
>-  # with a fresh cross-compiler works.
>-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-  # <limits.h> exists even on freestanding compilers.
>-  # On the NeXT, cc -E runs the code through the compiler's parser,
>-  # not just through cpp. "Syntax error" is here to catch this case.
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>-		     Syntax error
>-_ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>-  :
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-  # Broken: fails on valid input.
>-continue
>-fi
>-rm -f conftest.err conftest.$ac_ext
>-
>-  # OK, works on sane cases.  Now check whether non-existent headers
>-  # can be detected and how.
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-#include <ac_nonexistent.h>
>-_ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>-  # Broken: success on invalid input.
>-continue
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-  # Passes both tests.
>-ac_preproc_ok=:
>-break
>-fi
>-rm -f conftest.err conftest.$ac_ext
>-
>-done
>-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
>-rm -f conftest.err conftest.$ac_ext
>-if $ac_preproc_ok; then
>-  :
>-else
>-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
>-See \`config.log' for more details." >&5
>-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
>-See \`config.log' for more details." >&2;}
>-   { (exit 1); exit 1; }; }
>-fi
>-
>-ac_ext=cc
>-ac_cpp='$CXXCPP $CPPFLAGS'
>-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>+   { (exit 1); exit 1; }; }
>+fi
>+
> 
> 
> if test "${ac_cv_header_windows_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for windows.h" >&5
>-echo $ECHO_N "checking for windows.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for windows.h" >&5
>+echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_windows_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
>-echo "${ECHO_T}$ac_cv_header_windows_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
>+echo "${ECHO_T}$ac_cv_header_windows_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking windows.h usability" >&5
>-echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking windows.h usability" >&5
>+echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9087,41 +19743,37 @@
> #include <windows.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking windows.h presence" >&5
>-echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking windows.h presence" >&5
>+echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9130,24 +19782,22 @@
> /* end confdefs.h.  */
> #include <windows.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -9155,9 +19805,10 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
> case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>@@ -9181,25 +19832,23 @@
> echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for windows.h" >&5
>-echo $ECHO_N "checking for windows.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for windows.h" >&5
>+echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_windows_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_windows_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
>-echo "${ECHO_T}$ac_cv_header_windows_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
>+echo "${ECHO_T}$ac_cv_header_windows_h" >&6; }
> 
> fi
> if test $ac_cv_header_windows_h = yes; then
>@@ -9212,17 +19861,17 @@
> 
> 
> if test "${ac_cv_header_sigcpp_sigcpp_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for sigc++/sigc++.h" >&5
>-echo $ECHO_N "checking for sigc++/sigc++.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for sigc++/sigc++.h" >&5
>+echo $ECHO_N "checking for sigc++/sigc++.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_sigcpp_sigcpp_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_sigcpp_sigcpp_h" >&5
>-echo "${ECHO_T}$ac_cv_header_sigcpp_sigcpp_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_sigcpp_sigcpp_h" >&5
>+echo "${ECHO_T}$ac_cv_header_sigcpp_sigcpp_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking sigc++/sigc++.h usability" >&5
>-echo $ECHO_N "checking sigc++/sigc++.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking sigc++/sigc++.h usability" >&5
>+echo $ECHO_N "checking sigc++/sigc++.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9233,41 +19882,37 @@
> #include <sigc++/sigc++.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking sigc++/sigc++.h presence" >&5
>-echo $ECHO_N "checking sigc++/sigc++.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking sigc++/sigc++.h presence" >&5
>+echo $ECHO_N "checking sigc++/sigc++.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9276,24 +19921,22 @@
> /* end confdefs.h.  */
> #include <sigc++/sigc++.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -9301,9 +19944,10 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
> case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>@@ -9327,25 +19971,23 @@
> echo "$as_me: WARNING: sigc++/sigc++.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: sigc++/sigc++.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: sigc++/sigc++.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for sigc++/sigc++.h" >&5
>-echo $ECHO_N "checking for sigc++/sigc++.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for sigc++/sigc++.h" >&5
>+echo $ECHO_N "checking for sigc++/sigc++.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_sigcpp_sigcpp_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_sigcpp_sigcpp_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_sigcpp_sigcpp_h" >&5
>-echo "${ECHO_T}$ac_cv_header_sigcpp_sigcpp_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_sigcpp_sigcpp_h" >&5
>+echo "${ECHO_T}$ac_cv_header_sigcpp_sigcpp_h" >&6; }
> 
> fi
> if test $ac_cv_header_sigcpp_sigcpp_h = yes; then
>@@ -9362,17 +20004,17 @@
> _ACEOF
> 
> if test "${ac_cv_header_plib_ul_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for plib/ul.h" >&5
>-echo $ECHO_N "checking for plib/ul.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for plib/ul.h" >&5
>+echo $ECHO_N "checking for plib/ul.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_plib_ul_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_plib_ul_h" >&5
>-echo "${ECHO_T}$ac_cv_header_plib_ul_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_plib_ul_h" >&5
>+echo "${ECHO_T}$ac_cv_header_plib_ul_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking plib/ul.h usability" >&5
>-echo $ECHO_N "checking plib/ul.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking plib/ul.h usability" >&5
>+echo $ECHO_N "checking plib/ul.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9383,41 +20025,37 @@
> #include <plib/ul.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking plib/ul.h presence" >&5
>-echo $ECHO_N "checking plib/ul.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking plib/ul.h presence" >&5
>+echo $ECHO_N "checking plib/ul.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9426,24 +20064,22 @@
> /* end confdefs.h.  */
> #include <plib/ul.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -9451,9 +20087,10 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
> case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>@@ -9477,25 +20114,23 @@
> echo "$as_me: WARNING: plib/ul.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: plib/ul.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: plib/ul.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for plib/ul.h" >&5
>-echo $ECHO_N "checking for plib/ul.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for plib/ul.h" >&5
>+echo $ECHO_N "checking for plib/ul.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_plib_ul_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_plib_ul_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_plib_ul_h" >&5
>-echo "${ECHO_T}$ac_cv_header_plib_ul_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_plib_ul_h" >&5
>+echo "${ECHO_T}$ac_cv_header_plib_ul_h" >&6; }
> 
> fi
> if test $ac_cv_header_plib_ul_h = yes; then
>@@ -9508,17 +20143,17 @@
> 
> 
> if test "${ac_cv_header_plib_js_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for plib/js.h" >&5
>-echo $ECHO_N "checking for plib/js.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for plib/js.h" >&5
>+echo $ECHO_N "checking for plib/js.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_plib_js_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_plib_js_h" >&5
>-echo "${ECHO_T}$ac_cv_header_plib_js_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_plib_js_h" >&5
>+echo "${ECHO_T}$ac_cv_header_plib_js_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking plib/js.h usability" >&5
>-echo $ECHO_N "checking plib/js.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking plib/js.h usability" >&5
>+echo $ECHO_N "checking plib/js.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9529,41 +20164,37 @@
> #include <plib/js.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking plib/js.h presence" >&5
>-echo $ECHO_N "checking plib/js.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking plib/js.h presence" >&5
>+echo $ECHO_N "checking plib/js.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -9572,24 +20203,22 @@
> /* end confdefs.h.  */
> #include <plib/js.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -9597,9 +20226,10 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
> case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>@@ -9623,25 +20253,23 @@
> echo "$as_me: WARNING: plib/js.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: plib/js.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: plib/js.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for plib/js.h" >&5
>-echo $ECHO_N "checking for plib/js.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for plib/js.h" >&5
>+echo $ECHO_N "checking for plib/js.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_plib_js_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_plib_js_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_plib_js_h" >&5
>-echo "${ECHO_T}$ac_cv_header_plib_js_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_plib_js_h" >&5
>+echo "${ECHO_T}$ac_cv_header_plib_js_h" >&6; }
> 
> fi
> if test $ac_cv_header_plib_js_h = yes; then
>@@ -9654,13 +20282,6 @@
> 
> 
> 
>-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
>-
>-
> 
> 
> if test "x$ac_cv_header_windows_h" != "xyes" ; then
>@@ -9682,12 +20303,12 @@
>     X_LIBS="$X_LIBS -L$x_libraries"
>     # For Solaris; some versions of Sun CC require a space after -R and
>     # others require no space.  Words are not sufficient . . . .
>-    case `(uname -sr) 2>/dev/null` in
>-    "SunOS 5"*)
>-      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
>-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
>-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
>-      cat >conftest.$ac_ext <<_ACEOF
>+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
>+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
>+    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
>+    ac_xsave_cxx_werror_flag=$ac_cxx_werror_flag
>+    ac_cxx_werror_flag=yes
>+    cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
>@@ -9703,43 +20324,32 @@
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_R_nospace=yes
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  { echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6; }
>+       X_LIBS="$X_LIBS -R$x_libraries"
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_R_nospace=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-      if test $ac_R_nospace = yes; then
>-	echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>-	X_LIBS="$X_LIBS -R$x_libraries"
>-      else
> 	LIBS="$ac_xsave_LIBS -R $x_libraries"
>-	cat >conftest.$ac_ext <<_ACEOF
>+       cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
>@@ -9755,47 +20365,42 @@
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_R_space=yes
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>+  { echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
>+	  X_LIBS="$X_LIBS -R $x_libraries"
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_R_space=no
>+	{ echo "$as_me:$LINENO: result: neither works" >&5
>+echo "${ECHO_T}neither works" >&6; }
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
>-	if test $ac_R_space = yes; then
>-	  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>-	  X_LIBS="$X_LIBS -R $x_libraries"
>-	else
>-	  echo "$as_me:$LINENO: result: neither works" >&5
>-echo "${ECHO_T}neither works" >&6
>-	fi
>-      fi
>-      LIBS=$ac_xsave_LIBS
>-    esac
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>+      conftest$ac_exeext conftest.$ac_ext
>+    ac_cxx_werror_flag=$ac_xsave_cxx_werror_flag
>+    LIBS=$ac_xsave_LIBS
>   fi
> 
>   # Check for system-dependent libraries X programs must link with.
>@@ -9816,50 +20421,46 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char XOpenDisplay ();
> int
> main ()
> {
>-XOpenDisplay ();
>+return XOpenDisplay ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   :
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
>-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
>+	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
>+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
> if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -9872,63 +20473,60 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char dnet_ntoa ();
> int
> main ()
> {
>-dnet_ntoa ();
>+return dnet_ntoa ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_dnet_dnet_ntoa=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_dnet_dnet_ntoa=no
>+	ac_cv_lib_dnet_dnet_ntoa=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
>-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
>+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
> if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
>   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
> fi
> 
>     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
>-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
>-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
>+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
>+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
> if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -9941,63 +20539,61 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char dnet_ntoa ();
> int
> main ()
> {
>-dnet_ntoa ();
>+return dnet_ntoa ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_dnet_stub_dnet_ntoa=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_dnet_stub_dnet_ntoa=no
>+	ac_cv_lib_dnet_stub_dnet_ntoa=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
>-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
>+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
> if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
>   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
> fi
> 
>     fi
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
>     LIBS="$ac_xsave_LIBS"
> 
>@@ -10009,8 +20605,8 @@
>     # on Irix 5.2, according to T.E. Dickey.
>     # The functions gethostbyname, getservbyname, and inet_addr are
>     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
>-    echo "$as_me:$LINENO: checking for gethostbyname" >&5
>-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
>+    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
>+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
> if test "${ac_cv_func_gethostbyname+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10037,72 +20633,63 @@
> 
> #undef gethostbyname
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char gethostbyname ();
> /* The GNU C library defines this for functions which it implements
>     to always fail with ENOSYS.  Some functions are actually named
>     something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
>+#if defined __stub_gethostbyname || defined __stub___gethostbyname
> choke me
>-#else
>-char (*f) () = gethostbyname;
>-#endif
>-#ifdef __cplusplus
>-}
> #endif
> 
> int
> main ()
> {
>-return f != gethostbyname;
>+return gethostbyname ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_func_gethostbyname=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_func_gethostbyname=no
>+	ac_cv_func_gethostbyname=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
>-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
>+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
> 
>     if test $ac_cv_func_gethostbyname = no; then
>-      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
>-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
>+      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
>+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
> if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10115,63 +20702,60 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char gethostbyname ();
> int
> main ()
> {
>-gethostbyname ();
>+return gethostbyname ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_nsl_gethostbyname=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_nsl_gethostbyname=no
>+	ac_cv_lib_nsl_gethostbyname=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
>-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
>+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
> if test $ac_cv_lib_nsl_gethostbyname = yes; then
>   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
> fi
> 
>       if test $ac_cv_lib_nsl_gethostbyname = no; then
>-	echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
>-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
>+	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
>+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
> if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10184,56 +20768,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char gethostbyname ();
> int
> main ()
> {
>-gethostbyname ();
>+return gethostbyname ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_bsd_gethostbyname=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_bsd_gethostbyname=no
>+	ac_cv_lib_bsd_gethostbyname=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
>-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
>+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
> if test $ac_cv_lib_bsd_gethostbyname = yes; then
>   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
> fi
>@@ -10248,8 +20829,8 @@
>     # variants that don't use the name server (or something).  -lsocket
>     # must be given before -lnsl if both are needed.  We assume that
>     # if connect needs -lnsl, so does gethostbyname.
>-    echo "$as_me:$LINENO: checking for connect" >&5
>-echo $ECHO_N "checking for connect... $ECHO_C" >&6
>+    { echo "$as_me:$LINENO: checking for connect" >&5
>+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
> if test "${ac_cv_func_connect+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10276,72 +20857,63 @@
> 
> #undef connect
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char connect ();
> /* The GNU C library defines this for functions which it implements
>     to always fail with ENOSYS.  Some functions are actually named
>     something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_connect) || defined (__stub___connect)
>+#if defined __stub_connect || defined __stub___connect
> choke me
>-#else
>-char (*f) () = connect;
>-#endif
>-#ifdef __cplusplus
>-}
> #endif
> 
> int
> main ()
> {
>-return f != connect;
>+return connect ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_func_connect=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_func_connect=no
>+	ac_cv_func_connect=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
>-echo "${ECHO_T}$ac_cv_func_connect" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
>+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
> 
>     if test $ac_cv_func_connect = no; then
>-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
>-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
>+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
>+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
> if test "${ac_cv_lib_socket_connect+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10354,56 +20926,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char connect ();
> int
> main ()
> {
>-connect ();
>+return connect ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_socket_connect=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_socket_connect=no
>+	ac_cv_lib_socket_connect=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
>-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
>+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
> if test $ac_cv_lib_socket_connect = yes; then
>   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
> fi
>@@ -10411,8 +20980,8 @@
>     fi
> 
>     # Guillermo Gomez says -lposix is necessary on A/UX.
>-    echo "$as_me:$LINENO: checking for remove" >&5
>-echo $ECHO_N "checking for remove... $ECHO_C" >&6
>+    { echo "$as_me:$LINENO: checking for remove" >&5
>+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
> if test "${ac_cv_func_remove+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10439,72 +21008,63 @@
> 
> #undef remove
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char remove ();
> /* The GNU C library defines this for functions which it implements
>     to always fail with ENOSYS.  Some functions are actually named
>     something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_remove) || defined (__stub___remove)
>+#if defined __stub_remove || defined __stub___remove
> choke me
>-#else
>-char (*f) () = remove;
>-#endif
>-#ifdef __cplusplus
>-}
> #endif
> 
> int
> main ()
> {
>-return f != remove;
>+return remove ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_func_remove=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_func_remove=no
>+	ac_cv_func_remove=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
>-echo "${ECHO_T}$ac_cv_func_remove" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
>+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
> 
>     if test $ac_cv_func_remove = no; then
>-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
>-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
>+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
>+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
> if test "${ac_cv_lib_posix_remove+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10517,56 +21077,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char remove ();
> int
> main ()
> {
>-remove ();
>+return remove ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_posix_remove=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_posix_remove=no
>+	ac_cv_lib_posix_remove=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
>-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
>+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
> if test $ac_cv_lib_posix_remove = yes; then
>   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
> fi
>@@ -10574,8 +21131,8 @@
>     fi
> 
>     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
>-    echo "$as_me:$LINENO: checking for shmat" >&5
>-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
>+    { echo "$as_me:$LINENO: checking for shmat" >&5
>+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
> if test "${ac_cv_func_shmat+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10602,72 +21159,63 @@
> 
> #undef shmat
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char shmat ();
> /* The GNU C library defines this for functions which it implements
>     to always fail with ENOSYS.  Some functions are actually named
>     something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_shmat) || defined (__stub___shmat)
>+#if defined __stub_shmat || defined __stub___shmat
> choke me
>-#else
>-char (*f) () = shmat;
>-#endif
>-#ifdef __cplusplus
>-}
> #endif
> 
> int
> main ()
> {
>-return f != shmat;
>+return shmat ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_func_shmat=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_func_shmat=no
>+	ac_cv_func_shmat=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
>-echo "${ECHO_T}$ac_cv_func_shmat" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
>+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
> 
>     if test $ac_cv_func_shmat = no; then
>-      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
>-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
>+      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
>+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
> if test "${ac_cv_lib_ipc_shmat+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10680,56 +21228,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char shmat ();
> int
> main ()
> {
>-shmat ();
>+return shmat ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_ipc_shmat=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_ipc_shmat=no
>+	ac_cv_lib_ipc_shmat=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
>-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
>+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
> if test $ac_cv_lib_ipc_shmat = yes; then
>   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
> fi
>@@ -10746,8 +21291,8 @@
>   # These have to be linked with before -lX11, unlike the other
>   # libraries we check for below, so use a different variable.
>   # John Interrante, Karl Berry
>-  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
>-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
>+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
> if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10760,56 +21305,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char IceConnectionNumber ();
> int
> main ()
> {
>-IceConnectionNumber ();
>+return IceConnectionNumber ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_ICE_IceConnectionNumber=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_ICE_IceConnectionNumber=no
>+	ac_cv_lib_ICE_IceConnectionNumber=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
>-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
>+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
> if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
>   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
> fi
>@@ -10821,8 +21363,8 @@
>     x_suffix="$X_LIBS $X_PRE_LIBS -lX11 -lXi -lXext -lXmu $X_EXTRA_LIBS"
> 
> 
>-echo "$as_me:$LINENO: checking for dlclose in -ldl" >&5
>-echo $ECHO_N "checking for dlclose in -ldl... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for dlclose in -ldl" >&5
>+echo $ECHO_N "checking for dlclose in -ldl... $ECHO_C" >&6; }
> if test "${ac_cv_lib_dl_dlclose+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10835,56 +21377,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char dlclose ();
> int
> main ()
> {
>-dlclose ();
>+return dlclose ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_dl_dlclose=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_dl_dlclose=no
>+	ac_cv_lib_dl_dlclose=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlclose" >&5
>-echo "${ECHO_T}$ac_cv_lib_dl_dlclose" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlclose" >&5
>+echo "${ECHO_T}$ac_cv_lib_dl_dlclose" >&6; }
> if test $ac_cv_lib_dl_dlclose = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBDL 1
>@@ -10896,8 +21435,8 @@
> 
> 
> 
>-echo "$as_me:$LINENO: checking for glNewList in -lGL" >&5
>-echo $ECHO_N "checking for glNewList in -lGL... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for glNewList in -lGL" >&5
>+echo $ECHO_N "checking for glNewList in -lGL... $ECHO_C" >&6; }
> if test "${ac_cv_lib_GL_glNewList+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10910,56 +21449,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char glNewList ();
> int
> main ()
> {
>-glNewList ();
>+return glNewList ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_GL_glNewList=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_GL_glNewList=no
>+	ac_cv_lib_GL_glNewList=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glNewList" >&5
>-echo "${ECHO_T}$ac_cv_lib_GL_glNewList" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glNewList" >&5
>+echo "${ECHO_T}$ac_cv_lib_GL_glNewList" >&6; }
> if test $ac_cv_lib_GL_glNewList = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBGL 1
>@@ -10971,8 +21507,8 @@
> 
>     if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
> 
>-echo "$as_me:$LINENO: checking for glNewList in -lMesaGL" >&5
>-echo $ECHO_N "checking for glNewList in -lMesaGL... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for glNewList in -lMesaGL" >&5
>+echo $ECHO_N "checking for glNewList in -lMesaGL... $ECHO_C" >&6; }
> if test "${ac_cv_lib_MesaGL_glNewList+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -10985,56 +21521,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char glNewList ();
> int
> main ()
> {
>-glNewList ();
>+return glNewList ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_MesaGL_glNewList=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_MesaGL_glNewList=no
>+	ac_cv_lib_MesaGL_glNewList=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_MesaGL_glNewList" >&5
>-echo "${ECHO_T}$ac_cv_lib_MesaGL_glNewList" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_MesaGL_glNewList" >&5
>+echo "${ECHO_T}$ac_cv_lib_MesaGL_glNewList" >&6; }
> if test $ac_cv_lib_MesaGL_glNewList = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBMESAGL 1
>@@ -11048,17 +21581,17 @@
> 
>         if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
>         if test "${ac_cv_header_GL_xmesa_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for GL/xmesa.h" >&5
>-echo $ECHO_N "checking for GL/xmesa.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for GL/xmesa.h" >&5
>+echo $ECHO_N "checking for GL/xmesa.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_GL_xmesa_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_GL_xmesa_h" >&5
>-echo "${ECHO_T}$ac_cv_header_GL_xmesa_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_xmesa_h" >&5
>+echo "${ECHO_T}$ac_cv_header_GL_xmesa_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking GL/xmesa.h usability" >&5
>-echo $ECHO_N "checking GL/xmesa.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking GL/xmesa.h usability" >&5
>+echo $ECHO_N "checking GL/xmesa.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -11069,41 +21602,37 @@
> #include <GL/xmesa.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking GL/xmesa.h presence" >&5
>-echo $ECHO_N "checking GL/xmesa.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking GL/xmesa.h presence" >&5
>+echo $ECHO_N "checking GL/xmesa.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -11112,24 +21641,22 @@
> /* end confdefs.h.  */
> #include <GL/xmesa.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -11137,12 +21664,13 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
>-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
>+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>   yes:no: )
>     { echo "$as_me:$LINENO: WARNING: GL/xmesa.h: accepted by the compiler, rejected by the preprocessor!" >&5
> echo "$as_me: WARNING: GL/xmesa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
>@@ -11163,32 +21691,28 @@
> echo "$as_me: WARNING: GL/xmesa.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: GL/xmesa.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: GL/xmesa.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for GL/xmesa.h" >&5
>-echo $ECHO_N "checking for GL/xmesa.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for GL/xmesa.h" >&5
>+echo $ECHO_N "checking for GL/xmesa.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_GL_xmesa_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_GL_xmesa_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_GL_xmesa_h" >&5
>-echo "${ECHO_T}$ac_cv_header_GL_xmesa_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_xmesa_h" >&5
>+echo "${ECHO_T}$ac_cv_header_GL_xmesa_h" >&6; }
> 
> fi
> 
> 
>-
>-
>-if \
>+         if \
>                        test "x$ac_cv_header_GL_xmesa_h" = "xyes"; then
>   ENABLE_XMESA_FX_TRUE=
>   ENABLE_XMESA_FX_FALSE='#'
>@@ -11198,9 +21722,7 @@
> fi
> 
>     else
>-
>-
>-if test "no" = "yes"; then
>+                 if test "no" = "yes"; then
>   ENABLE_XMESA_FX_TRUE=
>   ENABLE_XMESA_FX_FALSE='#'
> else
>@@ -11211,8 +21733,8 @@
>     fi
> 
> 
>-echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5
>-echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5
>+echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6; }
> if test "${ac_cv_lib_GLU_gluLookAt+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -11225,56 +21747,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char gluLookAt ();
> int
> main ()
> {
>-gluLookAt ();
>+return gluLookAt ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_GLU_gluLookAt=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_GLU_gluLookAt=no
>+	ac_cv_lib_GLU_gluLookAt=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluLookAt" >&5
>-echo "${ECHO_T}$ac_cv_lib_GLU_gluLookAt" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluLookAt" >&5
>+echo "${ECHO_T}$ac_cv_lib_GLU_gluLookAt" >&6; }
> if test $ac_cv_lib_GLU_gluLookAt = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBGLU 1
>@@ -11286,8 +21805,8 @@
> 
>     if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
> 
>-echo "$as_me:$LINENO: checking for gluLookAt in -lMesaGLU" >&5
>-echo $ECHO_N "checking for gluLookAt in -lMesaGLU... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for gluLookAt in -lMesaGLU" >&5
>+echo $ECHO_N "checking for gluLookAt in -lMesaGLU... $ECHO_C" >&6; }
> if test "${ac_cv_lib_MesaGLU_gluLookAt+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -11300,56 +21819,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char gluLookAt ();
> int
> main ()
> {
>-gluLookAt ();
>+return gluLookAt ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_MesaGLU_gluLookAt=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_MesaGLU_gluLookAt=no
>+	ac_cv_lib_MesaGLU_gluLookAt=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_MesaGLU_gluLookAt" >&5
>-echo "${ECHO_T}$ac_cv_lib_MesaGLU_gluLookAt" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_MesaGLU_gluLookAt" >&5
>+echo "${ECHO_T}$ac_cv_lib_MesaGLU_gluLookAt" >&6; }
> if test $ac_cv_lib_MesaGLU_gluLookAt = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBMESAGLU 1
>@@ -11364,8 +21880,8 @@
>     opengl_LIBS="$LIBS $x_suffix"
> 
> 
>-echo "$as_me:$LINENO: checking for glutGetModifiers in -lfreeglut" >&5
>-echo $ECHO_N "checking for glutGetModifiers in -lfreeglut... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for glutGetModifiers in -lfreeglut" >&5
>+echo $ECHO_N "checking for glutGetModifiers in -lfreeglut... $ECHO_C" >&6; }
> if test "${ac_cv_lib_freeglut_glutGetModifiers+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -11378,56 +21894,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char glutGetModifiers ();
> int
> main ()
> {
>-glutGetModifiers ();
>+return glutGetModifiers ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_freeglut_glutGetModifiers=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_freeglut_glutGetModifiers=no
>+	ac_cv_lib_freeglut_glutGetModifiers=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_freeglut_glutGetModifiers" >&5
>-echo "${ECHO_T}$ac_cv_lib_freeglut_glutGetModifiers" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_freeglut_glutGetModifiers" >&5
>+echo "${ECHO_T}$ac_cv_lib_freeglut_glutGetModifiers" >&6; }
> if test $ac_cv_lib_freeglut_glutGetModifiers = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBFREEGLUT 1
>@@ -11439,8 +21952,8 @@
> 
>     if test "x$ac_cv_lib_freeglut_glutGetModifiers" = "xno" ; then
> 
>-echo "$as_me:$LINENO: checking for glutGetModifiers in -lglut" >&5
>-echo $ECHO_N "checking for glutGetModifiers in -lglut... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for glutGetModifiers in -lglut" >&5
>+echo $ECHO_N "checking for glutGetModifiers in -lglut... $ECHO_C" >&6; }
> if test "${ac_cv_lib_glut_glutGetModifiers+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -11453,56 +21966,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char glutGetModifiers ();
> int
> main ()
> {
>-glutGetModifiers ();
>+return glutGetModifiers ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_glut_glutGetModifiers=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_glut_glutGetModifiers=no
>+	ac_cv_lib_glut_glutGetModifiers=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutGetModifiers" >&5
>-echo "${ECHO_T}$ac_cv_lib_glut_glutGetModifiers" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutGetModifiers" >&5
>+echo "${ECHO_T}$ac_cv_lib_glut_glutGetModifiers" >&6; }
> if test $ac_cv_lib_glut_glutGetModifiers = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBGLUT 1
>@@ -11521,9 +22031,9 @@
> for ac_header in windows.h GL/gl.h GL/glext.h
> do
> as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>-echo "$as_me:$LINENO: checking for $ac_header" >&5
>-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   cat >conftest.$ac_ext <<_ACEOF
>@@ -11543,38 +22053,35 @@
> #include <$ac_header>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   eval "$as_ac_Header=yes"
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-eval "$as_ac_Header=no"
>+	eval "$as_ac_Header=no"
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
>-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+ac_res=`eval echo '${'$as_ac_Header'}'`
>+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
>+echo "${ECHO_T}$ac_res" >&6; }
> if test `eval echo '${'$as_ac_Header'}'` = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
>@@ -11585,9 +22092,7 @@
> done
> 
> 
>-
>-
>-if test "no" = "yes"; then
>+     if test "no" = "yes"; then
>   ENABLE_XMESA_FX_TRUE=
>   ENABLE_XMESA_FX_FALSE='#'
> else
>@@ -11606,18 +22111,19 @@
> for ac_header in GL/gl.h GL/glu.h
> do
> as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>-  echo "$as_me:$LINENO: checking for $ac_header" >&5
>-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+ac_res=`eval echo '${'$as_ac_Header'}'`
>+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
>+echo "${ECHO_T}$ac_res" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking $ac_header usability" >&5
>-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
>+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -11628,41 +22134,37 @@
> #include <$ac_header>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking $ac_header presence" >&5
>-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
>+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -11671,24 +22173,22 @@
> /* end confdefs.h.  */
> #include <$ac_header>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -11696,12 +22196,13 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
>-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
>+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>   yes:no: )
>     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
> echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
>@@ -11722,25 +22223,24 @@
> echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for $ac_header" >&5
>-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>-if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
>+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   eval "$as_ac_Header=\$ac_header_preproc"
> fi
>-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+ac_res=`eval echo '${'$as_ac_Header'}'`
>+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
>+echo "${ECHO_T}$ac_res" >&6; }
> 
> fi
> if test `eval echo '${'$as_ac_Header'}'` = yes; then
>@@ -11757,17 +22257,17 @@
> done
> 
> if test "${ac_cv_header_GL_glut_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for GL/glut.h" >&5
>-echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for GL/glut.h" >&5
>+echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_GL_glut_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5
>-echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5
>+echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking GL/glut.h usability" >&5
>-echo $ECHO_N "checking GL/glut.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking GL/glut.h usability" >&5
>+echo $ECHO_N "checking GL/glut.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -11778,41 +22278,37 @@
> #include <GL/glut.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking GL/glut.h presence" >&5
>-echo $ECHO_N "checking GL/glut.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking GL/glut.h presence" >&5
>+echo $ECHO_N "checking GL/glut.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -11821,24 +22317,22 @@
> /* end confdefs.h.  */
> #include <GL/glut.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -11846,12 +22340,13 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
>-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
>+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>   yes:no: )
>     { echo "$as_me:$LINENO: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&5
> echo "$as_me: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
>@@ -11872,25 +22367,23 @@
> echo "$as_me: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for GL/glut.h" >&5
>-echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for GL/glut.h" >&5
>+echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_GL_glut_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_GL_glut_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5
>-echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5
>+echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6; }
> 
> fi
> if test $ac_cv_header_GL_glut_h = yes; then
>@@ -11904,8 +22397,8 @@
> 
> 
> 
>-echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
>-echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
>+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
> if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>@@ -11918,56 +22411,53 @@
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>+/* 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
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
> char png_sig_cmp ();
> int
> main ()
> {
>-png_sig_cmp ();
>+return png_sig_cmp ();
>   ;
>   return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>+if { (ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_link") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest$ac_exeext &&
>+       $as_test_x conftest$ac_exeext; then
>   ac_cv_lib_png_png_sig_cmp=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_png_png_sig_cmp=no
>+	ac_cv_lib_png_png_sig_cmp=no
> fi
>-rm -f conftest.err conftest.$ac_objext \
>+
>+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
>-echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
>+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
> if test $ac_cv_lib_png_png_sig_cmp = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBPNG 1
>@@ -11978,17 +22468,17 @@
> fi
> 
> if test "${ac_cv_header_png_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for png.h" >&5
>-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for png.h" >&5
>+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_png_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
>-echo "${ECHO_T}$ac_cv_header_png_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
>+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking png.h usability" >&5
>-echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking png.h usability" >&5
>+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -11999,41 +22489,37 @@
> #include <png.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_c_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking png.h presence" >&5
>-echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking png.h presence" >&5
>+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -12042,24 +22528,22 @@
> /* end confdefs.h.  */
> #include <png.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_c_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -12067,12 +22551,13 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
>-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
>+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>   yes:no: )
>     { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
> echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
>@@ -12093,25 +22578,23 @@
> echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for png.h" >&5
>-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for png.h" >&5
>+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_png_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_png_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
>-echo "${ECHO_T}$ac_cv_header_png_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
>+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
> 
> fi
> if test $ac_cv_header_png_h = yes; then
>@@ -12124,24 +22607,18 @@
> 
> 
> 
>-ac_ext=cc
>-ac_cpp='$CXXCPP $CPPFLAGS'
>-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
>-
> if test "${ac_cv_header_cppunit_TestSuite_h+set}" = set; then
>-  echo "$as_me:$LINENO: checking for cppunit/TestSuite.h" >&5
>-echo $ECHO_N "checking for cppunit/TestSuite.h... $ECHO_C" >&6
>+  { echo "$as_me:$LINENO: checking for cppunit/TestSuite.h" >&5
>+echo $ECHO_N "checking for cppunit/TestSuite.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_cppunit_TestSuite_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_cppunit_TestSuite_h" >&5
>-echo "${ECHO_T}$ac_cv_header_cppunit_TestSuite_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_cppunit_TestSuite_h" >&5
>+echo "${ECHO_T}$ac_cv_header_cppunit_TestSuite_h" >&6; }
> else
>   # Is the header compilable?
>-echo "$as_me:$LINENO: checking cppunit/TestSuite.h usability" >&5
>-echo $ECHO_N "checking cppunit/TestSuite.h usability... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking cppunit/TestSuite.h usability" >&5
>+echo $ECHO_N "checking cppunit/TestSuite.h usability... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -12152,41 +22629,37 @@
> #include <cppunit/TestSuite.h>
> _ACEOF
> rm -f conftest.$ac_objext
>-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>conftest.er1
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-	 { ac_try='test -z "$ac_cxx_werror_flag"
>-			 || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-	 { ac_try='test -s conftest.$ac_objext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>+  (exit $ac_status); } && {
>+	 test -z "$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>   ac_header_compiler=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_header_compiler=no
>+	ac_header_compiler=no
> fi
>-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>-echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6; }
> 
> # Is the header present?
>-echo "$as_me:$LINENO: checking cppunit/TestSuite.h presence" >&5
>-echo $ECHO_N "checking cppunit/TestSuite.h presence... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking cppunit/TestSuite.h presence" >&5
>+echo $ECHO_N "checking cppunit/TestSuite.h presence... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -12195,24 +22668,22 @@
> /* end confdefs.h.  */
> #include <cppunit/TestSuite.h>
> _ACEOF
>-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+if { (ac_try="$ac_cpp conftest.$ac_ext"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
>   ac_status=$?
>   grep -v '^ *+' conftest.er1 >conftest.err
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } >/dev/null; then
>-  if test -s conftest.err; then
>-    ac_cpp_err=$ac_cxx_preproc_warn_flag
>-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
>-  else
>-    ac_cpp_err=
>-  fi
>-else
>-  ac_cpp_err=yes
>-fi
>-if test -z "$ac_cpp_err"; then
>+  (exit $ac_status); } >/dev/null && {
>+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
>+	 test ! -s conftest.err
>+       }; then
>   ac_header_preproc=yes
> else
>   echo "$as_me: failed program was:" >&5
>@@ -12220,9 +22691,10 @@
> 
>   ac_header_preproc=no
> fi
>+
> rm -f conftest.err conftest.$ac_ext
>-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>-echo "${ECHO_T}$ac_header_preproc" >&6
>+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6; }
> 
> # So?  What about this header?
> case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
>@@ -12246,25 +22718,23 @@
> echo "$as_me: WARNING: cppunit/TestSuite.h: proceeding with the preprocessor's result" >&2;}
>     { echo "$as_me:$LINENO: WARNING: cppunit/TestSuite.h: in the future, the compiler will take precedence" >&5
> echo "$as_me: WARNING: cppunit/TestSuite.h: in the future, the compiler will take precedence" >&2;}
>-    (
>-      cat <<\_ASBOX
>+    ( cat <<\_ASBOX
> ## -------------------------------------- ##
> ## Report this to snick-a-doo@comcast.net ##
> ## -------------------------------------- ##
> _ASBOX
>-    ) |
>-      sed "s/^/$as_me: WARNING:     /" >&2
>+     ) | sed "s/^/$as_me: WARNING:     /" >&2
>     ;;
> esac
>-echo "$as_me:$LINENO: checking for cppunit/TestSuite.h" >&5
>-echo $ECHO_N "checking for cppunit/TestSuite.h... $ECHO_C" >&6
>+{ echo "$as_me:$LINENO: checking for cppunit/TestSuite.h" >&5
>+echo $ECHO_N "checking for cppunit/TestSuite.h... $ECHO_C" >&6; }
> if test "${ac_cv_header_cppunit_TestSuite_h+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_cv_header_cppunit_TestSuite_h=$ac_header_preproc
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_header_cppunit_TestSuite_h" >&5
>-echo "${ECHO_T}$ac_cv_header_cppunit_TestSuite_h" >&6
>+{ echo "$as_me:$LINENO: result: $ac_cv_header_cppunit_TestSuite_h" >&5
>+echo "${ECHO_T}$ac_cv_header_cppunit_TestSuite_h" >&6; }
> 
> fi
> if test $ac_cv_header_cppunit_TestSuite_h = yes; then
>@@ -12276,10 +22746,14 @@
> 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
> 
> 
>-
>-if test x$unit_tests = xtrue; then
>+ if test x$unit_tests = xtrue; then
>   DO_UNIT_TESTS_TRUE=
>   DO_UNIT_TESTS_FALSE='#'
> else
>@@ -12288,7 +22762,7 @@
> fi
> 
> 
>-                                                                                                                                                                                                                                                          ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile body/Makefile geometry/Makefile media/Makefile track/Makefile world/Makefile include/Makefile include/vamos/Makefile include/vamos/body/Makefile include/vamos/geometry/Makefile include/vamos/media/Makefile include/vamos/track/Makefile include/vamos/world/Makefile vamos/Makefile data/Makefile data/cars/Makefile data/controls/Makefile data/textures/Makefile data/tracks/Makefile data/sounds/Makefile data/worlds/Makefile doc/Makefile caelum/Makefile"
>+ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile body/Makefile geometry/Makefile media/Makefile track/Makefile world/Makefile include/Makefile include/vamos/Makefile include/vamos/body/Makefile include/vamos/geometry/Makefile include/vamos/media/Makefile include/vamos/track/Makefile include/vamos/world/Makefile vamos/Makefile data/Makefile data/cars/Makefile data/controls/Makefile data/textures/Makefile data/tracks/Makefile data/sounds/Makefile data/worlds/Makefile doc/Makefile caelum/Makefile"
> 
> cat >confcache <<\_ACEOF
> # This file is a shell script that caches the results of configure
>@@ -12308,39 +22782,58 @@
> 
> # The following way of writing the cache mishandles newlines in values,
> # but we know of no workaround that is simple, portable, and efficient.
>-# So, don't put newlines in cache variables' values.
>+# So, we kill variables containing newlines.
> # Ultrix sh set writes to stderr and can't be redirected directly,
> # and sets the high bit in the cache file unless we assign to the vars.
>-{
>+(
>+  for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do
>+    eval ac_val=\$$ac_var
>+    case $ac_val in #(
>+    *${as_nl}*)
>+      case $ac_var in #(
>+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
>+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
>+      esac
>+      case $ac_var in #(
>+      _ | IFS | as_nl) ;; #(
>+      *) $as_unset $ac_var ;;
>+      esac ;;
>+    esac
>+  done
>+
>   (set) 2>&1 |
>-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
>-    *ac_space=\ *)
>+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
>+    *${as_nl}ac_space=\ *)
>       # `set' does not quote correctly, so add quotes (double-quote
>       # substitution turns \\\\ into \\, and sed turns \\ into \).
>       sed -n \
> 	"s/'/'\\\\''/g;
> 	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"
>-      ;;
>+      ;; #(
>     *)
>       # `set' quotes correctly as required by POSIX, so do not add quotes.
>-      sed -n \
>-	"s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"
>+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
>       ;;
>-    esac;
>-} |
>+    esac |
>+    sort
>+) |
>   sed '
>+     /^ac_cv_env_/b end
>      t clear
>-     : clear
>+     :clear
>      s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/
>      t end
>-     /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/
>-     : 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" && echo "updating cache $cache_file"
>+     s/^$[^=]*$=$.*$$/\1=${\1=\2}/
>+     :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" &&
>+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
>+echo "$as_me: updating cache $cache_file" >&6;}
>     cat confcache >$cache_file
>   else
>-    echo "not updating unwritable cache $cache_file"
>+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
>+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
>   fi
> fi
> rm -f confcache
>@@ -12349,63 +22842,48 @@
> # Let make expand exec_prefix.
> test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
> 
>-# VPATH may cause trouble with some makes, so we remove $(srcdir),
>-# ${srcdir} and @srcdir@ 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/;
>-s/:*$//;
>-s/^[^=]*=[	 ]*$//;
>-}'
>-fi
>-
> # Transform confdefs.h into DEFS.
> # Protect against shell expansion while executing Makefile rules.
> # Protect against Makefile macro expansion.
> #
> # If the first sed substitution is executed (which looks for macros that
>-# take arguments), then we branch to the quote section.  Otherwise,
>+# take arguments), then branch to the quote section.  Otherwise,
> # look for a macro that doesn't take arguments.
>-cat >confdef2opt.sed <<\_ACEOF
>+ac_script='
> t clear
>-: clear
>-s,^[	 ]*#[	 ]*define[	 ][	 ]*$[^	 (][^	 (]*([^)]*)$[	 ]*$.*$,-D\1=\2,g
>+:clear
>+s/^[	 ]*#[	 ]*define[	 ][	 ]*$[^	 (][^	 (]*([^)]*)$[	 ]*$.*$/-D\1=\2/g
> t quote
>-s,^[	 ]*#[	 ]*define[	 ][	 ]*$[^	 ][^	 ]*$[	 ]*$.*$,-D\1=\2,g
>+s/^[	 ]*#[	 ]*define[	 ][	 ]*$[^	 ][^	 ]*$[	 ]*$.*$/-D\1=\2/g
> t quote
>-d
>-: quote
>-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
>-s,\[,\\&,g
>-s,\],\\&,g
>-s,\$,$$,g
>-p
>-_ACEOF
>-# We use echo to avoid assuming a particular line-breaking character.
>-# The extra dot is to prevent the shell from consuming trailing
>-# line-breaks from the sub-command output.  A line-break within
>-# single-quotes doesn't work because, if this script is created in a
>-# platform that uses two characters for line-breaks (e.g., DOS), tr
>-# would break.
>-ac_LF_and_DOT=`echo; echo .`
>-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
>-rm -f confdef2opt.sed
>+b any
>+:quote
>+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
>+s/\[/\\&/g
>+s/\]/\\&/g
>+s/\$/$$/g
>+H
>+:any
>+${
>+	g
>+	s/^\n//
>+	s/\n/ /g
>+	p
>+}
>+'
>+DEFS=`sed -n "$ac_script" confdefs.h`
> 
> 
> ac_libobjs=
> ac_ltlibobjs=
> for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
>   # 1. Remove the extension, and $U if already installed.
>-  ac_i=`echo "$ac_i" |
>-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
>-  # 2. Add them.
>-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
>-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
>+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
>+  ac_i=`echo "$ac_i" | sed "$ac_script"`
>+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
>+  #    will be set to the directory where LIBOBJS objects are built.
>+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
>+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
> done
> LIBOBJS=$ac_libobjs
> 
>@@ -12485,17 +22963,45 @@
> ## M4sh Initialization.  ##
> ## --------------------- ##
> 
>-# Be Bourne compatible
>+# Be more Bourne compatible
>+DUALCASE=1; export DUALCASE # for MKS sh
> if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>   emulate sh
>   NULLCMD=:
>   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
>   # is contrary to our usage.  Disable this feature.
>   alias -g '${1+"$@"}'='"$@"'
>-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
>-  set -o posix
>+  setopt NO_GLOB_SUBST
>+else
>+  case `(set -o) 2>/dev/null` in
>+  *posix*) set -o posix ;;
>+esac
>+
>+fi
>+
>+
>+
>+
>+# PATH needs CR
>+# Avoid depending upon Character Ranges.
>+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
>+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
>+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
>+as_cr_digits='0123456789'
>+as_cr_alnum=$as_cr_Letters$as_cr_digits
>+
>+# The user is always right.
>+if test "${PATH_SEPARATOR+set}" != set; then
>+  echo "#! /bin/sh" >conf$$.sh
>+  echo  "exit 0"   >>conf$$.sh
>+  chmod +x conf$$.sh
>+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
>+    PATH_SEPARATOR=';'
>+  else
>+    PATH_SEPARATOR=:
>+  fi
>+  rm -f conf$$.sh
> fi
>-DUALCASE=1; export DUALCASE # for MKS sh
> 
> # Support unset when possible.
> if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
>@@ -12505,8 +23011,43 @@
> fi
> 
> 
>+# IFS
>+# We need space, tab and new line, in precisely that order.  Quoting is
>+# there to prevent editors from complaining about space-tab.
>+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
>+# splitting by setting IFS to empty value.)
>+as_nl='
>+'
>+IFS=" ""	$as_nl"
>+
>+# Find who we are.  Look in the path if we contain no directory separator.
>+case $0 in
>+  *[\\/]* ) as_myself=$0 ;;
>+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH
>+do
>+  IFS=$as_save_IFS
>+  test -z "$as_dir" && as_dir=.
>+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
>+done
>+IFS=$as_save_IFS
>+
>+     ;;
>+esac
>+# We did not find ourselves, most probably we were run as `sh COMMAND'
>+# in which case we are not to be found in the path.
>+if test "x$as_myself" = x; then
>+  as_myself=$0
>+fi
>+if test ! -f "$as_myself"; then
>+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
>+  { (exit 1); exit 1; }
>+fi
>+
> # Work around bugs in pre-3.0 UWIN ksh.
>-$as_unset ENV MAIL MAILPATH
>+for as_var in ENV MAIL MAILPATH
>+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
>+done
> PS1='$ '
> PS2='> '
> PS4='+ '
>@@ -12520,18 +23061,19 @@
>   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
>     eval $as_var=C; export $as_var
>   else
>-    $as_unset $as_var
>+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
>   fi
> done
> 
> # Required to use basename.
>-if expr a : '$a$' >/dev/null 2>&1; then
>+if expr a : '$a$' >/dev/null 2>&1 &&
>+   test "X`expr 00001 : '.*$...$'`" = X001; then
>   as_expr=expr
> else
>   as_expr=false
> fi
> 
>-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
>+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
>   as_basename=basename
> else
>   as_basename=false
>@@ -12539,159 +23081,120 @@
> 
> 
> # Name of the executable.
>-as_me=`$as_basename "$0" ||
>-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
>-	 X"$0" : 'X$//$$' \| \
>-	 X"$0" : 'X$/$$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>-echo X/"$0" |
>-    sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }
>-  	  /^X\/$\/\/$$/{ s//\1/; q; }
>-  	  /^X\/$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>-
>-
>-# PATH needs CR, and LINENO needs CR and PATH.
>-# Avoid depending upon Character Ranges.
>-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
>-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
>-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
>-as_cr_digits='0123456789'
>-as_cr_alnum=$as_cr_Letters$as_cr_digits
>-
>-# The user is always right.
>-if test "${PATH_SEPARATOR+set}" != set; then
>-  echo "#! /bin/sh" >conf$$.sh
>-  echo  "exit 0"   >>conf$$.sh
>-  chmod +x conf$$.sh
>-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
>-    PATH_SEPARATOR=';'
>-  else
>-    PATH_SEPARATOR=:
>-  fi
>-  rm -f conf$$.sh
>-fi
>-
>-
>-  as_lineno_1=$LINENO
>-  as_lineno_2=$LINENO
>-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
>-  test "x$as_lineno_1" != "x$as_lineno_2" &&
>-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
>-  # Find who we are.  Look in the path if we contain no path at all
>-  # relative or not.
>-  case $0 in
>-    *[\\/]* ) as_myself=$0 ;;
>-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>-for as_dir in $PATH
>-do
>-  IFS=$as_save_IFS
>-  test -z "$as_dir" && as_dir=.
>-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
>-done
>+as_me=`$as_basename -- "$0" ||
>+$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
>+	 X"$0" : 'X$//$$' \| \
>+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
>+echo X/"$0" |
>+    sed '/^.*\/$[^/][^/]*$\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X\/$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X\/$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
>+
>+# CDPATH.
>+$as_unset CDPATH
>+
>+
> 
>-       ;;
>-  esac
>-  # We did not find ourselves, most probably we were run as `sh COMMAND'
>-  # in which case we are not to be found in the path.
>-  if test "x$as_myself" = x; then
>-    as_myself=$0
>-  fi
>-  if test ! -f "$as_myself"; then
>-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
>-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
>-   { (exit 1); exit 1; }; }
>-  fi
>-  case $CONFIG_SHELL in
>-  '')
>-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
>-do
>-  IFS=$as_save_IFS
>-  test -z "$as_dir" && as_dir=.
>-  for as_base in sh bash ksh sh5; do
>-	 case $as_dir in
>-	 /*)
>-	   if ("$as_dir/$as_base" -c '
>   as_lineno_1=$LINENO
>   as_lineno_2=$LINENO
>-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
>   test "x$as_lineno_1" != "x$as_lineno_2" &&
>-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
>-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
>-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
>-	     CONFIG_SHELL=$as_dir/$as_base
>-	     export CONFIG_SHELL
>-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
>-	   fi;;
>-	 esac
>-       done
>-done
>-;;
>-  esac
>+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
> 
>   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
>   # uniformly replaced by the line number.  The first 'sed' inserts a
>-  # line-number line before each line; the second 'sed' does the real
>-  # work.  The second script uses 'N' to pair each line-number line
>-  # with the numbered line, and appends trailing '-' during
>-  # substitution so that $LINENO is not a special case at line end.
>+  # line-number line after each line using $LINENO; the second 'sed'
>+  # does the real work.  The second script uses 'N' to pair each
>+  # line-number line with the line containing $LINENO, and appends
>+  # trailing '-' during substitution so that $LINENO is not a special
>+  # case at line end.
>   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
>-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
>-  sed '=' <$as_myself |
>+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
>+  # E. McMahon (1931-1989) for sed's syntax.  :-)
>+  sed -n '
>+    p
>+    /[$]LINENO/=
>+  ' <$as_myself |
>     sed '
>+      s/[$]LINENO.*/&-/
>+      t lineno
>+      b
>+      :lineno
>       N
>-      s,$,-,
>-      : loop
>-      s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,
>+      :loop
>+      s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/
>       t loop
>-      s,-$,,
>-      s,^['$as_cr_digits']*\n,,
>+      s/-\n.*//
>     ' >$as_me.lineno &&
>-  chmod +x $as_me.lineno ||
>-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
>-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
>+  chmod +x "$as_me.lineno" ||
>+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
>    { (exit 1); exit 1; }; }
> 
>   # Don't try to exec as it changes $[0], causing all sort of problems
>   # (the dirname of $[0] is not the place where we might find the
>-  # original and so on.  Autoconf is especially sensible to this).
>-  . ./$as_me.lineno
>+  # original and so on.  Autoconf is especially sensitive to this).
>+  . "./$as_me.lineno"
>   # Exit status is that of the last command.
>   exit
> }
> 
> 
>-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
>-  *c*,-n*) ECHO_N= ECHO_C='
>-' ECHO_T='	' ;;
>-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
>-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
>+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
>+  as_dirname=dirname
>+else
>+  as_dirname=false
>+fi
>+
>+ECHO_C= ECHO_N= ECHO_T=
>+case `echo -n x` in
>+-n*)
>+  case `echo 'x\c'` in
>+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
>+  *)   ECHO_C='\c';;
>+  esac;;
>+*)
>+  ECHO_N='-n';;
> esac
> 
>-if expr a : '$a$' >/dev/null 2>&1; then
>+if expr a : '$a$' >/dev/null 2>&1 &&
>+   test "X`expr 00001 : '.*$...$'`" = X001; then
>   as_expr=expr
> else
>   as_expr=false
> fi
> 
> rm -f conf$$ conf$$.exe conf$$.file
>+if test -d conf$$.dir; then
>+  rm -f conf$$.dir/conf$$.file
>+else
>+  rm -f conf$$.dir
>+  mkdir conf$$.dir
>+fi
> echo >conf$$.file
> if ln -s conf$$.file conf$$ 2>/dev/null; then
>-  # We could just check for DJGPP; but this test a) works b) is more generic
>-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
>-  if test -f conf$$.exe; then
>-    # Don't use ln at all; we don't have any links
>+  as_ln_s='ln -s'
>+  # ... 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'.
>+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
>     as_ln_s='cp -p'
>-  else
>-    as_ln_s='ln -s'
>-  fi
> elif ln conf$$.file conf$$ 2>/dev/null; then
>   as_ln_s=ln
> else
>   as_ln_s='cp -p'
> fi
>-rm -f conf$$ conf$$.exe conf$$.file
>+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
>+rmdir conf$$.dir 2>/dev/null
> 
> if mkdir -p . 2>/dev/null; then
>   as_mkdir_p=:
>@@ -12700,7 +23203,28 @@
>   as_mkdir_p=false
> fi
> 
>-as_executable_p="test -f"
>+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
> 
> # 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'"
>@@ -12709,31 +23233,14 @@
> as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
> 
> 
>-# IFS
>-# We need space, tab and new line, in precisely that order.
>-as_nl='
>-'
>-IFS=" 	$as_nl"
>-
>-# CDPATH.
>-$as_unset CDPATH
>-
> exec 6>&1
> 
>-# Open the log real soon, to keep \$[0] and so on meaningful, and to
>+# Save the log message, to keep $[0] and so on meaningful, and to
> # report actual input values of CONFIG_FILES etc. instead of their
>-# values after options handling.  Logging --version etc. is OK.
>-exec 5>>config.log
>-{
>-  echo
>-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
>-## Running $as_me. ##
>-_ASBOX
>-} >&5
>-cat >&5 <<_CSEOF
>-
>+# values after options handling.
>+ac_log="
> This file was extended by vamos $as_me 0.5.5, which was
>-generated by GNU Autoconf 2.59.  Invocation command line was
>+generated by GNU Autoconf 2.61.  Invocation command line was
> 
>   CONFIG_FILES    = $CONFIG_FILES
>   CONFIG_HEADERS  = $CONFIG_HEADERS
>@@ -12741,30 +23248,19 @@
>   CONFIG_COMMANDS = $CONFIG_COMMANDS
>   $ $0 $@
> 
>-_CSEOF
>-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
>-echo >&5
>+on `(hostname || uname -n) 2>/dev/null | sed 1q`
>+"
>+
> _ACEOF
> 
>+cat >>$CONFIG_STATUS <<_ACEOF
> # Files that config.status was made for.
>-if test -n "$ac_config_files"; then
>-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
>-fi
>-
>-if test -n "$ac_config_headers"; then
>-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
>-fi
>-
>-if test -n "$ac_config_links"; then
>-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
>-fi
>+config_files="$ac_config_files"
>+config_commands="$ac_config_commands"
> 
>-if test -n "$ac_config_commands"; then
>-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
>-fi
>+_ACEOF
> 
> cat >>$CONFIG_STATUS <<\_ACEOF
>-
> ac_cs_usage="\
> \`$as_me' instantiates files from templates according to the
> current configuration.
>@@ -12772,7 +23268,7 @@
> Usage: $0 [OPTIONS] [FILE]...
> 
>   -h, --help       print this help, then exit
>-  -V, --version    print version number, then exit
>+  -V, --version    print version number and configuration settings, then exit
>   -q, --quiet      do not print progress messages
>   -d, --debug      don't remove temporary files
>       --recheck    update $as_me by reconfiguring in the same conditions
>@@ -12786,19 +23282,22 @@
> $config_commands
> 
> Report bugs to <bug-autoconf@gnu.org>."
>-_ACEOF
> 
>+_ACEOF
> cat >>$CONFIG_STATUS <<_ACEOF
> ac_cs_version="\\
> vamos config.status 0.5.5
>-configured by $0, generated by GNU Autoconf 2.59,
>-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
>+configured by $0, generated by GNU Autoconf 2.61,
>+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
> 
>-Copyright (C) 2003 Free Software Foundation, Inc.
>+Copyright (C) 2006 Free Software Foundation, Inc.
> This config.status script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it."
>-srcdir=$srcdir
>-INSTALL="$INSTALL"
>+
>+ac_pwd='$ac_pwd'
>+srcdir='$srcdir'
>+INSTALL='$INSTALL'
>+MKDIR_P='$MKDIR_P'
> _ACEOF
> 
> cat >>$CONFIG_STATUS <<\_ACEOF
>@@ -12809,60 +23308,42 @@
> do
>   case $1 in
>   --*=*)
>-    ac_option=`expr "x$1" : 'x$[^=]*$='`
>-    ac_optarg=`expr "x$1" : 'x[^=]*=$.*$'`
>+    ac_option=`expr "X$1" : 'X$[^=]*$='`
>+    ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`
>     ac_shift=:
>     ;;
>-  -*)
>+  *)
>     ac_option=$1
>     ac_optarg=$2
>     ac_shift=shift
>     ;;
>-  *) # This is not an option, so the user has probably given explicit
>-     # arguments.
>-     ac_option=$1
>-     ac_need_defaults=false;;
>   esac
> 
>   case $ac_option in
>   # Handling of the options.
>-_ACEOF
>-cat >>$CONFIG_STATUS <<\_ACEOF
>   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
>     ac_cs_recheck=: ;;
>-  --version | --vers* | -V )
>-    echo "$ac_cs_version"; exit 0 ;;
>-  --he | --h)
>-    # Conflict between --help and --header
>-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
>-Try \`$0 --help' for more information." >&5
>-echo "$as_me: error: ambiguous option: $1
>-Try \`$0 --help' for more information." >&2;}
>-   { (exit 1); exit 1; }; };;
>-  --help | --hel | -h )
>-    echo "$ac_cs_usage"; exit 0 ;;
>-  --debug | --d* | -d )
>+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
>+    echo "$ac_cs_version"; exit ;;
>+  --debug | --debu | --deb | --de | --d | -d )
>     debug=: ;;
>   --file | --fil | --fi | --f )
>     $ac_shift
>     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
>     ac_need_defaults=false;;
>-  --header | --heade | --head | --hea )
>-    $ac_shift
>-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
>-    ac_need_defaults=false;;
>+  --he | --h |  --help | --hel | -h )
>+    echo "$ac_cs_usage"; exit ;;
>   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
>   | -silent | --silent | --silen | --sile | --sil | --si | --s)
>     ac_cs_silent=: ;;
> 
>   # This is an error.
>-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
>-Try \`$0 --help' for more information." >&5
>-echo "$as_me: error: unrecognized option: $1
>-Try \`$0 --help' for more information." >&2;}
>+  -*) { echo "$as_me: error: unrecognized option: $1
>+Try \`$0 --help' for more information." >&2
>    { (exit 1); exit 1; }; } ;;
> 
>-  *) ac_config_targets="$ac_config_targets $1" ;;
>+  *) ac_config_targets="$ac_config_targets $1"
>+     ac_need_defaults=false ;;
> 
>   esac
>   shift
>@@ -12878,60 +23359,72 @@
> _ACEOF
> cat >>$CONFIG_STATUS <<_ACEOF
> if \$ac_cs_recheck; then
>-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
>-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
>+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
>+  CONFIG_SHELL=$SHELL
>+  export CONFIG_SHELL
>+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
> fi
> 
> _ACEOF
>+cat >>$CONFIG_STATUS <<\_ACEOF
>+exec 5>>config.log
>+{
>+  echo
>+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
>+## Running $as_me. ##
>+_ASBOX
>+  echo "$ac_log"
>+} >&5
> 
>+_ACEOF
> cat >>$CONFIG_STATUS <<_ACEOF
> #
>-# INIT-COMMANDS section.
>+# INIT-COMMANDS
> #
>-
> AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
> 
> _ACEOF
> 
>-
>-
> cat >>$CONFIG_STATUS <<\_ACEOF
>+
>+# Handling of arguments.
> for ac_config_target in $ac_config_targets
> do
>-  case "$ac_config_target" in
>-  # Handling of arguments.
>-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
>-  "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
>-  "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
>-  "body/Makefile" ) CONFIG_FILES="$CONFIG_FILES body/Makefile" ;;
>-  "geometry/Makefile" ) CONFIG_FILES="$CONFIG_FILES geometry/Makefile" ;;
>-  "media/Makefile" ) CONFIG_FILES="$CONFIG_FILES media/Makefile" ;;
>-  "track/Makefile" ) CONFIG_FILES="$CONFIG_FILES track/Makefile" ;;
>-  "world/Makefile" ) CONFIG_FILES="$CONFIG_FILES world/Makefile" ;;
>-  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
>-  "include/vamos/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/vamos/Makefile" ;;
>-  "include/vamos/body/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/vamos/body/Makefile" ;;
>-  "include/vamos/geometry/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/vamos/geometry/Makefile" ;;
>-  "include/vamos/media/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/vamos/media/Makefile" ;;
>-  "include/vamos/track/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/vamos/track/Makefile" ;;
>-  "include/vamos/world/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/vamos/world/Makefile" ;;
>-  "vamos/Makefile" ) CONFIG_FILES="$CONFIG_FILES vamos/Makefile" ;;
>-  "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
>-  "data/cars/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/cars/Makefile" ;;
>-  "data/controls/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/controls/Makefile" ;;
>-  "data/textures/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/textures/Makefile" ;;
>-  "data/tracks/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/tracks/Makefile" ;;
>-  "data/sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/sounds/Makefile" ;;
>-  "data/worlds/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/worlds/Makefile" ;;
>-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
>-  "caelum/Makefile" ) CONFIG_FILES="$CONFIG_FILES caelum/Makefile" ;;
>-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
>+  case $ac_config_target in
>+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
>+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
>+    "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
>+    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
>+    "body/Makefile") CONFIG_FILES="$CONFIG_FILES body/Makefile" ;;
>+    "geometry/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/Makefile" ;;
>+    "media/Makefile") CONFIG_FILES="$CONFIG_FILES media/Makefile" ;;
>+    "track/Makefile") CONFIG_FILES="$CONFIG_FILES track/Makefile" ;;
>+    "world/Makefile") CONFIG_FILES="$CONFIG_FILES world/Makefile" ;;
>+    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
>+    "include/vamos/Makefile") CONFIG_FILES="$CONFIG_FILES include/vamos/Makefile" ;;
>+    "include/vamos/body/Makefile") CONFIG_FILES="$CONFIG_FILES include/vamos/body/Makefile" ;;
>+    "include/vamos/geometry/Makefile") CONFIG_FILES="$CONFIG_FILES include/vamos/geometry/Makefile" ;;
>+    "include/vamos/media/Makefile") CONFIG_FILES="$CONFIG_FILES include/vamos/media/Makefile" ;;
>+    "include/vamos/track/Makefile") CONFIG_FILES="$CONFIG_FILES include/vamos/track/Makefile" ;;
>+    "include/vamos/world/Makefile") CONFIG_FILES="$CONFIG_FILES include/vamos/world/Makefile" ;;
>+    "vamos/Makefile") CONFIG_FILES="$CONFIG_FILES vamos/Makefile" ;;
>+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
>+    "data/cars/Makefile") CONFIG_FILES="$CONFIG_FILES data/cars/Makefile" ;;
>+    "data/controls/Makefile") CONFIG_FILES="$CONFIG_FILES data/controls/Makefile" ;;
>+    "data/textures/Makefile") CONFIG_FILES="$CONFIG_FILES data/textures/Makefile" ;;
>+    "data/tracks/Makefile") CONFIG_FILES="$CONFIG_FILES data/tracks/Makefile" ;;
>+    "data/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES data/sounds/Makefile" ;;
>+    "data/worlds/Makefile") CONFIG_FILES="$CONFIG_FILES data/worlds/Makefile" ;;
>+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
>+    "caelum/Makefile") CONFIG_FILES="$CONFIG_FILES caelum/Makefile" ;;
>+
>   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
> echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
>    { (exit 1); exit 1; }; };;
>   esac
> done
> 
>+
> # If the user did not use the arguments to specify the items to instantiate,
> # then the envvar interface is used.  Set only those that are not.
> # We use the long form for the default assignment because of an extremely
>@@ -12942,351 +23435,473 @@
> fi
> 
> # Have a temporary directory for convenience.  Make it in the build tree
>-# simply because there is no reason to put it here, and in addition,
>+# simply because there is no reason against having it here, and in addition,
> # creating and moving files from /tmp can sometimes cause problems.
>-# Create a temporary directory, and hook for its removal unless debugging.
>+# Hook for its removal unless debugging.
>+# Note that there is a small window in which the directory will not be cleaned:
>+# after its creation but before its name has been assigned to `$tmp'.
> $debug ||
> {
>-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
>+  tmp=
>+  trap 'exit_status=$?
>+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
>+' 0
>   trap '{ (exit 1); exit 1; }' 1 2 13 15
> }
>-
> # Create a (secure) tmp directory for tmp files.
> 
> {
>-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
>+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
>   test -n "$tmp" && test -d "$tmp"
> }  ||
> {
>-  tmp=./confstat$$-$RANDOM
>-  (umask 077 && mkdir $tmp)
>+  tmp=./conf$$-$RANDOM
>+  (umask 077 && mkdir "$tmp")
> } ||
> {
>    echo "$me: cannot create a temporary directory in ." >&2
>    { (exit 1); exit 1; }
> }
> 
>-_ACEOF
>-
>-cat >>$CONFIG_STATUS <<_ACEOF
>-
> #
>-# CONFIG_FILES section.
>+# Set up the sed scripts for CONFIG_FILES section.
> #
> 
> # No need to generate the scripts if there are no CONFIG_FILES.
> # This happens for instance when ./config.status config.h
>-if test -n "\$CONFIG_FILES"; then
>-  # Protect against being on the right side of a sed subst in config.status.
>-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
>-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
>-s,@SHELL@,$SHELL,;t t
>-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
>-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
>-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
>-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
>-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
>-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
>-s,@exec_prefix@,$exec_prefix,;t t
>-s,@prefix@,$prefix,;t t
>-s,@program_transform_name@,$program_transform_name,;t t
>-s,@bindir@,$bindir,;t t
>-s,@sbindir@,$sbindir,;t t
>-s,@libexecdir@,$libexecdir,;t t
>-s,@datadir@,$datadir,;t t
>-s,@sysconfdir@,$sysconfdir,;t t
>-s,@sharedstatedir@,$sharedstatedir,;t t
>-s,@localstatedir@,$localstatedir,;t t
>-s,@libdir@,$libdir,;t t
>-s,@includedir@,$includedir,;t t
>-s,@oldincludedir@,$oldincludedir,;t t
>-s,@infodir@,$infodir,;t t
>-s,@mandir@,$mandir,;t t
>-s,@build_alias@,$build_alias,;t t
>-s,@host_alias@,$host_alias,;t t
>-s,@target_alias@,$target_alias,;t t
>-s,@DEFS@,$DEFS,;t t
>-s,@ECHO_C@,$ECHO_C,;t t
>-s,@ECHO_N@,$ECHO_N,;t t
>-s,@ECHO_T@,$ECHO_T,;t t
>-s,@LIBS@,$LIBS,;t t
>-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
>-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
>-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
>-s,@CYGPATH_W@,$CYGPATH_W,;t t
>-s,@PACKAGE@,$PACKAGE,;t t
>-s,@VERSION@,$VERSION,;t t
>-s,@ACLOCAL@,$ACLOCAL,;t t
>-s,@AUTOCONF@,$AUTOCONF,;t t
>-s,@AUTOMAKE@,$AUTOMAKE,;t t
>-s,@AUTOHEADER@,$AUTOHEADER,;t t
>-s,@MAKEINFO@,$MAKEINFO,;t t
>-s,@AMTAR@,$AMTAR,;t t
>-s,@install_sh@,$install_sh,;t t
>-s,@STRIP@,$STRIP,;t t
>-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
>-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
>-s,@AWK@,$AWK,;t t
>-s,@SET_MAKE@,$SET_MAKE,;t t
>-s,@am__leading_dot@,$am__leading_dot,;t t
>-s,@CXX@,$CXX,;t t
>-s,@CXXFLAGS@,$CXXFLAGS,;t t
>-s,@LDFLAGS@,$LDFLAGS,;t t
>-s,@CPPFLAGS@,$CPPFLAGS,;t t
>-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
>-s,@EXEEXT@,$EXEEXT,;t t
>-s,@OBJEXT@,$OBJEXT,;t t
>-s,@DEPDIR@,$DEPDIR,;t t
>-s,@am__include@,$am__include,;t t
>-s,@am__quote@,$am__quote,;t t
>-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
>-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
>-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
>-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
>-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
>-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
>-s,@build@,$build,;t t
>-s,@build_cpu@,$build_cpu,;t t
>-s,@build_vendor@,$build_vendor,;t t
>-s,@build_os@,$build_os,;t t
>-s,@host@,$host,;t t
>-s,@host_cpu@,$host_cpu,;t t
>-s,@host_vendor@,$host_vendor,;t t
>-s,@host_os@,$host_os,;t t
>-s,@CC@,$CC,;t t
>-s,@CFLAGS@,$CFLAGS,;t t
>-s,@ac_ct_CC@,$ac_ct_CC,;t t
>-s,@CCDEPMODE@,$CCDEPMODE,;t t
>-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
>-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
>-s,@LN_S@,$LN_S,;t t
>-s,@ECHO@,$ECHO,;t t
>-s,@RANLIB@,$RANLIB,;t t
>-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
>-s,@CPP@,$CPP,;t t
>-s,@EGREP@,$EGREP,;t t
>-s,@LIBTOOL@,$LIBTOOL,;t t
>-s,@CXXCPP@,$CXXCPP,;t t
>-s,@X_CFLAGS@,$X_CFLAGS,;t t
>-s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
>-s,@X_LIBS@,$X_LIBS,;t t
>-s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
>-s,@ENABLE_XMESA_FX_TRUE@,$ENABLE_XMESA_FX_TRUE,;t t
>-s,@ENABLE_XMESA_FX_FALSE@,$ENABLE_XMESA_FX_FALSE,;t t
>-s,@DO_UNIT_TESTS_TRUE@,$DO_UNIT_TESTS_TRUE,;t t
>-s,@DO_UNIT_TESTS_FALSE@,$DO_UNIT_TESTS_FALSE,;t t
>-s,@LIBOBJS@,$LIBOBJS,;t t
>-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
>-CEOF
>-
>-_ACEOF
>-
>-  cat >>$CONFIG_STATUS <<\_ACEOF
>-  # Split the substitutions into bite-sized pieces for seds with
>-  # small command number limits, like on Digital OSF/1 and HP-UX.
>-  ac_max_sed_lines=48
>-  ac_sed_frag=1 # Number of current file.
>-  ac_beg=1 # First line for current file.
>-  ac_end=$ac_max_sed_lines # Line after last line for current file.
>-  ac_more_lines=:
>-  ac_sed_cmds=
>-  while $ac_more_lines; do
>-    if test $ac_beg -gt 1; then
>-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
>-    else
>-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
>-    fi
>-    if test ! -s $tmp/subs.frag; then
>-      ac_more_lines=false
>-    else
>-      # The purpose of the label and of the branching condition is to
>-      # speed up the sed processing (if there are no `@' at all, there
>-      # is no need to browse any of the substitutions).
>-      # These are the two extra sed commands mentioned above.
>-      (echo ':t
>-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
>-      if test -z "$ac_sed_cmds"; then
>-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
>-      else
>-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
>-      fi
>-      ac_sed_frag=`expr $ac_sed_frag + 1`
>-      ac_beg=$ac_end
>-      ac_end=`expr $ac_end + $ac_max_sed_lines`
>-    fi
>-  done
>-  if test -z "$ac_sed_cmds"; then
>-    ac_sed_cmds=cat
>+if test -n "$CONFIG_FILES"; then
>+
>+_ACEOF
>+
>+
>+
>+ac_delim='%!_!# '
>+for ac_last_try in false false false false false :; do
>+  cat >conf$$subs.sed <<_ACEOF
>+SHELL!$SHELL$ac_delim
>+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
>+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
>+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
>+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
>+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
>+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
>+exec_prefix!$exec_prefix$ac_delim
>+prefix!$prefix$ac_delim
>+program_transform_name!$program_transform_name$ac_delim
>+bindir!$bindir$ac_delim
>+sbindir!$sbindir$ac_delim
>+libexecdir!$libexecdir$ac_delim
>+datarootdir!$datarootdir$ac_delim
>+datadir!$datadir$ac_delim
>+sysconfdir!$sysconfdir$ac_delim
>+sharedstatedir!$sharedstatedir$ac_delim
>+localstatedir!$localstatedir$ac_delim
>+includedir!$includedir$ac_delim
>+oldincludedir!$oldincludedir$ac_delim
>+docdir!$docdir$ac_delim
>+infodir!$infodir$ac_delim
>+htmldir!$htmldir$ac_delim
>+dvidir!$dvidir$ac_delim
>+pdfdir!$pdfdir$ac_delim
>+psdir!$psdir$ac_delim
>+libdir!$libdir$ac_delim
>+localedir!$localedir$ac_delim
>+mandir!$mandir$ac_delim
>+DEFS!$DEFS$ac_delim
>+ECHO_C!$ECHO_C$ac_delim
>+ECHO_N!$ECHO_N$ac_delim
>+ECHO_T!$ECHO_T$ac_delim
>+LIBS!$LIBS$ac_delim
>+build_alias!$build_alias$ac_delim
>+host_alias!$host_alias$ac_delim
>+target_alias!$target_alias$ac_delim
>+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
>+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
>+INSTALL_DATA!$INSTALL_DATA$ac_delim
>+am__isrc!$am__isrc$ac_delim
>+CYGPATH_W!$CYGPATH_W$ac_delim
>+PACKAGE!$PACKAGE$ac_delim
>+VERSION!$VERSION$ac_delim
>+ACLOCAL!$ACLOCAL$ac_delim
>+AUTOCONF!$AUTOCONF$ac_delim
>+AUTOMAKE!$AUTOMAKE$ac_delim
>+AUTOHEADER!$AUTOHEADER$ac_delim
>+MAKEINFO!$MAKEINFO$ac_delim
>+install_sh!$install_sh$ac_delim
>+STRIP!$STRIP$ac_delim
>+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
>+mkdir_p!$mkdir_p$ac_delim
>+AWK!$AWK$ac_delim
>+SET_MAKE!$SET_MAKE$ac_delim
>+am__leading_dot!$am__leading_dot$ac_delim
>+AMTAR!$AMTAR$ac_delim
>+am__tar!$am__tar$ac_delim
>+am__untar!$am__untar$ac_delim
>+CXX!$CXX$ac_delim
>+CXXFLAGS!$CXXFLAGS$ac_delim
>+LDFLAGS!$LDFLAGS$ac_delim
>+CPPFLAGS!$CPPFLAGS$ac_delim
>+ac_ct_CXX!$ac_ct_CXX$ac_delim
>+EXEEXT!$EXEEXT$ac_delim
>+OBJEXT!$OBJEXT$ac_delim
>+DEPDIR!$DEPDIR$ac_delim
>+am__include!$am__include$ac_delim
>+am__quote!$am__quote$ac_delim
>+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
>+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
>+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
>+CXXDEPMODE!$CXXDEPMODE$ac_delim
>+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
>+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
>+build!$build$ac_delim
>+build_cpu!$build_cpu$ac_delim
>+build_vendor!$build_vendor$ac_delim
>+build_os!$build_os$ac_delim
>+host!$host$ac_delim
>+host_cpu!$host_cpu$ac_delim
>+host_vendor!$host_vendor$ac_delim
>+host_os!$host_os$ac_delim
>+CC!$CC$ac_delim
>+CFLAGS!$CFLAGS$ac_delim
>+ac_ct_CC!$ac_ct_CC$ac_delim
>+CCDEPMODE!$CCDEPMODE$ac_delim
>+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
>+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
>+SED!$SED$ac_delim
>+GREP!$GREP$ac_delim
>+EGREP!$EGREP$ac_delim
>+LN_S!$LN_S$ac_delim
>+ECHO!$ECHO$ac_delim
>+AR!$AR$ac_delim
>+RANLIB!$RANLIB$ac_delim
>+CPP!$CPP$ac_delim
>+_ACEOF
>+
>+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
>+    break
>+  elif $ac_last_try; then
>+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
>+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
>+   { (exit 1); exit 1; }; }
>+  else
>+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
>   fi
>-fi # test -n "$CONFIG_FILES"
>+done
>+
>+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
>+if test -n "$ac_eof"; then
>+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
>+  ac_eof=`expr $ac_eof + 1`
>+fi
>+
>+cat >>$CONFIG_STATUS <<_ACEOF
>+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
>+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
>+_ACEOF
>+sed '
>+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
>+s/^/s,@/; s/!/@,|#_!!_#|/
>+:n
>+t n
>+s/'"$ac_delim"'$/,g/; t
>+s/$/\\/; p
>+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
>+' >>$CONFIG_STATUS <conf$$subs.sed
>+rm -f conf$$subs.sed
>+cat >>$CONFIG_STATUS <<_ACEOF
>+CEOF$ac_eof
>+_ACEOF
>+
>+
>+ac_delim='%!_!# '
>+for ac_last_try in false false false false false :; do
>+  cat >conf$$subs.sed <<_ACEOF
>+CXXCPP!$CXXCPP$ac_delim
>+F77!$F77$ac_delim
>+FFLAGS!$FFLAGS$ac_delim
>+ac_ct_F77!$ac_ct_F77$ac_delim
>+LIBTOOL!$LIBTOOL$ac_delim
>+XMKMF!$XMKMF$ac_delim
>+X_CFLAGS!$X_CFLAGS$ac_delim
>+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
>+X_LIBS!$X_LIBS$ac_delim
>+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
>+ENABLE_XMESA_FX_TRUE!$ENABLE_XMESA_FX_TRUE$ac_delim
>+ENABLE_XMESA_FX_FALSE!$ENABLE_XMESA_FX_FALSE$ac_delim
>+DO_UNIT_TESTS_TRUE!$DO_UNIT_TESTS_TRUE$ac_delim
>+DO_UNIT_TESTS_FALSE!$DO_UNIT_TESTS_FALSE$ac_delim
>+LIBOBJS!$LIBOBJS$ac_delim
>+LTLIBOBJS!$LTLIBOBJS$ac_delim
>+_ACEOF
>+
>+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
>+    break
>+  elif $ac_last_try; then
>+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
>+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
>+   { (exit 1); exit 1; }; }
>+  else
>+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
>+  fi
>+done
> 
>+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
>+if test -n "$ac_eof"; then
>+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
>+  ac_eof=`expr $ac_eof + 1`
>+fi
>+
>+cat >>$CONFIG_STATUS <<_ACEOF
>+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
>+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
>+_ACEOF
>+sed '
>+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
>+s/^/s,@/; s/!/@,|#_!!_#|/
>+:n
>+t n
>+s/'"$ac_delim"'$/,g/; t
>+s/$/\\/; p
>+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
>+' >>$CONFIG_STATUS <conf$$subs.sed
>+rm -f conf$$subs.sed
>+cat >>$CONFIG_STATUS <<_ACEOF
>+:end
>+s/|#_!!_#|//g
>+CEOF$ac_eof
> _ACEOF
>+
>+
>+# VPATH may cause trouble with some makes, so we remove $(srcdir),
>+# ${srcdir} and @srcdir@ 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/
>+s/:*$//
>+s/^[^=]*=[	 ]*$//
>+}'
>+fi
>+
> cat >>$CONFIG_STATUS <<\_ACEOF
>-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
>-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
>-  case $ac_file in
>-  - | *:- | *:-:* ) # input from stdin
>-	cat >$tmp/stdin
>-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
>-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
>-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
>-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
>-  * )   ac_file_in=$ac_file.in ;;
>+fi # test -n "$CONFIG_FILES"
>+
>+
>+for ac_tag in  :F $CONFIG_FILES      :C $CONFIG_COMMANDS
>+do
>+  case $ac_tag in
>+  :[FHLC]) ac_mode=$ac_tag; continue;;
>+  esac
>+  case $ac_mode$ac_tag in
>+  :[FHL]*:*);;
>+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
>+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
>+   { (exit 1); exit 1; }; };;
>+  :[FH]-) ac_tag=-:-;;
>+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
>+  esac
>+  ac_save_IFS=$IFS
>+  IFS=:
>+  set x $ac_tag
>+  IFS=$ac_save_IFS
>+  shift
>+  ac_file=$1
>+  shift
>+
>+  case $ac_mode in
>+  :L) ac_source=$1;;
>+  :[FH])
>+    ac_file_inputs=
>+    for ac_f
>+    do
>+      case $ac_f in
>+      -) ac_f="$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 `:'.
>+	 test -f "$ac_f" ||
>+	   case $ac_f in
>+	   [\\/$]*) false;;
>+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
>+	   esac ||
>+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
>+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
>+   { (exit 1); exit 1; }; };;
>+      esac
>+      ac_file_inputs="$ac_file_inputs $ac_f"
>+    done
>+
>+    # Let's still pretend it is `configure' which instantiates (i.e., don't
>+    # use $as_me), people would be surprised to read:
>+    #    /* config.h.  Generated by config.status.  */
>+    configure_input="Generated from "`IFS=:
>+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
>+    if test x"$ac_file" != x-; then
>+      configure_input="$ac_file.  $configure_input"
>+      { echo "$as_me:$LINENO: creating $ac_file" >&5
>+echo "$as_me: creating $ac_file" >&6;}
>+    fi
>+
>+    case $ac_tag in
>+    *:-:* | *:-) cat >"$tmp/stdin";;
>+    esac
>+    ;;
>   esac
> 
>-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
>-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
>+  ac_dir=`$as_dirname -- "$ac_file" ||
> $as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
> 	 X"$ac_file" : 'X$//$[^/]' \| \
> 	 X"$ac_file" : 'X$//$$' \| \
>-	 X"$ac_file" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>+	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
> echo X"$ac_file" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>-  { if $as_mkdir_p; then
>-    mkdir -p "$ac_dir"
>-  else
>-    as_dir="$ac_dir"
>+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$[^/].*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
>+  { as_dir="$ac_dir"
>+  case $as_dir in #(
>+  -*) as_dir=./$as_dir;;
>+  esac
>+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
>     as_dirs=
>-    while test ! -d "$as_dir"; do
>-      as_dirs="$as_dir $as_dirs"
>-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
>+    while :; do
>+      case $as_dir in #(
>+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
>+      *) as_qdir=$as_dir;;
>+      esac
>+      as_dirs="'$as_qdir' $as_dirs"
>+      as_dir=`$as_dirname -- "$as_dir" ||
> $as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
> 	 X"$as_dir" : 'X$//$[^/]' \| \
> 	 X"$as_dir" : 'X$//$$' \| \
>-	 X"$as_dir" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
> echo X"$as_dir" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$[^/].*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
>+      test -d "$as_dir" && break
>     done
>-    test ! -n "$as_dirs" || mkdir $as_dirs
>-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
>-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
>+    test -z "$as_dirs" || eval "mkdir $as_dirs"
>+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
>+echo "$as_me: error: cannot create directory $as_dir" >&2;}
>    { (exit 1); exit 1; }; }; }
>-
>   ac_builddir=.
> 
>-if test "$ac_dir" != .; then
>+case "$ac_dir" in
>+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
>+*)
>   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
>-  # A "../" for each directory in $ac_dir_suffix.
>-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
>-else
>-  ac_dir_suffix= ac_top_builddir=
>-fi
>+  # A ".." for each directory in $ac_dir_suffix.
>+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
>+  case $ac_top_builddir_sub in
>+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
>+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
>+  esac ;;
>+esac
>+ac_abs_top_builddir=$ac_pwd
>+ac_abs_builddir=$ac_pwd$ac_dir_suffix
>+# for backward compatibility:
>+ac_top_builddir=$ac_top_build_prefix
> 
> case $srcdir in
>-  .)  # No --srcdir option.  We are building in place.
>+  .)  # We are building in place.
>     ac_srcdir=.
>-    if test -z "$ac_top_builddir"; then
>-       ac_top_srcdir=.
>-    else
>-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
>-    fi ;;
>-  [\\/]* | ?:[\\/]* )  # Absolute path.
>+    ac_top_srcdir=$ac_top_builddir_sub
>+    ac_abs_top_srcdir=$ac_pwd ;;
>+  [\\/]* | ?:[\\/]* )  # Absolute name.
>     ac_srcdir=$srcdir$ac_dir_suffix;
>-    ac_top_srcdir=$srcdir ;;
>-  *) # Relative path.
>-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
>-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
>+    ac_top_srcdir=$srcdir
>+    ac_abs_top_srcdir=$srcdir ;;
>+  *) # Relative name.
>+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
>+    ac_top_srcdir=$ac_top_build_prefix$srcdir
>+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
> esac
>+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> 
>-# Do not use `cd foo && pwd` to compute absolute paths, because
>-# the directories may not exist.
>-case `pwd` in
>-.) ac_abs_builddir="$ac_dir";;
>-*)
>-  case "$ac_dir" in
>-  .) ac_abs_builddir=`pwd`;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
>-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_top_builddir=${ac_top_builddir}.;;
>-*)
>-  case ${ac_top_builddir}. in
>-  .) ac_abs_top_builddir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
>-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_srcdir=$ac_srcdir;;
>-*)
>-  case $ac_srcdir in
>-  .) ac_abs_srcdir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
>-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_top_srcdir=$ac_top_srcdir;;
>-*)
>-  case $ac_top_srcdir in
>-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
>-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
>-  esac;;
>-esac
> 
>+  case $ac_mode in
>+  :F)
>+  #
>+  # CONFIG_FILE
>+  #
> 
>   case $INSTALL in
>   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
>-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
>+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
>   esac
>+  ac_MKDIR_P=$MKDIR_P
>+  case $MKDIR_P in
>+  [\\/$]* | ?:[\\/]* ) ;;
>+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
>+  esac
>+_ACEOF
> 
>-  if test x"$ac_file" != x-; then
>-    { echo "$as_me:$LINENO: creating $ac_file" >&5
>-echo "$as_me: creating $ac_file" >&6;}
>-    rm -f "$ac_file"
>-  fi
>-  # Let's still pretend it is `configure' which instantiates (i.e., don't
>-  # use $as_me), people would be surprised to read:
>-  #    /* config.h.  Generated by config.status.  */
>-  if test x"$ac_file" = x-; then
>-    configure_input=
>-  else
>-    configure_input="$ac_file.  "
>-  fi
>-  configure_input=$configure_input"Generated from `echo $ac_file_in |
>-				     sed 's,.*/,,'` by configure."
>-
>-  # First look for the input files in the build tree, otherwise in the
>-  # src tree.
>-  ac_file_inputs=`IFS=:
>-    for f in $ac_file_in; do
>-      case $f in
>-      -) echo $tmp/stdin ;;
>-      [\\/$]*)
>-	 # Absolute (can't be DOS-style, as IFS=:)
>-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
>-echo "$as_me: error: cannot find input file: $f" >&2;}
>-   { (exit 1); exit 1; }; }
>-	 echo "$f";;
>-      *) # Relative
>-	 if test -f "$f"; then
>-	   # Build tree
>-	   echo "$f"
>-	 elif test -f "$srcdir/$f"; then
>-	   # Source tree
>-	   echo "$srcdir/$f"
>-	 else
>-	   # /dev/null tree
>-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
>-echo "$as_me: error: cannot find input file: $f" >&2;}
>-   { (exit 1); exit 1; }; }
>-	 fi;;
>-      esac
>-    done` || { (exit 1); exit 1; }
>+cat >>$CONFIG_STATUS <<\_ACEOF
>+# If the template does not know about datarootdir, expand it.
>+# FIXME: This hack should be removed a few years after 2.60.
>+ac_datarootdir_hack=; ac_datarootdir_seen=
>+
>+case `sed -n '/datarootdir/ {
>+  p
>+  q
>+}
>+/@datadir@/p
>+/@docdir@/p
>+/@infodir@/p
>+/@localedir@/p
>+/@mandir@/p
>+' $ac_file_inputs` in
>+*datarootdir*) ac_datarootdir_seen=yes;;
>+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
>+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
>+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
>+_ACEOF
>+cat >>$CONFIG_STATUS <<_ACEOF
>+  ac_datarootdir_hack='
>+  s&@datadir@&$datadir&g
>+  s&@docdir@&$docdir&g
>+  s&@infodir@&$infodir&g
>+  s&@localedir@&$localedir&g
>+  s&@mandir@&$mandir&g
>+    s&\\\${datarootdir}&$datarootdir&g' ;;
>+esac
> _ACEOF
>+
>+# Neutralize VPATH when `$srcdir' = `.'.
>+# Shell code in configure.ac might set extrasub.
>+# FIXME: do we really want to maintain this feature?
> cat >>$CONFIG_STATUS <<_ACEOF
>   sed "$ac_vpsub
> $extrasub
>@@ -13294,142 +23909,44 @@
> cat >>$CONFIG_STATUS <<\_ACEOF
> :t
> /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
>-s,@configure_input@,$configure_input,;t t
>-s,@srcdir@,$ac_srcdir,;t t
>-s,@abs_srcdir@,$ac_abs_srcdir,;t t
>-s,@top_srcdir@,$ac_top_srcdir,;t t
>-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
>-s,@builddir@,$ac_builddir,;t t
>-s,@abs_builddir@,$ac_abs_builddir,;t t
>-s,@top_builddir@,$ac_top_builddir,;t t
>-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
>-s,@INSTALL@,$ac_INSTALL,;t t
>-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
>-  rm -f $tmp/stdin
>-  if test x"$ac_file" != x-; then
>-    mv $tmp/out $ac_file
>-  else
>-    cat $tmp/out
>-    rm -f $tmp/out
>-  fi
>-
>-done
>-_ACEOF
>-cat >>$CONFIG_STATUS <<\_ACEOF
>-
>-#
>-# CONFIG_COMMANDS section.
>-#
>-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
>-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
>-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
>-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
>-$as_expr X"$ac_dest" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
>-	 X"$ac_dest" : 'X$//$[^/]' \| \
>-	 X"$ac_dest" : 'X$//$$' \| \
>-	 X"$ac_dest" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>-echo X"$ac_dest" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>-  { if $as_mkdir_p; then
>-    mkdir -p "$ac_dir"
>-  else
>-    as_dir="$ac_dir"
>-    as_dirs=
>-    while test ! -d "$as_dir"; do
>-      as_dirs="$as_dir $as_dirs"
>-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
>-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
>-	 X"$as_dir" : 'X$//$[^/]' \| \
>-	 X"$as_dir" : 'X$//$$' \| \
>-	 X"$as_dir" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>-echo X"$as_dir" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>-    done
>-    test ! -n "$as_dirs" || mkdir $as_dirs
>-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
>-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
>-   { (exit 1); exit 1; }; }; }
>-
>-  ac_builddir=.
>+s&@configure_input@&$configure_input&;t t
>+s&@top_builddir@&$ac_top_builddir_sub&;t t
>+s&@srcdir@&$ac_srcdir&;t t
>+s&@abs_srcdir@&$ac_abs_srcdir&;t t
>+s&@top_srcdir@&$ac_top_srcdir&;t t
>+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
>+s&@builddir@&$ac_builddir&;t t
>+s&@abs_builddir@&$ac_abs_builddir&;t t
>+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
>+s&@INSTALL@&$ac_INSTALL&;t t
>+s&@MKDIR_P@&$ac_MKDIR_P&;t t
>+$ac_datarootdir_hack
>+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
>+
>+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"; } &&
>+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
>+which seems to be undefined.  Please make sure it is defined." >&5
>+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;}
> 
>-if test "$ac_dir" != .; then
>-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
>-  # A "../" for each directory in $ac_dir_suffix.
>-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
>-else
>-  ac_dir_suffix= ac_top_builddir=
>-fi
>+  rm -f "$tmp/stdin"
>+  case $ac_file in
>+  -) cat "$tmp/out"; rm -f "$tmp/out";;
>+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
>+  esac
>+ ;;
> 
>-case $srcdir in
>-  .)  # No --srcdir option.  We are building in place.
>-    ac_srcdir=.
>-    if test -z "$ac_top_builddir"; then
>-       ac_top_srcdir=.
>-    else
>-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
>-    fi ;;
>-  [\\/]* | ?:[\\/]* )  # Absolute path.
>-    ac_srcdir=$srcdir$ac_dir_suffix;
>-    ac_top_srcdir=$srcdir ;;
>-  *) # Relative path.
>-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
>-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
>-esac
> 
>-# Do not use `cd foo && pwd` to compute absolute paths, because
>-# the directories may not exist.
>-case `pwd` in
>-.) ac_abs_builddir="$ac_dir";;
>-*)
>-  case "$ac_dir" in
>-  .) ac_abs_builddir=`pwd`;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
>-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_top_builddir=${ac_top_builddir}.;;
>-*)
>-  case ${ac_top_builddir}. in
>-  .) ac_abs_top_builddir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
>-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_srcdir=$ac_srcdir;;
>-*)
>-  case $ac_srcdir in
>-  .) ac_abs_srcdir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
>-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
>-  esac;;
>-esac
>-case $ac_abs_builddir in
>-.) ac_abs_top_srcdir=$ac_top_srcdir;;
>-*)
>-  case $ac_top_srcdir in
>-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
>-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
>-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
>-  esac;;
>-esac
>+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
>+echo "$as_me: executing $ac_file commands" >&6;}
>+ ;;
>+  esac
> 
> 
>-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
>-echo "$as_me: executing $ac_dest commands" >&6;}
>-  case $ac_dest in
>-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
>+  case $ac_file$ac_mode in
>+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
>   # 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.
>@@ -13437,94 +23954,126 @@
>   # 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.
>-  # So let's grep whole file.
>-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
>-    dirpart=`(dirname "$mf") 2>/dev/null ||
>+  # Grep'ing the whole file is not good either: AIX grep has a line
>+  # limit of 2048, but all sed's we know have understand at least 4000.
>+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
>+    dirpart=`$as_dirname -- "$mf" ||
> $as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
> 	 X"$mf" : 'X$//$[^/]' \| \
> 	 X"$mf" : 'X$//$$' \| \
>-	 X"$mf" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>+	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
> echo X"$mf" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$[^/].*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
>   else
>     continue
>   fi
>-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
>-  # Extract the definition of DEP_FILES from the Makefile without
>-  # running `make'.
>-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
>+  # Extract the definition of DEPDIR, am__include, and am__quote
>+  # 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
>+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
>   # When using ansi2knr, U may be empty or an underscore; expand it
>-  U=`sed -n -e '/^U = / s///p' < "$mf"`
>-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
>-  # 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 -e '
>-    /^DEP_FILES = .*\\\\$/ {
>-      s/^DEP_FILES = //
>-      :loop
>-	s/\\\\$//
>-	p
>-	n
>-	/\\\\$/ b loop
>-      p
>-    }
>-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
>+  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
>     # Make sure the directory exists.
>     test -f "$dirpart/$file" && continue
>-    fdir=`(dirname "$file") 2>/dev/null ||
>+    fdir=`$as_dirname -- "$file" ||
> $as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
> 	 X"$file" : 'X$//$[^/]' \| \
> 	 X"$file" : 'X$//$$' \| \
>-	 X"$file" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>+	 X"$file" : 'X$/$' \| . 2>/dev/null ||
> echo X"$file" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>-    { if $as_mkdir_p; then
>-    mkdir -p $dirpart/$fdir
>-  else
>-    as_dir=$dirpart/$fdir
>+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$[^/].*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
>+    { as_dir=$dirpart/$fdir
>+  case $as_dir in #(
>+  -*) as_dir=./$as_dir;;
>+  esac
>+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
>     as_dirs=
>-    while test ! -d "$as_dir"; do
>-      as_dirs="$as_dir $as_dirs"
>-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
>+    while :; do
>+      case $as_dir in #(
>+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
>+      *) as_qdir=$as_dir;;
>+      esac
>+      as_dirs="'$as_qdir' $as_dirs"
>+      as_dir=`$as_dirname -- "$as_dir" ||
> $as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
> 	 X"$as_dir" : 'X$//$[^/]' \| \
> 	 X"$as_dir" : 'X$//$$' \| \
>-	 X"$as_dir" : 'X$/$' \| \
>-	 .     : '$.$' 2>/dev/null ||
>+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
> echo X"$as_dir" |
>-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
>-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
>-  	  /^X$\/\/$$/{ s//\1/; q; }
>-  	  /^X$\/$.*/{ s//\1/; q; }
>-  	  s/.*/./; q'`
>+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$[^/].*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/\/$$/{
>+	    s//\1/
>+	    q
>+	  }
>+	  /^X$\/$.*/{
>+	    s//\1/
>+	    q
>+	  }
>+	  s/.*/./; q'`
>+      test -d "$as_dir" && break
>     done
>-    test ! -n "$as_dirs" || mkdir $as_dirs
>-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
>-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
>+    test -z "$as_dirs" || eval "mkdir $as_dirs"
>+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
>+echo "$as_me: error: cannot create directory $as_dir" >&2;}
>    { (exit 1); exit 1; }; }; }
>-
>     # echo "creating $dirpart/$file"
>     echo '# dummy' > "$dirpart/$file"
>   done
> done
>  ;;
>+
>   esac
>-done
>-_ACEOF
>+done # for ac_tag
> 
>-cat >>$CONFIG_STATUS <<\_ACEOF
> 
> { (exit 0); exit 0; }
> _ACEOF
>diff -uNr vamos-0.5.5.orig/configure.ac vamos-0.5.5/configure.ac
>--- vamos-0.5.5.orig/configure.ac	2005-10-29 22:18:09.000000000 +0200
>+++ vamos-0.5.5/configure.ac	2007-06-25 18:02:21.000000000 +0200
>@@ -1,5 +1,5 @@
> dnl Process this file with autoconf to produce a configure script.
>-AC_INIT(vamos, 0.5.5, snick-a-doo@comcast.net)
>+AC_INIT([vamos],[0.5.5],[snick-a-doo@comcast.net])
> AC_CONFIG_SRCDIR(world/Atmosphere.cc)
> AC_CONFIG_AUX_DIR(config)
> 
>@@ -25,9 +25,9 @@
> 
> dnl Checks for libraries.
> dnl configure attempts to link a C++ program using gcc and fails when 
>-dnl libstdc++ is not found.  AC_LANG_CPLUSPLUS forces linking in C++.
>+dnl libstdc++ is not found.  AC_LANG([C++]) forces linking in C++.
> 
>-AC_LANG_CPLUSPLUS
>+AC_LANG_PUSH([C++])
> AC_CHECK_LIB(plibul, ulInit,,
> 	AC_MSG_ERROR([plib >= v1.4 is required.]))
> 
>@@ -52,9 +52,6 @@
> AC_CHECK_HEADER(plib/js.h,,
> 	AC_MSG_ERROR([plib/js.h >= v1.4 is required.]))
> 
>-dnl Reset to C linking.
>-AC_LANG_C
>-
> dnl Checks for typedefs, structures, and compiler characteristics.
> 
> dnl Checks for library functions.
>@@ -131,11 +128,11 @@
> 	AC_MSG_ERROR([libpng is required.]))
> 
> dnl CppUnit
>-AC_LANG_CPLUSPLUS
> AC_CHECK_HEADER([cppunit/TestSuite.h],,
>   test x$unit_tests = xtrue && AC_MSG_NOTICE(
>     [CppUnit not found; tests will not be built])
>   unit_tests=false)
>+AC_LANG_POP
> 
> AM_CONDITIONAL(DO_UNIT_TESTS, test x$unit_tests = xtrue)
> 
>diff -uNr vamos-0.5.5.orig/data/cars/Makefile.in vamos-0.5.5/data/cars/Makefile.in
>--- vamos-0.5.5.orig/data/cars/Makefile.in	2005-10-29 22:28:14.000000000 +0200
>+++ vamos-0.5.5/data/cars/Makefile.in	2007-06-25 18:02:54.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,31 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = data/cars
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(carsdir)"
>+carsDATA_INSTALL = $(INSTALL_DATA)
>+DATA = $(cars_DATA)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +71,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +92,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,54 +102,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> carsdir = $(pkgdatadir)/cars
>-
> cars_DATA = \
> 	default-car.xml \
> 	F1-1967.ac \
>@@ -154,51 +184,61 @@
> 	wheel.ac \
> 	wheel-fast.ac
> 
>-
> EXTRA_DIST = $(cars_DATA)
>-subdir = data/cars
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-DATA = $(cars_DATA)
>-
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/cars/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  data/cars/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-carsDATA_INSTALL = $(INSTALL_DATA)
> install-carsDATA: $(cars_DATA)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(carsdir)
>+	test -z "$(carsdir)" || $(MKDIR_P) "$(DESTDIR)$(carsdir)"
> 	@list='$(cars_DATA)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(carsDATA_INSTALL) $$d$$p $(DESTDIR)$(carsdir)/$$f"; \
>-	  $(carsDATA_INSTALL) $$d$$p $(DESTDIR)$(carsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(carsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(carsdir)/$$f'"; \
>+	  $(carsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(carsdir)/$$f"; \
> 	done
> 
> uninstall-carsDATA:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(cars_DATA)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(carsdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(carsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(carsdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(carsdir)/$$f"; \
> 	done
> tags: TAGS
> TAGS:
>@@ -206,28 +246,23 @@
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -241,9 +276,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(DATA)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(carsdir)
>+	for dir in "$(DESTDIR)$(carsdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -263,7 +299,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -274,24 +310,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-carsDATA
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -310,17 +356,21 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-carsDATA uninstall-info-am
>+uninstall-am: uninstall-carsDATA
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-carsDATA \
>-	install-data install-data-am install-exec install-exec-am \
>-	install-info install-info-am install-man install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-carsDATA uninstall-info-am
>+	dvi-am html html-am info info-am install install-am \
>+	install-carsDATA install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am install-man \
>+	install-pdf install-pdf-am install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	uninstall uninstall-am uninstall-carsDATA
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/data/controls/Makefile.in vamos-0.5.5/data/controls/Makefile.in
>--- vamos-0.5.5.orig/data/controls/Makefile.in	2005-10-29 22:28:16.000000000 +0200
>+++ vamos-0.5.5/data/controls/Makefile.in	2007-06-25 18:02:54.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,31 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = data/controls
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(controlsdir)"
>+controlsDATA_INSTALL = $(INSTALL_DATA)
>+DATA = $(controls_DATA)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +71,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +92,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,54 +102,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> controlsdir = $(pkgdatadir)/controls
>-
> controls_DATA = \
> 	clutch-wheel.xml \
> 	default-controls.xml \
>@@ -142,51 +172,61 @@
> 	stick.xml \
> 	throttle-wheel.xml
> 
>-
> EXTRA_DIST = $(controls_DATA)
>-subdir = data/controls
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-DATA = $(controls_DATA)
>-
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/controls/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  data/controls/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-controlsDATA_INSTALL = $(INSTALL_DATA)
> install-controlsDATA: $(controls_DATA)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(controlsdir)
>+	test -z "$(controlsdir)" || $(MKDIR_P) "$(DESTDIR)$(controlsdir)"
> 	@list='$(controls_DATA)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(controlsDATA_INSTALL) $$d$$p $(DESTDIR)$(controlsdir)/$$f"; \
>-	  $(controlsDATA_INSTALL) $$d$$p $(DESTDIR)$(controlsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(controlsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(controlsdir)/$$f'"; \
>+	  $(controlsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(controlsdir)/$$f"; \
> 	done
> 
> uninstall-controlsDATA:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(controls_DATA)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(controlsdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(controlsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(controlsdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(controlsdir)/$$f"; \
> 	done
> tags: TAGS
> TAGS:
>@@ -194,28 +234,23 @@
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -229,9 +264,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(DATA)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(controlsdir)
>+	for dir in "$(DESTDIR)$(controlsdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -251,7 +287,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -262,24 +298,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-controlsDATA
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -298,17 +344,21 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-controlsDATA uninstall-info-am
>+uninstall-am: uninstall-controlsDATA
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-controlsDATA \
>-	install-data install-data-am install-exec install-exec-am \
>-	install-info install-info-am install-man install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-controlsDATA uninstall-info-am
>+	dvi-am html html-am info info-am install install-am \
>+	install-controlsDATA install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am install-man \
>+	install-pdf install-pdf-am install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	uninstall uninstall-am uninstall-controlsDATA
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/data/Makefile.in vamos-0.5.5/data/Makefile.in
>--- vamos-0.5.5.orig/data/Makefile.in	2005-10-29 22:28:12.000000000 +0200
>+++ vamos-0.5.5/data/Makefile.in	2007-06-25 18:02:54.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -13,17 +13,11 @@
> # PARTICULAR PURPOSE.
> 
> @SET_MAKE@
>-
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +29,34 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = data
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
>+	html-recursive info-recursive install-data-recursive \
>+	install-dvi-recursive install-exec-recursive \
>+	install-html-recursive install-info-recursive \
>+	install-pdf-recursive install-ps-recursive install-recursive \
>+	installcheck-recursive installdirs-recursive pdf-recursive \
>+	ps-recursive uninstall-recursive
>+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
>+  distclean-recursive maintainer-clean-recursive
>+ETAGS = etags
>+CTAGS = ctags
>+DIST_SUBDIRS = $(SUBDIRS)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +73,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +94,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,74 +104,100 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> SUBDIRS = cars controls textures tracks sounds worlds
>-subdir = data
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-
>-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
>-	ps-recursive install-info-recursive uninstall-info-recursive \
>-	all-recursive install-data-recursive install-exec-recursive \
>-	installdirs-recursive install-recursive uninstall-recursive \
>-	check-recursive installcheck-recursive
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-DIST_SUBDIRS = $(SUBDIRS)
> all: all-recursive
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  data/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -161,10 +205,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
> # This directory's subdirectories are mostly independent; you can cd
> # into them and run `make' without going through this Makefile.
> # To change the values of `make' variables: instead of editing Makefiles,
>@@ -172,7 +212,13 @@
> #     (which will cause the Makefiles to be regenerated when you run `make');
> # (2) otherwise, pass the desired values on the `make' command line.
> $(RECURSIVE_TARGETS):
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	target=`echo $@ | sed s/-recursive//`; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -184,15 +230,20 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done; \
> 	if test "$$dot_seen" = "no"; then \
> 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
> 	fi; test -z "$$fail"
> 
>-mostlyclean-recursive clean-recursive distclean-recursive \
>-maintainer-clean-recursive:
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+$(RECURSIVE_CLEAN_TARGETS):
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	case "$@" in \
> 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
>@@ -213,7 +264,7 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done && test -z "$$fail"
> tags-recursive:
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -224,14 +275,6 @@
> 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -240,19 +283,22 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
> 	tags=; \
> 	here=`pwd`; \
>-	if (etags --etags-include --version) >/dev/null 2>&1; then \
>+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
> 	  include_option=--etags-include; \
>+	  empty_fix=.; \
> 	else \
> 	  include_option=--include; \
>+	  empty_fix=; \
> 	fi; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -f $$subdir/TAGS && \
>+	    test ! -f $$subdir/TAGS || \
> 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
> 	  fi; \
> 	done; \
>@@ -262,10 +308,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -288,28 +335,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -320,15 +362,19 @@
> 	    || exit 1; \
> 	  fi; \
> 	done
>-	list='$(SUBDIRS)'; for subdir in $$list; do \
>+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -d $(distdir)/$$subdir \
>-	    || mkdir $(distdir)/$$subdir \
>+	    test -d "$(distdir)/$$subdir" \
>+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
> 	    || exit 1; \
>+	    distdir=`$(am__cd) $(distdir) && pwd`; \
>+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
> 	    (cd $$subdir && \
> 	      $(MAKE) $(AM_MAKEFLAGS) \
>-	        top_distdir="$(top_distdir)" \
>-	        distdir=../$(distdir)/$$subdir \
>+	        top_distdir="$$top_distdir" \
>+	        distdir="$$distdir/$$subdir" \
>+		am__remove_distdir=: \
>+		am__skip_length_check=: \
> 	        distdir) \
> 	      || exit 1; \
> 	  fi; \
>@@ -338,7 +384,6 @@
> all-am: Makefile
> installdirs: installdirs-recursive
> installdirs-am:
>-
> install: install-recursive
> install-exec: install-exec-recursive
> install-data: install-data-recursive
>@@ -358,7 +403,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -369,25 +414,34 @@
> 
> distclean: distclean-recursive
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-recursive
> 
> dvi-am:
> 
>+html: html-recursive
>+
> info: info-recursive
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-recursive
>+
> install-exec-am:
> 
>+install-html: install-html-recursive
>+
> install-info: install-info-recursive
> 
> install-man:
> 
>+install-pdf: install-pdf-recursive
>+
>+install-ps: install-ps-recursive
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-recursive
>@@ -406,26 +460,24 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am:
> 
>-uninstall-info: uninstall-info-recursive
>+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
>+	install-strip
> 
>-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
>-	clean-generic clean-libtool clean-recursive ctags \
>-	ctags-recursive distclean distclean-generic distclean-libtool \
>-	distclean-recursive distclean-tags distdir dvi dvi-am \
>-	dvi-recursive info info-am info-recursive install install-am \
>-	install-data install-data-am install-data-recursive \
>-	install-exec install-exec-am install-exec-recursive \
>-	install-info install-info-am install-info-recursive install-man \
>-	install-recursive install-strip installcheck installcheck-am \
>-	installdirs installdirs-am installdirs-recursive \
>-	maintainer-clean maintainer-clean-generic \
>-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
>-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
>-	uninstall uninstall-am uninstall-info-am \
>-	uninstall-info-recursive uninstall-recursive
>+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>+	all all-am check check-am clean clean-generic clean-libtool \
>+	ctags ctags-recursive distclean distclean-generic \
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-ps install-ps-am install-strip installcheck \
>+	installcheck-am installdirs installdirs-am maintainer-clean \
>+	maintainer-clean-generic mostlyclean mostlyclean-generic \
>+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
>+	uninstall uninstall-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/data/sounds/Makefile.in vamos-0.5.5/data/sounds/Makefile.in
>--- vamos-0.5.5.orig/data/sounds/Makefile.in	2005-10-29 22:28:24.000000000 +0200
>+++ vamos-0.5.5/data/sounds/Makefile.in	2007-06-25 18:02:54.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,31 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = data/sounds
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(soundsdir)"
>+soundsDATA_INSTALL = $(INSTALL_DATA)
>+DATA = $(sounds_DATA)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +71,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +92,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,54 +102,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> soundsdir = $(pkgdatadir)/sounds
>-
> sounds_DATA = \
> 	crash.wav \
> 	default-sounds.xml \
>@@ -143,51 +173,61 @@
> 	tire_squeal.wav \
> 	wind.wav
> 
>-
> EXTRA_DIST = $(sounds_DATA)
>-subdir = data/sounds
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-DATA = $(sounds_DATA)
>-
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/sounds/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  data/sounds/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-soundsDATA_INSTALL = $(INSTALL_DATA)
> install-soundsDATA: $(sounds_DATA)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(soundsdir)
>+	test -z "$(soundsdir)" || $(MKDIR_P) "$(DESTDIR)$(soundsdir)"
> 	@list='$(sounds_DATA)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(soundsDATA_INSTALL) $$d$$p $(DESTDIR)$(soundsdir)/$$f"; \
>-	  $(soundsDATA_INSTALL) $$d$$p $(DESTDIR)$(soundsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(soundsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(soundsdir)/$$f'"; \
>+	  $(soundsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(soundsdir)/$$f"; \
> 	done
> 
> uninstall-soundsDATA:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(sounds_DATA)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(soundsdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(soundsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(soundsdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(soundsdir)/$$f"; \
> 	done
> tags: TAGS
> TAGS:
>@@ -195,28 +235,23 @@
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -230,9 +265,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(DATA)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(soundsdir)
>+	for dir in "$(DESTDIR)$(soundsdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -252,7 +288,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -263,24 +299,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-soundsDATA
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -299,17 +345,21 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-soundsDATA
>+uninstall-am: uninstall-soundsDATA
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-man install-soundsDATA install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-info-am uninstall-soundsDATA
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-man install-pdf \
>+	install-pdf-am install-ps install-ps-am install-soundsDATA \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	uninstall uninstall-am uninstall-soundsDATA
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/data/textures/Makefile.in vamos-0.5.5/data/textures/Makefile.in
>--- vamos-0.5.5.orig/data/textures/Makefile.in	2005-10-29 22:28:19.000000000 +0200
>+++ vamos-0.5.5/data/textures/Makefile.in	2007-06-25 18:02:55.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,31 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = data/textures
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(texturesdir)"
>+texturesDATA_INSTALL = $(INSTALL_DATA)
>+DATA = $(textures_DATA)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +71,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +92,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,54 +102,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> texturesdir = $(pkgdatadir)/textures
>-
> textures_DATA = \
> 	100.png \
> 	150.png \
>@@ -179,51 +209,61 @@
> 	track2.png \
> 	wall.png
> 
>-
> EXTRA_DIST = $(textures_DATA)
>-subdir = data/textures
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-DATA = $(textures_DATA)
>-
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/textures/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  data/textures/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-texturesDATA_INSTALL = $(INSTALL_DATA)
> install-texturesDATA: $(textures_DATA)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(texturesdir)
>+	test -z "$(texturesdir)" || $(MKDIR_P) "$(DESTDIR)$(texturesdir)"
> 	@list='$(textures_DATA)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(texturesDATA_INSTALL) $$d$$p $(DESTDIR)$(texturesdir)/$$f"; \
>-	  $(texturesDATA_INSTALL) $$d$$p $(DESTDIR)$(texturesdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(texturesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(texturesdir)/$$f'"; \
>+	  $(texturesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(texturesdir)/$$f"; \
> 	done
> 
> uninstall-texturesDATA:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(textures_DATA)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(texturesdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(texturesdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(texturesdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(texturesdir)/$$f"; \
> 	done
> tags: TAGS
> TAGS:
>@@ -231,28 +271,23 @@
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -266,9 +301,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(DATA)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(texturesdir)
>+	for dir in "$(DESTDIR)$(texturesdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -288,7 +324,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -299,24 +335,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-texturesDATA
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -335,17 +381,21 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-texturesDATA
>+uninstall-am: uninstall-texturesDATA
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-man install-strip install-texturesDATA \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-info-am uninstall-texturesDATA
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-man install-pdf \
>+	install-pdf-am install-ps install-ps-am install-strip \
>+	install-texturesDATA installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	uninstall uninstall-am uninstall-texturesDATA
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/data/tracks/Makefile.in vamos-0.5.5/data/tracks/Makefile.in
>--- vamos-0.5.5.orig/data/tracks/Makefile.in	2005-10-29 22:28:21.000000000 +0200
>+++ vamos-0.5.5/data/tracks/Makefile.in	2007-06-25 18:02:55.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,31 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = data/tracks
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(tracksdir)"
>+tracksDATA_INSTALL = $(INSTALL_DATA)
>+DATA = $(tracks_DATA)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +71,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +92,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,54 +102,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> tracksdir = $(pkgdatadir)/tracks
>-
> tracks_DATA = \
> 	Albert_Park.xml \
> 	Bahrain.xml \
>@@ -167,51 +197,61 @@
> 	Suzuka.xml \
> 	Villeneuve.xml
> 
>-
> EXTRA_DIST = $(tracks_DATA)
>-subdir = data/tracks
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-DATA = $(tracks_DATA)
>-
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/tracks/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  data/tracks/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-tracksDATA_INSTALL = $(INSTALL_DATA)
> install-tracksDATA: $(tracks_DATA)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(tracksdir)
>+	test -z "$(tracksdir)" || $(MKDIR_P) "$(DESTDIR)$(tracksdir)"
> 	@list='$(tracks_DATA)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(tracksDATA_INSTALL) $$d$$p $(DESTDIR)$(tracksdir)/$$f"; \
>-	  $(tracksDATA_INSTALL) $$d$$p $(DESTDIR)$(tracksdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(tracksDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tracksdir)/$$f'"; \
>+	  $(tracksDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tracksdir)/$$f"; \
> 	done
> 
> uninstall-tracksDATA:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(tracks_DATA)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(tracksdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(tracksdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(tracksdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(tracksdir)/$$f"; \
> 	done
> tags: TAGS
> TAGS:
>@@ -219,28 +259,23 @@
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -254,9 +289,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(DATA)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(tracksdir)
>+	for dir in "$(DESTDIR)$(tracksdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -276,7 +312,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -287,24 +323,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-tracksDATA
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -323,17 +369,21 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-tracksDATA
>+uninstall-am: uninstall-tracksDATA
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-man install-strip install-tracksDATA \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-info-am uninstall-tracksDATA
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-man install-pdf \
>+	install-pdf-am install-ps install-ps-am install-strip \
>+	install-tracksDATA installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	uninstall uninstall-am uninstall-tracksDATA
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/data/worlds/Makefile.in vamos-0.5.5/data/worlds/Makefile.in
>--- vamos-0.5.5.orig/data/worlds/Makefile.in	2005-10-29 22:28:26.000000000 +0200
>+++ vamos-0.5.5/data/worlds/Makefile.in	2007-06-25 18:02:55.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,31 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = data/worlds
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(worldsdir)"
>+worldsDATA_INSTALL = $(INSTALL_DATA)
>+DATA = $(worlds_DATA)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +71,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +92,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,104 +102,128 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> worldsdir = $(pkgdatadir)/worlds
>-
> worlds_DATA = \
> 	default-world.xml \
> 	earth.xml \
> 	moon.xml
> 
>-
> EXTRA_DIST = $(worlds_DATA)
>-subdir = data/worlds
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-DATA = $(worlds_DATA)
>-
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/worlds/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  data/worlds/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-worldsDATA_INSTALL = $(INSTALL_DATA)
> install-worldsDATA: $(worlds_DATA)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(worldsdir)
>+	test -z "$(worldsdir)" || $(MKDIR_P) "$(DESTDIR)$(worldsdir)"
> 	@list='$(worlds_DATA)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(worldsDATA_INSTALL) $$d$$p $(DESTDIR)$(worldsdir)/$$f"; \
>-	  $(worldsDATA_INSTALL) $$d$$p $(DESTDIR)$(worldsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(worldsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(worldsdir)/$$f'"; \
>+	  $(worldsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(worldsdir)/$$f"; \
> 	done
> 
> uninstall-worldsDATA:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(worlds_DATA)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(worldsdir)/$$f"; \
>-	  rm -f $(DESTDIR)$(worldsdir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(worldsdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(worldsdir)/$$f"; \
> 	done
> tags: TAGS
> TAGS:
>@@ -191,28 +231,23 @@
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -226,9 +261,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(DATA)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(worldsdir)
>+	for dir in "$(DESTDIR)$(worldsdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -248,7 +284,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -259,24 +295,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-worldsDATA
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -295,17 +341,21 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-worldsDATA
>+uninstall-am: uninstall-worldsDATA
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-man install-strip install-worldsDATA \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-info-am uninstall-worldsDATA
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-man install-pdf \
>+	install-pdf-am install-ps install-ps-am install-strip \
>+	install-worldsDATA installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	uninstall uninstall-am uninstall-worldsDATA
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/doc/Makefile.in vamos-0.5.5/doc/Makefile.in
>--- vamos-0.5.5.orig/doc/Makefile.in	2005-10-29 22:28:28.000000000 +0200
>+++ vamos-0.5.5/doc/Makefile.in	2007-06-25 18:02:56.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -13,17 +13,11 @@
> # PARTICULAR PURPOSE.
> 
> @SET_MAKE@
>-
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +29,42 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = doc
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+INFO_DEPS = $(srcdir)/vamos.info
>+TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
>+am__TEXINFO_TEX_DIR = $(top_srcdir)/config
>+DVIS = vamos.dvi
>+PDFS = vamos.pdf
>+PSS = vamos.ps
>+HTMLS = vamos.html
>+TEXINFOS = vamos.texi
>+TEXI2DVI = texi2dvi
>+TEXI2PDF = $(TEXI2DVI) --pdf --batch
>+MAKEINFOHTML = $(MAKEINFO) --html
>+AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
>+DVIPS = dvips
>+am__installdirs = "$(DESTDIR)$(infodir)"
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +81,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +102,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,77 +112,102 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> info_TEXINFOS = vamos.texi
>-
> EXTRA_DIST = matrixfaq.htm
>-subdir = doc
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
>-am__TEXINFO_TEX_DIR = $(top_srcdir)/config
>-INFO_DEPS = vamos.info
>-DVIS = vamos.dvi
>-PDFS = vamos.pdf
>-PSS = vamos.ps
>-TEXINFOS = vamos.texi
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-.SUFFIXES: .dvi .info .pdf .ps .texi
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+.SUFFIXES: .dvi .html .info .pdf .ps .texi
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  doc/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -164,42 +215,85 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-
> .texi.info:
>-	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
>-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
>-	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
>+	am__cwd=`pwd` && cd $(srcdir) && \
>+	rm -rf $$backupdir && mkdir $$backupdir && \
>+	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
>+	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
>+	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
>+	  done; \
>+	else :; fi && \
>+	cd "$$am__cwd"; \
>+	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
>+	 -o $@ $<; \
>+	then \
>+	  rc=0; \
>+	  cd $(srcdir); \
>+	else \
>+	  rc=$$?; \
>+	  cd $(srcdir) && \
>+	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
>+	fi; \
>+	rm -rf $$backupdir; exit $$rc
> 
> .texi.dvi:
> 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
> 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
>-	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
>+	$(TEXI2DVI) $<
> 
> .texi.pdf:
> 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
> 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
>-	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
>-vamos.info: vamos.texi 
>+	$(TEXI2PDF) $<
>+
>+.texi.html:
>+	rm -rf $(@:.html=.htp)
>+	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
>+	 -o $(@:.html=.htp) $<; \
>+	then \
>+	  rm -rf $@; \
>+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
>+	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
>+	else \
>+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
>+	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
>+	  exit 1; \
>+	fi
>+$(srcdir)/vamos.info: vamos.texi 
> vamos.dvi: vamos.texi 
> vamos.pdf: vamos.texi 
>-TEXI2DVI = texi2dvi
>-
>-TEXI2PDF = $(TEXI2DVI) --pdf --batch
>-DVIPS = dvips
>+vamos.html: vamos.texi 
> .dvi.ps:
>+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
> 	$(DVIPS) -o $@ $<
> 
>+uninstall-dvi-am:
>+	@$(NORMAL_UNINSTALL)
>+	@list='$(DVIS)'; for p in $$list; do \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(dvidir)/$$f"; \
>+	done
>+
>+uninstall-html-am:
>+	@$(NORMAL_UNINSTALL)
>+	@list='$(HTMLS)'; for p in $$list; do \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
>+	  rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
>+	done
>+
> uninstall-info-am:
>-	$(PRE_UNINSTALL)
>-	@if (install-info --version && \
>+	@$(PRE_UNINSTALL)
>+	@if test -d '$(DESTDIR)$(infodir)' && \
>+	    (install-info --version && \
> 	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
> 	  list='$(INFO_DEPS)'; \
> 	  for file in $$list; do \
> 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
>-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \
>-	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \
>+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
>+	    install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
> 	  done; \
> 	else :; fi
> 	@$(NORMAL_UNINSTALL)
>@@ -207,27 +301,51 @@
> 	for file in $$list; do \
> 	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
> 	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
>-	  (if cd $(DESTDIR)$(infodir); then \
>-	     echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
>+	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
>+	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
> 	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
> 	   else :; fi); \
> 	done
> 
>+uninstall-pdf-am:
>+	@$(NORMAL_UNINSTALL)
>+	@list='$(PDFS)'; for p in $$list; do \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
>+	done
>+
>+uninstall-ps-am:
>+	@$(NORMAL_UNINSTALL)
>+	@list='$(PSS)'; for p in $$list; do \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
>+	done
>+
> dist-info: $(INFO_DEPS)
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
> 	list='$(INFO_DEPS)'; \
> 	for base in $$list; do \
>+	  case $$base in \
>+	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
>+	  esac; \
> 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
>-	  for file in $$d/$$base*; do \
>-	    relfile=`expr "$$file" : "$$d/$.*$"`; \
>-	    test -f $(distdir)/$$relfile || \
>-	      cp -p $$file $(distdir)/$$relfile; \
>+	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
>+	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
>+	    if test -f $$file; then \
>+	      relfile=`expr "$$file" : "$$d/$.*$"`; \
>+	      test -f $(distdir)/$$relfile || \
>+		cp -p $$file $(distdir)/$$relfile; \
>+	    else :; fi; \
> 	  done; \
> 	done
> 
> mostlyclean-aminfo:
>-	-rm -f vamos.aux vamos.cp vamos.cps vamos.fn vamos.fns vamos.ky vamos.kys \
>+	-rm -rf vamos.aux vamos.cp vamos.cps vamos.fn vamos.fns vamos.ky vamos.kys \
> 	  vamos.log vamos.pg vamos.pgs vamos.tmp vamos.toc vamos.tp \
>-	  vamos.tps vamos.vr vamos.vrs vamos.dvi vamos.pdf vamos.ps
>+	  vamos.tps vamos.vr vamos.vrs vamos.dvi vamos.pdf vamos.ps \
>+	  vamos.html
> 
> maintainer-clean-aminfo:
> 	@list='$(INFO_DEPS)'; for i in $$list; do \
>@@ -241,28 +359,23 @@
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -279,9 +392,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(INFO_DEPS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(infodir)
>+	for dir in "$(DESTDIR)$(infodir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -301,7 +415,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -312,35 +426,72 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am: $(DVIS)
> 
>+html: html-am
>+
>+html-am: $(HTMLS)
>+
> info: info-am
> 
> info-am: $(INFO_DEPS)
> 
> install-data-am: install-info-am
> 
>+install-dvi: install-dvi-am
>+
>+install-dvi-am: $(DVIS)
>+	@$(NORMAL_INSTALL)
>+	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
>+	@list='$(DVIS)'; for p in $$list; do \
>+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
>+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
>+	done
> install-exec-am:
> 
>+install-html: install-html-am
>+
>+install-html-am: $(HTMLS)
>+	@$(NORMAL_INSTALL)
>+	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
>+	@list='$(HTMLS)'; for p in $$list; do \
>+	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+	  f=$(am__strip_dir) \
>+	  if test -d "$$d$$p"; then \
>+	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
>+	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
>+	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
>+	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
>+	  else \
>+	    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
>+	    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
>+	  fi; \
>+	done
> install-info: install-info-am
> 
> install-info-am: $(INFO_DEPS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(infodir)
>-	@list='$(INFO_DEPS)'; \
>+	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>+	list='$(INFO_DEPS)'; \
> 	for file in $$list; do \
>+	  case $$file in \
>+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>+	  esac; \
> 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
> 	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
> 	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
>                        $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
> 	    if test -f $$ifile; then \
> 	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
>-	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
>-	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
>+	      echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
>+	      $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
> 	    else : ; fi; \
> 	  done; \
> 	done
>@@ -350,12 +501,34 @@
> 	  list='$(INFO_DEPS)'; \
> 	  for file in $$list; do \
> 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
>-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
>-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
>+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
>+	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
> 	  done; \
> 	else : ; fi
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-pdf-am: $(PDFS)
>+	@$(NORMAL_INSTALL)
>+	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
>+	@list='$(PDFS)'; for p in $$list; do \
>+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
>+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
>+	done
>+install-ps: install-ps-am
>+
>+install-ps-am: $(PSS)
>+	@$(NORMAL_INSTALL)
>+	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
>+	@list='$(PSS)'; for p in $$list; do \
>+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
>+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
>+	done
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -376,17 +549,24 @@
> 
> ps-am: $(PSS)
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
>+	uninstall-pdf-am uninstall-ps-am
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
>-	dist-info distclean distclean-generic distclean-libtool distdir \
>-	dvi dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-man install-strip installcheck \
>-	installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
>-	mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \
>-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
>+	dist-info distclean distclean-generic distclean-libtool \
>+	distdir dvi dvi-am html html-am info info-am install \
>+	install-am install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am install-man \
>+	install-pdf install-pdf-am install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-aminfo \
>+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
>+	uninstall-info-am uninstall-pdf-am uninstall-ps-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/geometry/Makefile.am vamos-0.5.5/geometry/Makefile.am
>--- vamos-0.5.5.orig/geometry/Makefile.am	2005-09-21 03:53:32.000000000 +0200
>+++ vamos-0.5.5/geometry/Makefile.am	2007-06-25 17:58:10.000000000 +0200
>@@ -15,7 +15,7 @@
> 
> INCLUDES = -I$(top_srcdir)/include
> 
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>+AM_CXXFLAGS =
> 
> if DO_UNIT_TESTS
> UNIT_TESTS = \
>diff -uNr vamos-0.5.5.orig/geometry/Makefile.in vamos-0.5.5/geometry/Makefile.in
>--- vamos-0.5.5.orig/geometry/Makefile.in	2005-10-29 22:28:48.000000000 +0200
>+++ vamos-0.5.5/geometry/Makefile.in	2007-06-25 18:02:56.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,12 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
>+
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +31,78 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+noinst_PROGRAMS = $(am__EXEEXT_1)
>+EXTRA_PROGRAMS = $(am__EXEEXT_1)
>+subdir = geometry
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(libdir)"
>+libLTLIBRARIES_INSTALL = $(INSTALL)
>+LTLIBRARIES = $(lib_LTLIBRARIES)
>+libvamos_geometry_la_LIBADD =
>+am_libvamos_geometry_la_OBJECTS = Inertia_Tensor.lo \
>+	Linear_Interpolator.lo Material.lo Rectangle.lo Spline.lo \
>+	Three_Matrix.lo Three_Vector.lo Two_Vector.lo XML_Parser.lo
>+libvamos_geometry_la_OBJECTS = $(am_libvamos_geometry_la_OBJECTS)
>+@DO_UNIT_TESTS_TRUE@am__EXEEXT_1 = test_Rectangle$(EXEEXT) \
>+@DO_UNIT_TESTS_TRUE@	test_Spline$(EXEEXT) \
>+@DO_UNIT_TESTS_TRUE@	test_Three_Vector$(EXEEXT) \
>+@DO_UNIT_TESTS_TRUE@	test_Two_Vector$(EXEEXT) \
>+@DO_UNIT_TESTS_TRUE@	test_XML_Parser$(EXEEXT)
>+PROGRAMS = $(noinst_PROGRAMS)
>+am_test_Rectangle_OBJECTS = test_Rectangle.$(OBJEXT)
>+test_Rectangle_OBJECTS = $(am_test_Rectangle_OBJECTS)
>+test_Rectangle_DEPENDENCIES = Rectangle.lo
>+am_test_Spline_OBJECTS = test_Spline.$(OBJEXT)
>+test_Spline_OBJECTS = $(am_test_Spline_OBJECTS)
>+test_Spline_DEPENDENCIES = Spline.lo
>+am_test_Three_Vector_OBJECTS = test_Three_Vector.$(OBJEXT)
>+test_Three_Vector_OBJECTS = $(am_test_Three_Vector_OBJECTS)
>+test_Three_Vector_DEPENDENCIES = Three_Vector.lo Three_Matrix.lo
>+am_test_Two_Vector_OBJECTS = test_Two_Vector.$(OBJEXT)
>+test_Two_Vector_OBJECTS = $(am_test_Two_Vector_OBJECTS)
>+test_Two_Vector_DEPENDENCIES = Two_Vector.lo
>+am_test_XML_Parser_OBJECTS = test_XML_Parser.$(OBJEXT)
>+test_XML_Parser_OBJECTS = $(am_test_XML_Parser_OBJECTS)
>+test_XML_Parser_DEPENDENCIES = XML_Parser.lo
>+DEFAULT_INCLUDES = -I.@am__isrc@
>+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>+am__depfiles_maybe = depfiles
>+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+CXXLD = $(CXX)
>+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+	$(LDFLAGS) -o $@
>+SOURCES = $(libvamos_geometry_la_SOURCES) $(test_Rectangle_SOURCES) \
>+	$(test_Spline_SOURCES) $(test_Three_Vector_SOURCES) \
>+	$(test_Two_Vector_SOURCES) $(test_XML_Parser_SOURCES)
>+DIST_SOURCES = $(libvamos_geometry_la_SOURCES) \
>+	$(test_Rectangle_SOURCES) $(test_Spline_SOURCES) \
>+	$(test_Three_Vector_SOURCES) $(test_Two_Vector_SOURCES) \
>+	$(test_XML_Parser_SOURCES)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,28 +119,28 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
> INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
> LDFLAGS = @LDFLAGS@
> LIBOBJS = @LIBOBJS@
>-
> LIBS = 
> LIBTOOL = @LIBTOOL@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -87,54 +150,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> lib_LTLIBRARIES = libvamos-geometry.la
>-
> libvamos_geometry_la_SOURCES = \
> 	Inertia_Tensor.cc \
> 	Linear_Interpolator.cc \
>@@ -146,11 +223,9 @@
> 	Two_Vector.cc \
> 	XML_Parser.cc
> 
>-
> INCLUDES = -I$(top_srcdir)/include
>-
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>-
>+AM_CXXFLAGS = 
>+@DO_UNIT_TESTS_FALSE@UNIT_TESTS = 
> @DO_UNIT_TESTS_TRUE@UNIT_TESTS = \
> @DO_UNIT_TESTS_TRUE@	test_Rectangle \
> @DO_UNIT_TESTS_TRUE@	test_Spline \
>@@ -158,10 +233,6 @@
> @DO_UNIT_TESTS_TRUE@	test_Two_Vector \
> @DO_UNIT_TESTS_TRUE@	test_XML_Parser
> 
>-@DO_UNIT_TESTS_FALSE@UNIT_TESTS = 
>-
>-noinst_PROGRAMS = $(UNIT_TESTS)
>-EXTRA_PROGRAMS = $(UNIT_TESTS)
> test_Rectangle_SOURCES = test_Rectangle.cc
> test_Rectangle_LDADD = Rectangle.lo -lcppunit -ldl
> test_Spline_SOURCES = test_Spline.cc
>@@ -172,121 +243,68 @@
> test_Two_Vector_LDADD = Two_Vector.lo -lcppunit -ldl
> test_XML_Parser_SOURCES = test_XML_Parser.cc
> test_XML_Parser_LDADD = XML_Parser.lo -lcppunit -ldl
>-subdir = geometry
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-LTLIBRARIES = $(lib_LTLIBRARIES)
>-
>-libvamos_geometry_la_LDFLAGS =
>-libvamos_geometry_la_LIBADD =
>-am_libvamos_geometry_la_OBJECTS = Inertia_Tensor.lo \
>-	Linear_Interpolator.lo Material.lo Rectangle.lo Spline.lo \
>-	Three_Matrix.lo Three_Vector.lo Two_Vector.lo XML_Parser.lo
>-libvamos_geometry_la_OBJECTS = $(am_libvamos_geometry_la_OBJECTS)
>-@DO_UNIT_TESTS_TRUE@EXTRA_PROGRAMS = test_Rectangle$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_Spline$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_Three_Vector$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_Two_Vector$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_XML_Parser$(EXEEXT)
>-@DO_UNIT_TESTS_FALSE@EXTRA_PROGRAMS =
>-@DO_UNIT_TESTS_TRUE@noinst_PROGRAMS = test_Rectangle$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_Spline$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_Three_Vector$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_Two_Vector$(EXEEXT) \
>-@DO_UNIT_TESTS_TRUE@	test_XML_Parser$(EXEEXT)
>-@DO_UNIT_TESTS_FALSE@noinst_PROGRAMS =
>-PROGRAMS = $(noinst_PROGRAMS)
>-
>-am_test_Rectangle_OBJECTS = test_Rectangle.$(OBJEXT)
>-test_Rectangle_OBJECTS = $(am_test_Rectangle_OBJECTS)
>-test_Rectangle_DEPENDENCIES = Rectangle.lo
>-test_Rectangle_LDFLAGS =
>-am_test_Spline_OBJECTS = test_Spline.$(OBJEXT)
>-test_Spline_OBJECTS = $(am_test_Spline_OBJECTS)
>-test_Spline_DEPENDENCIES = Spline.lo
>-test_Spline_LDFLAGS =
>-am_test_Three_Vector_OBJECTS = test_Three_Vector.$(OBJEXT)
>-test_Three_Vector_OBJECTS = $(am_test_Three_Vector_OBJECTS)
>-test_Three_Vector_DEPENDENCIES = Three_Vector.lo Three_Matrix.lo
>-test_Three_Vector_LDFLAGS =
>-am_test_Two_Vector_OBJECTS = test_Two_Vector.$(OBJEXT)
>-test_Two_Vector_OBJECTS = $(am_test_Two_Vector_OBJECTS)
>-test_Two_Vector_DEPENDENCIES = Two_Vector.lo
>-test_Two_Vector_LDFLAGS =
>-am_test_XML_Parser_OBJECTS = test_XML_Parser.$(OBJEXT)
>-test_XML_Parser_OBJECTS = $(am_test_XML_Parser_OBJECTS)
>-test_XML_Parser_DEPENDENCIES = XML_Parser.lo
>-test_XML_Parser_LDFLAGS =
>-
>-DEFAULT_INCLUDES =  -I. -I$(srcdir)
>-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>-am__depfiles_maybe = depfiles
>-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Inertia_Tensor.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Linear_Interpolator.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Material.Plo ./$(DEPDIR)/Rectangle.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Spline.Plo ./$(DEPDIR)/Three_Matrix.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Three_Vector.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Two_Vector.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/XML_Parser.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/test_Rectangle.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/test_Spline.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/test_Three_Vector.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/test_Two_Vector.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/test_XML_Parser.Po
>-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CXXFLAGS) $(CXXFLAGS)
>-CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>-DIST_SOURCES = $(libvamos_geometry_la_SOURCES) $(test_Rectangle_SOURCES) \
>-	$(test_Spline_SOURCES) $(test_Three_Vector_SOURCES) \
>-	$(test_Two_Vector_SOURCES) $(test_XML_Parser_SOURCES)
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-SOURCES = $(libvamos_geometry_la_SOURCES) $(test_Rectangle_SOURCES) $(test_Spline_SOURCES) $(test_Three_Vector_SOURCES) $(test_Two_Vector_SOURCES) $(test_XML_Parser_SOURCES)
>-
> all: all-am
> 
> .SUFFIXES:
> .SUFFIXES: .cc .lo .o .obj
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  geometry/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>-libLTLIBRARIES_INSTALL = $(INSTALL)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> install-libLTLIBRARIES: $(lib_LTLIBRARIES)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  if test -f $$p; then \
>-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
>-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
>+	    f=$(am__strip_dir) \
>+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
>+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
> 	  else :; fi; \
> 	done
> 
> uninstall-libLTLIBRARIES:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
>-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
>-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
>+	  p=$(am__strip_dir) \
>+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
>+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
> 	done
> 
> clean-libLTLIBRARIES:
> 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
>-	  test "$$dir" = "$$p" && dir=.; \
>+	  test "$$dir" != "$$p" || dir=.; \
> 	  echo "rm -f \"$${dir}/so_locations\""; \
> 	  rm -f "$${dir}/so_locations"; \
> 	done
> libvamos-geometry.la: $(libvamos_geometry_la_OBJECTS) $(libvamos_geometry_la_DEPENDENCIES) 
>-	$(CXXLINK) -rpath $(libdir) $(libvamos_geometry_la_LDFLAGS) $(libvamos_geometry_la_OBJECTS) $(libvamos_geometry_la_LIBADD) $(LIBS)
>+	$(CXXLINK) -rpath $(libdir) $(libvamos_geometry_la_OBJECTS) $(libvamos_geometry_la_LIBADD) $(LIBS)
> 
> clean-noinstPROGRAMS:
> 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
>@@ -296,22 +314,22 @@
> 	done
> test_Rectangle$(EXEEXT): $(test_Rectangle_OBJECTS) $(test_Rectangle_DEPENDENCIES) 
> 	@rm -f test_Rectangle$(EXEEXT)
>-	$(CXXLINK) $(test_Rectangle_LDFLAGS) $(test_Rectangle_OBJECTS) $(test_Rectangle_LDADD) $(LIBS)
>+	$(CXXLINK) $(test_Rectangle_OBJECTS) $(test_Rectangle_LDADD) $(LIBS)
> test_Spline$(EXEEXT): $(test_Spline_OBJECTS) $(test_Spline_DEPENDENCIES) 
> 	@rm -f test_Spline$(EXEEXT)
>-	$(CXXLINK) $(test_Spline_LDFLAGS) $(test_Spline_OBJECTS) $(test_Spline_LDADD) $(LIBS)
>+	$(CXXLINK) $(test_Spline_OBJECTS) $(test_Spline_LDADD) $(LIBS)
> test_Three_Vector$(EXEEXT): $(test_Three_Vector_OBJECTS) $(test_Three_Vector_DEPENDENCIES) 
> 	@rm -f test_Three_Vector$(EXEEXT)
>-	$(CXXLINK) $(test_Three_Vector_LDFLAGS) $(test_Three_Vector_OBJECTS) $(test_Three_Vector_LDADD) $(LIBS)
>+	$(CXXLINK) $(test_Three_Vector_OBJECTS) $(test_Three_Vector_LDADD) $(LIBS)
> test_Two_Vector$(EXEEXT): $(test_Two_Vector_OBJECTS) $(test_Two_Vector_DEPENDENCIES) 
> 	@rm -f test_Two_Vector$(EXEEXT)
>-	$(CXXLINK) $(test_Two_Vector_LDFLAGS) $(test_Two_Vector_OBJECTS) $(test_Two_Vector_LDADD) $(LIBS)
>+	$(CXXLINK) $(test_Two_Vector_OBJECTS) $(test_Two_Vector_LDADD) $(LIBS)
> test_XML_Parser$(EXEEXT): $(test_XML_Parser_OBJECTS) $(test_XML_Parser_DEPENDENCIES) 
> 	@rm -f test_XML_Parser$(EXEEXT)
>-	$(CXXLINK) $(test_XML_Parser_LDFLAGS) $(test_XML_Parser_OBJECTS) $(test_XML_Parser_LDADD) $(LIBS)
>+	$(CXXLINK) $(test_XML_Parser_OBJECTS) $(test_XML_Parser_LDADD) $(LIBS)
> 
> mostlyclean-compile:
>-	-rm -f *.$(OBJEXT) core *.core
>+	-rm -f *.$(OBJEXT)
> 
> distclean-compile:
> 	-rm -f *.tab.c
>@@ -332,37 +350,25 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_XML_Parser.Po@am__quote@
> 
> .cc.o:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
> 
> .cc.obj:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
> 
> .cc.lo:
>-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -370,18 +376,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -390,6 +384,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -401,10 +396,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -427,28 +423,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -459,13 +450,15 @@
> 	    || exit 1; \
> 	  fi; \
> 	done
>+@DO_UNIT_TESTS_FALSE@check-local:
> check-am: all-am
> 	$(MAKE) $(AM_MAKEFLAGS) check-local
> check: check-am
> all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	for dir in "$(DESTDIR)$(libdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -485,7 +478,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -499,24 +492,34 @@
> 	-rm -rf ./$(DEPDIR)
> 	-rm -f Makefile
> distclean-am: clean-am distclean-compile distclean-generic \
>-	distclean-libtool distclean-tags
>+	distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am: install-libLTLIBRARIES
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -537,20 +540,24 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
>+uninstall-am: uninstall-libLTLIBRARIES
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
> 	clean-generic clean-libLTLIBRARIES clean-libtool \
> 	clean-noinstPROGRAMS ctags distclean distclean-compile \
> 	distclean-generic distclean-libtool distclean-tags distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-libLTLIBRARIES install-man \
>-	install-strip installcheck installcheck-am installdirs \
>-	maintainer-clean maintainer-clean-generic mostlyclean \
>-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
>-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
>-	uninstall-libLTLIBRARIES
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-libLTLIBRARIES \
>+	install-man install-pdf install-pdf-am install-ps \
>+	install-ps-am install-strip installcheck installcheck-am \
>+	installdirs maintainer-clean maintainer-clean-generic \
>+	mostlyclean mostlyclean-compile mostlyclean-generic \
>+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
>+	uninstall-am uninstall-libLTLIBRARIES
> 
> 
> @DO_UNIT_TESTS_TRUE@check-local: $(UNIT_TESTS)
>diff -uNr vamos-0.5.5.orig/include/Makefile.in vamos-0.5.5/include/Makefile.in
>--- vamos-0.5.5.orig/include/Makefile.in	2005-10-29 22:28:30.000000000 +0200
>+++ vamos-0.5.5/include/Makefile.in	2007-06-25 18:02:56.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -13,17 +13,11 @@
> # PARTICULAR PURPOSE.
> 
> @SET_MAKE@
>-
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +29,34 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = include
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
>+	html-recursive info-recursive install-data-recursive \
>+	install-dvi-recursive install-exec-recursive \
>+	install-html-recursive install-info-recursive \
>+	install-pdf-recursive install-ps-recursive install-recursive \
>+	installcheck-recursive installdirs-recursive pdf-recursive \
>+	ps-recursive uninstall-recursive
>+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
>+  distclean-recursive maintainer-clean-recursive
>+ETAGS = etags
>+CTAGS = ctags
>+DIST_SUBDIRS = $(SUBDIRS)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +73,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +94,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,74 +104,100 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> SUBDIRS = vamos
>-subdir = include
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-
>-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
>-	ps-recursive install-info-recursive uninstall-info-recursive \
>-	all-recursive install-data-recursive install-exec-recursive \
>-	installdirs-recursive install-recursive uninstall-recursive \
>-	check-recursive installcheck-recursive
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-DIST_SUBDIRS = $(SUBDIRS)
> all: all-recursive
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  include/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -161,10 +205,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
> # This directory's subdirectories are mostly independent; you can cd
> # into them and run `make' without going through this Makefile.
> # To change the values of `make' variables: instead of editing Makefiles,
>@@ -172,7 +212,13 @@
> #     (which will cause the Makefiles to be regenerated when you run `make');
> # (2) otherwise, pass the desired values on the `make' command line.
> $(RECURSIVE_TARGETS):
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	target=`echo $@ | sed s/-recursive//`; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -184,15 +230,20 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done; \
> 	if test "$$dot_seen" = "no"; then \
> 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
> 	fi; test -z "$$fail"
> 
>-mostlyclean-recursive clean-recursive distclean-recursive \
>-maintainer-clean-recursive:
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+$(RECURSIVE_CLEAN_TARGETS):
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	case "$@" in \
> 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
>@@ -213,7 +264,7 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done && test -z "$$fail"
> tags-recursive:
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -224,14 +275,6 @@
> 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -240,19 +283,22 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
> 	tags=; \
> 	here=`pwd`; \
>-	if (etags --etags-include --version) >/dev/null 2>&1; then \
>+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
> 	  include_option=--etags-include; \
>+	  empty_fix=.; \
> 	else \
> 	  include_option=--include; \
>+	  empty_fix=; \
> 	fi; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -f $$subdir/TAGS && \
>+	    test ! -f $$subdir/TAGS || \
> 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
> 	  fi; \
> 	done; \
>@@ -262,10 +308,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -288,28 +335,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -320,15 +362,19 @@
> 	    || exit 1; \
> 	  fi; \
> 	done
>-	list='$(SUBDIRS)'; for subdir in $$list; do \
>+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -d $(distdir)/$$subdir \
>-	    || mkdir $(distdir)/$$subdir \
>+	    test -d "$(distdir)/$$subdir" \
>+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
> 	    || exit 1; \
>+	    distdir=`$(am__cd) $(distdir) && pwd`; \
>+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
> 	    (cd $$subdir && \
> 	      $(MAKE) $(AM_MAKEFLAGS) \
>-	        top_distdir="$(top_distdir)" \
>-	        distdir=../$(distdir)/$$subdir \
>+	        top_distdir="$$top_distdir" \
>+	        distdir="$$distdir/$$subdir" \
>+		am__remove_distdir=: \
>+		am__skip_length_check=: \
> 	        distdir) \
> 	      || exit 1; \
> 	  fi; \
>@@ -338,7 +384,6 @@
> all-am: Makefile
> installdirs: installdirs-recursive
> installdirs-am:
>-
> install: install-recursive
> install-exec: install-exec-recursive
> install-data: install-data-recursive
>@@ -358,7 +403,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -369,25 +414,34 @@
> 
> distclean: distclean-recursive
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-recursive
> 
> dvi-am:
> 
>+html: html-recursive
>+
> info: info-recursive
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-recursive
>+
> install-exec-am:
> 
>+install-html: install-html-recursive
>+
> install-info: install-info-recursive
> 
> install-man:
> 
>+install-pdf: install-pdf-recursive
>+
>+install-ps: install-ps-recursive
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-recursive
>@@ -406,26 +460,24 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am:
> 
>-uninstall-info: uninstall-info-recursive
>+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
>+	install-strip
> 
>-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
>-	clean-generic clean-libtool clean-recursive ctags \
>-	ctags-recursive distclean distclean-generic distclean-libtool \
>-	distclean-recursive distclean-tags distdir dvi dvi-am \
>-	dvi-recursive info info-am info-recursive install install-am \
>-	install-data install-data-am install-data-recursive \
>-	install-exec install-exec-am install-exec-recursive \
>-	install-info install-info-am install-info-recursive install-man \
>-	install-recursive install-strip installcheck installcheck-am \
>-	installdirs installdirs-am installdirs-recursive \
>-	maintainer-clean maintainer-clean-generic \
>-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
>-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
>-	uninstall uninstall-am uninstall-info-am \
>-	uninstall-info-recursive uninstall-recursive
>+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>+	all all-am check check-am clean clean-generic clean-libtool \
>+	ctags ctags-recursive distclean distclean-generic \
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-ps install-ps-am install-strip installcheck \
>+	installcheck-am installdirs installdirs-am maintainer-clean \
>+	maintainer-clean-generic mostlyclean mostlyclean-generic \
>+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
>+	uninstall uninstall-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/include/vamos/body/Makefile.in vamos-0.5.5/include/vamos/body/Makefile.in
>--- vamos-0.5.5.orig/include/vamos/body/Makefile.in	2005-10-29 22:28:34.000000000 +0200
>+++ vamos-0.5.5/include/vamos/body/Makefile.in	2007-06-25 18:02:57.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,15 +14,10 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
>-top_builddir = ../../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -34,13 +29,35 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>-
>+subdir = include/vamos/body
>+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
>+	$(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
>+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
>+HEADERS = $(pkginclude_HEADERS)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> pkgincludedir = $(includedir)/@PACKAGE@/body
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -57,16 +74,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -78,6 +95,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -87,52 +105,67 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> pkginclude_HEADERS = \
> 	Aerodynamic_Device.h \
> 	Rigid_Body.h \
>@@ -154,61 +187,63 @@
> 	Transmission.h \
> 	Wheel.h
> 
>-
> EXTRA_DIST = $(pkginclude_HEADERS)
>-subdir = include/vamos/body
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-HEADERS = $(pkginclude_HEADERS)
>-
>-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/vamos/body/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  include/vamos/body/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
> install-pkgincludeHEADERS: $(pkginclude_HEADERS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
> uninstall-pkgincludeHEADERS:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -217,6 +252,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -228,10 +264,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -254,28 +291,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -289,9 +321,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(HEADERS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -311,7 +344,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -322,25 +355,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-pkgincludeHEADERS
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -359,18 +401,22 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
>+uninstall-am: uninstall-pkgincludeHEADERS
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libtool ctags distclean distclean-generic \
>-	distclean-libtool distclean-tags distdir dvi dvi-am info \
>-	info-am install install-am install-data install-data-am \
>-	install-exec install-exec-am install-info install-info-am \
>-	install-man install-pkgincludeHEADERS install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
>-	uninstall-am uninstall-info-am uninstall-pkgincludeHEADERS
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-pkgincludeHEADERS install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/include/vamos/geometry/Makefile.in vamos-0.5.5/include/vamos/geometry/Makefile.in
>--- vamos-0.5.5.orig/include/vamos/geometry/Makefile.in	2005-10-29 22:28:37.000000000 +0200
>+++ vamos-0.5.5/include/vamos/geometry/Makefile.in	2007-06-25 18:02:57.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,15 +14,10 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
>-top_builddir = ../../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -34,13 +29,35 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>-
>+subdir = include/vamos/geometry
>+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
>+	$(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
>+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
>+HEADERS = $(pkginclude_HEADERS)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> pkgincludedir = $(includedir)/@PACKAGE@/geometry
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -57,16 +74,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -78,6 +95,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -87,52 +105,67 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> pkginclude_HEADERS = \
> 	Constants.h \
> 	Conversions.h \
>@@ -147,61 +180,63 @@
> 	Two_Vector.h \
> 	XML_Parser.h
> 
>-
> EXTRA_DIST = $(pkginclude_HEADERS)
>-subdir = include/vamos/geometry
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-HEADERS = $(pkginclude_HEADERS)
>-
>-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/vamos/geometry/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  include/vamos/geometry/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
> install-pkgincludeHEADERS: $(pkginclude_HEADERS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
> uninstall-pkgincludeHEADERS:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -210,6 +245,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -221,10 +257,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -247,28 +284,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -282,9 +314,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(HEADERS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -304,7 +337,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -315,25 +348,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-pkgincludeHEADERS
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -352,18 +394,22 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
>+uninstall-am: uninstall-pkgincludeHEADERS
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libtool ctags distclean distclean-generic \
>-	distclean-libtool distclean-tags distdir dvi dvi-am info \
>-	info-am install install-am install-data install-data-am \
>-	install-exec install-exec-am install-info install-info-am \
>-	install-man install-pkgincludeHEADERS install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
>-	uninstall-am uninstall-info-am uninstall-pkgincludeHEADERS
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-pkgincludeHEADERS install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/include/vamos/Makefile.in vamos-0.5.5/include/vamos/Makefile.in
>--- vamos-0.5.5.orig/include/vamos/Makefile.in	2005-10-29 22:28:32.000000000 +0200
>+++ vamos-0.5.5/include/vamos/Makefile.in	2007-06-25 18:02:56.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -13,17 +13,11 @@
> # PARTICULAR PURPOSE.
> 
> @SET_MAKE@
>-
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +29,34 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = include/vamos
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
>+	html-recursive info-recursive install-data-recursive \
>+	install-dvi-recursive install-exec-recursive \
>+	install-html-recursive install-info-recursive \
>+	install-pdf-recursive install-ps-recursive install-recursive \
>+	installcheck-recursive installdirs-recursive pdf-recursive \
>+	ps-recursive uninstall-recursive
>+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
>+  distclean-recursive maintainer-clean-recursive
>+ETAGS = etags
>+CTAGS = ctags
>+DIST_SUBDIRS = $(SUBDIRS)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +73,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +94,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,74 +104,100 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> SUBDIRS = body geometry media track world
>-subdir = include/vamos
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-
>-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
>-	ps-recursive install-info-recursive uninstall-info-recursive \
>-	all-recursive install-data-recursive install-exec-recursive \
>-	installdirs-recursive install-recursive uninstall-recursive \
>-	check-recursive installcheck-recursive
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-DIST_SUBDIRS = $(SUBDIRS)
> all: all-recursive
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/vamos/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  include/vamos/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -161,10 +205,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
> # This directory's subdirectories are mostly independent; you can cd
> # into them and run `make' without going through this Makefile.
> # To change the values of `make' variables: instead of editing Makefiles,
>@@ -172,7 +212,13 @@
> #     (which will cause the Makefiles to be regenerated when you run `make');
> # (2) otherwise, pass the desired values on the `make' command line.
> $(RECURSIVE_TARGETS):
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	target=`echo $@ | sed s/-recursive//`; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -184,15 +230,20 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done; \
> 	if test "$$dot_seen" = "no"; then \
> 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
> 	fi; test -z "$$fail"
> 
>-mostlyclean-recursive clean-recursive distclean-recursive \
>-maintainer-clean-recursive:
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+$(RECURSIVE_CLEAN_TARGETS):
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	case "$@" in \
> 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
>@@ -213,7 +264,7 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done && test -z "$$fail"
> tags-recursive:
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -224,14 +275,6 @@
> 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -240,19 +283,22 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
> 	tags=; \
> 	here=`pwd`; \
>-	if (etags --etags-include --version) >/dev/null 2>&1; then \
>+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
> 	  include_option=--etags-include; \
>+	  empty_fix=.; \
> 	else \
> 	  include_option=--include; \
>+	  empty_fix=; \
> 	fi; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -f $$subdir/TAGS && \
>+	    test ! -f $$subdir/TAGS || \
> 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
> 	  fi; \
> 	done; \
>@@ -262,10 +308,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -288,28 +335,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -320,15 +362,19 @@
> 	    || exit 1; \
> 	  fi; \
> 	done
>-	list='$(SUBDIRS)'; for subdir in $$list; do \
>+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -d $(distdir)/$$subdir \
>-	    || mkdir $(distdir)/$$subdir \
>+	    test -d "$(distdir)/$$subdir" \
>+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
> 	    || exit 1; \
>+	    distdir=`$(am__cd) $(distdir) && pwd`; \
>+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
> 	    (cd $$subdir && \
> 	      $(MAKE) $(AM_MAKEFLAGS) \
>-	        top_distdir="$(top_distdir)" \
>-	        distdir=../$(distdir)/$$subdir \
>+	        top_distdir="$$top_distdir" \
>+	        distdir="$$distdir/$$subdir" \
>+		am__remove_distdir=: \
>+		am__skip_length_check=: \
> 	        distdir) \
> 	      || exit 1; \
> 	  fi; \
>@@ -338,7 +384,6 @@
> all-am: Makefile
> installdirs: installdirs-recursive
> installdirs-am:
>-
> install: install-recursive
> install-exec: install-exec-recursive
> install-data: install-data-recursive
>@@ -358,7 +403,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -369,25 +414,34 @@
> 
> distclean: distclean-recursive
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-recursive
> 
> dvi-am:
> 
>+html: html-recursive
>+
> info: info-recursive
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-recursive
>+
> install-exec-am:
> 
>+install-html: install-html-recursive
>+
> install-info: install-info-recursive
> 
> install-man:
> 
>+install-pdf: install-pdf-recursive
>+
>+install-ps: install-ps-recursive
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-recursive
>@@ -406,26 +460,24 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am:
> 
>-uninstall-info: uninstall-info-recursive
>+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
>+	install-strip
> 
>-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
>-	clean-generic clean-libtool clean-recursive ctags \
>-	ctags-recursive distclean distclean-generic distclean-libtool \
>-	distclean-recursive distclean-tags distdir dvi dvi-am \
>-	dvi-recursive info info-am info-recursive install install-am \
>-	install-data install-data-am install-data-recursive \
>-	install-exec install-exec-am install-exec-recursive \
>-	install-info install-info-am install-info-recursive install-man \
>-	install-recursive install-strip installcheck installcheck-am \
>-	installdirs installdirs-am installdirs-recursive \
>-	maintainer-clean maintainer-clean-generic \
>-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
>-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
>-	uninstall uninstall-am uninstall-info-am \
>-	uninstall-info-recursive uninstall-recursive
>+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>+	all all-am check check-am clean clean-generic clean-libtool \
>+	ctags ctags-recursive distclean distclean-generic \
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-ps install-ps-am install-strip installcheck \
>+	installcheck-am installdirs installdirs-am maintainer-clean \
>+	maintainer-clean-generic mostlyclean mostlyclean-generic \
>+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
>+	uninstall uninstall-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/include/vamos/media/Makefile.in vamos-0.5.5/include/vamos/media/Makefile.in
>--- vamos-0.5.5.orig/include/vamos/media/Makefile.in	2005-10-29 22:28:39.000000000 +0200
>+++ vamos-0.5.5/include/vamos/media/Makefile.in	2007-06-25 18:02:57.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,15 +14,10 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
>-top_builddir = ../../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -34,13 +29,35 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>-
>+subdir = include/vamos/media
>+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
>+	$(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
>+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
>+HEADERS = $(pkginclude_HEADERS)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> pkgincludedir = $(includedir)/@PACKAGE@/media
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -57,16 +74,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -78,6 +95,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -87,112 +105,129 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> pkginclude_HEADERS = \
> 	Ac3d.h \
> 	Sample.h \
> 	Texture_Image.h
> 
>-
> EXTRA_DIST = $(pkginclude_HEADERS)
>-subdir = include/vamos/media
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-HEADERS = $(pkginclude_HEADERS)
>-
>-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/vamos/media/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  include/vamos/media/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
> install-pkgincludeHEADERS: $(pkginclude_HEADERS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
> uninstall-pkgincludeHEADERS:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -201,6 +236,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -212,10 +248,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -238,28 +275,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -273,9 +305,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(HEADERS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -295,7 +328,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -306,25 +339,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-pkgincludeHEADERS
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -343,18 +385,22 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
>+uninstall-am: uninstall-pkgincludeHEADERS
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libtool ctags distclean distclean-generic \
>-	distclean-libtool distclean-tags distdir dvi dvi-am info \
>-	info-am install install-am install-data install-data-am \
>-	install-exec install-exec-am install-info install-info-am \
>-	install-man install-pkgincludeHEADERS install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
>-	uninstall-am uninstall-info-am uninstall-pkgincludeHEADERS
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-pkgincludeHEADERS install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/include/vamos/track/Makefile.in vamos-0.5.5/include/vamos/track/Makefile.in
>--- vamos-0.5.5.orig/include/vamos/track/Makefile.in	2005-10-29 22:28:41.000000000 +0200
>+++ vamos-0.5.5/include/vamos/track/Makefile.in	2007-06-25 18:02:57.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,15 +14,10 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
>-top_builddir = ../../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -34,13 +29,35 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>-
>+subdir = include/vamos/track
>+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
>+	$(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
>+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
>+HEADERS = $(pkginclude_HEADERS)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> pkgincludedir = $(includedir)/@PACKAGE@/track
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -57,16 +74,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -78,6 +95,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -87,113 +105,130 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> pkginclude_HEADERS = \
> 	Gl_Road_Segment.h \
> 	Road_Segment.h \
> 	Strip_Track.h \
> 	Track.h
> 
>-
> EXTRA_DIST = $(pkginclude_HEADERS)
>-subdir = include/vamos/track
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-HEADERS = $(pkginclude_HEADERS)
>-
>-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/vamos/track/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  include/vamos/track/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
> install-pkgincludeHEADERS: $(pkginclude_HEADERS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
> uninstall-pkgincludeHEADERS:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -202,6 +237,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -213,10 +249,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -239,28 +276,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -274,9 +306,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(HEADERS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -296,7 +329,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -307,25 +340,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-pkgincludeHEADERS
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -344,18 +386,22 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
>+uninstall-am: uninstall-pkgincludeHEADERS
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libtool ctags distclean distclean-generic \
>-	distclean-libtool distclean-tags distdir dvi dvi-am info \
>-	info-am install install-am install-data install-data-am \
>-	install-exec install-exec-am install-info install-info-am \
>-	install-man install-pkgincludeHEADERS install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
>-	uninstall-am uninstall-info-am uninstall-pkgincludeHEADERS
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-pkgincludeHEADERS install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/include/vamos/world/Makefile.in vamos-0.5.5/include/vamos/world/Makefile.in
>--- vamos-0.5.5.orig/include/vamos/world/Makefile.in	2005-10-29 22:28:43.000000000 +0200
>+++ vamos-0.5.5/include/vamos/world/Makefile.in	2007-06-25 18:02:58.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,15 +14,10 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
>-top_builddir = ../../..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -34,13 +29,35 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>-
>+subdir = include/vamos/world
>+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
>+	$(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
>+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
>+HEADERS = $(pkginclude_HEADERS)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> pkgincludedir = $(includedir)/@PACKAGE@/world
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -57,16 +74,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -78,6 +95,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -87,52 +105,67 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> pkginclude_HEADERS = \
> 	Atmosphere.h \
> 	World.h \
>@@ -140,61 +173,63 @@
> 	Gl_World.h \
> 	Sounds.h
> 
>-
> EXTRA_DIST = $(pkginclude_HEADERS)
>-subdir = include/vamos/world
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-HEADERS = $(pkginclude_HEADERS)
>-
>-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/vamos/world/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  include/vamos/world/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
> install-pkgincludeHEADERS: $(pkginclude_HEADERS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
> 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
> uninstall-pkgincludeHEADERS:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
>-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
>-	  rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
>+	  f=$(am__strip_dir) \
>+	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -203,6 +238,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -214,10 +250,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -240,28 +277,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ../../..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -275,9 +307,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(HEADERS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
>+	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -297,7 +330,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -308,25 +341,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool \
>-	distclean-tags
>+distclean-am: clean-am distclean-generic distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am: install-pkgincludeHEADERS
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -345,18 +387,22 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
>+uninstall-am: uninstall-pkgincludeHEADERS
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libtool ctags distclean distclean-generic \
>-	distclean-libtool distclean-tags distdir dvi dvi-am info \
>-	info-am install install-am install-data install-data-am \
>-	install-exec install-exec-am install-info install-info-am \
>-	install-man install-pkgincludeHEADERS install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
>-	uninstall-am uninstall-info-am uninstall-pkgincludeHEADERS
>+	distclean-libtool distclean-tags distdir dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-pkgincludeHEADERS install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/INSTALL vamos-0.5.5/INSTALL
>--- vamos-0.5.5.orig/INSTALL	2001-10-17 03:31:29.000000000 +0200
>+++ vamos-0.5.5/INSTALL	2007-06-25 17:58:10.000000000 +0200
>@@ -1,38 +1,54 @@
>+Installation Instructions
>+*************************
>+
>+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
>+2006 Free Software Foundation, Inc.
>+
>+This file is free documentation; the Free Software Foundation gives
>+unlimited permission to copy, distribute and modify it.
>+
> Basic Installation
> ==================
> 
>-   These are generic installation instructions.
>+Briefly, the shell commands `./configure; make; make install' should
>+configure, build, and install this package.  The following
>+more-detailed instructions are generic; see the `README' file for
>+instructions specific to this package.
> 
>    The `configure' shell script attempts to guess correct values for
> various system-dependent variables used during compilation.  It uses
> those values to create a `Makefile' in each directory of the package.
> It may also create one or more `.h' files containing system-dependent
> definitions.  Finally, it creates a shell script `config.status' that
>-you can run in the future to recreate the current configuration, a file
>-`config.cache' that saves the results of its tests to speed up
>-reconfiguring, and a file `config.log' containing compiler output
>-(useful mainly for debugging `configure').
>+you can run in the future to recreate the current configuration, and a
>+file `config.log' containing compiler output (useful mainly for
>+debugging `configure').
>+
>+   It can also use an optional file (typically called `config.cache'
>+and enabled with `--cache-file=config.cache' or simply `-C') that saves
>+the results of its tests to speed up reconfiguring.  Caching is
>+disabled by default to prevent problems with accidental use of stale
>+cache files.
> 
>    If you need to do unusual things to compile the package, please try
> to figure out how `configure' could check whether to do them, and mail
> diffs or instructions to the address given in the `README' so they can
>-be considered for the next release.  If at some point `config.cache'
>-contains results you don't want to keep, you may remove or edit it.
>-
>-   The file `configure.in' is used to create `configure' by a program
>-called `autoconf'.  You only need `configure.in' if you want to change
>-it or regenerate `configure' using a newer version of `autoconf'.
>+be considered for the next release.  If you are using the cache, and at
>+some point `config.cache' contains results you don't want to keep, you
>+may remove or edit it.
>+
>+   The file `configure.ac' (or `configure.in') is used to create
>+`configure' by a program called `autoconf'.  You need `configure.ac' if
>+you want to change it or regenerate `configure' using a newer version
>+of `autoconf'.
> 
> The simplest way to compile this package is:
> 
>   1. `cd' to the directory containing the package's source code and type
>-     `./configure' to configure the package for your system.  If you're
>-     using `csh' on an old version of System V, you might need to type
>-     `sh ./configure' instead to prevent `csh' from trying to execute
>-     `configure' itself.
>+     `./configure' to configure the package for your system.
> 
>-     Running `configure' takes awhile.  While running, it prints some
>-     messages telling which features it is checking for.
>+     Running `configure' might take a while.  While running, it prints
>+     some messages telling which features it is checking for.
> 
>   2. Type `make' to compile the package.
> 
>@@ -54,49 +70,49 @@
> Compilers and Options
> =====================
> 
>-   Some systems require unusual options for compilation or linking that
>-the `configure' script does not know about.  You can give `configure'
>-initial values for variables by setting them in the environment.  Using
>-a Bourne-compatible shell, you can do that on the command line like
>-this:
>-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
>+Some systems require unusual options for compilation or linking that the
>+`configure' script does not know about.  Run `./configure --help' for
>+details on some of the pertinent environment variables.
>+
>+   You can give `configure' initial values for configuration parameters
>+by setting variables in the command line or in the environment.  Here
>+is an example:
>+
>+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
> 
>-Or on systems that have the `env' program, you can do it like this:
>-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
>+   *Note Defining Variables::, for more details.
> 
> Compiling For Multiple Architectures
> ====================================
> 
>-   You can compile the package for more than one kind of computer at the
>+You can compile the package for more than one kind of computer at the
> same time, by placing the object files for each architecture in their
>-own directory.  To do this, you must use a version of `make' that
>-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
>+own directory.  To do this, you can use GNU `make'.  `cd' to the
> directory where you want the object files and executables to go and run
> the `configure' script.  `configure' automatically checks for the
> source code in the directory that `configure' is in and in `..'.
> 
>-   If you have to use a `make' that does not supports the `VPATH'
>-variable, you have to compile the package for one architecture at a time
>-in the source code directory.  After you have installed the package for
>-one architecture, use `make distclean' before reconfiguring for another
>-architecture.
>+   With a non-GNU `make', it is safer to compile the package for one
>+architecture at a time in the source code directory.  After you have
>+installed the package for one architecture, use `make distclean' before
>+reconfiguring for another architecture.
> 
> Installation Names
> ==================
> 
>-   By default, `make install' will install the package's files in
>-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
>-installation prefix other than `/usr/local' by giving `configure' the
>-option `--prefix=PATH'.
>+By default, `make install' installs the package's commands under
>+`/usr/local/bin', include files under `/usr/local/include', etc.  You
>+can specify an installation prefix other than `/usr/local' by giving
>+`configure' the option `--prefix=PREFIX'.
> 
>    You can specify separate installation prefixes for
> architecture-specific files and architecture-independent files.  If you
>-give `configure' the option `--exec-prefix=PATH', the package will use
>-PATH as the prefix for installing programs and libraries.
>-Documentation and other data files will still use the regular prefix.
>+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
>+PREFIX as the prefix for installing programs and libraries.
>+Documentation and other data files still use the regular prefix.
> 
>    In addition, if you use an unusual directory layout you can give
>-options like `--bindir=PATH' to specify different values for particular
>+options like `--bindir=DIR' to specify different values for particular
> kinds of files.  Run `configure --help' for a list of the directories
> you can set and what kinds of files go in them.
> 
>@@ -107,7 +123,7 @@
> Optional Features
> =================
> 
>-   Some packages pay attention to `--enable-FEATURE' options to
>+Some packages pay attention to `--enable-FEATURE' options to
> `configure', where FEATURE indicates an optional part of the package.
> They may also pay attention to `--with-PACKAGE' options, where PACKAGE
> is something like `gnu-as' or `x' (for the X Window System).  The
>@@ -122,48 +138,86 @@
> Specifying the System Type
> ==========================
> 
>-   There may be some features `configure' can not figure out
>-automatically, but needs to determine by the type of host the package
>-will run on.  Usually `configure' can figure that out, but if it prints
>-a message saying it can not guess the host type, give it the
>-`--host=TYPE' option.  TYPE can either be a short name for the system
>-type, such as `sun4', or a canonical name with three fields:
>+There may be some features `configure' cannot figure out automatically,
>+but needs to determine by the type of machine the package will run on.
>+Usually, assuming the package is built to be run on the _same_
>+architectures, `configure' can figure that out, but if it prints a
>+message saying it cannot guess the machine type, give it the
>+`--build=TYPE' option.  TYPE can either be a short name for the system
>+type, such as `sun4', or a canonical name which has the form:
>+
>      CPU-COMPANY-SYSTEM
> 
>-See the file `config.sub' for the possible values of each field.  If
>+where SYSTEM can have one of these forms:
>+
>+     OS KERNEL-OS
>+
>+   See the file `config.sub' for the possible values of each field.  If
> `config.sub' isn't included in this package, then this package doesn't
>-need to know the host type.
>+need to know the machine type.
> 
>-   If you are building compiler tools for cross-compiling, you can also
>-use the `--target=TYPE' option to select the type of system they will
>-produce code for and the `--build=TYPE' option to select the type of
>-system on which you are compiling the package.
>+   If you are _building_ compiler tools for cross-compiling, you should
>+use the option `--target=TYPE' to select the type of system they will
>+produce code for.
>+
>+   If you want to _use_ a cross compiler, that generates code for a
>+platform different from the build platform, you should specify the
>+"host" platform (i.e., that on which the generated programs will
>+eventually be run) with `--host=TYPE'.
> 
> Sharing Defaults
> ================
> 
>-   If you want to set default values for `configure' scripts to share,
>-you can create a site shell script called `config.site' that gives
>-default values for variables like `CC', `cache_file', and `prefix'.
>+If you want to set default values for `configure' scripts to share, you
>+can create a site shell script called `config.site' that gives default
>+values for variables like `CC', `cache_file', and `prefix'.
> `configure' looks for `PREFIX/share/config.site' if it exists, then
> `PREFIX/etc/config.site' if it exists.  Or, you can set the
> `CONFIG_SITE' environment variable to the location of the site script.
> A warning: not all `configure' scripts look for a site script.
> 
>-Operation Controls
>+Defining Variables
> ==================
> 
>-   `configure' recognizes the following options to control how it
>-operates.
>+Variables not defined in a site shell script can be set in the
>+environment passed to `configure'.  However, some packages may run
>+configure again during the build, and the customized values of these
>+variables may be lost.  In order to avoid this problem, you should set
>+them in the `configure' command line, using `VAR=value'.  For example:
> 
>-`--cache-file=FILE'
>-     Use and save the results of the tests in FILE instead of
>-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
>-     debugging `configure'.
>+     ./configure CC=/usr/local2/bin/gcc
>+
>+causes the specified `gcc' to be used as the C compiler (unless it is
>+overridden in the site shell script).
>+
>+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
>+an Autoconf bug.  Until the bug is fixed you can use this workaround:
>+
>+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
>+
>+`configure' Invocation
>+======================
>+
>+`configure' recognizes the following options to control how it operates.
> 
> `--help'
>+`-h'
>      Print a summary of the options to `configure', and exit.
> 
>+`--version'
>+`-V'
>+     Print the version of Autoconf used to generate the `configure'
>+     script, and exit.
>+
>+`--cache-file=FILE'
>+     Enable the cache: use and save the results of the tests in FILE,
>+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
>+     disable caching.
>+
>+`--config-cache'
>+`-C'
>+     Alias for `--cache-file=config.cache'.
>+
> `--quiet'
> `--silent'
> `-q'
>@@ -175,8 +229,6 @@
>      Look for the package's source code in directory DIR.  Usually
>      `configure' can determine that directory automatically.
> 
>-`--version'
>-     Print the version of Autoconf used to generate the `configure'
>-     script, and exit.
>+`configure' also accepts some other, not widely useful, options.  Run
>+`configure --help' for more details.
> 
>-`configure' also accepts some other, not widely useful, options.
>diff -uNr vamos-0.5.5.orig/Makefile.in vamos-0.5.5/Makefile.in
>--- vamos-0.5.5.orig/Makefile.in	2005-10-29 22:27:40.000000000 +0200
>+++ vamos-0.5.5/Makefile.in	2007-06-25 18:02:53.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -13,17 +13,11 @@
> # PARTICULAR PURPOSE.
> 
> @SET_MAKE@
>-
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = .
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +29,48 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = .
>+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
>+	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
>+	ChangeLog INSTALL NEWS TODO
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
>+ configure.lineno config.status.lineno
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SOURCES =
>+DIST_SOURCES =
>+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
>+	html-recursive info-recursive install-data-recursive \
>+	install-dvi-recursive install-exec-recursive \
>+	install-html-recursive install-info-recursive \
>+	install-pdf-recursive install-ps-recursive install-recursive \
>+	installcheck-recursive installdirs-recursive pdf-recursive \
>+	ps-recursive uninstall-recursive
>+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
>+  distclean-recursive maintainer-clean-recursive
>+ETAGS = etags
>+CTAGS = ctags
>+DIST_SUBDIRS = $(SUBDIRS)
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>+distdir = $(PACKAGE)-$(VERSION)
>+top_distdir = $(distdir)
>+am__remove_distdir = \
>+  { test ! -d $(distdir) \
>+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
>+         && rm -fr $(distdir); }; }
>+DIST_ARCHIVES = $(distdir).tar.gz
>+GZIP_ENV = --best
>+distuninstallcheck_listfiles = find . -type f -print
>+distcleancheck_listfiles = find . -type f -print
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +87,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +108,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,90 +118,106 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>-
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> SUBDIRS = config scripts data doc include \
> 	body geometry media track world \
> 	vamos caelum
> 
>-subdir = .
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-DIST_SOURCES =
>-
>-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
>-	ps-recursive install-info-recursive uninstall-info-recursive \
>-	all-recursive install-data-recursive install-exec-recursive \
>-	installdirs-recursive install-recursive uninstall-recursive \
>-	check-recursive installcheck-recursive
>-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
>-	COPYING ChangeLog INSTALL Makefile.am NEWS TODO acinclude.m4 \
>-	aclocal.m4 configure configure.ac
>-DIST_SUBDIRS = $(SUBDIRS)
> all: all-recursive
> 
> .SUFFIXES:
>-
>-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
>- configure.lineno
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+am--refresh:
>+	@:
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
>+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    echo ' $(SHELL) ./config.status'; \
>+	    $(SHELL) ./config.status;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
>+	esac;
> 
>-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
> 	$(SHELL) ./config.status --recheck
>-$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
>-	cd $(srcdir) && $(AUTOCONF)
> 
>-$(ACLOCAL_M4):  configure.ac acinclude.m4
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(srcdir) && $(AUTOCONF)
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
> 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
> 
> mostlyclean-libtool:
>@@ -180,7 +228,6 @@
> 
> distclean-libtool:
> 	-rm -f libtool
>-uninstall-info-am:
> 
> # This directory's subdirectories are mostly independent; you can cd
> # into them and run `make' without going through this Makefile.
>@@ -189,7 +236,13 @@
> #     (which will cause the Makefiles to be regenerated when you run `make');
> # (2) otherwise, pass the desired values on the `make' command line.
> $(RECURSIVE_TARGETS):
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	target=`echo $@ | sed s/-recursive//`; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -201,15 +254,20 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done; \
> 	if test "$$dot_seen" = "no"; then \
> 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
> 	fi; test -z "$$fail"
> 
>-mostlyclean-recursive clean-recursive distclean-recursive \
>-maintainer-clean-recursive:
>-	@set fnord $$MAKEFLAGS; amf=$$2; \
>+$(RECURSIVE_CLEAN_TARGETS):
>+	@failcom='exit 1'; \
>+	for f in x $$MAKEFLAGS; do \
>+	  case $$f in \
>+	    *=* | --[!k]*);; \
>+	    *k*) failcom='fail=yes';; \
>+	  esac; \
>+	done; \
> 	dot_seen=no; \
> 	case "$@" in \
> 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
>@@ -230,7 +288,7 @@
> 	    local_target="$$target"; \
> 	  fi; \
> 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
>-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
>+	  || eval $$failcom; \
> 	done && test -z "$$fail"
> tags-recursive:
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -241,14 +299,6 @@
> 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
> 	done
> 
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -257,19 +307,22 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
> 	tags=; \
> 	here=`pwd`; \
>-	if (etags --etags-include --version) >/dev/null 2>&1; then \
>+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
> 	  include_option=--etags-include; \
>+	  empty_fix=.; \
> 	else \
> 	  include_option=--include; \
>+	  empty_fix=; \
> 	fi; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -f $$subdir/TAGS && \
>+	    test ! -f $$subdir/TAGS || \
> 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
> 	  fi; \
> 	done; \
>@@ -279,10 +332,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -305,39 +359,25 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = .
>-distdir = $(PACKAGE)-$(VERSION)
>-
>-am__remove_distdir = \
>-  { test ! -d $(distdir) \
>-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
>-         && rm -fr $(distdir); }; }
>-
>-GZIP_ENV = --best
>-distuninstallcheck_listfiles = find . -type f -print
>-distcleancheck_listfiles = find . -type f -print
> 
> distdir: $(DISTFILES)
> 	$(am__remove_distdir)
>-	mkdir $(distdir)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	test -d $(distdir) || mkdir $(distdir)
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -348,15 +388,19 @@
> 	    || exit 1; \
> 	  fi; \
> 	done
>-	list='$(SUBDIRS)'; for subdir in $$list; do \
>+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> 	  if test "$$subdir" = .; then :; else \
>-	    test -d $(distdir)/$$subdir \
>-	    || mkdir $(distdir)/$$subdir \
>+	    test -d "$(distdir)/$$subdir" \
>+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
> 	    || exit 1; \
>+	    distdir=`$(am__cd) $(distdir) && pwd`; \
>+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
> 	    (cd $$subdir && \
> 	      $(MAKE) $(AM_MAKEFLAGS) \
>-	        top_distdir="$(top_distdir)" \
>-	        distdir=../$(distdir)/$$subdir \
>+	        top_distdir="$$top_distdir" \
>+	        distdir="$$distdir/$$subdir" \
>+		am__remove_distdir=: \
>+		am__skip_length_check=: \
> 	        distdir) \
> 	      || exit 1; \
> 	  fi; \
>@@ -364,22 +408,49 @@
> 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
> 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
> 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
>-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
>+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
> 	|| chmod -R a+r $(distdir)
> dist-gzip: distdir
>-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
>+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
>+	$(am__remove_distdir)
>+
>+dist-bzip2: distdir
>+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
>+	$(am__remove_distdir)
>+
>+dist-tarZ: distdir
>+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
>+	$(am__remove_distdir)
>+
>+dist-shar: distdir
>+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
>+	$(am__remove_distdir)
>+
>+dist-zip: distdir
>+	-rm -f $(distdir).zip
>+	zip -rq $(distdir).zip $(distdir)
> 	$(am__remove_distdir)
> 
> dist dist-all: distdir
>-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
>+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> 	$(am__remove_distdir)
> 
> # This target untars the dist file and tries a VPATH configuration.  Then
> # it guarantees that the distribution is self-contained by making another
> # tarfile.
> distcheck: dist
>-	$(am__remove_distdir)
>-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
>+	case '$(DIST_ARCHIVES)' in \
>+	*.tar.gz*) \
>+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
>+	*.tar.bz2*) \
>+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
>+	*.tar.Z*) \
>+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
>+	*.shar.gz*) \
>+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
>+	*.zip*) \
>+	  unzip $(distdir).zip ;;\
>+	esac
> 	chmod -R a-w $(distdir); chmod a+w $(distdir)
> 	mkdir $(distdir)/_build
> 	mkdir $(distdir)/_inst
>@@ -399,19 +470,20 @@
> 	        distuninstallcheck \
> 	  && chmod -R a-w "$$dc_install_base" \
> 	  && ({ \
>-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
>+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
> 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
> 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
> 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
> 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
> 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
> 	  && rm -rf "$$dc_destdir" \
>-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
>-	  && rm -f $(distdir).tar.gz \
>+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
>+	  && rm -rf $(DIST_ARCHIVES) \
> 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
> 	$(am__remove_distdir)
>-	@echo "$(distdir).tar.gz is ready for distribution" | \
>-	  sed 'h;s/./=/g;p;x;p;x'
>+	@(echo "$(distdir) archives ready for distribution: "; \
>+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
>+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
> distuninstallcheck:
> 	@cd $(distuninstallcheck_dir) \
> 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
>@@ -435,7 +507,6 @@
> all-am: Makefile
> installdirs: installdirs-recursive
> installdirs-am:
>-
> install: install-recursive
> install-exec: install-exec-recursive
> install-data: install-data-recursive
>@@ -455,7 +526,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -474,18 +545,28 @@
> 
> dvi-am:
> 
>+html: html-recursive
>+
> info: info-recursive
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-recursive
>+
> install-exec-am:
> 
>+install-html: install-html-recursive
>+
> install-info: install-info-recursive
> 
> install-man:
> 
>+install-pdf: install-pdf-recursive
>+
>+install-ps: install-ps-recursive
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-recursive
>@@ -506,27 +587,26 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am:
> 
>-uninstall-info: uninstall-info-recursive
>+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
>+	install-strip
> 
>-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
>-	clean-generic clean-libtool clean-recursive ctags \
>-	ctags-recursive dist dist-all dist-gzip distcheck distclean \
>-	distclean-generic distclean-libtool distclean-recursive \
>-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
>-	dvi-am dvi-recursive info info-am info-recursive install \
>-	install-am install-data install-data-am install-data-recursive \
>-	install-exec install-exec-am install-exec-recursive \
>-	install-info install-info-am install-info-recursive install-man \
>-	install-recursive install-strip installcheck installcheck-am \
>-	installdirs installdirs-am installdirs-recursive \
>-	maintainer-clean maintainer-clean-generic \
>-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
>-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
>-	uninstall uninstall-am uninstall-info-am \
>-	uninstall-info-recursive uninstall-recursive
>+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
>+	all all-am am--refresh check check-am clean clean-generic \
>+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
>+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
>+	distclean-generic distclean-libtool distclean-tags \
>+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
>+	html-am info info-am install install-am install-data \
>+	install-data-am install-dvi install-dvi-am install-exec \
>+	install-exec-am install-html install-html-am install-info \
>+	install-info-am install-man install-pdf install-pdf-am \
>+	install-ps install-ps-am install-strip installcheck \
>+	installcheck-am installdirs installdirs-am maintainer-clean \
>+	maintainer-clean-generic mostlyclean mostlyclean-generic \
>+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
>+	uninstall uninstall-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/media/Makefile.am vamos-0.5.5/media/Makefile.am
>--- vamos-0.5.5.orig/media/Makefile.am	2005-03-09 03:37:39.000000000 +0100
>+++ vamos-0.5.5/media/Makefile.am	2007-06-25 17:58:10.000000000 +0200
>@@ -7,4 +7,4 @@
> 
> INCLUDES = -I$(top_srcdir)/include
> 
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>+AM_CXXFLAGS =
>diff -uNr vamos-0.5.5.orig/media/Makefile.in vamos-0.5.5/media/Makefile.in
>--- vamos-0.5.5.orig/media/Makefile.in	2005-10-29 22:28:51.000000000 +0200
>+++ vamos-0.5.5/media/Makefile.in	2007-06-25 18:02:58.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,48 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = media
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(libdir)"
>+libLTLIBRARIES_INSTALL = $(INSTALL)
>+LTLIBRARIES = $(lib_LTLIBRARIES)
>+libvamos_media_la_LIBADD =
>+am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo
>+libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS)
>+DEFAULT_INCLUDES = -I.@am__isrc@
>+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>+am__depfiles_maybe = depfiles
>+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+CXXLD = $(CXX)
>+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+	$(LDFLAGS) -o $@
>+SOURCES = $(libvamos_media_la_SOURCES)
>+DIST_SOURCES = $(libvamos_media_la_SOURCES)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +88,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +109,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,133 +119,140 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> lib_LTLIBRARIES = libvamos-media.la
>-
> libvamos_media_la_SOURCES = \
> 	Ac3d.cc \
> 	Sample.cc \
> 	Texture_Image.cc
> 
>-
> INCLUDES = -I$(top_srcdir)/include
>-
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>-subdir = media
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-LTLIBRARIES = $(lib_LTLIBRARIES)
>-
>-libvamos_media_la_LDFLAGS =
>-libvamos_media_la_LIBADD =
>-am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo
>-libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS)
>-
>-DEFAULT_INCLUDES =  -I. -I$(srcdir)
>-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>-am__depfiles_maybe = depfiles
>-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Ac3d.Plo ./$(DEPDIR)/Sample.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Texture_Image.Plo
>-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CXXFLAGS) $(CXXFLAGS)
>-CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>-DIST_SOURCES = $(libvamos_media_la_SOURCES)
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-SOURCES = $(libvamos_media_la_SOURCES)
>-
>+AM_CXXFLAGS = 
> all: all-am
> 
> .SUFFIXES:
> .SUFFIXES: .cc .lo .o .obj
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  media/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  media/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>-libLTLIBRARIES_INSTALL = $(INSTALL)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> install-libLTLIBRARIES: $(lib_LTLIBRARIES)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  if test -f $$p; then \
>-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
>-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
>+	    f=$(am__strip_dir) \
>+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
>+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
> 	  else :; fi; \
> 	done
> 
> uninstall-libLTLIBRARIES:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
>-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
>-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
>+	  p=$(am__strip_dir) \
>+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
>+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
> 	done
> 
> clean-libLTLIBRARIES:
> 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
>-	  test "$$dir" = "$$p" && dir=.; \
>+	  test "$$dir" != "$$p" || dir=.; \
> 	  echo "rm -f \"$${dir}/so_locations\""; \
> 	  rm -f "$${dir}/so_locations"; \
> 	done
> libvamos-media.la: $(libvamos_media_la_OBJECTS) $(libvamos_media_la_DEPENDENCIES) 
>-	$(CXXLINK) -rpath $(libdir) $(libvamos_media_la_LDFLAGS) $(libvamos_media_la_OBJECTS) $(libvamos_media_la_LIBADD) $(LIBS)
>+	$(CXXLINK) -rpath $(libdir) $(libvamos_media_la_OBJECTS) $(libvamos_media_la_LIBADD) $(LIBS)
> 
> mostlyclean-compile:
>-	-rm -f *.$(OBJEXT) core *.core
>+	-rm -f *.$(OBJEXT)
> 
> distclean-compile:
> 	-rm -f *.tab.c
>@@ -222,37 +262,25 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Texture_Image.Plo@am__quote@
> 
> .cc.o:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
> 
> .cc.obj:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
> 
> .cc.lo:
>-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -260,18 +288,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -280,6 +296,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -291,10 +308,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -317,28 +335,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -352,9 +365,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(LTLIBRARIES)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	for dir in "$(DESTDIR)$(libdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -374,7 +388,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -388,24 +402,34 @@
> 	-rm -rf ./$(DEPDIR)
> 	-rm -f Makefile
> distclean-am: clean-am distclean-compile distclean-generic \
>-	distclean-libtool distclean-tags
>+	distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am: install-libLTLIBRARIES
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -426,20 +450,23 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
>+uninstall-am: uninstall-libLTLIBRARIES
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libLTLIBRARIES clean-libtool ctags distclean \
> 	distclean-compile distclean-generic distclean-libtool \
>-	distclean-tags distdir dvi dvi-am info info-am install \
>-	install-am install-data install-data-am install-exec \
>-	install-exec-am install-info install-info-am \
>-	install-libLTLIBRARIES install-man install-strip installcheck \
>+	distclean-tags distdir dvi dvi-am html html-am info info-am \
>+	install install-am install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am \
>+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
>+	install-ps install-ps-am install-strip installcheck \
> 	installcheck-am installdirs maintainer-clean \
> 	maintainer-clean-generic mostlyclean mostlyclean-compile \
> 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>-	tags uninstall uninstall-am uninstall-info-am \
>-	uninstall-libLTLIBRARIES
>+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/scripts/Makefile.in vamos-0.5.5/scripts/Makefile.in
>--- vamos-0.5.5.orig/scripts/Makefile.in	2005-10-29 22:28:09.000000000 +0200
>+++ vamos-0.5.5/scripts/Makefile.in	2007-06-25 18:02:58.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,23 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = scripts
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+SCRIPTS = $(noinst_SCRIPTS)
>+SOURCES =
>+DIST_SOURCES =
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +63,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +84,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,109 +94,130 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> noinst_SCRIPTS = trk-convert magic.el
>-
> EXTRA_DIST = trk-convert magic.el
>-subdir = scripts
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-SCRIPTS = $(noinst_SCRIPTS)
>-
>-DIST_SOURCES =
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
> all: all-am
> 
> .SUFFIXES:
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  scripts/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
> 
> clean-libtool:
> 	-rm -rf .libs _libs
>-
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
> tags: TAGS
> TAGS:
> 
> ctags: CTAGS
> CTAGS:
> 
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -202,7 +231,6 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(SCRIPTS)
>-
> installdirs:
> install: install-am
> install-exec: install-exec-am
>@@ -223,7 +251,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -234,24 +262,34 @@
> 
> distclean: distclean-am
> 	-rm -f Makefile
>-distclean-am: clean-am distclean-generic distclean-libtool
>+distclean-am: clean-am distclean-generic
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am:
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -270,17 +308,20 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am
>+uninstall-am:
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: all all-am check check-am clean clean-generic clean-libtool \
> 	distclean distclean-generic distclean-libtool distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-man install-strip installcheck \
>-	installcheck-am installdirs maintainer-clean \
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-man install-pdf \
>+	install-pdf-am install-ps install-ps-am install-strip \
>+	installcheck installcheck-am installdirs maintainer-clean \
> 	maintainer-clean-generic mostlyclean mostlyclean-generic \
>-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
>-	uninstall-info-am
>+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/track/Makefile.am vamos-0.5.5/track/Makefile.am
>--- vamos-0.5.5.orig/track/Makefile.am	2005-09-21 03:59:18.000000000 +0200
>+++ vamos-0.5.5/track/Makefile.am	2007-06-25 17:58:10.000000000 +0200
>@@ -11,7 +11,7 @@
> INCLUDES = \
> 	-I$(top_srcdir)/include
> 
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>+AM_CXXFLAGS =
> 
> if DO_UNIT_TESTS
> UNIT_TESTS = test_Road_Segment
>diff -uNr vamos-0.5.5.orig/track/Makefile.in vamos-0.5.5/track/Makefile.in
>--- vamos-0.5.5.orig/track/Makefile.in	2005-10-29 22:28:53.000000000 +0200
>+++ vamos-0.5.5/track/Makefile.in	2007-06-25 18:02:59.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,12 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
>+
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +31,58 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+noinst_PROGRAMS = $(am__EXEEXT_1)
>+EXTRA_PROGRAMS = test_Road_Segment$(EXEEXT)
>+subdir = track
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(libdir)"
>+libLTLIBRARIES_INSTALL = $(INSTALL)
>+LTLIBRARIES = $(lib_LTLIBRARIES)
>+libvamos_track_la_LIBADD =
>+am_libvamos_track_la_OBJECTS = Gl_Road_Segment.lo Road_Segment.lo \
>+	Strip_Track.lo Strip_Track_Reader.lo
>+libvamos_track_la_OBJECTS = $(am_libvamos_track_la_OBJECTS)
>+@DO_UNIT_TESTS_TRUE@am__EXEEXT_1 = test_Road_Segment$(EXEEXT)
>+PROGRAMS = $(noinst_PROGRAMS)
>+am_test_Road_Segment_OBJECTS = test_Road_Segment.$(OBJEXT)
>+test_Road_Segment_OBJECTS = $(am_test_Road_Segment_OBJECTS)
>+test_Road_Segment_DEPENDENCIES =  \
>+	$(top_srcdir)/geometry/libvamos-geometry.la Road_Segment.lo
>+DEFAULT_INCLUDES = -I.@am__isrc@
>+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>+am__depfiles_maybe = depfiles
>+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+CXXLD = $(CXX)
>+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+	$(LDFLAGS) -o $@
>+SOURCES = $(libvamos_track_la_SOURCES) $(test_Road_Segment_SOURCES)
>+DIST_SOURCES = $(libvamos_track_la_SOURCES) \
>+	$(test_Road_Segment_SOURCES)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,28 +99,28 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
> INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
> LDFLAGS = @LDFLAGS@
> LIBOBJS = @LIBOBJS@
>-
> LIBS = 
> LIBTOOL = @LIBTOOL@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -87,159 +130,148 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> lib_LTLIBRARIES = libvamos-track.la
>-
> libvamos_track_la_SOURCES = \
> 	Gl_Road_Segment.cc \
> 	Road_Segment.cc \
> 	Strip_Track.cc \
> 	Strip_Track_Reader.cc
> 
>-
> INCLUDES = \
> 	-I$(top_srcdir)/include
> 
>-
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>-
>-@DO_UNIT_TESTS_TRUE@UNIT_TESTS = test_Road_Segment
>+AM_CXXFLAGS = 
> @DO_UNIT_TESTS_FALSE@UNIT_TESTS = 
>-
>-noinst_PROGRAMS = $(UNIT_TESTS)
>-EXTRA_PROGRAMS = test_Road_Segment
>+@DO_UNIT_TESTS_TRUE@UNIT_TESTS = test_Road_Segment
> test_Road_Segment_SOURCES = test_Road_Segment.cc
> test_Road_Segment_LDADD = \
> 	$(top_srcdir)/geometry/libvamos-geometry.la \
> 	Road_Segment.lo \
> 	-lcppunit -ldl
> 
>-subdir = track
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-LTLIBRARIES = $(lib_LTLIBRARIES)
>-
>-libvamos_track_la_LDFLAGS =
>-libvamos_track_la_LIBADD =
>-am_libvamos_track_la_OBJECTS = Gl_Road_Segment.lo Road_Segment.lo \
>-	Strip_Track.lo Strip_Track_Reader.lo
>-libvamos_track_la_OBJECTS = $(am_libvamos_track_la_OBJECTS)
>-EXTRA_PROGRAMS = test_Road_Segment$(EXEEXT)
>-@DO_UNIT_TESTS_TRUE@noinst_PROGRAMS = test_Road_Segment$(EXEEXT)
>-@DO_UNIT_TESTS_FALSE@noinst_PROGRAMS =
>-PROGRAMS = $(noinst_PROGRAMS)
>-
>-am_test_Road_Segment_OBJECTS = test_Road_Segment.$(OBJEXT)
>-test_Road_Segment_OBJECTS = $(am_test_Road_Segment_OBJECTS)
>-test_Road_Segment_DEPENDENCIES = \
>-	$(top_srcdir)/geometry/libvamos-geometry.la Road_Segment.lo
>-test_Road_Segment_LDFLAGS =
>-
>-DEFAULT_INCLUDES =  -I. -I$(srcdir)
>-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>-am__depfiles_maybe = depfiles
>-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Gl_Road_Segment.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Road_Segment.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Strip_Track.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Strip_Track_Reader.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/test_Road_Segment.Po
>-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CXXFLAGS) $(CXXFLAGS)
>-CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>-DIST_SOURCES = $(libvamos_track_la_SOURCES) $(test_Road_Segment_SOURCES)
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-SOURCES = $(libvamos_track_la_SOURCES) $(test_Road_Segment_SOURCES)
>-
> all: all-am
> 
> .SUFFIXES:
> .SUFFIXES: .cc .lo .o .obj
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  track/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  track/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>-libLTLIBRARIES_INSTALL = $(INSTALL)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> install-libLTLIBRARIES: $(lib_LTLIBRARIES)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  if test -f $$p; then \
>-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
>-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
>+	    f=$(am__strip_dir) \
>+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
>+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
> 	  else :; fi; \
> 	done
> 
> uninstall-libLTLIBRARIES:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
>-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
>-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
>+	  p=$(am__strip_dir) \
>+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
>+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
> 	done
> 
> clean-libLTLIBRARIES:
> 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
>-	  test "$$dir" = "$$p" && dir=.; \
>+	  test "$$dir" != "$$p" || dir=.; \
> 	  echo "rm -f \"$${dir}/so_locations\""; \
> 	  rm -f "$${dir}/so_locations"; \
> 	done
> libvamos-track.la: $(libvamos_track_la_OBJECTS) $(libvamos_track_la_DEPENDENCIES) 
>-	$(CXXLINK) -rpath $(libdir) $(libvamos_track_la_LDFLAGS) $(libvamos_track_la_OBJECTS) $(libvamos_track_la_LIBADD) $(LIBS)
>+	$(CXXLINK) -rpath $(libdir) $(libvamos_track_la_OBJECTS) $(libvamos_track_la_LIBADD) $(LIBS)
> 
> clean-noinstPROGRAMS:
> 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
>@@ -249,10 +281,10 @@
> 	done
> test_Road_Segment$(EXEEXT): $(test_Road_Segment_OBJECTS) $(test_Road_Segment_DEPENDENCIES) 
> 	@rm -f test_Road_Segment$(EXEEXT)
>-	$(CXXLINK) $(test_Road_Segment_LDFLAGS) $(test_Road_Segment_OBJECTS) $(test_Road_Segment_LDADD) $(LIBS)
>+	$(CXXLINK) $(test_Road_Segment_OBJECTS) $(test_Road_Segment_LDADD) $(LIBS)
> 
> mostlyclean-compile:
>-	-rm -f *.$(OBJEXT) core *.core
>+	-rm -f *.$(OBJEXT)
> 
> distclean-compile:
> 	-rm -f *.tab.c
>@@ -264,37 +296,25 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Road_Segment.Po@am__quote@
> 
> .cc.o:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
> 
> .cc.obj:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
> 
> .cc.lo:
>-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -302,18 +322,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -322,6 +330,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -333,10 +342,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -359,28 +369,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -391,13 +396,15 @@
> 	    || exit 1; \
> 	  fi; \
> 	done
>+@DO_UNIT_TESTS_FALSE@check-local:
> check-am: all-am
> 	$(MAKE) $(AM_MAKEFLAGS) check-local
> check: check-am
> all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	for dir in "$(DESTDIR)$(libdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -417,7 +424,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -431,24 +438,34 @@
> 	-rm -rf ./$(DEPDIR)
> 	-rm -f Makefile
> distclean-am: clean-am distclean-compile distclean-generic \
>-	distclean-libtool distclean-tags
>+	distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am: install-libLTLIBRARIES
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -469,20 +486,24 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
>+uninstall-am: uninstall-libLTLIBRARIES
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
> 	clean-generic clean-libLTLIBRARIES clean-libtool \
> 	clean-noinstPROGRAMS ctags distclean distclean-compile \
> 	distclean-generic distclean-libtool distclean-tags distdir dvi \
>-	dvi-am info info-am install install-am install-data \
>-	install-data-am install-exec install-exec-am install-info \
>-	install-info-am install-libLTLIBRARIES install-man \
>-	install-strip installcheck installcheck-am installdirs \
>-	maintainer-clean maintainer-clean-generic mostlyclean \
>-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
>-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
>-	uninstall-libLTLIBRARIES
>+	dvi-am html html-am info info-am install install-am \
>+	install-data install-data-am install-dvi install-dvi-am \
>+	install-exec install-exec-am install-html install-html-am \
>+	install-info install-info-am install-libLTLIBRARIES \
>+	install-man install-pdf install-pdf-am install-ps \
>+	install-ps-am install-strip installcheck installcheck-am \
>+	installdirs maintainer-clean maintainer-clean-generic \
>+	mostlyclean mostlyclean-compile mostlyclean-generic \
>+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
>+	uninstall-am uninstall-libLTLIBRARIES
> 
> 
> @DO_UNIT_TESTS_TRUE@check-local: $(UNIT_TESTS)
>diff -uNr vamos-0.5.5.orig/vamos/Makefile.am vamos-0.5.5/vamos/Makefile.am
>--- vamos-0.5.5.orig/vamos/Makefile.am	2005-07-05 03:14:24.000000000 +0200
>+++ vamos-0.5.5/vamos/Makefile.am	2007-06-25 17:58:10.000000000 +0200
>@@ -18,4 +18,4 @@
> 	-lpng \
> 	@LIBS@
> 
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+ -DDATADIR=\"$(pkgdatadir)\"
>+AM_CXXFLAGS = -DDATADIR=\"$(pkgdatadir)\"
>diff -uNr vamos-0.5.5.orig/vamos/Makefile.in vamos-0.5.5/vamos/Makefile.in
>--- vamos-0.5.5.orig/vamos/Makefile.in	2005-10-29 22:28:58.000000000 +0200
>+++ vamos-0.5.5/vamos/Makefile.in	2007-06-25 18:02:59.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,43 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+bin_PROGRAMS = vamos$(EXEEXT)
>+subdir = vamos
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+am__installdirs = "$(DESTDIR)$(bindir)"
>+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
>+PROGRAMS = $(bin_PROGRAMS)
>+am_vamos_OBJECTS = vamos.$(OBJEXT)
>+vamos_OBJECTS = $(am_vamos_OBJECTS)
>+vamos_LDADD = $(LDADD)
>+DEFAULT_INCLUDES = -I.@am__isrc@
>+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>+am__depfiles_maybe = depfiles
>+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+CXXLD = $(CXX)
>+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+	$(LDFLAGS) -o $@
>+SOURCES = $(vamos_SOURCES)
>+DIST_SOURCES = $(vamos_SOURCES)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,23 +83,22 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
> INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
> LDFLAGS = @LDFLAGS@
> LIBOBJS = @LIBOBJS@
>-
> LIBS = \
> 	$(top_srcdir)/world/libvamos-world.la \
> 	$(top_srcdir)/body/libvamos-body.la \
>@@ -88,6 +114,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -97,114 +124,119 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>-bin_PROGRAMS = vamos
>-
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> vamos_SOURCES = \
> 	vamos.cc
> 
>-
> INCLUDES = \
> 	-I$(top_srcdir)/include \
> 	`pkg-config --cflags sigc++-1.2`
> 
>-
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+ -DDATADIR=\"$(pkgdatadir)\"
>-subdir = vamos
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-bin_PROGRAMS = vamos$(EXEEXT)
>-PROGRAMS = $(bin_PROGRAMS)
>-
>-am_vamos_OBJECTS = vamos.$(OBJEXT)
>-vamos_OBJECTS = $(am_vamos_OBJECTS)
>-vamos_LDADD = $(LDADD)
>-vamos_DEPENDENCIES =
>-vamos_LDFLAGS =
>-
>-DEFAULT_INCLUDES =  -I. -I$(srcdir)
>-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>-am__depfiles_maybe = depfiles
>-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/vamos.Po
>-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CXXFLAGS) $(CXXFLAGS)
>-CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>-DIST_SOURCES = $(vamos_SOURCES)
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-SOURCES = $(vamos_SOURCES)
>-
>+AM_CXXFLAGS = -DDATADIR=\"$(pkgdatadir)\"
> all: all-am
> 
> .SUFFIXES:
> .SUFFIXES: .cc .lo .o .obj
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  vamos/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  vamos/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> install-binPROGRAMS: $(bin_PROGRAMS)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(bindir)
>+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
> 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
> 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
> 	  if test -f $$p \
> 	     || test -f $$p1 \
> 	  ; then \
> 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
>-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
>-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
>+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
>+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
> 	  else :; fi; \
> 	done
> 
>@@ -212,8 +244,8 @@
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
> 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
>-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
>-	  rm -f $(DESTDIR)$(bindir)/$$f; \
>+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
>+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
> 	done
> 
> clean-binPROGRAMS:
>@@ -224,10 +256,10 @@
> 	done
> vamos$(EXEEXT): $(vamos_OBJECTS) $(vamos_DEPENDENCIES) 
> 	@rm -f vamos$(EXEEXT)
>-	$(CXXLINK) $(vamos_LDFLAGS) $(vamos_OBJECTS) $(vamos_LDADD) $(LIBS)
>+	$(CXXLINK) $(vamos_OBJECTS) $(vamos_LDADD) $(LIBS)
> 
> mostlyclean-compile:
>-	-rm -f *.$(OBJEXT) core *.core
>+	-rm -f *.$(OBJEXT)
> 
> distclean-compile:
> 	-rm -f *.tab.c
>@@ -235,37 +267,25 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vamos.Po@am__quote@
> 
> .cc.o:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
> 
> .cc.obj:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
> 
> .cc.lo:
>-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -273,18 +293,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -293,6 +301,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -304,10 +313,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -330,28 +340,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -365,9 +370,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(PROGRAMS)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(bindir)
>+	for dir in "$(DESTDIR)$(bindir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -387,7 +393,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -400,24 +406,34 @@
> 	-rm -rf ./$(DEPDIR)
> 	-rm -f Makefile
> distclean-am: clean-am distclean-compile distclean-generic \
>-	distclean-libtool distclean-tags
>+	distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am: install-binPROGRAMS
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -438,19 +454,23 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
>+uninstall-am: uninstall-binPROGRAMS
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
> 	clean-generic clean-libtool ctags distclean distclean-compile \
> 	distclean-generic distclean-libtool distclean-tags distdir dvi \
>-	dvi-am info info-am install install-am install-binPROGRAMS \
>-	install-data install-data-am install-exec install-exec-am \
>-	install-info install-info-am install-man install-strip \
>-	installcheck installcheck-am installdirs maintainer-clean \
>-	maintainer-clean-generic mostlyclean mostlyclean-compile \
>-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>-	tags uninstall uninstall-am uninstall-binPROGRAMS \
>-	uninstall-info-am
>+	dvi-am html html-am info info-am install install-am \
>+	install-binPROGRAMS install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am install-man \
>+	install-pdf install-pdf-am install-ps install-ps-am \
>+	install-strip installcheck installcheck-am installdirs \
>+	maintainer-clean maintainer-clean-generic mostlyclean \
>+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
>+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
>+	uninstall-binPROGRAMS
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.
>diff -uNr vamos-0.5.5.orig/world/Makefile.am vamos-0.5.5/world/Makefile.am
>--- vamos-0.5.5.orig/world/Makefile.am	2005-02-17 05:32:20.000000000 +0100
>+++ vamos-0.5.5/world/Makefile.am	2007-06-25 17:58:10.000000000 +0200
>@@ -11,4 +11,4 @@
> 	-I$(top_srcdir)/include \
> 	`pkg-config --cflags sigc++-1.2`
> 
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>+AM_CXXFLAGS =
>diff -uNr vamos-0.5.5.orig/world/Makefile.in vamos-0.5.5/world/Makefile.in
>--- vamos-0.5.5.orig/world/Makefile.in	2005-10-29 22:28:56.000000000 +0200
>+++ vamos-0.5.5/world/Makefile.in	2007-06-25 18:02:59.000000000 +0200
>@@ -1,8 +1,8 @@
>-# Makefile.in generated by automake 1.7.9 from Makefile.am.
>+# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
> 
>-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
>@@ -14,16 +14,11 @@
> 
> @SET_MAKE@
> 
>-srcdir = @srcdir@
>-top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
> pkglibdir = $(libdir)/@PACKAGE@
> pkgincludedir = $(includedir)/@PACKAGE@
>-top_builddir = ..
>-
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
>-INSTALL = @INSTALL@
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
>@@ -35,11 +30,49 @@
> NORMAL_UNINSTALL = :
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
>+build_triplet = @build@
> host_triplet = @host@
>+subdir = world
>+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
>+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>+	$(ACLOCAL_M4)
>+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>+CONFIG_CLEAN_FILES =
>+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
>+am__vpath_adj = case $$p in \
>+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>+    *) f=$$p;; \
>+  esac;
>+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>+am__installdirs = "$(DESTDIR)$(libdir)"
>+libLTLIBRARIES_INSTALL = $(INSTALL)
>+LTLIBRARIES = $(lib_LTLIBRARIES)
>+libvamos_world_la_LIBADD =
>+am_libvamos_world_la_OBJECTS = Atmosphere.lo World.lo Controls.lo \
>+	Gl_World.lo Sounds.lo
>+libvamos_world_la_OBJECTS = $(am_libvamos_world_la_OBJECTS)
>+DEFAULT_INCLUDES = -I.@am__isrc@
>+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>+am__depfiles_maybe = depfiles
>+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>+CXXLD = $(CXX)
>+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+	$(LDFLAGS) -o $@
>+SOURCES = $(libvamos_world_la_SOURCES)
>+DIST_SOURCES = $(libvamos_world_la_SOURCES)
>+ETAGS = etags
>+CTAGS = ctags
>+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> ACLOCAL = @ACLOCAL@
>-AMDEP_FALSE = @AMDEP_FALSE@
>-AMDEP_TRUE = @AMDEP_TRUE@
> AMTAR = @AMTAR@
>+AR = @AR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
>@@ -56,16 +89,16 @@
> CYGPATH_W = @CYGPATH_W@
> DEFS = @DEFS@
> DEPDIR = @DEPDIR@
>-DO_UNIT_TESTS_FALSE = @DO_UNIT_TESTS_FALSE@
>-DO_UNIT_TESTS_TRUE = @DO_UNIT_TESTS_TRUE@
> ECHO = @ECHO@
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
> EGREP = @EGREP@
>-ENABLE_XMESA_FX_FALSE = @ENABLE_XMESA_FX_FALSE@
>-ENABLE_XMESA_FX_TRUE = @ENABLE_XMESA_FX_TRUE@
> EXEEXT = @EXEEXT@
>+F77 = @F77@
>+FFLAGS = @FFLAGS@
>+GREP = @GREP@
>+INSTALL = @INSTALL@
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
>@@ -77,6 +110,7 @@
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
>+MKDIR_P = @MKDIR_P@
> OBJEXT = @OBJEXT@
> PACKAGE = @PACKAGE@
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
>@@ -86,54 +120,68 @@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> RANLIB = @RANLIB@
>+SED = @SED@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
> VERSION = @VERSION@
>+XMKMF = @XMKMF@
> X_CFLAGS = @X_CFLAGS@
> X_EXTRA_LIBS = @X_EXTRA_LIBS@
> X_LIBS = @X_LIBS@
> X_PRE_LIBS = @X_PRE_LIBS@
>+abs_builddir = @abs_builddir@
>+abs_srcdir = @abs_srcdir@
>+abs_top_builddir = @abs_top_builddir@
>+abs_top_srcdir = @abs_top_srcdir@
> ac_ct_CC = @ac_ct_CC@
> ac_ct_CXX = @ac_ct_CXX@
>-ac_ct_RANLIB = @ac_ct_RANLIB@
>-ac_ct_STRIP = @ac_ct_STRIP@
>-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
>-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
>-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
>-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
>+ac_ct_F77 = @ac_ct_F77@
> am__include = @am__include@
> am__leading_dot = @am__leading_dot@
> am__quote = @am__quote@
>+am__tar = @am__tar@
>+am__untar = @am__untar@
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
>+builddir = @builddir@
> datadir = @datadir@
>+datarootdir = @datarootdir@
>+docdir = @docdir@
>+dvidir = @dvidir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
>+htmldir = @htmldir@
> includedir = @includedir@
> infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
>+localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
>+mkdir_p = @mkdir_p@
> oldincludedir = @oldincludedir@
>+pdfdir = @pdfdir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
>+psdir = @psdir@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
>+srcdir = @srcdir@
> sysconfdir = @sysconfdir@
> target_alias = @target_alias@
>+top_builddir = @top_builddir@
>+top_srcdir = @top_srcdir@
> lib_LTLIBRARIES = libvamos-world.la
>-
> libvamos_world_la_SOURCES = \
> 	Atmosphere.cc \
> 	World.cc \
>@@ -141,85 +189,76 @@
> 	Gl_World.cc \
> 	Sounds.cc
> 
>-
> INCLUDES = \
> 	-I$(top_srcdir)/include \
> 	`pkg-config --cflags sigc++-1.2`
> 
>-
>-AM_CXXFLAGS = -Wall -pedantic -O1 -g -gstabs+
>-subdir = world
>-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
>-CONFIG_CLEAN_FILES =
>-LTLIBRARIES = $(lib_LTLIBRARIES)
>-
>-libvamos_world_la_LDFLAGS =
>-libvamos_world_la_LIBADD =
>-am_libvamos_world_la_OBJECTS = Atmosphere.lo World.lo Controls.lo \
>-	Gl_World.lo Sounds.lo
>-libvamos_world_la_OBJECTS = $(am_libvamos_world_la_OBJECTS)
>-
>-DEFAULT_INCLUDES =  -I. -I$(srcdir)
>-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
>-am__depfiles_maybe = depfiles
>-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Atmosphere.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Controls.Plo ./$(DEPDIR)/Gl_World.Plo \
>-@AMDEP_TRUE@	./$(DEPDIR)/Sounds.Plo ./$(DEPDIR)/World.Plo
>-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CXXFLAGS) $(CXXFLAGS)
>-CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>-DIST_SOURCES = $(libvamos_world_la_SOURCES)
>-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
>-SOURCES = $(libvamos_world_la_SOURCES)
>-
>+AM_CXXFLAGS = 
> all: all-am
> 
> .SUFFIXES:
> .SUFFIXES: .cc .lo .o .obj
>-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
>+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+	@for dep in $?; do \
>+	  case '$(am__configure_deps)' in \
>+	    *$$dep*) \
>+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
>+		&& exit 0; \
>+	      exit 1;; \
>+	  esac; \
>+	done; \
>+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  world/Makefile'; \
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  world/Makefile
>-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
>-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
>-libLTLIBRARIES_INSTALL = $(INSTALL)
>+.PRECIOUS: Makefile
>+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+	@case '$?' in \
>+	  *config.status*) \
>+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
>+	  *) \
>+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
>+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
>+	esac;
>+
>+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+
>+$(top_srcdir)/configure:  $(am__configure_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
> install-libLTLIBRARIES: $(lib_LTLIBRARIES)
> 	@$(NORMAL_INSTALL)
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  if test -f $$p; then \
>-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
>-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
>-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
>+	    f=$(am__strip_dir) \
>+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
>+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
> 	  else :; fi; \
> 	done
> 
> uninstall-libLTLIBRARIES:
> 	@$(NORMAL_UNINSTALL)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
>-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
>-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
>-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
>+	  p=$(am__strip_dir) \
>+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
>+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
> 	done
> 
> clean-libLTLIBRARIES:
> 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
> 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
> 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
>-	  test "$$dir" = "$$p" && dir=.; \
>+	  test "$$dir" != "$$p" || dir=.; \
> 	  echo "rm -f \"$${dir}/so_locations\""; \
> 	  rm -f "$${dir}/so_locations"; \
> 	done
> libvamos-world.la: $(libvamos_world_la_OBJECTS) $(libvamos_world_la_DEPENDENCIES) 
>-	$(CXXLINK) -rpath $(libdir) $(libvamos_world_la_LDFLAGS) $(libvamos_world_la_OBJECTS) $(libvamos_world_la_LIBADD) $(LIBS)
>+	$(CXXLINK) -rpath $(libdir) $(libvamos_world_la_OBJECTS) $(libvamos_world_la_LIBADD) $(LIBS)
> 
> mostlyclean-compile:
>-	-rm -f *.$(OBJEXT) core *.core
>+	-rm -f *.$(OBJEXT)
> 
> distclean-compile:
> 	-rm -f *.tab.c
>@@ -231,37 +270,25 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/World.Plo@am__quote@
> 
> .cc.o:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
> 
> .cc.obj:
>-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
> 
> .cc.lo:
>-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
>-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
>-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
>-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
>-@am__fastdepCXX_TRUE@	fi
>+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
>-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
>+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
> 
> mostlyclean-libtool:
> 	-rm -f *.lo
>@@ -269,18 +296,6 @@
> clean-libtool:
> 	-rm -rf .libs _libs
> 
>-distclean-libtool:
>-	-rm -f libtool
>-uninstall-info-am:
>-
>-ETAGS = etags
>-ETAGSFLAGS =
>-
>-CTAGS = ctags
>-CTAGSFLAGS =
>-
>-tags: TAGS
>-
> ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
> 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> 	unique=`for i in $$list; do \
>@@ -289,6 +304,7 @@
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
> 	mkid -fID $$unique
>+tags: TAGS
> 
> TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -300,10 +316,11 @@
> 	  done | \
> 	  $(AWK) '    { files[$$0] = 1; } \
> 	       END { for (i in files) print i; }'`; \
>-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
>-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>-	     $$tags $$unique
>-
>+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
>+	  test -n "$$unique" || unique=$$empty_fix; \
>+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
>+	    $$tags $$unique; \
>+	fi
> ctags: CTAGS
> CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
> 		$(TAGS_FILES) $(LISP)
>@@ -326,28 +343,23 @@
> 
> distclean-tags:
> 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
>-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-
>-top_distdir = ..
>-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
> 
> distdir: $(DISTFILES)
>-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
>-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
>-	list='$(DISTFILES)'; for file in $$list; do \
>-	  case $$file in \
>-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
>-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
>-	  esac; \
>+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
>+	list='$(DISTFILES)'; \
>+	  dist_files=`for file in $$list; do echo $$file; done | \
>+	  sed -e "s|^$$srcdirstrip/||;t" \
>+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
>+	case $$dist_files in \
>+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
>+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
>+			   sort -u` ;; \
>+	esac; \
>+	for file in $$dist_files; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
>-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
>-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
>-	    dir="/$$dir"; \
>-	    $(mkinstalldirs) "$(distdir)$$dir"; \
>-	  else \
>-	    dir=''; \
>-	  fi; \
> 	  if test -d $$d/$$file; then \
>+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
>@@ -361,9 +373,10 @@
> check-am: all-am
> check: check-am
> all-am: Makefile $(LTLIBRARIES)
>-
> installdirs:
>-	$(mkinstalldirs) $(DESTDIR)$(libdir)
>+	for dir in "$(DESTDIR)$(libdir)"; do \
>+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>+	done
> install: install-am
> install-exec: install-exec-am
> install-data: install-data-am
>@@ -383,7 +396,7 @@
> clean-generic:
> 
> distclean-generic:
>-	-rm -f $(CONFIG_CLEAN_FILES)
>+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> 
> maintainer-clean-generic:
> 	@echo "This command is intended for maintainers to use"
>@@ -397,24 +410,34 @@
> 	-rm -rf ./$(DEPDIR)
> 	-rm -f Makefile
> distclean-am: clean-am distclean-compile distclean-generic \
>-	distclean-libtool distclean-tags
>+	distclean-tags
> 
> dvi: dvi-am
> 
> dvi-am:
> 
>+html: html-am
>+
> info: info-am
> 
> info-am:
> 
> install-data-am:
> 
>+install-dvi: install-dvi-am
>+
> install-exec-am: install-libLTLIBRARIES
> 
>+install-html: install-html-am
>+
> install-info: install-info-am
> 
> install-man:
> 
>+install-pdf: install-pdf-am
>+
>+install-ps: install-ps-am
>+
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
>@@ -435,20 +458,23 @@
> 
> ps-am:
> 
>-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
>+uninstall-am: uninstall-libLTLIBRARIES
>+
>+.MAKE: install-am install-strip
> 
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
> 	clean-libLTLIBRARIES clean-libtool ctags distclean \
> 	distclean-compile distclean-generic distclean-libtool \
>-	distclean-tags distdir dvi dvi-am info info-am install \
>-	install-am install-data install-data-am install-exec \
>-	install-exec-am install-info install-info-am \
>-	install-libLTLIBRARIES install-man install-strip installcheck \
>+	distclean-tags distdir dvi dvi-am html html-am info info-am \
>+	install install-am install-data install-data-am install-dvi \
>+	install-dvi-am install-exec install-exec-am install-html \
>+	install-html-am install-info install-info-am \
>+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
>+	install-ps install-ps-am install-strip installcheck \
> 	installcheck-am installdirs maintainer-clean \
> 	maintainer-clean-generic mostlyclean mostlyclean-compile \
> 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>-	tags uninstall uninstall-am uninstall-info-am \
>-	uninstall-libLTLIBRARIES
>+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
> 
> # Tell versions [3.59,3.63) of GNU make to not export all variables.
> # Otherwise a system limit (for SysV at least) may be exceeded.

Actions: View

Attachments on bug 208679: 157850 | 157851 | 158683