Skip to content

Commit 55f86ec

Browse files
bmomjianbmomjian
committed
Configure patches from Brook Milligan.
1 parent a35a681 commit 55f86ec

File tree

6 files changed

+1558
-225
lines changed

6 files changed

+1558
-225
lines changed

‎INSTALL

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,15 @@ PostgreSQL:
267267
listens for incoming connections on. The
268268
default for this is port 5432.
269269

270+
--with-defaults Use default responses to several queries during
271+
configuration.
272+
273+
--with-tcl Enables programs requiring Tcl/Tk and X11,
274+
including pgtclsh and libpgtcl.
275+
276+
--with-perl Enables the perl interface. Note that this
277+
requires an installed version of postgreSQL.
278+
270279
As an example, here is the configure script I use on a Sparc
271280
Solaris 2.5 system with /opt/postgres being the install base.
272281

‎src/Makefile.global.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.34 1998/02/13 05:09:12 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.35 1998/02/22 20:02:11 momjian Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -160,18 +160,18 @@ endif
160160
USE_TCL= @USE_TCL@
161161
# customize these to your site's needs
162162
#
163-
TCL_INCDIR= /usr/local/include
163+
TCL_INCDIR= @TCL_INCDIR@
164164
TCL_LIBDIR= /usr/local/lib
165-
TCL_LIB= -ltcl8.0
166-
TK_INCDIR= /usr/local/include
165+
TCL_LIB= @TCL_LIB@
166+
TK_INCDIR= @TK_INCDIR@
167167
TK_LIBDIR= /usr/local/lib
168-
TK_LIB= -ltk8.0
168+
TK_LIB= @TK_LIB@
169169

170170
USE_PERL= @USE_PERL@
171171

172-
X11_INCDIR= /usr/include
173-
X11_LIBDIR= /usr/lib
174-
X11_LIB= -lX11 @SOCKET_LIB@ @NSL_LIB@
172+
X_CFLAGS= @X_CFLAGS@
173+
X_LIBS= @X_LIBS@
174+
X11_LIBS= -lX11 @X_EXTRA_LIBS@
175175

176176

177177
##############################################################################

‎src/bin/pgtclsh/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.10 1998/01/25 04:14:23 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.11 1998/02/22 20:02:28 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
1616

17-
CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
17+
CFLAGS+= $(X_CFLAGS) -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
1818

1919
ifdef KRBVERS
2020
LDFLAGS+= $(KRBLIBS)
@@ -33,8 +33,8 @@ pgtclsh: pgtclAppInit.o
3333

3434
pgtksh: pgtkAppInit.o
3535
$(CC) $(CFLAGS) -o $@ pgtkAppInit.o \
36-
$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR) \
37-
$(TK_LIB) $(TCL_LIB) -lX11 -lm $(LDFLAGS)
36+
$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) $(X_LIBS) \
37+
$(TK_LIB) $(TCL_LIB) $(X11_LIBS) -lm $(LDFLAGS)
3838

3939
install: pgtclsh pgtksh
4040
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh

0 commit comments

Comments
 (0)