bk commit into 5.1 tree (joerg:1.2598)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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@stripped, 2007-04-20 11:03:13+02:00, joerg@debian.(none) +1 -0
  Merge debian.(none):/M50/bug27739-5.0
  into  debian.(none):/M51/bug27739-5.1
  MERGE: 1.1810.2815.4

  configure.in@stripped, 2007-04-20 11:02:58+02:00, joerg@debian.(none) +0 -0
    Auto merged
    MERGE: 1.245.1.194

# 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:	joerg
# Host:	debian.(none)
# Root:	/M51/bug27739-5.1/RESYNC

--- 1.453/configure.in	2007-04-17 14:45:14 +02:00
+++ 1.454/configure.in	2007-04-20 11:02:58 +02:00
@@ -418,6 +418,22 @@
 
 # icheck, used for ABI check
 AC_PATH_PROG(ICHECK, icheck, no)
+# "icheck" is also the name of a file system check program on Tru64.
+# Verify the program found is really the interface checker.
+if test "x$ICHECK" != "xno"
+then
+  AC_MSG_CHECKING(if $ICHECK works as expected)
+  echo "int foo;" > conftest.h
+  $ICHECK --canonify -o conftest.ic conftest.h 2>/dev/null
+  if test -f "conftest.ic"
+  then
+    AC_MSG_RESULT(yes)
+  else
+    AC_MSG_RESULT(no)
+    ICHECK=no
+  fi
+  rm -f conftest.ic conftest.h
+fi
 AC_SUBST(ICHECK)
 
 # Lock for PS