From 82a9b8bb6f2cad4911f70a7dce7eb6e57781d294 Mon Sep 17 00:00:00 2001
From: Heiko Hund <heiko.hund@sophos.com>
Date: Sun, 16 Nov 2014 15:55:38 +0100
Subject: [PATCH] buildsystem fixes

---
 Makefile.am  | 3 +--
 configure.ac | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c4d754c..8bc9320 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,8 +37,7 @@ dist_doc_DATA = \
 	COPYRIGHT.GPL \
 	COPYING
 
-INCLUDES = $(OPENSSL_CRYPTO_CFLAGS)
-AM_CPPFLAGS = -D_UNICODE
+AM_CPPFLAGS = $(OPENSSL_CRYPTO_CFLAGS) -D_UNICODE
 AM_CFLAGS = -municode
 
 openvpn_gui_RESOURCES = \
diff --git a/configure.ac b/configure.ac
index b66325a..ffc8f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ AC_DEFINE([PACKAGE_VERSION_RESOURCE], [_GUI_VERSION,0,0,0], [Version in windows
 AC_CONFIG_AUX_DIR([.])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([main.h])
-AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
 AC_USE_SYSTEM_EXTENSIONS