From: John Crispin <john@openwrt.org>
Date: Mon, 13 Aug 2012 20:04:08 +0000 (+0000)
Subject: [packages] remove variants from radlib
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a8fde8a3c18c1cce5be54afa4bf10440c5d8f0d9;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] remove variants from radlib

SVN-Revision: 33176
---

diff --git a/libs/radlib/Makefile b/libs/radlib/Makefile
index c6c4f8c6a7..0f406b2e82 100644
--- a/libs/radlib/Makefile
+++ b/libs/radlib/Makefile
@@ -22,40 +22,24 @@ include $(INCLUDE_DIR)/package.mk
 define Package/radlib
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libpthread
+  DEPENDS:=+libpthread +libsqlite3
   TITLE:=Rapid Application Development Library
   URL:=http://www.radlib.teel.ws/
-  VARIANT:=nosql
 endef
 
 define Package/radlib/description
 	radlib is a rapid application development library for unix multi-process applications
 endef
 
-define Package/radlib-sqlite
-  $(call Package/radlib)
-  VARIANT:=sqlite
-  DEPENDS+=+libsqlite3
-  TITLE+= (sqlite)
-endef
-
 define Package/radlib-sqlite/description
   $(call Package/radlib/description)
   This package comes with sqlite support
 endef
 
-
-CONFIGURE_ARGS += \
-		  --prefix="$(TOOLCHAIN_DIR)/usr"
-
-ifeq ($(BUILD_VARIANT),sqlite)
 EXTRA_LDFLAGS=-lsqlite3
 CONFIGURE_ARGS += \
-        --enable-sqlite
-else
-CONFIGURE_ARGS += \
-	--disable-sqlite
-endif
+	--prefix="$(TOOLCHAIN_DIR)/usr" \
+	--enable-sqlite
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
@@ -76,4 +60,3 @@ define Package/radlib-sqlite/install
 endef
 
 $(eval $(call BuildPackage,radlib))
-$(eval $(call BuildPackage,radlib-sqlite))