Move pty library from util/pty to appl/libpty; update Makefile.in and

configure.in files accordingly.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index acebdf25f6027fafb80a1f1c4a2e1aa47d44aeac..fc076b3142a2a5751c2e1cc41736300f1053ad31 100644 (file)
--- 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 e35d1862625ef417e4a8bcd6b64f349fe5326c45..11a16a734a3db45c3af64f10aa33a47064b7674a 100644 (file)
--- 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 8b96bff50d140643cc156c44a17f709db86e016b..e8d2f65129ec1a3b970ea8f45eeb12ec54d0973e 100644 (file)
--- 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
similarity index 100%
rename from src/util/pty/.Sanitize
rename to src/appl/libpty/.Sanitize

diff --git a/src/util/pty/ChangeLog b/src/appl/libpty/ChangeLog
similarity index 99%
rename from src/util/pty/ChangeLog
rename to src/appl/libpty/ChangeLog
index fc026843ef743bd8fb44fd50270f949b77869fd1..2e42f7c993dd828dd2941db33c24a817ed05c095 100644 (file)
--- 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
similarity index 99%
rename from src/util/pty/Makefile.in
rename to src/appl/libpty/Makefile.in
index 4277a5217de7403badc0ff1c7dcf591286fea6ef..3c3ca3828df1a98fa02f64e2322229fc0a2625c5 100644 (file)
--- 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
similarity index 100%
rename from src/util/pty/README
rename to src/appl/libpty/README

diff --git a/src/util/pty/cleanup.c b/src/appl/libpty/cleanup.c
similarity index 100%
rename from src/util/pty/cleanup.c
rename to src/appl/libpty/cleanup.c

diff --git a/src/util/pty/configure.in b/src/appl/libpty/configure.in
similarity index 100%
rename from src/util/pty/configure.in
rename to src/appl/libpty/configure.in

diff --git a/src/util/pty/dump-utmp.c b/src/appl/libpty/dump-utmp.c
similarity index 100%
rename from src/util/pty/dump-utmp.c
rename to src/appl/libpty/dump-utmp.c

diff --git a/src/util/pty/getpty.c b/src/appl/libpty/getpty.c
similarity index 100%
rename from src/util/pty/getpty.c
rename to src/appl/libpty/getpty.c

diff --git a/src/util/pty/init.c b/src/appl/libpty/init.c
similarity index 100%
rename from src/util/pty/init.c
rename to src/appl/libpty/init.c

diff --git a/src/util/pty/init_slave.c b/src/appl/libpty/init_slave.c
similarity index 100%
rename from src/util/pty/init_slave.c
rename to src/appl/libpty/init_slave.c

diff --git a/src/util/pty/libpty.h b/src/appl/libpty/libpty.h
similarity index 100%
rename from src/util/pty/libpty.h
rename to src/appl/libpty/libpty.h

diff --git a/src/util/pty/logwtmp.c b/src/appl/libpty/logwtmp.c
similarity index 100%
rename from src/util/pty/logwtmp.c
rename to src/appl/libpty/logwtmp.c

diff --git a/src/util/pty/open_ctty.c b/src/appl/libpty/open_ctty.c
similarity index 100%
rename from src/util/pty/open_ctty.c
rename to src/appl/libpty/open_ctty.c

diff --git a/src/util/pty/open_slave.c b/src/appl/libpty/open_slave.c
similarity index 100%
rename from src/util/pty/open_slave.c
rename to src/appl/libpty/open_slave.c

diff --git a/src/util/pty/pty-int.h b/src/appl/libpty/pty-int.h
similarity index 100%
rename from src/util/pty/pty-int.h
rename to src/appl/libpty/pty-int.h

diff --git a/src/util/pty/pty_err.et b/src/appl/libpty/pty_err.et
similarity index 100%
rename from src/util/pty/pty_err.et
rename to src/appl/libpty/pty_err.et

diff --git a/src/util/pty/pty_paranoia.c b/src/appl/libpty/pty_paranoia.c
similarity index 100%
rename from src/util/pty/pty_paranoia.c
rename to src/appl/libpty/pty_paranoia.c

diff --git a/src/util/pty/sane_hostname.c b/src/appl/libpty/sane_hostname.c
similarity index 100%
rename from src/util/pty/sane_hostname.c
rename to src/appl/libpty/sane_hostname.c

diff --git a/src/util/pty/update_utmp.c b/src/appl/libpty/update_utmp.c
similarity index 100%
rename from src/util/pty/update_utmp.c
rename to src/appl/libpty/update_utmp.c

diff --git a/src/util/pty/update_wtmp.c b/src/appl/libpty/update_wtmp.c
similarity index 100%
rename from src/util/pty/update_wtmp.c
rename to src/appl/libpty/update_wtmp.c

diff --git a/src/util/pty/vhangup.c b/src/appl/libpty/vhangup.c
similarity index 100%
rename from src/util/pty/vhangup.c
rename to src/appl/libpty/vhangup.c

diff --git a/src/util/pty/void_assoc.c b/src/appl/libpty/void_assoc.c
similarity index 100%
rename from src/util/pty/void_assoc.c
rename to src/appl/libpty/void_assoc.c

diff --git a/src/configure.in b/src/configure.in
index 8b75fff4d492ddbf3612021729634edeb1d26eac..857d6fe54a54a3deb2ef41e78c2c17882b7a013a 100644 (file)
--- 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 0b81219d48393b0a866949a9d72e3b1e1f8c92de..89eff938bde6007880eeed4bafd57a163c0f87f6 100644 (file)
--- 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 c9fd1d8ce6cb5dbf223d1ccf9b295dce6f689ea7..0ded4f35d4c6a23df52c9bd3334332789ede4f85 100644 (file)
--- 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)..