$OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ --- libiconv/libcharset/autoconf/ltmain.sh.orig Wed Feb 21 15:09:19 2001 +++ libiconv/libcharset/autoconf/ltmain.sh Sat Mar 31 20:02:13 2001 @@ -1079,7 +1079,18 @@ compiler." # These systems don't actually have c library (as such) continue ;; + *-*-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 elif test "$arg" = "-lm"; then case "$host" in *-*-cygwin* | *-*-beos*) @@ -1091,6 +1102,10 @@ compiler." deplibs="$deplibs $arg" ;; + -?thread) + deplibs="$deplibs $arg" + ;; + -module) module=yes continue @@ -1799,6 +1814,9 @@ compiler." # rhapsody is a little odd... deplibs="$deplibs -framework System" ;; + *-*-openbsd*) + # do not include libc due to us having libc/libc_r. + ;; *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" @@ -3567,40 +3585,6 @@ libdir='$install_libdir'\ # Exit here if they wanted silent mode. test "$show" = : && exit 0 - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use \`-LLIBDIR'" - echo "flag during linking and do at least 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 -n "$admincmds"; then - echo " - have your system administrator run these commands:$admincmds" - 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 ;;