pgpool2.git / summary / log / commit / refs
commit 2294e58e019d828ed4ee45c17fcc62ae4fa0a37a
Author: Yugo Nagata <nagata@sraoss.co.jp>
Date: Tue Oct 20 07:36:15 2015 +0000
autoreconf
configure | 40 ++++++++++++++++++++++++++++++++++++++++
doc/Makefile.in | 2 +-
src/Makefile.in | 8 ++++----
src/include/Makefile.in | 6 +++---
src/include/config.h.in | 9 ++++++---
src/libs/Makefile.in | 2 +-
src/libs/pcp/Makefile.in | 2 +-
src/parser/Makefile.in | 37 ++++++++++++++++---------------------
src/tools/Makefile.in | 2 +-
src/tools/pcp/Makefile.in | 2 +-
10 files changed, 74 insertions(+), 36 deletions(-)
diff --git a/configure b/configure
index 67f90562a..f82302c1a 100755
--- a/configure
+++ b/configure
@@ -643,6 +643,8 @@ MEMCACHED_RPATH_OPT
MEMCACHED_LINK_OPT
MEMCACHED_INCLUDE_OPT
PGCONFIG
+use_repl_snprintf_FALSE
+use_repl_snprintf_TRUE
LIBOBJS
YFLAGS
YACC
@@ -13120,6 +13122,32 @@ fi
pgac_need_repl_snprintf=no
+for ac_func in snprintf
+do :
+ ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SNPRINTF 1
+_ACEOF
+
+else
+ pgac_need_repl_snprintf=yes
+fi
+done
+
+for ac_func in vsnprintf
+do :
+ ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_VSNPRINTF 1
+_ACEOF
+
+else
+ pgac_need_repl_snprintf=yes
+fi
+done
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether long int is 64 bits" >&5
$as_echo_n "checking whether long int is 64 bits... " >&6; }
@@ -13423,6 +13451,14 @@ $as_echo "#define USE_REPL_SNPRINTF 1" >>confdefs.h
esac
fi
+ if test $pgac_need_repl_snprintf = yes; then
+ use_repl_snprintf_TRUE=
+ use_repl_snprintf_FALSE='#'
+else
+ use_repl_snprintf_TRUE='#'
+ use_repl_snprintf_FALSE=
+fi
+
# Need a #define for the size of Datum (unsigned long)
# The cast to long int works around a bug in the HP C Compiler
@@ -14725,6 +14761,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${use_repl_snprintf_TRUE}" && test -z "${use_repl_snprintf_FALSE}"; then
+ as_fn_error $? "conditional \"use_repl_snprintf\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${enable_rpath_TRUE}" && test -z "${enable_rpath_FALSE}"; then
as_fn_error $? "conditional \"enable_rpath\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8efc71077..0bb4646a7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/src/Makefile.in b/src/Makefile.in
index 3dfa7e558..93fa3e23d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -111,8 +111,8 @@ am_pgpool_OBJECTS = main/main.$(OBJEXT) main/pool_globals.$(OBJEXT) \
protocol/child.$(OBJEXT) protocol/pool_process_query.$(OBJEXT) \
protocol/pool_connection_pool.$(OBJEXT) \
protocol/pool_proto_modules.$(OBJEXT) \
- protocol/CommandComplete.$(OBJEXT) \
query_cache/pool_memqcache.$(OBJEXT) \
+ protocol/CommandComplete.$(OBJEXT) \
context/pool_session_context.$(OBJEXT) \
context/pool_process_context.$(OBJEXT) \
context/pool_query_context.$(OBJEXT) \
@@ -698,8 +698,6 @@ protocol/pool_connection_pool.$(OBJEXT): protocol/$(am__dirstamp) \
protocol/$(DEPDIR)/$(am__dirstamp)
protocol/pool_proto_modules.$(OBJEXT): protocol/$(am__dirstamp) \
protocol/$(DEPDIR)/$(am__dirstamp)
-protocol/CommandComplete.$(OBJEXT): protocol/$(am__dirstamp) \
- protocol/$(DEPDIR)/$(am__dirstamp)
query_cache/$(am__dirstamp):
@$(MKDIR_P) query_cache
@: > query_cache/$(am__dirstamp)
@@ -708,6 +706,8 @@ query_cache/$(DEPDIR)/$(am__dirstamp):
@: > query_cache/$(DEPDIR)/$(am__dirstamp)
query_cache/pool_memqcache.$(OBJEXT): query_cache/$(am__dirstamp) \
query_cache/$(DEPDIR)/$(am__dirstamp)
+protocol/CommandComplete.$(OBJEXT): protocol/$(am__dirstamp) \
+ protocol/$(DEPDIR)/$(am__dirstamp)
context/$(am__dirstamp):
@$(MKDIR_P) context
@: > context/$(am__dirstamp)
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index bc3cb426c..bd5c09aa2 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -306,8 +306,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 5f3ac8e24..af10a84fd 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -143,6 +143,9 @@
/* Define to 1 if you have the `sigprocmask' function. */
#undef HAVE_SIGPROCMASK
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
@@ -242,6 +245,9 @@
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
/* Define to 1 if you have the `vsyslog' function. */
#undef HAVE_VSYSLOG
@@ -256,9 +262,6 @@
*/
#undef LT_OBJDIR
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
/* Name of package */
#undef PACKAGE
diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in
index 259ecab5b..2fe9a2172 100644
--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in
index a4a2f1516..0bb1b573b 100644
--- a/src/libs/pcp/Makefile.in
+++ b/src/libs/pcp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in
index e2f7ea424..3d62eaff9 100644
--- a/src/parser/Makefile.in
+++ b/src/parser/Makefile.in
@@ -78,6 +78,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@use_repl_snprintf_TRUE@am__append_1 = snprintf.c
subdir = src/parser
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs gram.h gram.c \
@@ -104,15 +105,23 @@ am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libsql_parser_a_AR = $(AR) $(ARFLAGS)
libsql_parser_a_LIBADD =
+am__libsql_parser_a_SOURCES_DIST = copyfuncs.c gram.y keywords.c \
+ kwlookup.c list.c makefuncs.c nodes.c outfuncs.c parser.c \
+ pool_string.c scansup.c stringinfo.c value.c \
+ $(top_srcdir)/src/utils/mmgr/mcxt.c \
+ $(top_srcdir)/src/utils/mmgr/aset.c \
+ $(top_srcdir)/src/utils/error/elog.c wchar.c snprintf.c
am__dirstamp = $(am__leading_dot)dirstamp
+@use_repl_snprintf_TRUE@am__objects_1 = snprintf.$(OBJEXT)
am_libsql_parser_a_OBJECTS = copyfuncs.$(OBJEXT) gram.$(OBJEXT) \
keywords.$(OBJEXT) kwlookup.$(OBJEXT) list.$(OBJEXT) \
makefuncs.$(OBJEXT) nodes.$(OBJEXT) outfuncs.$(OBJEXT) \
parser.$(OBJEXT) pool_string.$(OBJEXT) scansup.$(OBJEXT) \
- snprintf.$(OBJEXT) stringinfo.$(OBJEXT) value.$(OBJEXT) \
+ stringinfo.$(OBJEXT) value.$(OBJEXT) \
$(top_srcdir)/src/utils/mmgr/mcxt.$(OBJEXT) \
$(top_srcdir)/src/utils/mmgr/aset.$(OBJEXT) \
- $(top_srcdir)/src/utils/error/elog.$(OBJEXT) wchar.$(OBJEXT)
+ $(top_srcdir)/src/utils/error/elog.$(OBJEXT) wchar.$(OBJEXT) \
+ $(am__objects_1)
libsql_parser_a_OBJECTS = $(am_libsql_parser_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -164,7 +173,7 @@ am__v_YACC_0 = @echo " YACC " $@;
am__v_YACC_1 =
YLWRAP = $(top_srcdir)/ylwrap
SOURCES = $(libsql_parser_a_SOURCES)
-DIST_SOURCES = $(libsql_parser_a_SOURCES)
+DIST_SOURCES = $(am__libsql_parser_a_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -320,26 +329,12 @@ top_srcdir = @top_srcdir@
parser_incdir = $(top_srcdir)/src/include/parser
AM_CPPFLAGS = -D_GNU_SOURCE -I $(parser_incdir) -I @PGSQL_INCLUDE_DIR@
noinst_LIBRARIES = libsql-parser.a
-libsql_parser_a_SOURCES = \
- copyfuncs.c \
- gram.y \
- keywords.c \
- kwlookup.c \
- list.c \
- makefuncs.c \
- nodes.c \
- outfuncs.c \
- parser.c \
- pool_string.c \
- scansup.c \
- snprintf.c \
- stringinfo.c \
- value.c \
+libsql_parser_a_SOURCES = copyfuncs.c gram.y keywords.c kwlookup.c \
+ list.c makefuncs.c nodes.c outfuncs.c parser.c pool_string.c \
+ scansup.c stringinfo.c value.c \
$(top_srcdir)/src/utils/mmgr/mcxt.c \
$(top_srcdir)/src/utils/mmgr/aset.c \
- $(top_srcdir)/src/utils/error/elog.c \
- wchar.c
-
+ $(top_srcdir)/src/utils/error/elog.c wchar.c $(am__append_1)
EXTRA_DIST = scan.c scan.l
AM_YFLAGS = -d
all: all-am
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index 8758c6e94..c595c24ba 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/src/tools/pcp/Makefile.in b/src/tools/pcp/Makefile.in
index 9f5cee666..4e4a64ea4 100644
--- a/src/tools/pcp/Makefile.in
+++ b/src/tools/pcp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
[parent: 667344cdf8f5]