diff options
| author | Narayanan V <v.narayanan@sun.com> | 2008-07-31 16:59:41 +0530 |
|---|---|---|
| committer | Narayanan V <v.narayanan@sun.com> | 2008-07-31 16:59:41 +0530 |
| commit | 10aa6172765f0a65cb8dc5449a91903ad46bacf6 (patch) | |
| tree | 3bd43bee2e86949ce96ad1f7074dbbe225f6e723 /configure.in | |
| parent | b467c15e3694772b0da0930274a8dfc4a8ead030 (diff) | |
| parent | 223c0177e71c4d586d36f1e595dfe7145b28df3d (diff) | |
| download | mariadb-git-10aa6172765f0a65cb8dc5449a91903ad46bacf6.tar.gz | |
merging mysql-5.1 -> mysql-5.1-sea
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/configure.in b/configure.in index 56bdb4ba006..eeb2977e0ba 100644 --- a/configure.in +++ b/configure.in @@ -419,6 +419,7 @@ AC_PATH_PROG(SED, sed, sed) AC_PATH_PROG(CMP, cmp, cmp) AC_PATH_PROG(CHMOD, chmod, chmod) AC_PATH_PROG(HOSTNAME, hostname, hostname) +AC_PATH_PROG(DIFF, diff, diff) # Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and # fall back to 'tar' otherwise and hope that it's a GNU tar as well AC_CHECK_PROGS(TAR, gnutar gtar tar) @@ -443,26 +444,6 @@ AC_SUBST(HOSTNAME) AC_SUBST(PERL) AC_SUBST(PERL5) -# 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 AC_PATH_PROG(PS, ps, ps) AC_MSG_CHECKING("how to check if pid exists") |