Index: libtool.m4 =================================================================== RCS file: /var/CVSROOT/libtool/libtool.m4,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- libtool.m4 24 Dec 2002 00:10:55 -0000 1.1.1.2 +++ libtool.m4 17 Jan 2004 03:11:01 -0000 1.2 @@ -649,7 +649,9 @@ ;; *) - AC_CHECK_FUNC([shl_load], + AC_CHECK_FUNC([dllload], + [lt_cv_dlopen="dllload"], + [AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], @@ -666,6 +668,7 @@ ]) ]) ]) + ]) ;; esac @@ -929,6 +932,10 @@ lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ;; + + openedition) + # XPLINK code is PIC by default + ;; osf3* | osf4* | osf5*) # All OSF/1 code is PIC. @@ -1689,6 +1696,13 @@ fi ;; + openedition*) + archive_cmds="\$CC -Wl,DLL \$libobjs \$deplibs \$compiler_flags -o \$lib && + cp \$linknames \$output_objdir && linknames=''" + export_dynamic_flag_spec="-Wl,DLL" + hardcode_into_libs=no + ;; + os2*) hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes @@ -2238,6 +2252,18 @@ shlibpath_var=LD_LIBRARY_PATH ;; +openedition*) + need_lib_prefix=no + need_version=no + shlibpath_var=LIBPATH + shlibpath_overrides_runpath=yes + postinstall_cmds="rm \$destdir/\$linkname; cp \$linkname \$destdir; chmod a+x \$lib" + # the library's exports are in libname.x; this is the file that must + # actually be linked with to use a DLL. + library_names_spec="\${libname}\${release}.so\$versuffix \${libname}.x" + libltdl_cv_shlibext=".so" + ;; + os2*) libname_spec='$name' need_lib_prefix=no @@ -3436,6 +3462,10 @@ else lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi + ;; + +openedition*) + lt_cv_deplibs_check_method=pass_all ;; osf3* | osf4* | osf5*) Index: ltdl.m4 =================================================================== RCS file: /var/CVSROOT/libtool/ltdl.m4,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- ltdl.m4 24 Dec 2002 00:10:55 -0000 1.1.1.2 +++ ltdl.m4 17 Jan 2004 03:11:01 -0000 1.2 @@ -95,7 +95,7 @@ AC_REQUIRE([AC_LTDL_FUNC_ARGZ]) AC_CHECK_HEADERS([errno.h malloc.h memory.h stdlib.h stdio.h ctype.h unistd.h]) -AC_CHECK_HEADERS([dl.h sys/dl.h dld.h]) +AC_CHECK_HEADERS([dl.h sys/dl.h dld.h dll.h]) AC_CHECK_HEADERS([string.h strings.h], break) AC_CHECK_FUNCS([strchr index], break) @@ -249,7 +249,10 @@ [LIBADD_DL= AC_SUBST(LIBADD_DL) -AC_CHECK_FUNC([shl_load], +AC_CHECK_FUNC([dllload], + [AC_DEFINE([HAVE_DLLLOAD], [1], + [Define if you have the dllload function.])], + [AC_CHECK_FUNC([shl_load], [AC_DEFINE([HAVE_SHL_LOAD], [1], [Define if you have the shl_load function.])], [AC_CHECK_LIB([dld], [shl_load], @@ -280,6 +283,7 @@ ]) ]) ]) +]) ]) if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = xyes; then Index: ltmain.in =================================================================== RCS file: /var/CVSROOT/libtool/ltmain.in,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- ltmain.in 24 Dec 2002 00:10:55 -0000 1.1.1.2 +++ ltmain.in 17 Jan 2004 17:34:56 -0000 1.2 @@ -1756,7 +1756,8 @@ continue fi - if test "$installed" = no; then + if test "$installed" = no + && test "$hardcode_action" != unsupported; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes fi