aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2015-07-31 13:23:23 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-08-14 23:40:32 +0200
commit416471916542f30c49f2ed2187d634e9ad26d57d (patch)
tree5b4f4548de0411f0ce5fe35a3af86554999904de
parent06832648e1dbd268d7b719b9a49df476af689c6d (diff)
configure: only add CONFIG_RDMA to config-host.h once
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>
-rwxr-xr-xconfigure4
1 files changed, 0 insertions, 4 deletions
diff --git a/configure b/configure
index 704b34c5aa..aace4897df 100755
--- 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