[Python-checkins] python/dist/src configure.in,1.336,1.337 configure,1.325,1.326 pyconfig.h.in,1.46,1.47

nnorwitz@users.sourceforge.net nnorwitz@users.sourceforge.net
Mon, 29 Jul 2002 18:08:31 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv28627

Modified Files:
	configure.in configure pyconfig.h.in 
Log Message:
SF patch #584245, get python to link on OSF1 (Dec Unix)

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.336
retrieving revision 1.337
diff -C2 -d -r1.336 -r1.337
*** configure.in	28 Jul 2002 16:33:45 -0000	1.336
--- configure.in	30 Jul 2002 01:08:28 -0000	1.337
***************
*** 624,627 ****
--- 624,651 ----
  AC_MSG_RESULT($was_it_defined)
  
+ # Check whether using makedev requires defining _OSF_SOURCE
+ AC_MSG_CHECKING(for makedev)
+ AC_TRY_LINK([ #include <sys/types.h> ],
+ 	    [ 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
+     AC_TRY_LINK([
+     #define _OSF_SOURCE 1
+     #include <sys/types.h>
+     ],
+     [ makedev(0, 0) ],
+     ac_cv_has_makedev=yes,
+     ac_cv_has_makedev=no)
+     if test "$ac_cv_has_makedev" = "yes"; then
+         AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.])
+     fi
+ fi
+ AC_MSG_RESULT($ac_cv_has_makedev)
+ if test "$ac_cv_has_makedev" = "yes"; then
+     AC_DEFINE(HAVE_MAKEDEV, 1, [Define this if you have the makedev macro.])
+ fi
+ 
  # Two defines needed to enable largefile support on various platforms
  # These may affect some typedefs

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.325
retrieving revision 1.326
diff -C2 -d -r1.325 -r1.326
*** configure	28 Jul 2002 16:33:42 -0000	1.325
--- configure	30 Jul 2002 01:08:28 -0000	1.326
***************
*** 4317,4320 ****
--- 4317,4420 ----
  echo "${ECHO_T}$was_it_defined" >&6
  
+ # Check whether using makedev requires defining _OSF_SOURCE
+ echo "$as_me:$LINENO: checking for makedev" >&5
+ echo $ECHO_N "checking for makedev... $ECHO_C" >&6
+ 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 ()
+ {
+  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_has_makedev=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_has_makedev=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test "$ac_cv_has_makedev" = "no"; then
+     # we didn't link, try if _OSF_SOURCE will allow us to link
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ 
+     #define _OSF_SOURCE 1
+     #include <sys/types.h>
+ 
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+    int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+  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_has_makedev=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_has_makedev=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+     if test "$ac_cv_has_makedev" = "yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define _OSF_SOURCE 1
+ _ACEOF
+ 
+     fi
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_has_makedev" >&5
+ echo "${ECHO_T}$ac_cv_has_makedev" >&6
+ if test "$ac_cv_has_makedev" = "yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MAKEDEV 1
+ _ACEOF
+ 
+ fi
+ 
  # Two defines needed to enable largefile support on various platforms
  # These may affect some typedefs

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** pyconfig.h.in	28 Jul 2002 16:33:45 -0000	1.46
--- pyconfig.h.in	30 Jul 2002 01:08:28 -0000	1.47
***************
*** 248,251 ****
--- 248,254 ----
  #undef HAVE_LSTAT
  
+ /* Define this if you have the makedev macro. */
+ #undef HAVE_MAKEDEV
+ 
  /* Define to 1 if you have the `memmove' function. */
  #undef HAVE_MEMMOVE
***************
*** 766,769 ****
--- 769,775 ----
  /* Define to 1 if on MINIX. */
  #undef _MINIX
+ 
+ /* Define _OSF_SOURCE to get the makedev macro. */
+ #undef _OSF_SOURCE
  
  /* Define to 2 if the system does not provide POSIX.1 features except with