From: Date: April 20 2007 10:52am
Subject: bk commit into 5.0 tree (joerg:1.2459) BUG#27739
List-Archive: http://lists.mysql.com/commits/24978
X-Bug: 27739
Message-Id: <200704200852.l3K8qDaO001362@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 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 10:51:53+02:00, joerg@debian.(none) +1 -0
  configure.in  :  Ensure that "icheck" is really the ABI checker,
                   not some other tool (file system checker on Tru64).
  
  Patch originally supplied by Peter O'Gorman, slightly modified by me.
  
  Bug#27739 "build fails on Tru64 due to icheck test in configure"

  configure.in@stripped, 2007-04-20 10:51:45+02:00, joerg@debian.(none) +16 -0
    We use "icheck" as a tool to check against ABI changes.
    However, some systems (like Tru64) have "icheck" as a file system checker.
    So if "icheck" is found, it should be verified that this really is the
    ABI checker and not some other tool.
    
    Patch originally supplied by Peter O'Gorman, slightly modified by me.
    
    Bug#27739 "build fails on Tru64 due to icheck test in configure"

# 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:	/M50/bug27739-5.0

--- 1.438/configure.in	2007-04-17 14:41:03 +02:00
+++ 1.439/configure.in	2007-04-20 10:51:45 +02:00
@@ -459,6 +459,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