Merge trift2.:/MySQL/M51/push-5.1

into trift2.:/MySQL/M51/tmp-5.1

Merge trift2.:/MySQL/M51/push-5.1
into trift2.:/MySQL/M51/tmp-5.1
6a67761b · joerg@trift2 · 1a13d769 · e288730a · 6a67761b
Commit 6a67761b authored Sep 13, 2007 by joerg@trift2
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

config/ac-macros/misc.m4 config/ac-macros/misc.m4 +2 -5

No files found.
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -648,11 +648,8 @@ case $CXX_VERSION in
    ARFLAGS="-xar -o"
  ;;
  *)
-    if test -z "$AR"
+    AC_CHECK_PROG([AR], [ar], [ar])
-    then
+    if test -z "$AR" || test "$AR" = "false"
-      AC_CHECK_PROG([AR], [ar], [ar])
-    fi
-    if test -z "$AR"
    then
      AC_MSG_ERROR([You need ar to build the library])
    fi