summaryrefslogtreecommitdiff
path: root/src/Makefile.global.in
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-06-17 00:10:40 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-06-17 00:10:40 +0000
commit1652d433582dc819746ba166a6dbdb9e9643e69a (patch)
tree132c0b4ef005551c728cb331a2486bb3b0dfa472 /src/Makefile.global.in
parentb36d31030be202830cc21e29ec2fd3aaedbc1ea3 (diff)
downloadpostgresql-1652d433582dc819746ba166a6dbdb9e9643e69a.tar.gz
Remove fmgrstamp-h business -- not needed and confusing
Add options to configure to automatically build for Kerberos support; no more editing of make files.
Diffstat (limited to 'src/Makefile.global.in')
-rw-r--r--src/Makefile.global.in40
1 files changed, 4 insertions, 36 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 399f30e4e8..10056c5361 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.78 2000/06/15 18:55:34 momjian Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.79 2000/06/17 00:09:31 petere Exp $
#
# NOTES
# Essentially all Postgres make files include this file and use the
@@ -108,39 +108,6 @@ ENFORCE_ALIGNMENT= true
# Comment out PROFILE to generate a profile version of the binaries
#PROFILE= -p -non_shared
-# If you plan to use Kerberos for authentication...
-#
-# Comment out KRBVERS if you do not use Kerberos.
-# Set KRBVERS to "4" for Kerberos v4, "5" for Kerberos v5.
-# XXX Edit the default Kerberos variables below!
-#
-#KRBVERS=5
-
-# Globally pass Kerberos file locations.
-# these are used in the postmaster and all libpq applications.
-#
-# Adjust KRBINCS and KRBLIBS to reflect where you have Kerberos
-# include files and libraries installed.
-# PG_KRB_SRVNAM is the name under which POSTGRES is registered in
-# the Kerberos database (KDC).
-# PG_KRB_SRVTAB is the location of the server's keytab file.
-#
-ifdef KRBVERS
-KRBINCS= -I/usr/krb5/include
-KRBLIBS= -L/usr/krb5/lib
-KRBFLAGS+= $(KRBINCS) -DPG_KRB_SRVNAM='"postgres"'
- ifeq ($(KRBVERS), 4)
-KRBFLAGS+= -DKRB4
-KRBFLAGS+= -DPG_KRB_SRVTAB='"/etc/srvtab"'
-KRBLIBS+= -lkrb -ldes
- else
- ifeq ($(KRBVERS), 5)
-KRBFLAGS+= -DKRB5
-KRBFLAGS+= -DPG_KRB_SRVTAB='"FILE:/usr/local/postgres/krb5.keytab"'
-KRBLIBS+= -lkrb5 -lcrypto -lcom_err
- endif
- endif
-endif
#
# Please do not edit USE_TCL and USE_TK by hand.
@@ -179,11 +146,12 @@ YACC= @YACC@
YFLAGS = @YFLAGS@
LEX= @LEX@
AROPT= @AROPT@
-CFLAGS= -I$(SRCDIR)/include @CPPFLAGS@ @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = -I$(SRCDIR)/include $(CPPFLAGS) @CFLAGS@
CFLAGS_SL= @SHARED_LIB@
-PGSQL_INCLUDES= @PGSQL_INCLUDES@
LIBS= @LIBS@
LDFLAGS= @LDFLAGS@ $(LIBS)
+KRB_LIBS = @KRB_LIBS@
LDREL= -r
LDOUT= -o
DLSUFFIX= @DLSUFFIX@