* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)

(_LT_CHECK_MAGIC_METHOD, _LT_COMPILER_PIC, _LT_LINKER_SHLIBS)
(_LT_LANG_CXX_CONFIG, _LT_SYS_HIDDEN_LIBDEPS) [ interix ]: When
matching for interix, accept version range [3-9] instead of 3.
* NEWS: Update.
Report by Martin Koeppe <mkoeppe@gmx.de>.

diff --git a/ChangeLog b/ChangeLog
index 54b7c0aaf0a0232f6003fc624f1a67725787f6e0..69f507218f290fc1a72f3f1f454afa4698fb58f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-03-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)
+       (_LT_CHECK_MAGIC_METHOD, _LT_COMPILER_PIC, _LT_LINKER_SHLIBS)
+       (_LT_LANG_CXX_CONFIG, _LT_SYS_HIDDEN_LIBDEPS) [ interix ]: When
+       matching for interix, accept version range [3-9] instead of 3.
+       * NEWS: Update.
+       Report by Martin Koeppe <mkoeppe@gmx.de>.
+
        * libltdl/m4/libtool.m4 (LT_PROG_GCJ): Avoid M4 expansion error
        that caused `dnl' to be merged to the previous word.
        * THANKS: Update.

diff --git a/NEWS b/NEWS
index 09c13ebe6539fbaca263c26473535da9d1089967..3c52c666d4b37f91d467c055249ffae35bf330da 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -76,7 +76,7 @@ New in 2.1a: 2007-??-??; CVS version 2.1a, Libtool team:
   - Basic support for PIE (position-independent executables).
   - Support for DragonFly BSD, improved support for FreeBSD.
   - Improved support for GNU/kFreeBSD and GNU/NetBSD.
-  - Support for Interix 3 (Windows SFU).
+  - Support for Interix 3 (Windows SFU) and newer versions.
   - Improved support for UnixWare.
   - Initial support for RDOS.
   - Initial Support for FC (modern Fortran).

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 993c833aee2e6936e8b8364a9106f9dec1a2ec33..46d59635dfa53aa19174a62d5a50f9572829e938 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2251,7 +2251,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2903,7 +2903,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -3424,7 +3424,7 @@ m4_if([$1], [CXX], [
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -3731,7 +3731,7 @@ m4_if([$1], [CXX], [
       esac
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -4154,7 +4154,7 @@ _LT_EOF
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5704,7 +5704,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         esac
         ;;
 
-      interix3*)
+      interix[[3-9]]*)
        _LT_TAGVAR(hardcode_direct, $1)=no
        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -6375,7 +6375,7 @@ $RM -f confest.$objext
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
 [case $host_os in
-interix3*)
+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.
   _LT_TAGVAR(predep_objects,$1)=