$OpenBSD: patch-lib_configure,v 1.5 2011/09/08 11:36:36 ajacoutot Exp $ --- lib/configure.orig Thu Sep 1 10:10:01 2011 +++ lib/configure Thu Sep 8 13:35:34 2011 @@ -18577,21 +18577,9 @@ else ZLIB_HAS_PKGCONFIG=n fi -if test x$ac_zlib != xno; then - if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then - if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then - GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" - else - GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib" - fi - else - GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ" - fi -fi - # Check whether --with-p11-kit was given. if test "${with_p11_kit+set}" = set; then : withval=$with_p11_kit; @@ -26946,7 +26934,7 @@ fi done fi if test "X$found_dir" != "X"; then - LTLIBPTHREAD="${LTLIBPTHREAD}${LTLIBPTHREAD:+ }-L$found_dir -l$name" + LTLIBPTHREAD="${LTLIBPTHREAD}${LTLIBPTHREAD:+ }-L$found_dir -$name" if test "X$found_so" != "X"; then if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so" @@ -26999,7 +26987,7 @@ fi if test "$acl_hardcode_minus_L" != no; then LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_so" else - LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }-l$name" + LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }-$name" fi fi fi @@ -27008,7 +26996,7 @@ fi if test "X$found_a" != "X"; then LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }$found_a" else - LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }-L$found_dir -l$name" + LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }-L$found_dir -$name" fi fi additional_includedir= @@ -27158,8 +27146,8 @@ fi done fi else - LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }-l$name" - LTLIBPTHREAD="${LTLIBPTHREAD}${LTLIBPTHREAD:+ }-l$name" + LIBPTHREAD="${LIBPTHREAD}${LIBPTHREAD:+ }-$name" + LTLIBPTHREAD="${LTLIBPTHREAD}${LTLIBPTHREAD:+ }-$name" fi fi fi