From 481cf3f1dc3b7cae9a30d04277b616b1f388aa7b Mon Sep 17 00:00:00 2001
From: chuck <chuck>
Date: Wed, 19 Nov 2008 01:26:52 +0000
Subject: update to libtool 1.5.26 using libtool/patches/manual.README
 procedure: fixes linking problems on darwin (problems with nmedit, see
 http://pogma.com/2008/02/13/nmedit-libtool-exported-symbols/ )

---
 devel/libtool/Makefile.common           |   4 +-
 devel/libtool/distinfo                  |  12 +-
 devel/libtool/patches/manual-libtool.m4 |  77 ++++++------
 devel/libtool/patches/patch-ab          | 161 ++++++++++++------------
 devel/libtool/patches/patch-ad          | 212 ++++++++++++++++++++------------
 5 files changed, 267 insertions(+), 199 deletions(-)

(limited to 'devel/libtool')

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 6c28930fe95..e743c239089 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.72 2007/11/11 11:35:48 martti Exp $
+# $NetBSD: Makefile.common,v 1.73 2008/11/19 01:26:52 chuck Exp $
 
 ###########################################################################
 ###########################################################################
@@ -23,7 +23,7 @@
 ###########################################################################
 ###########################################################################
 
-DISTNAME=	libtool-1.5.24
+DISTNAME=	libtool-1.5.26
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 05642f9b5e1..287aa8083fc 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.71 2007/10/07 13:59:43 joerg Exp $
+$NetBSD: distinfo,v 1.72 2008/11/19 01:26:52 chuck Exp $
 
-SHA1 (libtool-1.5.24.tar.gz) = b4c994f1bf4a76d2b0c1d0a6f54d16598c15f3db
-RMD160 (libtool-1.5.24.tar.gz) = e682fe6570c71d93ad65e0c6c77cb6558846f27d
-Size (libtool-1.5.24.tar.gz) = 2919557 bytes
+SHA1 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a
+RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11
+Size (libtool-1.5.26.tar.gz) = 2961939 bytes
 SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = ee24f61f6825e352c421c3b887cd9cf1eb1884c2
+SHA1 (patch-ab) = 4b3befd3cf5629e3b46b4bd100b697d10089d434
 SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
-SHA1 (patch-ad) = d2f3979009c4d77541ba0df85425e4a20b16564d
+SHA1 (patch-ad) = d3636017fc09a571df6ecb57b7b988867bbbd4ce
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 2a39a94dac2..17289ea4781 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.22 2007/10/07 12:31:59 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.23 2008/11/19 01:26:52 chuck Exp $
 
 Local pkgsrc changes:
 - override the basename to point to the actual backend compiler,
@@ -9,9 +9,9 @@ Local pkgsrc changes:
 - Interix3 support
 - disable static linkage on OS X by default
 
---- libtool.m4.orig	2007-06-24 04:19:11.000000000 +0200
-+++ libtool.m4
-@@ -248,8 +248,11 @@ AC_DEFUN([_LT_CC_BASENAME],
+--- libtool.m4.orig	2008-02-01 11:26:47.000000000 -0500
++++ libtool.m4	2008-11-18 16:37:04.000000000 -0500
+@@ -249,7 +249,10 @@
      *) break;;
    esac
  done
@@ -23,8 +23,7 @@ Local pkgsrc changes:
  ])
  
  
- # _LT_COMPILER_BOILERPLATE
-@@ -402,11 +405,11 @@ else
+@@ -474,11 +477,11 @@
  
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
@@ -38,7 +37,7 @@ Local pkgsrc changes:
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
  	 test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -1351,6 +1354,7 @@ beos*)
+@@ -1427,6 +1430,7 @@
  bsdi[[45]]*)
    version_type=linux
    need_version=no
@@ -46,7 +45,7 @@ Local pkgsrc changes:
    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'
-@@ -1449,7 +1453,7 @@ freebsd1*)
+@@ -1525,7 +1529,7 @@
    dynamic_linker=no
    ;;
  
@@ -55,7 +54,7 @@ Local pkgsrc changes:
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -1463,7 +1467,7 @@ freebsd* | dragonfly*)
+@@ -1539,7 +1543,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -64,7 +63,7 @@ Local pkgsrc changes:
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -1493,6 +1497,16 @@ freebsd* | dragonfly*)
+@@ -1569,6 +1573,16 @@
    esac
    ;;
  
@@ -81,7 +80,7 @@ Local pkgsrc changes:
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -1561,15 +1575,22 @@ interix[[3-9]]*)
+@@ -1637,15 +1651,22 @@
    hardcode_into_libs=yes
    ;;
  
@@ -110,7 +109,7 @@ Local pkgsrc changes:
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1634,11 +1655,11 @@ linux* | k*bsd*-gnu)
+@@ -1710,11 +1731,11 @@
    ;;
  
  netbsd*)
@@ -124,7 +123,7 @@ Local pkgsrc changes:
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -1663,13 +1684,14 @@ nto-qnx*)
+@@ -1739,13 +1760,14 @@
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -140,7 +139,7 @@ Local pkgsrc changes:
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1677,7 +1699,7 @@ openbsd*)
+@@ -1753,7 +1775,7 @@
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -149,7 +148,7 @@ Local pkgsrc changes:
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -1871,9 +1893,7 @@ if test -f "$ltmain" && test -n "$tagnam
+@@ -1954,9 +1976,7 @@
  
        case $tagname in
        CXX)
@@ -160,7 +159,7 @@ Local pkgsrc changes:
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -2392,6 +2412,10 @@ interix[[3-9]]*)
+@@ -2475,6 +2495,10 @@
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
    ;;
  
@@ -171,7 +170,7 @@ Local pkgsrc changes:
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -2422,7 +2446,7 @@ newos6*)
+@@ -2505,7 +2529,7 @@
    ;;
  
  nto-qnx*)
@@ -180,7 +179,7 @@ Local pkgsrc changes:
    ;;
  
  openbsd*)
-@@ -2629,21 +2653,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+@@ -2712,21 +2736,10 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -203,7 +202,7 @@ Local pkgsrc changes:
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -2781,7 +2794,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+@@ -2864,7 +2877,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -212,7 +211,7 @@ Local pkgsrc changes:
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3294,6 +3307,16 @@ case $host_os in
+@@ -3350,6 +3363,16 @@
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
@@ -229,7 +228,7 @@ Local pkgsrc changes:
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -3447,14 +3470,29 @@ case $host_os in
+@@ -3503,14 +3526,29 @@
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -246,7 +245,9 @@ Local pkgsrc changes:
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+-    fi
+-    # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +    elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
 +      # Workaround some broken pre-1.5 ELF toolchains
 +      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
@@ -255,13 +256,11 @@ Local pkgsrc changes:
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      output_verbose_link_cmd='echo'
-     fi
--    # Workaround some broken pre-1.5 toolchains
--    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    fi
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -3767,6 +3805,11 @@ case $host_os in
+@@ -3823,6 +3861,11 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -273,7 +272,7 @@ Local pkgsrc changes:
    *)
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3928,6 +3971,21 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3985,6 +4028,21 @@
      esac
    done
  
@@ -295,8 +294,8 @@ Local pkgsrc changes:
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4966,9 +5024,11 @@ AC_MSG_CHECKING([for $compiler option to
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -5033,9 +5091,11 @@
+ 	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -308,7 +307,7 @@ Local pkgsrc changes:
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4994,6 +5054,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5061,6 +5121,10 @@
  	;;
        esac
        ;;
@@ -319,7 +318,7 @@ Local pkgsrc changes:
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5072,6 +5136,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5139,6 +5203,8 @@
  	# This is c89, which is MS Visual C++ (no shared libs)
  	# Anyone wants to do a port?
  	;;
@@ -328,7 +327,7 @@ Local pkgsrc changes:
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -5211,6 +5277,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5278,6 +5344,8 @@
  	;;
        vxworks*)
  	;;
@@ -337,7 +336,7 @@ Local pkgsrc changes:
        *)
  	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
  	;;
-@@ -5251,9 +5319,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5319,9 +5387,11 @@
        ;;
  
      darwin* | rhapsody*)
@@ -350,7 +349,7 @@ Local pkgsrc changes:
        ;;
  
      interix[[3-9]]*)
-@@ -5287,6 +5357,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5355,6 +5425,11 @@
        esac
        ;;
  
@@ -362,7 +361,7 @@ Local pkgsrc changes:
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5441,6 +5516,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5510,6 +5585,10 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -373,7 +372,7 @@ Local pkgsrc changes:
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
        ;;
-@@ -5719,6 +5798,17 @@ EOF
+@@ -5791,6 +5870,17 @@
        fi
        ;;
  
@@ -391,7 +390,7 @@ Local pkgsrc changes:
      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'
-@@ -5784,6 +5874,11 @@ _LT_EOF
+@@ -5856,6 +5946,11 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
@@ -403,7 +402,7 @@ Local pkgsrc changes:
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6139,6 +6234,21 @@ _LT_EOF
+@@ -6210,6 +6305,21 @@
        fi
        ;;
  
@@ -425,7 +424,7 @@ Local pkgsrc changes:
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -6364,6 +6474,13 @@ _LT_EOF
+@@ -6435,6 +6545,13 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 10f4ed3d93e..58a3de327c6 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
+$NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
 
---- configure.orig	2007-10-05 18:47:50.000000000 +0200
+--- configure.orig	2008-11-18 16:39:10.000000000 -0500
 +++ configure
 @@ -630,11 +630,11 @@ else
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
  	 test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -5258,6 +5258,10 @@ interix[3-9]*)
+@@ -5260,6 +5260,10 @@ interix[3-9]*)
    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
    ;;
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -5288,7 +5292,7 @@ newos6*)
+@@ -5290,7 +5294,7 @@ newos6*)
    ;;
  
  nto-qnx*)
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    ;;
  
  openbsd*)
-@@ -6488,12 +6492,7 @@ fi
+@@ -6494,12 +6498,7 @@ fi
  
  done
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6719,8 +6718,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
+@@ -6725,8 +6724,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
  
  
-@@ -7462,7 +7459,10 @@ for cc_temp in $compiler""; do
+@@ -7467,7 +7464,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -71,7 +71,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
  
  # Only perform the check for file, if the check method requires it
-@@ -7765,9 +7765,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8082,9 +8082,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -84,7 +84,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -7801,6 +7803,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8118,6 +8120,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -96,7 +96,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7955,6 +7962,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8272,6 +8279,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -107,7 +107,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared=no
        ;;
-@@ -8191,7 +8202,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -8509,7 +8520,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
@@ -119,7 +119,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -8360,6 +8374,17 @@ EOF
+@@ -8678,6 +8692,17 @@ EOF
        fi
        ;;
  
@@ -137,7 +137,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -8425,6 +8450,11 @@ _LT_EOF
+@@ -8743,6 +8768,11 @@ _LT_EOF
        hardcode_shlibpath_var=no
        ;;
  
@@ -149,7 +149,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -8892,6 +8922,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9209,6 +9239,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -171,7 +171,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      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'
-@@ -9117,6 +9162,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9434,6 +9479,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -185,7 +185,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        ld_shlibs=no
        ;;
-@@ -9333,6 +9385,7 @@ beos*)
+@@ -9650,6 +9702,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -193,7 +193,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg 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'
-@@ -9431,7 +9484,7 @@ freebsd1*)
+@@ -9748,7 +9801,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -202,7 +202,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -9445,7 +9498,7 @@ freebsd* | dragonfly*)
+@@ -9762,7 +9815,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -211,7 +211,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -9475,6 +9528,16 @@ freebsd* | dragonfly*)
+@@ -9792,6 +9845,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -228,7 +228,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9543,15 +9606,22 @@ interix[3-9]*)
+@@ -9860,15 +9923,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -257,7 +257,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9616,11 +9686,11 @@ linux* | k*bsd*-gnu)
+@@ -9933,11 +10003,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -271,7 +271,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -9645,13 +9715,14 @@ nto-qnx*)
+@@ -9962,13 +10032,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -287,7 +287,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9659,7 +9730,7 @@ openbsd*)
+@@ -9976,7 +10047,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -296,7 +296,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -11229,9 +11300,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11566,9 +11637,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -307,7 +307,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11336,7 +11405,10 @@ for cc_temp in $compiler""; do
+@@ -11674,7 +11743,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -319,7 +319,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
  
  # We don't want -fno-exception wen compiling C++ code, so set the
-@@ -11999,6 +12071,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12309,6 +12381,16 @@ if test -z "$aix_libpath"; then aix_libp
      archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
@@ -336,7 +336,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -12152,14 +12234,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12462,14 +12544,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -368,7 +368,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -12472,6 +12569,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12782,6 +12879,11 @@ if test -z "$aix_libpath"; then aix_libp
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -380,7 +380,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    *)
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
-@@ -12582,6 +12684,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12891,6 +12993,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -402,7 +402,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -12687,9 +12804,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13000,9 +13117,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -415,7 +415,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -12715,6 +12834,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13028,6 +13147,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -426,7 +426,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -12793,6 +12916,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13106,6 +13229,8 @@ echo $ECHO_N "checking for $compiler opt
  	# This is c89, which is MS Visual C++ (no shared libs)
  	# Anyone wants to do a port?
  	;;
@@ -435,7 +435,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -12932,6 +13057,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13245,6 +13370,8 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        vxworks*)
  	;;
@@ -444,7 +444,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        *)
  	lt_prog_compiler_can_build_shared_CXX=no
  	;;
-@@ -13304,6 +13431,7 @@ beos*)
+@@ -13618,6 +13745,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -452,7 +452,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg 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'
-@@ -13401,7 +13529,7 @@ freebsd1*)
+@@ -13715,7 +13843,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -461,7 +461,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -13415,7 +13543,7 @@ freebsd* | dragonfly*)
+@@ -13729,7 +13857,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -470,7 +470,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -13445,6 +13573,16 @@ freebsd* | dragonfly*)
+@@ -13759,6 +13887,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -487,7 +487,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -13513,15 +13651,22 @@ interix[3-9]*)
+@@ -13827,15 +13965,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -516,7 +516,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -13586,11 +13731,11 @@ linux* | k*bsd*-gnu)
+@@ -13900,11 +14045,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -530,7 +530,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -13615,13 +13760,14 @@ nto-qnx*)
+@@ -13929,13 +14074,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -546,7 +546,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13629,7 +13775,7 @@ openbsd*)
+@@ -13943,7 +14089,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -555,7 +555,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -14327,7 +14473,10 @@ for cc_temp in $compiler""; do
+@@ -14661,7 +14807,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -567,7 +567,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
  
  { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-@@ -14408,9 +14557,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14742,9 +14891,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -580,7 +580,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -14444,6 +14595,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14778,6 +14929,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -592,7 +592,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14598,6 +14754,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14932,6 +15088,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -603,7 +603,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_F77=no
        ;;
-@@ -14834,7 +14994,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -15169,7 +15329,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
@@ -615,7 +615,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -15003,6 +15166,17 @@ EOF
+@@ -15338,6 +15501,17 @@ EOF
        fi
        ;;
  
@@ -633,7 +633,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -15068,6 +15242,11 @@ _LT_EOF
+@@ -15403,6 +15577,11 @@ _LT_EOF
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -645,7 +645,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -15515,6 +15694,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15849,6 +16028,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -667,7 +667,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      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'
-@@ -15740,6 +15934,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16074,6 +16268,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -681,7 +681,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        ld_shlibs_F77=no
        ;;
-@@ -15905,6 +16106,7 @@ beos*)
+@@ -16239,6 +16440,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -689,7 +689,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg 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'
-@@ -16002,7 +16204,7 @@ freebsd1*)
+@@ -16336,7 +16538,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -698,7 +698,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -16016,7 +16218,7 @@ freebsd* | dragonfly*)
+@@ -16350,7 +16552,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -707,7 +707,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -16046,6 +16248,16 @@ freebsd* | dragonfly*)
+@@ -16380,6 +16582,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -724,7 +724,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -16114,15 +16326,22 @@ interix[3-9]*)
+@@ -16448,15 +16660,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -753,7 +753,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16187,11 +16406,11 @@ linux* | k*bsd*-gnu)
+@@ -16521,11 +16740,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -767,7 +767,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -16216,13 +16435,14 @@ nto-qnx*)
+@@ -16550,13 +16769,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -783,7 +783,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16230,7 +16450,7 @@ openbsd*)
+@@ -16564,7 +16784,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -792,7 +792,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -16888,7 +17108,10 @@ for cc_temp in $compiler""; do
+@@ -17242,7 +17462,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -804,7 +804,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
  
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -16993,9 +17216,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17347,9 +17570,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -817,7 +817,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -17029,6 +17254,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17383,6 +17608,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -829,7 +829,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -17183,6 +17413,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17537,6 +17767,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -840,7 +840,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_GCJ=no
        ;;
-@@ -17419,7 +17653,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -17774,7 +18008,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
@@ -852,7 +852,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -17588,6 +17825,17 @@ EOF
+@@ -17943,6 +18180,17 @@ EOF
        fi
        ;;
  
@@ -870,7 +870,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17653,6 +17901,11 @@ _LT_EOF
+@@ -18008,6 +18256,11 @@ _LT_EOF
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -882,7 +882,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18120,6 +18373,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18474,6 +18727,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -904,7 +904,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      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'
-@@ -18345,6 +18613,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18699,6 +18967,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -918,7 +918,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      *)
        ld_shlibs_GCJ=no
        ;;
-@@ -18510,6 +18785,7 @@ beos*)
+@@ -18864,6 +19139,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -926,7 +926,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg 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'
-@@ -18607,7 +18883,7 @@ freebsd1*)
+@@ -18961,7 +19237,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -935,7 +935,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -18621,7 +18897,7 @@ freebsd* | dragonfly*)
+@@ -18975,7 +19251,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -944,7 +944,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -18651,6 +18927,16 @@ freebsd* | dragonfly*)
+@@ -19005,6 +19281,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -961,7 +961,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -18719,15 +19005,22 @@ interix[3-9]*)
+@@ -19073,15 +19359,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -990,7 +990,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -18792,11 +19085,11 @@ linux* | k*bsd*-gnu)
+@@ -19146,11 +19439,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -1004,7 +1004,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -18821,13 +19114,14 @@ nto-qnx*)
+@@ -19175,13 +19468,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1020,7 +1020,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -18835,7 +19129,7 @@ openbsd*)
+@@ -19189,7 +19483,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -1029,7 +1029,7 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -19492,7 +19786,10 @@ for cc_temp in $compiler""; do
+@@ -19866,7 +20160,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -1041,3 +1041,12 @@ $NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
  
  lt_cv_prog_compiler_c_o_RC=yes
  
+@@ -21547,7 +21844,7 @@ echo "$as_me: executing $ac_file command
+   # each Makefile.in and add a new line on top of each file to say so.
+   # Grep'ing the whole file is not good either: AIX grep has a line
+   # limit of 2048, but all sed's we know have understand at least 4000.
+-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+     dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 890f68c0b6a..c9c282b24df 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
+$NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
 
---- libltdl/configure.orig	2007-10-05 18:47:59.000000000 +0200
+--- libltdl/configure.orig	2008-11-18 16:39:34.000000000 -0500
 +++ libltdl/configure
 @@ -630,11 +630,11 @@ else
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
  	 test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -4393,6 +4393,10 @@ interix[3-9]*)
+@@ -4395,6 +4395,10 @@ interix[3-9]*)
    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
    ;;
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -4423,7 +4427,7 @@ newos6*)
+@@ -4425,7 +4429,7 @@ newos6*)
    ;;
  
  nto-qnx*)
@@ -36,7 +36,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    ;;
  
  openbsd*)
-@@ -6095,12 +6099,7 @@ else
+@@ -6101,12 +6105,7 @@ else
  fi
  
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6326,8 +6325,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
+@@ -6332,8 +6331,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -59,7 +59,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-@@ -7329,7 +7326,10 @@ for cc_temp in $compiler""; do
+@@ -7334,7 +7331,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -71,7 +71,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
  
  # Only perform the check for file, if the check method requires it
-@@ -7632,9 +7632,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7949,9 +7949,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -84,7 +84,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -7668,6 +7670,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7985,6 +7987,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -96,7 +96,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7822,6 +7829,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8139,6 +8146,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -107,7 +107,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared=no
        ;;
-@@ -8058,7 +8069,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -8376,7 +8387,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
@@ -119,7 +119,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -8227,6 +8241,17 @@ EOF
+@@ -8545,6 +8559,17 @@ EOF
        fi
        ;;
  
@@ -137,7 +137,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -8292,6 +8317,11 @@ _LT_EOF
+@@ -8610,6 +8635,11 @@ _LT_EOF
        hardcode_shlibpath_var=no
        ;;
  
@@ -149,7 +149,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -8759,6 +8789,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9076,6 +9106,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -171,7 +171,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      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'
-@@ -8984,6 +9029,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9301,6 +9346,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -185,7 +185,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        ld_shlibs=no
        ;;
-@@ -9200,6 +9252,7 @@ beos*)
+@@ -9517,6 +9569,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -193,7 +193,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg 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'
-@@ -9298,7 +9351,7 @@ freebsd1*)
+@@ -9615,7 +9668,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -202,7 +202,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -9312,7 +9365,7 @@ freebsd* | dragonfly*)
+@@ -9629,7 +9682,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -211,7 +211,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -9342,6 +9395,16 @@ freebsd* | dragonfly*)
+@@ -9659,6 +9712,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -228,7 +228,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9410,15 +9473,22 @@ interix[3-9]*)
+@@ -9727,15 +9790,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -257,7 +257,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9483,11 +9553,11 @@ linux* | k*bsd*-gnu)
+@@ -9800,11 +9870,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -271,7 +271,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -9512,13 +9582,14 @@ nto-qnx*)
+@@ -9829,13 +9899,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -287,7 +287,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9526,7 +9597,7 @@ openbsd*)
+@@ -9843,7 +9914,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -296,7 +296,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -11096,9 +11167,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11433,9 +11504,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -307,7 +307,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11203,7 +11272,10 @@ for cc_temp in $compiler""; do
+@@ -11541,7 +11610,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -319,7 +319,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
  
  # We don't want -fno-exception wen compiling C++ code, so set the
-@@ -11866,6 +11938,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12176,6 +12248,16 @@ if test -z "$aix_libpath"; then aix_libp
      archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
@@ -336,7 +336,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -12019,14 +12101,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12329,14 +12411,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -368,7 +368,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -12339,6 +12436,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12649,6 +12746,11 @@ if test -z "$aix_libpath"; then aix_libp
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -380,7 +380,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    *)
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
-@@ -12449,6 +12551,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12758,6 +12860,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -402,7 +402,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -12554,9 +12671,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12867,9 +12984,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -415,7 +415,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -12582,6 +12701,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12895,6 +13014,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -426,7 +426,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -12660,6 +12783,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12973,6 +13096,8 @@ echo $ECHO_N "checking for $compiler opt
  	# This is c89, which is MS Visual C++ (no shared libs)
  	# Anyone wants to do a port?
  	;;
@@ -435,7 +435,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -12799,6 +12924,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13112,6 +13237,8 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        vxworks*)
  	;;
@@ -444,7 +444,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        *)
  	lt_prog_compiler_can_build_shared_CXX=no
  	;;
-@@ -13171,6 +13298,7 @@ beos*)
+@@ -13485,6 +13612,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -452,7 +452,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg 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'
-@@ -13268,7 +13396,7 @@ freebsd1*)
+@@ -13582,7 +13710,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -461,7 +461,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -13282,7 +13410,7 @@ freebsd* | dragonfly*)
+@@ -13596,7 +13724,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -470,7 +470,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -13312,6 +13440,16 @@ freebsd* | dragonfly*)
+@@ -13626,6 +13754,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -487,7 +487,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -13380,15 +13518,22 @@ interix[3-9]*)
+@@ -13694,15 +13832,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -516,7 +516,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -13453,11 +13598,11 @@ linux* | k*bsd*-gnu)
+@@ -13767,11 +13912,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -530,7 +530,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -13482,13 +13627,14 @@ nto-qnx*)
+@@ -13796,13 +13941,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -546,7 +546,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13496,7 +13642,7 @@ openbsd*)
+@@ -13810,7 +13956,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -555,7 +555,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -14194,7 +14340,10 @@ for cc_temp in $compiler""; do
+@@ -14528,7 +14674,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -567,7 +567,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
  
  { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-@@ -14275,9 +14424,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14609,9 +14758,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -580,7 +580,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -14311,6 +14462,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14645,6 +14796,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -592,7 +592,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14465,6 +14621,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14799,6 +14955,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -603,7 +603,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_F77=no
        ;;
-@@ -14701,7 +14861,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -15036,7 +15196,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
@@ -615,7 +615,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -14870,6 +15033,17 @@ EOF
+@@ -15205,6 +15368,17 @@ EOF
        fi
        ;;
  
@@ -633,7 +633,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14935,6 +15109,11 @@ _LT_EOF
+@@ -15270,6 +15444,11 @@ _LT_EOF
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -645,7 +645,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -15382,6 +15561,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15716,6 +15895,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -667,7 +667,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      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'
-@@ -15607,6 +15801,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15941,6 +16135,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -681,7 +681,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        ld_shlibs_F77=no
        ;;
-@@ -15772,6 +15973,7 @@ beos*)
+@@ -16106,6 +16307,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -689,7 +689,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg 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'
-@@ -15869,7 +16071,7 @@ freebsd1*)
+@@ -16203,7 +16405,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -698,7 +698,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -15883,7 +16085,7 @@ freebsd* | dragonfly*)
+@@ -16217,7 +16419,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -707,7 +707,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -15913,6 +16115,16 @@ freebsd* | dragonfly*)
+@@ -16247,6 +16449,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -724,7 +724,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -15981,15 +16193,22 @@ interix[3-9]*)
+@@ -16315,15 +16527,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -753,7 +753,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16054,11 +16273,11 @@ linux* | k*bsd*-gnu)
+@@ -16388,11 +16607,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -767,7 +767,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -16083,13 +16302,14 @@ nto-qnx*)
+@@ -16417,13 +16636,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -783,7 +783,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16097,7 +16317,7 @@ openbsd*)
+@@ -16431,7 +16651,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -792,7 +792,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -16755,7 +16975,10 @@ for cc_temp in $compiler""; do
+@@ -17109,7 +17329,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -804,7 +804,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
  
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -16860,9 +17083,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17214,9 +17437,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -817,7 +817,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -16896,6 +17121,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17250,6 +17475,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -829,7 +829,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -17050,6 +17280,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17404,6 +17634,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -840,7 +840,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_GCJ=no
        ;;
-@@ -17286,7 +17520,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -17641,7 +17875,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
@@ -852,7 +852,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -17455,6 +17692,17 @@ EOF
+@@ -17810,6 +18047,17 @@ EOF
        fi
        ;;
  
@@ -870,7 +870,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17520,6 +17768,11 @@ _LT_EOF
+@@ -17875,6 +18123,11 @@ _LT_EOF
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -882,7 +882,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -17987,6 +18240,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18341,6 +18594,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -904,7 +904,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      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'
-@@ -18212,6 +18480,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18566,6 +18834,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -918,7 +918,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      *)
        ld_shlibs_GCJ=no
        ;;
-@@ -18377,6 +18652,7 @@ beos*)
+@@ -18731,6 +19006,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -926,7 +926,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg 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'
-@@ -18474,7 +18750,7 @@ freebsd1*)
+@@ -18828,7 +19104,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -935,7 +935,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -18488,7 +18764,7 @@ freebsd* | dragonfly*)
+@@ -18842,7 +19118,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -944,7 +944,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -18518,6 +18794,16 @@ freebsd* | dragonfly*)
+@@ -18872,6 +19148,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -961,7 +961,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -18586,15 +18872,22 @@ interix[3-9]*)
+@@ -18940,15 +19226,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -990,7 +990,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -18659,11 +18952,11 @@ linux* | k*bsd*-gnu)
+@@ -19013,11 +19306,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -1004,7 +1004,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -18688,13 +18981,14 @@ nto-qnx*)
+@@ -19042,13 +19335,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1020,7 +1020,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -18702,7 +18996,7 @@ openbsd*)
+@@ -19056,7 +19350,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -1029,7 +1029,7 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -19359,7 +19653,10 @@ for cc_temp in $compiler""; do
+@@ -19733,7 +20027,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -1041,3 +1041,63 @@ $NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
  
  lt_cv_prog_compiler_c_o_RC=yes
  
+@@ -21414,7 +21711,7 @@ else
+     # we want this `case' here to explicitly catch those versions.
+     libltdl_cv_sys_dlopen_deplibs=unknown
+     ;;
+-  aix[4-9]*)
++  aix[45]*)
+     libltdl_cv_sys_dlopen_deplibs=yes
+     ;;
+   darwin*)
+@@ -21422,10 +21719,7 @@ else
+     # If you are looking for one http://www.opendarwin.org/projects/dlcompat
+     libltdl_cv_sys_dlopen_deplibs=yes
+     ;;
+-  freebsd* | dragonfly*)
+-    libltdl_cv_sys_dlopen_deplibs=yes
+-    ;;
+-  gnu* | linux* | k*bsd*-gnu)
++  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
+     # GNU and its variants, using gnu ld.so (Glibc)
+     libltdl_cv_sys_dlopen_deplibs=yes
+     ;;
+@@ -23981,22 +24275,21 @@ echo "$as_me: $ac_file is unchanged" >&6
+   fi
+   rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
+-_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+   case $_am_header in
+-    $_am_arg | $_am_arg:* )
++    $ac_file | $ac_file:* )
+       break ;;
+     * )
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+-	 X"$_am_arg" : 'X\(//\)$' \| \
+-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X"$_am_arg" |
++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
++$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X$ac_file : 'X\(//\)[^/]' \| \
++	 X$ac_file : 'X\(//\)$' \| \
++	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
++echo X$ac_file |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -24033,7 +24326,7 @@ echo "$as_me: executing $ac_file command
+   # each Makefile.in and add a new line on top of each file to say so.
+   # Grep'ing the whole file is not good either: AIX grep has a line
+   # limit of 2048, but all sed's we know have understand at least 4000.
+-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+     dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
-- 
cgit v1.2.3