fielding    01/02/18 01:38:09

  Modified:    build    config.guess config.sub
  Log:
  Add support for OS/2 emx [originally from Brian Havard].
  Isolate and clearly identify all changes for Apache.
  
  Revision  Changes    Path
  1.3       +15 -6     apr/build/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/apr/build/config.guess,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.guess      2001/02/18 08:23:41     1.2
  +++ config.guess      2001/02/18 09:38:08     1.3
  @@ -199,9 +199,21 @@
       wgrisc:OpenBSD:*:*)
        echo mipsel-unknown-openbsd${UNAME_RELEASE}
        exit 0 ;;
  -    *:OS/390:*:*)
  -     echo i370-ibm-openedition
  -     exit 0 ;;
  +#########################
  +# Apache changes
  +#
  +#   *:OS/390:*:*)
  +#    echo i370-ibm-openedition
  +#    exit 0 ;;
  +    *:OS390:*:* | *:OS/390:*:*)
  +     echo s390-ibm-os390
  +     exit 0 ;; 
  +    *:OS/2:*:*)
  +     echo "i386-pc-os2_emx"
  +     exit 0;;
  +#
  +# end Apache changes
  +#########################
       arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
        exit 0;;
  @@ -389,9 +401,6 @@
       *:IRIX*:*:*)
        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
        exit 0 ;;
  -    *:OS390:*:* | *:OS/390:*:*)
  -     echo s390-ibm-os390
  -     exit 0 ;; 
       ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
        echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
        exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
  
  
  
  1.3       +33 -1     apr/build/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/apr/build/config.sub,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.sub        2001/02/18 08:23:41     1.2
  +++ config.sub        2001/02/18 09:38:09     1.3
  @@ -77,6 +77,9 @@
       os=-$maybe_os
       basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
       ;;
  +########################
  +# changes for Apache
  +#
     tpf | os390 | vmcms)
       os=-$maybe_os
       basic_machine=s390;
  @@ -85,6 +88,9 @@
       os=-mvs
       basic_machine=i370;
       ;;
  +#
  +# end Apache changes
  +########################
     *)
       basic_machine=`echo $1 | sed 's/-[^-]*$//'`
       if [ $basic_machine != $1 ]
  @@ -450,6 +456,8 @@
                ;;
        i370-ibm* | ibm*)
                basic_machine=i370-ibm
  +# next line added by Apache (not sure why)
  +             os=-mvs
                ;;
   # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
        i[34567]86v32)
  @@ -688,9 +696,15 @@
                basic_machine=a29k-amd
                os=-udi
                ;;
  +########################
  +# changes for Apache
  +#
        s390*)
                basic_machine=s390-ibm
                ;; 
  +# 
  +# end Apache changes
  +########################
        sequent)
                basic_machine=i386-sequent
                ;;
  @@ -932,6 +946,14 @@
        -gnu/linux*)
                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
                ;;
  +########################
  +# changes for Apache
  +#
  +     -os2_emx | -tpf* | -os390* | -vmcms* )
  +             ;;
  +#
  +# end Apache changes
  +########################
        # First accept the basic system types.
        # The portable systems comes first.
        # Each alternative MUST END IN A *, to match a version number.
  @@ -950,7 +972,7 @@
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
  -           | -openstep* | -oskit* | -tpf* | -os390* | -vmcms* )
  +           | -openstep* | -oskit*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
  @@ -1118,6 +1140,13 @@
        *-be)
                os=-beos
                ;;
  +########################
  +# changes for Apache
  +#
  +#    *-ibm)
  +#            os=-aix
  +#            ;;
  +#
        *-ibm)
                case $basic_machine in
                    s390*)
  @@ -1131,6 +1160,9 @@
                        ;;
                esac
                ;;
  +# 
  +# end Apache changes
  +########################
        *-wec)
                os=-proelf
                ;;
  
  
  

Reply via email to