From 410a4b83d8a8b45a5ea195a1f0d29a3a7c18c919 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 20 Apr 2008 18:41:29 +0000
Subject: [PATCH] Move OpenLDAP includes to AM_CPPFLAGS to avoid dropping other
 defines for the library.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23061 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hdb/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index 75c94530f..6a11f6b48 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -3,6 +3,7 @@
 include $(top_srcdir)/Makefile.am.common
 
 AM_CPPFLAGS += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_hcrypto)
+AM_CPPFLAGS += $(INCLUDE_openldap) -DHDB_DB_DIR=\"$(DIR_hdbdir)\"
 
 BUILT_SOURCES = \
 	$(gen_files_hdb:.x=.c)	\
@@ -36,6 +37,7 @@ LDADD = libhdb.la \
 	$(LIB_roken) \
 	$(LIB_ldopen)
 
+
 if OPENLDAP_MODULE
 
 ldap_so = hdb_ldap.la
@@ -72,13 +74,9 @@ dist_libhdb_la_SOURCES =			\
 
 nodist_libhdb_la_SOURCES = $(BUILT_SOURCES)
 
-AM_CPPFLAGS += $(INCLUDE_openldap)
-
 include_HEADERS = hdb.h hdb-protos.h
 nodist_include_HEADERS =  hdb_err.h hdb_asn1.h
 
-libhdb_la_CPPFLAGS = -DHDB_DB_DIR=\"$(DIR_hdbdir)\"
-
 libhdb_la_LIBADD = \
 	$(LIB_com_err) \
 	../krb5/libkrb5.la \
-- 
2.11.4.GIT