From 87801cc08ae422ff98d2ff2daba8df7fd202051f Mon Sep 17 00:00:00 2001
From: "user@SRH-Linux-01.(none)" <user@SRH-Linux-01.(none)@noemail.net>
Date: Wed, 20 Aug 2014 17:56:11 +0000
Subject: [PATCH] Some stuff moved to ../Macros.mak

FossilOrigin-Name: 2af45181ca43cf105d636b862ee644af65c59bc3357dea1b8eb290198328cf31
---
 src/ac/Makefile | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/ac/Makefile b/src/ac/Makefile
index dd2f95af..dba5a25e 100644
--- a/src/ac/Makefile
+++ b/src/ac/Makefile
@@ -1,5 +1,6 @@
 
 include ../Config.mak
+include ../Macros.mak
 
 ifndef CC
         CC=gcc
@@ -10,25 +11,17 @@ ifndef ARCH
 	ARCH = $(shell $(CC) -dumpmachine)
 endif
 
-ifdef USE_CONTRIB_OPENSSL
-OPENSSLLIB=../contrib/openssl-1.0.1i/libssl.a ../contrib/openssl-1.0.1i/libcrypto.a -ldl
-OPENSSLINC=../contrib/openssl-1.0.1i/include
-else
-OPENSSLLIB=-lssl
-endif
+LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../capwap/$(ARCH) 
 
-LDFLAGS = -g -D_REENTRANT -L/usr/local/lib -L../capwap/$(ARCH) 
-
-CFLAGS = -I$(OPENSSLINC) -Wall -g -O0 -D_REENTRANT -DCW_NO_DTLS -DIPV6 -I/usr/local/include -I../capwap 
+CFLAGS += -I$(OPENSSLINC) -Wall -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../capwap 
 
 
 
 LIBS+=-lcapwap
 LIBS+=-lrt
 ifdef WITH_GNUTLS
-LIBS+=-lgnutls
+
 else
-LIBS+=$(OPENSSLLIB)
 endif
 
 
@@ -39,8 +32,12 @@ LIBS+=-lsqlite3
 LIBS+=-ldl
 
 
-ifdef WITH_GNUTLS
-CFLAGS += -DWITH_GNUTLS
+ifeq ($(SSL_LIBRARY),GNUTLS)
+CFLAGS+=-DWITH_GNUTLS
+LIBS+=-lgnutls
+else
+CFLAGS+=-DWITH_OPENSSL
+LIBS+=$(OPENSSLLIB)
 endif
 
 CFLAGS += -DWITH_CW_LOG