* autoconf/acinclude.m4: revamp MPN-matcher.

* autoconf/aclocal.m4: upgrade to autoconf-2.52 infrastructure, sync with CLisp from CVS. * autoconf/autoconf: Likewise. * autoconf/autoconf.m4f: Likewise (new file). * configure.ac: Likewise (new file, replaces configure.in). * configure.in: Likewise (deleted, replaced by configure.ac). * autoconf/config.{guess,sub}: Update to GNU version 2001-12-13. * src/Makefile.in: made VPATH safe for autoconf-2.52. * include/cln/config.h.in: Add __s390__.
24 years ago · 6617af2754
12 changed files with 10130 additions and 471 deletions
--- a/13
+++ b/13
@ -1,3 +1,16 @@
 2002-01-03  Richard Kreckel  <kreckel@ginac.de>
        * autoconf/acinclude.m4: revamp MPN-matcher.
        * autoconf/aclocal.m4: upgrade to autoconf-2.52 infrastructure,
          sync with CLisp from CVS.
        * autoconf/autoconf: Likewise.
        * autoconf/autoconf.m4f: Likewise (new file).
        * configure.ac: Likewise (new file, replaces configure.in).
        * configure.in: Likewise (deleted, replaced by configure.ac).
        * autoconf/config.{guess,sub}: Update to GNU version 2001-12-13.
        * src/Makefile.in: made VPATH safe for autoconf-2.52.
        * include/cln/config.h.in: Add __s390__.
 2001-12-31  Richard Kreckel  <kreckel@ginac.de>
        * src/base/digitseq/cl_DS.h: <gmp.h> is not included extern "C"
--- a/Makefile.devel
+++ b/Makefile.devel
@ -17,20 +17,20 @@ all : configures documentation
 CONFIGURES = configure
 CONFIGURES_IN = configure.in
 CONFIGURES_IN = configure.ac
 AUTOCONF_FILES = autoconf/aclocal.m4 autoconf/acgeneral.m4 autoconf/acspecific.m4
 AUTOCONF_FILES = autoconf/aclocal.m4 autoconf/autoconf.m4f autoconf/acgeneral.m4 autoconf/acspecific.m4
 configures : $(CONFIGURES)
 configure : configure.in $(AUTOCONF_FILES)
 	./autoconf/autoconf -m autoconf
 configure : configure.ac $(AUTOCONF_FILES)
 	./autoconf/autoconf -A autoconf -l autoconf
 CLISP_ACLOCAL = /home/kreckel/contrib/src/clisp/src/autoconf/aclocal.m4
 ACSELECT = /home/kreckel/contrib/src/clisp/src/autoconf/acselect
 LIBTOOLMACROS = /home/kreckel/contrib/libtool/libtool.m4
 autoconf/aclocal.m4 : $(CLISP_ACLOCAL)
 autoconf/aclocal.m4 : $(CLISP_ACLOCAL) autoconf/acinclude.m4
 	($(ACSELECT) `cat $(CONFIGURES_IN) | grep '^[A-Z][A-Z]_' | sed 's,[^A-Z_].*$$,,g' | sort | uniq` < $(CLISP_ACLOCAL) ; cat $(LIBTOOLMACROS) | sed -e 's,AC_CANONICAL_HOST,CL_CANONICAL_HOST,g' -e 's,AC_PROG_RANLIB,CL_PROG_RANLIB,g'; cat autoconf/acinclude.m4) > autoconf/aclocal.m4
 # Syntaxcheck
--- a/autoconf/acinclude.m4
+++ b/autoconf/acinclude.m4
@ -24,18 +24,27 @@ AC_DEFUN(CL_GMP_SET_UINTD,
 #include <gmp.h>
 int main() {
    FILE *f=fopen("conftestval", "w");
    if (!f) return(1);
    if (!f) return(255);
    if (sizeof(mp_limb_t) > sizeof(long))
        fprintf(f, "long long");
    else if (sizeof(mp_limb_t) == sizeof(long))
        fprintf(f, "long");
    else if (sizeof(mp_limb_t) == sizeof(int))
        fprintf(f, "int");
    else return(1);
    else return(sizeof(mp_limb_t));
 #if defined(__GMP_BITS_PER_MP_LIMB)
    /* Is there a nail in a limb? */
    if (8*sizeof(mp_limb_t)!=__GMP_BITS_PER_MP_LIMB)
        return(254);
 #endif
    return(0);
 }], cl_cv_gmp_set_uintd=`cat conftestval`; \
    cl_gmp_demands="GMP_DEMANDS_UINTD_`echo ${cl_cv_gmp_set_uintd} | sed -e 'y/ gilnot/_GILNOT/'`"; 
    AC_DEFINE_UNQUOTED($cl_gmp_demands),
    AC_MSG_ERROR([CLN can't handle the result]),dnl
 }], cl_cv_gmp_set_uintd=`cat conftestval`
    cl_gmp_demands="GMP_DEMANDS_UINTD_`echo ${cl_cv_gmp_set_uintd} | sed -e 'y/ gilnot/_GILNOT/'`",
    gmp_retval="$ac_status"
    if test x$gmp_retval = "x255"; then AC_MSG_ERROR([error opening output file.]); fi
    if test x$gmp_retval = "x254"; then AC_MSG_ERROR([nails in MP limbs are unsupported.]); fi
    AC_MSG_ERROR([Don't know which C-type has sizeof $gmp_retval.]),
    AC_MSG_ERROR([cross-compiling - cannot determine]))
 ])])
 ])
 AC_DEFINE_UNQUOTED($cl_gmp_demands)
 ])
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@ -2,7 +2,7 @@ dnl local autoconf macros
 dnl Bruno Haible 2001-02-04
 dnl Marcus Daniels 1997-04-10
 dnl
 AC_PREREQ(2.12)dnl
 AC_PREREQ(2.52)dnl
 dnl
 dnl without AC_MSG_...:   with AC_MSG_... and caching:
 dnl   AC_TRY_CPP          CL_CPP_CHECK
@ -69,7 +69,8 @@ define(CL_PROTO,
 AC_CACHE_VAL(cl_cv_proto_[$1], [$2
 cl_cv_proto_$1="$3"])
 cl_cv_proto_$1=`echo "[$]cl_cv_proto_$1" | tr -s ' ' | sed -e 's/( /(/'`
 AC_MSG_RESULTPROTO([$]cl_cv_proto_$1)
 AC_MSG_RESULT([$]{ac_t:-
         }[$]cl_cv_proto_$1)
 ])dnl
 dnl
 dnl CL_PROTO_RET(INCLUDES, DECL, CACHE-ID, TYPE-IF-OK, TYPE-IF-FAILS)
@ -102,16 +103,24 @@ define(CL_SILENT,
 [pushdef([AC_MSG_CHECKING],[:])dnl
 pushdef([AC_CHECKING],[:])dnl
 pushdef([AC_MSG_RESULT],[:])dnl
 pushdef([AC_MSG_RESULTPROTO],[:])dnl
 $1[]dnl
 popdef([AC_MSG_RESULTPROTO])dnl
 popdef([AC_MSG_RESULT])dnl
 popdef([AC_CHECKING])dnl
 popdef([AC_MSG_CHECKING])dnl
 ])dnl
 dnl
 dnl Expands to the "extern ..." prefix used for system declarations.
 dnl AC_LANG_EXTERN()
 define(AC_LANG_EXTERN,
 [extern
 #ifdef __cplusplus
 "C"
 #endif
 ])dnl
 dnl
 AC_DEFUN(CL_AS_UNDERSCORE,
 [AC_BEFORE([$0], [CL_GLOBAL_CONSTRUCTORS])
 m4_pattern_allow([^AS_UNDERSCORE$])
 AC_CACHE_CHECK(for underscore in external names, cl_cv_prog_as_underscore, [
 cat > conftest.c <<EOF
 int foo() { return 0; }
@ -145,7 +154,7 @@ AC_DEFUN(CL_PROG_INSTALL,
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # AFS /usr/afsws/bin/install, which mis-handles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 AC_MSG_CHECKING(for a BSD compatible install)
@ -208,48 +217,16 @@ AC_DEFUN(CL_CANONICAL_HOST,
 dnl Set ac_aux_dir before the cache check, because AM_PROG_LIBTOOL needs it.
 ac_aux_dir=${srcdir}/$1
 dnl A substitute for AC_CONFIG_AUX_DIR_DEFAULT, so we don't need install.sh.
 ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
 AC_CACHE_CHECK(host system type, cl_cv_host, [
 dnl Mostly copied from AC_CANONICAL_HOST.
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else AC_MSG_ERROR(can not run $ac_config_sub)
 fi
 host_alias=$host
 case "$host_alias" in
 NONE)
  case $nonopt in
  NONE) dnl config.guess needs to compile things
        host_alias=`export CC; ${CONFIG_SHELL-/bin/sh} $ac_config_guess` ;;
  *)    host_alias=$nonopt ;;
  esac ;;
 esac
 # Don't fail just because the system is not listed in GNU's database.
 if test -n "$host_alias"; then
  host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
 else
  host_alias=unknown
  host=unknown-unknown-unknown
 fi
 cl_cv_host_alias="$host_alias"
 cl_cv_host="$host"
 ])
 host_alias="$cl_cv_host_alias"
 host="$cl_cv_host"
 changequote(,)dnl
 host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 changequote([,])dnl
 AC_SUBST(host)dnl
 AC_SUBST(host_cpu)dnl
 AC_SUBST(host_vendor)dnl
 AC_SUBST(host_os)dnl
 ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 dnl We have defined $ac_aux_dir.
 AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 dnl We have defined $host_alias and $host.
 AC_PROVIDE([AC_CANONICAL_HOST])dnl
 dnl In autoconf-2.52, a single AC_CANONICAL_HOST has the effect of inserting
 dnl the code of AC_CANONICAL_BUILD *before* CL_CANONICAL_HOST, i.e. before
 dnl ac_aux_dir has been set. To work around this, we list AC_CANONICAL_BUILD
 dnl explicitly.
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 ])dnl
 dnl
 AC_DEFUN(CL_CANONICAL_HOST_CPU,
@ -734,10 +711,8 @@ dnl
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 # The next line was added by Bruno Haible 2001-06-08.
 builtin([undefine],[symbols])
 # serial 46 AC_PROG_LIBTOOL
 AC_DEFUN([AC_PROG_LIBTOOL],
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
@ -863,9 +838,30 @@ _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_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)
 ])# _LT_AC_CHECK_DLFCN
@ -883,10 +879,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 # Character class describing NM global symbol codes.
 [symcode='[BCDEGRST]']
 symcode='[[BCDEGRST]]'
 # Regexp to match symbols that can be accessed directly from C.
 [sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 # Transform the above into a raw symbol and a C symbol.
 symxfrm='\1 \2\3 \3'
@ -894,25 +890,29 @@ 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]']
  symcode='[[BCDT]]'
  ;;
 cygwin* | mingw* | pw32*)
  [symcode='[ABCDGISTW]']
  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]']
  symcode='[[BCDEGRST]]'
  ;;
 solaris* | sysv5*)
  [symcode='[BDT]']
  symcode='[[BDT]]'
  ;;
 sysv4)
  [symcode='[DFNSTU]']
  symcode='[[DFNSTU]]'
  ;;
 esac
@ -926,14 +926,14 @@ 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]']
  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'"]
 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
@ -975,23 +975,23 @@ EOF
 	  cat <<EOF >> conftest.$ac_ext
 #if defined (__STDC__) && __STDC__
 # define lt_ptr_t void *
 # define lt_ptr void *
 #else
 # define lt_ptr_t char *
 # define lt_ptr char *
 # define const
 #endif
 /* The mapping between symbol names and symbols. */
 const struct {
  const char *name;
  lt_ptr_t address;
  lt_ptr address;
 }
 [lt_preloaded_symbols[] =]
 lt_preloaded_symbols[[]] =
 {
 EOF
 	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
 	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
 	  cat <<\EOF >> conftest.$ac_ext
  {0, (lt_ptr_t) 0}
  {0, (lt_ptr) 0}
 };
 #ifdef __cplusplus
@ -1035,10 +1035,13 @@ 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_cdecl"; then
 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)
@ -1056,13 +1059,14 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
    *-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.
 # 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)])
@ -1131,7 +1135,7 @@ else
  #
  # So, first we look for a working echo in the user's PATH.
  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
  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' &&
@ -1220,7 +1224,7 @@ AC_DIVERT_POP
 # _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,
 AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
 [if test "$cross_compiling" = yes; then :
  [$4]
 else
@ -1307,7 +1311,7 @@ rm -fr conftest*
 # AC_LIBTOOL_DLOPEN_SELF
 # -------------------
 AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
 AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 [if test "x$enable_dlopen" != xyes; then
  enable_dlopen=unknown
  enable_dlopen_self=unknown
@ -1329,17 +1333,23 @@ else
   ;;
  *)
    AC_CHECK_LIB(dl, dlopen,  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
      [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
        [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
          [AC_CHECK_LIB(svld, dlopen,
    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, shl_load,
 	      [AC_CHECK_LIB([dld], [dld_link],
 	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
 	      ])
 	    ])
 	  ])
 	])
      ])
    ;;
  esac
@ -1401,10 +1411,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK],
 # 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']
 sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
 # Same as above, but do not quote variable references.
 [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
 double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
 # Sed substitution to delay expansion of an escaped shell variable in a
 # double_quote_subst'ed string.
@ -1473,8 +1483,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 if test -n "$RANLIB"; then
  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  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.
@ -1528,7 +1545,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
      # 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
      # we not sure about C++ programs.
      # not sure about C++ programs.
      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
      ;;
    amigaos*)
@ -1563,11 +1580,11 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
    # 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'
        lt_cv_prog_cc_wl='-Wl,'
      else
 	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
      fi
@ -1696,7 +1713,7 @@ 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 :
  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
@ -1778,6 +1795,8 @@ if test x"$compiler_c_o" = x"yes"; then
  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
@ -1787,10 +1806,11 @@ if test x"$compiler_c_o" = x"yes"; then
      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_c_lo])
  AC_MSG_RESULT([$compiler_o_lo])
 else
  compiler_o_lo=no
 fi
@ -1903,7 +1923,9 @@ cygwin* | mingw* | pw32* )
    with_gnu_ld=no
  fi
  ;;
 openbsd*)
  with_gnu_ld=no
  ;;
 esac
 ld_shlibs=yes
@ -1990,7 +2012,7 @@ EOF
    # 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~
      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=
@ -2003,7 +2025,7 @@ EOF
    # 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'
      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.
@ -2115,15 +2137,42 @@ else
    ;;
  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
@ -2140,42 +2189,31 @@ else
 	  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='-G'
 	shared_flag='${wl}-G'
      else
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag='${wl}-G'
 	else
 	  shared_flag='${wl}-bM:SRE'
 	fi
      hardcode_direct=yes
      fi
    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
      # 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 run time linking.
      aix_use_runtimelinking=no
      for ld_flag in $LDFLAGS; do
        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
          aix_use_runtimelinking=yes
          break
        fi
      done
      exp_sym_flag='-bexport'
      no_entry_flag='-bnoentry'
    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'
      allow_undefined_flag=' -Wl,-G'
      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"
      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'
@ -2183,9 +2221,9 @@ else
 	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"
 	# 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'
@ -2220,11 +2258,18 @@ else
    ;;
  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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
    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
@ -2299,7 +2344,7 @@ else
    ;;
  newsos6)
    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
    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=:
@ -2307,10 +2352,24 @@ else
    ;;
  openbsd*)
    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
    hardcode_libdir_flag_spec='-R$libdir'
    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*)
@ -2355,10 +2414,39 @@ else
    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'
@ -2367,7 +2455,7 @@ else
    hardcode_libdir_flag_spec='-R$libdir'
    hardcode_shlibpath_var=no
    case $host_os in
    [solaris2.[0-5] | solaris2.[0-5].*]) ;;
    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
@ -2390,7 +2478,7 @@ else
  sysv4)
    if test "x$host_vendor" = xsno; then
      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
      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'
@ -2559,7 +2647,7 @@ aix4* | aix5*)
    # 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].*)]
      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
@ -2569,12 +2657,14 @@ aix4* | aix5*)
 	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.
    # 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.
      # 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
@ -2583,14 +2673,13 @@ aix4* | aix5*)
      soname_spec='${libname}${release}.so$major'
    fi
    shlibpath_var=LIBPATH
    deplibs_check_method=pass_all
  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'
  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*)
@ -2621,7 +2710,7 @@ cygwin* | mingw* | pw32*)
  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'
    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~
@ -2631,14 +2720,14 @@ cygwin* | mingw* | pw32*)
       $rm \$dlpath'
    ;;
  yes,mingw*)
    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
    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'
    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
    ;;
  esac
  dynamic_linker='Win32 ld.exe'
@ -2796,9 +2885,19 @@ newsos6)
 openbsd*)
  version_type=sunos
  if test "$with_gnu_ld" = yes; then
  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'
@ -2915,6 +3014,41 @@ 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
@ -3014,6 +3148,7 @@ if test -f "$ltmain"; then
    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
@ -3080,12 +3215,12 @@ SHELL=$lt_SHELL
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 # Whether or not to add -lc for building shared libraries.
 build_libtool_need_lc=$need_lc
 # 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
@ -3251,6 +3386,9 @@ 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
@ -3732,6 +3870,7 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([CL_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.
@ -3745,8 +3884,8 @@ if test "$GCC" = yes; then
  esac
  case $ac_prog in
    # Accept absolute paths.
    [[\\/]* | [A-Za-z]:[\\/]*)]
      [re_direlt='/[^/][^/]*/\.\./']
    [[\\/]]* | [[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
@ -3770,7 +3909,7 @@ else
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
  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
@ -3834,7 +3973,7 @@ lt_cv_deplibs_check_method='unknown'
 # `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
 # '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.
@ -3849,7 +3988,7 @@ beos*)
  ;;
 bsdi4*)
  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
  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
  ;;
@ -3863,7 +4002,7 @@ 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])
  rhapsody* | darwin1.[[012]])
    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
    ;;
  *) # Darwin 1.3 on
@ -3878,7 +4017,7 @@ freebsd*)
    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)/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.*`
      ;;
@ -3893,7 +4032,7 @@ gnu*)
  ;;
 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_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
  ;;
@ -3912,7 +4051,7 @@ irix5* | irix6*)
    *) 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 ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
    ;;
  esac
  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@ -3922,29 +4061,39 @@ irix5* | irix6*)
 # This must be Linux ELF.
 linux-gnu*)
  case $host_cpu in
  alpha* | i*86 | powerpc* | sparc* | ia64* )
  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 )' ;;]
    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]+$']
    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
  else
    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
    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_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'
@ -3961,14 +4110,14 @@ solaris*)
  lt_cv_file_magic_test_file=/lib/libc.so
  ;;
 [sysv5uw[78]* | sysv4*uw2*)]
 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_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)
@ -3976,11 +4125,11 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
    ;;
  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 )']
    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_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
@ -3994,13 +4143,14 @@ 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_MSG_CHECKING([for BSD-compatible 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="${IFS}${PATH_SEPARATOR-:}"
  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
@ -4136,18 +4286,27 @@ AC_DEFUN(CL_GMP_SET_UINTD,
 #include <gmp.h>
 int main() {
    FILE *f=fopen("conftestval", "w");
    if (!f) return(1);
    if (!f) return(255);
    if (sizeof(mp_limb_t) > sizeof(long))
        fprintf(f, "long long");
    else if (sizeof(mp_limb_t) == sizeof(long))
        fprintf(f, "long");
    else if (sizeof(mp_limb_t) == sizeof(int))
        fprintf(f, "int");
    else return(1);
    else return(sizeof(mp_limb_t));
 #if defined(__GMP_BITS_PER_MP_LIMB)
    /* Is there a nail in a limb? */
    if (8*sizeof(mp_limb_t)!=__GMP_BITS_PER_MP_LIMB)
        return(254);
 #endif
    return(0);
 }], cl_cv_gmp_set_uintd=`cat conftestval`; \
    cl_gmp_demands="GMP_DEMANDS_UINTD_`echo ${cl_cv_gmp_set_uintd} | sed -e 'y/ gilnot/_GILNOT/'`"; 
    AC_DEFINE_UNQUOTED($cl_gmp_demands),
    AC_MSG_ERROR([CLN can't handle the result]),dnl
 }], cl_cv_gmp_set_uintd=`cat conftestval`
    cl_gmp_demands="GMP_DEMANDS_UINTD_`echo ${cl_cv_gmp_set_uintd} | sed -e 'y/ gilnot/_GILNOT/'`",
    gmp_retval="$ac_status"
    if test x$gmp_retval = "x255"; then AC_MSG_ERROR([error opening output file.]); fi
    if test x$gmp_retval = "x254"; then AC_MSG_ERROR([nails in MP limbs are unsupported.]); fi
    AC_MSG_ERROR([Don't know which C-type has sizeof $gmp_retval.]),
    AC_MSG_ERROR([cross-compiling - cannot determine]))
 ])])
 ])
 AC_DEFINE_UNQUOTED($cl_gmp_demands)
 ])
--- a/autoconf/autoconf
+++ b/autoconf/autoconf
@ -1,6 +1,8 @@
 #! /bin/sh
 # -*- shell-script -*-
 # autoconf -- create `configure' using m4 macros
 # Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
 # Copyright 1992, 1993, 1994, 1996, 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
@ -17,143 +19,772 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 # If given no args, create `configure' from template file `configure.in'.
 # With one arg, create a configure script on standard output from
 # the given template file.
 me=`echo "$0" | sed -e 's,.*[\\/],,'`
 usage="\
 Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
       [-l dir] [--localdir=dir] [--version] [template-file]"
 Usage: $0 [OPTION] ... [TEMPLATE-FILE]
 Generate a configuration script from a TEMPLATE-FILE if given, or
 \`configure.ac' if present, or else \`configure.in'.  Output is sent
 to the standard output if TEMPLATE-FILE is given, else into
 \`configure'.
 Operation modes:
  -h, --help               print this help, then exit
  -V, --version            print version number, then exit
  -v, --verbose            verbosely report processing
  -d, --debug              don't remove temporary files
  -o, --output=FILE        save output in FILE (stdout is the default)
  -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
 Warning categories include:
  \`cross'         cross compilation issues
  \`obsolete'      obsolete constructs
  \`syntax'        dubious syntactic constructs
  \`all'           all the warnings
  \`no-CATEGORY'   turn off the warnings on CATEGORY
  \`none'          turn off all the warnings
  \`error'         warnings are error
 The environment variable \`WARNINGS' is honored.
 Library directories:
  -A, --autoconf-dir=ACDIR  Autoconf's macro files location (rarely needed)
  -l, --localdir=DIR        location of the \`aclocal.m4' file
 Tracing:
  -t, --trace=MACRO     report the list of calls to MACRO
  -i, --initialization  also trace Autoconf's initialization process
 In tracing mode, no configuration script is created.
 Report bugs to <bug-autoconf@gnu.org>."
 version="\
 autoconf (GNU Autoconf) 2.52
 Written by David J. MacKenzie.
 Copyright 1992, 1993, 1994, 1996, 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."
 exit_missing_arg="\
 echo \"$me: option \\\`\$1' requires an argument\" >&2
 echo \"\$help\" >&2
 exit 1"
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally
 # because not all systems understand e.g. LANG=C (notably SCO).
 # Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
 # Non-C LC_CTYPE values break the ctype check.
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
 if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 : ${AC_MACRODIR=/usr/share/autoconf}
 : ${M4=/usr/bin/m4}
 : ${AWK=/usr/bin/awk}
 case "${M4}" in
 /*) # Handle the case that m4 has moved since we were configured.
 # ac_LF_and_DOT
 # 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 .`
 # Find GNU m4.
 # Handle the case that m4 has moved since we were configured.
 # It may have been found originally in a build directory.
    test -f "${M4}" || M4=m4 ;;
 : ${M4=/usr/bin/m4}
 case "$M4" in
  [\\/]* | ?:[\\/]*) test -f "$M4" || M4=m4 ;;
 esac
 # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
 case `$M4 --help </dev/null 2>&1` in
 *reload-state*);;
 *) echo "$me: Autoconf requires GNU m4 1.4 or later" >&2; exit 1 ;;
 esac
 # Set some high recursion limit as the default limit, 250, has already
 # been hit with AC_OUTPUT.
 case " $M4 " in
  *" --nesting-limit"* | *" -L"* )
  # Don't override the user's choice
  ;;
  *) M4="$M4 --nesting-limit=1024"
  ;;
 esac
 : ${TMPDIR=/tmp}
 tmpout=${TMPDIR}/acout.$$
 localdir=
 show_version=no
 # Find a good AWK.
 : ${AWK=gawk}
 if echo xfoo | $AWK '/foo|^bar$/ { print }' | grep xfoo >/dev/null; then :; else
  echo "$me: the regex engine of $AWK is too broken to be used" >&2
  echo "$me: you might want to install GNU AWK" >&2
  exit 1
 fi
 # Variables.
 : ${autoconf_dir=${AC_MACRODIR=/usr/share/autoconf}}
 test -z "$AC_ACLOCALDIR" &&
  AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`
 debug=false
 # Trace Autoconf's initialization?
 initialization=false
 localdir=.
 outfile=
 # Exit status.
 status=0
 # Tasks:
 # - trace
 #   Trace the first arguments of some macros
 # - script
 #   Produce the configure script (default)
 task=script
 tmp=
 verbose=:
 # Parse command line.
 while test $# -gt 0 ; do
   case "${1}" in
      -h | --help | --h* )
         echo "${usage}" 1>&2; exit 0 ;;
      --localdir=* | --l*=* )
         localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
               "x$1" : 'x-.\(.*\)'`
  case $1 in
    --version | -V )
       echo "$version" ; exit 0 ;;
    --help | -h )
       echo "$usage"; exit 0 ;;
    --debug | -d )
       debug=:; shift ;;
    --verbose | -v )
       verbose=echo
       shift;;
      -l | --localdir | --l*)
    --localdir=* | -l?* )
       localdir=$optarg
       shift ;;
    --localdir | -l )
       test $# = 1 && eval "$exit_missing_arg"
       shift
       localdir=$1
       shift ;;
    --autoconf-dir=* | -A?* )
      autoconf_dir=$optarg
       shift ;;
    --autoconf-dir | -A )
       test $# = 1 && eval "$exit_missing_arg"
       shift
         test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
         localdir="${1}"
       autoconf_dir=$1
       shift ;;
      --macrodir=* | --m*=* )
         AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
    --macrodir=* | -m?* )
       echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2
       autoconf_dir=$optarg
       shift ;;
    --macrodir | -m )
       echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2
       test $# = 1 && eval "$exit_missing_arg"
       shift
       autoconf_dir=$1
       shift ;;
    --trace=* | -t?* )
       task=trace
       traces="$traces '"`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"`"'"
       shift ;;
    --trace | -t )
       test $# = 1 && eval "$exit_missing_arg"
       task=trace
       shift
       traces="$traces '"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'"
       shift ;;
    --initialization | -i )
       initialization=:
       shift;;
    --output=* | -o?* )
       outfile=$optarg
       shift ;;
      -m | --macrodir | --m* )
    --output | -o )
       test $# = 1 && eval "$exit_missing_arg"
       shift
         test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
         AC_MACRODIR="${1}"
       outfile=$1
       shift ;;
      --version | --v* )
         show_version=yes; shift ;;
    --warnings=* | -W?* )
       warnings=$warnings,$optarg
       shift ;;
    --warnings | -W )
       test $# = 1 && eval "$exit_missing_arg"
       shift
       warnings=$warnings,$1
       shift ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
        echo "${usage}" 1>&2; exit 1 ;;
       exec >&2
       echo "$me: invalid option $1"
       echo "$help"
       exit 1 ;;
    * )
       break ;;
  esac
 done
 if test $show_version = yes; then
  version=`sed -n 's/define.AC_ACVERSION.[ 	]*\([0-9.]*\).*/\1/p' \
    $AC_MACRODIR/acgeneral.m4`
  echo "Autoconf version $version"
  exit 0
 fi
 # The warnings are the concatenation of 1. application's defaults,
 # 2. $WARNINGS, $3 command line options, in that order.
 # Set them in the order expected by the M4 macros: the converse.
 alphabet='abcdefghijklmnopqrstuvwxyz'
 ALPHABET='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 NUMBERS='0123456789'
 WORDCHAR=_$alphabet$ALPHABET$NUMBERS
 m4_warnings=
 for warning in `IFS=,; echo syntax $WARNINGS $warnings |
                         tr $ALPHABET $alphabet`
 do
  test -n $warning || continue
  m4_warnings="$warning"`test -n "$m4_warnings" && echo ",$m4_warnings"`
 done
 # Trap on 0 to stop playing with `rm'.
 $debug ||
 {
  trap 'status=$?; rm -rf $tmp && exit $status' 0
  trap '(exit 1); exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 : ${TMPDIR=/tmp}
 {
  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/acXXXXXX") 2>/dev/null` &&
  test -n "$tmp" && test -d "$tmp"
 } ||
 {
  tmp=$TMPDIR/ac$$
  (umask 077 && mkdir $tmp)
 } ||
 {
   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
   (exit 1); exit 1;
 }
 # Running m4.
 test -f "$autoconf_dir/acsite.m4" && acsite_m4="$autoconf_dir/acsite.m4"
 test -f "$localdir/aclocal.m4"   && aclocal_m4="$localdir/aclocal.m4"
 m4_common="-I $autoconf_dir -I $localdir -Dm4_tmpdir=$tmp"
 m4_prefiles="                $autoconf_dir/autoconf.m4  $acsite_m4 $aclocal_m4"
 m4f_prefiles="--reload-state=$autoconf_dir/autoconf.m4f $acsite_m4 $aclocal_m4"
 run_m4="$M4 $m4_common"
 # Find the input file.
 case $# in
  0) infile=configure.in ;;
  1) infile="$1" ;;
  *) echo "$usage" >&2; exit 1 ;;
  0)
    case `ls configure.ac configure.in 2>/dev/null` in
      *ac*in )
        echo "$me: warning: both \`configure.ac' and \`configure.in' are present." >&2
        echo "$me: warning: proceeding with \`configure.ac'." >&2
        infile=configure.ac;;
      *ac ) infile=configure.ac;;
      *in ) infile=configure.in;;
      * )
        echo "$me: no input file" >&2
        exit 1;;
    esac
    test $task = script && test -z "$outfile" && outfile=configure;;
  1) infile=$1 ;;
  *) exec >&2
     echo "$me: invalid number of arguments."
     echo "$help"
     (exit 1); exit 1 ;;
 esac
 trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
 # Unless specified, the output is stdout.
 test -z "$outfile" && outfile=-
 tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
 # We need an actual file.
 if test z$infile = z-; then
  infile=$tmpin
  infile=$tmp/stdin
  cat >$infile
 elif test ! -r "$infile"; then
  echo "autoconf: ${infile}: No such file or directory" >&2
  exit 1
  echo "$me: $infile: No such file or directory" >&2
  (exit 1); exit 1
 fi
 if test -n "$localdir"; then
  use_localdir="-I$localdir -DAC_LOCALDIR=$localdir"
 else
  use_localdir=
 # Output is produced into FD 4.  Prepare it.
 case $outfile in
 -)  # Output to stdout
  exec 4>&1 ;;
 * )
  exec 4>$outfile;;
 esac
 # Initializations are performed.  Proceed to the main task.
 case $task in
  ## --------------------------------- ##
  ## Generate the `configure' script.  ##
  ## --------------------------------- ##
  script)
  # M4 expansion.
  : >$tmp/forbidden.rx
  : >$tmp/allowed.rx
  $verbose "$me: running $run_m4 -Dm4_warnings=$m4_warnings $m4f_prefiles $infile" >&2
  $run_m4 -Dm4_warnings=$m4_warnings $m4f_prefiles $infile >$tmp/configure ||
    { (exit 1); exit 1; }
  if test "x$outfile" != x-; then
    chmod +x $outfile
  fi
 # Use the frozen version of Autoconf if available.
 r= f=
 # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
 case `$M4 --help < /dev/null 2>&1` in
 *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
 *traditional*) ;;
 *) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
 esac
  # Put the real line numbers into configure to make config.log more
  # helpful.  Because quoting can sometimes get really painful in m4,
  # there are special @tokens@ to substitute.
  sed 's/^    //' >"$tmp/finalize.awk" <<EOF
    # Load the list of tokens which escape the forbidden patterns.
    BEGIN {
      # Be sure the read GAWK documentation to understand the parens
      # around \`tmp "/forbidden.rx"'.
      while ((getline pattern < (tmp "/forbidden.rx")) > 0)
        forbidden = (forbidden ? forbidden "|" : "") pattern
      close (tmp "/forbidden.rx")
      if (verbose)
        errprint("$me: forbidden: " forbidden)
 $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
  { rm -f $tmpin $tmpout; exit 2; }
      while ((getline pattern < (tmp "/allowed.rx")) > 0)
        allowed = (allowed ? allowed "|" : "") pattern
      if (!allowed)
        allowed = "^$"
      close (tmp "/allowed.rx")
      if (verbose)
        errprint("$me: allowed: " allowed)
    }
 # You could add your own prefixes to pattern if you wanted to check for
 # them too, e.g. pattern='\(AC_\|ILT_\)', except that UNIX sed doesn't do
 # alternation.
 pattern="AC_"
    function errprint (message)
    {
      # BAD! the pipe to 'cat >&2' doesn't work for DJGPP.
      #  print message | "cat >&2"
      # Use normal redirection instead:
      print message > "$tmp/finalize.err"
    }
 status=0
 if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then
  echo "autoconf: Undefined macros:" >&2
  sed -n "s/^[^#]*\\(${pattern}[_A-Za-z0-9]*\\).*/\\1/p" $tmpout |
    while read macro; do
      grep -n "^[^#]*$macro" $infile /dev/null
      test $? -eq 1 && echo >&2 "***BUG in Autoconf--please report*** $macro"
    done | sort -u >&2
  status=1
    function undefined (file, line, macro)
    {
      errprint(file ":" line ": error: possibly undefined macro: " macro)
    }
    # Body.
    {
      sub (/[ \t]*$/, "")
      if (\$0 == "")
        {
          if (!duplicate)
            {
               oline++
               print
            }
          duplicate = 1
          next
        }
      duplicate = 0
      oline++
      if (\$0 ~ /__oline__/)
        while (sub (/__oline__/, oline))
          continue
      while (sub (/@<:@/, "["))
        continue
      while (sub (/@:>@/, "]"))
        continue
      while (sub (/@S\|@/, "$"))
        continue
      while (sub (/@%:@/, "#"))
        continue
      print
      # Dubious feature: we tolerate macro names when commented.
      sub (/#.*/, "")
      # Get the tokens.
      split (\$0, tokens, /[^$WORDCHAR]*/)
      for (token in tokens)
        if (match (tokens[token], forbidden) &&
            !match (tokens[token], allowed))
          {
            macros [tokens [token]] = oline
            some_macros_were_not_expanded = 1
          }
    }
    # If there are some macros which are left unexpanded in the output,
    # try to find the input which is responsible.  Otherwise, try to help.
    END {
      if (some_macros_were_not_expanded)
        {
          line = 0
          while (getline < "$infile")
            {
              line++
              for (macro in macros)
                if (index (\$0, macro))
                  {
                    delete macros [macro]
                    undefined("$infile", line, macro)
                  }
            }
          close ("$infile")
          for (macro in macros)
            undefined("$outfile", macros [macro], macro)
          exit 1
        }
    }
 EOF
    $AWK -v tmp="$tmp" \
         `$verbose "-v verbose=1"` \
         -f "$tmp/finalize.awk" <$tmp/configure >&4 ||
      { test -f "$tmp/finalize.err" && cat "$tmp/finalize.err" >&2
        (exit 1); exit 1; }
    test -f "$tmp/finalize.err" && cat "$tmp/finalize.err" >&2
  ;; # End of the task script.
  ## -------------- ##
  ## Trace macros.  ##
  ## -------------- ##
  trace)
  # trace.m4
  # --------
  # Routines to process formatted m4 traces.
  sed 's/^  //' >$tmp/trace.m4 <<\EOF
  divert(-1)
  changequote([, ])
  # _at_MODE(SEPARATOR, ELT1, ELT2...)
  # ----------------------------------
  # List the elements, separating then with SEPARATOR.
  # MODE can be:
  #  `at'       -- the elements are enclosed in brackets.
  #  `star'     -- the elements are listed as are.
  #  `percent'  -- the elements are `flattened': spaces are singled out,
  #                and no new line remains.
  define([_at_at],
         [at_ifelse([$#], [1], [],
                    [$#], [2], [[[$2]]],
                    [[[$2]][$1]$0([$1], at_shift(at_shift($@)))])])
  define([_at_percent],
         [at_ifelse([$#], [1], [],
                    [$#], [2], [at_flatten([$2])],
                    [at_flatten([$2])[$1]$0([$1], at_shift(at_shift($@)))])])
  define([_at_star],
         [at_ifelse([$#], [1], [],
                    [$#], [2], [[$2]],
                    [[$2][$1]$0([$1], at_shift(at_shift($@)))])])
  # FLATTEN quotes its result.
  define([at_flatten],
         [at_patsubst(at_patsubst(at_patsubst([[[$1]]],
                                              [\\
  ]),
                                  [[
     ]+],
                                  [ ]),
    		      [^ *\(.*\) *$], [[\1]])])
  define([at_args],    [at_shift(at_shift(at_shift(at_shift(at_shift($@)))))])
  define([at_at],      [_$0([$1], at_args($@))])
  define([at_percent], [_$0([$1], at_args($@))])
  define([at_star],    [_$0([$1], at_args($@))])
 EOF
  # If you trace `define', then on `define([m4_exit], defn([m4exit])' you
  # will produce
  #
  #    AT_define([m4sugar.m4], [115], [1], [define], [m4_exit], <m4exit>)
  #
  # Since `<m4exit>' is not quoted, the outter m4, when processing
  # `trace.m4' will exit prematurely.  Hence, move all the builtins to
  # the `at_' name space.
  echo '# Copy the builtins.' >>$tmp/trace.m4
  echo "dumpdef" |
    $M4 2>&1 >/dev/null |
    sed 's/^\([^:]*\):.*/define([at_\1], defn([\1]))/' >>$tmp/trace.m4
  echo >>$tmp/trace.m4
  echo '# Disable the builtins.' >>$tmp/trace.m4
  echo "dumpdef" |
    $M4 2>&1 >/dev/null |
    sed 's/^\([^:]*\):.*/at_undefine([\1])/' >>$tmp/trace.m4
  echo >>$tmp/trace.m4
  # trace2m4.sed
  # ------------
  # Transform the traces from m4 into an m4 input file.
  # Typically, transform:
  #
  # | m4trace:configure.ac:3: -1- AC_SUBST([exec_prefix], [NONE])
  #
  # into
  #
  # | AT_AC_SUBST([configure.ac], [3], [1], [AC_SUBST], [exec_prefix], [NONE])
  #
  # Pay attention that the file name might include colons, if under DOS
  # for instance, so we don't use `[^:][^:]*'.
  # The first s/// catches multiline traces, the second, traces as above.
  preamble='m4trace:\(..*\):\([0-9][0-9]*\): -\([0-9][0-9]*\)-'
  cat >$tmp/trace2m4.sed <<EOF
  s/^$preamble \([^(][^(]*\)(\(.*\)$/AT_\4([\1], [\2], [\3], [\4], \5/
  s/^$preamble \(.*\)$/AT_\4([\1], [\2], [\3], [\4])/
 EOF
  # translate.awk
  # -------------
  # Translate user tracing requests into m4 macros.
  cat >$tmp/translate.awk <<\EOF
  function trans (arg, sep)
  {
    # File name.
    if (arg == "f")
      return "$1"
    # Line number.
    if (arg == "l")
      return "$2"
    # Depth.
    if (arg == "d")
      return "$3"
    # Name (also available as $0).
    if (arg == "n")
      return "$4"
    # Escaped dollar.
    if (arg == "$")
      return "$"
    # $@, list of quoted effective arguments.
    if (arg == "@")
      return "]at_at([" (separator ? separator : ",") "], $@)["
    # $*, list of unquoted effective arguments.
    if (arg == "*")
      return "]at_star([" (separator ? separator : ",") "], $@)["
    # $%, list of flattened unquoted effective arguments.
    if (arg == "%")
      return "]at_percent([" (separator ? separator : ":") "], $@)["
  }
  function error (message)
  {
    print message | "cat >&2"
    exit 1
  }
  {
    # Accumulate the whole input.
    request = request $0 "\n"
  }
  END {
    # Chomp.
    request = substr (request, 1, length (request) - 1)
    # The default request is `$f:$l:$n:$*'.
    colon   = index (request, ":")
    macro   = colon ? substr (request, 1, colon - 1) : request
    request = colon ? substr (request, colon + 1)    : "$f:$l:$n:$%"
    res = ""
    for (cp = request; cp; cp = substr (cp, 2))
      {
  	char = substr (cp, 1, 1)
  	if (char == "$")
  	  {
  	    if (match (cp, /^\$[0-9]+/))
  	      {
  		# $n -> $(n + 4)
  		res = res "$" (substr (cp, 2, RLENGTH - 1) + 4)
  		cp = substr (cp, RLENGTH)
  	      }
  	    else if (substr (cp, 2, 1) ~ /[fldn$@%*]/)
  	      {
  		# $x, no separator given.
  		res = res trans(substr (cp, 2, 1))
  		cp = substr (cp, 2)
  	      }
  	    else if (substr (cp, 2, 1) == "{")
  	      {
  		# ${sep}x, long separator.
  		end = index (cp, "}")
  		if (!end)
  		  error("invalid escape: " cp)
  		separator = substr (cp, 3, end - 3)
  		if (substr (cp, end + 1, 1) ~ /[*@%]/)
  		  res = res trans(substr (cp, end + 1, 1), separator)
  		else
  		  error("invalid escape: " cp)
  		cp = substr (cp, end + 1)
  	      }
  	    else if (substr (cp, 3, 1) ~ /[*@%]/)
  	      {
  		# $sx, short separator `s'.
  		res = res trans(substr (cp, 3, 1), substr (cp, 2, 1))
  		cp = substr(cp, 3)
  	      }
  	    else
  	      {
  		error("invalid escape: " substr (cp, 1, 2))
  	      }
  	  }
  	else
  	  res = res char
      }
    # Produce the definition of AT_<MACRO> = the translation of the request.
    print "at_define([AT_" macro "],"
    print "[[" res "]])"
    print ""
    close("cat >&2")
  }
 EOF
  # Extract both the m4 program and the m4 options from TRACES.
  echo "## ------------------------- ##" >>$tmp/trace.m4
  echo "## Trace processing macros.  ##" >>$tmp/trace.m4
  echo "## ------------------------- ##" >>$tmp/trace.m4
  echo >>$tmp/trace.m4
  eval set dummy "$traces"
  shift
  for trace
  do
    echo "# $trace" >>$tmp/trace.m4
    # The request may be several lines long, hence sed has to quit.
    macro_name=`echo "$trace" | sed 's/:.*//;q'`
    # If for instance TRACE is `define', be sure to have an empty
    # TRACE_FORMAT.
    case $trace in
      $macro_name:* )
         trace_format=`echo "$trace" | sed "1s/^$macro_name:/:/"`;;
      * )
         trace_format=;;
    esac
    # GNU M4 1.4's tracing of builtins is buggy.  When run on this input:
    #
    # | divert(-1)
    # | changequote([, ])
    # | define([m4_eval], defn([eval]))
    # | eval(1)
    # | m4_eval(2)
    # | undefine([eval])
    # | m4_eval(3)
    #
    # it behaves this way:
    #
    # | % m4 input.m4 -da -t eval
    # | m4trace: -1- eval(1)
    # | m4trace: -1- m4_eval(2)
    # | m4trace: -1- m4_eval(3)
    # | %
    #
    # Conversely:
    #
    # | % m4 input.m4 -da -t m4_eval
    # | %
    #
    # So we will merge them, i.e.  tracing `BUILTIN' or tracing
    # `m4_BUILTIN' will be the same: tracing both, but honoring the
    # *last* trace specification.
    # FIXME: This is not enough: in the output `$0' will be `BUILTIN'
    # sometimes and `m4_BUILTIN' at others.  We should render a unique name,
    # the one specified by the user.
    base_name=`echo "$macro_name" | sed 's/^m4_//'`
    if echo "ifdef(\`$base_name', \`', \`m4exit(-1)')" | $M4; then
      # BASE_NAME is a builtin.
      trace_opt="$trace_opt -t $base_name -t m4_$base_name"
      echo "$base_name$trace_format" |
        $AWK -f $tmp/translate.awk >>$tmp/trace.m4 ||
          { (exit 1); exit 1; }
      echo "m4_$base_name$trace_format" |
        $AWK -f $tmp/translate.awk >>$tmp/trace.m4 ||
          { (exit 1); exit 1; }
    else
      # MACRO_NAME is not a builtin.
      trace_opt="$trace_opt -t $macro_name"
      echo "$trace" |
        $AWK -f $tmp/translate.awk >>$tmp/trace.m4 ||
          { (exit 1); exit 1; }
    fi
    echo >>$tmp/trace.m4
  done
  echo "## ------------------- ##" >>$tmp/trace.m4
  echo "## Traces to process.  ##" >>$tmp/trace.m4
  echo "## ------------------- ##" >>$tmp/trace.m4
  echo >>$tmp/trace.m4
  echo "at_divert(0)at_dnl" >>$tmp/trace.m4
 if test $# -eq 0; then
  exec 4> configure; chmod +x configure
  # Do we trace the initialization?
  # `errprint' must be silent, otherwise there can be warnings mixed
  # with traces in m4's stderr.
  run_m4_trace="$run_m4 $trace_opt -daflq -Derrprint"
  if $initialization; then
    trace_prefiles="$m4_prefiles"
  else
  exec 4>&1
    trace_prefiles="$m4f_prefiles"
  fi
 # Put the real line numbers into configure to make config.log more helpful.
 $AWK '
 /__oline__/ { printf "%d:", NR + 1 }
           { print }
 ' $tmpout | sed '
 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
 ' >&4
  # Run m4 on the input file to get traces.
  #
  # We used to have a simple pipe, which was very convenient as it
  # allows to use traces on never ending expansions (i.e., when
  # debugging :) but it is requires to keep error messages *and*
  # traces in stderr.  This is too fragile, as it results in
  # unexpected data in the output.  autoheader has been fragile to
  # this.
  $verbose "$me: running $run_m4_trace $trace_prefiles $infile -o $tmp/traces" >&2
  $run_m4_trace $trace_prefiles $infile -o $tmp/traces >/dev/null ||
    {
      echo "$me: tracing failed" >&2
      (exit 1); exit 1
    }
  $verbose "$me: running $M4 $tmp/trace.m4" >&2
  sed -f $tmp/trace2m4.sed $tmp/traces |
    # Now we are ready to run m4 to process the trace file.
    if $debug; then
      cat >>$tmp/trace.m4
      $M4 $tmp/trace.m4
    else
      $M4 $tmp/trace.m4 -
    fi |
      # It makes no sense to try to transform __oline__.
      sed '
    	s/@<:@/[/g
    	s/@:>@/]/g
    	s/@S|@/$/g
    	s/@%:@/#/g
    	' >&4 ||
      {
    	echo "$me: traces formatting failed" >&2
    	(exit 1); exit 1
      }
  ;;
 rm -f $tmpout
 exit $status
  ## ------------ ##
  ## Unknown task ##
  ## ------------ ##
  *) echo "$me: internal error: unknown task: $task" >&2
    (exit 1); exit 1
 esac
 (exit $status); exit $status
--- a/autoconf/autoconf.m4f
+++ b/autoconf/autoconf.m4f
--- a/autoconf/config.guess
+++ b/autoconf/config.guess
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 timestamp='2001-09-04'
 timestamp='2001-12-13'
 # 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
@ -24,8 +24,9 @@ timestamp='2001-09-04'
 # 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>.
 # Please send patches to <config-patches@gnu.org>.
 # Originally written by Per Bothner <bothner@cygnus.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
@ -127,29 +128,28 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:NetBSD:*:*)
 	# Netbsd (nbsd) targets should (where applicable) match one or
 	# 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.
 	# Determine the machine/vendor (is the vendor relevant).
 	case "${UNAME_MACHINE}" in
 	    amiga) machine=m68k-unknown ;;
 	    arm32) machine=arm-unknown ;;
 	    atari*) machine=m68k-atari ;;
 	    sun3*) machine=m68k-sun ;;
 	    mac68k) machine=m68k-apple ;;
 	    macppc) machine=powerpc-apple ;;
 	    hp3[0-9][05]) machine=m68k-hp ;;
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
 	    UNAME_MACHINE_ARCH=unknown
 	case "${UNAME_MACHINE_ARCH}" in
 	    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}" in
 	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 	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
@ -172,6 +172,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 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}'`
@ -247,30 +286,9 @@ EOF
    Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	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}
 	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}
 	exit 0 ;;
    *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
@ -333,12 +351,6 @@ EOF
    aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
    sparc*:NetBSD:*)
 	echo `uname -p`-unknown-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
@ -365,18 +377,6 @@ EOF
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
        echo m68k-unknown-mint${UNAME_RELEASE}
        exit 0 ;;
    sun3*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${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 ;;
@ -546,8 +546,6 @@ EOF
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
              case "${HPUX_REV}" in
                11.[0-9][0-9])
 		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`
@ -558,10 +556,10 @@ EOF
                        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 ;;
              esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
 		    sed 's/^              //' << EOF >$dummy.c
@ -664,9 +662,6 @@ EOF
    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 ;;
@ -718,9 +713,6 @@ EOF
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@ -733,9 +725,6 @@ EOF
    *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
    *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
@ -745,6 +734,9 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
    x86:Interix*:3*)
 	echo i386-pc-interix3
 	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
@ -776,10 +768,21 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
    mips:Linux:*:*)
 	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
 	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
 	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
 	esac
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#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=`
 	rm -f $dummy.c
 	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
 	;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@ -852,32 +855,25 @@ EOF
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	cat >$dummy.c <<EOF
 	sed 's/^	//' << EOF >$dummy.c
 	#include <features.h>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	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-pc-linux-gnu\n", argv[1]);
 	LIBC=gnu
 	#  else
    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 	LIBC=gnulibc1
 	#  endif
 	# else
   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 	LIBC=gnulibc1
 	# endif
 	#else
  printf ("%s-pc-linux-gnuaout\n", argv[1]);
 	LIBC=gnuaout
 	#endif
  return 0;
 }
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	rm -f $dummy.c
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
    i*86:DYNIX/ptx:4*:*)
@ -956,7 +952,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
    3[34]??:*:4.0:3.0 | 3[34]??A:*: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 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@ -1065,7 +1061,7 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
    NSR-[KW]:NONSTOP_KERNEL:*:*)
    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    *:NonStop-UX:*:*)
--- a/autoconf/config.sub
+++ b/autoconf/config.sub
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 timestamp='2001-09-07'
 timestamp='2001-12-10'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -29,7 +29,8 @@ timestamp='2001-09-07'
 # 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>.
 # 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.
@ -244,14 +245,13 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| s390 | s390x \
 	| sh | sh[34] | sh[34]eb | shbe | shle \
 	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
 	| stormy16 | strongarm \
 	| strongarm \
 	| tahoe | thumb | tic80 | tron \
 	| v850 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale \
 	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@ -280,6 +280,7 @@ case $basic_machine in
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alphapca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
 	| clipper-* | cray2-* | cydra-* \
@ -302,14 +303,14 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
 	| s390-* | s390x-* \
 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
 	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | vax-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
 	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
 	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@ -418,6 +419,14 @@ case $basic_machine in
 	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
@ -724,7 +733,7 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
 	pentium | p5 | k5 | k6 | nexgen)
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
 	pentiumpro | p6 | 6x86 | athlon)
@ -733,7 +742,7 @@ case $basic_machine in
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@ -784,6 +793,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
 	s390 | s390-*)
 		basic_machine=s390-ibm
 		;;
 	s390x | s390x-*)
 		basic_machine=s390x-ibm
 		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@ -795,7 +810,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
 	sparclite-wrs)
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@ -875,6 +890,10 @@ case $basic_machine in
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
 	toad1)
 		basic_machine=pdp10-xkl
 		os=-tops20
 		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@ -1068,7 +1087,7 @@ case $os in
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos*)
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1120,6 +1139,9 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
 	-atheos*)
 		os=-atheos
 		;;
 	-386bsd)
 		os=-bsd
 		;;
@ -1200,6 +1222,7 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,6 @@
 dnl  AUTOCONF configuration for CLN
 dnl
 dnl  configure.in ---<autoconf>--->> configure
 dnl  configure.ac ---<autoconf>--->> configure
 dnl
 dnl  configure    ---<sh>--->> config.status
 dnl                      --->> include/cln/config.h
@ -68,7 +68,7 @@ dnl
                      dnl libcln depends on libm
 PACKAGE=cln
                      dnl libtool wants PACKAGE
 AM_PROG_LIBTOOL
 AC_PROG_LIBTOOL
                      dnl sets variable LIBTOOL
 dnl Libtool's library version information for CLN.
@ -80,7 +80,7 @@ dnl   CL_CURRENT and set CL_REVISION to 0,
 dnl * if any functions/classes have been added, increment CL_AGE,
 dnl * if backwards compatibility has been broken, set CL_AGE to 0.
 CL_CURRENT=2
 CL_REVISION=2
 CL_REVISION=3
 CL_AGE=0
 dnl make substitutions
 AC_SUBST(CL_CURRENT)
@ -89,7 +89,7 @@ AC_SUBST(CL_AGE)
 dnl release version
 CL_VERSION_MAJOR=1
 CL_VERSION_MINOR=1
 CL_VERSION_PATCHLEVEL=3
 CL_VERSION_PATCHLEVEL=4
 dnl release version for cln/config.h, so it can be tested by the preprocessor
 AC_DEFINE_UNQUOTED(CL_VERSION_MAJOR, $CL_VERSION_MAJOR)
 AC_DEFINE_UNQUOTED(CL_VERSION_MINOR, $CL_VERSION_MINOR)
--- a/doc/cln.tex
+++ b/doc/cln.tex
@ -3393,7 +3393,7 @@ macro is in the file @file{cln.m4} which is installed in
 different @samp{--prefix} than CLN, you will either have to manually
 move @file{cln.m4} to automake's @file{$datadir/aclocal}, or give
 aclocal the @samp{-I} option when running it. Here is a possible example
 to be included in your package's @file{configure.in}:
 to be included in your package's @file{configure.ac}:
@example
 AC_PATH_CLN(1.1.0, [
  LIBS="$LIBS $CLN_LIBS"
--- a/include/cln/config.h.in
+++ b/include/cln/config.h.in
@ -54,6 +54,9 @@
 #ifndef __ia64__
 #undef __ia64__
 #endif
 #ifndef __s390__
 #undef __s390__
 #endif
 /* assembler syntax */
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -64,8 +64,10 @@ top_builddir = ..
 SUBDIR = .
 # Define the search path for sources.
 # The ":" below keeps config.status from removing this line.
 VPATH = $(srcdir)/$(SUBDIR) # :
 # The variable $(aux_srcdir) is needed because new versions of aufoconf tend to
 # remove $(srcdir), ${srcdir} and so on...
 aux_srcdir = @srcdir@
 VPATH = $(aux_srcdir)/$(SUBDIR)
 # Add subdirectory specific flags.
 include $(srcdir)/$(SUBDIR)/Makeflags