* libtool.m4 (osf[345]): Append $major to soname_spec.

Reflect this in library_names_spec.
* ltmain.in (osf): Prefix $major with '.' for use as extension.

diff --git a/ChangeLog b/ChangeLog
index 4f71d776134ec819795f7a70b561fae61fc3a5e1..3c9a05caa14b036e205e31ebbbe6a6203d147eab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.de>
+
+       * libtool.m4 (osf[345]): Append $major to soname_spec.
+       Reflect this in library_names_spec.
+       * ltmain.in (osf): Prefix $major with '.' for use as extension.
+
 2002-08-28  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
         * ltdl.m4 & libltdl/ltdl.c: Port fully to native Win32 API.

diff --git a/libtool.m4 b/libtool.m4
index 61ba9e8a011e1d241045cbe27714b92f72cdf360..f050acffec9c1a4c3085b3aca95aaebf885bc582 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1376,8 +1376,8 @@ osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
@@ -5065,9 +5065,8 @@ EOF
     openbsd*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       else
@@ -5077,7 +5076,7 @@ EOF
           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
           ;;
         *)
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
           ;;
        esac

diff --git a/ltmain.in b/ltmain.in
index d9b49856e5bb7e47da398b52c0e61ebece9c2739..108462be53e3043f813035a1cd77b323c3053bde 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2685,7 +2685,7 @@ EOF
          ;;
 
        osf)
-         major=`expr $current - $age`
+         major=.`expr $current - $age`
          versuffix=".$current.$age.$revision"
          verstring="$current.$age.$revision"
 
@@ -4293,7 +4293,7 @@ fi\
          oldobjs="$libobjs_save"
          build_libtool_libs=no
        else
-         oldobjs="$oldobjs$old_deplibs $non_pic_objects"
+         oldobjs="$old_deplibs $non_pic_objects"
        fi
        addlibs="$old_convenience"
       fi