IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

slapi plugins: fix CFLAGS

Browse Source 
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>
This commit is contained in:
Jan Cholasta 2017-03-15 05:14:25 +00:00
parent 1cdd5dee00
commit b7329e31f5
17 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am
View File

@ -10,6 +10,7 @@ AM_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NDRNBT_CFLAGS) \ $(NDRNBT_CFLAGS) \

2
daemons/ipa-slapi-plugins/ipa-dns/Makefile.am
View File

@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

1
daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am
View File

@ -10,6 +10,7 @@ AM_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(KRB5_CFLAGS) \ $(KRB5_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

1
daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am
View File

@ -10,6 +10,7 @@ AM_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(SSSNSSIDMAP_CFLAGS) \ $(SSSNSSIDMAP_CFLAGS) \

2
daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am
View File

@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

2
daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am
View File

@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

2
daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am
View File

@ -2,13 +2,13 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) $(WARN_CFLAGS)

2
daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am
View File

@ -2,13 +2,13 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) $(WARN_CFLAGS)

2
daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
View File

@ -12,9 +12,11 @@ AM_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(CRYPTO_CFLAGS) \ $(CRYPTO_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(KRB5_CFLAGS) \ $(KRB5_CFLAGS) \
$(NSPR_CFLAGS) \
$(NSS_CFLAGS) \ $(NSS_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

2
daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am
View File

@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

2
daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am
View File

@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

2
daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am
View File

@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

2
daemons/ipa-slapi-plugins/ipa-version/Makefile.am
View File

@ -6,12 +6,12 @@ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_builddir)/daemons/ \ -I$(top_builddir)/daemons/ \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(KRB5_CFLAGS) \ $(KRB5_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

1
daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am
View File

@ -10,6 +10,7 @@ AM_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

10
daemons/ipa-slapi-plugins/libotp/Makefile.am
View File

@ -1,6 +1,12 @@
NULL =
PLUGIN_COMMON_DIR = $(srcdir)/../common PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = -I/usr/include/dirsrv \ AM_CPPFLAGS = \
-I$(PLUGIN_COMMON_DIR) -I$(PLUGIN_COMMON_DIR) \
$(DIRSRV_CFLAGS) \
$(NSPR_CFLAGS) \
$(NSS_CFLAGS) \
$(NULL)
noinst_LTLIBRARIES = libhotp.la libotp.la noinst_LTLIBRARIES = libhotp.la libotp.la
libhotp_la_SOURCES = hotp.c hotp.h libhotp_la_SOURCES = hotp.c hotp.h

2
daemons/ipa-slapi-plugins/topology/Makefile.am
View File

@ -5,12 +5,12 @@ PLUGIN_COMMON_DIR = $(srcdir)/../common
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \ -I$(PLUGIN_COMMON_DIR) \
-I/usr/include/dirsrv \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \ -DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(DIRSRV_CFLAGS) \
$(LDAP_CFLAGS) \ $(LDAP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(NULL) $(NULL)

2
server.m4
View File

@ -23,6 +23,8 @@ fi
dnl -- dirsrv is needed for the extdom unit tests -- dnl -- dirsrv is needed for the extdom unit tests --
PKG_CHECK_MODULES([DIRSRV], [dirsrv >= 1.3.0]) 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 -- dnl -- sss_idmap is needed by the extdom exop --
PKG_CHECK_MODULES([SSSIDMAP], [sss_idmap]) PKG_CHECK_MODULES([SSSIDMAP], [sss_idmap])