From: "Daniel P. Berrange" <berra...@redhat.com> For unknown reasons (probably a git rebase merge mistake)
commit 2da776db4846eadcb808598a5d3484d149773c05 Author: Michael R. Hines <mrhi...@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 <berra...@redhat.com> Message-Id: <1438345403-32467-1-git-send-email-berra...@redhat.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- configure | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure b/configure index 28bf755..a19e8ec 100755 --- a/configure +++ b/configure @@ -5646,10 +5646,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