diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-11-02 17:51:59 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-11-02 17:51:59 -0500 |
| commit | b074e1348343224f22a6c58eba38bd565cabd24a (patch) | |
| tree | dc9dc6a9c5046129bcdf2523c94969503fb1a0cc /configure.in | |
| parent | b2978f9ee8bc9e4f44299ab0ffcb1bc4b99cfb89 (diff) | |
| parent | deb03b93ece12ee8ac0fe144455912730efcfc26 (diff) | |
| download | mariadb-git-b074e1348343224f22a6c58eba38bd565cabd24a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 61eb8a9d259..8fd60b966d6 100644 --- a/configure.in +++ b/configure.in @@ -415,6 +415,10 @@ AC_SUBST(HOSTNAME) AC_SUBST(PERL) AC_SUBST(PERL5) +# icheck, used for ABI check +AC_PATH_PROG(ICHECK, icheck, no) +AC_SUBST(ICHECK) + # Lock for PS AC_PATH_PROG(PS, ps, ps) AC_MSG_CHECKING("how to check if pid exists") @@ -1060,6 +1064,18 @@ EOF s,\(extra/comp_err\)\$(EXEEXT),\1.linux, EOF ;; + libmysql/Makefile.in) + cat > $filesed << EOF +s,libyassl.la,.libs/libyassl.a, +s,libtaocrypt.la,.libs/libtaocrypt.a, +EOF + ;; + libmysql_r/Makefile.in) + cat > $filesed << EOF +s,libyassl.la,.libs/libyassl.a, +s,libtaocrypt.la,.libs/libtaocrypt.a, +EOF + ;; client/Makefile.in) # cat > $filesed << EOF |