Configure patches from Brook Milligan.
This commit is contained in:
parent
a35a681f97
commit
55f86ec8f7
9
INSTALL
9
INSTALL
|
@ -267,6 +267,15 @@ PostgreSQL:
|
||||||
listens for incoming connections on. The
|
listens for incoming connections on. The
|
||||||
default for this is port 5432.
|
default for this is port 5432.
|
||||||
|
|
||||||
|
--with-defaults Use default responses to several queries during
|
||||||
|
configuration.
|
||||||
|
|
||||||
|
--with-tcl Enables programs requiring Tcl/Tk and X11,
|
||||||
|
including pgtclsh and libpgtcl.
|
||||||
|
|
||||||
|
--with-perl Enables the perl interface. Note that this
|
||||||
|
requires an installed version of postgreSQL.
|
||||||
|
|
||||||
As an example, here is the configure script I use on a Sparc
|
As an example, here is the configure script I use on a Sparc
|
||||||
Solaris 2.5 system with /opt/postgres being the install base.
|
Solaris 2.5 system with /opt/postgres being the install base.
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# IDENTIFICATION
|
# IDENTIFICATION
|
||||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.34 1998/02/13 05:09:12 scrappy Exp $
|
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.35 1998/02/22 20:02:11 momjian Exp $
|
||||||
#
|
#
|
||||||
# NOTES
|
# NOTES
|
||||||
# Essentially all Postgres make files include this file and use the
|
# Essentially all Postgres make files include this file and use the
|
||||||
|
@ -160,18 +160,18 @@ endif
|
||||||
USE_TCL= @USE_TCL@
|
USE_TCL= @USE_TCL@
|
||||||
# customize these to your site's needs
|
# customize these to your site's needs
|
||||||
#
|
#
|
||||||
TCL_INCDIR= /usr/local/include
|
TCL_INCDIR= @TCL_INCDIR@
|
||||||
TCL_LIBDIR= /usr/local/lib
|
TCL_LIBDIR= /usr/local/lib
|
||||||
TCL_LIB= -ltcl8.0
|
TCL_LIB= @TCL_LIB@
|
||||||
TK_INCDIR= /usr/local/include
|
TK_INCDIR= @TK_INCDIR@
|
||||||
TK_LIBDIR= /usr/local/lib
|
TK_LIBDIR= /usr/local/lib
|
||||||
TK_LIB= -ltk8.0
|
TK_LIB= @TK_LIB@
|
||||||
|
|
||||||
USE_PERL= @USE_PERL@
|
USE_PERL= @USE_PERL@
|
||||||
|
|
||||||
X11_INCDIR= /usr/include
|
X_CFLAGS= @X_CFLAGS@
|
||||||
X11_LIBDIR= /usr/lib
|
X_LIBS= @X_LIBS@
|
||||||
X11_LIB= -lX11 @SOCKET_LIB@ @NSL_LIB@
|
X11_LIBS= -lX11 @X_EXTRA_LIBS@
|
||||||
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
|
@ -7,14 +7,14 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# IDENTIFICATION
|
# IDENTIFICATION
|
||||||
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.10 1998/01/25 04:14:23 scrappy Exp $
|
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.11 1998/02/22 20:02:28 momjian Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
SRCDIR= ../..
|
SRCDIR= ../..
|
||||||
include ../../Makefile.global
|
include ../../Makefile.global
|
||||||
|
|
||||||
CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
|
CFLAGS+= $(X_CFLAGS) -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
|
||||||
|
|
||||||
ifdef KRBVERS
|
ifdef KRBVERS
|
||||||
LDFLAGS+= $(KRBLIBS)
|
LDFLAGS+= $(KRBLIBS)
|
||||||
|
@ -33,8 +33,8 @@ pgtclsh: pgtclAppInit.o
|
||||||
|
|
||||||
pgtksh: pgtkAppInit.o
|
pgtksh: pgtkAppInit.o
|
||||||
$(CC) $(CFLAGS) -o $@ pgtkAppInit.o \
|
$(CC) $(CFLAGS) -o $@ pgtkAppInit.o \
|
||||||
$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR) \
|
$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) $(X_LIBS) \
|
||||||
$(TK_LIB) $(TCL_LIB) -lX11 -lm $(LDFLAGS)
|
$(TK_LIB) $(TCL_LIB) $(X11_LIBS) -lm $(LDFLAGS)
|
||||||
|
|
||||||
install: pgtclsh pgtksh
|
install: pgtclsh pgtksh
|
||||||
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
|
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
127
src/configure.in
127
src/configure.in
|
@ -229,6 +229,7 @@ else
|
||||||
USE_TCL=
|
USE_TCL=
|
||||||
fi
|
fi
|
||||||
export USE_TCL
|
export USE_TCL
|
||||||
|
USE_X=$USE_TCL
|
||||||
|
|
||||||
dnl We exclude perl support unless we override it with --with-perl
|
dnl We exclude perl support unless we override it with --with-perl
|
||||||
if test "X$with_perl" = "Xyes"
|
if test "X$with_perl" = "Xyes"
|
||||||
|
@ -515,4 +516,130 @@ AC_MSG_CHECKING(setting DEF_PGPORT)
|
||||||
AC_DEFINE_UNQUOTED(DEF_PGPORT, "${DEF_PGPORT}")
|
AC_DEFINE_UNQUOTED(DEF_PGPORT, "${DEF_PGPORT}")
|
||||||
AC_MSG_RESULT($DEF_PGPORT)
|
AC_MSG_RESULT($DEF_PGPORT)
|
||||||
|
|
||||||
|
dnl Check for X libraries
|
||||||
|
|
||||||
|
if test "$USE_X" = true; then
|
||||||
|
|
||||||
|
ice_save_LIBS="$LIBS"
|
||||||
|
ice_save_CFLAGS="$CFLAGS"
|
||||||
|
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
ice_save_LDFLAGS="$LDFLAGS"
|
||||||
|
|
||||||
|
AC_PATH_XTRA
|
||||||
|
|
||||||
|
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||||
|
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||||
|
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||||
|
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||||
|
|
||||||
|
dnl Check for X library
|
||||||
|
|
||||||
|
X11_LIBS=""
|
||||||
|
AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS})
|
||||||
|
if test "$X11_LIBS" = ""; then
|
||||||
|
dnl Not having X may be fatal. Let the user fix this.
|
||||||
|
AC_MSG_WARN([The X11 library '-lX11' could not be found.
|
||||||
|
Please use the configure options '--x-includes=DIR'
|
||||||
|
and '--x-libraries=DIR' to specify the X location.
|
||||||
|
See the file 'config.log' for further diagnostics.])
|
||||||
|
fi
|
||||||
|
AC_SUBST(X_LIBS)
|
||||||
|
AC_SUBST(X11_LIBS)
|
||||||
|
AC_SUBST(X_PRE_LIBS)
|
||||||
|
|
||||||
|
LIBS="$ice_save_LIBS"
|
||||||
|
CFLAGS="$ice_save_CFLAGS"
|
||||||
|
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||||
|
LDFLAGS="$ice_save_LDFLAGS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl Check for location of Tcl support
|
||||||
|
dnl Disable Tcl support if not found
|
||||||
|
|
||||||
|
dnl Check for tcl.h
|
||||||
|
if test "$USE_TCL" = "true"
|
||||||
|
then
|
||||||
|
TCL_INCDIR=no
|
||||||
|
AC_CHECK_HEADER(tcl.h, TCL_INCDIR=)
|
||||||
|
for f in /usr/include /usr/include/tcl8.0 /usr/local/include /usr/local/include/tcl8.0; do
|
||||||
|
if test "$TCL_INCDIR" = "no"; then
|
||||||
|
AC_CHECK_HEADER($f/tcl.h, TCL_INCDIR=$f)
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test "$TCL_INCDIR" = "no"; then
|
||||||
|
AC_MSG_WARN(tcl support disabled; tcl.h missing)
|
||||||
|
USE_TCL=
|
||||||
|
fi
|
||||||
|
AC_SUBST(TCL_INCDIR)
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl Check for Tcl archive
|
||||||
|
if test "$USE_TCL" = "true"
|
||||||
|
then
|
||||||
|
TCL_LIB=
|
||||||
|
for f in tcl8.0 tcl80; do
|
||||||
|
if test -z "$TCL_LIB"; then
|
||||||
|
AC_CHECK_LIB($f, main, TCL_LIB=$f)
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$TCL_LIB"; then
|
||||||
|
AC_MSG_WARN(tcl support disabled; Tcl library missing)
|
||||||
|
USE_TCL=
|
||||||
|
else
|
||||||
|
TCL_LIB=-l$TCL_LIB
|
||||||
|
fi
|
||||||
|
AC_SUBST(TCL_LIB)
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl Check for location of Tk support (only if Tcl used)
|
||||||
|
dnl Disable Tcl support if Tk not found
|
||||||
|
|
||||||
|
dnl Check for tk.h
|
||||||
|
if test "$USE_TCL" = "true"
|
||||||
|
then
|
||||||
|
|
||||||
|
ice_save_LIBS="$LIBS"
|
||||||
|
ice_save_CFLAGS="$CFLAGS"
|
||||||
|
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
ice_save_LDFLAGS="$LDFLAGS"
|
||||||
|
|
||||||
|
CPPFLAGS="$CPPFLAGS $X_CFLAGS -I$TCL_INCDIR"
|
||||||
|
|
||||||
|
TK_INCDIR=no
|
||||||
|
AC_CHECK_HEADER(tk.h, TK_INCDIR=)
|
||||||
|
for f in /usr/include /usr/include/tk8.0 /usr/local/include /usr/local/include/tk8.0; do
|
||||||
|
if test "$TK_INCDIR" = "no"; then
|
||||||
|
AC_CHECK_HEADER($f/tk.h, TK_INCDIR=$f)
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test "$TK_INCDIR" = "no"; then
|
||||||
|
AC_MSG_WARN(tcl support disabled; tk.h missing)
|
||||||
|
USE_TCL=
|
||||||
|
fi
|
||||||
|
AC_SUBST(TK_INCDIR)
|
||||||
|
|
||||||
|
LIBS="$ice_save_LIBS"
|
||||||
|
CFLAGS="$ice_save_CFLAGS"
|
||||||
|
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||||
|
LDFLAGS="$ice_save_LDFLAGS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl Check for Tk archive
|
||||||
|
if test "$USE_TCL" = "true"
|
||||||
|
then
|
||||||
|
TK_LIB=
|
||||||
|
for f in tk8.0 tk80; do
|
||||||
|
if test -z "$TK_LIB"; then
|
||||||
|
AC_CHECK_LIB($f, main, TK_LIB=$f)
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$TK_LIB"; then
|
||||||
|
AC_MSG_WARN(tcl support disabled; Tk library missing)
|
||||||
|
USE_TCL=
|
||||||
|
else
|
||||||
|
TK_LIB=-l$TK_LIB
|
||||||
|
fi
|
||||||
|
AC_SUBST(TK_LIB)
|
||||||
|
fi
|
||||||
|
|
||||||
AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile )
|
AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile )
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
for file in `cat "$@" | grep 'failed$' | cut -d " " -f 1`
|
for file in `cat "$@" | grep 'failed$' | cut -d " " -f 1`
|
||||||
do
|
do
|
||||||
echo "====== $file ======"
|
echo "====== $file ======"
|
||||||
diff -w expected/$file.out results
|
diff -uw expected/$file.out results
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue