Commit979b537

committed

Include -lkrb5 when needed for shlibs depending on libpq. Per report

from Johan Henselmans.

1 parente554e2b commit979b537Copy full SHA for 979b537

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.10 2003/09/27 19:35:32 tgl Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.11 2003/10/28 21:55:58 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -18,7 +18,7 @@ SO_MINOR_VERSION= 0`
`18`	`18`
`19`	`19`	`overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils$(CPPFLAGS)$(THREAD_CPPFLAGS)`
`20`	`20`	`SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes$(libpq)\`
`21`		`-$(filter -lssl -lcrypto -lcrypt -lm,$(LIBS))$(THREAD_LIBS)`
	`21`	`+$(filter -lssl -lcrypto -lkrb5 -lcrypt -lm,$(LIBS))$(THREAD_LIBS)`
`22`	`22`
`23`	`23`	`OBJS= informix.o`
`24`	`24`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.9 2003/09/27 19:35:32 tgl Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.10 2003/10/28 21:55:58 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -22,7 +22,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \`
`22`	`22`	`connect.o misc.o`
`23`	`23`
`24`	`24`	`SHLIB_LINK = -L../pgtypeslib -lpgtypes$(libpq)\`
`25`		`-$(filter -lssl -lcrypto -lcrypt -lm,$(LIBS))$(THREAD_LIBS)`
	`25`	`+$(filter -lssl -lcrypto -lkrb5 -lcrypt -lm,$(LIBS))$(THREAD_LIBS)`
`26`	`26`
`27`	`27`	`all: all-lib`
`28`	`28`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.32 2003/09/27 20:38:19 tgl Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.33 2003/10/28 21:55:58 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -21,7 +21,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(TCL_INCLUDE_SPEC)`
`21`	`21`	`OBJS= pgtcl.o pgtclCmds.o pgtclId.o`
`22`	`22`
`23`	`23`	`SHLIB_LINK =$(libpq)$(TCL_LIB_SPEC)$(TCL_LIBS)\`
`24`		`-$(filter -lssl -lcrypto -lcrypt,$(LIBS))$(THREAD_LIBS)`
	`24`	`+$(filter -lssl -lcrypto -lkrb5 -lcrypt,$(LIBS))$(THREAD_LIBS)`
`25`	`25`
`26`	`26`	`all: submake-libpq all-lib`
`27`	`27`

Comments

(0)