From 979b5375227dac6c42c1e5b9557d9d698997e7d1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 28 Oct 2003 21:55:58 +0000 Subject: [PATCH] Include -lkrb5 when needed for shlibs depending on libpq. Per report from Johan Henselmans. --- src/interfaces/ecpg/compatlib/Makefile | 4 ++-- src/interfaces/ecpg/ecpglib/Makefile | 4 ++-- src/interfaces/libpgtcl/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index 5c65a53824..da81ff47f8 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.10 2003/09/27 19:35:32 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.11 2003/10/28 21:55:58 tgl Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ SO_MINOR_VERSION= 0 override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS) $(THREAD_CPPFLAGS) SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \ - $(filter -lssl -lcrypto -lcrypt -lm, $(LIBS)) $(THREAD_LIBS) + $(filter -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(THREAD_LIBS) OBJS= informix.o diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index 70e73aaba3..25620f35b3 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.9 2003/09/27 19:35:32 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.10 2003/10/28 21:55:58 tgl Exp $ # #------------------------------------------------------------------------- @@ -22,7 +22,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ connect.o misc.o SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \ - $(filter -lssl -lcrypto -lcrypt -lm, $(LIBS)) $(THREAD_LIBS) + $(filter -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(THREAD_LIBS) all: all-lib diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile index 215da00754..c6da2b9bd0 100644 --- a/src/interfaces/libpgtcl/Makefile +++ b/src/interfaces/libpgtcl/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.32 2003/09/27 20:38:19 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.33 2003/10/28 21:55:58 tgl Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(TCL_INCLUDE_SPEC) OBJS= pgtcl.o pgtclCmds.o pgtclId.o SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \ - $(filter -lssl -lcrypto -lcrypt, $(LIBS)) $(THREAD_LIBS) + $(filter -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS) all: submake-libpq all-lib