From: Tom I Helbekkmo <tih@Hamartun.Priv.NO>

Hi -- a couple of small items concerning the January 23rd snapshot:
the inclusion of the Kerberos stuff in one Makefile, a "leading tab"
cleanup in another, and a fix for a typo in the configure script.

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 9498f98..6c4e8f2 100644 (file)
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.9 1997/09/27 19:28:40 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.10 1998/01/25 04:14:23 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,6 +16,11 @@ include ../../Makefile.global
 
 CFLAGS+=  -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
 
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
 # try to find libpgtcl.a in either directory
 LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -L$(LIBDIR) -lpgtcl
 LIBPQ= -L$(LIBPQDIR) -L$(LIBDIR) -lpq

diff --git a/src/configure b/src/configure
index acb6d2f..bd8021a 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -580,7 +580,7 @@ case "$host_os" in
    sunos*) os=sunos4 ;;
    linux*) os=linux ;;
     bsdi*) os=bsdi ;;
- freebsd*|netbsd|openbsd*) os=bsd ;;
+ freebsd*|netbsd*|openbsd*) os=bsd ;;
     dgux*) os=dgux;;
      aix*) os=aix ;;
 nextstep*) os=nextstep;;

diff --git a/src/configure.in b/src/configure.in
index c77c33b..dd5143d 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -16,7 +16,7 @@ case "$host_os" in
    sunos*) os=sunos4 ;;
    linux*) os=linux ;;
     bsdi*) os=bsdi ;;
- freebsd*|netbsd|openbsd*) os=bsd ;;
+ freebsd*|netbsd*|openbsd*) os=bsd ;;
     dgux*) os=dgux;;
      aix*) os=aix ;;
 nextstep*) os=nextstep;;

diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index ddeb996..95ee333 100644 (file)
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.3 1997/10/30 04:38:30 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.4 1998/01/25 04:14:36 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,8 +24,7 @@ endif
 ifeq ($(USE_TCL), true)
        $(MAKE) -C libpgtcl $@
 endif
-
 ifeq ($(USE_PERL), true)
-      cd perl5 && perl Makefile.PL
-      $(MAKE) -C perl5 $@
+       cd perl5 && perl Makefile.PL
+       $(MAKE) -C perl5 $@
 endif