summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-01-19 19:28:12 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-01-19 19:28:12 (GMT)
commite4f2a9317a8cf9a2f7eb03c7f17a1f78f35a16bb (patch)
tree0e770cd6e46e890086955d9d1ba580704a3d792e /Utilities
parent9ea63c581b466e0bb31db1b5750e3b588e5a6497 (diff)
parentcf5ad18340f1d775e47c7aa9afde7deb0482027e (diff)
downloadCMake-e4f2a9317a8cf9a2f7eb03c7f17a1f78f35a16bb.zip
CMake-e4f2a9317a8cf9a2f7eb03c7f17a1f78f35a16bb.tar.gz
CMake-e4f2a9317a8cf9a2f7eb03c7f17a1f78f35a16bb.tar.bz2
Merge topic 'linux-standard-base'
cf5ad18 libarchive: Fix major() check for LSB 4.0 (#11648)
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmlibarchive/CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 8c10b21..6472ec5 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -415,8 +415,12 @@ CHECK_SYMBOL_EXISTS(strerror_r "string.h" HAVE_STRERROR_R)
CHECK_SYMBOL_EXISTS(strftime "time.h" HAVE_STRFTIME)
CHECK_SYMBOL_EXISTS(vprintf "stdio.h" HAVE_VPRINTF)
-CHECK_SYMBOL_EXISTS(major "sys/mkdev.h" MAJOR_IN_MKDEV)
-CHECK_SYMBOL_EXISTS(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS)
+CHECK_C_SOURCE_COMPILES(
+ "#include <sys/mkdev.h>\nint main() { return major(256); }"
+ MAJOR_IN_MKDEV)
+CHECK_C_SOURCE_COMPILES(
+ "#include <sys/sysmacros.h>\nint main() { return major(256); }"
+ MAJOR_IN_SYSMACROS)
IF(HAVE_STRERROR_R)
SET(HAVE_DECL_STRERROR_R 1)