Commit ff4839a9 authored by tim@cane.mysql.fi's avatar tim@cane.mysql.fi
Browse files

Merge work.mysql.com:/home/bk/mysql 

into cane.mysql.fi:/usr/home/tim/my/work
parents fff8cbff 08d36171

configure.in

+8 −0
Original line number Diff line number Diff line
@@ -389,6 +389,14 @@ then 
  AC_MSG_ERROR([MySQL requiers a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])

fi



AC_ARG_WITH(server-suffix,

    [  --with-server-suffix    Append value to the version string.],

    # I heard that 'cut' isn't portable.  Isn't there a better way?

    [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e  's/^\(...................................\)..*$/\1/'` ],

    [ MYSQL_SERVER_SUFFIX= ]

    )

AC_SUBST(MYSQL_SERVER_SUFFIX)



# Set flags if we wants to have MIT threads.

AC_ARG_WITH(mit-threads,

    [  --with-mit-threads      Always use included thread lib.],

include/mysql_version.h.in

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#else

#define PROTOCOL_VERSION		@PROTOCOL_VERSION@

#define MYSQL_SERVER_VERSION		"@VERSION@"

#define MYSQL_SERVER_SUFFIX		"@MYSQL_SERVER_SUFFIX@"

#define FRM_VER				@DOT_FRM_VERSION@

#define MYSQL_VERSION_ID		@MYSQL_VERSION_ID@

#define MYSQL_PORT			@MYSQL_TCP_PORT@

myisam/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ SUFFIXES = .sh 
	  -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\

	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\

	  -e 's!@''VERSION''@!@VERSION@!' \

	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \

	  -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \

	  -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \

	  -e 's!@''HOSTNAME''@!@HOSTNAME@!' \

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ SUFFIXES = .sh 
	  -e 's!@''libexecdir''@!$(libexecdir)!g' \

	  -e 's!@''PERL''@!@PERL@!' \

	  -e 's!@''VERSION''@!@VERSION@!' \

	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \

	  $< > $@-t

	@CHMOD@ +x $@-t

	@MV@ $@-t $@

scripts/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ SUFFIXES = .sh 
	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\

	  -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \

	  -e 's!@''VERSION''@!@VERSION@!' \

	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \

	  -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \

	  -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \

	  -e 's!@''HOSTNAME''@!@HOSTNAME@!' \