Commit a91c019c authored by Tom Lane's avatar Tom Lane

Drat. Should test a few more cases before committing.

parent 485a71a4
This diff is collapsed.
...@@ -325,6 +325,7 @@ AC_ARG_ENABLE( ...@@ -325,6 +325,7 @@ AC_ARG_ENABLE(
) )
dnl Check for C support (allow override if needed) dnl Check for C support (allow override if needed)
dnl Note: actually, setting CC environment variable works just as well.
AC_ARG_WITH(CC, AC_ARG_WITH(CC,
[ --with-CC=compiler use specific C compiler], [ --with-CC=compiler use specific C compiler],
[ [
...@@ -334,11 +335,14 @@ AC_ARG_WITH(CC, ...@@ -334,11 +335,14 @@ AC_ARG_WITH(CC,
;; ;;
esac esac
CC="$withval" CC="$withval"
], ])
[
AC_PROG_CC dnl Find a compiler if CC is not already set.
AC_PROG_GCC_TRADITIONAL AC_PROG_CC
]) dnl Find CPP, then check traditional.
dnl Caution: these macros must be called in this order...
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
if test "$CC" = "gcc" if test "$CC" = "gcc"
then then
...@@ -354,9 +358,6 @@ echo "- setting CPPFLAGS=$CPPFLAGS" ...@@ -354,9 +358,6 @@ echo "- setting CPPFLAGS=$CPPFLAGS"
LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
echo "- setting LDFLAGS=$LDFLAGS" echo "- setting LDFLAGS=$LDFLAGS"
dnl Checks for programs.
AC_PROG_CPP
AC_SUBST(PORTNAME) AC_SUBST(PORTNAME)
AC_SUBST(SRCDIR) AC_SUBST(SRCDIR)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment