Remove fmgrstamp-h business -- not needed and confusing

Add options to configure to automatically build for Kerberos
support; no more editing of make files.

configure.in

@@ -149,30 +149,31 @@ sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "src/template/$TEMPLATE" >conftest.sh
 rm -f conftest.sh
 ]
 
+dnl
+dnl Add non-standard directories to the include path
+dnl
+AC_ARG_WITH(includes, [  --with-includes=DIRS    add non-standard include paths],
+[if test x"$withval" = x"yes" || test x"$withval" = x"no" ; then
+  AC_MSG_ERROR([You must supply an argument to the --with-includes option.])
+fi])
 
-AC_ARG_WITH(includes,
+# SRCH_INC comes from the template file
-    [  --with-includes=DIRS    look for header files for tcl/tk, etc in DIRS],
+ac_save_IFS=$IFS
-    [
+IFS=':'
-	case "$withval" in
+for dir in $with_includes $SRCH_INC; do
-	"" | y | ye | yes | n | no)
+  if test -d "$dir"; then
-	    AC_MSG_ERROR([*** You must supply an argument to the --with-includes option.])
+    INCLUDES="$INCLUDES -I$dir"
-	  ;;
+  else
-	esac
+    AC_MSG_WARN([*** Include directory $dir does not exist.])
-	INCLUDE_DIRS="$withval"
+  fi
-    ])
+done
+IFS=$ac_save_IFS
+AC_SUBST(INCLUDES)
 
-dnl INCLUDE_DIRS comes from command line, SRCH_INC from template file.
-dnl Each can name one or more directories.
-if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
-	for dir in $INCLUDE_DIRS $SRCH_INC; do
-		if test -d "$dir"; then
-			PGSQL_INCLUDES="$PGSQL_INCLUDES -I$dir"
-		else
-			AC_MSG_WARN([*** Include directory $dir does not exist.])
-		fi
-	done
-fi
 
+dnl
+dnl Add non-standard directories to the library search path
+dnl
 AC_ARG_WITH(libraries,
     [  --with-libraries=DIRS   look for additional libraries in DIRS],
     [
@@ -394,6 +395,108 @@ fi],
 [AC_MSG_RESULT(no)])
 AC_SUBST(with_python)
 
+
+dnl
+dnl Optionally build with Kerberos 4 support
+dnl
+AC_MSG_CHECKING(whether to build with Kerberos 4 support)
+AC_ARG_WITH(krb4, [  --with-krb4[=DIR]       use Kerberos 4 [/usr/athena]],
+[if test x"$withval" != x"no"; then
+  # If the user didn't give an argument, we take the Kerberos 4 default
+  # path /usr/athena. We look into lib/ and include/ for the Kerberos
+  # libraries and includes. If the user has a more complicated layout
+  # he can use --with-includes and --with-libraries.
+  if test x"$withval" = x"yes"; then
+    krb4dir=/usr/athena
+  else
+    krb4dir=$withval
+  fi
+  with_krb4=yes
+  AC_MSG_RESULT(yes)
+  if test -d $krb4dir; then
+    if test -d "$krb4dir/include"; then
+      INCLUDES="$INCLUDES -I$krb4dir/include"
+    fi
+    if test -d "$krb4dir/lib"; then
+      krb_libdir="-L$krb4dir/lib"
+      LIBS="$krb_libdir $LIBS"
+    fi
+  fi
+  AC_CHECK_LIB(des, main, [], [AC_MSG_ERROR([library \`des' is required for Kerberos 4])])
+  AC_CHECK_LIB(krb, main, [], [AC_MSG_ERROR([library \`krb' is required for Kerberos 4])])
+  KRB_LIBS="$krb_libdir -lkrb -ldes"
+  AC_DEFINE(KRB4,, [Define if you are building with Kerberos 4 support.])
+else
+  AC_MSG_RESULT(no)
+fi],
+[AC_MSG_RESULT(no)])
+AC_SUBST(with_krb4)
+
+
+dnl
+dnl Optionally build with Kerberos 5 support
+dnl
+AC_MSG_CHECKING(whether to build with Kerberos 5 support)
+AC_ARG_WITH(krb5, [  --with-krb5[=DIR]       use Kerberos 5 [/usr/athena]],
+[if test x"$withval" != x"no"; then
+  if test x"$withval" = x"yes"; then
+    krb5dir=/usr/athena
+  else
+    krb5dir=$withval
+  fi
+  with_krb5=yes
+  AC_MSG_RESULT(yes)
+  if test -d $krb5dir; then
+    if test -d "$krb5dir/include"; then
+      INCLUDES="$INCLUDES -I$krb5dir/include"
+    fi
+    if test -d "$krb5dir/lib"; then
+      krb_libdir="-L$krb5dir/lib"
+      LIBS="$krb_libdir $LIBS"
+    fi
+  fi
+  AC_CHECK_LIB(com_err, main, [], [AC_MSG_ERROR([library \`com_err' is required for Kerberos 5])])
+  AC_CHECK_LIB(crypto, main, [], [AC_MSG_ERROR([library \`crypto' is required for Kerberos 5])])
+  AC_CHECK_LIB(krb5, main, [], [AC_MSG_ERROR([library \`krb5' is required for Kerberos 5])])
+  KRB_LIBS="$krb_libdir -lkrb5 -lcrypto -lcom_err"
+  AC_DEFINE(KRB5,, [Define if you are building with Kerberos 5 support.])
+else
+  AC_MSG_RESULT(no)
+fi],
+[AC_MSG_RESULT(no)])
+AC_SUBST(with_krb5)
+
+dnl Necessary for special libpq link
+AC_SUBST(KRB_LIBS)
+
+
+dnl
+dnl Kerberos configuration parameters
+dnl
+AC_ARG_WITH(krb-srvnam, [  --with-krb-srvnam=NAME  name of the Postgres service principal in Kerberos],
+[if test x"$withval" = x"yes"; then
+  AC_MSG_ERROR([argument required for --with-krb-srvnam])
+else
+  krb_srvnam=$withval
+fi],
+[krb_srvnam="postgres"])
+AC_DEFINE_UNQUOTED(PG_KRB_SRVNAM, ["$krb_srvnam"], [The name of the Postgres service principal])
+
+AC_ARG_WITH(krb-srvtab, [  --with-krb-srvtab=FILE  location of Kerberos server's keytab file],
+[if test x"$withval" = x"yes"; then
+  AC_MSG_ERROR([argument required for --with-krb-srvtab])
+else
+  krb_srvtab=$withval
+fi],
+[if test x"$with_krb5" = x"yes"; then
+  krb_srvtab="FILE:/usr/local/postgres/krb5.keytab"
+else
+  krb_srvtab="/etc/srvtab"
+fi])
+AC_DEFINE_UNQUOTED(PG_KRB_SRVTAB, ["$krb_srvtab"], [The location of the Kerberos server's keytab file])
+
+
+
 dnl We include odbc support unless we disable it with --with-odbc=false
 AC_MSG_CHECKING(setting USE_ODBC)
 AC_ARG_WITH(
@@ -467,7 +570,7 @@ then
   unixODBC_libs="$unixODBC/lib"
   unixODBC_includes="$unixODBC/include"
 
-  CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
+  INCLUDES="$INCLUDES -I$unixODBC_includes"
   AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
           unixODBC_ok=yes;
           odbc_headers="$odbc_headers $ac_hdr",
@@ -499,7 +602,7 @@ AC_ARG_ENABLE(
    AC_MSG_RESULT(disabled)
 )
 
-CPPFLAGS="$CPPFLAGS $PGSQL_INCLUDES"
+CPPFLAGS="$CPPFLAGS $INCLUDES"
 echo "- setting CPPFLAGS=$CPPFLAGS"
 
 LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
@@ -547,8 +650,6 @@ AC_SUBST(PORTNAME)
 AC_SUBST(CPU)
 AC_SUBST(SRCDIR)
 AC_SUBST(LDFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(PGSQL_INCLUDES)
 AC_SUBST(AROPT)
 AC_SUBST(SHARED_LIB)
 AC_SUBST(CFLAGS)
@@ -636,10 +737,7 @@ AC_SUBST(YFLAGS)
 
 
 AC_CHECK_LIB(sfio,     main)
-for curses in ncurses curses ; do
+AC_CHECK_LIB(ncurses,  main, [], [AC_CHECK_LIB(curses, main)])
-	AC_CHECK_LIB(${curses}, main,
-		[LIBS="-l${curses} $LIBS"; break])
-done
 AC_CHECK_LIB(termcap,  main)
 AC_CHECK_LIB(readline, main)
 AC_CHECK_LIB(readline, using_history, AC_DEFINE(HAVE_HISTORY_IN_READLINE),

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@

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.54 2000/06/05 07:16:12 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.55 2000/06/17 00:09:34 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -59,13 +59,6 @@ endif
 
 VERSIONOBJ = $(SRCDIR)/utils/version.o
 
-# kerberos flags
-
-ifdef KRBVERS
-CFLAGS+= $(KRBFLAGS)
-LDFLAGS+= $(KRBLIBS)
-endif
-
 ifeq ($(MAKE_DLL), true)
 DLLOBJS= $(OBJS) $(VERSIONOBJ)
 DLLLIBS= -L/usr/local/lib -lcygipc -lcrypt -lcygwin -lkernel32
@@ -303,5 +296,5 @@ $(IDFILE):
 #	make foo.C
 #
 %.cpp:	%.c
-	$(CC) -E $(CFLAGS) $(<:.C=.c) | cat -s | cb | tr -s '\012*' '\012' \
+	$(CC) -E $(CPPFLAGS) $(<:.C=.c) | cat -s | cb | tr -s '\012*' '\012' \
 	    > $(@F)

src/backend/libpq/Makefile

@@ -4,19 +4,13 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.19 2000/05/29 05:44:46 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.20 2000/06/17 00:09:40 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-# kerberos flags
-ifdef KRBVERS
-CFLAGS+= $(KRBFLAGS)
-LDFLAGS+= $(KRBLIBS)
-endif
-
 OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o portal.o portalbuf.o \
 	auth.o hba.o crypt.o password.o \
 	pqcomm.o pqformat.o pqpacket.o pqsignal.o util.o

src/backend/utils/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for utils
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.14 2000/06/09 02:38:36 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.15 2000/06/17 00:09:43 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -32,25 +32,13 @@ SUBSYS.o: $(OBJS)
 submake:
 	for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
 
-# Gen_fmgrtab.sh will not change the timestamp of its output files
-# if they already exist and would not be changed. This is to avoid
-# unnecessary recompilations. In order to avoid re-running it all
-# the time we update a stamp file instead. (Idea stolen from
-# autoconf and autoheader.)
 
-fmgroids.h fmgrtab.c: fmgrstamp-h
+fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
-
-fmgrstamp-h: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
 	$(SHELL) $(SHOPTS) Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
-	date > fmgrstamp-h
 
-# don't clean fmgroids.h and fmgrtab.c, but do clean fmgrstamp-h
-# (we don't really want to put that much trust in timestamps in
-# distribution files and CVS pulls, so force at least one run of
-# Gen_fmgrtab.sh after a make clean)
 
 clean:
-	rm -f SUBSYS.o fmgrtab.o fmgrstamp-h
+	rm -f SUBSYS.o fmgrtab.o fmgroids.h fmgrtab.c
 	for i in $(DIRS); do $(MAKE) -C $$i clean; done
 
 dep depend: fmgroids.h fmgrtab.c

src/bin/pg_dump/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.13 2000/05/11 17:46:32 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.14 2000/06/17 00:09:44 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,13 +18,6 @@ OBJS= pg_dump.o common.o @STRDUP@
 
 CFLAGS+= -I$(LIBPQDIR)
 
-#
-# And where libpq goes, so goes the authentication stuff...
-#
-ifdef KRBVERS
-LDFLAGS+= $(KRBLIBS)
-CFLAGS+= $(KRBFLAGS)
-endif
 
 all: submake pg_dump
 

src/bin/pgtclsh/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.26 2000/06/12 02:23:47 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.27 2000/06/17 00:09:47 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,10 +24,6 @@ endif
 
 CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR)
 
-ifdef KRBVERS
-LDFLAGS+= $(KRBLIBS)
-CFLAGS+= $(KRBFLAGS)
-endif
 
 # If we are here then TCL is available
 PGMS = pgtclsh

src/bin/psql/Makefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.25 2000/06/10 18:01:45 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.26 2000/06/17 00:09:51 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,14 +19,6 @@ PERL = @PERL@
 
 CFLAGS+= -I$(LIBPQDIR)
 
-#
-# And where libpq goes, so goes the authentication stuff...
-#
-ifdef KRBVERS
-LDFLAGS+= $(KRBLIBS)
-CFLAGS+= $(KRBFLAGS)
-endif
-
 OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \
 	copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \
 	tab-complete.o

src/include/config.h.in

@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.118 2000/06/11 11:39:58 petere Exp $
+ * $Id: config.h.in,v 1.119 2000/06/17 00:09:56 petere Exp $
  */
 
 #ifndef CONFIG_H
@@ -524,6 +524,17 @@ extern void srandom(unsigned int seed);
 /* Define if C++ compiler accepts "#include <string>" */
 #undef HAVE_CXX_STRING_HEADER
 
+/* Define if you are building with Kerberos 4 support */
+#undef KRB4
+
+/* Define if you are building with Kerberos 5 support */
+#undef KRB5
+
+/* The name of the Postgres service principal in Kerberos */
+#undef PG_KRB_SRVNAM
+
+/* The location of the Kerberos server's keytab file */
+#undef PG_KRB_SRVTAB
 
 /*
  * Pull in OS-specific declarations (using link created by configure)

src/interfaces/ecpg/lib/Makefile.in

@@ -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

src/interfaces/libpgeasy/Makefile.in

@@ -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)

src/interfaces/libpgtcl/Makefile.in

@@ -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)

src/interfaces/libpq++/Makefile.in

@@ -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)

src/interfaces/libpq++/examples/Makefile

@@ -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
 

src/interfaces/libpq/Makefile.in

@@ -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
 

src/interfaces/libpq/fe-auth.c

@@ -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);

src/pl/plperl/GNUmakefile.in

@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/pl/plperl/Attic/GNUmakefile.in,v 1.1 2000/06/10 18:02:11 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/plperl/Attic/GNUmakefile.in,v 1.2 2000/06/17 00:10:21 petere Exp $
 
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -14,14 +14,14 @@ plperl_installdir = $(libdir)
 
 mkinstalldirs = @mkinstalldirs@
 PERL = @PERL@
-PGSQL_INCLUDES = @PGSQL_INCLUDES@
+INCLUDES = @INCLUDES@
 
 all: Makefile
 	$(MAKE) -f $< all
 
 Makefile: Makefile.PL
 	@plperl_installdir='$(plperl_installdir)' \
-	  EXTRA_INCLUDES='-I$(top_srcdir)/src/include $(PGSQL_INCLUDES)' \
+	  EXTRA_INCLUDES='-I$(top_srcdir)/src/include $(INCLUDES)' \
 	  $(PERL) $< POLLUTE=1
 
 install: Makefile installdirs

src/pl/tcl/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for the pltcl shared object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.16 2000/06/12 02:23:52 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.17 2000/06/17 00:10:25 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -70,7 +70,7 @@ CFLAGS= $(TCL_CFLAGS_OPTIMIZE)
 
 CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
 
-CFLAGS+= -I$(SRCDIR)/include $(PGSQL_INCLUDES)
+CFLAGS+= -I$(SRCDIR)/include $(INCLUDES)
         
 #
 # Uncomment the following to enable the unknown command lookup

src/test/bench/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.5 1998/01/04 19:12:48 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.6 2000/06/17 00:10:28 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,13 +19,6 @@ OUTFILES= bench.out bench.out.perquery
 
 CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
 
-#
-# And where libpq goes, so goes the authentication stuff...
-#
-ifdef KRBVERS
-LDFLAGS+= $(KRBLIBS)
-CFLAGS+= $(KRBFLAGS)
-endif
 
 all: $(CREATEFILES)
 	rm -f $(OUTFILES)

src/test/examples/Makefile

@@ -9,13 +9,6 @@ CFLAGS+= -I$(LIBPQDIR)
 
 LDFLAGS+= -L$(LIBPQDIR) -lpq 
 
-#
-# And where libpq goes, so goes the authentication stuff...
-#
-ifdef KRBVERS
-LDFLAGS+= $(KRBLIBS)
-CFLAGS+= $(KRBFLAGS)
-endif
 
 # PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo
 PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo testlo2

src/test/locale/Makefile

@@ -5,13 +5,6 @@
 SRCDIR= ../..
 include ../../Makefile.global
 
-#
-# And where libpq goes, so goes the authentication stuff...
-#
-ifdef KRBVERS
-LDFLAGS+= $(KRBLIBS)
-CFLAGS+= $(KRBFLAGS)
-endif
 
 PROGS = test-pgsql-locale test-ctype
 DIRS = koi8-r ISO8859-7 koi8-to-win1251

src/tools/release_prep

@@ -43,13 +43,6 @@ rm -f bootstrap_tokens.h bootparse.c bootscanner.c
 $MAKE bootstrap_tokens.h bootparse.c bootscanner.c
 cd ../../..
 
-# Generate function manager files
-
-cd src/backend/utils
-rm -f fmgroids.h fmgrtab.c fmgrstamp-h
-$MAKE fmgroids.h fmgrtab.c
-cd ../../..
-
 # Generate configuration file scanner
 
 cd src/backend/utils/misc