Backport Haiku support, taken from upstream.

(I'm using this patch over 10 months).

5 files changed, 441 insertions, 109 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 527066031bb..475daec9cc9 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.80 2010/03/17 10:59:44 markd Exp $
+$NetBSD: distinfo,v 1.81 2011/03/23 15:46:36 obache Exp $
 
 SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55
 RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef
 Size (libtool-2.2.6b.tar.gz) = 2347317 bytes
 SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751
-SHA1 (patch-ab) = 39bce4c6a4bcfb9f6e20c06742e2a9897f40cac8
-SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65
-SHA1 (patch-ad) = 51ede8bef293d566cd359efa52e6cd04f4a380ec
+SHA1 (patch-ab) = 5944c9a00a964c08e37734af177763f81fa15fb8
+SHA1 (patch-ac) = 95e9aed6036cd98075af6fed4a53ecdd58e1e84c
+SHA1 (patch-ad) = b2a60570d0eec011adc4a662249fd22975487d86
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 63632286103..29fa4f9e9a8 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,6 +1,6 @@
-$NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
+$NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
 
---- libltdl/m4/libtool.m4.orig	2008-09-05 13:54:41.000000000 +0200
+--- libltdl/m4/libtool.m4.orig	2009-11-16 13:11:59.000000000 +0000
 +++ libltdl/m4/libtool.m4
 @@ -118,7 +118,10 @@ m4_defun([_LT_CC_BASENAME],
      *) break;;
@@ -82,7 +82,27 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -2405,12 +2425,7 @@ interix[[3-9]]*)
+@@ -2344,6 +2364,19 @@ gnu*)
+   hardcode_into_libs=yes
+   ;;
+ 
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
++  hardcode_into_libs=yes
++  ;;
++
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -2405,12 +2438,7 @@ interix[[3-9]]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -96,7 +116,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -2486,15 +2501,14 @@ linux* | k*bsd*-gnu)
+@@ -2486,15 +2514,14 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -115,7 +135,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -2523,7 +2537,7 @@ newsos6)
+@@ -2523,7 +2550,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -124,7 +144,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd 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.
-@@ -2531,7 +2545,7 @@ openbsd*)
+@@ -2531,7 +2558,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -133,7 +153,18 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd 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
-@@ -3091,7 +3105,7 @@ newos6*)
+@@ -3038,6 +3065,10 @@ gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++haiku*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case $host_cpu in
+@@ -3091,7 +3122,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -142,7 +173,16 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
    ;;
  
  openbsd*)
-@@ -3580,9 +3594,15 @@ m4_if([$1], [CXX], [
+@@ -3256,7 +3287,7 @@ AC_DEFUN([LT_LIB_M],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3580,14 +3611,25 @@ m4_if([$1], [CXX], [
  	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
        ;;
      darwin* | rhapsody*)
@@ -159,7 +199,17 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -3650,6 +3670,9 @@ m4_if([$1], [CXX], [
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)=
++      ;;
+     interix[[3-9]]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+@@ -3650,6 +3692,9 @@ m4_if([$1], [CXX], [
  	    ;;
  	esac
  	;;
@@ -169,7 +219,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -3888,9 +3911,11 @@ m4_if([$1], [CXX], [
+@@ -3888,9 +3933,17 @@ m4_if([$1], [CXX], [
        ;;
  
      darwin* | rhapsody*)
@@ -179,10 +229,16 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
        # Common symbols not allowed in MH_DYLIB files
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=''
++      ;;
++
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)=
        ;;
  
      hpux*)
-@@ -3912,6 +3937,13 @@ m4_if([$1], [CXX], [
+@@ -3912,6 +3965,13 @@ m4_if([$1], [CXX], [
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -196,7 +252,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -4110,6 +4142,9 @@ m4_if([$1], [CXX], [
+@@ -4110,6 +4170,9 @@ m4_if([$1], [CXX], [
  ])
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -206,7 +262,19 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -4429,7 +4464,7 @@ _LT_EOF
+@@ -4343,6 +4406,11 @@ _LT_EOF
+       fi
+       ;;
+ 
++    haiku*)
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
+     interix[[3-9]]*)
+       _LT_TAGVAR(hardcode_direct, $1)=no
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -4429,7 +4497,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -215,7 +283,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -4861,6 +4896,8 @@ _LT_EOF
+@@ -4861,6 +4929,8 @@ _LT_EOF
        ;;
  
      *nto* | *qnx*)
@@ -224,7 +292,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
        ;;
  
      openbsd*)
-@@ -5318,9 +5355,7 @@ m4_defun([_LT_PROG_CXX],
+@@ -5318,9 +5388,7 @@ m4_defun([_LT_PROG_CXX],
  [
  pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
  AC_PROG_CXX
@@ -235,7 +303,19 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -6008,18 +6043,37 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -5685,6 +5753,11 @@ if test "$_lt_caught_CXX_error" != yes; 
+       gnu*)
+         ;;
+ 
++      haiku*)
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(link_all_deplibs, $1)=yes
++        ;;
++
+       hpux9*)
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -6008,18 +6081,37 @@ if test "$_lt_caught_CXX_error" != yes; 
  
        netbsd*)
          if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
@@ -277,7 +357,7 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $
  	;;
  
        openbsd2*)
-@@ -6481,6 +6535,11 @@ $RM -f confest.$objext
+@@ -6481,6 +6573,11 @@ $RM -f confest.$objext
  # PORTME: override above test on systems where it is broken
  m4_if([$1], [CXX],
  [case $host_os in
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index b6e60e3dadb..e0465386ca8 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.68 2010/03/17 10:59:45 markd Exp $
+$NetBSD: patch-ab,v 1.69 2011/03/23 15:46:36 obache Exp $
 
 The last two chunks work around bugs in ksh on NetBSD.
 The problem manifests with wl and no_builtin_flag containing newlines.
 
---- configure.orig	2009-11-16 13:14:55.000000000 +0000
+--- configure.orig	2010-06-19 07:24:20.000000000 +0000
 +++ configure
 @@ -5293,6 +5293,13 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -19,7 +19,18 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-@@ -5718,7 +5725,7 @@ newos6*)
+@@ -5665,6 +5672,10 @@ gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++haiku*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case $host_cpu in
+@@ -5718,7 +5729,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -28,7 +39,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    ;;
  
  openbsd*)
-@@ -7900,7 +7907,10 @@ for cc_temp in $compiler""; do
+@@ -7900,7 +7911,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -40,7 +51,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
  # Only perform the check for file, if the check method requires it
-@@ -8210,9 +8220,11 @@ $as_echo_n "checking for $compiler optio
+@@ -8210,9 +8224,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -50,10 +61,16 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic='-fno-common'
 +      lt_prog_compiler_static=''
++      ;;
++
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static=
        ;;
  
      hpux*)
-@@ -8234,6 +8246,13 @@ $as_echo_n "checking for $compiler optio
+@@ -8234,6 +8256,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -67,7 +84,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -8431,6 +8450,9 @@ $as_echo_n "checking for $compiler optio
+@@ -8431,6 +8460,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -77,7 +94,19 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -8930,7 +8952,7 @@ _LT_EOF
+@@ -8844,6 +8876,11 @@ _LT_EOF
+       fi
+       ;;
+ 
++    haiku*)
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      link_all_deplibs=yes
++      ;;
++
+     interix[3-9]*)
+       hardcode_direct=no
+       hardcode_shlibpath_var=no
+@@ -8930,7 +8967,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -86,7 +115,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -9450,6 +9472,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9450,6 +9487,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -95,7 +124,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -10064,6 +10088,7 @@ beos*)
+@@ -10064,6 +10103,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -103,7 +132,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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'
-@@ -10165,9 +10190,7 @@ freebsd1*)
+@@ -10165,9 +10205,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -114,7 +143,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -10179,7 +10202,7 @@ freebsd* | dragonfly*)
+@@ -10179,7 +10217,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -123,7 +152,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -10202,13 +10225,24 @@ freebsd* | dragonfly*)
+@@ -10202,13 +10240,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -149,7 +178,27 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -10280,12 +10314,7 @@ interix[3-9]*)
+@@ -10219,6 +10268,19 @@ gnu*)
+   hardcode_into_libs=yes
+   ;;
+ 
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
++  hardcode_into_libs=yes
++  ;;
++
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -10280,12 +10342,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -163,7 +212,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -10376,15 +10405,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10376,15 +10433,14 @@ rm -f core conftest.err conftest.$ac_obj
    ;;
  
  netbsd*)
@@ -182,7 +231,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10413,7 +10441,7 @@ newsos6)
+@@ -10413,7 +10469,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -191,7 +240,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -10421,7 +10449,7 @@ openbsd*)
+@@ -10421,7 +10477,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -200,7 +249,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -12587,9 +12615,7 @@ else
+@@ -12587,9 +12643,7 @@ else
  fi
  
  
@@ -211,7 +260,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12836,7 +12862,10 @@ $RM -r conftest*
+@@ -12836,7 +12890,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -223,7 +272,19 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
    if test -n "$compiler"; then
-@@ -13628,18 +13657,37 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -13305,6 +13362,11 @@ if test -z "$aix_libpath"; then aix_libp
+       gnu*)
+         ;;
+ 
++      haiku*)
++        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        link_all_deplibs_CXX=yes
++        ;;
++
+       hpux9*)
+         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+         hardcode_libdir_separator_CXX=:
+@@ -13628,18 +13690,37 @@ if test -z "$aix_libpath"; then aix_libp
  
        netbsd*)
          if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
@@ -265,7 +326,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	;;
  
        openbsd2*)
-@@ -14036,6 +14084,11 @@ $RM -f confest.$objext
+@@ -14036,6 +14117,11 @@ $RM -f confest.$objext
  
  # PORTME: override above test on systems where it is broken
  case $host_os in
@@ -277,7 +338,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  interix[3-9]*)
    # Interix 3.5 installs completely hosed .la files for C++, so rather than
    # hack all around it, let's just trust "g++" to DTRT.
-@@ -14176,9 +14229,15 @@ $as_echo_n "checking for $compiler optio
+@@ -14176,14 +14262,25 @@ $as_echo_n "checking for $compiler optio
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -294,7 +355,17 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -14246,6 +14305,9 @@ $as_echo_n "checking for $compiler optio
+       lt_prog_compiler_pic_CXX=
+       ;;
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static_CXX=
++      ;;
+     interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+@@ -14246,6 +14343,9 @@ $as_echo_n "checking for $compiler optio
  	    ;;
  	esac
  	;;
@@ -304,7 +375,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -14443,6 +14505,9 @@ $as_echo_n "checking for $compiler optio
+@@ -14443,6 +14543,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -314,7 +385,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_CXX=
      ;;
-@@ -14948,6 +15013,7 @@ beos*)
+@@ -14948,6 +15051,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -322,7 +393,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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'
-@@ -15048,9 +15114,7 @@ freebsd1*)
+@@ -15048,9 +15152,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -333,7 +404,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -15062,7 +15126,7 @@ freebsd* | dragonfly*)
+@@ -15062,7 +15164,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -342,7 +413,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -15085,13 +15149,24 @@ freebsd* | dragonfly*)
+@@ -15085,13 +15187,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -368,7 +439,27 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -15163,12 +15238,7 @@ interix[3-9]*)
+@@ -15102,6 +15215,19 @@ gnu*)
+   hardcode_into_libs=yes
+   ;;
+ 
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
++  hardcode_into_libs=yes
++  ;;
++
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -15163,12 +15289,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -382,7 +473,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15259,15 +15329,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -15259,15 +15380,14 @@ rm -f core conftest.err conftest.$ac_obj
    ;;
  
  netbsd*)
@@ -401,7 +492,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -15296,7 +15365,7 @@ newsos6)
+@@ -15296,7 +15416,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -410,7 +501,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -15304,7 +15373,7 @@ openbsd*)
+@@ -15304,7 +15424,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -419,7 +510,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -15877,7 +15946,10 @@ $RM -r conftest*
+@@ -15877,7 +15997,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -431,7 +522,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
    GCC=$G77
    if test -n "$compiler"; then
-@@ -15971,9 +16043,11 @@ $as_echo_n "checking for $compiler optio
+@@ -15971,9 +16094,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -441,10 +532,16 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_F77='-fno-common'
 +      lt_prog_compiler_static_F77=''
++      ;;
++
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static_F77=
        ;;
  
      hpux*)
-@@ -15995,6 +16069,13 @@ $as_echo_n "checking for $compiler optio
+@@ -15995,6 +16126,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -458,7 +555,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16192,6 +16273,9 @@ $as_echo_n "checking for $compiler optio
+@@ -16192,6 +16330,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -468,7 +565,19 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_F77=
      ;;
-@@ -16676,7 +16760,7 @@ _LT_EOF
+@@ -16590,6 +16731,11 @@ _LT_EOF
+       fi
+       ;;
+ 
++    haiku*)
++      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      link_all_deplibs_F77=yes
++      ;;
++
+     interix[3-9]*)
+       hardcode_direct_F77=no
+       hardcode_shlibpath_var_F77=no
+@@ -16676,7 +16822,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -477,7 +586,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -17183,6 +17267,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17183,6 +17329,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -486,7 +595,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -17644,6 +17730,7 @@ beos*)
+@@ -17644,6 +17792,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -494,7 +603,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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'
-@@ -17744,9 +17831,7 @@ freebsd1*)
+@@ -17744,9 +17893,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -505,7 +614,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -17758,7 +17843,7 @@ freebsd* | dragonfly*)
+@@ -17758,7 +17905,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -514,7 +623,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -17781,13 +17866,24 @@ freebsd* | dragonfly*)
+@@ -17781,13 +17928,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -540,7 +649,27 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -17859,12 +17955,7 @@ interix[3-9]*)
+@@ -17798,6 +17956,19 @@ gnu*)
+   hardcode_into_libs=yes
+   ;;
+ 
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
++  hardcode_into_libs=yes
++  ;;
++
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -17859,12 +18030,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -554,7 +683,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17949,15 +18040,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17949,15 +18115,14 @@ rm -f core conftest.err conftest.$ac_obj
    ;;
  
  netbsd*)
@@ -573,7 +702,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17986,7 +18076,7 @@ newsos6)
+@@ -17986,7 +18151,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -582,7 +711,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -17994,7 +18084,7 @@ openbsd*)
+@@ -17994,7 +18159,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -591,7 +720,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -18557,7 +18647,10 @@ $RM -r conftest*
+@@ -18557,7 +18722,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -603,7 +732,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
    if test -n "$compiler"; then
-@@ -18776,9 +18869,11 @@ $as_echo_n "checking for $compiler optio
+@@ -18776,9 +18944,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -613,10 +742,16 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_FC='-fno-common'
 +      lt_prog_compiler_static_FC=''
++      ;;
++
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static_FC=
        ;;
  
      hpux*)
-@@ -18800,6 +18895,13 @@ $as_echo_n "checking for $compiler optio
+@@ -18800,6 +18976,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -630,7 +765,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18997,6 +19099,9 @@ $as_echo_n "checking for $compiler optio
+@@ -18997,6 +19180,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -640,7 +775,19 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_FC=
      ;;
-@@ -19481,7 +19586,7 @@ _LT_EOF
+@@ -19395,6 +19581,11 @@ _LT_EOF
+       fi
+       ;;
+ 
++    haiku*)
++      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      link_all_deplibs_FC=yes
++      ;;
++
+     interix[3-9]*)
+       hardcode_direct_FC=no
+       hardcode_shlibpath_var_FC=no
+@@ -19481,7 +19672,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -649,7 +796,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -19988,6 +20093,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -19988,6 +20179,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -658,7 +805,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -20449,6 +20556,7 @@ beos*)
+@@ -20449,6 +20642,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -666,7 +813,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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'
-@@ -20549,9 +20657,7 @@ freebsd1*)
+@@ -20549,9 +20743,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -677,7 +824,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -20563,7 +20669,7 @@ freebsd* | dragonfly*)
+@@ -20563,7 +20755,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -686,7 +833,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -20586,13 +20692,24 @@ freebsd* | dragonfly*)
+@@ -20586,13 +20778,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -712,7 +859,27 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -20664,12 +20781,7 @@ interix[3-9]*)
+@@ -20603,6 +20806,19 @@ gnu*)
+   hardcode_into_libs=yes
+   ;;
+ 
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
++  hardcode_into_libs=yes
++  ;;
++
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -20664,12 +20880,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -726,7 +893,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -20754,15 +20866,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -20754,15 +20965,14 @@ rm -f core conftest.err conftest.$ac_obj
    ;;
  
  netbsd*)
@@ -745,7 +912,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -20791,7 +20902,7 @@ newsos6)
+@@ -20791,7 +21001,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -754,7 +921,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -20799,7 +20910,7 @@ openbsd*)
+@@ -20799,7 +21009,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -763,7 +930,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -21205,7 +21316,10 @@ for cc_temp in $compiler""; do
+@@ -21205,7 +21415,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -775,7 +942,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -21320,9 +21434,11 @@ $as_echo_n "checking for $compiler optio
+@@ -21320,9 +21533,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -785,10 +952,16 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_GCJ='-fno-common'
 +      lt_prog_compiler_static_GCJ=''
++      ;;
++
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static_GCJ=
        ;;
  
      hpux*)
-@@ -21344,6 +21460,13 @@ $as_echo_n "checking for $compiler optio
+@@ -21344,6 +21565,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -802,7 +975,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -21541,6 +21664,9 @@ $as_echo_n "checking for $compiler optio
+@@ -21541,6 +21769,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -812,7 +985,19 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
      ;;
-@@ -22025,7 +22151,7 @@ _LT_EOF
+@@ -21939,6 +22170,11 @@ _LT_EOF
+       fi
+       ;;
+ 
++    haiku*)
++      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      link_all_deplibs_GCJ=yes
++      ;;
++
+     interix[3-9]*)
+       hardcode_direct_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+@@ -22025,7 +22261,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -821,7 +1006,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -22545,6 +22671,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -22545,6 +22781,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -830,7 +1015,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -23115,7 +23243,10 @@ for cc_temp in $compiler""; do
+@@ -23115,7 +23353,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -842,7 +1027,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  lt_cv_prog_compiler_c_o_RC=yes
  
-@@ -24296,6 +24429,9 @@ LTCC='$LTCC'
+@@ -24296,6 +24537,9 @@ LTCC='$LTCC'
  LTCFLAGS='$LTCFLAGS'
  compiler='$compiler_DEFAULT'
  
@@ -852,7 +1037,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  # Quote evaled strings.
  for var in SED \
  GREP \
-@@ -24580,6 +24716,9 @@ case \$lt_ECHO in
+@@ -24580,6 +24824,9 @@ case \$lt_ECHO in
    ;;
  esac
  
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 809d598eada..152f995f859 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.24 2009/12/15 17:35:37 joerg Exp $
+$NetBSD: patch-ac,v 1.25 2011/03/23 15:46:36 obache Exp $
 
---- libltdl/config/ltmain.sh.orig	2009-11-16 14:23:18.000000000 +0100
+--- libltdl/config/ltmain.sh.orig	2009-11-16 13:23:18.000000000 +0000
 +++ libltdl/config/ltmain.sh
 @@ -111,9 +111,9 @@ done
  $lt_unset CDPATH
@@ -15,3 +15,21 @@ $NetBSD: patch-ac,v 1.24 2009/12/15 17:35:37 joerg Exp $
  : ${CP="cp -f"}
  : ${ECHO="echo"}
  : ${EGREP="/bin/grep -E"}
+@@ -4522,7 +4522,7 @@ func_mode_link ()
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+@@ -6476,7 +6476,7 @@ func_mode_link ()
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index a266002595c..2bd0a06474f 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
+$NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
 
---- libltdl/configure.orig	2009-12-17 01:29:59.000000000 +0100
+--- libltdl/configure.orig	2010-06-19 07:24:26.000000000 +0000
 +++ libltdl/configure
 @@ -4542,6 +4542,13 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -16,7 +16,18 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-@@ -4967,7 +4974,7 @@ newos6*)
+@@ -4914,6 +4921,10 @@ gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++haiku*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case $host_cpu in
+@@ -4967,7 +4978,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -25,7 +36,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
    ;;
  
  openbsd*)
-@@ -7286,7 +7293,10 @@ for cc_temp in $compiler""; do
+@@ -7286,7 +7297,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -37,7 +48,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
  
  
  # Only perform the check for file, if the check method requires it
-@@ -7596,9 +7606,11 @@ $as_echo_n "checking for $compiler optio
+@@ -7596,9 +7610,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -47,10 +58,16 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic='-fno-common'
 +      lt_prog_compiler_static=''
++      ;;
++
++    haiku*)
++      # PIC is the default for Haiku.
++      # The "-static" flag exists, but is broken.
++      lt_prog_compiler_static=
        ;;
  
      hpux*)
-@@ -7620,6 +7632,13 @@ $as_echo_n "checking for $compiler optio
+@@ -7620,6 +7642,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -64,7 +81,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -7817,6 +7836,9 @@ $as_echo_n "checking for $compiler optio
+@@ -7817,6 +7846,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -74,7 +91,19 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -8316,7 +8338,7 @@ _LT_EOF
+@@ -8230,6 +8262,11 @@ _LT_EOF
+       fi
+       ;;
+ 
++    haiku*)
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      link_all_deplibs=yes
++      ;;
++
+     interix[3-9]*)
+       hardcode_direct=no
+       hardcode_shlibpath_var=no
+@@ -8316,7 +8353,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -83,7 +112,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -8836,6 +8858,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -8836,6 +8873,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -92,7 +121,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
        ;;
  
      openbsd*)
-@@ -9450,6 +9474,7 @@ beos*)
+@@ -9450,6 +9489,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -100,7 +129,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 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'
-@@ -9551,9 +9576,7 @@ freebsd1*)
+@@ -9551,9 +9591,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -111,7 +140,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -9565,7 +9588,7 @@ freebsd* | dragonfly*)
+@@ -9565,7 +9603,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -120,7 +149,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -9588,13 +9611,24 @@ freebsd* | dragonfly*)
+@@ -9588,13 +9626,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -146,7 +175,27 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9666,12 +9700,7 @@ interix[3-9]*)
+@@ -9605,6 +9654,19 @@ gnu*)
+   hardcode_into_libs=yes
+   ;;
+ 
++haiku*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  dynamic_linker="$host_os runtime_loader"
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
++  hardcode_into_libs=yes
++  ;;
++
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -9666,12 +9728,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -160,7 +209,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9762,15 +9791,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9762,15 +9819,14 @@ rm -f core conftest.err conftest.$ac_obj
    ;;
  
  netbsd*)
@@ -178,7 +227,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -9799,7 +9827,7 @@ newsos6)
+@@ -9799,7 +9855,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -187,7 +236,7 @@ $NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 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.
-@@ -9807,7 +9835,7 @@ openbsd*)
+@@ -9807,7 +9863,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac