$OpenBSD: patch-autoconf_ltmain_sh,v 1.2 2001/02/20 18:40:33 danh Exp $ --- autoconf/ltmain.sh.orig Mon Dec 21 19:28:47 1998 +++ autoconf/ltmain.sh Tue Feb 20 13:38:20 2001 @@ -507,7 +507,28 @@ if test -z "$show_help"; then deplibs="$deplibs $arg" ;; - -l*) deplibs="$deplibs $arg" ;; + -l*) + if test "$arg" = "-lc"; then + case "$host" in + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + continue + ;; + esac + elif test "$arg" = "-lc_r"; then + case "$host" in + *-*-openbsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + deplibs="$deplibs $arg" + ;; + + -?thread) + deplibs="$deplibs $arg" + ;; -no-undefined) allow_undefined=no @@ -1002,9 +1023,23 @@ if test -z "$show_help"; then allow_undefined_flag="$no_undefined_flag" fi - # Add libc to deplibs on all systems. dependency_libs="$deplibs" - deplibs="$deplibs -lc" + case "$host" in + *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # these systems don't actually have a c library (as such)! + ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-rhapsody*) + # rhapsody is a little odd... + deplibs="$deplibs -framework System" + ;; + *) + # Add libc to deplibs on all other systems. + deplibs="$deplibs -lc" + ;; + esac if test "$build_libtool_libs" = yes; then # Get the real and link names of the library. @@ -2025,37 +2060,6 @@ libdir='$install_libdir'\ done fi - echo "------------------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo - echo "To link against installed libraries in a given directory, LIBDIR," - echo "you must use the \`-LLIBDIR' flag during linking." - echo - echo " You will also need to do one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - echo " - use the \`$flag' linker flag" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "------------------------------------------------------------------------------" exit 0 ;;