1diff -ur libtool-1.5.26-orig/libltdl/ltdl.c libtool-1.5.26/libltdl/ltdl.c 2--- libtool-1.5.26-orig/libltdl/ltdl.c 2007-11-15 19:36:41.000000000 +0000 3+++ libtool-1.5.26/libltdl/ltdl.c 2008-03-20 16:21:34.000000000 +0000 4@@ -1458,7 +1458,7 @@ 5 /* --- LOAD_ADD_ON() INTERFACE LOADER --- */ 6 7 8-#ifdef __BEOS__ 9+#if defined(__BEOS__) && !defined(__HAIKU__) 10 11 /* dynamic linking for BeOS */ 12 13@@ -2241,7 +2241,7 @@ 14 #ifdef __WINDOWS__ 15 errors += lt_dlloader_add (lt_dlloader_next (0), &sys_wll, "dlopen"); 16 #endif 17-#ifdef __BEOS__ 18+#if defined(__BEOS__) && !defined(__HAIKU__) 19 errors += lt_dlloader_add (lt_dlloader_next (0), &sys_bedl, "dlopen"); 20 #endif 21 #if HAVE_DLD 22diff -ur libtool-1.5.26-orig/libtool.m4 libtool-1.5.26/libtool.m4 23--- libtool-1.5.26-orig/libtool.m4 2008-02-01 16:26:47.000000000 +0000 24+++ libtool-1.5.26/libtool.m4 2008-03-24 22:35:06.000000000 +0000 25@@ -1579,6 +1579,18 @@ 26 hardcode_into_libs=yes 27 ;; 28 29+haiku*) 30+ version_type=linux 31+ need_lib_prefix=no 32+ need_version=no 33+ dynamic_linker="$host_os runtime_loader" 34+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' 35+ soname_spec='${libname}${release}${shared_ext}$major' 36+ shlibpath_var=LIBRARY_PATH 37+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' 38+ hardcode_into_libs=yes 39+ ;; 40+ 41 hpux9* | hpux10* | hpux11*) 42 # Give a soname corresponding to the major version so that dld.sl refuses to 43 # link against other versions. 44@@ -2452,6 +2464,10 @@ 45 lt_cv_deplibs_check_method=pass_all 46 ;; 47 48+haiku*) 49+ lt_cv_deplibs_check_method=pass_all 50+ ;; 51+ 52 hpux10.20* | hpux11*) 53 lt_cv_file_magic_cmd=/usr/bin/file 54 case $host_cpu in 55@@ -2625,7 +2641,7 @@ 56 [AC_REQUIRE([AC_CANONICAL_HOST])dnl 57 LIBM= 58 case $host in 59-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) 60+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin* | *-*-haiku*) 61 # These system don't have libm, or don't need it 62 ;; 63 *-ncr-sysv4.3*) 64@@ -3226,6 +3242,9 @@ 65 ;; 66 gnu*) 67 ;; 68+ haiku*) 69+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 70+ ;; 71 hpux9*) 72 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' 73 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: 74@@ -5021,7 +5040,7 @@ 75 # like `-m68040'. 76 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' 77 ;; 78- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 79+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 80 # PIC is the default for these OSes. 81 ;; 82 mingw* | cygwin* | os2* | pw32*) 83@@ -5305,7 +5324,7 @@ 84 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' 85 ;; 86 87- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 88+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 89 # PIC is the default for these OSes. 90 ;; 91 92@@ -5736,6 +5755,10 @@ 93 fi 94 ;; 95 96+ haiku*) 97+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 98+ ;; 99+ 100 interix[[3-9]]*) 101 _LT_AC_TAGVAR(hardcode_direct, $1)=no 102 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no 103diff -ur libtool-1.5.26-orig/ltmain.in libtool-1.5.26/ltmain.in 104--- libtool-1.5.26-orig/ltmain.in 2008-02-01 16:12:00.000000000 +0000 105+++ libtool-1.5.26/ltmain.in 2008-03-20 14:02:27.000000000 +0000 106@@ -1599,7 +1599,7 @@ 107 -l*) 108 if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then 109 case $host in 110- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) 111+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*) 112 # These systems don't actually have a C or math library (as such) 113 continue 114 ;; 115@@ -3526,7 +3526,7 @@ 116 if test "$build_libtool_libs" = yes; then 117 if test -n "$rpath"; then 118 case $host in 119- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) 120+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*) 121 # these systems don't actually have a c library (as such)! 122 ;; 123 *-*-rhapsody* | *-*-darwin1.[012]) 124