From Tom Bates <Tom.Bates@compaq.com>:

* libtool.m4 [mips-compaq-nonstopux]: New port.
* ltmain.in [mips-compaq-nonstopux]: Support
$version_type == nonstopux.

diff --git a/ChangeLog b/ChangeLog
index 1feb27f81da39e2868e30d0d7d8f9f226b442255..630c0896fb4c97c5f2d5446ddb5862d899a7e8f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
-2001-10-28  Albert Chin-A-Young <china@thewrittenword.com>
+2001-10-28  Gary V. Vaughan  <gary@gnu.org>
 
-       * ltdl.c: change some types to size_t from int because
-       strlen() returns size_t. argz_len changed to size_t in
-       foreach_dirinpath() because argzize_path() takes 3rd
-       argument as size_t, not int. Based on lint run from
-       Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
+       From Tom Bates  <Tom.Bates@compaq.com>:
+       * libtool.m4 [mips-compaq-nonstopux]: New port.
+       * ltmain.in [mips-compaq-nonstopux]: Support
+       $version_type == nonstopux.
+
+2001-10-28  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * libltdl/ltdl.c (foreach_dirinpath): change some types to size_t
+       from int because strlen() returns size_t. argz_len changed to
+       size_t because argzize_path() takes 3rd argument as size_t, not
+       int.
+       Based on lint run from Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
 
 2001-10-27  Gary V. Vaughan  <gary@gnu.org>
 
@@ -16,22 +23,22 @@
        option to configure, but to find an appropriate ltdl library and
        append the right options to link it.
 
-2001-10-24 Kevin Ryde  <user42@zip.com.au>
+2001-10-24  Kevin Ryde  <user42@zip.com.au>
 
        * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Remove a stray ' quote.
 
-2001-10-24 H.J. Lu  <hjl@gnu.org>
+2001-10-24  H.J. Lu  <hjl@gnu.org>
 
        * ltmain.sh: Allow link against an archive when building a
        shared library.
        * libtool.m4 (lt_cv_deplibs_check_method): Always use
        file_magic for Linux ELF.
 
-2001-10-12 Guido Draheim  <guidod-2001q3@gmx.de>
+2001-10-12  Guido Draheim  <guidod-2001q3@gmx.de>
 
        * ltdl.m4: Changed "underscode to underscore".
 
-2001-10-06 Gary V. Vaughan  <gary@gnu.org>
+2001-10-06  Gary V. Vaughan  <gary@gnu.org>
 
        * configure.ac: General modernisation and cleanup.
        * cdemo/configure.ac: Ditto.

diff --git a/libtool.m4 b/libtool.m4
index 5e3110da7e386a3e00a689e7da54c8742bef4bdb..d87186b4b57f5bfa41327450c3f7862f2f812a3f 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1208,14 +1208,17 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-irix5* | irix6*)
-  version_type=irix
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)          version_type=irix ;;
+  esac
   need_lib_prefix=no
   need_version=no
   soname_spec='${libname}${release}.so$major'
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
   case $host_os in
-  irix5*)
+  irix5* | nonstopux*)
     libsuff= shlibsuff=
     ;;
   *)
@@ -1914,9 +1917,9 @@ hpux10.20* | hpux11*)
   fi
   ;;
 
-irix5* | irix6*)
+irix5* | irix6* | nonstopux*)
   case $host_os in
-  irix5*)
+  irix5* | nonstopux*)
     # this will be overridden with pass_all, but let us keep it just in case
     lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
     ;;
@@ -3747,7 +3750,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-irix*)
+irix* | nonstopux*)
   symcode='[[BCDEGRST]]'
   ;;
 solaris* | sysv5*)
@@ -3914,7 +3917,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
     cygwin* | mingw* | os2*)
@@ -4001,7 +4004,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            ;;
        esac
        ;;
-      irix5* | irix6*)
+      irix5* | irix6* | nonstopux*)
        case $cc_basename in
          CC)
            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4149,7 +4152,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
@@ -4217,7 +4220,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
       ;;
 
-    irix5* | irix6*)
+    irix5* | irix6* | nonstopux*)
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC (with -KPIC) is the default.
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
@@ -4837,7 +4840,7 @@ EOF
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
-    irix5* | irix6*)
+    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'
       else

diff --git a/ltmain.in b/ltmain.in
index 0db856cd0f1fd03a1aa1314ce146862cfc8cb02e..ffd7f27eb0a1b0793426ec1def9d043052d65f25 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2647,16 +2647,21 @@ EOF
          versuffix=".$current";
          ;;
 
-       irix)
+       irix | nonstopux)
+         case $version_type in
+           nonstopux) verstring_prefix=nonstopux ;;
+           *)         verstring_prefix=sgi ;;
+         esac
+         verstring="$verstring_prefix$major.$revision"
+
          major=`expr $current - $age + 1`
-         verstring="sgi$major.$revision"
 
          # Add in all the interfaces that we are compatible with.
          loop=$revision
          while test "$loop" -ne 0; do
            iface=`expr $revision - $loop`
            loop=`expr $loop - 1`
-           verstring="sgi$major.$iface:$verstring"
+           verstring="$verstring_prefix$major.$iface:$verstring"
          done
 
          # Before this point, $major must not contain `.'.