summaryrefslogtreecommitdiff
path: root/package/tntnet
diff options
context:
space:
mode:
Diffstat (limited to 'package/tntnet')
-rw-r--r--package/tntnet/Config.in55
-rw-r--r--package/tntnet/Makefile19
2 files changed, 9 insertions, 65 deletions
diff --git a/package/tntnet/Config.in b/package/tntnet/Config.in
deleted file mode 100644
index 6d2ff122d..000000000
--- a/package/tntnet/Config.in
+++ /dev/null
@@ -1,55 +0,0 @@
-config ADK_PACKAGE_TNTNET
- prompt "tntnet............................ a modular, multithreaded webapplicationserver"
- tristate
- default n
- select ADK_PACKAGE_CXXTOOLS
- select ADK_PACKAGE_LIBICONV
- select ADK_PACKAGE_LIBPTHREAD
- select ADK_PACKAGE_ZLIB
- help
- Tntnet is a modular, multithreaded webapplicationserver
- written from scratch for C++.
-
- http://www.tntnet.org
-
-choice
-prompt "SSL/TLS Configuration"
-depends on ADK_PACKAGE_TNTNET
-default ADK_COMPILE_TNTNET_WITH_OPENSSL
-
-config ADK_COMPILE_TNTNET_WITHOUT_OPENSSL
- bool "no ssl encryption support"
- help
-
-config ADK_COMPILE_TNTNET_WITH_OPENSSL
- bool "enable openssl encryption support"
- depends on ADK_PACKAGE_TNTNET
- select ADK_PACKAGE_LIBOPENSSL
- help
-
-config ADK_COMPILE_TNTNET_WITH_GNUTLS
- bool "enable gnutls encryption support"
- depends on ADK_PACKAGE_TNTNET
- select ADK_PACKAGE_LIBGNUTLS
- help
-
-endchoice
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_TNTNET
-default ADK_COMPILE_TNTNET_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_TNTNET_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_TNTNET_WITH_STDCXX
- bool "Standard C++ library"
- select ADK_PACKAGE_LIBSTDCXX
- help
-
-config ADK_COMPILE_TNTNET_WITH_UCLIBCXX
- bool "Embedded uClibc++ library"
- select ADK_PACKAGE_UCLIBCXX
- depends on ADK_BROKEN
- help
-
-endchoice
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index c251da7a9..a768954c4 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -6,26 +6,25 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= tntnet
PKG_VERSION:= 1.6.4
PKG_RELEASE:= 1
+PKG_BUILDDEP+= cxxtools zlib
+ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
+PKG_BUILDDEP+= openssl
+else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
+PKG_BUILDDEP+= gnutls
+endif
PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996
PKG_DESCR:= small C++ application server
PKG_SECTION:= net
PKG_DEPENDS:= cxxtools zlib libpthread libiconv
PKG_URL:= http://www.tntnet.org
PKG_SITES:= http://www.tntnet.org/download/
+PKG_CXX:= TNTNET
include ${TOPDIR}/mk/package.mk
-ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y)
-PKG_DEPENDS+= uclibc++
-else
-PKG_DEPENDS+= libstdcxx
-endif
-
-ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y)
+ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
PKG_DEPENDS+= libopenssl
-endif
-
-ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y)
+else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
PKG_DEPENDS+= libgnutls
endif