1
0
mirror of https://github.com/postgres/postgres.git synced 2025-10-31 10:30:33 +03:00

Remove fmgrstamp-h business -- not needed and confusing

Add options to configure to automatically build for Kerberos
support; no more editing of make files.
This commit is contained in:
Peter Eisentraut
2000-06-17 00:10:40 +00:00
parent b36d31030b
commit 1652d43358
23 changed files with 1054 additions and 677 deletions

View File

@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.67 2000/06/06 22:00:52 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.68 2000/06/17 00:09:59 petere Exp $
#
#-------------------------------------------------------------------------
@@ -19,9 +19,6 @@ include $(SRCDIR)/Makefile.global
CFLAGS+= -I../include -I$(LIBPQDIR)
ifdef KRBVERS
CFLAGS+= $(KRBFLAGS)
endif
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
connect.o misc.o

View File

@@ -4,7 +4,7 @@
# Makefile for pgeasy library
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.7 2000/06/06 22:00:53 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.8 2000/06/17 00:10:00 petere Exp $
#
#-------------------------------------------------------------------------
@@ -17,10 +17,6 @@ include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(LIBPQDIR)
ifdef KRBVERS
CFLAGS+= $(KRBFLAGS)
endif
OBJS= libpgeasy.o halt.o
SHLIB_LINK+= $(LIBPQ)

View File

@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.43 2000/06/14 17:07:31 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.44 2000/06/17 00:10:05 petere Exp $
#
#-------------------------------------------------------------------------
@@ -19,10 +19,6 @@ include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(LIBPQDIR)
ifdef KRBVERS
CFLAGS+= $(KRBFLAGS)
endif
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
SHLIB_LINK+= $(LIBPQ)

View File

@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.26 2000/06/06 22:01:06 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.27 2000/06/17 00:10:17 petere Exp $
#
#-------------------------------------------------------------------------
@@ -18,17 +18,13 @@ SRCDIR= ../..
include $(SRCDIR)/Makefile.global
CXX=@CXX@
CXXFLAGS=@CXXFLAGS@
CXXFLAGS=@CXXFLAGS@ @INCLUDES@
SRCHEADERDIR = $(SRCDIR)/include
LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
CXXFLAGS+= -I$(SRCHEADERDIR) -I$(LIBPQDIR)
ifdef KRBVERS
CXXFLAGS+= $(KRBFLAGS)
endif
OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o
ifeq ($(PORTNAME), win)

View File

@@ -19,14 +19,6 @@ CXXFLAGS+= -I$(HEADERDIR)
LDFLAGS+= -L$(LIBPQDIR) -lpq++
#
# And where libpq goes, so goes the authentication stuff...
#
ifdef KRBVERS
LDFLAGS+= $(KRBLIBS)
CXXFLAGS+= $(KRBFLAGS)
endif
PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 \
testlibpq4 testlibpq5 testlibpq6 testlo

View File

@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.59 2000/06/06 22:01:03 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.60 2000/06/17 00:10:09 petere Exp $
#
#-------------------------------------------------------------------------
@@ -19,11 +19,6 @@ include $(SRCDIR)/Makefile.global
CFLAGS+= -DFRONTEND
ifdef KRBVERS
CFLAGS+= $(KRBFLAGS)
SHLIB_LINK += $(KRBLIBS)
endif
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
pqexpbuffer.o dllist.o pqsignal.o @SNPRINTF@ @INET_ATON@
@@ -35,6 +30,10 @@ endif
# make sure it gets included in shared libpq.
SHLIB_LINK+= $(findstring -lcrypt,$(LIBS))
# Include kerberos libraries into libpq
SHLIB_LINK += $(KRB_LIBS)
# Shared library stuff, also default 'all' target
include $(SRCDIR)/Makefile.shlib

View File

@@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.42 2000/05/27 04:13:05 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.43 2000/06/17 00:10:09 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -119,7 +119,7 @@ static void
pg_krb4_init()
{
char *realm;
static init_done = 0;
static int init_done = 0;
if (init_done)
return;
@@ -129,7 +129,7 @@ pg_krb4_init()
* If the user set PGREALM, then we use a ticket file with a special
* name: <usual-ticket-file-name>@<PGREALM-value>
*/
if (realm = getenv("PGREALM"))
if ((realm = getenv("PGREALM")))
{
char tktbuf[MAXPGPATH];
@@ -184,7 +184,7 @@ pg_krb4_authname(char *PQerrormsg)
* (canonicalized to omit all domain suffixes).
*/
static int
pg_krb4_sendauth(const char *PQerrormsg, int sock,
pg_krb4_sendauth(char *PQerrormsg, int sock,
struct sockaddr_in * laddr,
struct sockaddr_in * raddr,
const char *hostname)
@@ -213,7 +213,7 @@ pg_krb4_sendauth(const char *PQerrormsg, int sock,
(u_long) 0,
(MSG_DAT *) NULL,
(CREDENTIALS *) NULL,
(Key_schedule *) NULL,
NULL,
laddr,
raddr,
PG_KRB4_VERSION);