From 9b8ad9f282f082bb181ad784c7f66a9c03c2c764 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 28 Aug 2001 08:31:31 +0000
Subject: [PATCH] set and use INCLUDE_des

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10574 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 admin/Makefile.am                 | 2 +-
 appl/ftp/ftp/Makefile.am          | 2 +-
 appl/otp/Makefile.am              | 2 ++
 appl/su/Makefile.am               | 2 +-
 appl/telnet/libtelnet/Makefile.am | 2 +-
 cf/crypto.m4                      | 1 +
 kadmin/Makefile.am                | 2 +-
 kdc/Makefile.am                   | 2 +-
 kpasswd/Makefile.am               | 2 ++
 lib/hdb/Makefile.am               | 2 +-
 10 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/admin/Makefile.am b/admin/Makefile.am
index b568c8605..f687eb195 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += $(INCLUDE_readline)
+INCLUDES += $(INCLUDE_readline) $(INCLUDE_des)
 
 man_MANS = ktutil.8
 
diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am
index 6a4de1a80..21b3c6819 100644
--- a/appl/ftp/ftp/Makefile.am
+++ b/appl/ftp/ftp/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4)
+INCLUDES += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des)
 
 bin_PROGRAMS = ftp
 
diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am
index 88fa65831..16c89c5ec 100644
--- a/appl/otp/Makefile.am
+++ b/appl/otp/Makefile.am
@@ -2,6 +2,8 @@
 
 include $(top_srcdir)/Makefile.am.common
 
+INCLUDES += $(INCLUDE_des)
+
 bin_PROGRAMS = otp otpprint
 bin_SUIDS = otp
 otp_SOURCES = otp.c otp_locl.h
diff --git a/appl/su/Makefile.am b/appl/su/Makefile.am
index 30db06d10..0469a7888 100644
--- a/appl/su/Makefile.am
+++ b/appl/su/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += $(INCLUDE_krb4)
+INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des)
 
 bin_PROGRAMS = su
 bin_SUIDS = su
diff --git a/appl/telnet/libtelnet/Makefile.am b/appl/telnet/libtelnet/Makefile.am
index 0cecfc139..8294a3375 100644
--- a/appl/telnet/libtelnet/Makefile.am
+++ b/appl/telnet/libtelnet/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4)
+INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
 
 noinst_LIBRARIES = libtelnet.a
 
diff --git a/cf/crypto.m4 b/cf/crypto.m4
index 53bd5f4a5..9cc5bad68 100644
--- a/cf/crypto.m4
+++ b/cf/crypto.m4
@@ -110,6 +110,7 @@ if test "$crypto_lib" = "unknown"; then
 fi
 
 AC_SUBST(DIR_des)
+AC_SUBST(INCLUDE_des)
 AC_SUBST(LIB_des)
 AC_SUBST(LIB_des_a)
 AC_SUBST(LIB_des_so)
diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 9e4f4ca06..70e9ea76a 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) -I$(srcdir)/../lib/krb5
+INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
 
 sbin_PROGRAMS = kadmin
 
diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index 5ce9f2655..b43c1735a 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += $(INCLUDE_krb4) -I$(srcdir)/../lib/krb5
+INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
 
 bin_PROGRAMS = string2key
 
diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am
index cc5619fed..17b38da49 100644
--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -2,6 +2,8 @@
 
 include $(top_srcdir)/Makefile.am.common
 
+INCLUDES += $(INCLUDE_des)
+
 man_MANS = kpasswd.1 kpasswdd.8
 
 bin_PROGRAMS = kpasswd
diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index d38d6415c..5382a0fd6 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += -I../asn1 -I$(srcdir)/../asn1
+INCLUDES += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_des)
 
 BUILT_SOURCES = asn1_Key.c asn1_Event.c asn1_HDBFlags.c asn1_hdb_entry.c \
 	asn1_Salt.c hdb_err.c hdb_err.h asn1_GENERATION.c