diff options
| author | unknown <jimw@mysql.com> | 2006-04-13 10:37:57 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-13 10:37:57 -0700 |
| commit | c323e60c46c73efde0efea3ff056f83e17cb9009 (patch) | |
| tree | 6e8a46e592c3904f889bb457121f5350fbcf5661 /configure.in | |
| parent | e2f724a8222e881737d73fb4b6f549ab6c56f247 (diff) | |
| parent | 0544ed4204416540bc11b222d4dd1af24a4a744d (diff) | |
| download | mariadb-git-c323e60c46c73efde0efea3ff056f83e17cb9009.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-clean
into mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
Makefile.am:
Resolve conflict
configure.in:
Resolve conflict
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/configure.in b/configure.in index e485d6c7389..6984f5b5f89 100644 --- a/configure.in +++ b/configure.in @@ -2288,26 +2288,6 @@ fi AC_SUBST(man_dirs) AC_SUBST(man1_files) -if test -e sql-bench -then -# Shall we build the bench code? -AC_ARG_WITH(bench, - [ --without-bench Skip building of the benchmark suite.], - [with_bench=$withval], - [with_bench=yes] -) -fi - -if test "$with_bench" = "yes" -then - bench_dirs="sql-bench" - AC_CONFIG_FILES(sql-bench/Makefile) -else - bench_dirs="" -fi -bench_dirs="$bench_dirs mysql-test" -AC_SUBST(bench_dirs) - # Don't build readline, i have it already AC_ARG_WITH(readline, [ --without-readline Use system readline instead of bundled copy.], |