summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-03-28 23:08:00 +0200
committerunknown <kent@kent-amd64.(none)>2007-03-28 23:08:00 +0200
commitf2e8355d27748c3fed3b4562cc357825d9910317 (patch)
tree4c3aa8ce9f94908db01e0a1f2cc92620f3783d0d /configure.in
parent5d3b8266b8d9fab8ee0981c885d88b41e969b106 (diff)
parent406fd12ad42268b42631c27772a292d5787ff0a4 (diff)
downloadmariadb-git-f2e8355d27748c3fed3b4562cc357825d9910317.tar.gz
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build Makefile.am: Auto merged configure.in: Auto merged include/config-win.h: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-README~1: Auto merged BitKeeper/deleted/.del-configure.js: Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in12
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 4a70337b048..50ca08ab1ed 100644
--- a/configure.in
+++ b/configure.in
@@ -2296,12 +2296,18 @@ AC_ARG_WITH(man,
[with_man=yes]
)
-if test "$with_man" = "yes"
+if test X"$with_man" = Xyes
then
man_dirs="man"
- man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
+ if test X"$have_ndbcluster" = Xyes
+ then
+ man1_files=`ls $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
+ man8_files=`ls $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
+ else
+ man1_files=`ls $srcdir/man/*.1 | grep -v '/ndb' | sed -e 's;^.*man/;;'`
+ man8_files=`ls $srcdir/man/*.8 | grep -v '/ndb' | sed -e 's;^.*man/;;'`
+ fi
man1_files=`echo $man1_files`
- man8_files=`ls -1 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
man8_files=`echo $man8_files`
else
man_dirs=""