do not depend on external opencdk (not used) and libtasn1, use bundled version instead, set common lib searchpath

SVN-Revision: 1695

openwrt/package/Makefile

@@ -41,7 +41,7 @@ package-$(BR2_PACKAGE_FUSE) += fuse
 package-$(BR2_PACKAGE_GDBSERVER) += gdbserver
 package-$(BR2_PACKAGE_GLIB) += glib
 package-$(BR2_PACKAGE_GMP) += gmp
-package-$(BR2_PACKAGE_GNUTLS) += gnutls
+package-$(BR2_COMPILE_GNUTLS) += gnutls
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_HOSTAPD) += hostapd
 package-$(BR2_PACKAGE_HOWL) += howl

openwrt/package/gnutls/Config.in

@@ -1,4 +1,4 @@
-config BR2_PACKAGE_GNUTLS
+config BR2_COMPILE_GNUTLS
 	bool
 	default n
 	depends BR2_PACKAGE_LIBGNUTLS
@@ -7,10 +7,8 @@ config BR2_PACKAGE_LIBGNUTLS
 	tristate "libgnutls - The GNU TLS library"
 #	default m if CONFIG_DEVEL
 	default n
-	select BR2_PACKAGE_GNUTLS
+	select BR2_COMPILE_GNUTLS
 	select BR2_PACKAGE_LIBGCRYPT
-	select BR2_PACKAGE_LIBOPENCDK
-	select BR2_PACKAGE_LIBTASN1
 	help
 	 GnuTLS is a project that aims to develop a library which provides a 
 	 secure layer, over a reliable transport layer. Currently the GnuTLS 

openwrt/package/gnutls/Makefile

@@ -35,7 +35,7 @@ $(PKG_BUILD_DIR)/.configured:
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -62,10 +62,9 @@ $(PKG_BUILD_DIR)/.configured:
 		--disable-srp-authentication \
 		--disable-anon-authentication \
 		--disable-openpgp-authentication \
-		--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
-		--with-libopencdk-prefix="$(STAGING_DIR)/usr" \
-		--with-libtasn1-prefix="$(STAGING_DIR)/usr" \
-		--with-included-libcfg \
+		--with-included-opencdk=yes \
+		--with-included-libtasn1=yes \
+		--with-included-libcfg=yes \
 		--without-zlib \
 		--without-lzo \
 	);

openwrt/package/gnutls/ipkg/libgnutls.control

@@ -6,4 +6,4 @@ Architecture: [TBDL]
 Maintainer: OpenWrt Developers Team <bugs@openwrt.org>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/gnutls/
 Description: GNU TLS library
-Depends: libgcrypt, libopencdk, libtasn1
+Depends: libgcrypt