diff options
| author | Michael Widenius <monty@mysql.com> | 2010-11-29 11:27:52 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-11-29 11:27:52 +0200 |
| commit | e68ff466534c370b96e96ee3c0b04996ae67ecfd (patch) | |
| tree | 424de8ecfa893f4b50bd6015971283965ef83f8e /config/ac-macros | |
| parent | 9ab4829bc6d37e0ffacc016ce09351e9bde8cf81 (diff) | |
| download | mariadb-git-e68ff466534c370b96e96ee3c0b04996ae67ecfd.tar.gz | |
Fixed compiler and gmake warnings
- Removed SCCS rule from Makefile.am
- Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
config/ac-macros/maintainer.m4:
Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
Force initialization of variables when using -Werror (To get rid of compiler warnings)
configure.in:
Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
sql/sql_yacc.yy:
Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
Diffstat (limited to 'config/ac-macros')
| -rw-r--r-- | config/ac-macros/maintainer.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/ac-macros/maintainer.m4 b/config/ac-macros/maintainer.m4 index e18be27ce02..9b4bf3d076b 100644 --- a/config/ac-macros/maintainer.m4 +++ b/config/ac-macros/maintainer.m4 @@ -8,7 +8,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [ [AS_HELP_STRING([--enable-mysql-maintainer-mode], [Enable a MySQL maintainer-specific development environment])], [USE_MYSQL_MAINTAINER_MODE=$enableval], - [AS_IF([test "$with_debug" != "no"], + [AS_IF([test "$with_debug" != "no" -a "$with_valgrind" = "no"], [USE_MYSQL_MAINTAINER_MODE=yes], [USE_MYSQL_MAINTAINER_MODE=no])]) AC_MSG_RESULT([$USE_MYSQL_MAINTAINER_MODE]) ]) @@ -17,7 +17,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [ AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [ # Setup GCC warning options. AS_IF([test "$GCC" = "yes"], [ - C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror" + C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror -DFORCE_INIT_OF_VARS" CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter" ]) |