Try again, (HEAD) Interix3 support for libtool

[Todd Vierling]

Following is a patch for cvs HEAD for Interix 3 support for libtool.  I also
have a working patch for 1.5.x releases; please let me know if you're still
accepting those.

As I plan to improve this port and possibly add "native-CC" support (MS-VC++
wrapper shipped with Interix), I am willing to support this port of libtool.
Libtool maintainers please contact me offlist about this.

=====

Note:  I chose "version_type=sunos" deliberately; please honor that choice
from the diff.  Interix prefers that version scheme, as it is a descendant
of modern *BSD systems.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.61
diff -u -r1.61 libtool.m4
--- m4/libtool.m4       31 Mar 2004 14:11:08 -0000      1.61
+++ m4/libtool.m4       15 Apr 2004 14:35:46 -0000
@@ -1853,6 +1853,18 @@
   postinstall_cmds='chmod 555 $lib'
   ;;

+interix*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix ld.so.1 (ELF-like)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -2432,6 +2444,10 @@
   esac
   ;;

+interix*)
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $LD in
   *-32|*"-32 ") libmagic=32-bit;;
@@ -3021,6 +3037,8 @@
            ;;
        esac
        ;;
+      interix*)
+       ;;
       irix5* | irix6* | nonstopux*)
        case $cc_basename in
          CC)
@@ -3543,6 +3561,11 @@
       fi
       ;;

+    interix*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs 
$compiler_flags ${wl}-h,$soname'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -o $lib $libobjs 
$deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$export_symbols'
+      ;;
+
     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'
@@ -3946,6 +3969,15 @@
       fi
       ;;

+    interix*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs 
$compiler_flags'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
     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'
@@ -4897,6 +4929,8 @@
        fi
        ;;
       esac
+      ;;
+    interix*)
       ;;
     irix5* | irix6*)
       case $cc_basename in
Index: m4/ltdl.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/ltdl.m4,v
retrieving revision 1.10
diff -u -r1.10 ltdl.m4
--- m4/ltdl.m4  13 Apr 2004 22:13:16 -0000      1.10
+++ m4/ltdl.m4  15 Apr 2004 14:35:47 -0000
@@ -156,6 +156,9 @@
   hpux10*|hpux11*)
     libltdl_cv_sys_dlopen_deplibs=yes
     ;;
+  interix*)
+    libltdl_cv_sys_dlopen_deplibs=yes
+    ;;
   irix[[12345]]*|irix6.[[01]]*)
     # Catch all versions of IRIX before 6.2, and indicate that we don't
     # know how it worked for any of those versions.

-- 
-- Todd Vierling <address@hidden> <address@hidden>