diff --git a/src/backend/Makefile b/src/backend/Makefile
index 285bf77d69325f7b937b62b5a45615c03d88eb1e..60b2d6f60d2be6078b02e6a97a4d053caf35b0cd 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.29 1997/12/20 00:22:06 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.30 1998/01/04 19:12:02 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -51,6 +51,14 @@ endif
 
 OBJS = $(DIRS:%=%/SUBSYS.o)
 
+# kerberos flags
+
+ifdef KRBVERS
+CFLAGS+= $(KRBFLAGS)
+LDFLAGS+= $(KRBLIBS)
+endif
+
+
 all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
 				global1.description local1_template1.description
 
@@ -121,7 +129,6 @@ install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
          global1.bki.source local1_template1.bki.source \
          global1.description local1_template1.description \
          libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
-	
 	$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
 ifeq ($(MAKE_EXPORTS), true)
 	$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in
index 57c74b826f82bd11151b9f52d9cf179fe9b3fa16..6b5c5ef14a48c818a3bcb49ba47ed285cbf142b0 100644
--- a/src/bin/pg_dump/Makefile.in
+++ b/src/bin/pg_dump/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.4 1997/04/26 06:13:31 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.5 1998/01/04 19:12:06 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,6 +18,14 @@ 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
 
 pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
index 42c6fbc753c76dd775a57d2b8e877b086e7e11c9..ed9b7cf957f00c81601ca4559fb4c9bb882b40a7 100644
--- a/src/bin/pg_id/Makefile
+++ b/src/bin/pg_id/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.6 1997/04/26 05:05:20 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.7 1998/01/04 19:12:11 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,6 +16,14 @@ include ../../Makefile.global
 
 OBJS= pg_id.o
 
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
 all: pg_id
 
 pg_id: $(OBJS) $(LIBPQDIR)/libpq.a
diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index ab7de496fdc0096c08c863a5f63c5bec3d10799b..62b32d4ec4335450ce0410b56b51463c02e28678 100644
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.5 1997/04/26 05:06:40 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.6 1998/01/04 19:12:21 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,6 +16,14 @@ include ../../Makefile.global
 
 CFLAGS+= -I$(LIBPQDIR)
 
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
 OBJS= psql.o stringutils.o @STRDUP@ 
 
 all: submake psql
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index b59146d8c0d524167b392a39a61940a879533eec..b4c48749898adc70b9185e83bb24e1acb8578dd5 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.14 1997/12/30 04:01:28 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.15 1998/01/04 19:12:38 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,12 +241,11 @@ tas_dummy()
 
 static int	tas(slock_t *lock);
 
-static int
+static void
 tas_dummy()
 {
 	asm(".seg \"data\"");
 	asm(".seg \"text\"");
-	asm(".global _tas");
 	asm("_tas:");
 
 	/*
@@ -321,7 +320,7 @@ void S_LOCK(slock_t* lock);
 
 #endif							/* defined(__alpha__) && defined(linux) */
 
-#if (defined(linux) || defined(__NetBSD__)) && defined(sparc)
+#if defined(linux) && defined(sparc)
 
 #define S_LOCK(lock)	do \
 						{ \
diff --git a/src/test/bench/Makefile b/src/test/bench/Makefile
index 9e6a54fd858dbf9b239d76d8f265b8e5c7f96d89..69b1f365ada59e0b5ac7064464306ee64b9c3cb1 100644
--- a/src/test/bench/Makefile
+++ b/src/test/bench/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.4 1997/07/28 23:57:20 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.5 1998/01/04 19:12:48 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,6 +19,14 @@ 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)
 
diff --git a/src/tutorial/C-code/Makefile b/src/tutorial/C-code/Makefile
index 548bfadcfe30954146a54a0e6dcc13c019f2f1fb..ec1fa1f21f5bb5f13d5b1d95fed2efded7347459 100644
--- a/src/tutorial/C-code/Makefile
+++ b/src/tutorial/C-code/Makefile
@@ -3,6 +3,14 @@ include ../../Makefile.global
 
 CFLAGS+= -I../../include -I$(LIBPQDIR)
 
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
 all: complex$(DLSUFFIX) funcs$(DLSUFFIX)
 
 clean: 
diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile
index 32b14b0b6d665b4cd2104688c0c62bc8830e024d..c575d040b492679ec3d84d643d72d656a7aa41df 100644
--- a/src/tutorial/Makefile
+++ b/src/tutorial/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for tutorial
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.5 1997/01/05 21:17:45 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.6 1998/01/04 19:12:55 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,6 +13,14 @@ include ../Makefile.global
 
 CFLAGS+= -I$(LIBPQDIR) -I../../include
 
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
 #
 # DLOBJS is the dynamically-loaded object files.  The "funcs" queries
 # include CREATE FUNCTIONs that load routines from these files.