bk commit into 5.0 tree (svoj:1.1985)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1985 05/06/22 16:29:21 svoj@stripped +2 -0
  Better AR guessing.

  configure.in
    1.319 05/06/22 16:29:16 svoj@stripped +1 -9
    Move AR guessing to misc.m4.

  config/ac-macros/misc.m4
    1.10 05/06/22 16:29:16 svoj@stripped +29 -0
    Better AR guessing.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	svoj.pils.ru
# Root:	/home/svoj/devel/mysql/yassl-mysql-5.0

--- 1.318/configure.in	2005-06-22 15:10:07 +05:00
+++ 1.319/configure.in	2005-06-22 16:29:16 +05:00
@@ -354,15 +354,7 @@
     [1], [Defined by configure. Use explicit template instantiation.])
 fi
 
-case $CXX_VERSION in
-  MIPSpro*)
-    AR=$CXX
-    ARFLAGS="-ar -o"
-  ;;
-  *Forte*)
-    AR=$CXX
-    ARFLAGS="-xar -o"
-esac
+MYSQL_PROG_AR
 
 # Avoid bug in fcntl on some versions of linux
 AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")

--- 1.9/config/ac-macros/misc.m4	2005-06-22 14:08:20 +05:00
+++ 1.10/config/ac-macros/misc.m4	2005-06-22 16:29:16 +05:00
@@ -737,3 +737,32 @@
 fi
 AC_SUBST(CXX_VERSION)
 ])
+
+AC_DEFUN([MYSQL_PROG_AR], [
+AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
+case $CXX_VERSION in
+  MIPSpro*)
+    AR=$CXX
+    ARFLAGS="-ar -o"
+  ;;
+  *Forte*)
+    AR=$CXX
+    ARFLAGS="-xar -o"
+  ;;
+  *)
+    if test -z "$AR"
+    then
+      AC_CHECK_PROG([AR], [ar], [ar])
+    fi
+    if test -z "$AR"
+    then
+      AC_MSG_ERROR([You need ar to build the library])
+    fi
+    if test -z "$ARFLAGS"
+    then
+      ARFLAGS="cru"
+    fi
+esac
+AC_SUBST(AR)
+AC_SUBST(ARFLAGS)
+])