diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2017-03-15 05:14:25 +0000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-03-15 08:55:12 +0000 |
| commit | b7329e31f5c985b9721e3a21b1cd1bec6430129d (patch) | |
| tree | 74e4c19de3ac0af373ccead7c2d04a6dcf8ff8c9 /daemons | |
| parent | 1cdd5dee006426c996f67240b6cb2c1aa05e5168 (diff) | |
| download | freeipa-b7329e31f5c985b9721e3a21b1cd1bec6430129d.tar.gz freeipa-b7329e31f5c985b9721e3a21b1cd1bec6430129d.tar.xz freeipa-b7329e31f5c985b9721e3a21b1cd1bec6430129d.zip | |
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.
Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
Diffstat (limited to 'daemons')
16 files changed, 24 insertions, 12 deletions
diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am index f299b7051..0eae746e9 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 099708c53..8e667db7e 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 4ce32c44c..319a869a6 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 c9f74f0a9..1213965c9 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 8d8c9757a..51b944a5f 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 8efa155e1..d793e6393 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 dee38453c..c340ef2cf 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 e98e6963f..1ab28b7f8 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 43c99d90f..f2639ba7f 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 b9abc4a77..64110fb30 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 a672e212e..e3c597422 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 540325ea6..32504423e 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 21bf9c249..99f6c9405 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 3ac572dcc..74f3ea5e7 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 3a89a67d5..e7525f307 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 1d86bd009..4f0b5a010 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) |