diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/Makefile.global.in | 6 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/configure b/configure index d00f9bc38f1..0b60ad3acbb 100755 --- a/configure +++ b/configure @@ -12015,7 +12015,7 @@ LIBOBJS="$LIBOBJS pipe.$ac_objext" LIBOBJS="$LIBOBJS rand.$ac_objext" cat >>confdefs.h <<\_ACEOF -#define PGTZ 1 +#define USE_PGTZ 1 _ACEOF PGTZ=yes @@ -18613,7 +18613,7 @@ s,@python_includespec@,$python_includespec,;t t s,@python_libspec@,$python_libspec,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@HAVE_IPV6@,$HAVE_IPV6,;t t -s,@PGTZ@,$PGTZ,;t t +s,@USE_PGTZ@,$USE_PGTZ,;t t s,@acx_pthread_config@,$acx_pthread_config,;t t s,@PTHREAD_CC@,$PTHREAD_CC,;t t s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t diff --git a/configure.in b/configure.in index 4b23f23d7f4..65d3738f793 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.341 2004/04/30 04:31:51 momjian Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.342 2004/04/30 15:01:25 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -894,10 +894,10 @@ AC_LIBOBJ(gettimeofday) AC_LIBOBJ(open) AC_LIBOBJ(pipe) AC_LIBOBJ(rand) -AC_DEFINE(PGTZ, 1, +AC_DEFINE(USE_PGTZ, 1, [Define to 1 to use our own timezone library]) PGTZ=yes -AC_SUBST(PGTZ) ;; +AC_SUBST(USE_PGTZ) ;; esac # Win32 can't to rename or unlink on an open file diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 66f1a56652f..35cdc7974c2 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.179 2004/04/30 04:31:52 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.180 2004/04/30 15:01:25 momjian Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -147,11 +147,11 @@ TK_LIBS = @TK_LIBS@ TK_LIB_SPEC = @TK_LIB_SPEC@ TK_XINCLUDES = @TK_XINCLUDES@ +USE_PGTZ = @USE_PGTZ@ + PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ -PGTZ = @PGTZ@ - have_docbook = @have_docbook@ DOCBOOKSTYLE = @DOCBOOKSTYLE@ COLLATEINDEX = @COLLATEINDEX@ diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 974011e0a77..7722087da0c 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -575,9 +575,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 to use our own timezone library */ -#undef PGTZ - /* Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME) */ #undef PG_KRB_SRVNAM @@ -618,6 +615,9 @@ /* Define to 1 to build with PAM support. (--with-pam) */ #undef USE_PAM +/* Define to 1 to use our own timezone library */ +#undef USE_PGTZ + /* Define to 1 to build with Rendezvous support. (--with-rendezvous) */ #undef USE_RENDEZVOUS |