diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2008-02-26 18:36:06 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2008-02-26 18:36:06 +0100 |
| commit | 1aaa63aabaef8015c71fc6143b3062e197049707 (patch) | |
| tree | 6b688301bdebe315cb40a33ec74716a7786b1a80 | |
| parent | 720b3d15d8dc9bf011db4ecb5524bd5ba7f469e5 (diff) | |
| download | mariadb-git-1aaa63aabaef8015c71fc6143b3062e197049707.tar.gz | |
Makefile.am, Info.plist.sh:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
Removed unneded semicolon
config/ac-macros/character_sets.m4:
Removed unneded semicolon
config/ac-macros/misc.m4:
Removed unneded semicolon
config/ac-macros/openssl.m4:
Removed unneded semicolon
support-files/MacOSX/Info.plist.sh:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
support-files/MacOSX/Makefile.am:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
| -rw-r--r-- | config/ac-macros/character_sets.m4 | 6 | ||||
| -rw-r--r-- | config/ac-macros/misc.m4 | 2 | ||||
| -rw-r--r-- | config/ac-macros/openssl.m4 | 4 | ||||
| -rw-r--r-- | support-files/MacOSX/Info.plist.sh | 2 | ||||
| -rw-r--r-- | support-files/MacOSX/Makefile.am | 2 |
5 files changed, 8 insertions, 8 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 9c7b9aeb171..8c3b51ebc5e 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -756,7 +756,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) diff --git a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4 index 3130cdc3437..9de69b8a1b4 100644 --- a/config/ac-macros/openssl.m4 +++ b/config/ac-macros/openssl.m4 @@ -126,11 +126,11 @@ AC_MSG_CHECKING(for OpenSSL) AC_MSG_RESULT(no) if test ! -z "$openssl_includes" then - AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl); + AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl) fi if test ! -z "$openssl_libs" then - AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl); + AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl) fi fi AC_SUBST(openssl_libs) diff --git a/support-files/MacOSX/Info.plist.sh b/support-files/MacOSX/Info.plist.sh index fdfb0c7a17c..7df9c5ac710 100644 --- a/support-files/MacOSX/Info.plist.sh +++ b/support-files/MacOSX/Info.plist.sh @@ -9,7 +9,7 @@ <key>CFBundleName</key> <string>MySQL</string> <key>CFBundleShortVersionString</key> - <string>@MYSQL_NO_DASH_VERSION@</string> + <string>@MYSQL_NUMERIC_VERSION@</string> <key>IFPkgFlagAllowBackRev</key> <false/> <key>IFPkgFlagAuthorizationAction</key> diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am index 85ccb9c126d..3f11107d714 100644 --- a/support-files/MacOSX/Makefile.am +++ b/support-files/MacOSX/Makefile.am @@ -47,7 +47,7 @@ SUFFIXES = .sh @SED@ \ -e 's!@''prefix''@!$(prefix)!g' \ -e 's!@''VERSION''@!@VERSION@!' \ - -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \ + -e 's!@''MYSQL_NUMERIC_VERSION''@!@MYSQL_NUMERIC_VERSION@!' \ -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ $< > $@-t |