mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
Gen_fmgrtab.sh is strange: it is a platform dependent way (because it uses
CPP) to create platform independent files. Unfortunately, that means that every config.status (or configure) run invariably causes a relink of the postmaster and also that we can't put these files in the distribution (usefully). So we make it a little smarter: when the output files already exist and it notices that it would recreate them in identical form, it doesn't touch them. In order to avoid re-running the make rule all the time we update a timestamp file instead. Update release_prep accordingly. Also make Gen_fmgrtab.sh use the awk that is detected at configure time, not necessarily named `awk' and have it check for 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, configure is smart enough to find bison or yacc itself. Use AC_PROG_YACC for that instead of the hand-crafted code. Do not set YFLAGS to `-d'. The make rules that need this flag should explicitly invoke it. YFLAGS should be a user variable. Update the makefiles to that effect.
This commit is contained in:
36
configure.in
36
configure.in
@@ -214,15 +214,12 @@ if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
|
||||
done
|
||||
fi
|
||||
|
||||
dnl We have read the default value of USE_LOCALE from the template
|
||||
dnl file. We have a further option of using
|
||||
dnl --enable-locale to explicitly enable it
|
||||
dnl It defaults to disabled
|
||||
|
||||
AC_MSG_CHECKING(whether to support locale)
|
||||
AC_ARG_ENABLE(
|
||||
locale,
|
||||
[ --enable-locale enable locale support ],
|
||||
AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled),
|
||||
[AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled)],
|
||||
AC_MSG_RESULT(disabled)
|
||||
)
|
||||
|
||||
@@ -233,7 +230,7 @@ AC_MSG_CHECKING(whether to support cyrillic recode)
|
||||
AC_ARG_ENABLE(
|
||||
recode,
|
||||
[ --enable-recode enable cyrillic recode support ],
|
||||
AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled),
|
||||
[AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled)],
|
||||
AC_MSG_RESULT(disabled)
|
||||
)
|
||||
|
||||
@@ -598,6 +595,8 @@ AC_SUBST(INSTL_LIB_OPTS)
|
||||
AC_SUBST(INSTL_SHLIB_OPTS)
|
||||
AC_SUBST(INSTL_EXE_OPTS)
|
||||
|
||||
AC_PROG_AWK
|
||||
|
||||
dnl Check the option to echo to inhibit newlines.
|
||||
ECHO_N_OUT=`echo -n "" | wc -c`
|
||||
ECHO_C_OUT=`echo "\c" | wc -c`
|
||||
@@ -640,31 +639,10 @@ AC_PATH_PROG(etags, etags)
|
||||
AC_PATH_PROG(xargs, xargs)
|
||||
AC_PATH_PROGS(GZCAT, gzcat zcat, gzcat)
|
||||
AC_CHECK_PROGS(PERL, perl,)
|
||||
|
||||
dnl Changes to look for YACC. We have three choices (in order of pref.)
|
||||
dnl (1) We specify in YACC and YFLAGS what we want
|
||||
dnl (2) We have bison and we use bison -y
|
||||
dnl (3) We have yacc and use it
|
||||
|
||||
if test -f "$YACC"
|
||||
then
|
||||
echo "- Using $YACC $YFLAGS"
|
||||
else
|
||||
AC_PATH_PROG(bison, bison)
|
||||
if test -f "$bison"
|
||||
then
|
||||
echo "- Using $bison -y $YFLAGS"
|
||||
YACC="$bison"
|
||||
YFLAGS="-y $YFLAGS"
|
||||
else
|
||||
AC_PATH_PROG(yacc, yacc)
|
||||
echo "- Using $yacc $YFLAGS"
|
||||
YACC="$yacc"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(YACC)
|
||||
AC_PROG_YACC
|
||||
AC_SUBST(YFLAGS)
|
||||
|
||||
|
||||
AC_CHECK_LIB(sfio, main)
|
||||
for curses in ncurses curses ; do
|
||||
AC_CHECK_LIB(${curses}, main,
|
||||
|
Reference in New Issue
Block a user