[Spread-cvs] cvs commit: spread/daemon arch.h configure.in

[jonathan at spread.org]

jonathan    02/09/23 20:10:28

  Modified:    daemon   arch.h configure.in
  Log:
  Fix autoconf build bugs.
  The pthread macro test was not correctly clearing LDFLAGS.
  Add test to use cc on sgi instead of gcc.
  Change ARCH_SCATTER_CONTROL/ACCRIGHTS to only allow one or the other to be
  set but not both. Change ACCRIGHTS to be first one tested to avoid an
  SGI stupidity that defines the control datastruct AND the accrights, but
  the control one is missing some fields! This way it will detect accrights
  and ignoore the buggy control structure.
  
  Fix LOC_INLINE to be updated correctly by configure.
  
  Disable shared libraries on SGI as the irix needs special rules for building them..
  
  Revision  Changes    Path
  1.14      +1 -1      spread/daemon/arch.h
  
  Index: arch.h
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/arch.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- arch.h	22 Sep 2002 02:56:52 -0000	1.13
  +++ arch.h	23 Sep 2002 20:10:27 -0000	1.14
  @@ -70,7 +70,7 @@
   #define		ARCH_ENDIAN	0x80000080
   #endif
     
  -#define         LOC_INLINE      __inline__
  +#define         LOC_INLINE      inline
     
   /* Need to add special cases, SUNOS gets 64, IRIX gets 512 */  
   #ifdef MSG_MAXIOVLEN
  
  
  
  1.2       +28 -14    spread/daemon/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/configure.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure.in	16 Sep 2002 16:59:06 -0000	1.1
  +++ configure.in	23 Sep 2002 20:10:27 -0000	1.2
  @@ -2,8 +2,16 @@
   
   AC_CONFIG_AUX_DIR(buildtools)
   AC_CONFIG_HEADER(config.h)
  -AC_PROG_CC
   AC_CANONICAL_HOST
  +
  +case "$host" in
  +mips-sgi-irix* ) 
  +	CC=cc 
  +	CFLAGS="-n32 -signed"
  +	;;
  +esac
  +
  +AC_PROG_CC
   AC_C_BIGENDIAN
   
   # Checks for programs.
  @@ -178,19 +186,6 @@
   	AC_DEFINE(ARCH_SCATTER_NONE)
   else
     have_scatter="no"
  -  AC_CACHE_CHECK([for struct msghdr control], ac_cv_have_struct_msghdr_ctl, [
  -        AC_TRY_COMPILE(
  -                [ #include <sys/types.h>
  -		  #include <sys/socket.h> ],
  -                [ static  struct  msghdr msg; msg.msg_controllen = 0; ],
  -                [ ac_cv_have_struct_msghdr_ctl="yes" ],
  -                [ ac_cv_have_struct_msghdr_ctl="no" ]
  -        )
  -  ])
  -  if test "x$ac_cv_have_struct_msghdr_ctl" = "xyes" ; then
  -	AC_DEFINE(ARCH_SCATTER_CONTROL)
  -	have_scatter="yes"
  -  fi
     AC_CACHE_CHECK([for struct msghdr accrights], ac_cv_have_struct_msghdr_acc, [
           AC_TRY_COMPILE(
                   [ #include <sys/types.h>
  @@ -205,6 +200,21 @@
   	have_scatter="yes"
     fi
     if test "x$have_scatter" = "xno" ; then
  +	AC_CACHE_CHECK([for struct msghdr control], ac_cv_have_struct_msghdr_ctl, [
  +	    AC_TRY_COMPILE(
  +            [ #include <sys/types.h>
  +	      #include <sys/socket.h> ],
  +            [ static  struct  msghdr msg; msg.msg_controllen = 0; ],
  +            [ ac_cv_have_struct_msghdr_ctl="yes" ],
  +            [ ac_cv_have_struct_msghdr_ctl="no" ]
  +            )
  +     	])
  +	if test "x$ac_cv_have_struct_msghdr_ctl" = "xyes" ; then
  +	    AC_DEFINE(ARCH_SCATTER_CONTROL)
  +            have_scatter="yes"
  +	fi
  +  fi
  +  if test "x$have_scatter" = "xno" ; then
           AC_MSG_ERROR([*** cannot determine which scatter type to use ***])
     fi
   fi
  @@ -658,6 +668,10 @@
   	LIBSPSO="libspread.dylib"
   	LIBTSPSO="libtspread.dylib"
           ;;
  +mips-sgi-irix*)
  +	LIBSPSO=none
  +	LIBTSPSO=none
  +	;;
   *-*-*)
   	SHCC=$CC
   	SHCFLAGS="$CFLAGS -fPIC"