Move apputils dir from util to lib, to get its proper place in the

build process (after include).

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

12 files changed, 25 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b8e1472..5c5edcf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-25  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Configure lib/apputils, not util/apputils.
+
 2004-02-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* aclocal.m4 (KRB5_AC_NEED_DAEMON): Don't use AC_REPLACE_FUNCS.
diff --git a/src/configure.in b/src/configure.in
index 4dc3d68..f2d3f7e 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -64,7 +64,7 @@ AC_CONFIG_SUBDIRS(util/profile util/pty)
 if test "$DB_VERSION" = k5 ; then
   AC_CONFIG_SUBDIRS(util/db2)
 fi
-AC_CONFIG_SUBDIRS(include lib/crypto lib/krb5 lib/des425 util/apputils)
+AC_CONFIG_SUBDIRS(include lib/crypto lib/krb5 lib/des425 lib/apputils)
 if test -n "$KRB4_LIB"; then
   AC_CONFIG_SUBDIRS(lib/krb4)
 fi
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 2d456bb..f27894c 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MY_SUBDIRS): Add apputils.
+	(CLEANLIBS): Add libapputils.a.
+
 2003-12-18  Jeffrey Altman <jaltman@mit.edu>
 
         * krb5_32.def: Remove exports added on 2003-12-13.  Moved
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 030beb7..54e20c2 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
 myfulldir=lib
 mydir=lib
-MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5
+MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 apputils
 BUILDTOP=$(REL)..
 
 MAC_SUBDIRS = crypto krb5 gssapi
@@ -12,7 +12,7 @@ all-mac::
 
 CLEANLIBS = libkrb5.a libkdb5.a libcrypto.a libgssapi_krb5.a libdes425.a \
 	libkrb425.a libkadm.a libkrb4.a libcom_err.a libpty.a \
-	libss.a libgssapi.a \
+	libss.a libgssapi.a libapputils.a \
 	libkrb5.so libcrypto.so libkrb4.so libdes425.so
 
 clean-mac:: clean-unix
diff --git a/src/lib/apputils/ChangeLog b/src/lib/apputils/ChangeLog
new file mode 100644
index 0000000..382e1f3
--- /dev/null
+++ b/src/lib/apputils/ChangeLog
@@ -0,0 +1,6 @@
+2004-02-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* New directory.
+	* Makefile.in, configure.in, dummy.c, daemon.c: Moved here from
+	util/apputils.
+
diff --git a/src/util/apputils/Makefile.in b/src/lib/apputils/Makefile.in
index 20fb80f..ec5f94f 100644
--- a/src/util/apputils/Makefile.in
+++ b/src/lib/apputils/Makefile.in
@@ -3,10 +3,10 @@ bindir=@bindir@
 datadir=@datadir@
 mydatadir=$(datadir)/apputils
 thisconfigdir=.
-myfulldir=util/apputils
+myfulldir=lib/apputils
 mydir=.
 BUILDTOP=$(REL)..$(S)..
-RELDIR=../util/apputils
+RELDIR=../lib/apputils
 SED = sed
 
 ##DOS##BUILDTOP = ..\..
diff --git a/src/util/apputils/configure.in b/src/lib/apputils/configure.in
index efc4fcb..efc4fcb 100644
--- a/src/util/apputils/configure.in
+++ b/src/lib/apputils/configure.in
diff --git a/src/util/apputils/daemon.c b/src/lib/apputils/daemon.c
index 00dde48..00dde48 100644
--- a/src/util/apputils/daemon.c
+++ b/src/lib/apputils/daemon.c
diff --git a/src/util/apputils/dummy.c b/src/lib/apputils/dummy.c
index d5b6cc0..d5b6cc0 100644
--- a/src/util/apputils/dummy.c
+++ b/src/lib/apputils/dummy.c
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 7273cf5..84cafbe 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MY_SUBDIRS): Drop apputils.
+
 2004-02-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (MY_SUBDIRS): Build in apputils dir.
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index d04f421..dc5d9dd 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -7,7 +7,7 @@ mydir=util
 ##WIN32### below in the 'all-windows' target anyways, so just hide this.
 ##WIN32##!if 0
 MY_SUBDIRS=$(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
-	profile pty $(MAYBE_DB_@DB_VERSION@) send-pr apputils
+	profile pty $(MAYBE_DB_@DB_VERSION@) send-pr
 ##WIN32##!endif
 BUILDTOP=$(REL)..
 
diff --git a/src/util/apputils/ChangeLog b/src/util/apputils/ChangeLog
deleted file mode 100644
index 68305d9..0000000
--- a/src/util/apputils/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2004-02-24  Ken Raeburn  <raeburn@mit.edu>
-
-	* New directory.
-	* Makefile.in, configure.in, dummy.c: New files.
-	* daemon.c: Moved here from lib/krb5/posix.
-