Common subdirectories: libtool-1.3.5/cdemo and libtool-1.3.5-oli/cdemo Common subdirectories: libtool-1.3.5/demo and libtool-1.3.5-oli/demo Common subdirectories: libtool-1.3.5/doc and libtool-1.3.5-oli/doc Common subdirectories: libtool-1.3.5/libltdl and libtool-1.3.5-oli/libltdl diff -u libtool-1.3.5/ltconfig libtool-1.3.5-oli/ltconfig --- libtool-1.3.5/ltconfig Sat May 27 13:15:00 2000 +++ libtool-1.3.5-oli/ltconfig Mon Aug 7 21:24:52 2000 @@ -1784,6 +1784,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= +dlname_spec= postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -1815,7 +1816,8 @@ shlibpath_var=LIBPATH # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' ;; aix4*) @@ -1850,7 +1852,8 @@ version_type=linux need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' @@ -1920,7 +1923,8 @@ need_lib_prefix=no need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -1934,7 +1938,8 @@ shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' + soname_spec='${libbasename}${release}.sl$major' + dlname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' case "$host_os" in @@ -1951,7 +1956,8 @@ version_type=irix need_lib_prefix=no need_version=no - soname_spec='${libname}${release}.so.$major' + soname_spec='${libbasename}${release}.so.$major' + dlname_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*) @@ -1988,7 +1994,8 @@ need_lib_prefix=no need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2013,7 +2020,8 @@ dynamic_linker='NetBSD (a.out) ld.so' else library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2041,7 +2049,8 @@ osf3* | osf4* | osf5*) version_type=osf need_version=no - soname_spec='${libname}${release}.so' + soname_spec='${libbasename}${release}.so' + dlname_spec='${libname}${release}.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH # this will be overridden with pass_all, but let us keep it just in case @@ -2056,14 +2065,16 @@ rhapsody*) version_type=sunos library_names_spec='${libname}.so' - soname_spec='${libname}.so' + soname_spec='${libbasename}.so' + dlname_spec='${libname}.so' shlibpath_var=DYLD_LIBRARY_PATH deplibs_check_method=pass_all ;; sco3.2v5*) version_type=osf - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2073,7 +2084,8 @@ need_lib_prefix=no need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # ldd complains unless libraries are executable @@ -2098,7 +2110,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH case "$host_vendor" in sequent) @@ -2123,7 +2136,8 @@ uts4*) version_type=linux library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2132,7 +2146,8 @@ need_lib_prefix=no need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + soname_spec='${libbasename}${release}.so$major' + dlname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2140,7 +2155,8 @@ if test -d /usr/nec ;then version_type=linux library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' - soname_spec='$libname.so.$major' + soname_spec='$libbasename.so.$major' + dlname_spec='$libname.so.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; @@ -2701,7 +2717,7 @@ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ - library_names_spec soname_spec \ + library_names_spec soname_spec dlname_spec \ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \ file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \ diff -u libtool-1.3.5/ltmain.sh libtool-1.3.5-oli/ltmain.sh --- libtool-1.3.5/ltmain.sh Sat May 27 13:15:01 2000 +++ libtool-1.3.5-oli/ltmain.sh Mon Aug 7 22:22:33 2000 @@ -854,6 +854,7 @@ temp_rpath= thread_safe=no vinfo= + libbasename= # We need to know -static, to get the right output filenames. for arg @@ -1154,6 +1155,11 @@ continue ;; + -sobasename) + prev=libbasename + continue + ;; + # Some other compiler flag. -* | +*) # Unknown arguments in both finalize_command and compile_command need @@ -2044,6 +2050,12 @@ realname="$2" shift; shift + # if user specified a libbasename (for soname) + # we use the name given by user, otherwise: + if test -z "$libbasename"; then + eval libbasename=\"$libname\" + fi + if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else @@ -2172,8 +2184,13 @@ # If -module or -export-dynamic was specified, set the dlname. if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" + # On all known operating systems, soname and dlname are identical, + # but somtimes soname shall be defineable as command line option + if test -n "$dlname_spec"; then + eval dlname=\"$dlname_spec\" + else + dlname="$realname" + fi fi fi ;; @@ -3971,6 +3988,7 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -sobasename NAME define basename of soname -static do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] Common subdirectories: libtool-1.3.5/mdemo and libtool-1.3.5-oli/mdemo Common subdirectories: libtool-1.3.5/tests and libtool-1.3.5-oli/tests