Merge commit 'origin/confgen'

finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos

Conflicts:

	.gitignore
	Makefile
	mk/build.mk
	package/eglibc/Config.in
	package/glibc/Config.in
	package/uclibc++/Config.in
	package/uclibc/Config.in
	rules.mk

2 files changed, 2 insertions, 100 deletions

diff --git a/package/squid/Config.in b/package/squid/Config.in
deleted file mode 100644
index 61eb6ac75..000000000
--- a/package/squid/Config.in
+++ /dev/null
@@ -1,94 +0,0 @@
-
-config ADK_PACKAGE_SQUID
-	prompt "squid............................. full-featured Web proxy cache"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  Squid is a high-performance proxy caching server for web clients, 
-	  supporting FTP, gopher, and HTTP data objects. Unlike traditional 
-	  caching software, Squid handles all requests in a single, 
-	  non-blocking, I/O-driven process.
-
-	  http://www.squid-cache.org
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_SQUID
-default ADK_COMPILE_SQUID_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_SQUID_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_SQUID_WITH_STDCXX
-        bool "Standard C++ library"
-        select ADK_PACKAGE_LIBSTDCXX
-        help
-
-config ADK_COMPILE_SQUID_WITH_UCLIBCXX
-        bool "Embedded uClibc++ library"
-        select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-        help
-
-endchoice
-
-menu "squid-modules...................... proxy and web cache modules"
-depends on ADK_PACKAGE_SQUID
-
-config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM
-	prompt "squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Password basic authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_NCSA
-	prompt "squid-mod-basic-auth-ncsa........... NCSA basic authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  NCSA basic authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB
-	prompt "squid-mod-basic-auth-smb............ Samba basic authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Samba basic authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD
-	prompt "squid-mod-digest-auth-password...... Password digest authentication ehlper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Password digest authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER
-	prompt "squid-mod-external-acl-ip_user...... IP user external ACL helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  IP user external ACL helper
-
-config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
-	prompt "squid-mod-external-acl-unix-group... Unix group external ACL helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Unix group external ACL helper
-
-config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH
-	prompt "squid-mod-ntlm-auth-fakeauth........ Fakeauth NTLM authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Fakeauth NTLM authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH
-	prompt "squid-mod-ntlm-auth-smb-auth........ Samba NTLM authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Samba NTLM authentication helper
-
-endmenu
diff --git a/package/squid/Makefile b/package/squid/Makefile
index cfc35061c..807e4dc08 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -6,18 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		squid
 PKG_VERSION:=		3.0.STABLE20
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		b69577cfc5cfb6808ec426e3a933220d
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libpthread
 PKG_URL:=		http://www.squid-cache.org
 PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.0/
-
-ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
+PKG_CXX:=		SQUID
 
 AUTH_MODULES:=		basic digest ntlm
 ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},)