URL: https://github.com/freeipa/freeipa/pull/592 Author: HonzaCholasta Title: #592: slapi plugins: fix CFLAGS Action: opened
PR body: """ Add explicit NSPR_CFLAGS and NSS_CFLAGS where NSPR_LIBS and NSS_LIBS is used. Use DIRSRV_CFLAGS rather than hardcode -I/usr/include/dirsrv. Append NSPR_CFLAGS to DIRSRV_CFLAGS in ./configure as slapi-plugin.h includes nspr.h. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/592/head:pr592 git checkout pr592
From 89a95734e315b81e559aefc5e27caf650d4afd01 Mon Sep 17 00:00:00 2001 From: Jan Cholasta <jchol...@redhat.com> Date: Wed, 15 Mar 2017 05:14:25 +0000 Subject: [PATCH] slapi plugins: fix CFLAGS Add explicit NSPR_CFLAGS and NSS_CFLAGS where NSPR_LIBS and NSS_LIBS is used. Use DIRSRV_CFLAGS rather than hardcode -I/usr/include/dirsrv. Append NSPR_CFLAGS to DIRSRV_CFLAGS in ./configure as slapi-plugin.h includes nspr.h. --- daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am | 1 + daemons/ipa-slapi-plugins/ipa-dns/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am | 1 + daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am | 1 + daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 2 ++ daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-version/Makefile.am | 2 +- daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am | 1 + daemons/ipa-slapi-plugins/libotp/Makefile.am | 10 ++++++++-- daemons/ipa-slapi-plugins/topology/Makefile.am | 2 +- server.m4 | 2 ++ 17 files changed, 26 insertions(+), 12 deletions(-) diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am index f299b70..0eae746 100644 --- a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NDRNBT_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am index 099708c..8e667db 100644 --- a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am @@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am index 4ce32c4..319a869 100644 --- a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am index c9f74f0..1213965 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(SSSNSSIDMAP_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am index 8d8c975..51b944a 100644 --- a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am @@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am index 8efa155..d793e63 100644 --- a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am @@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am b/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am index dee3845..c340ef2 100644 --- a/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am @@ -2,13 +2,13 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(AM_CFLAGS) \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) diff --git a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am index e98e696..1ab28b7 100644 --- a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am @@ -2,13 +2,13 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(AM_CFLAGS) \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index 43c99d9..f2639ba 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -12,9 +12,11 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(CRYPTO_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ + $(NSPR_CFLAGS) \ $(NSS_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am index b9abc4a..64110fb 100644 --- a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am @@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am index a672e21..e3c5974 100644 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am @@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am index 540325e..3250442 100644 --- a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am @@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am index 21bf9c2..99f6c94 100644 --- a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am @@ -6,12 +6,12 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_builddir)/daemons/ \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am index 3ac572d..74f3ea5 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/libotp/Makefile.am b/daemons/ipa-slapi-plugins/libotp/Makefile.am index 3a89a67..e7525f3 100644 --- a/daemons/ipa-slapi-plugins/libotp/Makefile.am +++ b/daemons/ipa-slapi-plugins/libotp/Makefile.am @@ -1,6 +1,12 @@ +NULL = + PLUGIN_COMMON_DIR = $(srcdir)/../common -AM_CPPFLAGS = -I/usr/include/dirsrv \ - -I$(PLUGIN_COMMON_DIR) +AM_CPPFLAGS = \ + -I$(PLUGIN_COMMON_DIR) \ + $(DIRSRV_CFLAGS) \ + $(NSPR_CFLAGS) \ + $(NSS_CFLAGS) \ + $(NULL) noinst_LTLIBRARIES = libhotp.la libotp.la libhotp_la_SOURCES = hotp.c hotp.h diff --git a/daemons/ipa-slapi-plugins/topology/Makefile.am b/daemons/ipa-slapi-plugins/topology/Makefile.am index 1d86bd0..4f0b5a0 100644 --- a/daemons/ipa-slapi-plugins/topology/Makefile.am +++ b/daemons/ipa-slapi-plugins/topology/Makefile.am @@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ + $(DIRSRV_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/server.m4 b/server.m4 index 381d461..92b5cdd 100644 --- a/server.m4 +++ b/server.m4 @@ -23,6 +23,8 @@ fi dnl -- dirsrv is needed for the extdom unit tests -- PKG_CHECK_MODULES([DIRSRV], [dirsrv >= 1.3.0]) +# slapi-plugin.h includes nspr.h +DIRSRV_CFLAGS="$DIRSRV_CFLAGS $NSPR_CFLAGS" dnl -- sss_idmap is needed by the extdom exop -- PKG_CHECK_MODULES([SSSIDMAP], [sss_idmap])
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
