From 228b633183083ad4d5f12b2156d91fa6a4fe8e6e Mon Sep 17 00:00:00 2001 From: angt Date: Mon, 9 Nov 2015 08:40:11 +0100 Subject: [PATCH] Set glorytun_CFLAGS instead of CFLAGS --- Makefile.am | 3 ++- configure.ac | 3 +-- glorytun.c => main.c | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename glorytun.c => main.c (100%) diff --git a/Makefile.am b/Makefile.am index 104f4c7..cfb1e05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ bin_PROGRAMS = glorytun -glorytun_SOURCES = glorytun.c option.c option.h common.h common-static.h +glorytun_SOURCES = main.c option.c option.h common.h common-static.h +glorytun_CFLAGS = $(libsodium_CFLAGS) glorytun_LDADD = $(libsodium_LIBS) diff --git a/configure.ac b/configure.ac index 5c8f874..1e10a09 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,6 @@ AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE(HAVE_CLOCK_GETTIME,[1],[define if you have clock_gettime()])]) AC_SEARCH_LIBS([getaddrinfo], [resolv nsl]) AC_SEARCH_LIBS([socket], [socket]) -PKG_CHECK_MODULES([libsodium], [libsodium >= 1.0.4], - [CFLAGS="$CFLAGS $libsodium_CFLAGS"], [echo "not found"]) +PKG_CHECK_MODULES([libsodium], [libsodium >= 1.0.4]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/glorytun.c b/main.c similarity index 100% rename from glorytun.c rename to main.c