summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/curl/Makefile2
-rw-r--r--package/dovecot/Makefile2
-rw-r--r--package/hostapd/Makefile2
-rw-r--r--package/strongswan/Makefile2
-rw-r--r--package/tntnet/Makefile2
-rw-r--r--package/wget/Makefile2
-rw-r--r--package/wpa_supplicant/Makefile2
7 files changed, 7 insertions, 7 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile
index f2fb4d573..7a03fcd9e 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -24,7 +24,7 @@ PKGSS_LIBCURL:= zlib
PKG_FLAVOURS_CURL:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
-PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_LIBCURL:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL
PKGCD_WITHOUT_SSL:= use no SSL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 369264c6d..624d47672 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= mail
PKG_URL:= http://www.dovecot.org/
PKG_SITES:= http://www.dovecot.org/releases/2.0/
-PKG_CHOICES_DOVECOT:= WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_DOVECOT:= WITH_GNUTLS WITH_OPENSSL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
PKGCS_WITH_OPENSSL:= libopenssl
PKGCB_WITH_OPENSSL:= openssl
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 0b8d3aa7a..99ca40234 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://hostap.epitest.fi/releases/
PKG_MULTI:= 1
PKG_SUBPKGS:= HOSTAPD HOSTAPD_UTILS
-PKG_CHOICES_HOSTAPD:= WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_HOSTAPD:= WITH_GNUTLS WITH_OPENSSL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
PKGCS_WITH_OPENSSL:= libopenssl
PKGCB_WITH_OPENSSL:= openssl
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index b60c6e6d7..314e30635 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -20,7 +20,7 @@ PKG_SITES:= http://download.strongswan.org/
PKG_LIBC_DEPENDS:= uclibc glibc
-PKG_CHOICES_STRONGSWAN:=WITH_GMP WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_STRONGSWAN:=WITH_GNUTLS WITH_OPENSSL WITH_GMP
PKGCD_WITH_GMP:= use GMP for crypto
PKGCS_WITH_GMP:= libgmp
PKGCB_WITH_GMP:= gmp
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 109f13963..e8e674fcc 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -17,7 +17,7 @@ PKG_NEED_CXX:= 1
PKG_ARCH_DEPENDS:= !arm !m68k
-PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_TNTNET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL
PKGCD_WITHOUT_SSL:= use no SSL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
PKGCS_WITH_OPENSSL:= libopenssl
diff --git a/package/wget/Makefile b/package/wget/Makefile
index 9c412c3ea..516576a86 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:= autotool
PKG_URL:= http://www.gnu.org/software/wget/
PKG_SITES:= ${MASTER_SITE_GNU:=wget/}
-PKG_CHOICES_WGET:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
+PKG_CHOICES_WGET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL
PKGCD_WITHOUT_SSL:= use no SSL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index e1545e64c..38895bb24 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -18,7 +18,7 @@ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_SYSTEM_IBM_X40
WRKSRC= ${WRKDIST}/${PKG_NAME}
-PKG_CHOICES_WPA_SUPPLICANT:= WITH_OPENSSL WITH_GNUTLS WITH_INTERNAL
+PKG_CHOICES_WPA_SUPPLICANT:= WITH_GNUTLS WITH_OPENSSL WITH_INTERNAL
PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
PKGCS_WITH_OPENSSL:= libopenssl
PKGCB_WITH_OPENSSL:= openssl