Skip to content
Snippets Groups Projects
Commit f630b013 authored by SASANO Takayoshi's avatar SASANO Takayoshi Committed by Adrien Béraud
Browse files

replace CPPFLAGS += ... (2)

parent 36167c3e
Branches
No related tags found
No related merge requests found
...@@ -21,12 +21,10 @@ AS_IF([test "x$enable_debug" = "xyes"], ...@@ -21,12 +21,10 @@ AS_IF([test "x$enable_debug" = "xyes"],
[CXXFLAGS="${CXXFLAGS} -g -Og -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Wno-deprecated -pedantic-errors"], [CXXFLAGS="${CXXFLAGS} -g -Og -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Wno-deprecated -pedantic-errors"],
[CXXFLAGS="${CXXFLAGS} -O3 -Wno-deprecated -pedantic-errors -fvisibility=hidden"]) [CXXFLAGS="${CXXFLAGS} -O3 -Wno-deprecated -pedantic-errors -fvisibility=hidden"])
save_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -DOPENDHT_BUILD"
CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_BUILD"
AM_CONDITIONAL([OPENDHT_SHARED], [test "x$enable_shared" != xno]) AM_CONDITIONAL([OPENDHT_SHARED], [test "x$enable_shared" != xno])
AM_COND_IF(OPENDHT_SHARED, [ AM_COND_IF(OPENDHT_SHARED, [
save_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -Dopendht_EXPORTS"
CPPFLAGS="${save_CPPFLAGS} -Dopendht_EXPORTS"
]) ])
AM_PROG_AR AM_PROG_AR
...@@ -149,8 +147,7 @@ AS_IF([test "x$with_jsoncpp" != "xno"], ...@@ -149,8 +147,7 @@ AS_IF([test "x$with_jsoncpp" != "xno"],
[have_jsoncpp=no]) [have_jsoncpp=no])
AS_IF([test "x$have_jsoncpp" = "xyes"], [ AS_IF([test "x$have_jsoncpp" = "xyes"], [
AC_MSG_NOTICE([Using JsonCpp]) AC_MSG_NOTICE([Using JsonCpp])
save_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -DOPENDHT_JSONCPP"
CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_JSONCPP"
AC_SUBST(jsoncpp_lib, [", jsoncpp"]) AC_SUBST(jsoncpp_lib, [", jsoncpp"])
], [ ], [
AC_MSG_NOTICE([Not using JsonCpp]) AC_MSG_NOTICE([Not using JsonCpp])
...@@ -197,14 +194,8 @@ AM_COND_IF([ENABLE_TOOLS], [ ...@@ -197,14 +194,8 @@ AM_COND_IF([ENABLE_TOOLS], [
AM_COND_IF(ENABLE_PROXY_SERVER, AC_DEFINE([OPENDHT_PROXY_SERVER], [], [Building with proxy server])) AM_COND_IF(ENABLE_PROXY_SERVER, AC_DEFINE([OPENDHT_PROXY_SERVER], [], [Building with proxy server]))
AM_COND_IF(ENABLE_PROXY_CLIENT, AC_DEFINE([OPENDHT_PROXY_CLIENT], [], [Building with proxy client])) AM_COND_IF(ENABLE_PROXY_CLIENT, AC_DEFINE([OPENDHT_PROXY_CLIENT], [], [Building with proxy client]))
AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS, [ AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS, [CPPFLAGS="${CPPFLAGS} -DOPENDHT_PUSH_NOTIFICATIONS"], [])
save_CPPFLAGS="${CPPFLAGS}" AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY, [CPPFLAGS="${CPPFLAGS} -DOPENDHT_PROXY_SERVER_IDENTITY"], [])
CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_PUSH_NOTIFICATIONS"
], [])
AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY, [
save_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_PROXY_SERVER_IDENTITY"
], [])
dnl Configure setup.py if we build the python module dnl Configure setup.py if we build the python module
AC_SUBST(CURRENT_SOURCE_DIR, ".") AC_SUBST(CURRENT_SOURCE_DIR, ".")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment