git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/configure b/configure

index d00f9bc38f1bd10f15b51ce7c0770ba2aaf0b554..0b60ad3acbba68f5c428e23514d6659a44bb6cd1 100755 (executable)

--- a/configure

+++ b/configure

LIBOBJS="$LIBOBJS rand.$ac_objext"

cat >>confdefs.h <<\_ACEOF

-#define PGTZ 1

+#define USE_PGTZ 1

_ACEOF

PGTZ=yes

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 4b23f23d7f47b5d59f06cf5a5b7d7c52d300ff66..65d3738f793302953434974bed50537ec2d91699 100644 (file)

--- a/configure.in

+++ b/configure.in

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

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 66f1a56652feb49be31ef31900de319181c1e608..35cdc7974c2d72deefbde119af9b47ddb83ac1d5 100644 (file)

--- a/src/Makefile.global.in

+++ b/src/Makefile.global.in

# -*-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,

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 974011e0a778ba2c2f184f4d9143ce8261e27b0f..7722087da0cfdb9e71b838c86f851b41793aa00b 100644 (file)

--- a/src/include/pg_config.h.in

+++ b/src/include/pg_config.h.in

/* 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

/* 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