From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZL9Lc-0006fJ-Hj for qemu-devel@nongnu.org; Fri, 31 Jul 2015 08:23:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZL9LY-000206-Ef for qemu-devel@nongnu.org; Fri, 31 Jul 2015 08:23:36 -0400 From: "Daniel P. Berrange" Date: Fri, 31 Jul 2015 13:23:23 +0100 Message-Id: <1438345403-32467-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] configure: only add CONFIG_RDMA to config-host.h once List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org For unknown reasons (probably a git rebase merge mistake) commit 2da776db4846eadcb808598a5d3484d149773c05 Author: Michael R. Hines Date: Mon Jul 22 10:01:54 2013 -0400 rdma: core logic Adds CONFIG_RDMA to config-host.h twice, as can be seen in the generated file: $ grep CONFIG_RDMA config-host.h #define CONFIG_RDMA 1 #define CONFIG_RDMA 1 Signed-off-by: Daniel P. Berrange --- configure | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure b/configure index a14dc44..8f35400b 100755 --- a/configure +++ b/configure @@ -5635,10 +5635,6 @@ if [ "$pixman" = "internal" ]; then echo "config-host.h: subdir-pixman" >> $config_host_mak fi -if test "$rdma" = "yes" ; then -echo "CONFIG_RDMA=y" >> $config_host_mak -fi - if [ "$dtc_internal" = "yes" ]; then echo "config-host.h: subdir-dtc" >> $config_host_mak fi -- 2.4.3