From 7e543dd533c5082056e6a3d59b2655bfe774e188 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Nov 2007 14:27:35 +0100 Subject: configure.in: Revert version back to 5.0.52 for release build configure.in: Revert version back to 5.0.52 for release build --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e042bb80719..c423bca3faa 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.54) +AM_INIT_AUTOMAKE(mysql, 5.0.52) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 @@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=54 +NDB_VERSION_BUILD=52 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? -- cgit v1.2.1 From 1b9a1b34f516cb0e2613a4ab402bae79494cf33e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 22 Nov 2007 17:48:40 +0100 Subject: Makefile.am, configure.in: Include "manual.chm" in source TAR if it exists configure.in: Include "manual.chm" in source TAR if it exists Docs/Makefile.am: Include "manual.chm" in source TAR if it exists --- configure.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e042bb80719..ead2f85afb7 100644 --- a/configure.in +++ b/configure.in @@ -2452,10 +2452,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, -- cgit v1.2.1 From e4936a35317d043a0c2a9794f9320aebae5864dc Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Dec 2007 20:27:08 +0100 Subject: configure.in: Removed the auto detection and use of Solaris "libmtmalloc", as it cause regression on bug#18322. The code removed also prevented a build without using this library. Users can still compile with "libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc" configure.in: Removed the auto detection and use of Solaris "libmtmalloc", as it cause regression on bug#18322. The code removed also prevented a build without using this library. Users can still compile with "libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc" --- configure.in | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0fa99dc1b00..b6dd6e29509 100644 --- a/configure.in +++ b/configure.in @@ -789,7 +789,6 @@ AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) AC_CHECK_LIB(nsl_r, gethostbyname_r, [], AC_CHECK_LIB(nsl, gethostbyname_r)) AC_CHECK_FUNC(gethostbyname_r) -AC_CHECK_LIB(mtmalloc, malloc) AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) AC_CHECK_FUNC(yp_get_default_domain, , -- cgit v1.2.1 From 59d90cdeee80a6466520924c4458adb7ac10cf0f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Dec 2007 17:38:49 +0100 Subject: No we're still at 5.0.54. --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 52fe0dc9c66..ead2f85afb7 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.52) +AM_INIT_AUTOMAKE(mysql, 5.0.54) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 @@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=52 +NDB_VERSION_BUILD=54 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? -- cgit v1.2.1