From 561f2cdd8613f26d7de48c567b603e8c06fe7e5a Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Sun, 9 Feb 1997 17:43:52 +0000
Subject: Merge of libhack_branch

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/gssftp/ftp/ChangeLog    |  5 +++++
 src/appl/gssftp/ftp/Makefile.in  | 12 ++++--------
 src/appl/gssftp/ftp/configure.in |  3 +--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/appl/gssftp/ftp')

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 9d39c10..2dced63 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 20:29:31 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:48:19 1996  unknown  <bjaspan@mit.edu>
 
 	* ftp.c (hookup): use sizeof instead of h_length to determine
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index 145ddc2..27a39b2 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -2,8 +2,8 @@
 # appl/gssftp/ftp/Makefile.in
 #
 CFLAGS = -DGSSAPI -DFTP_BUFSIZ=10240 $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS	= cmds.c cmdtab.c domacro.c ftp.c getpass.c glob.c main.c pclose.c \
 	  radix.c ruserpass.c secure.c 
@@ -12,17 +12,13 @@ SRCS	= cmds.c cmdtab.c domacro.c ftp.c getpass.c glob.c main.c pclose.c \
 OBJS	= cmds.o cmdtab.o domacro.o ftp.o getpass.o glob.o main.o pclose.o \
 	  radix.o ruserpass.o secure.o
 
-KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \
-		$(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
 LOCALINCLUDE = -I$(srcdir)/..
 DEFINES = -DGSSAPI -DNOCONFIDENTIAL
 
 all::	ftp
 
-ftp:	$(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o ftp $(OBJS) $(KLIB) $(LIBS)
+ftp:	$(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) ftp
diff --git a/src/appl/gssftp/ftp/configure.in b/src/appl/gssftp/ftp/configure.in
index 40b0785..cac62b4 100644
--- a/src/appl/gssftp/ftp/configure.in
+++ b/src/appl/gssftp/ftp/configure.in
@@ -16,6 +16,5 @@ AC_HEADER_STDARG
 AC_CHECK_HEADERS(sys/select.h)
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
 AC_CHECK_HEADERS(stdlib.h)
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
-- 
cgit v1.1