From cab10d564e648f23384495df4801d81f7fe780db Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 26 Jun 2000 04:47:41 +0000 Subject: [PATCH] aclocal.m4 (AM_WITH_NLS): Don't set MSGFMT or GMSGFMT to no, test for msgfmt without path instead. 2000-06-26 Philipp Thomas * aclocal.m4 (AM_WITH_NLS): Don't set MSGFMT or GMSGFMT to no, test for msgfmt without path instead. * configure: Rebuilt. From-SVN: r34704 --- gcc/ChangeLog | 6 ++++++ gcc/aclocal.m4 | 13 +++++-------- gcc/configure | 49 +++++++++++++++++++++++-------------------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ee15ce9c5ab..28f417819d0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-06-26 Philipp Thomas + + * aclocal.m4 (AM_WITH_NLS): Don't set MSGFMT or GMSGFMT to no, + test for msgfmt without path instead. + * configure: Rebuilt. + 2000-06-25 Theodore Papadopoulo * gengenrtl.c (special_rtx): Fix typo in comment. diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 0a8747ee775..e17e27752fb 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -380,8 +380,8 @@ AC_DEFUN(AM_WITH_NLS, AC_PATH_PROG(GMSGFMT, gmsgfmt, no) 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 + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + if test "$GMSGFMT" = "msgfmt"; then AC_MSG_WARN(No program for catalog building found, so disabling building them) create_catalogs="no" fi @@ -412,16 +412,13 @@ 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 '`"], no) - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) 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 + if test "$MSGFMT" = "msgfmt" && test "$GMSGFMT" = "msgfmt"; 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)'`"], :) diff --git a/gcc/configure b/gcc/configure index a44bc1b0fe3..79c060d6cc9 100755 --- a/gcc/configure +++ b/gcc/configure @@ -8123,7 +8123,7 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="msgfmt" ;; esac fi @@ -8134,7 +8134,7 @@ else echo "$ac_t""no" 1>&6 fi - if test "$GMSGFMT" = "no"; then + if test "$GMSGFMT" = "msgfmt"; then echo "configure: warning: No program for catalog building found" 1>&2 create_catalogs="no" fi @@ -8220,7 +8220,7 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt" ;; esac fi @@ -8256,7 +8256,7 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi @@ -8267,17 +8267,14 @@ else echo "$ac_t""no" 1>&6 fi - - if test "$MSGFMT" = "no" && test "$GMSGFMT" = "no"; then + if test "$MSGFMT" = "msgfmt" && test "$GMSGFMT" = "msgfmt"; 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:8281: checking for $ac_word" >&5 +echo "configure:8278: 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 @@ -8372,7 +8369,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:8376: checking for catalogs to be installed" >&5 +echo "configure:8373: checking for catalogs to be installed" >&5 if test "x$LINGUAS" = "x"; then LINGUAS=$ALL_LINGUAS else @@ -8404,17 +8401,17 @@ echo "configure:8376: 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:8408: checking for linux/version.h" >&5 +echo "configure:8405: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8415: \"$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* @@ -8489,7 +8486,7 @@ fi echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:8493: checking whether windows registry support is requested" >&5 +echo "configure:8490: 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 @@ -8518,7 +8515,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:8522: checking registry key on windows hosts" >&5 +echo "configure:8519: checking registry key on windows hosts" >&5 cat >> confdefs.h <&6 -echo "configure:8716: checking assembler alignment features" >&5 +echo "configure:8713: 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 @@ -8833,7 +8830,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:8837: checking assembler subsection support" >&5 +echo "configure:8834: checking assembler subsection support" >&5 gcc_cv_as_subsections= if test x$gcc_cv_as != x; then # Check if we have .subsection @@ -8873,7 +8870,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:8877: checking assembler weak support" >&5 +echo "configure:8874: checking assembler weak support" >&5 gcc_cv_as_weak= if test x$gcc_cv_as != x; then # Check if we have .weak @@ -8890,7 +8887,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:8894: checking assembler hidden support" >&5 +echo "configure:8891: checking assembler hidden support" >&5 gcc_cv_as_hidden= if test x$gcc_cv_as != x; then # Check if we have .hidden @@ -8910,7 +8907,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:8914: checking assembler .register pseudo-op support" >&5 +echo "configure:8911: 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 @@ -8938,7 +8935,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:8942: checking assembler supports -relax" >&5 +echo "configure:8939: 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 @@ -8968,7 +8965,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:8972: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 +echo "configure:8969: 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 @@ -9013,7 +9010,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:9017: checking for assembler offsetable %lo() support" >&5 +echo "configure:9014: 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 @@ -9052,7 +9049,7 @@ EOF i[34567]86-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:9056: checking assembler instructions" >&5 +echo "configure:9053: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_as != x; then set "filds fists" "filds mem; fists mem" @@ -9182,7 +9179,7 @@ fi # Build a new-libstdc++ system (ie libstdc++-v3) echo $ac_n "checking for libstdc++ to install""... $ac_c" 1>&6 -echo "configure:9186: checking for libstdc++ to install" >&5 +echo "configure:9183: 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" @@ -9206,7 +9203,7 @@ EOF echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:9210: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:9207: 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" -- 2.30.2