projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove dead bit from m4
[awesomized/libmemcached]
/
m4
/
pandora_warnings.m4
diff --git
a/m4/pandora_warnings.m4
b/m4/pandora_warnings.m4
index 6d82df1d961aff6ed60e0d4b72de40e217a55e71..42cee56b9d6595ec223dcdb820f0505f11790b4f 100644
(file)
--- a/
m4/pandora_warnings.m4
+++ b/
m4/pandora_warnings.m4
@@
-27,7
+27,6
@@
AC_DEFUN([PANDORA_WARNINGS],[
])
])
])
])
- AC_REQUIRE([PANDORA_BUILDING_FROM_VC])
m4_if(PW_WARN_ALWAYS_ON, [yes],
[ac_cv_warnings_as_errors=yes],
AS_IF([test "$pandora_building_from_vc" = "yes"],
m4_if(PW_WARN_ALWAYS_ON, [yes],
[ac_cv_warnings_as_errors=yes],
AS_IF([test "$pandora_building_from_vc" = "yes"],
@@
-75,8
+74,11
@@
AC_DEFUN([PANDORA_WARNINGS],[
- AS_IF([test "$ac_cv_warnings_as_errors" = "yes"],
- [W_FAIL="-Werror"])
+ AS_IF([test "$ac_cv_warnings_as_errors" = "yes"],[
+ W_FAIL="-Werror"
+ SPHINX_WARNINGS="-W"
+ INTLTOOL_WARNINGS="yes"
+ ])
AC_CACHE_CHECK([whether it is safe to use -fdiagnostics-show-option],
[ac_cv_safe_to_use_fdiagnostics_show_option_],
AC_CACHE_CHECK([whether it is safe to use -fdiagnostics-show-option],
[ac_cv_safe_to_use_fdiagnostics_show_option_],
@@
-127,9
+129,9
@@
AC_DEFUN([PANDORA_WARNINGS],[
],[
m4_if(PW_LESS_WARNINGS,[no],[
],[
m4_if(PW_LESS_WARNINGS,[no],[
- BASE_WARNINGS_FULL="${W_CONVERSION} -Wstrict-aliasing"
+ BASE_WARNINGS_FULL="${W_CONVERSION} -Wstrict-aliasing
-Wswitch-enum
"
CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum -Wwrite-strings"
CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum -Wwrite-strings"
- CXX_WARNINGS_FULL="
-Weffc++ -Wold-style-cast
"
+ CXX_WARNINGS_FULL=""
NO_OLD_STYLE_CAST="-Wno-old-style-cast"
NO_EFF_CXX="-Wno-effc++"
],[
NO_OLD_STYLE_CAST="-Wno-old-style-cast"
NO_EFF_CXX="-Wno-effc++"
],[
@@
-372,6
+374,7
@@
inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}"
NO_WERROR="-Wno-error"
PERMISSIVE_WARNINGS="-Wno-error -Wno-unused-function -fpermissive"
PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}"
NO_WERROR="-Wno-error"
PERMISSIVE_WARNINGS="-Wno-error -Wno-unused-function -fpermissive"
+ PERMISSIVE_C_WARNINGS="-Wno-error -Wno-redundant-decls"
AS_IF([test "$host_vendor" = "apple"],[
BOOSTSKIP_WARNINGS="-Wno-uninitialized"
])
AS_IF([test "$host_vendor" = "apple"],[
BOOSTSKIP_WARNINGS="-Wno-uninitialized"
])
@@
-434,7
+437,10
@@
inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
AC_SUBST(INNOBASE_SKIP_WARNINGS)
AC_SUBST(BOOSTSKIP_WARNINGS)
AC_SUBST(PERMISSIVE_WARNINGS)
AC_SUBST(INNOBASE_SKIP_WARNINGS)
AC_SUBST(BOOSTSKIP_WARNINGS)
AC_SUBST(PERMISSIVE_WARNINGS)
+ AC_SUBST(PERMISSIVE_C_WARNINGS)
AC_SUBST(NO_WERROR)
AC_SUBST([GCOV_LIBS])
AC_SUBST(NO_WERROR)
AC_SUBST([GCOV_LIBS])
+ AC_SUBST([SPHINX_WARNINGS])
+ AC_SUBST([INTLTOOL_WARNINGS])
])
])