Changeset 1101

Timestamp:

Jan 29, 2004, 3:57:43 PM (22 years ago)

Author:

bird

Message:

Corrected tests so we recognize gettext tools and newer intl libs.

File:

• trunk/src/binutils/gettext.m4 (modified) (6 diffs, 1 prop)

trunk/src/binutils/gettext.m4

@@ -34 +34 @@
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      echo "nls_cv_use_gnu_gettext:$nls_cv_use_gnu_gettext" >&5
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
         dnl User does not insist on using GNU NLS library.  Figure out what
@@ -52 +53 @@
                [AC_CACHE_CHECK([for gettext in libintl],
                  gt_cv_func_gettext_libintl,
-                 [AC_TRY_LINK([], [return (int) gettext ("")],
+                 [ac_save_LIBS="$LIBS"; LIBS="-lintl $LIBS";
+                 AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
                  gt_cv_func_gettext_libintl=yes,
-                 gt_cv_func_gettext_libintl=no)])])
+                 gt_cv_func_gettext_libintl=no)
+                 LIBS="$ac_save_LIBS";])])
            fi
 
@@ -68 +71 @@
                 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
                   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+
                 AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
                                return _nl_msg_cat_cntr],
@@ -86 +90 @@
           dnl Fall back on GNU gettext library.
           nls_cv_use_gnu_gettext=yes
+          echo "nls_cv_use_gnu_gettext:$nls_cv_use_gnu_gettext fallback" >&5
         fi
       fi
@@ -295 +300 @@
 AC_CACHE_VAL(ac_cv_path_$1,
 [case "[$]$1" in
-  /*)
+  [[/\\]]*|[[a-zA-Z]]:*)
   ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
   ;;
@@ -308 +313 @@
       fi
     fi
+    ac_word_saved="$ac_word"
+    ac_word=$ac_word$ac_cv_exeext
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+        ac_cv_path_$1="$ac_dir/$ac_word"
+        break
+      fi
+    fi
+    ac_word="$ac_word_saved"
   done
   IFS="$ac_save_ifs"