From bdfa996a1b6f1f50f69b2ecad259b50756f44bf7 Mon Sep 17 00:00:00 2001 From: Saverio Proto Date: Thu, 3 Apr 2014 14:38:18 +0200 Subject: [PATCH] trying to fix linking issues --- configure.ac | 1 + src/Makefile.am | 2 +- src/have.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 32b618c5..eac66278 100644 --- a/configure.ac +++ b/configure.ac @@ -148,6 +148,7 @@ AS_IF([test "x$enable_hardening" != "xno"], ;; *) AX_CHECK_COMPILE_FLAG([-fPIE], [CPPFLAGS="$CPPFLAGS -fPIE"]) + AX_CHECK_COMPILE_FLAG([-fPIC], [CPPFLAGS="$CPPFLAGS -fPIC"]) AX_CHECK_LINK_FLAG([-pie], [LDFLAGS="$LDFLAGS -pie"]) ;; esac diff --git a/src/Makefile.am b/src/Makefile.am index 26d4474a..31dfae5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,7 +109,7 @@ libmeshlink_la_SOURCES = \ libmeshlink_la_CFLAGS = -fPIC libmeshlink_la_LIBADD = \ - protocol.o + protocol.o protocol_auth.o ## Conditionally compile device drivers diff --git a/src/have.h b/src/have.h index 85479f75..4d9a97bd 100644 --- a/src/have.h +++ b/src/have.h @@ -203,4 +203,7 @@ #define SLASH "/" #endif +#define CONFDIR "/etc/" +#define LOCALSTATEDIR "/var/" + #endif /* __TINC_SYSTEM_H__ */ -- 2.39.5