httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.org>
Subject cvs commit: apache/src/helpers GuessOS
Date Mon, 21 Jul 1997 23:09:32 GMT
jim         97/07/21 16:09:31

  Modified:    src       Configure
               src/helpers  GuessOS
  Log:
  Nicer solution to the Solaris version "problem". We now set SOLARIS
  to the actual version number in Configure, thanks to extra info
  from GuessOS.
  
  Revision  Changes    Path
  1.119     +11 -17    apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -C3 -r1.118 -r1.119
  *** Configure	1997/07/21 20:06:34	1.118
  --- Configure	1997/07/21 23:09:30	1.119
  ***************
  *** 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'
  --- 386,405 ----
    	LIBS="$LIBS -lsocket -lmalloc -lprot"
    	DEF_WANTHSREGEX=no
    	;;
        *-solaris2*)
  !     	SOLVER=`echo $PLAT | sed -e 's/^.*solaris2.//'`
  ! 	OS="Solaris $SOLVER"
  ! 	CFLAGS="$CFLAGS -DSOLARIS2=$SOLVER"
    	LIBS="$LIBS -lsocket -lnsl"
    	DBM_LIB=""
  ! 	case "$SOLVER" in
  ! 	    2[0123]*)
  ! 		DEF_WANTHSREGEX=yes
  ! 		;;
  ! 	    *)
  ! 		DEF_WANTHSREGEX=no
  ! 		;;
  ! 	esac
    	;;
        *-sunos4*)
    	OS='SunOS 4'
  
  
  
  1.27      +6 -1      apache/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -C3 -r1.26 -r1.27
  *** GuessOS	1997/07/21 20:06:35	1.26
  --- GuessOS	1997/07/21 23:09:31	1.27
  ***************
  *** 150,156 ****
    	;;
    
        SunOS:5.*)
  ! 	SOLVER=`echo ${RELEASE}|sed -e 's/^5.//'`
    	echo "${MACHINE}-sun-solaris2.${SOLVER}"; exit 0
    	;;
    
  --- 150,161 ----
    	;;
    
        SunOS:5.*)
  ! 	SOLVER=`echo ${RELEASE}|awk -F. '{
  ! 	    if (NF < 3)
  ! 		printf "2%s0\n",$2
  ! 	    else
  ! 	    	printf "2%s%s\n",$2,$3
  ! 	}'`
    	echo "${MACHINE}-sun-solaris2.${SOLVER}"; exit 0
    	;;
    
  
  
  

Mime
View raw message