cvs commit: apache/src/helpers GuessOS

[Jim Jagielski]

jim         97/07/21 13:06:37

  Modified:    src       Configure
               src/helpers  GuessOS
  Log:
  Per Roy's request, Configure/GuessOS now knows about Solaris versions
  
  Revision  Changes    Path
  1.118     +15 -1     apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -C3 -r1.117 -r1.118
  *** Configure 1997/07/21 17:51:29     1.117
  --- Configure 1997/07/21 20:06:34     1.118
  ***************
  *** 386,397 ****
        LIBS="$LIBS -lsocket -lmalloc -lprot"
        DEF_WANTHSREGEX=no
        ;;
        *-solaris2*)
        OS='Solaris 2'
        CFLAGS="$CFLAGS -DSOLARIS2"
        LIBS="$LIBS -lsocket -lnsl"
        DBM_LIB=""
  !     DEF_WANTHSREGEX=yes
        ;;
        *-sunos4*)
        OS='SunOS 4'
  --- 386,411 ----
        LIBS="$LIBS -lsocket -lmalloc -lprot"
        DEF_WANTHSREGEX=no
        ;;
  +     *-solaris2.[0123]*)
  +     OS='Solaris 2.[0123]'
  +     CFLAGS="$CFLAGS -DSOLARIS2 -DSOLARIS_PRE24"
  +     LIBS="$LIBS -lsocket -lnsl"
  +     DBM_LIB=""
  +     DEF_WANTHSREGEX=yes
  +     ;;
  +     *-solaris2.[45]*)
  +     OS='Solaris 2.[45]'
  +     CFLAGS="$CFLAGS -DSOLARIS2 -DSOLARIS_PRE26"
  +     LIBS="$LIBS -lsocket -lnsl"
  +     DBM_LIB=""
  +     DEF_WANTHSREGEX=no
  +     ;;
        *-solaris2*)
        OS='Solaris 2'
        CFLAGS="$CFLAGS -DSOLARIS2"
        LIBS="$LIBS -lsocket -lnsl"
        DBM_LIB=""
  !     DEF_WANTHSREGEX=no
        ;;
        *-sunos4*)
        OS='SunOS 4'
  
  
  
  1.26      +3 -9      apache/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -C3 -r1.25 -r1.26
  *** GuessOS   1997/07/21 12:27:19     1.25
  --- GuessOS   1997/07/21 20:06:35     1.26
  ***************
  *** 74,87 ****
    
        HP-UX:*)
        HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  !     case "$HPUXVER" in
  !         10.*)
  !             echo "${MACHINE}-hp-hpux10."; exit 0
  !             ;;
  !         *)
  !             echo "${MACHINE}-hp-hpux"; exit 0
  !             ;;
  !     esac
        ;;
    
        IRIX:*)
  --- 74,80 ----
    
        HP-UX:*)
        HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  !     echo "${MACHINE}-hp-hpux${HPUXVER}"; exit 0
        ;;
    
        IRIX:*)
  ***************
  *** 157,163 ****
        ;;
    
        SunOS:5.*)
  !     echo "${MACHINE}-sun-solaris2"; exit 0
        ;;
    
        SunOS:*)
  --- 150,157 ----
        ;;
    
        SunOS:5.*)
  !     SOLVER=`echo ${RELEASE}|sed -e 's/^5.//'`
  !     echo "${MACHINE}-sun-solaris2.${SOLVER}"; exit 0
        ;;
    
        SunOS:*)