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

@@ -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"],

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)

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)

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>

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