izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around "make distcheck" fail on OS X with protobuf 3.02.

Browse Source
This commit is contained in:
John Hood
2016-09-18 21:55:43 -04:00
parent e734d5e41a
commit e494025b24
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+7 -3
View File
@@ -22,6 +22,7 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
WARNING_CXXFLAGS="" WARNING_CXXFLAGS=""
PICKY_CXXFLAGS="" PICKY_CXXFLAGS=""
DISTCHECK_CXXFLAGS=""
AC_ARG_ENABLE([compile-warnings], AC_ARG_ENABLE([compile-warnings],
[AS_HELP_STRING([--enable-compile-warnings@<:@=no/yes/maximum/error/distcheck@:>@], [AS_HELP_STRING([--enable-compile-warnings@<:@=no/yes/maximum/error/distcheck@:>@],
[Turn on compiler warnings])], [Turn on compiler warnings])],
@@ -42,9 +43,12 @@ AC_ARG_ENABLE([compile-warnings],
distcheck) distcheck)
WARNING_CXXFLAGS="-Wall -Werror" WARNING_CXXFLAGS="-Wall -Werror"
PICKY_CXXFLAGS="-Wextra -pedantic -Wno-long-long -Weffc++ -Wmissing-declarations" PICKY_CXXFLAGS="-Wextra -pedantic -Wno-long-long -Weffc++ -Wmissing-declarations"
if test "$(uname -s)" != Linux; then AC_LANG_PUSH(C++)
PICKY_CXXFLAGS="${PICKY_CXXFLAGS} -Wno-error=unused-parameter" AX_CHECK_COMPILE_FLAG([-Wno-error=unused-parameter],
fi [PICKY_CXXFLAGS="$PICKY_CXXFLAGS -Wno-error=unused-parameter"], [], [-Werror])
AX_CHECK_COMPILE_FLAG([-Wno-error=c++11-extensions],
[PICKY_CXXFLAGS="$PICKY_CXXFLAGS -Wno-error=c++11-extensions"], [], [-Werror])
AC_LANG_POP(C++)
;; ;;
*) *)
AC_MSG_ERROR([Unknown argument '$enableval' to --enable-compile-warnings]) AC_MSG_ERROR([Unknown argument '$enableval' to --enable-compile-warnings])