aclocal.m4 (AM_WITH_NLS): Set create_catalogs=no if no catalog compiler found.

	* aclocal.m4 (AM_WITH_NLS): Set create_catalogs=no if no catalog
	compiler found.
	AM_GNU_GETTEXT: Don't set CATALOGS if create_catalogs=no.
	* configure: Rebuilt.

From-SVN: r34692

3 files changed, 62 insertions, 27 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a667b8d..c40b554 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-25  Philipp Thomas  <pthomas@suse.de>
+
+	* aclocal.m4 (AM_WITH_NLS): Set create_catalogs=no if no catalog
+	compiler found.
+	AM_GNU_GETTEXT: Don't set CATALOGS if create_catalogs=no.
+	* configure: Rebuilt.
+	
 2000-06-25  John David Anglin  <dave.anglin@nrc.ca>
 
         * config/vax/vax.h (TARGET_SWITCHES): Provide descriptions.
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 2336943..0a8747e 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -381,6 +381,10 @@ AC_DEFUN(AM_WITH_NLS,
 		 if test "$GMSGFMT" = "no"; then
 		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
 		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+		   if test "$GMSGFMT" = "no"; then
+		     AC_MSG_WARN(No program for catalog building found, so disabling building them)
+		     create_catalogs="no"
+		   fi
 		 fi
 		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
@@ -408,8 +412,17 @@ AC_DEFUN(AM_WITH_NLS,
         dnl Mark actions used to generate GNU NLS library.
         INTLOBJS="\$(GETTOBJS)"
         AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+        AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+
+        dnl If we didn't find either msgfmt or gmsgfmt, don't try to
+        dnl create a catalog.
+	if test "$MSGFMT" = "no" && test "$GMSGFMT" = "no"; then
+	  AC_MSG_WARN(Neither msgfmt nor gmsgfmt found. No catalogs will be built)
+	  create_catalogs="no"
+	  MSGFMT=msgfmt
+	  GMSGFMT=msgfmt
+	fi
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
         AC_SUBST(MSGFMT)
@@ -437,6 +450,8 @@ AC_DEFUN(AM_WITH_NLS,
 	fi
       fi
 
+
+
       # We need to process the po/ directory.
       POSUB=po
     else
@@ -507,7 +522,7 @@ strdup __argz_count __argz_stringify __argz_next])
    AM_LC_MESSAGES
    AM_WITH_NLS
 
-   if test "x$CATOBJEXT" != "x"; then
+   if test "x$CATOBJEXT" != "x" && test "x$create_catalogs" != "xno" ; then
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
diff --git a/gcc/configure b/gcc/configure
index b5f9c4b..a44bc1b 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -8134,11 +8134,15 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+		   if test "$GMSGFMT" = "no"; then
+		     echo "configure: warning: No program for catalog building found" 1>&2
+		     create_catalogs="no"
+		   fi
 		 fi
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8142: checking for $ac_word" >&5
+echo "configure:8146: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8196,7 +8200,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8200: checking for $ac_word" >&5
+echo "configure:8204: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8216,7 +8220,7 @@ else
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
   ;;
 esac
 fi
@@ -8230,7 +8234,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8234: checking for $ac_word" >&5
+echo "configure:8238: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8252,7 +8256,7 @@ else
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
   ;;
 esac
 fi
@@ -8263,10 +8267,17 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+
+                	if test "$MSGFMT" = "no" && test "$GMSGFMT" = "no"; then
+	  echo "configure: warning: Neither msgfmt nor gmsgfmt found. No catalogs will be built" 1>&2
+	  create_catalogs="no"
+	  MSGFMT=msgfmt
+	  GMSGFMT=msgfmt
+	fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8270: checking for $ac_word" >&5
+echo "configure:8281: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8318,6 +8329,8 @@ fi
 	fi
       fi
 
+
+
       # We need to process the po/ directory.
       POSUB=po
     else
@@ -8354,12 +8367,12 @@ fi
     
   
 
-   if test "x$CATOBJEXT" != "x"; then
+   if test "x$CATOBJEXT" != "x" && test "x$create_catalogs" != "xno" ; then
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:8363: checking for catalogs to be installed" >&5
+echo "configure:8376: checking for catalogs to be installed" >&5
        if test "x$LINGUAS" = "x"; then
 	 LINGUAS=$ALL_LINGUAS
        else
@@ -8391,17 +8404,17 @@ echo "configure:8363: checking for catalogs to be installed" >&5
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:8395: checking for linux/version.h" >&5
+echo "configure:8408: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8400 "configure"
+#line 8413 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8476,7 +8489,7 @@ fi
 
 
 echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
-echo "configure:8480: checking whether windows registry support is requested" >&5
+echo "configure:8493: checking whether windows registry support is requested" >&5
 if test x$enable_win32_registry != xno; then
   cat >> confdefs.h <<\EOF
 #define ENABLE_WIN32_REGISTRY 1
@@ -8505,7 +8518,7 @@ esac
 
 if test x$enable_win32_registry != xno; then
   echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
-echo "configure:8509: checking registry key on windows hosts" >&5
+echo "configure:8522: checking registry key on windows hosts" >&5
   cat >> confdefs.h <<EOF
 #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
 EOF
@@ -8699,7 +8712,7 @@ fi
 
 # Figure out what assembler alignment features are present.
 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:8703: checking assembler alignment features" >&5
+echo "configure:8716: checking assembler alignment features" >&5
 gcc_cv_as=
 gcc_cv_as_alignment_features=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
@@ -8820,7 +8833,7 @@ fi
 echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
 
 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
-echo "configure:8824: checking assembler subsection support" >&5
+echo "configure:8837: checking assembler subsection support" >&5
 gcc_cv_as_subsections=
 if test x$gcc_cv_as != x; then
 	# Check if we have .subsection
@@ -8860,7 +8873,7 @@ fi
 echo "$ac_t""$gcc_cv_as_subsections" 1>&6
 
 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
-echo "configure:8864: checking assembler weak support" >&5
+echo "configure:8877: checking assembler weak support" >&5
 gcc_cv_as_weak=
 if test x$gcc_cv_as != x; then
 	# Check if we have .weak
@@ -8877,7 +8890,7 @@ fi
 echo "$ac_t""$gcc_cv_as_weak" 1>&6
 
 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
-echo "configure:8881: checking assembler hidden support" >&5
+echo "configure:8894: checking assembler hidden support" >&5
 gcc_cv_as_hidden=
 if test x$gcc_cv_as != x; then
 	# Check if we have .hidden
@@ -8897,7 +8910,7 @@ echo "$ac_t""$gcc_cv_as_hidden" 1>&6
 case "$target" in 
   sparc*-*-*)
     echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
-echo "configure:8901: checking assembler .register pseudo-op support" >&5
+echo "configure:8914: checking assembler .register pseudo-op support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8925,7 +8938,7 @@ EOF
     fi
 
     echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
-echo "configure:8929: checking assembler supports -relax" >&5
+echo "configure:8942: checking assembler supports -relax" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8955,7 +8968,7 @@ EOF
     case "$tm_file" in
     *64*)
 	echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
-echo "configure:8959: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
+echo "configure:8972: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9000,7 +9013,7 @@ EOF
 
     if test "x$gcc_cv_as_flags64" != xno; then
 	echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
-echo "configure:9004: checking for assembler offsetable %lo() support" >&5
+echo "configure:9017: checking for assembler offsetable %lo() support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9039,7 +9052,7 @@ EOF
 
   i[34567]86-*-*)
     echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
-echo "configure:9043: checking assembler instructions" >&5
+echo "configure:9056: checking assembler instructions" >&5
     gcc_cv_as_instructions=
     if test x$gcc_cv_as != x; then
 	set "filds fists" "filds mem; fists mem"
@@ -9169,7 +9182,7 @@ fi
 
 # Build a new-libstdc++ system (ie libstdc++-v3)
 echo $ac_n "checking for libstdc++ to install""... $ac_c" 1>&6
-echo "configure:9173: checking for libstdc++ to install" >&5
+echo "configure:9186: checking for libstdc++ to install" >&5
 # Check whether --enable-libstdcxx-v3 or --disable-libstdcxx-v3 was given.
 if test "${enable_libstdcxx_v3+set}" = set; then
   enableval="$enable_libstdcxx_v3"
@@ -9193,7 +9206,7 @@ EOF
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:9197: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:9210: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"