Commit f215e13a authored by Luca Boccassi's avatar Luca Boccassi

Problem: compiler flags passed to preprocessor in autoconf

Solution: use CXXFLAGS for compiler flags and CPPFLAGS for preprocessor
flags.
parent 79f65b43
...@@ -158,7 +158,8 @@ libzmq_on_gnu="no" ...@@ -158,7 +158,8 @@ libzmq_on_gnu="no"
libzmq_on_debian_kfreebsd="no" libzmq_on_debian_kfreebsd="no"
# Set some default features required by ZeroMQ code # Set some default features required by ZeroMQ code
CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE -Wno-long-long $CPPFLAGS" CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
CXXFLAGS="-Wno-long-long $CXXFLAGS"
# Will be used to add flags to pkg-config useful when apps want to statically link # Will be used to add flags to pkg-config useful when apps want to statically link
PKGCFG_LIBS_PRIVATE="" PKGCFG_LIBS_PRIVATE=""
...@@ -188,7 +189,8 @@ case "${host_os}" in ...@@ -188,7 +189,8 @@ case "${host_os}" in
;; ;;
*solaris*) *solaris*)
# Define on Solaris to enable all library features # Define on Solaris to enable all library features
CPPFLAGS="-Wno-sign-compare -D_PTHREADS $CPPFLAGS" CPPFLAGS="-D_PTHREADS $CPPFLAGS"
CXXFLAGS="-Wno-sign-compare $CXXFLAGS"
AC_DEFINE(ZMQ_HAVE_SOLARIS, 1, [Have Solaris OS]) AC_DEFINE(ZMQ_HAVE_SOLARIS, 1, [Have Solaris OS])
AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(socket, socket)
AC_CHECK_LIB(nsl, gethostbyname) AC_CHECK_LIB(nsl, gethostbyname)
...@@ -602,14 +604,14 @@ AM_CONDITIONAL(HAVE_VMCI, test "x$have_vmci_ext" != "xno") ...@@ -602,14 +604,14 @@ AM_CONDITIONAL(HAVE_VMCI, test "x$have_vmci_ext" != "xno")
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
# Check how to enable -Wall # Check how to enable -Wall
LIBZMQ_LANG_WALL([CPPFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag $CPPFLAGS"]) LIBZMQ_LANG_WALL([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag $CXXFLAGS"])
if test "x$libzmq_werror" = "xyes" -a "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" != "xyes"; then if test "x$libzmq_werror" = "xyes" -a "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" != "xyes"; then
LIBZMQ_LANG_WERROR([CPPFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag $CPPFLAGS"]) LIBZMQ_LANG_WERROR([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag $CXXFLAGS"])
fi fi
if test "x$libzmq_pedantic" = "xyes"; then if test "x$libzmq_pedantic" = "xyes"; then
LIBZMQ_LANG_STRICT([CPPFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag $CPPFLAGS"]) LIBZMQ_LANG_STRICT([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag $CXXFLAGS"])
fi fi
AC_LANG_POP([C++]) AC_LANG_POP([C++])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment