cvs commit: apache/src/helpers GuessOS

[Jim Jagielski]

jim         97/01/06 13:12:06

  Modified:    src       Configure conf.h
               src/helpers  GuessOS
  Log:
  Added CONVEXOS11 and minor fix
  
  Revision  Changes    Path
  1.65      +6 -0      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -C3 -r1.64 -r1.65
  *** Configure 1997/01/06 17:27:54     1.64
  --- Configure 1997/01/06 21:12:01     1.65
  ***************
  *** 344,349 ****
  --- 344,355 ----
                OS='MachTen'
        LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
        ;;
  +     *convex-v11*)
  +         OS='CONVEXOS11'
  +     CFLAGS="$CFLAGS -DCONVEXOS11"
  +     CC='cc'
  +     DEF_WANTHSREGEX=yes
  +     ;;
        *) # default: Catch systems we don't know about
                echo Sorry, but we cannot grok \"$PLAT\"
        echo uname -m
  
  
  
  1.65      +9 -1      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -C3 -r1.64 -r1.65
  *** conf.h    1997/01/01 18:10:15     1.64
  --- conf.h    1997/01/06 21:12:02     1.65
  ***************
  *** 419,424 ****
  --- 419,432 ----
    #define FCNTL_SERIALIZED_ACCEPT
    #endif
    
  + /* Convex OS v11 */
  + #elif defined(CONVEXOS11)
  + #define NO_TIMEZONE
  + #include <stdio.h>
  + #include <sys/types.h>
  + #define JMB_BUF jmp_buf
  + typedef int rlim_t;
  + 
    /* Unknown system - Edit these to match */
    #else
    #ifdef BSD
  ***************
  *** 481,487 ****
    #include <grp.h>
    #include <fcntl.h>
    #include <limits.h>
  ! #ifndef QNX
    #include <memory.h>
    #endif
    #ifdef NEED_PROCESS_H
  --- 489,495 ----
    #include <grp.h>
    #include <fcntl.h>
    #include <limits.h>
  ! #if !defined(QNX) && !defined(CONVEXOS11)
    #include <memory.h>
    #endif
    #ifdef NEED_PROCESS_H
  
  
  
  1.13      +5 -0      apache/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -C3 -r1.12 -r1.13
  *** GuessOS   1997/01/06 17:27:55     1.12
  --- GuessOS   1997/01/06 21:12:05     1.13
  ***************
  *** 164,172 ****
  --- 164,177 ----
    
        machten:*)
           echo "${MACHINE}-tenon-${SYSTEM}"; exit 0;
  +        ;;
    
        library:*)
            echo "${MACHINE}-ncr-sysv4"; exit 0
  +         ;;
  + 
  +     ConvexOS:*:11.0:*)
  +         echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
            ;;
    
        esac