mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-17 19:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange some configure.in comments for better readability.

Browse Source 
Commit configure and pg_config.h.in, missed in last configure.in
update.
This commit is contained in:
Tom Lane 2006-04-29 20:47:31 +00:00
parent de762468aa
commit f0df096785
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configure vendored
View File

@ -2713,12 +2713,14 @@ else
fi
fi
# The Intel compiler on Linux supports most gcc options, but not
# all of them, so only add these options if we are really using
# gcc.
# Some versions of GCC support some additional useful warning flags.
# Check whether they are supported, and add them to CFLAGS if so.
if test "$GCC" = yes; then
# ICC pretends to be GCC but it's lying; it doesn't support these options.
# So we have to check if "GCC" is really ICC.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@ -2766,11 +2768,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ICC=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$ICC" = no; then
CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
# Some versions of GCC support some additional useful warning flags.
# Check whether they are supported, and add them to CFLAGS if so.
echo "$as_me:$LINENO: checking if $CC supports -Wdeclaration-after-statement" >&5
echo $ECHO_N "checking if $CC supports -Wdeclaration-after-statement... $ECHO_C" >&6
pgac_save_CFLAGS=$CFLAGS
@ -21621,29 +21622,38 @@ esac
# Select semaphore implementation type.
if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
if test "$PORTNAME" != "win32"; then
if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then
cat >>confdefs.h <<\_ACEOF
#define USE_NAMED_POSIX_SEMAPHORES 1
_ACEOF
SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
else
if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
else
if test x"$USE_UNNAMED_POSIX_SEMAPHORES" = x"1" ; then
cat >>confdefs.h <<\_ACEOF
#define USE_UNNAMED_POSIX_SEMAPHORES 1
_ACEOF
SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
else
SEMA_IMPLEMENTATION="src/backend/port/posix_sema.c"
else
cat >>confdefs.h <<\_ACEOF
#define USE_SYSV_SEMAPHORES 1
_ACEOF
SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
SEMA_IMPLEMENTATION="src/backend/port/sysv_sema.c"
fi
fi
else
cat >>confdefs.h <<\_ACEOF
#define USE_WIN32_SEMAPHORES 1
_ACEOF
SEMA_IMPLEMENTATION="src/backend/port/win32_sema.c"
fi

13
configure.in
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.463 2006/04/29 16:34:41 momjian Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.464 2006/04/29 20:47:29 tgl Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
@ -248,19 +248,20 @@ else
fi
fi
# The Intel compiler on Linux supports most gcc options, but not
# all of them, so only add these options if we are really using
# gcc.
# Some versions of GCC support some additional useful warning flags.
# Check whether they are supported, and add them to CFLAGS if so.
if test "$GCC" = yes; then
# ICC pretends to be GCC but it's lying; it doesn't support these options.
# So we have to check if "GCC" is really ICC.
AC_TRY_COMPILE([], [@%:@ifndef __INTEL_COMPILER
choke me
@%:@endif], [ICC=[yes]], [ICC=[no]])
if test "$ICC" = no; then
CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
# Some versions of GCC support some additional useful warning flags.
# Check whether they are supported, and add them to CFLAGS if so.
PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
else

5
src/include/pg_config.h.in
View File

@ -129,7 +129,7 @@
/* Define to 1 if your compiler understands __FUNCTION__. */
#undef HAVE_FUNCNAME__FUNCTION
/* Define to 1 if you have getaddrinfo(). */
/* Define to 1 if you have the `getaddrinfo' function. */
#undef HAVE_GETADDRINFO
/* Define to 1 if you have the `gethostbyname_r' function. */
@ -625,6 +625,9 @@
/* Define to select unnamed POSIX semaphores. */
#undef USE_UNNAMED_POSIX_SEMAPHORES
/* Define to select Win32-style semaphores. */
#undef USE_WIN32_SEMAPHORES
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS