64 lines
2.9 KiB
Plaintext
64 lines
2.9 KiB
Plaintext
$OpenBSD: patch-lib_configure,v 1.8 2012/01/09 14:03:59 ajacoutot Exp $
|
|
--- lib/configure.orig Fri Jan 6 21:50:21 2012
|
|
+++ lib/configure Mon Jan 9 14:45:45 2012
|
|
@@ -18782,21 +18782,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;
|
|
@@ -27837,7 +27825,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"
|
|
@@ -27890,7 +27878,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
|
|
@@ -27899,7 +27887,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=
|
|
@@ -28049,8 +28037,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
|