From: Ken Raeburn <raeburn@mit.edu>
Date: Thu, 31 May 2007 21:25:56 +0000 (+0000)
Subject: Configure cksum_body and wpse in top-level configure script.  (Still don't build... 
X-Git-Tag: krb5-1.7-alpha1~1099
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=663b22141ca0e6353d75495bdfa641a36fa73627;p=krb5.git

Configure cksum_body and wpse in top-level configure script.  (Still don't build by default.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19565 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/configure.in b/src/configure.in
index 983107d27..88b25675f 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -399,7 +399,7 @@ AC_CHECK_HEADER(termios.h,dnl
   AC_DEFINE(POSIX_TERMIOS,1,[Define if termios.h exists and tcsetattr exists]))])
 dnl
 KRB5_SIGTYPE
-AC_CHECK_HEADERS(stdlib.h string.h stddef.h sys/types.h sys/file.h sys/param.h sys/stat.h sys/time.h netinet/in.h sys/uio.h sys/filio.h sys/select.h time.h paths.h)
+AC_CHECK_HEADERS(stdlib.h string.h stddef.h sys/types.h sys/file.h sys/param.h sys/stat.h sys/time.h netinet/in.h sys/uio.h sys/filio.h sys/select.h time.h paths.h errno.h)
 AC_HEADER_STDARG
 KRB5_AC_INET6
 dnl
@@ -961,8 +961,6 @@ if test -n "$OPENLDAP_PLUGIN"; then
 fi
 AC_SUBST(ldap_plugin_dir)
 
-AC_CONFIG_SUBDIRS(plugins/preauth/wpse plugins/preauth/cksum_body)
-
 AC_CHECK_HEADERS(Python.h python2.3/Python.h)
 
 dnl
@@ -1004,6 +1002,8 @@ V5_AC_OUTPUT_MAKEFILE(.
 
 	plugins/locate/python
 	plugins/kdb/db2
+	plugins/preauth/cksum_body
+	plugins/preauth/wpse
 
 	clients clients/klist clients/kinit clients/kvno
 	clients/kdestroy clients/kpasswd clients/ksu
diff --git a/src/plugins/preauth/cksum_body/Makefile.in b/src/plugins/preauth/cksum_body/Makefile.in
index 83d7cdb5b..ae79f8219 100644
--- a/src/plugins/preauth/cksum_body/Makefile.in
+++ b/src/plugins/preauth/cksum_body/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../../..
 myfulldir=plugins/preauth/cksum_body
-mydir=.
+mydir=plugins/preauth/cksum_body
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
@@ -40,3 +40,11 @@ clean::
 @libobj_frag@
 
 # +++ Dependency line eater +++
+# 
+# Makefile dependencies follow.  This must be the last section in
+# the Makefile.in file
+#
+cksum_body_main.so cksum_body_main.po $(OUTPRE)cksum_body_main.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/preauth_plugin.h \
+  cksum_body_main.c
diff --git a/src/plugins/preauth/cksum_body/cksum_body_main.c b/src/plugins/preauth/cksum_body/cksum_body_main.c
index cd19daf7a..8efda23f5 100644
--- a/src/plugins/preauth/cksum_body/cksum_body_main.c
+++ b/src/plugins/preauth/cksum_body/cksum_body_main.c
@@ -43,9 +43,7 @@
 
 #ident "$Id$"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "autoconf.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/src/plugins/preauth/cksum_body/configure.in b/src/plugins/preauth/cksum_body/configure.in
deleted file mode 100644
index 53870b507..000000000
--- a/src/plugins/preauth/cksum_body/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-
-AC_CHECK_HEADERS(errno.h string.h)
-
-KRB5_RUN_FLAGS
-dnl The following is for check...
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY
-AC_CONFIG_HEADERS(config.h)
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/plugins/preauth/wpse/Makefile.in b/src/plugins/preauth/wpse/Makefile.in
index 6c2830f50..efb054177 100644
--- a/src/plugins/preauth/wpse/Makefile.in
+++ b/src/plugins/preauth/wpse/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../../..
 myfulldir=plugins/preauth/wpse
-mydir=.
+mydir=plugins/preauth/wpse
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
@@ -40,3 +40,11 @@ clean::
 @libobj_frag@
 
 # +++ Dependency line eater +++
+# 
+# Makefile dependencies follow.  This must be the last section in
+# the Makefile.in file
+#
+wpse_main.so wpse_main.po $(OUTPRE)wpse_main.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/preauth_plugin.h \
+  wpse_main.c
diff --git a/src/plugins/preauth/wpse/configure.in b/src/plugins/preauth/wpse/configure.in
deleted file mode 100644
index 53870b507..000000000
--- a/src/plugins/preauth/wpse/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-
-AC_CHECK_HEADERS(errno.h string.h)
-
-KRB5_RUN_FLAGS
-dnl The following is for check...
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY
-AC_CONFIG_HEADERS(config.h)
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/plugins/preauth/wpse/wpse_main.c b/src/plugins/preauth/wpse/wpse_main.c
index f85806387..fd6ff92dd 100644
--- a/src/plugins/preauth/wpse/wpse_main.c
+++ b/src/plugins/preauth/wpse/wpse_main.c
@@ -32,9 +32,7 @@
 
 #ident "$Id$"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "autoconf.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>