Update Makefile.in and configure.

diff --git a/Makefile.in b/Makefile.in
index 0f75e8a7ae94a46f296ff9ede5237b5555f786a9..7bef65583d4b8abe9cea6dd83c1bfc6e167588b2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -202,6 +202,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/configure b/configure
index 6f3a9cfae302396ef5b342ff3ceafa148de7e501..063160dbbbfaf09dd0e2842a912d5b7cfa342a7d 100755 (executable)
--- a/configure
+++ b/configure
@@ -700,6 +700,7 @@ build_vendor
 build_cpu
 build
 LIBTOOL
+AR_FLAGS
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -4131,6 +4132,8 @@ fi
 
 
 # AC_PROG_RANLIB
+AR_FLAGS="cr"
+
 case `pwd` in
   *\ * | *\    *)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5

diff --git a/doc.ja/Makefile.in b/doc.ja/Makefile.in
index f8ba199f84907af3bc005d333ebbed414adab6a3..7a39c4e5fb585f04e5226c8ac49bfd019d88047c 100644 (file)
--- a/doc.ja/Makefile.in
+++ b/doc.ja/Makefile.in
@@ -181,6 +181,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc.ja/src/Makefile.in b/doc.ja/src/Makefile.in
index 304de89ecd10bb92553950fdb23f9c9d70f2ed4d..7f44952d28af75a2bc58af8dd74b562e1036d82d 100644 (file)
--- a/doc.ja/src/Makefile.in
+++ b/doc.ja/src/Makefile.in
@@ -181,6 +181,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc.ja/src/sgml/Makefile.in b/doc.ja/src/sgml/Makefile.in
index 68e729209a81768f8d5151c8eaf1cdb18d194d64..c42373ca3275137fa793c6dcc93d2a5a394a852f 100644 (file)
--- a/doc.ja/src/sgml/Makefile.in
+++ b/doc.ja/src/sgml/Makefile.in
@@ -123,6 +123,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc.zh-cn/Makefile.in b/doc.zh-cn/Makefile.in
index 52ccf095c4f92797164776d8bb632ef46d65efa7..f9f71db5f3d1cebfc824729ba7be4d3e08436f86 100644 (file)
--- a/doc.zh-cn/Makefile.in
+++ b/doc.zh-cn/Makefile.in
@@ -181,6 +181,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc.zh-cn/src/Makefile.in b/doc.zh-cn/src/Makefile.in
index be966d8c97f532faf588102421e7011f77f71851..2cf78b000297468a6e136c385ddb4645c00f36ba 100644 (file)
--- a/doc.zh-cn/src/Makefile.in
+++ b/doc.zh-cn/src/Makefile.in
@@ -181,6 +181,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc.zh-cn/src/sgml/Makefile.in b/doc.zh-cn/src/sgml/Makefile.in
index 3d614c97060cfc868c2501ca2cefb0b3aee8319b..0a621f0dbd4d932a759a1ae5d818ba0f3d3980f0 100644 (file)
--- a/doc.zh-cn/src/sgml/Makefile.in
+++ b/doc.zh-cn/src/sgml/Makefile.in
@@ -123,6 +123,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc/Makefile.in b/doc/Makefile.in
index bac7350a5ee44e6d87788ef85d056dd10900fe5e..031d85b30b0f4f8d669a9b0094ca809ca9e3c517 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -181,6 +181,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc/src/Makefile.in b/doc/src/Makefile.in
index 8e6c4e45da31d45525c77d7e1ee66ffe45ba745e..30facb74270474af0b0eec0966ba39c762da337d 100644 (file)
--- a/doc/src/Makefile.in
+++ b/doc/src/Makefile.in
@@ -181,6 +181,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/doc/src/sgml/Makefile.in b/doc/src/sgml/Makefile.in
index 6fff98a7fe1162673298c3885c78c03e31cacccc..e17a4ff9d2479dfa9ebea2614f92e042b8624e35 100644 (file)
--- a/doc/src/sgml/Makefile.in
+++ b/doc/src/sgml/Makefile.in
@@ -123,6 +123,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/Makefile.in b/src/Makefile.in
index 4aae28a96988185d53965dc2e90a59088d77a95a..3e9b55f4d694c1144f11f63ab906f5ad550bec77 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -295,6 +295,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 78e0b233496fdfd991ff54cb04c92ee18ae3e762..a3aef5e12a40516617d4f17f6347cdafc3f9c6af 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -140,6 +140,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in
index 83835cec2d2137d7d50adaa68dcaf19ba516225a..0d591d59c0a93e391a6fd56f50234f550adc67a8 100644 (file)
--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -181,6 +181,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in
index b03b0bb447ef0cbbc5309293a70f9761ba24985d..5ea3213a67e8b66811e04b508011fdeef6056079 100644 (file)
--- a/src/libs/pcp/Makefile.in
+++ b/src/libs/pcp/Makefile.in
@@ -205,6 +205,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in
index 4e7adfe1c0fdd04f8fd7a197df99c25821b95db6..7b98faaae76e1fba33d0cbd26076383d4d6c9513 100644 (file)
--- a/src/parser/Makefile.in
+++ b/src/parser/Makefile.in
@@ -201,6 +201,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index 5a2a64c8d43031892ad376d78a64b82a7383642e..46e7538900876b8ff8544cfbdb1cd22eda1ca801 100644 (file)
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -211,6 +211,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/tools/pcp/Makefile.in b/src/tools/pcp/Makefile.in
index 9dad6cf6d21579e12f918c487203879ebc7f4284..1cd7918b5e4ef7b24e2e09598bf4dba30ec44b97 100644 (file)
--- a/src/tools/pcp/Makefile.in
+++ b/src/tools/pcp/Makefile.in
@@ -227,6 +227,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/tools/pgenc/Makefile.in b/src/tools/pgenc/Makefile.in
index 041e9d176474165cdd7d943a4fe6e092d9efb269..ad117a5e11ad9dc3e3f3a3e627a7233693e9399a 100644 (file)
--- a/src/tools/pgenc/Makefile.in
+++ b/src/tools/pgenc/Makefile.in
@@ -175,6 +175,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/tools/pgmd5/Makefile.in b/src/tools/pgmd5/Makefile.in
index 079e0402e974ec29ea8b37cbccaef7d8b9658249..275f39e5b578001fcf78fca9c2ed86bf2133cf4e 100644 (file)
--- a/src/tools/pgmd5/Makefile.in
+++ b/src/tools/pgmd5/Makefile.in
@@ -174,6 +174,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/tools/pgproto/Makefile.in b/src/tools/pgproto/Makefile.in
index b1eda1bfa010848b4ba95d084145e7c62419c256..1f862e79e9cd1fc5427f5e071a5832e8ea279f21 100644 (file)
--- a/src/tools/pgproto/Makefile.in
+++ b/src/tools/pgproto/Makefile.in
@@ -171,6 +171,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/tools/watchdog/Makefile.in b/src/tools/watchdog/Makefile.in
index b6d14877f139d166519b32320550aa4ab135dd2c..3e578b44684ba47294f1a566b8d47ac42d022c1f 100644 (file)
--- a/src/tools/watchdog/Makefile.in
+++ b/src/tools/watchdog/Makefile.in
@@ -205,6 +205,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@

diff --git a/src/watchdog/Makefile.in b/src/watchdog/Makefile.in
index d6d6997298d25ee12274ed5c2b4303ebe4bb31ec..f61e318008800ab8244d041953f6b86b767eb98b 100644 (file)
--- a/src/watchdog/Makefile.in
+++ b/src/watchdog/Makefile.in
@@ -96,7 +96,6 @@ CONFIG_HEADER = $(top_builddir)/src/include/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR      " $@;
@@ -178,6 +177,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -313,6 +313,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = ../..
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -D_GNU_SOURCE -I @PGSQL_INCLUDE_DIR@
+ARFLAGS = cr
 WATCHDOG_DEBUG = 0
 noinst_LIBRARIES = lib-watchdog.a
 lib_watchdog_a_SOURCES = \