1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.am, Info.plist.sh:

Browse Source 
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
This commit is contained in:
unknown 2008-02-26 18:36:06 +01:00
parent 720b3d15d8
commit 1aaa63aaba
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/ac-macros/character_sets.m4
View File

@ -199,7 +199,7 @@ do
;; ;;
*) *)
AC_MSG_ERROR([Charset '$cs' not available. (Available are: $CHARSETS_AVAILABLE). 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 esac
done done
@ -380,7 +380,7 @@ case $default_charset in
;; ;;
*) *)
AC_MSG_ERROR([Charset $cs not available. (Available are: $CHARSETS_AVAILABLE). 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 esac
if test "$default_collation" = default; then if test "$default_collation" = default; then
@ -405,7 +405,7 @@ else
Collation $default_collation is not valid for character set $default_charset. Collation $default_collation is not valid for character set $default_charset.
Valid collations are: $default_charset_collations. Valid collations are: $default_charset_collations.
See the Installation chapter in the Reference Manual. See the Installation chapter in the Reference Manual.
]); ])
fi fi
AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"], AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"],

2
config/ac-macros/misc.m4
View File

@ -756,7 +756,7 @@ case $SYSTEM_TYPE in
esac esac
if test "$CXX_VERSION" if test "$CXX_VERSION"
then then
AC_MSG_CHECKING("C++ compiler version"); AC_MSG_CHECKING("C++ compiler version")
AC_MSG_RESULT("$CXX $CXX_VERSION") AC_MSG_RESULT("$CXX $CXX_VERSION")
fi fi
AC_SUBST(CXX_VERSION) AC_SUBST(CXX_VERSION)

4
config/ac-macros/openssl.m4
View File

@ -126,11 +126,11 @@ AC_MSG_CHECKING(for OpenSSL)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
if test ! -z "$openssl_includes" if test ! -z "$openssl_includes"
then 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 fi
if test ! -z "$openssl_libs" if test ! -z "$openssl_libs"
then 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
fi fi
AC_SUBST(openssl_libs) AC_SUBST(openssl_libs)

2
support-files/MacOSX/Info.plist.sh
View File

@ -9,7 +9,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>MySQL</string> <string>MySQL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>@MYSQL_NO_DASH_VERSION@</string> <string>@MYSQL_NUMERIC_VERSION@</string>
<key>IFPkgFlagAllowBackRev</key> <key>IFPkgFlagAllowBackRev</key>
<false/> <false/>
<key>IFPkgFlagAuthorizationAction</key> <key>IFPkgFlagAuthorizationAction</key>

2
support-files/MacOSX/Makefile.am
View File

@ -47,7 +47,7 @@ SUFFIXES = .sh
@SED@ \ @SED@ \
-e 's!@''prefix''@!$(prefix)!g' \ -e 's!@''prefix''@!$(prefix)!g' \
-e 's!@''VERSION''@!@VERSION@!' \ -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!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
$< > $@-t $< > $@-t