From 78b95a8ab583dafa7b9e99abfa9c55742cb9b80d Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Tue, 27 Jan 2009 00:16:28 +0000
Subject: [PATCH] Add missing dlopen results to libstdc++ configure. Some
 combining.

git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29058 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 gcc/libstdc++-v3/configure | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/gcc/libstdc++-v3/configure b/gcc/libstdc++-v3/configure
index 34670e9090..0aa820437c 100755
--- a/gcc/libstdc++-v3/configure
+++ b/gcc/libstdc++-v3/configure
@@ -4913,7 +4913,7 @@ aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-beos*)
+beos* | haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9177,7 +9177,7 @@ amigaos*)
   fi
   ;;
 
-beos*)
+beos* | haiku*)
   library_names_spec='${libname}${shared_ext}'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
@@ -9341,12 +9341,6 @@ gnu*)
   hardcode_into_libs=yes
   ;;
 
-haiku*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
@@ -9873,7 +9867,7 @@ else
   lt_cv_dlopen_libs=
 
   case $host_os in
-  beos*)
+  beos* | haiku*)
     lt_cv_dlopen="load_add_on"
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
@@ -13103,7 +13097,7 @@ amigaos*)
   fi
   ;;
 
-beos*)
+beos* | haiku*)
   library_names_spec='${libname}${shared_ext}'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
@@ -13266,12 +13260,6 @@ gnu*)
   hardcode_into_libs=yes
   ;;
 
-haiku*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.