summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorJesus Cea <jcea@jcea.es>2010-04-28 11:35:30 (GMT)
committerJesus Cea <jcea@jcea.es>2010-04-28 11:35:30 (GMT)
commit740f53a6006cc8d8897a843394700cd8ec0dc0d6 (patch)
tree0667001848c10fd2b81cda777e229f52a4468fcd /configure.in
parentd99cd81df5bee3eb5a5de0dcc5d5046da3db9006 (diff)
downloadcpython-740f53a6006cc8d8897a843394700cd8ec0dc0d6.zip
cpython-740f53a6006cc8d8897a843394700cd8ec0dc0d6.tar.gz
cpython-740f53a6006cc8d8897a843394700cd8ec0dc0d6.tar.bz2
Merged revisions 80574 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80574 | jesus.cea | 2010-04-28 12:32:30 +0200 (Wed, 28 Apr 2010) | 1 line Issue #3928: Support 'os.mknod()' in Solaris ........
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in12
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 7d3c573..d4f74bc 100644
--- a/configure.in
+++ b/configure.in
@@ -1314,8 +1314,16 @@ AC_MSG_RESULT($was_it_defined)
# Check whether using makedev requires defining _OSF_SOURCE
AC_MSG_CHECKING(for makedev)
-AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[#include <sys/types.h> ]], [[ makedev(0, 0) ]])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#if defined(MAJOR_IN_MKDEV)
+#include <sys/mkdev.h>
+#elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#else
+#include <sys/types.h>
+#endif
+]], [[
+ makedev(0, 0) ]])
],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
if test "$ac_cv_has_makedev" = "no"; then
# we didn't link, try if _OSF_SOURCE will allow us to link