Merge mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build

into mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build

Merge mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build
into mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
b60c1366 · kent@kent-amd64.(none) · 3a9202bd · 41778b56 · b60c1366 · b60c1366
Commit b60c1366 authored Nov 22, 2007 by kent@kent-amd64.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Docs/Makefile.am Docs/Makefile.am +1 -1

configure.in configure.in +5 -0

No files found.
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-EXTRA_DIST =		mysql.info INSTALL-BINARY
+EXTRA_DIST =		mysql.info INSTALL-BINARY @extra_docs@
 # make sure that "make install" installs the info page, too
 # automake only seems to take care of this automatically,

--- a/configure.in
+++ b/configure.in
@@ -2379,10 +2379,15 @@ AC_ARG_WITH(docs,
 if test "$with_docs" = "yes"
 then
  docs_dirs="Docs"
+  if test -f "$srcdir/Docs/manual.chm" ; then
+    extra_docs="manual.chm"
+  fi
 else
  docs_dirs=""
+  extra_docs=""
 fi
 AC_SUBST(docs_dirs)
+AC_SUBST(extra_docs)
 # Shall we build the man pages?
 AC_ARG_WITH(man,