summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Bajo <rasky@develer.com>2012-04-23 00:30:38 +0200
committerSimon Kelley <simon@thekelleys.org.uk>2013-08-20 15:41:18 +0100
commit7e846b98580ba62220b24dcc9c7a0213f52dce6a (patch)
treeca013e7d2a63117c08c04b78b0910def1535b0ab
parentd322de06139eba5d25f829863a8ea682234d776e (diff)
downloaddnsmasq-7e846b98580ba62220b24dcc9c7a0213f52dce6a.tar.gz
Add openssl support to build machinery.
-rw-r--r--Makefile6
-rw-r--r--src/config.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2f853b9..0d08b14 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,8 @@ ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFI
ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1`
lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1`
+ssl_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_OPENSSL $(PKG_CONFIG) --cflags openssl`
+ssl_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_OPENSSL $(PKG_CONFIG) --libs openssl`
sunos_libs = `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`
version = -DVERSION='\"`$(top)/bld/get-version $(top)`\"'
@@ -74,8 +76,8 @@ hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
all : $(BUILDDIR)
@cd $(BUILDDIR) && $(MAKE) \
top="$(top)" \
- build_cflags="$(version) $(dbus_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags)" \
- build_libs="$(dbus_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs)" \
+ build_cflags="$(version) $(dbus_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(ssl_cflags)" \
+ build_libs="$(dbus_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(ssl_libs)" \
-f $(top)/Makefile dnsmasq
clean :
diff --git a/src/config.h b/src/config.h
index fa20147..93dbf44 100644
--- a/src/config.h
+++ b/src/config.h
@@ -142,7 +142,7 @@ RESOLVFILE
/* #define HAVE_IDN */
/* #define HAVE_CONNTRACK */
#define HAVE_DNSSEC
-
+#define HAVE_OPENSSL
/* Default locations for important system files. */