Add Taral's test for flags required by the detected cpp program to read

from stdin. Necessary at least for systems missing cpp but having gcc -E.
Include new configured file backend/catalog/genbki.sh.
This commit is contained in:
Thomas G. Lockhart 1998-10-14 16:02:11 +00:00
parent 56792f3729
commit fe6d19f15f
3 changed files with 372 additions and 291 deletions

View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.49 1998/10/13 16:30:45 momjian Exp $
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.50 1998/10/14 16:02:10 thomas Exp $
#
# NOTES
# Essentially all Postgres make files include this file and use the
@ -191,6 +191,7 @@ BACKSLASH_C= @BACKSLASH_C@
# See the subdirectory template for default settings for these
#-------------------------------------------------------------
CC= @CC@
CPP= @CPP@
YFLAGS= @YFLAGS@
YACC= @YACC@
LEX= @LEX@

619
src/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -363,6 +363,44 @@ AC_CONFIG_HEADER(include/config.h)
dnl Checks for programs.
AC_PROG_CPP
dnl Check to see what flags are required to get stdin into cpp
AC_DEFUN(AC_TRY_CPPSTDIN,
[AC_REQUIRE_CPP()dnl
cat > conftest.$ac_ext <<EOF
[#]line __oline__ "configure"
#include "confdefs.h"
[$1]
EOF
ac_try="$ac_cpp $CPPSTDIN <conftest.$ac_ext >/dev/null 2>conftest.out"
AC_TRY_EVAL(ac_try)
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
ifelse([$2], , :, [rm -rf conftest*
$2])
else
echo "$ac_err" >&AC_FD_CC
echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$3], , , [ rm -rf conftest*
$3
])dnl
fi
rm -f conftest*])
AC_MSG_CHECKING(how to use cpp with stdin)
if test -z "$CPPSTDIN"; then
AC_CACHE_VAL(ac_cv_cpp_stdin,
[ CPPSTDIN=""
AC_TRY_CPPSTDIN([#include <assert.h>
Syntax Error], , CPPSTDIN="-")
ac_cv_cpp_stdin="$CPPSTDIN"])
CPPSTDIN="$ac_cv_cpp_stdin"
else
ac_cv_cpp_stdin="$CPPSTDIN"
fi
AC_MSG_RESULT($CPP $CPPSTDIN)
AC_SUBST(CPPSTDIN)
AC_SUBST(PORTNAME)
AC_SUBST(SRCDIR)
AC_SUBST(LDFLAGS)
@ -865,7 +903,8 @@ AC_CONFIG_HEADER(interfaces/odbc/config.h)
AC_OUTPUT(
GNUmakefile
Makefile.global
backend/port/Makefile
backend/port/Makefile
backend/catalog/genbki.sh
backend/utils/Gen_fmgrtab.sh
bin/pg_dump/Makefile
bin/pg_version/Makefile