[Python-checkins] python/dist/src configure,1.344,1.345 configure.in,1.355,1.356 pyconfig.h.in,1.52,1.53
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Thu, 10 Oct 2002 07:27:32 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv3565
Modified Files:
configure configure.in pyconfig.h.in
Log Message:
Patch #569139: Implementation of major, minor and makedev.
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.344
retrieving revision 1.345
diff -C2 -d -r1.344 -r1.345
*** configure 7 Oct 2002 17:45:53 -0000 1.344
--- configure 10 Oct 2002 14:27:27 -0000 1.345
***************
*** 1,4 ****
#! /bin/sh
! # From configure.in Revision: 1.354 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53.
--- 1,4 ----
#! /bin/sh
! # From configure.in Revision: 1.355 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53.
***************
*** 902,906 ****
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--- 902,906 ----
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
***************
*** 4297,4300 ****
--- 4297,4573 ----
fi
+ echo "$as_me:$LINENO: checking whether sys/types.h defines makedev" >&5
+ echo $ECHO_N "checking whether sys/types.h defines makedev... $ECHO_C" >&6
+ if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef F77_DUMMY_MAIN
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+ int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+ return makedev(0, 0);
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_header_sys_types_h_makedev=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_header_sys_types_h_makedev=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_header_sys_types_h_makedev" >&5
+ echo "${ECHO_T}$ac_cv_header_sys_types_h_makedev" >&6
+
+ if test $ac_cv_header_sys_types_h_makedev = no; then
+ if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
+ echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6
+ if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
+ echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6
+ else
+ # Is the header compilable?
+ echo "$as_me:$LINENO: checking sys/mkdev.h usability" >&5
+ echo $ECHO_N "checking sys/mkdev.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <sys/mkdev.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+
+ # Is the header present?
+ echo "$as_me:$LINENO: checking sys/mkdev.h presence" >&5
+ echo $ECHO_N "checking sys/mkdev.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sys/mkdev.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+ else
+ ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: sys/mkdev.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&2;};;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: sys/mkdev.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: sys/mkdev.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&2;};;
+ esac
+ echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
+ echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6
+ if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_sys_mkdev_h=$ac_header_preproc
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
+ echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6
+
+ fi
+ if test $ac_cv_header_sys_mkdev_h = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define MAJOR_IN_MKDEV 1
+ _ACEOF
+
+ fi
+
+
+
+ if test $ac_cv_header_sys_mkdev_h = no; then
+ if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
+ echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6
+ if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
+ echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6
+ else
+ # Is the header compilable?
+ echo "$as_me:$LINENO: checking sys/sysmacros.h usability" >&5
+ echo $ECHO_N "checking sys/sysmacros.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <sys/sysmacros.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+
+ # Is the header present?
+ echo "$as_me:$LINENO: checking sys/sysmacros.h presence" >&5
+ echo $ECHO_N "checking sys/sysmacros.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sys/sysmacros.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+ else
+ ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: sys/sysmacros.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&2;};;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: sys/sysmacros.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: sys/sysmacros.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&2;};;
+ esac
+ echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
+ echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6
+ if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_sys_sysmacros_h=$ac_header_preproc
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
+ echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6
+
+ fi
+ if test $ac_cv_header_sys_sysmacros_h = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define MAJOR_IN_SYSMACROS 1
+ _ACEOF
+
+ fi
+
+
+ fi
+ fi
+
# checks for typedefs
***************
*** 12499,12502 ****
--- 12772,12835 ----
+ echo "$as_me:$LINENO: checking for major" >&5
+ echo $ECHO_N "checking for major... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+
+ #if defined(MAJOR_IN_MKDEV)
+ #include <sys/mkdev.h>
+ #elif defined(MAJOR_IN_SYSMACROS)
+ #include <sys/sysmacros.h>
+ #else
+ #include <sys/types.h>
+ #endif
+
+ #ifdef F77_DUMMY_MAIN
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+ int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+
+ makedev(major(0),minor(0));
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DEVICE_MACROS 1
+ _ACEOF
+
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
# On OSF/1 V5.1, getaddrinfo is available, but a define
***************
*** 16843,16847 ****
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--- 17176,17180 ----
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.355
retrieving revision 1.356
diff -C2 -d -r1.355 -r1.356
*** configure.in 7 Oct 2002 17:45:55 -0000 1.355
--- configure.in 10 Oct 2002 14:27:30 -0000 1.356
***************
*** 622,625 ****
--- 622,626 ----
sys/resource.h netpacket/packet.h)
AC_HEADER_DIRENT
+ AC_HEADER_MAJOR
# checks for typedefs
***************
*** 1717,1720 ****
--- 1718,1739 ----
)
+ AC_MSG_CHECKING(for major, minor, and makedev)
+ AC_TRY_COMPILE([
+ #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(major(0),minor(0));
+ ],[
+ AC_DEFINE(HAVE_DEVICE_MACROS, 1,
+ [Define to 1 if you have the device macros.])
+ AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
+ ])
# On OSF/1 V5.1, getaddrinfo is available, but a define
Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** pyconfig.h.in 7 Oct 2002 17:45:56 -0000 1.52
--- pyconfig.h.in 10 Oct 2002 14:27:30 -0000 1.53
***************
*** 58,61 ****
--- 58,64 ----
#undef HAVE_CTERMID_R
+ /* Define to 1 if you have the device macros. */
+ #undef HAVE_DEVICE_MACROS
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
***************
*** 604,607 ****
--- 607,618 ----
/* Define if you are using Mach cthreads under mach / */
#undef MACH_C_THREADS
+
+ /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
+ */
+ #undef MAJOR_IN_MKDEV
+
+ /* Define to 1 if `major', `minor', and `makedev' are declared in
+ <sysmacros.h>. */
+ #undef MAJOR_IN_SYSMACROS
/* Define if malloc(0) returns a NULL pointer. */