Update Makefile.in and configure.

diff --git a/Makefile.in b/Makefile.in
index 6da73204218b8664099fd25bf843dba3dabf4a8f..65ac9cb8485ff7505edacd47fc6579d4a524051c 100644 (file)
--- a/Makefile.in
+++ b/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/configure b/configure
index a7450771cbda440cddc31eb52a4fab857edd382c..defe7ed94c133efe45f026bce3c75cfd2f816d18 100755 (executable)
--- a/configure
+++ b/configure
@@ -699,6 +699,7 @@ build_vendor
 build_cpu
 build
 LIBTOOL
+AR_FLAGS
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -4149,6 +4150,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 2caa2ba17016006f9c9747ced049799d9763e597..bb25d3092e91ef9d4831e6e01951fcc654477b87 100644 (file)
--- a/doc.ja/Makefile.in
+++ b/doc.ja/Makefile.in
@@ -179,6 +179,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 dec50624ba64151431df1d26631fbae727d1187a..1ed23f0a4fff6ce0dc23f2c86a64180e91783f8f 100644 (file)
--- a/doc.ja/src/Makefile.in
+++ b/doc.ja/src/Makefile.in
@@ -179,6 +179,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 05be3c4b1459c2717feeb2f579e676fa8dd50cbf..a4ef277607decf5846a796bcc58edd516c5e06a8 100644 (file)
--- a/doc.ja/src/sgml/Makefile.in
+++ b/doc.ja/src/sgml/Makefile.in
@@ -121,6 +121,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 238f16ee5fa02de9695c0926a07666a8ef07bbf4..301fbb097aa410922c0f76d7bce415405fcdb9ea 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -179,6 +179,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 42308948c6b90db9d8928097e33a0b6e815925d2..831ab233b6804eca1d34c5f5a2e3a20a24817ccc 100644 (file)
--- a/doc/src/Makefile.in
+++ b/doc/src/Makefile.in
@@ -179,6 +179,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 071e98bbd7333c0eb1808ddf9f225a3a813d8c91..c09a9b46427b1bf0c7c8130bde931a3123376e74 100644 (file)
--- a/doc/src/sgml/Makefile.in
+++ b/doc/src/sgml/Makefile.in
@@ -121,6 +121,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 0d287eaed466bf13f598408134989d32bc796ebf..eeb8e10756979c3c1e0e0b39f578b305d3d997c6 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -288,6 +288,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 f3d6206f991397a09154b000c78626305092abd6..fc86ef8438775ae9e2f0a204087e457f83120930 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -138,6 +138,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/config.h.in b/src/include/config.h.in
index 36b4038e45ce51863916f71371853e06f3fe7b23..ada564b48a2bc82cbf1024d1cf1bab0a7731c935 100644 (file)
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -262,6 +262,9 @@
    */
 #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 fd2ae78ca9dfe1891b6a99c683948586e67ed4b6..986e270f99d56f9d1327c18bee43a7ab35b72a7d 100644 (file)
--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -179,6 +179,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 a00e247af686be0e324e04fa84e986246ed9effb..5e841c046128439dcd38390409edd45ba73d647c 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 a9029ec1070aa8d31f6d7fb6b7d4eb45b94af7ce..0609ea09053dfa6e5f5a0ace1a5630ffc6eeb01b 100644 (file)
--- a/src/parser/Makefile.in
+++ b/src/parser/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/src/tools/Makefile.in b/src/tools/Makefile.in
index b7c06aa7a1b2d28a33edfb09c35028eec8f9d33e..ef3750bee7e29469321d2e6ede3cb29c1ccb8250 100644 (file)
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -209,6 +209,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 0e95c4ab05b01cc2c05632c3c6df7c79d38f6517..dbd04ae72f756b1197b21ca281fbf9cd45d1810e 100644 (file)
--- a/src/tools/pcp/Makefile.in
+++ b/src/tools/pcp/Makefile.in
@@ -218,6 +218,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 b3410146625bbd8f679113021d44ece40115ba92..d441de1d5f3222b4c9a973827d0bd9fa1a583759 100644 (file)
--- a/src/tools/pgmd5/Makefile.in
+++ b/src/tools/pgmd5/Makefile.in
@@ -185,6 +185,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 c3dfffac99c02f2ae2831b33732f142ccbeb53ef..f8ff1b930248c86fe85c08bd5ff2bd6db773905f 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@
@@ -316,6 +316,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = ../..
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -D_GNU_SOURCE -I @PGSQL_INCLUDE_DIR@
+ARFLAGS = cr
 noinst_LIBRARIES = lib-watchdog.a
 lib_watchdog_a_SOURCES = \
        watchdog.c \