Remove fmgrstamp-h business -- not needed and confusing

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

Author: petere

configure

@@ -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])
+
+# SRCH_INC comes from the template file
+ac_save_IFS=$IFS
+IFS=':'
+for dir in $with_includes $SRCH_INC; do
+  if test -d "$dir"; then
+    INCLUDES="$INCLUDES -I$dir"
+  else
+    AC_MSG_WARN([*** Include directory $dir does not exist.])
+  fi
+done
+IFS=$ac_save_IFS
+AC_SUBST(INCLUDES)
 
-AC_ARG_WITH(includes,
-    [  --with-includes=DIRS    look for header files for tcl/tk, etc in DIRS],
-    [
-	case "$withval" in
-	"" | y | ye | yes | n | no)
-	    AC_MSG_ERROR([*** You must supply an argument to the --with-includes option.])
-	  ;;
-	esac
-	INCLUDE_DIRS="$withval"
-    ])
-
-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(${curses}, main,
-		[LIBS="-l${curses} $LIBS"; break])
-done
+AC_CHECK_LIB(ncurses,  main, [], [AC_CHECK_LIB(curses, main)])
 AC_CHECK_LIB(termcap,  main)
 AC_CHECK_LIB(readline, main)
 AC_CHECK_LIB(readline, using_history, AC_DEFINE(HAVE_HISTORY_IN_READLINE),

configure.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/Makefile.global.in

@@ -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/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/libpq/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
-
-fmgrstamp-h: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
+fmgroids.h fmgrtab.c: 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/backend/utils/Makefile

@@ -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/pg_dump/Makefile.in

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