From eda9d69d6c6509eed028b118c79140abe8bb2fb5 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Fri, 4 Apr 1997 11:23:15 +0000
Subject: [PATCH] Move YACC and YFLAGS into the template files
Clean up the .sample files...comment out all sample entries except for
the localhost one
---
src/Makefile.global.in | 21 +++------------------
src/backend/libpq/pg_hba.conf.sample | 2 +-
src/backend/libpq/pg_ident.conf.sample | 4 ++--
src/build | 7 +++++--
src/configure | 2 ++
src/configure.in | 4 ++--
src/template/aix | 2 ++
src/template/alpha | 2 ++
src/template/bsdi | 2 ++
src/template/bsdi-2.1 | 2 ++
src/template/dgux | 2 ++
src/template/freebsd | 2 ++
src/template/generic | 2 ++
src/template/hpux-cc | 2 ++
src/template/hpux-gcc | 2 ++
src/template/i386_solaris-cc | 2 ++
src/template/i386_solaris-gcc | 2 ++
src/template/irix5 | 2 ++
src/template/linux | 2 ++
src/template/linux-elf | 2 ++
src/template/nextstep | 2 ++
src/template/sparc_solaris-cc | 2 ++
src/template/sparc_solaris-gcc | 2 ++
src/template/sunos4-cc | 2 ++
src/template/sunos4-gcc | 2 ++
src/template/svr4 | 2 ++
src/template/ultrix4 | 2 ++
src/template/univel | 2 ++
28 files changed, 59 insertions(+), 25 deletions(-)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index c890fe17431..a3f3d0e465c 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.18 1997/04/04 10:38:23 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.19 1997/04/04 11:21:39 scrappy Exp $
#
# NOTES
# Essentially all Postgres make files include this file and use the
@@ -198,11 +198,6 @@ X11_INCDIR= /usr/include
X11_LIBDIR= /usr/lib
X11_LIB= -lX11 @SOCKET_LIB@ @NSL_LIB@
-##############################################################################
-#
-# YACC
-
-YFLAGS= -d
##############################################################################
#
@@ -247,6 +242,8 @@ endif
# See the subdirectory template for default settings for these
#-------------------------------------------------------------
CC= @CC@
+YFLAGS= @YFLAGS@
+YACC= @YACC@
LEX= @LEX@
AROPT= @AROPT@
CFLAGS= @CPPFLAGS@ @CFLAGS@
@@ -306,9 +303,6 @@ endif
ifeq ($(PORTNAME), dgux)
%.so: %.o
$(CC) -shared -o $@ $<
-
-YACC= bison -y
-
endif
#----------------------------------------------------------------------------
@@ -342,11 +336,8 @@ endif
#--------------------------------------------------------------------------
ifeq ($(PORTNAME), i386_solaris)
-# cc won't work!
-
%.so: %.o
$(LD) -G -Bdynamic -o $@ $<
-
endif
#----------------------------------------------------------------------------
@@ -384,17 +375,13 @@ endif
#----------------------------------------------------------------------------
ifeq ($(PORTNAME), sparc_solaris)
-
%.so: %.o
$(LD) -G -Bdynamic -o $@ $<
-
endif
#-----------------------------------------------------------------------------
ifeq ($(PORTNAME), svr4)
-YACC= bison -y
-
# MAKE_EXPORTS is required for svr4 loaders that want a file of
# symbol names to tell them what to export/import.
MAKE_EXPORTS= true
@@ -420,8 +407,6 @@ endif
# The univel port is almost guaranteed NOT to work yet.
#
ifeq ($(PORTNAME), univel)
-YACC= bison -y
-
# MAKE_EXPORTS is required for svr4 loaders that want a file of
# symbol names to tell them what to export/import.
#MAKE_EXPORTS= true
diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
index 30a8c78d957..bb0d34f4019 100644
--- a/src/backend/libpq/pg_hba.conf.sample
+++ b/src/backend/libpq/pg_hba.conf.sample
@@ -80,7 +80,7 @@ host all 127.0.0.1 255.255.255.255 trust
# The above allows any user on the local system to connect to any database
# under any username.
-host template1 192.168.0.0 255.255.255.0 ident sameuser
+#host template1 192.168.0.0 255.255.255.0 ident sameuser
# The above allows any user from any host with IP address 192.168.0.x to
# connect to database template1 as the same username that ident on that host
diff --git a/src/backend/libpq/pg_ident.conf.sample b/src/backend/libpq/pg_ident.conf.sample
index 9baff6a1910..f0e9481a1d4 100644
--- a/src/backend/libpq/pg_ident.conf.sample
+++ b/src/backend/libpq/pg_ident.conf.sample
@@ -19,7 +19,7 @@
# A user always has to specify when he connects what Postgres username he is
# using. This file is only used to validate that selection.
-testmap robert bob
-testmap lucy lucy
+#testmap robert bob
+#testmap lucy lucy
diff --git a/src/build b/src/build
index b51cb259564..e1b83df907b 100644
--- a/src/build
+++ b/src/build
@@ -35,6 +35,8 @@ else
USE_LOCALE=`grep USE_LOCALE $TEMPLATE | awk -F: '{print $2}'`
DLSUFFIX=`grep DLSUFFIX $TEMPLATE | awk -F: '{print $2}'`
DL_LIB=`grep DL_LIB $TEMPLATE | awk -F: '{print $2}'`
+ YACC=`grep YACC $TEMPLATE | awk -F: '{print $2}'`
+ YFLAGS=`grep YFLAGS $TEMPLATE | awk -F: '{print $2}'`
fi
$ECHO_N "Additional directories to search for .h files [$SRCH_INC]: $ECHO_C"
@@ -70,6 +72,7 @@ then
IDIR=${a}
fi
+echo ""
echo "Define USE_LOCALE to get Postgres work (sort, search)"
$ECHO_N "with national alphabet. [$USE_LOCALE]: $ECHO_C"
read a
@@ -105,8 +108,8 @@ then
NOHBA=${a}
fi
-export BUILDRUN USE_LOCALE DEF_PGPORT NOHBA AROPT DLSUFFIX DL_LIB
-export SHARED_LIB CFLAGS CPPFLAGS LDFLAGS
+export BUILDRUN USE_LOCALE DEF_PGPORT NOHBA AROPT DLSUFFIX DL_LIB YACC
+export SHARED_LIB CFLAGS CPPFLAGS LDFLAGS YFLAGS
./configure --prefix=${IDIR}
diff --git a/src/configure b/src/configure
index 66bf7652e5f..ec243c3e937 100755
--- a/src/configure
+++ b/src/configure
@@ -3642,6 +3642,8 @@ s%@AROPT@%$AROPT%g
s%@SHARED_LIB@%$SHARED_LIB%g
s%@DLSUFFIX@%$DLSUFFIX%g
s%@DL_LIB@%$DL_LIB%g
+s%@YACC@%$YACC%g
+s%@YFLAGS@%$YFLAGS%g
s%@HAVECXX@%$HAVECXX%g
s%@INSTALL@%$INSTALL%g
s%@BSDINST@%$BSDINST%g
diff --git a/src/configure.in b/src/configure.in
index 5011652ab08..e25f6f206af 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -59,8 +59,8 @@ AC_SUBST(SHARED_LIB)
AC_SUBST(CFLAGS)
AC_SUBST(DLSUFFIX)
AC_SUBST(DL_LIB)
-
-
+AC_SUBST(YACC)
+AC_SUBST(YFLAGS)
dnl ****************************************************************
dnl Hold off on the C++ stuff until we can figure out why it doesn't
diff --git a/src/template/aix b/src/template/aix
index 229e7c42950..96b68d7c587 100644
--- a/src/template/aix
+++ b/src/template/aix
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/alpha b/src/template/alpha
index 9600955e98d..a8e22c8cbed 100644
--- a/src/template/alpha
+++ b/src/template/alpha
@@ -12,3 +12,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/bsdi b/src/template/bsdi
index 9382e5a0378..6c00b239ae3 100644
--- a/src/template/bsdi
+++ b/src/template/bsdi
@@ -6,3 +6,5 @@ SRCH_INC:/usr/local/include
SRCH_LIB:/usr/local/lib
USE_LOCALE:no
DLSUFFIX:.o
+YFLAGS:-d
+YACC:
diff --git a/src/template/bsdi-2.1 b/src/template/bsdi-2.1
index ca4be08a5cd..2a089e29fcc 100644
--- a/src/template/bsdi-2.1
+++ b/src/template/bsdi-2.1
@@ -6,3 +6,5 @@ SRCH_INC:/usr/local/include
SRCH_LIB:/usr/local/lib
USE_LOCALE:no
DLSUFFIX:.o
+YFLAGS:-d
+YACC:
diff --git a/src/template/dgux b/src/template/dgux
index 12eacc9694b..ad9c1d0e2c8 100644
--- a/src/template/dgux
+++ b/src/template/dgux
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:bison -y
diff --git a/src/template/freebsd b/src/template/freebsd
index feff9e248f6..4e142054227 100644
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -5,3 +5,5 @@ SRCH_INC:/usr/local/include
SRCH_LIB:/usr/local/lib
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:bison -y
diff --git a/src/template/generic b/src/template/generic
index 7df8389b232..6260bc0dcb3 100644
--- a/src/template/generic
+++ b/src/template/generic
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/hpux-cc b/src/template/hpux-cc
index 27bea8a58ea..621687929fb 100644
--- a/src/template/hpux-cc
+++ b/src/template/hpux-cc
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.sl
+YFLAGS:-d
+YACC:
diff --git a/src/template/hpux-gcc b/src/template/hpux-gcc
index c685b01a9c8..9915ba5b5b7 100644
--- a/src/template/hpux-gcc
+++ b/src/template/hpux-gcc
@@ -7,3 +7,5 @@ SRCH_LIB:
USE_LOCALE:no
DL_LIB:/usr/lib/libdld.sl
DLSUFFIX:.sl
+YFLAGS:-d
+YACC:
diff --git a/src/template/i386_solaris-cc b/src/template/i386_solaris-cc
index 574d16a7fd7..0b957d293d8 100644
--- a/src/template/i386_solaris-cc
+++ b/src/template/i386_solaris-cc
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/i386_solaris-gcc b/src/template/i386_solaris-gcc
index 36f87789c93..73a51db6780 100644
--- a/src/template/i386_solaris-gcc
+++ b/src/template/i386_solaris-gcc
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/irix5 b/src/template/irix5
index 7df8389b232..6260bc0dcb3 100644
--- a/src/template/irix5
+++ b/src/template/irix5
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/linux b/src/template/linux
index 12eacc9694b..26d2d7969b4 100644
--- a/src/template/linux
+++ b/src/template/linux
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/linux-elf b/src/template/linux-elf
index 241e6c34e4c..86ae0f833c0 100644
--- a/src/template/linux-elf
+++ b/src/template/linux-elf
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.o
+YFLAGS:-d
+YACC:
diff --git a/src/template/nextstep b/src/template/nextstep
index fb70ef397f3..6a6e169c244 100644
--- a/src/template/nextstep
+++ b/src/template/nextstep
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.o
+YFLAGS:-d
+YACC:
diff --git a/src/template/sparc_solaris-cc b/src/template/sparc_solaris-cc
index 37eee8f568c..b0a80e42256 100644
--- a/src/template/sparc_solaris-cc
+++ b/src/template/sparc_solaris-cc
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/sparc_solaris-gcc b/src/template/sparc_solaris-gcc
index 574d16a7fd7..0b957d293d8 100644
--- a/src/template/sparc_solaris-gcc
+++ b/src/template/sparc_solaris-gcc
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/sunos4-cc b/src/template/sunos4-cc
index 155a026ad48..f1c51a104c6 100644
--- a/src/template/sunos4-cc
+++ b/src/template/sunos4-cc
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/sunos4-gcc b/src/template/sunos4-gcc
index d43a41a83a7..3c094643de3 100644
--- a/src/template/sunos4-gcc
+++ b/src/template/sunos4-gcc
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:
diff --git a/src/template/svr4 b/src/template/svr4
index f22a6350866..136e10c93a4 100644
--- a/src/template/svr4
+++ b/src/template/svr4
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:bison -y
diff --git a/src/template/ultrix4 b/src/template/ultrix4
index 79fb9e839a3..e5bcdad82d1 100644
--- a/src/template/ultrix4
+++ b/src/template/ultrix4
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.o
+YFLAGS:-d
+YACC:
diff --git a/src/template/univel b/src/template/univel
index 255e9a7ee14..6c1cb2a476a 100644
--- a/src/template/univel
+++ b/src/template/univel
@@ -6,3 +6,5 @@ SRCH_INC:
SRCH_LIB:
USE_LOCALE:no
DLSUFFIX:.so
+YFLAGS:-d
+YACC:bison -y
--
GitLab