From 3933a7402c6614a2af45d9c89381760eb94f91e7 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Mon, 14 Jan 2019 21:53:12 +0000
Subject: [PATCH] Add -pthread to pkgconfig's Libs.private if enabled

Allows static builds to correctly inherit the pthread dependency when
used with pkg-config --static --libs libsodium
---
 configure.ac                | 3 +++
 libsodium-uninstalled.pc.in | 1 +
 libsodium.pc.in             | 1 +
 3 files changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index 28eeb5dd..50d8902a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ AC_SUBST(DLL_VERSION)
 
 AC_LANG_ASSERT(C)
 LX_CFLAGS=${CFLAGS-NONE}
+PKGCONFIG_LIBS_PRIVATE=""
 
 dnl Path check
 
@@ -127,6 +128,7 @@ AS_IF([test "x$withval" = "xyes"], [
     AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files])
     with_threads="yes"
     LIBS="$PTHREAD_LIBS $LIBS"
+    PKGCONFIG_LIBS_PRIVATE="$PTHREAD_LIBS $PTHREAD_CFLAGS $PKGCONFIG_LIBS_PRIVATE"
     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
     CC="$PTHREAD_CC"])
 ], [with_threads="no"])
@@ -193,6 +195,7 @@ AC_ARG_ENABLE(opt,
 ])
 
 AC_SUBST([MAINT])
+AC_SUBST(PKGCONFIG_LIBS_PRIVATE, $PKGCONFIG_LIBS_PRIVATE)
 
 AX_VALGRIND_CHECK
 
diff --git a/libsodium-uninstalled.pc.in b/libsodium-uninstalled.pc.in
index 3d502308..068a9c6b 100644
--- a/libsodium-uninstalled.pc.in
+++ b/libsodium-uninstalled.pc.in
@@ -3,4 +3,5 @@ Version: @PACKAGE_VERSION@
 Description: A modern and easy-to-use crypto library
 
 Libs: -L${pcfiledir}/src/libsodium -lsodium
+Libs.private: @PKGCONFIG_LIBS_PRIVATE@
 Cflags: -I${pcfiledir}/src/libsodium/include -I@top_srcdir@/src/libsodium/include -I@top_srcdir@/src/libsodium/include/sodium
diff --git a/libsodium.pc.in b/libsodium.pc.in
index 19b3c1af..6c2b43aa 100644
--- a/libsodium.pc.in
+++ b/libsodium.pc.in
@@ -8,4 +8,5 @@ Version: @PACKAGE_VERSION@
 Description: A modern and easy-to-use crypto library
 
 Libs: -L${libdir} -lsodium
+Libs.private: @PKGCONFIG_LIBS_PRIVATE@
 Cflags: -I${includedir}