Imported Debian patch 4.0.5-6~numeezy

daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am

@@ -7,6 +7,7 @@ AM_CPPFLAGS =							\
 	-I$(srcdir)						\
 	-I$(PLUGIN_COMMON_DIR)					\
 	-I$(KRB5_UTIL_DIR)					\
+	-I$(COMMON_BER_DIR)					\
 	-DPREFIX=\""$(prefix)"\" 				\
 	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBDIR=\""$(libdir)"\" 				\
@@ -14,6 +15,7 @@ AM_CPPFLAGS =							\
 	-DDATADIR=\""$(datadir)"\"				\
 	$(LDAP_CFLAGS)						\
 	$(WARN_CFLAGS)						\
+	$(SSSIDMAP_CFLAGS)					\
 	$(SSSNSSIDMAP_CFLAGS)					\
 	$(NULL)
 
@@ -31,36 +33,31 @@ libipa_extdom_extop_la_LDFLAGS = -avoid-version
 
 libipa_extdom_extop_la_LIBADD = 	\
 	$(LDAP_LIBS)			\
+	$(SSSIDMAP_LIBS)		\
 	$(SSSNSSIDMAP_LIBS)	\
 	$(NULL)
 
-TESTS =
-check_PROGRAMS =
-
-if HAVE_CMOCKA
-if HAVE_NSS_WRAPPER
-TESTS_ENVIRONMENT = . ./test_data/test_setup.sh;
-TESTS += extdom_cmocka_tests
-check_PROGRAMS += extdom_cmocka_tests
-endif
+if HAVE_CHECK
+TESTS = extdom_tests
+check_PROGRAMS = extdom_tests
 endif
 
-extdom_cmocka_tests_SOURCES = 		\
-	ipa_extdom_cmocka_tests.c	\
-	ipa_extdom_common.c		\
+extdom_tests_SOURCES = 	\
+	ipa_extdom_tests.c	\
+	ipa_extdom_common.c	\
 	$(NULL)
-extdom_cmocka_tests_CFLAGS = $(CMOCKA_CFLAGS)
-extdom_cmocka_tests_LDFLAGS = 	\
+extdom_tests_CFLAGS = $(CHECK_CFLAGS)
+extdom_tests_LDFLAGS =	\
 	-rpath $(shell pkg-config --libs-only-L dirsrv | sed -e 's/-L//') \
 	$(NULL)
-extdom_cmocka_tests_LDADD = 	\
-	$(CMOCKA_LIBS)		\
+extdom_tests_LDADD = 		\
+	$(CHECK_LIBS)		\
 	$(LDAP_LIBS)		\
 	$(DIRSRV_LIBS)		\
+	$(SSSIDMAP_LIBS)	\
 	$(SSSNSSIDMAP_LIBS)	\
 	$(NULL)
 
-
 appdir = $(IPA_DATA_DIR)
 app_DATA =				\
 	ipa-extdom-extop-conf.ldif	\