diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-09-25 22:23:01 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-09-25 22:23:01 +0000 |
| commit | f428d053ce075bafe1785d0ba7792f4eb92d93d5 (patch) | |
| tree | 5a7e6981c0929343338ca0fa3de0f4e3e4702af1 /src/interfaces | |
| parent | e353e73768e54c7e5cfd5a1d6e97e1f6315207bb (diff) | |
| download | postgresql-f428d053ce075bafe1785d0ba7792f4eb92d93d5.tar.gz postgresql-f428d053ce075bafe1785d0ba7792f4eb92d93d5.zip | |
Revise Tcl/Tk configuration. Make missing Tcl after --with-tcl an error,
add --without-tk option to disable Tk. We don't need the AC_PATH_XTRA
test because tkConfig.sh already contains all the information about how to
compile and link with X. Also make sure that libpq is up to date for
libpgtcl. Remove executable bits from pgaccess.sh, but add it to pgaccess.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/Makefile | 4 | ||||
| -rw-r--r-- | src/interfaces/libpgtcl/Makefile | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile index 5640c8d0bc3..ee9fed3851b 100644 --- a/src/interfaces/Makefile +++ b/src/interfaces/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.42 2000/08/31 16:11:30 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.43 2000/09/25 22:23:00 petere Exp $ # #------------------------------------------------------------------------- @@ -24,7 +24,7 @@ ifeq ($(with_CXX), yes) DIRS += libpq++ endif -ifeq ($(USE_TCL), true) +ifeq ($(with_tcl), yes) DIRS += libpgtcl endif diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile index 636891e3e85..a20970c098a 100644 --- a/src/interfaces/libpgtcl/Makefile +++ b/src/interfaces/libpgtcl/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.21 2000/09/17 13:02:49 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.22 2000/09/25 22:23:00 petere Exp $ # #------------------------------------------------------------------------- @@ -27,7 +27,11 @@ SHLIB_LINK+= $(libpq) # braindead; users of libpq should not need to know what it depends on.) SHLIB_LINK+= $(findstring -lcrypt,$(LIBS)) -all: all-lib +all: submake all-lib + +.PHONY: submake +submake: + $(MAKE) -C $(libpq_builddir) all # Shared library stuff include $(top_srcdir)/src/Makefile.shlib |