Update Interix support once more (deliberately no PKGREVISION bump);

add a random image base address for shlibs that's more likely to be "out
of the way" from the rest of the OS and application.

4 files changed, 284 insertions, 200 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index d46205400f6..03b5f73936c 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2004/04/21 14:55:32 tv Exp $
+$NetBSD: distinfo,v 1.41 2004/04/21 19:24:49 tv Exp $
 
 SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260
 Size (libtool-1.5.2.tar.gz) = 2653072 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = ef15cd8d1436719d2c4715ceb139474ce3e81a30
+SHA1 (patch-ab) = 9579b82ec97663665f1cfc6e61f965f95b0e0b95
 SHA1 (patch-ac) = b09fb38a59875a60bb51c9fb487e940521a71715
-SHA1 (patch-ad) = 2fdd8d3bd276bdadf25811b5b102c823adeced34
+SHA1 (patch-ad) = 97be231b803d8a058dfa11930f3314126837ed35
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 494398d9a00..a2838c9f854 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.2 2004/04/21 14:55:32 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.3 2004/04/21 19:24:49 tv Exp $
 
 --- libtool.m4.orig	Fri Jan 23 01:07:04 2004
 +++ libtool.m4
@@ -194,30 +194,42 @@ $NetBSD: manual-libtool.m4,v 1.2 2004/04/21 14:55:32 tv Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5131,6 +5176,11 @@ EOF
+@@ -5131,6 +5176,17 @@ EOF
        fi
        ;;
  
 +    interix3*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      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'
-@@ -5534,6 +5584,14 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5534,6 +5590,20 @@ $echo "local: *; };" >> $output_objdir/$
  	  ;;
  	esac
        fi
 +      ;;
 +
 +    interix3*)
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 +      _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 -o $lib $libobjs $deplibs $compiler_flags'
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
      irix5* | irix6* | nonstopux*)
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index f7ddcc2f832..51a61603fc8 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
+$NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
 
 --- configure.orig	Sun Jan 25 07:36:38 2004
 +++ configure
@@ -252,19 +252,25 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7243,6 +7275,11 @@ EOF
+@@ -7243,6 +7275,17 @@ EOF
        fi
        ;;
  
 +    interix3*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7457,7 +7494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7457,7 +7500,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -274,7 +280,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7517,7 +7555,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7517,7 +7561,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -284,22 +290,28 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7748,6 +7787,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7748,6 +7793,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
 +    interix3*)
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      export_dynamic_flag_spec='${wl}-E'
 +      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec='${wl}-h,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
++      hardcode_shlibpath_var=no
 +      ;;
 +
      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'
-@@ -8136,8 +8183,9 @@ beos*)
+@@ -8136,8 +8195,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -310,7 +322,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -8253,15 +8301,15 @@ kfreebsd*-gnu)
+@@ -8253,15 +8313,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -332,7 +344,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -8337,15 +8385,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8337,15 +8397,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -361,7 +373,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8381,7 +8436,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8381,7 +8448,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -370,7 +382,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8505,7 +8560,7 @@ sco3.2v5*)
+@@ -8505,7 +8572,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -379,7 +391,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8708,7 +8763,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8708,7 +8775,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -389,7 +401,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8811,7 +8867,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8811,7 +8879,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -399,7 +411,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8876,7 +8933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8876,7 +8945,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -409,7 +421,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8969,7 +9027,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8969,7 +9039,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -419,7 +431,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9034,7 +9093,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9034,7 +9105,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -429,7 +441,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9100,7 +9160,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9100,7 +9172,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -439,7 +451,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9166,7 +9227,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9166,7 +9239,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -449,7 +461,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10411,7 +10473,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -10411,7 +10485,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -459,7 +471,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10472,7 +10535,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -10472,7 +10547,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -469,7 +481,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10746,6 +10810,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10746,6 +10822,8 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -478,7 +490,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10854,6 +10920,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10854,6 +10932,13 @@ if test -z "$aix_libpath"; then aix_libp
      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=
@@ -492,7 +504,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11226,6 +11299,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11226,6 +11311,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -507,7 +519,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11273,9 +11354,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11273,9 +11366,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -520,7 +532,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11297,6 +11380,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11297,6 +11392,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -531,7 +543,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11361,6 +11448,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11361,6 +11460,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -540,7 +552,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11829,8 +11918,9 @@ beos*)
+@@ -11829,8 +11930,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -551,7 +563,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -11946,15 +12036,15 @@ kfreebsd*-gnu)
+@@ -11946,15 +12048,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -573,7 +585,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -12030,15 +12120,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12030,15 +12132,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -602,7 +614,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12074,7 +12171,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12074,7 +12183,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -611,7 +623,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12198,7 +12295,7 @@ sco3.2v5*)
+@@ -12198,7 +12307,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -620,7 +632,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12401,7 +12498,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12401,7 +12510,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -630,7 +642,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12504,7 +12602,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12504,7 +12614,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -640,7 +652,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12569,7 +12668,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12569,7 +12680,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -650,7 +662,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12662,7 +12762,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12662,7 +12774,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -660,7 +672,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12727,7 +12828,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12727,7 +12840,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -670,7 +682,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12793,7 +12895,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12793,7 +12907,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -680,7 +692,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12859,7 +12962,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12859,7 +12974,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -690,7 +702,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13721,6 +13825,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13721,6 +13837,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -702,19 +714,25 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14096,6 +14205,11 @@ EOF
+@@ -14096,6 +14217,17 @@ EOF
        fi
        ;;
  
 +    interix3*)
-+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14300,7 +14414,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -14300,7 +14432,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -724,7 +742,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14350,7 +14465,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -14350,7 +14483,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -734,22 +752,28 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14581,6 +14697,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14581,6 +14715,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
 +    interix3*)
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
-+      export_dynamic_flag_spec_F77='${wl}-E'
++      hardcode_shlibpath_var_F77=no
 +      ;;
 +
      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'
-@@ -14969,8 +15093,9 @@ beos*)
+@@ -14969,8 +15117,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -760,7 +784,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -15086,15 +15211,15 @@ kfreebsd*-gnu)
+@@ -15086,15 +15235,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -782,7 +806,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15170,15 +15295,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15170,15 +15319,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -811,7 +835,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15214,7 +15346,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15214,7 +15370,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -820,7 +844,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15338,7 +15470,7 @@ sco3.2v5*)
+@@ -15338,7 +15494,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -829,7 +853,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -16050,6 +16182,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16050,6 +16206,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -841,19 +865,25 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16425,6 +16562,11 @@ EOF
+@@ -16425,6 +16586,17 @@ EOF
        fi
        ;;
  
 +    interix3*)
-+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16639,7 +16781,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16639,7 +16811,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -863,7 +893,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16699,7 +16842,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16699,7 +16872,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -873,22 +903,28 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16930,6 +17074,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16930,6 +17104,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
 +    interix3*)
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
-+      export_dynamic_flag_spec_GCJ='${wl}-E'
++      hardcode_shlibpath_var_GCJ=no
 +      ;;
 +
      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'
-@@ -17318,8 +17470,9 @@ beos*)
+@@ -17318,8 +17506,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -899,7 +935,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -17435,15 +17588,15 @@ kfreebsd*-gnu)
+@@ -17435,15 +17624,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -921,7 +957,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17519,15 +17672,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17519,15 +17708,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -950,7 +986,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17563,7 +17723,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -17563,7 +17759,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -959,7 +995,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17687,7 +17847,7 @@ sco3.2v5*)
+@@ -17687,7 +17883,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -968,7 +1004,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17890,7 +18050,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17890,7 +18086,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -978,7 +1014,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17993,7 +18154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17993,7 +18190,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -988,7 +1024,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18058,7 +18220,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18058,7 +18256,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -998,7 +1034,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18151,7 +18314,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18151,7 +18350,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1008,7 +1044,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18216,7 +18380,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18216,7 +18416,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1018,7 +1054,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18282,7 +18447,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18282,7 +18483,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1028,7 +1064,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18348,7 +18514,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18348,7 +18550,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1038,7 +1074,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20503,6 +20670,11 @@ esac
+@@ -20503,6 +20706,11 @@ esac
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -1050,7 +1086,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
    # 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.  */
-@@ -20541,12 +20713,6 @@ echo "$as_me: error: cannot find input f
+@@ -20541,12 +20749,6 @@ echo "$as_me: error: cannot find input f
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -1063,7 +1099,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-@@ -20718,14 +20884,14 @@ echo X"$mf" |
+@@ -20718,14 +20920,14 @@ echo X"$mf" |
    grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
    # Extract the definition of DEP_FILES from the Makefile without
    # running `make'.
@@ -1081,7 +1117,7 @@ $NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
      /^DEP_FILES = .*\\\\$/ {
        s/^DEP_FILES = //
        :loop
-@@ -20987,7 +21153,7 @@ echo "$as_me: error: $ac_sub_configure f
+@@ -20987,7 +21189,7 @@ echo "$as_me: error: $ac_sub_configure f
     { (exit 1); exit 1; }; }
      fi
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index fa55362a172..a8da2c5a8bb 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
+$NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $
 
 --- libltdl/configure.orig	Sun Jan 25 07:36:58 2004
 +++ libltdl/configure
@@ -272,19 +272,25 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7148,6 +7182,11 @@ EOF
+@@ -7148,6 +7182,17 @@ EOF
        fi
        ;;
  
 +    interix3*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7362,7 +7401,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7362,7 +7407,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -294,7 +300,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7422,7 +7462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7422,7 +7468,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -304,22 +310,28 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7653,6 +7694,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7653,6 +7700,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
 +    interix3*)
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      export_dynamic_flag_spec='${wl}-E'
 +      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec='${wl}-h,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
++      hardcode_shlibpath_var=no
 +      ;;
 +
      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'
-@@ -8041,8 +8090,9 @@ beos*)
+@@ -8041,8 +8102,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -330,7 +342,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -8158,15 +8208,15 @@ kfreebsd*-gnu)
+@@ -8158,15 +8220,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -352,7 +364,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -8242,15 +8292,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8242,15 +8304,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -381,7 +393,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8286,7 +8343,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8286,7 +8355,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -390,7 +402,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8410,7 +8467,7 @@ sco3.2v5*)
+@@ -8410,7 +8479,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -399,7 +411,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8613,7 +8670,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8613,7 +8682,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -409,7 +421,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8716,7 +8774,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8716,7 +8786,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -419,7 +431,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8781,7 +8840,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8781,7 +8852,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -429,7 +441,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8874,7 +8934,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8874,7 +8946,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -439,7 +451,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8939,7 +9000,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8939,7 +9012,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -449,7 +461,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9005,7 +9067,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9005,7 +9079,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -459,7 +471,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9071,7 +9134,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9071,7 +9146,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -469,7 +481,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10316,7 +10380,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -10316,7 +10392,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -479,7 +491,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10377,7 +10442,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -10377,7 +10454,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -489,7 +501,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10651,6 +10717,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10651,6 +10729,8 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -498,7 +510,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10759,6 +10827,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10759,6 +10839,13 @@ if test -z "$aix_libpath"; then aix_libp
      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=
@@ -512,7 +524,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11131,6 +11206,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11131,6 +11218,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -527,7 +539,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11178,9 +11261,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11178,9 +11273,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -540,7 +552,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11202,6 +11287,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11202,6 +11299,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -551,7 +563,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11266,6 +11355,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11266,6 +11367,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -560,7 +572,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11734,8 +11825,9 @@ beos*)
+@@ -11734,8 +11837,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -571,7 +583,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -11851,15 +11943,15 @@ kfreebsd*-gnu)
+@@ -11851,15 +11955,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -593,7 +605,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -11935,15 +12027,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -11935,15 +12039,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -622,7 +634,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -11979,7 +12078,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -11979,7 +12090,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -631,7 +643,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12103,7 +12202,7 @@ sco3.2v5*)
+@@ -12103,7 +12214,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -640,7 +652,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12306,7 +12405,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12306,7 +12417,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -650,7 +662,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12409,7 +12509,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12409,7 +12521,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -660,7 +672,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12474,7 +12575,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12474,7 +12587,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -670,7 +682,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12567,7 +12669,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12567,7 +12681,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -680,7 +692,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12632,7 +12735,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12632,7 +12747,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -690,7 +702,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12698,7 +12802,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12698,7 +12814,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -700,7 +712,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12764,7 +12869,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -12764,7 +12881,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -710,7 +722,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13626,6 +13732,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13626,6 +13744,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -722,19 +734,25 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14001,6 +14112,11 @@ EOF
+@@ -14001,6 +14124,17 @@ EOF
        fi
        ;;
  
 +    interix3*)
-+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14205,7 +14321,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -14205,7 +14339,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -744,7 +762,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14255,7 +14372,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -14255,7 +14390,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -754,22 +772,28 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14486,6 +14604,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14486,6 +14622,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
 +    interix3*)
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
-+      export_dynamic_flag_spec_F77='${wl}-E'
++      hardcode_shlibpath_var_F77=no
 +      ;;
 +
      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'
-@@ -14874,8 +15000,9 @@ beos*)
+@@ -14874,8 +15024,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -780,7 +804,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -14991,15 +15118,15 @@ kfreebsd*-gnu)
+@@ -14991,15 +15142,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -802,7 +826,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15075,15 +15202,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15075,15 +15226,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -831,7 +855,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15119,7 +15253,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15119,7 +15277,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -840,7 +864,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15243,7 +15377,7 @@ sco3.2v5*)
+@@ -15243,7 +15401,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -849,7 +873,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15955,6 +16089,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -15955,6 +16113,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -861,19 +885,25 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16330,6 +16469,11 @@ EOF
+@@ -16330,6 +16493,17 @@ EOF
        fi
        ;;
  
 +    interix3*)
-+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16544,7 +16688,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16544,7 +16718,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -883,7 +913,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16604,7 +16749,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16604,7 +16779,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -893,22 +923,28 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16835,6 +16981,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16835,6 +17011,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
 +    interix3*)
++      # Oy, what a hack.
++      # Because shlibs are not compiled -fPIC due to broken code, we must
++      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++      # all libraries, leading to runtime relocations -- slow and very
++      # memory consuming.  To do this, we pick a random 256KB-aligned
++      # start address between 0x50000000 and 0x6ffc0000 at link time.
++      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
-+      export_dynamic_flag_spec_GCJ='${wl}-E'
++      hardcode_shlibpath_var_GCJ=no
 +      ;;
 +
      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'
-@@ -17223,8 +17377,9 @@ beos*)
+@@ -17223,8 +17413,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -919,7 +955,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    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'
-@@ -17340,15 +17495,15 @@ kfreebsd*-gnu)
+@@ -17340,15 +17531,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -941,7 +977,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17424,15 +17579,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17424,15 +17615,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -970,7 +1006,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17468,7 +17630,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -17468,7 +17666,7 @@ linux*oldld* | linux*aout* | linux*coff*
  
  # This must be Linux ELF.
  linux*)
@@ -979,7 +1015,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17592,7 +17754,7 @@ sco3.2v5*)
+@@ -17592,7 +17790,7 @@ sco3.2v5*)
    ;;
  
  solaris*)
@@ -988,7 +1024,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17795,7 +17957,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17795,7 +17993,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -998,7 +1034,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17898,7 +18061,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17898,7 +18097,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1008,7 +1044,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17963,7 +18127,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17963,7 +18163,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1018,7 +1054,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18056,7 +18221,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18056,7 +18257,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1028,7 +1064,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18121,7 +18287,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18121,7 +18323,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1038,7 +1074,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18187,7 +18354,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18187,7 +18390,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1048,7 +1084,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18253,7 +18421,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -18253,7 +18457,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1058,7 +1094,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19482,7 +19651,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -19482,7 +19687,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1068,7 +1104,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19554,7 +19724,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -19554,7 +19760,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1078,7 +1114,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19608,7 +19779,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -19608,7 +19815,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1088,7 +1124,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19679,7 +19851,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -19679,7 +19887,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1098,7 +1134,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19733,7 +19906,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -19733,7 +19942,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1108,7 +1144,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19985,7 +20159,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -19985,7 +20195,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1118,7 +1154,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20054,7 +20229,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20054,7 +20265,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1128,7 +1164,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20125,7 +20301,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20125,7 +20337,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1138,7 +1174,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20185,7 +20362,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20185,7 +20398,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1148,7 +1184,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20244,7 +20422,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20244,7 +20458,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1158,7 +1194,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20315,7 +20494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20315,7 +20530,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1168,7 +1204,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20413,7 +20593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20413,7 +20629,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1178,7 +1214,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20538,7 +20719,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20538,7 +20755,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1188,7 +1224,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20859,7 +21041,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -20859,7 +21077,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1198,7 +1234,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21010,7 +21193,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -21010,7 +21229,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1208,7 +1244,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21122,7 +21306,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21122,7 +21342,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1218,7 +1254,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21215,7 +21400,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -21215,7 +21436,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1228,7 +1264,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21367,7 +21553,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -21367,7 +21589,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1238,7 +1274,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21517,7 +21704,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -21517,7 +21740,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1248,7 +1284,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21703,7 +21891,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21703,7 +21927,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1258,7 +1294,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21805,7 +21994,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21805,7 +22030,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1268,7 +1304,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21907,7 +22097,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21907,7 +22133,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1278,7 +1314,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22009,7 +22200,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -22009,7 +22236,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1288,7 +1324,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22112,7 +22304,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -22112,7 +22340,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1298,7 +1334,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23053,6 +23246,11 @@ esac
+@@ -23053,6 +23282,11 @@ esac
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -1310,7 +1346,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
    # 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.  */
-@@ -23091,12 +23289,6 @@ echo "$as_me: error: cannot find input f
+@@ -23091,12 +23325,6 @@ echo "$as_me: error: cannot find input f
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -1323,7 +1359,7 @@ $NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-@@ -23513,14 +23705,14 @@ echo X"$mf" |
+@@ -23513,14 +23741,14 @@ echo X"$mf" |
    grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
    # Extract the definition of DEP_FILES from the Makefile without
    # running `make'.