From 75a2f2fff142a1202b8ab9dd8bc1dd92e6f91206 Mon Sep 17 00:00:00 2001
From: tripolar <tripolar@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Jun 2012 17:00:55 +0000
Subject: [PATCH] [packages]: nfs-kernel server: fix the configure problem with
 CONFIGURE_VARS instead  of a patch

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32120 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/nfs-kernel-server/Makefile                        |  7 ++++++-
 net/nfs-kernel-server/patches/200-configure.patch     | 11 -----------
 ...ogin-install.patch => 200-osd_login-install.patch} |  0
 3 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 net/nfs-kernel-server/patches/200-configure.patch
 rename net/nfs-kernel-server/patches/{300-osd_login-install.patch => 200-osd_login-install.patch} (100%)

diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index fcf6e44e2..c98a204f1 100644
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -80,6 +80,10 @@ CONFIGURE_ARGS += \
 	--disable-tirpc \
 	--disable-nfsdcld
 
+CONFIGURE_VARS += \
+	CONFIG_SQLITE3_TRUE="\#" \
+	CONFIG_NFSDCLD_TRUE="\#"
+
 MAKE_FLAGS += \
 	OPT="$(TARGET_CFLAGS)" \
 	INSTALLSUID="install -m 4755" \
@@ -106,7 +110,8 @@ HOST_CONFIGURE_VARS += \
 	GSSGLUE_LIBS=" " \
 	RPCSECGSS_CFLAGS=" " \
 	RPCSECGSS_LIBS=" " \
-
+	CONFIG_SQLITE3_TRUE="\#" \
+	CONFIG_NFSDCLD_TRUE="\#"
 
 define Host/Compile
 	$(MAKE) -C $(HOST_BUILD_DIR)/tools/rpcgen all
diff --git a/net/nfs-kernel-server/patches/200-configure.patch b/net/nfs-kernel-server/patches/200-configure.patch
deleted file mode 100644
index 65208e47f..000000000
--- a/net/nfs-kernel-server/patches/200-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -868,6 +868,8 @@ RPCSECGSS_LIBS'
- 
- 
- # Initialize some variables set by options.
-+CONFIG_SQLITE3_TRUE='#'
-+CONFIG_NFSDCLD_TRUE='#'
- ac_init_help=
- ac_init_version=false
- ac_unrecognized_opts=
diff --git a/net/nfs-kernel-server/patches/300-osd_login-install.patch b/net/nfs-kernel-server/patches/200-osd_login-install.patch
similarity index 100%
rename from net/nfs-kernel-server/patches/300-osd_login-install.patch
rename to net/nfs-kernel-server/patches/200-osd_login-install.patch