Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite3059fc

Browse files
committed
Gen_fmgrtab.sh is strange: it is a platform dependent way (because it uses
CPP) to create platform independent files. Unfortunately, that means thatevery config.status (or configure) run invariably causes a relink of thepostmaster and also that we can't put these files in the distribution(usefully). So we make it a little smarter: when the output files alreadyexist and it notices that it would recreate them in identical form, itdoesn't touch them. In order to avoid re-running the make rule all the timewe update a timestamp file instead.Update release_prep accordingly. Also make Gen_fmgrtab.sh use the awk thatis detected at configure time, not necessarily named `awk' and have it checkfor exit statuses a little better.In other news... Remove USE_LOCALE from the templates, it was set to `no'everywhere anyway. Also remove YACC and YFLAGS from the templates, configureis smart enough to find bison or yacc itself. Use AC_PROG_YACC for thatinstead of the hand-crafted code. Do not set YFLAGS to `-d'. The make rulesthat need this flag should explicitly invoke it. YFLAGS should be a uservariable. Update the makefiles to that effect.
1 parent7d30194 commite3059fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+652
-712
lines changed

‎configure

Lines changed: 493 additions & 509 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,12 @@ if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
214214
done
215215
fi
216216

217-
dnl We have read the default value of USE_LOCALE from the template
218-
dnl file. We have a further option of using
219-
dnl--enable-locale to explicitly enable it
220-
dnl It defaults to disabled
217+
221218
AC_MSG_CHECKING(whether to support locale)
222219
AC_ARG_ENABLE(
223220
locale,
224221
[ --enable-locale enable locale support ],
225-
AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled),
222+
[AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled)],
226223
AC_MSG_RESULT(disabled)
227224
)
228225

@@ -233,7 +230,7 @@ AC_MSG_CHECKING(whether to support cyrillic recode)
233230
AC_ARG_ENABLE(
234231
recode,
235232
[ --enable-recode enable cyrillic recode support ],
236-
AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled),
233+
[AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled)],
237234
AC_MSG_RESULT(disabled)
238235
)
239236

@@ -598,6 +595,8 @@ AC_SUBST(INSTL_LIB_OPTS)
598595
AC_SUBST(INSTL_SHLIB_OPTS)
599596
AC_SUBST(INSTL_EXE_OPTS)
600597

598+
AC_PROG_AWK
599+
601600
dnl Check the option to echo to inhibit newlines.
602601
ECHO_N_OUT=`echo -n "" | wc -c`
603602
ECHO_C_OUT=`echo "\c" | wc -c`
@@ -640,31 +639,10 @@ AC_PATH_PROG(etags, etags)
640639
AC_PATH_PROG(xargs, xargs)
641640
AC_PATH_PROGS(GZCAT, gzcat zcat, gzcat)
642641
AC_CHECK_PROGS(PERL, perl,)
643-
644-
dnl Changes to look for YACC. We have three choices (in order of pref.)
645-
dnl (1) We specify in YACC and YFLAGS what we want
646-
dnl (2) We have bison and we use bison -y
647-
dnl (3) We have yacc and use it
648-
649-
if test -f "$YACC"
650-
then
651-
echo "- Using $YACC $YFLAGS"
652-
else
653-
AC_PATH_PROG(bison, bison)
654-
if test -f "$bison"
655-
then
656-
echo "- Using $bison -y $YFLAGS"
657-
YACC="$bison"
658-
YFLAGS="-y $YFLAGS"
659-
else
660-
AC_PATH_PROG(yacc, yacc)
661-
echo "- Using $yacc $YFLAGS"
662-
YACC="$yacc"
663-
fi
664-
fi
665-
AC_SUBST(YACC)
642+
AC_PROG_YACC
666643
AC_SUBST(YFLAGS)
667644

645+
668646
AC_CHECK_LIB(sfio, main)
669647
for curses in ncurses curses ; do
670648
AC_CHECK_LIB(${curses}, main,

‎src/backend/bootstrap/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the bootstrap module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.22 2000/05/29 05:44:42 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.23 2000/06/07 16:26:37 petere Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -48,14 +48,14 @@ SUBSYS.o: $(OBJS)
4848
bootstrap.o: bootstrap_tokens.h
4949

5050
bootstrap_tokens.hbootparse.c: bootparse.y
51-
$(YACC)$(YFLAGS)$<
51+
$(YACC)-d$(YFLAGS)$<
5252
grep -v"^#" boot.sed> sedfile
5353
sed -f sedfile< y.tab.c> bootparse.c
5454
mv y.tab.h bootstrap_tokens.h
5555
rm -f y.tab.c sedfile
5656

5757
bootscanner.c: bootscanner.l
58-
$(LEX)$<
58+
$(LEX)$(LFLAGS)$<
5959
grep -v"^#" boot.sed> sedfile
6060
sed -f sedfile< lex.yy.c> bootscanner.c
6161
rm -f lex.yy.c sedfile

‎src/backend/parser/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for parser
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.25 2000/05/29 05:44:53 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.26 2000/06/07 16:26:41 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -25,12 +25,12 @@ SUBSYS.o: $(OBJS)
2525
$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)
2626

2727
gram.cparse.h: gram.y
28-
$(YACC)$(YFLAGS)$<
28+
$(YACC)-d$(YFLAGS)$<
2929
mv y.tab.c gram.c
3030
mv y.tab.h parse.h
3131

3232
scan.c:scan.l
33-
$(LEX)$<
33+
$(LEX)$(LFLAGS)$<
3434
mv lex.yy.c scan.c
3535

3636
# The following dependencies on parse.h are computed by

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp