Add openssl support to build machinery.

diff --git a/Makefile b/Makefile
index 2f853b9d80b6a91d512aa3c9cc17b23fdab8e888..0d08b14bc5308c6cad0bc35bb8213cc700c7aa68 100644 (file)
--- 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 fa20147ded3c03b783d795c2b6aa399a6bee88bc..93dbf4421fe892fe11390248b6c021b81b2e679f 100644 (file)
--- 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. */