From: Kefu Chai <kchai@redhat.com>
Date: Tue, 12 Apr 2016 03:19:06 +0000 (+0800)
Subject: cmake: config-h.in.cmake: avoid redefinition warnings
X-Git-Tag: v11.0.0~865^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=515cd487de1f2d896757cba0cafcccaae2561779;p=ceph.git

cmake: config-h.in.cmake: avoid redefinition warnings

when compiling python bindings, the included "pyconfig.h" also defines
some of the macros which are duplicated with our versions in acconfig.h.
so do not define them if they are already defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 059e0a24d73e..e908e85f43ba 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -174,16 +174,22 @@
 #cmakedefine HAVE_SYS_VFS_H 1
 
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#ifndef HAVE_SYS_WAIT_H
 #cmakedefine HAVE_SYS_WAIT_H
+#endif
 
 /* Define to 1 if you have the <sys/xattr.h> header file. */
 #cmakedefine HAVE_SYS_XATTR_H
 
+#ifndef HAVE_UNISTD_H
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H
+#endif
 
+#ifndef HAVE_UTIME_H
 /* Define to 1 if you have the <utime.h> header file. */
 #cmakedefine HAVE_UTIME_H
+#endif
 
 /* Define if you have the <execinfo.h> header file. */
 #cmakedefine HAVE_EXECINFO_H