3 files changed, 10 insertions, 7 deletions
diff --git a/argp-standalone/configure.ac b/argp-standalone/configure.ac
index fe54d5ac9..2ecd2a801 100644
--- a/argp-standalone/configure.ac
+++ b/argp-standalone/configure.ac
@@ -8,7 +8,9 @@ AC_CONFIG_SRCDIR([argp-ba.c])
 AC_CONFIG_AUX_DIR([.])
 
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
 
 # GNU libc defaults to supplying the ISO C library functions only. The
 # _GNU_SOURCE define enables these extensions, in particular we want
@@ -20,7 +22,7 @@ AC_GNU_SOURCE
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
-AM_PROG_CC_STDC
+AC_PROG_CC
 
 if test "x$am_cv_prog_cc_stdc" = xno ; then
   AC_ERROR([the C compiler doesn't handle ANSI-C])
diff --git a/argp-standalone/strcasecmp.c b/argp-standalone/strcasecmp.c
index bcad7a226..9c1637232 100644
--- a/argp-standalone/strcasecmp.c
+++ b/argp-standalone/strcasecmp.c
@@ -8,6 +8,7 @@
  */
 
 #include <ctype.h>
+int strcasecmp(const char *, const char *);
 
 int strcasecmp(const char *s1, const char *s2)
 {
diff --git a/argp-standalone/vsnprintf.c b/argp-standalone/vsnprintf.c
index e9b5f192b..33c9a5d00 100644
--- a/argp-standalone/vsnprintf.c
+++ b/argp-standalone/vsnprintf.c
@@ -551,7 +551,7 @@ static LDOUBLE abs_val (LDOUBLE value)
   return result;
 }
 
-static LDOUBLE pow10 (int exp)
+static LDOUBLE pow10_argp (int exp)
 {
   LDOUBLE result = 1;
 
@@ -564,7 +564,7 @@ static LDOUBLE pow10 (int exp)
   return result;
 }
 
-static long round (LDOUBLE value)
+static long round_argp (LDOUBLE value)
 {
   long intpart;
 
@@ -626,12 +626,12 @@ static int fmtfp (char *buffer, size_t *currlen, size_t maxlen,
   /* We "cheat" by converting the fractional part to integer by
    * multiplying by a factor of 10
    */
-  fracpart = round ((pow10 (max)) * (ufvalue - intpart));
+  fracpart = round_argp ((pow10_argp (max)) * (ufvalue - intpart));
 
-  if (fracpart >= pow10 (max))
+  if (fracpart >= pow10_argp (max))
   {
     intpart++;
-    fracpart -= pow10 (max);
+    fracpart -= pow10_argp (max);
   }
 
 #ifdef DEBUG_SNPRINTF