Check for working msgfmt version (from GNU gettext 0.10 or later).

Avoid //s in sysdirs.
Fix script for handling $CC containing whitespace.

diff --git a/configure.in b/configure.in
index ee84c20059dc8ad35c71311161aac4cebca65805..933be7358c97eecfd9da765aa9b20520e001932d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -273,7 +273,9 @@ for d in $add_ons_pfx ''; do
   for b in $base ''; do
     for m0 in $mach ''; do
       for v in /$vendor ''; do
+       test $v = / && continue
        for o in /$ostry ''; do
+         test $o = / && continue
          for m in $mach ''; do
            if test "$m0$b$v$o$m"; then
              try="${d}sysdeps$m0$b$v$o$m"
@@ -404,6 +406,32 @@ if test "$INSTALL" = "${srcdir}/install-sh -c"; then
 fi
 AC_PROG_LN_S
 AC_CHECK_PROGS(MSGFMT, msgfmt gmsgfmt, :)
+if test "$MSGFMT" != ":"; then
+changequote(,)dnl Need [] for regexps.
+  if $MSGFMT --version | grep 'GNU gettext.*0\.[1-9][0-9]' >/dev/null 2>&1
+changequote([,])dnl
+  then : # msgfmt from gettext 0.10 or greater, works.
+  else
+    AC_MSG_WARN([
+*** (g)msgfmt is too old or wrong version (need GNU gettext 0.10 or better).])
+    MSGFMT=":"
+  fi
+fi
+
+AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo)
+if test "$MAKEINFO"; then
+changequote(,)dnl Need [] for regexps.
+  if $MAKEINFO --version | grep 'texinfo 3\.[1-9][1-9]' >/dev/null 2>&1
+changequote([,])dnl
+  then : # Makeinfo 3.11 or greater, works.
+  else
+    AC_MSG_WARN([
+*** makeinfo is too old (need version 3.11 or better).
+*** You should install the needed version and re-configure since otherwise
+*** you won't get the info pages installed.])
+    MAKEINFO=
+  fi
+fi
 
 AC_PROG_CC_LOCAL
 AC_CANONICAL_BUILD
@@ -902,15 +930,15 @@ VERSION=`sed -e 's/^#define VERSION "\([^"]*\)"/\1/p' -e d < $srcdir/version.h`
 AC_SUBST(VERSION)
 
 if test $libc_cv_gcc_pipe_bug = yes; then
- realCC=$CC
- CC=$makeCC
- CFLAGS=$makeCFLAGS
+  realCC="$CC"
+  CC="$makeCC"
+  CFLAGS="$makeCFLAGS"
 fi
 AC_OUTPUT_COMMANDS([
 if test "$realCC"; then
  sed -e 's/%{pipe:-}/%|/g' `$realCC -print-file-name=specs` >specsT
  mv specsT specs
-fi], [realCC=$realCC])
+fi], [realCC="$realCC"])
 
 AC_OUTPUT(config.make glibcbug ${config_makefile} ${config_uname}, ,
           [echo '$config_vars' >> config.make])