40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
From 02d5c58ae4b9bbaa6201990ff5066f0db561d231 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alan Antonuk <alan.antonuk@gmail.com>
|
||
|
|
Date: Wed, 1 Jan 2014 17:51:31 -0800
|
||
|
|
Subject: [PATCH] Fixes librabbitmq.pc generation under autoconf
|
||
|
|
|
||
|
|
Properly substitute the @requires_private@ and @libs_private@ variables
|
||
|
|
when configuring under autoconf
|
||
|
|
|
||
|
|
This fixes #154
|
||
|
|
---
|
||
|
|
configure.ac | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 0559f8f..382fafa 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -115,7 +115,8 @@ AS_IF([test "x$with_ssl" = "xcyassl"],
|
||
|
|
[test "x$with_ssl" = "xgnutls"],
|
||
|
|
[PKG_CHECK_MODULES([SSL], [gnutls],, [with_ssl=no])],
|
||
|
|
[test "x$with_ssl" = "xopenssl"],
|
||
|
|
- [PKG_CHECK_MODULES([SSL], [openssl >= 0.9.8],, [with_ssl=no])],
|
||
|
|
+ [PKG_CHECK_MODULES([SSL], [openssl >= 0.9.8], [ssl_pkg_required=openssl],
|
||
|
|
+ [with_ssl=no])],
|
||
|
|
[test "x$with_ssl" = "xpolarssl"],
|
||
|
|
[AX_LIB_POLARSSL([SSL_CFLAGS=$POLARSSL_CFLAGS
|
||
|
|
SSL_LIBS=$POLARSSL_LIBS],
|
||
|
|
@@ -162,6 +163,8 @@ AC_ARG_ENABLE([examples],
|
||
|
|
[enable_examples=yes])
|
||
|
|
AM_CONDITIONAL([EXAMPLES], [test "x$enable_examples" = "xyes"])
|
||
|
|
|
||
|
|
+AC_SUBST([requires_private], [$ssl_pkg_required])
|
||
|
|
+AC_SUBST([libs_private], [$LIBS])
|
||
|
|
AC_CONFIG_HEADERS([config.h])
|
||
|
|
AC_CONFIG_FILES([
|
||
|
|
librabbitmq.pc
|
||
|
|
--
|
||
|
|
1.8.5.1
|
||
|
|
|