diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index 9498f98e0ca3dce9e174ef79360f8dbbd0b7d0e0..6c4e8f2ee92afa4e8d9bfdd5c9e211fb44b4ebe6 100644 --- 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 acb6d2f741d15f7a3dbc1703a5d30d1f4fbfeb84..bd8021a816655990a8edede9a35812fb763f86a0 100755 --- 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 c77c33bb0297eb6bd1890979ab486e163c703077..dd5143d0d696a097ca322eada274fe9afa9f9129 100644 --- 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 ddeb996bc14849386ca43b642b4f3fdeca80af5d..95ee3337ef6ce639de2ce31c7bf46b4718a13008 100644 --- 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