28 files changed, 25 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index acebdf25f..fc076b314 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Don't configure pty library.  Use one invocation
+	of AC_CONFIG_SUBDIRS instead of two in a row.
+
 2006-04-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* aclocal.m4 (CONFIG_RULES): Don't define KRB5_PRIVATE or
diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog
index e35d18626..11a16a734 100644
--- a/src/appl/ChangeLog
+++ b/src/appl/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* libpty: Directory moved from util/pty.
+	* configure.in: Configure libpty.
+
 2006-03-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Supply comment template in AC_DEFINE calls.
diff --git a/src/appl/configure.in b/src/appl/configure.in
index 8b96bff50..e8d2f6512 100644
--- a/src/appl/configure.in
+++ b/src/appl/configure.in
@@ -17,5 +17,5 @@ dnl
 KRB5_GETSOCKNAME_ARGS
 KRB5_GETPEERNAME_ARGS
 KRB5_BUILD_PROGRAM
-AC_CONFIG_SUBDIRS(bsd gssftp telnet)
+AC_CONFIG_SUBDIRS(libpty bsd gssftp telnet)
 V5_AC_OUTPUT_MAKEFILE(. sample sample/sclient sample/sserver simple simple/client simple/server gss-sample user_user)
diff --git a/src/util/pty/.Sanitize b/src/appl/libpty/.Sanitize
index d1b4efbe3..d1b4efbe3 100644
--- a/src/util/pty/.Sanitize
+++ b/src/appl/libpty/.Sanitize
diff --git a/src/util/pty/ChangeLog b/src/appl/libpty/ChangeLog
index fc026843e..2e42f7c99 100644
--- a/src/util/pty/ChangeLog
+++ b/src/appl/libpty/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* Move directory from util/pty to appl/libpty.
+	* Makefile.in (myfulldir, RELDIR): Updated.
+
 2006-04-05  Tom Yu  <tlyu@mit.edu>
 
 	* configure.in: Add prerequisites for sys/ptyvar.h.
diff --git a/src/util/pty/Makefile.in b/src/appl/libpty/Makefile.in
index 4277a5217..3c3ca3828 100644
--- a/src/util/pty/Makefile.in
+++ b/src/appl/libpty/Makefile.in
@@ -1,8 +1,8 @@
 thisconfigdir=.
-myfulldir=util/pty
+myfulldir=appl/libpty
 mydir=.
 BUILDTOP=$(REL)..$(S)..
-RELDIR=../util/pty
+RELDIR=../appl/libpty
 
 SED = sed
 
diff --git a/src/util/pty/README b/src/appl/libpty/README
index f10dd2b37..f10dd2b37 100644
--- a/src/util/pty/README
+++ b/src/appl/libpty/README
diff --git a/src/util/pty/cleanup.c b/src/appl/libpty/cleanup.c
index 57cc796ac..57cc796ac 100644
--- a/src/util/pty/cleanup.c
+++ b/src/appl/libpty/cleanup.c
diff --git a/src/util/pty/configure.in b/src/appl/libpty/configure.in
index 7600b1dbd..7600b1dbd 100644
--- a/src/util/pty/configure.in
+++ b/src/appl/libpty/configure.in
diff --git a/src/util/pty/dump-utmp.c b/src/appl/libpty/dump-utmp.c
index d4c303fb3..d4c303fb3 100644
--- a/src/util/pty/dump-utmp.c
+++ b/src/appl/libpty/dump-utmp.c
diff --git a/src/util/pty/getpty.c b/src/appl/libpty/getpty.c
index 610a471e6..610a471e6 100644
--- a/src/util/pty/getpty.c
+++ b/src/appl/libpty/getpty.c
diff --git a/src/util/pty/init.c b/src/appl/libpty/init.c
index b48a1f8a7..b48a1f8a7 100644
--- a/src/util/pty/init.c
+++ b/src/appl/libpty/init.c
diff --git a/src/util/pty/init_slave.c b/src/appl/libpty/init_slave.c
index ce7507645..ce7507645 100644
--- a/src/util/pty/init_slave.c
+++ b/src/appl/libpty/init_slave.c
diff --git a/src/util/pty/libpty.h b/src/appl/libpty/libpty.h
index d95c8fe08..d95c8fe08 100644
--- a/src/util/pty/libpty.h
+++ b/src/appl/libpty/libpty.h
diff --git a/src/util/pty/logwtmp.c b/src/appl/libpty/logwtmp.c
index 21a35d3a9..21a35d3a9 100644
--- a/src/util/pty/logwtmp.c
+++ b/src/appl/libpty/logwtmp.c
diff --git a/src/util/pty/open_ctty.c b/src/appl/libpty/open_ctty.c
index 5a1730b31..5a1730b31 100644
--- a/src/util/pty/open_ctty.c
+++ b/src/appl/libpty/open_ctty.c
diff --git a/src/util/pty/open_slave.c b/src/appl/libpty/open_slave.c
index 5bab6bc36..5bab6bc36 100644
--- a/src/util/pty/open_slave.c
+++ b/src/appl/libpty/open_slave.c
diff --git a/src/util/pty/pty-int.h b/src/appl/libpty/pty-int.h
index b94a65c0e..b94a65c0e 100644
--- a/src/util/pty/pty-int.h
+++ b/src/appl/libpty/pty-int.h
diff --git a/src/util/pty/pty_err.et b/src/appl/libpty/pty_err.et
index 770cce7a9..770cce7a9 100644
--- a/src/util/pty/pty_err.et
+++ b/src/appl/libpty/pty_err.et
diff --git a/src/util/pty/pty_paranoia.c b/src/appl/libpty/pty_paranoia.c
index 466a65888..466a65888 100644
--- a/src/util/pty/pty_paranoia.c
+++ b/src/appl/libpty/pty_paranoia.c
diff --git a/src/util/pty/sane_hostname.c b/src/appl/libpty/sane_hostname.c
index 8ef6de875..8ef6de875 100644
--- a/src/util/pty/sane_hostname.c
+++ b/src/appl/libpty/sane_hostname.c
diff --git a/src/util/pty/update_utmp.c b/src/appl/libpty/update_utmp.c
index 004582650..004582650 100644
--- a/src/util/pty/update_utmp.c
+++ b/src/appl/libpty/update_utmp.c
diff --git a/src/util/pty/update_wtmp.c b/src/appl/libpty/update_wtmp.c
index 988bae61a..988bae61a 100644
--- a/src/util/pty/update_wtmp.c
+++ b/src/appl/libpty/update_wtmp.c
diff --git a/src/util/pty/vhangup.c b/src/appl/libpty/vhangup.c
index 292437142..292437142 100644
--- a/src/util/pty/vhangup.c
+++ b/src/appl/libpty/vhangup.c
diff --git a/src/util/pty/void_assoc.c b/src/appl/libpty/void_assoc.c
index a39c9c723..a39c9c723 100644
--- a/src/util/pty/void_assoc.c
+++ b/src/appl/libpty/void_assoc.c
diff --git a/src/configure.in b/src/configure.in
index 8b75fff4d..857d6fe54 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -613,8 +613,7 @@ fi
 if test "$SS_VERSION" = k5 ; then
   AC_CONFIG_SUBDIRS(util/ss)
 fi
-AC_CONFIG_SUBDIRS(util/profile util/pty)
-AC_CONFIG_SUBDIRS(lib/crypto lib/krb5 lib/des425 lib/apputils)
+AC_CONFIG_SUBDIRS(util/profile lib/crypto lib/krb5 lib/des425 lib/apputils)
 if test -n "$KRB4_LIB"; then
   AC_CONFIG_SUBDIRS(lib/krb4)
 fi
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 0b81219d4..89eff938b 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* pty: Directory moved to appl/libpty.
+	* Makefile.in (LOCAL_SUBDIRS): Remove pty.
+
 2006-03-30  Ken Raeburn  <raeburn@mit.edu>
 
 	* depfix.pl (uniquify): Sort dependencies, so little tweaks to
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index c9fd1d8ce..0ded4f35d 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
 LOCAL_SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
-	profile pty send-pr
+	profile send-pr
 ##WIN32##!endif
 BUILDTOP=$(REL)..