diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-02-28 20:55:18 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-02-28 20:55:18 +0000 |
| commit | 5c4a91c2958638ce9ec5f08c28dcddb88f4c0bd9 (patch) | |
| tree | 9ddf23c9f34b301efb9dc66b9f02d0024d07cebb /configure.in | |
| parent | f1430ce06376accaebfc37ee54c5ba6a7024ad77 (diff) | |
| download | postgresql-5c4a91c2958638ce9ec5f08c28dcddb88f4c0bd9.tar.gz | |
Un-break configure snprintf tests (partly my fault, partly Bruce's).
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/configure.in b/configure.in index f5dbf5f9ba..073ea042f6 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.402 2005/02/28 20:36:05 momjian Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.403 2005/02/28 20:55:18 tgl Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -1066,6 +1066,15 @@ AC_MSG_ERROR([[ [AC_MSG_RESULT([cross-compiling])]) +# Force use of our snprintf if system's doesn't do arg control +if test $pgac_need_repl_snprintf = no; then + PGAC_FUNC_PRINTF_ARG_CONTROL + if test $pgac_cv_printf_arg_control != yes ; then + pgac_need_repl_snprintf=yes + fi +fi + + dnl Check to see if we have a working 64-bit integer type. dnl This breaks down into two steps: dnl (1) figure out if the compiler has a 64-bit int type with working @@ -1104,18 +1113,6 @@ fi # snprintfs that use %lld, %qd, or %I64d as the format. If none of these # work, fall back to our own snprintf emulation (which we know uses %lld). -# Also force use of our snprintf if system's doesn't do arg control -if test $pgac_need_repl_snprintf = no; then - PGAC_FUNC_PRINTF_ARG_CONTROL - if test $pgac_cv_printf_arg_control != yes ; then - pgac_need_repl_snprintf=yes - fi -fi - -if test $pgac_need_repl_snprintf = yes; then - AC_LIBOBJ(snprintf) -fi - if test "$HAVE_LONG_LONG_INT_64" = yes ; then if test $pgac_need_repl_snprintf = no; then PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT @@ -1143,6 +1140,11 @@ AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT, AC_DEFINE_UNQUOTED(UINT64_FORMAT, $UINT64_FORMAT, [Define to the appropriate snprintf format for unsigned 64-bit ints, if any.]) +# Now we have checked all the reasons to replace snprintf +if test $pgac_need_repl_snprintf = yes; then + AC_LIBOBJ(snprintf) +fi + # Need a #define for the size of Datum (unsigned long) AC_CHECK_SIZEOF([unsigned long]) |