libzvt changes

[Havoc Pennington <hp redhat com>]

Hi,

etc., etc.

Havoc

Index: libzvt/ChangeLog
===================================================================
RCS file: /cvs/gnome/libzvt/libzvt/ChangeLog,v
retrieving revision 1.298
diff -u -p -u -r1.298 ChangeLog
--- libzvt/ChangeLog	2001/09/07 21:36:12	1.298
+++ libzvt/ChangeLog	2001/09/19 19:04:16
@@ -1,3 +1,11 @@
+2001-09-18  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (gnome-pty-helper-2): rename gnome-pty-helper, and
+	use automake properly to compile it (what was up with this
+	before?)
+
+	* subshell.c (get_ptys): rename gnome-pty-helper
+
 Fri Sep 07 14:32:00 2001  George Lebl <jirka 5z com>
 
 	* Makefile.am, libzvt-2.0.pc.in:  Use the gnome-2.0 prefix just like
Index: libzvt/Makefile.am
===================================================================
RCS file: /cvs/gnome/libzvt/libzvt/Makefile.am,v
retrieving revision 1.53
diff -u -p -u -r1.53 Makefile.am
--- libzvt/Makefile.am	2001/09/07 21:36:12	1.53
+++ libzvt/Makefile.am	2001/09/19 19:04:16
@@ -1,5 +1,5 @@
 noinst_PROGRAMS  = zterm test-utmp
-sbin_PROGRAMS    = gnome-pty-helper
+sbin_PROGRAMS    = gnome-pty-helper-2
 lib_LTLIBRARIES  = libzvt-2.la
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -47,9 +47,13 @@ libzvt_2_la_SOURCES = \
 
 libzvt_2_la_LIBADD = $(ZVT_LIBS)
 
-gnome-pty-helper: gnome-pty-helper.o gnome-login-support.o gnome-utmp.o
-	$(CC) -o $@ $^ $(UTIL_LIBS)
+gnome_pty_helper_2_SOURCES=   \
+	gnome-pty-helper.c    \
+        gnome-login-support.c \
+        gnome-utmp.c
 
+gnome_pty_helper_2_LDADD= $(UTIL_LIBS)
+
 # Since we do gnome-pty-helper manually, include the relevant sources here
 EXTRA_DIST = TODO BUGS README	\
 	gnome-pty.h gnome-pty-helper.c gnome-utmp.c
@@ -68,5 +72,5 @@ test_utmp_SOURCES =			\
 test_utmp_LDADD =
 
 install-exec-local:
-	-file=$(DESTDIR)$(sbindir)/gnome-pty-helper; \
+	-file=$(DESTDIR)$(sbindir)/gnome-pty-helper-2; \
 	chown root $$file && chgrp root $$file && chmod u+s $$file
Index: libzvt/subshell.c
===================================================================
RCS file: /cvs/gnome/libzvt/libzvt/subshell.c,v
retrieving revision 1.37
diff -u -p -u -r1.37 subshell.c
--- libzvt/subshell.c	2000/03/28 22:20:46	1.37
+++ libzvt/subshell.c	2001/09/19 19:04:16
@@ -242,7 +242,7 @@ get_ptys (int *master, int *slave, int u
 			close (helper_socket_fdpassing [0]);
 			close (helper_socket_fdpassing [1]);
 
-			execl (GNOMESBINDIR "/gnome-pty-helper", "gnome-pty-helper", NULL);
+			execl (GNOMESBINDIR "/gnome-pty-helper-2", "gnome-pty-helper", NULL);
 			exit (1);
 		} else {
 			close (helper_socket_fdpassing [1]);