Fix SF bug #691793, Python 2.3a2 build fails on Tru64

Need to make sure that preprocessor directives start in first column.
This means we can't indent code which has preprocessor directives,
nor have a space between [ #include for example.

diff --git a/configure b/configure
index fd96ba80681eacc5f33de11b340b54154c941cf5..efcada6f65c1054b226007cf9caabb0a2433a6e8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.389 .
+# From configure.in Revision: 1.390 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
 #
@@ -4746,7 +4746,7 @@ echo $ECHO_N "checking for makedev... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"
- #include <sys/types.h>
+#include <sys/types.h>
 #ifdef F77_DUMMY_MAIN
 #  ifdef __cplusplus
      extern "C"
@@ -4786,8 +4786,8 @@ if test "$ac_cv_has_makedev" = "no"; then
 #line $LINENO "configure"
 #include "confdefs.h"
 
-    #define _OSF_SOURCE 1
-    #include <sys/types.h>
+#define _OSF_SOURCE 1
+#include <sys/types.h>
 
 #ifdef F77_DUMMY_MAIN
 #  ifdef __cplusplus
@@ -9159,7 +9159,7 @@ else
 #line $LINENO "configure"
 #include "confdefs.h"
 #include <stdio.h>
-  #include <pthread.h>
+#include <pthread.h>
   main()
   {
     FILE *f=fopen("conftestval", "w");
@@ -10128,10 +10128,11 @@ echo $ECHO_N "checking for _POSIX_THREADS in unistd.h... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"
+
 #include <unistd.h>
-     #ifdef _POSIX_THREADS
-     yes
-     #endif
+#ifdef _POSIX_THREADS
+yes
+#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -13189,13 +13190,13 @@ 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
+#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

diff --git a/configure.in b/configure.in
index 06c4048f974b093bb3e2513cc38e403a8b913246..1fc6bf783eedbca3244e316e4f355733cd4ccdaa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -763,15 +763,15 @@ 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> ],
+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>
+#define _OSF_SOURCE 1
+#include <sys/types.h>
     ],
     [ makedev(0, 0) ],
     ac_cv_has_makedev=yes,
@@ -929,7 +929,7 @@ if test "$have_pthread_t" = yes ; then
   AC_MSG_CHECKING(size of pthread_t)
   AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
   [AC_TRY_RUN([#include <stdio.h>
-  #include <pthread.h>
+#include <pthread.h>
   main()
   {
     FILE *f=fopen("conftestval", "w");
@@ -1357,10 +1357,11 @@ else
     # define _POSIX_THREADS in unistd.h. Some apparently don't (which ones?)
     AC_MSG_CHECKING(for _POSIX_THREADS in unistd.h)
     AC_EGREP_CPP(yes,
-    [#include <unistd.h>
-     #ifdef _POSIX_THREADS
-     yes
-     #endif
+    [
+#include <unistd.h>
+#ifdef _POSIX_THREADS
+yes
+#endif
     ], unistd_defines_pthreads=yes, unistd_defines_pthreads=no)
     AC_MSG_RESULT($unistd_defines_pthreads)
 
@@ -1927,13 +1928,13 @@ AC_CHECK_FUNCS(gettimeofday,
 
 AC_MSG_CHECKING(for major, minor, and makedev)
 AC_TRY_LINK([
-  #if defined(MAJOR_IN_MKDEV)
-  #include <sys/mkdev.h>
-  #elif defined(MAJOR_IN_SYSMACROS)
-  #include <sys/sysmacros.h>
-  #else
-  #include <sys/types.h>
-  #endif
+#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));
 ],[