From ae8d3838fb86c319f1de413b93fa2a2475d15139 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Fri, 26 May 2006 00:22:01 +0000
Subject: [PATCH] Build lib/krb4 makefile at top level

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18046 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/configure.in          | 20 +++++++++++++++++++-
 src/lib/krb4/Makefile.in  |  4 ++--
 src/lib/krb4/configure.in | 23 -----------------------
 3 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 src/lib/krb4/configure.in

diff --git a/src/configure.in b/src/configure.in
index e8c60520a..81945eddb 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -591,6 +591,24 @@ dnl Nothing for autoconf.h for now.
 AC_MSG_RESULT($ac_cv_printf_positional)
 dnl
 dnl
+dnl for lib/krb4
+case $krb5_cv_host in
+     *-apple-darwin*)
+     KRB_ERR_TXT=
+     KRB_ERR=
+     KRB_ERR_C=krb_err.c
+     ;;
+     *)
+     KRB_ERR='$(OUTPRE)krb_err.$(OBJEXT)'
+     KRB_ERR_TXT=krb_err_txt.c
+     KRB_ERR_C=
+     ;;
+esac
+AC_SUBST([KRB_ERR_TXT])
+AC_SUBST([KRB_ERR])
+AC_SUBST([KRB_ERR_C])
+dnl
+dnl
 dnl Check for thread safety issues.
 dnl (Is there a better place for this?)
 dnl tsfuncs="getpwnam_r getpwuid_r gethostbyname_r getservbyname_r gmtime_r localtime_r"
@@ -633,7 +651,7 @@ if test "$SS_VERSION" = k5 ; then
 fi
 AC_CONFIG_SUBDIRS(lib/krb5 lib/apputils)
 if test -n "$KRB4_LIB"; then
-  AC_CONFIG_SUBDIRS(lib/krb4)
+  K5_GEN_MAKEFILE(lib/krb4)
 fi
 AC_CONFIG_SUBDIRS(lib/gssapi lib/rpc lib/kadm5)
 AC_CONFIG_SUBDIRS(kadmin plugins/kdb/db2 appl tests)
diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index b6d420317..9812d1597 100644
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
 myfulldir=lib/krb4
-mydir=.
+mydir=lib/krb4
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(BUILDTOP)/include/kerberosIV -I$(srcdir)/../../include/kerberosIV -I.
 DEFINES= -DKRB4_USE_KEYTAB
diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
deleted file mode 100644
index 109120eed..000000000
--- a/src/lib/krb4/configure.in
+++ /dev/null
@@ -1,23 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_TYPE_MODE_T
-AC_TYPE_UID_T
-case $krb5_cv_host in
-     *-apple-darwin*)
-     KRB_ERR_TXT=
-     KRB_ERR=
-     KRB_ERR_C=krb_err.c
-     ;;
-     *)
-     KRB_ERR='$(OUTPRE)krb_err.$(OBJEXT)'
-     KRB_ERR_TXT=krb_err_txt.c
-     KRB_ERR_C=
-     ;;
-esac
-AC_SUBST([KRB_ERR_TXT])
-AC_SUBST([KRB_ERR])
-AC_SUBST([KRB_ERR_C])
-AC_PROG_AWK
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-V5_AC_OUTPUT_MAKEFILE
-- 
2.26.2