m4/nunc-stans.m4 | 13 +++++++++++++
rpm/389-ds-base.spec.in | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 095b720ab5dc1dab860da62826c227fc31630859
Author: William Brown <firstyear(a)redhat.com>
Date: Tue Nov 1 15:45:31 2016 +1000
Ticket 49026 - Support nunc-stans pkgconfig
Bug Description: Without pkgconfig we would have to provide a with path to
the our tools incase nunc-stans was in a weird location. This avoids that issue
Fix Description: Add the support to use pkgconfig for nunc-stans.
https://fedorahosted.org/389/ticket/49026
Author: wibrown
Review by: mreynolds (Thanks)
diff --git a/m4/nunc-stans.m4 b/m4/nunc-stans.m4
index 6c3a360..442a0df 100644
--- a/m4/nunc-stans.m4
+++ b/m4/nunc-stans.m4
@@ -61,3 +61,16 @@ AC_ARG_WITH(nunc-stans-lib,
AS_HELP_STRING([--with-nunc-stans-lib=PATH],[nunc-st
fi
],
AC_MSG_RESULT(no))
+
+if test -z "$nunc_stans_inc" -o -z "$nunc_stans_lib"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+ AC_MSG_CHECKING(for nunc-stans with pkg-config)
+ if test -n "$PKG_CONFIG"; then
+ if $PKG_CONFIG --exists nunc-stans; then
+ nunc_stans_inc=`$PKG_CONFIG --cflags-only-I nunc-stans`
+ nunc_stans_lib=`$PKG_CONFIG --libs-only-L nunc-stans`
+ AC_MSG_RESULT([using system nunc-stans])
+ fi
+ fi
+fi
+
commit 416f2621bf956d4d804e673239dc31fecfd4fffa
Author: William Brown <firstyear(a)redhat.com>
Date: Tue Nov 1 12:29:01 2016 +1000
Ticket 49025 - Upgrade nunc-stans to 0.2.1
Bug Description: Nunc Stans 0.2.0 had a defect which prevented signal
registration functioning correctly.
Fix Description: Upgrade to 0.2.1
https://fedorahosted.org/389/ticket/49025
Author: wibrown
Review by: mreynolds (Thanks!)
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index cd054ec..9fe6a96 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -18,7 +18,7 @@
# To build without nunc-stans, set use_nunc_stans to 0.
%global use_nunc_stans __NUNC_STANS_ON__
%if %{use_nunc_stans}
-%global nunc_stans_ver 0.2.0
+%global nunc_stans_ver 0.2.1
%endif
# This enables an ASAN build. This should not go to production, so we rename.
@@ -253,6 +253,7 @@ cp %{SOURCE2} README.devel
%if %{use_nunc_stans}
pushd ../nunc-stans-%{nunc_stans_ver}
+autoreconf -fiv
%configure --with-fhs --libdir=%{_libdir}/%{pkgname}
# We install into our build dir first, then later we install to the correct build root.
# This is to make it possible for directory server to use us, else we can't resolve