openvpn without ssl closes #277/#278

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 93f233f..927ad57 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -64,6 +64,7 @@ package-$(BR2_COMPILE_HOWL) += howl
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ICECAST) += icecast
 package-$(BR2_PACKAGE_ID3LIB) += id3lib
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ICECAST) += icecast
 package-$(BR2_PACKAGE_ID3LIB) += id3lib

+package-$(BR2_PACKAGE_IFTOP) += iftop

 package-$(BR2_PACKAGE_IPCAD) += ipcad
 package-$(BR2_PACKAGE_IPERF) += iperf
 package-$(BR2_PACKAGE_IPKG) += ipkg
 package-$(BR2_PACKAGE_IPCAD) += ipcad
 package-$(BR2_PACKAGE_IPERF) += iperf
 package-$(BR2_PACKAGE_IPKG) += ipkg


@@ -287,6 +288,7 @@ gnutls-compile: libgcrypt-compile opencdk-compile libtasn1-compile
 gpsd-compile: uclibc++-compile
 icecast-compile: curl-compile libvorbisidec-compile libxml2-compile libxslt-compile
 id3lib-compile: uclibc++-compile zlib-compile
 gpsd-compile: uclibc++-compile
 icecast-compile: curl-compile libvorbisidec-compile libxml2-compile libxslt-compile
 id3lib-compile: uclibc++-compile zlib-compile

+iftop-compile: libpcap-compile libpthread-compile ncurses-compile

 ipcad-compile: libpcap-compile
 irssi-compile: glib-compile ncurses-compile
 iperf-compile: uclibc++-compile
 ipcad-compile: libpcap-compile
 irssi-compile: glib-compile ncurses-compile
 iperf-compile: uclibc++-compile


@@ -329,7 +331,7 @@ peercast-compile: uclibc++-compile
 peerguardian-compile: libpthread-compile
 portmap-compile: tcp_wrappers-compile
 postgresql-compile: zlib-compile
 peerguardian-compile: libpthread-compile
 portmap-compile: tcp_wrappers-compile
 postgresql-compile: zlib-compile

-ppp-compile: linux-atm-compile
+ppp-compile: linux-atm-compile libpcap-compile

 ptunnel-compile: libpcap-compile
 quagga-compile: readline-compile ncurses-compile
 raddump-compile: openssl-compile libpcap-compile
 ptunnel-compile: libpcap-compile
 quagga-compile: readline-compile ncurses-compile
 raddump-compile: openssl-compile libpcap-compile


@@ -409,7 +411,9 @@ ifneq ($(BR2_PACKAGE_MPD_FLAC),)
 mpd-compile: flac-compile
 endif
 
 mpd-compile: flac-compile
 endif
 

+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)

 openvpn-compile: openssl-compile
 openvpn-compile: openssl-compile

+endif

 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
 openvpn-compile: liblzo-compile
 endif
 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
 openvpn-compile: liblzo-compile
 endif