From 1ca858e972d952e4e587bd0ad63069cfd0ca0f73 Mon Sep 17 00:00:00 2001
From: jbasney <jbasney>
Date: Tue, 9 Jul 2002 22:57:29 +0000
Subject: [PATCH] make installation of gsi prefixed binaries and man pages
 conditional on whether we actually compiled with GSI support

---
 openssh/Makefile.in  | 31 +++++++++++++++++++------------
 openssh/configure.ac |  6 +++++-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/openssh/Makefile.in b/openssh/Makefile.in
index 7acd9b9..a2293aa 100644
--- a/openssh/Makefile.in
+++ b/openssh/Makefile.in
@@ -55,6 +55,7 @@ EXEEXT=@EXEEXT@
 
 INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
 INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
+INSTALL_GSISSH=@INSTALL_GSISSH@
 
 @NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT)
 
@@ -251,14 +252,16 @@ install-files: scard-install
 	ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 	ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
-	-rm -f $(DESTDIR)$(bindir)/gsissh
-	ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/gsissh
-	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
-	ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
-	-rm -f $(DESTDIR)$(bindir)/gsiscp
-	ln -s scp$(EXEEXT) $(DESTDIR)$(bindir)/gsiscp
-	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
-	ln -s scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
+	if [ ! -z "$(INSTALL_GSISSH)" ]; then \
+		rm -f $(DESTDIR)$(bindir)/gsissh; \
+		ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/gsissh; \
+		rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
+		ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
+		rm -f $(DESTDIR)$(bindir)/gsiscp; \
+		ln -s scp$(EXEEXT) $(DESTDIR)$(bindir)/gsiscp; \
+		rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
+		ln -s scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
+	fi
 	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
 	fi
@@ -329,8 +332,10 @@ uninstallall:	uninstall
 
 uninstall: 
 	-rm -f $(DESTDIR)$(bindir)/slogin
-	-rm -f $(DESTDIR)$(bindir)/gsiscp
-	-rm -f $(DESTDIR)$(bindir)/gsissh
+	if [ ! -z "$(INSTALL_GSISSH)" ]; then \
+		rm -f $(DESTDIR)$(bindir)/gsiscp; \
+		rm -f $(DESTDIR)$(bindir)/gsissh; \
+	fi
 	-rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT)
 	-rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT)
 	-rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
@@ -344,8 +349,10 @@ uninstall:
 	-rm -f $(DESTDIR)$(RAND_HELPER)$(EXEEXT)
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1
-	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1
+	if [ ! -z "$(INSTALL_GSISSH)" ]; then \
+		rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1; \
+		rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1; \
+	fi
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
diff --git a/openssh/configure.ac b/openssh/configure.ac
index 9fd96ae..dde7dd9 100644
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -575,8 +575,12 @@ if test "x$gsi_path" != "xno" ; then
 	LIBS="$LIBS $GSI_LIBS"
 	LDFLAGS="$LDFLAGS $GSI_LDFLAGS"
 	CFLAGS="$CFLAGS $GSI_CFLAGS"
-# End Globus/GSI section
+	INSTALL_GSISSH="yes"
+else
+	INSTALL_GSISSH=""
 fi
+AC_SUBST(INSTALL_GSISSH)
+# End Globus/GSI section
 
 # Check whether user wants S/Key support
 SKEY_MSG="no" 
-- 
2.45.1