diff options
| author | unknown <anozdrin/alik@alik.> | 2006-11-07 16:24:35 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.> | 2006-11-07 16:24:35 +0300 |
| commit | b554ce7e5706ff3f9ec32f14e4c2c3606d89a453 (patch) | |
| tree | 4c085423d9f65d9221f445b2bc03833ed5b266f0 /configure.in | |
| parent | 1283f4f2e41caff8b024016410a30f5edcf9870c (diff) | |
| parent | deecc1b331fe5d0a18cd2912062a0a078b18be03 (diff) | |
| download | mariadb-git-b554ce7e5706ff3f9ec32f14e4c2c3606d89a453.tar.gz | |
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/time.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/mysql-test-run.pl:
Manually merged.
sql/sql_parse.cc:
Manually merged.
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 65523fbe3a9..a58f71e22c2 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 |