Imported Debian patch 4.0.5-6~numeezy

daemons/ipa-sam/Makefile.am

@@ -1,19 +1,16 @@
 NULL =
-LIBPDB_NAME = @LIBPDB_NAME@
 SAMBA40EXTRA_LIBS = $(SAMBA40EXTRA_LIBPATH)	\
 			-lsmbldap		\
-			-l$(LIBPDB_NAME)			\
+			-lpdb			\
 			-lsmbconf		\
 			$(NULL)
 
 KRB5_UTIL_DIR=../../util
 KRB5_UTIL_SRCS=$(KRB5_UTIL_DIR)/ipa_krb5.c $(KRB5_UTIL_DIR)/ipa_pwd_ntlm.c
-ASN1_UTIL_DIR=../../asn1
 
 AM_CPPFLAGS =						\
 	-I.						\
 	-I$(srcdir)					\
-	-I$(ASN1_UTIL_DIR)				\
 	-I/usr/include/samba-4.0			\
 	-DPREFIX=\""$(prefix)"\" 			\
 	-DBINDIR=\""$(bindir)"\"			\
@@ -56,7 +53,6 @@ ipasam_la_LIBADD = 		\
 	$(NDR_LIBS)		\
 	$(SAMBA40EXTRA_LIBS)	\
 	$(SSSIDMAP_LIBS)	\
-	$(ASN1_UTIL_DIR)/libipaasn1.la  \
 	$(NULL)
 
 EXTRA_DIST =			\