configure: only add CONFIG_RDMA to config-host.h once
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 31 Jul 2015 12:23:23 +0000 (13:23 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 14 Aug 2015 21:40:32 +0000 (23:40 +0200)
For unknown reasons (probably a git rebase merge mistake)

  commit 2da776db4846eadcb808598a5d3484d149773c05
  Author: Michael R. Hines <mrhines@us.ibm.com>
  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 <berrange@redhat.com>
Message-Id: <1438345403-32467-1-git-send-email-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
configure

index 704b34c5aada1794c89b22d6cce21c0bccccb820..aace4897df7e531f04a9b90ace3cf247f92fb776 100755 (executable)
--- a/configure
+++ b/configure
@@ -5601,10 +5601,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