diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 10 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 20 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index aa41ee9f9b6..7af95f98f9f 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.240 2007/11/13 00:13:19 tgl Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.241 2008/02/17 16:36:43 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -62,11 +62,12 @@ configure_args = @configure_args@ ifndef PGXS -# Note that prefix and exec_prefix aren't defined in a PGXS build; +# Note that prefix, exec_prefix, and datarootdir aren't defined in a PGXS build; # makefiles may only use the derived variables such as bindir. prefix := @prefix@ exec_prefix := @exec_prefix@ +datarootdir := @datarootdir@ bindir := @bindir@ @@ -105,14 +106,13 @@ endif mandir := @mandir@ docdir := @docdir@ -# docdir can be an empty string to signify --without-docdir -ifneq (,$(docdir)) ifeq "$(findstring pgsql, $(docdir))" "" ifeq "$(findstring postgres, $(docdir))" "" override docdir := $(docdir)/postgresql endif endif -endif + +htmldir := @htmldir@ localedir := @localedir@ diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index e3a6c9982ad..b48e261cbf5 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -12,19 +12,19 @@ /* Define to the return type of 'accept' */ #undef ACCEPT_TYPE_RETURN -/* The alignment requirement of a `double'. */ +/* The normal alignment of `double', in bytes. */ #undef ALIGNOF_DOUBLE -/* The alignment requirement of a `int'. */ +/* The normal alignment of `int', in bytes. */ #undef ALIGNOF_INT -/* The alignment requirement of a `long'. */ +/* The normal alignment of `long', in bytes. */ #undef ALIGNOF_LONG -/* The alignment requirement of a `long long int'. */ +/* The normal alignment of `long long int', in bytes. */ #undef ALIGNOF_LONG_LONG_INT -/* The alignment requirement of a `short'. */ +/* The normal alignment of `short', in bytes. */ #undef ALIGNOF_SHORT /* Define to the default TCP port number on which the server listens and to @@ -637,10 +637,10 @@ your system. */ #undef PTHREAD_CREATE_JOINABLE -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of a `unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* Define to 1 if you have the ANSI C header files. */ @@ -719,9 +719,11 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus #undef inline +#endif /* Define to empty if the C compiler does not understand signed types. */ #undef signed |