diff options
| author | unknown <kent@kent-amd64.(none)> | 2008-02-26 18:38:43 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2008-02-26 18:38:43 +0100 |
| commit | 1113518436ab205e505c8af233d401a393a5cda6 (patch) | |
| tree | 059522210811c81c0dbbed66a9bd680518ffa317 /config | |
| parent | 977edd0c8424dd2ee3ab743ef5b6ef16b770bb49 (diff) | |
| parent | 1aaa63aabaef8015c71fc6143b3062e197049707 (diff) | |
| download | mariadb-git-1113518436ab205e505c8af233d401a393a5cda6.tar.gz | |
Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into mysql.com:/home/kent/bk/build/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/character_sets.m4 | 6 | ||||
| -rw-r--r-- | config/ac-macros/misc.m4 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4 index 8c3e8ca73b7..ea2763a1cd4 100644 --- a/config/ac-macros/character_sets.m4 +++ b/config/ac-macros/character_sets.m4 @@ -199,7 +199,7 @@ do ;; *) AC_MSG_ERROR([Charset '$cs' not available. (Available are: $CHARSETS_AVAILABLE). - See the Installation chapter in the Reference Manual.]); + See the Installation chapter in the Reference Manual.]) esac done @@ -380,7 +380,7 @@ case $default_charset in ;; *) AC_MSG_ERROR([Charset $cs not available. (Available are: $CHARSETS_AVAILABLE). - See the Installation chapter in the Reference Manual.]); + See the Installation chapter in the Reference Manual.]) esac if test "$default_collation" = default; then @@ -405,7 +405,7 @@ else Collation $default_collation is not valid for character set $default_charset. Valid collations are: $default_charset_collations. See the Installation chapter in the Reference Manual. - ]); + ]) fi AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"], diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 975e48d0487..2fbb30383bd 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -631,7 +631,7 @@ case $SYSTEM_TYPE in esac if test "$CXX_VERSION" then - AC_MSG_CHECKING("C++ compiler version"); + AC_MSG_CHECKING("C++ compiler version") AC_MSG_RESULT("$CXX $CXX_VERSION") fi AC_SUBST(CXX_VERSION) |