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

scrappy · scrappy · commit 25a8c053e330 · 1998-01-25T04:14:36.000Z
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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.9 1997/09/27 19:28:40 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.10 1998/01/25 04:14:23 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -16,6 +16,11 @@ include ../../Makefile.global`
`16`	`16`
`17`	`17`	`CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl`
`18`	`18`
	`19`	`+ifdef KRBVERS`
	`20`	`+LDFLAGS+= $(KRBLIBS)`
	`21`	`+CFLAGS+= $(KRBFLAGS)`
	`22`	`+endif`
	`23`	`+`
`19`	`24`	`# try to find libpgtcl.a in either directory`
`20`	`25`	`LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -L$(LIBDIR) -lpgtcl`
`21`	`26`	`LIBPQ= -L$(LIBPQDIR) -L$(LIBDIR) -lpq`