* libtool.m4 (AC_DEPLIBS_CHECK_METHOD)

(AC_LIBTOOL_SYS_DYNAMIC_LINKER, AC_LIBTOOL_LANG_CXX_CONFIG)
(AC_LIBTOOL_PROG_COMPILER_PIC, AC_LIBTOOL_PROG_LD_SHLIBS)
* ltdl.m4 (AC_LTDL_SYS_DLOPEN_DEPLIBS) [ unixware7* | sysv5* ]:
Get UnixWare 7.1.[34] and OpenServer 6 fully working.
Improve other UnixWare versions a little.

diff --git a/ChangeLog b/ChangeLog
index c21ccfc464aa4aa073b2c48f3d7e970417ea00eb..473db5999573181559b81824ae49991a8b507805 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-09-27  Tim Rice  <tim@multitalents.net>
+
+       * libtool.m4 (AC_DEPLIBS_CHECK_METHOD)
+       (AC_LIBTOOL_SYS_DYNAMIC_LINKER, AC_LIBTOOL_LANG_CXX_CONFIG)
+       (AC_LIBTOOL_PROG_COMPILER_PIC, AC_LIBTOOL_PROG_LD_SHLIBS)
+       * ltdl.m4 (AC_LTDL_SYS_DLOPEN_DEPLIBS) [ unixware7* | sysv5* ]:
+       Get UnixWare 7.1.[34] and OpenServer 6 fully working.
+       Improve other UnixWare versions a little.
+
 2005-09-25  Alan W. Irwin  <irwin@beluga.phys.uvic.ca>,
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/libtool.m4 b/libtool.m4
index 3d2a1d6fcf5a2a020d263d575f542b1c56383c45..106546ab645ed3c03b31c54f8bc3fe708b419178 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1655,7 +1655,7 @@ sunos4*)
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.2uw2* | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -1688,6 +1688,19 @@ sysv4*MP*)
   fi
   ;;
 
+sysv5*)
+  version_type=linux
+  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'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2314,11 +2327,7 @@ solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.2uw2* | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -2339,10 +2348,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv4*uw2* | unixware7*)
+unixware7* | sysv5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -3559,8 +3571,29 @@ case $host_os in
        ;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+  sysv5OpenUNIX8* | sysv5UnixWare7.[[01]].[[01]]* | sysv5uw[[78]]* | unixware7*)
+    case $cc_basename in
+      CC*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+    esac
+    ;;
+  sysv5*)
+    case $cc_basename in
+      CC*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+    esac
     ;;
   tandem*)
     case $cc_basename in
@@ -4949,7 +4982,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            ;;
        esac
        ;;
-      unixware*)
+      unixware* | sysv5*)
+       case $cc_basename in
+         CC*)
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+       esac
        ;;
       vxworks*)
        ;;
@@ -5966,27 +6006,30 @@ EOF
       runpath_var=LD_RUN_PATH
       ;;
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+    sysv5OpenUNIX8* | sysv5UnixWare7.[[01]].[[10]]* |  sysv5uw[[78]]* | unixware7*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       runpath_var='LD_RUN_PATH'
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-               $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
       runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     uts4*)

diff --git a/ltdl.m4 b/ltdl.m4
index 22abfc8d64b6d0fe144b9cfdd829cd0707ebe344..8af88c84bbc25d838ced36b84689fe272f9f8709 100644 (file)
--- a/ltdl.m4
+++ b/ltdl.m4
@@ -175,6 +175,9 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
   solaris*)
     libltdl_cv_sys_dlopen_deplibs=yes
     ;;
+  sysv5*)
+    libltdl_cv_sys_dlopen_deplibs=yes
+    ;;
   esac
   ])
 if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then