summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug140723
-rw-r--r--configure.ac8
2 files changed, 7 insertions, 4 deletions
diff --git a/changes/bug14072 b/changes/bug14072
new file mode 100644
index 0000000000..c810616cc0
--- /dev/null
+++ b/changes/bug14072
@@ -0,0 +1,3 @@
+ o Minor bugfixes (build):
+ - Avoid warnings when building with systemd 209 or later.
+ Fixes bug 14072; bugfix on 0.2.6.2-alpha. Patch from "h.venev".
diff --git a/configure.ac b/configure.ac
index ea8d6b601a..2c92a6c409 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,8 @@ fi
if test x$have_systemd = xyes; then
AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd])
- TOR_SYSTEMD_LIBS="-lsystemd-daemon"
+ CFLAGS="${CFLAGS} ${SYSTEMD_CFLAGS}"
+ TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}"
fi
AC_SUBST(TOR_SYSTEMD_LIBS)
@@ -1542,10 +1543,9 @@ fi
if test "$GCC" = yes; then
# Disable GCC's strict aliasing checks. They are an hours-to-debug
# accident waiting to happen.
- CFLAGS="$CFLAGS -Wall -fno-strict-aliasing"
+ CFLAGS="$CFLAGS -Wall -fno-strict-aliasing -g -O2"
else
- # Autoconf sets -g -O2 by default. Override optimization level
- # for non-gcc compilers
+ # Override optimization level for non-gcc compilers
CFLAGS="$CFLAGS -O"
enable_gcc_warnings=no
enable_gcc_warnings_advisory=no