[389-commits] [389-ds-base] 01/02: Ticket 49099 - fix configure.ac due to NS change

This is an automated email from the git hooks/post-receive script.

firstyear pushed a commit to branch master
in repository 389-ds-base.

commit a05cf36a63a3602895c2310703297af7bfcd0772
Author: William Brown <firstyear@redhat.com>
Date: Thu May 11 11:26:06 2017 +1000

Ticket 49099 - fix configure.ac due to NS change

Bug Description: During the ns change, apparently make clean
and autoreconf were not enough to check this was fine. I missed
some removal of options.

Fix Description: Remove the enable_nunc_stans line, and libevent.m4

https://pagure.io/389-ds-base/issue/49099

Author: wibrown

Review by: mreynolds (Thanks!)
---
Makefile.am | 4 ----
configure.ac | 1 +
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 65f4356..8e75390 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,12 +39,8 @@ else
SDS_INCLUDES = -I$(srcdir)/src/libsds/include/ -I$(srcdir)/src/libsds/external/
endif

-if enable_nunc_stans
NUNCSTANS_INCLUDES = -I$(srcdir)/src/nunc-stans/include/
NUNC_STANS_ON = 1
-else
-NUNC_STANS_ON = 0
-endif

# the -U undefines these symbols - should use the corresponding DS_ ones instead - see configure.ac
DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) -DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand)\"" -DCAPBRAND="\"$(capbrand)\"" \
diff --git a/configure.ac b/configure.ac
index bfccc2c..a64c9bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -704,6 +704,7 @@ AM_CONDITIONAL([FREEBSD],[test "$platform" = "freebsd"])
AM_CONDITIONAL([SPARC],[test "x$TARGET" = xSPARC])

# Check for library dependencies
+m4_include(m4/event.m4)
m4_include(m4/nspr.m4)
m4_include(m4/nss.m4)
m4_include(m4/openldap.m4)

--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org