r3889: *** empty log message ***

diff --git a/config.sub b/config.sub
index f3657978c7401e6ea9216ab85e05c75adf0fdd25..04baf3d80d17f75134815ea958df7fa64378cd3d 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

 
 

-timestamp='2002-03-07'
+timestamp='2003-01-03'

 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software


@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in

-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;


@@ -229,24 +229,36 @@ case $basic_machine in
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \

-       | c4x | clipper \
-       | d10v | d30v | dsp16xx \
-       | fr30 \
+       | clipper \
+       | d10v | d30v | dlx | dsp16xx \
+       | fr30 | frv \

        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \

+       | ip2k \

        | m32r | m68000 | m68k | m88k | mcore \
        | m32r | m68000 | m68k | m88k | mcore \

-       | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-       | mips64vr4100 | mips64vr4100el | mips64vr4300 \
-       | mips64vr4300el | mips64vr5000 | mips64vr5000el \
-       | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-       | mipsisa32 | mipsisa64 \
+       | mips | mipsbe | mipseb | mipsel | mipsle \
+       | mips16 \
+       | mips64 | mips64el \
+       | mips64vr | mips64vrel \
+       | mips64orion | mips64orionel \
+       | mips64vr4100 | mips64vr4100el \
+       | mips64vr4300 | mips64vr4300el \
+       | mips64vr5000 | mips64vr5000el \
+       | mipsisa32 | mipsisa32el \
+       | mipsisa32r2 | mipsisa32r2el \
+       | mipsisa64 | mipsisa64el \
+       | mipsisa64sb1 | mipsisa64sb1el \
+       | mipsisa64sr71k | mipsisa64sr71kel \
+       | mipstx39 | mipstx39el \

        | mn10200 | mn10300 \
        | mn10200 | mn10300 \

+       | msp430 \

        | ns16k | ns32k \
        | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
        | ns16k | ns32k \
        | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \

-       | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+       | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+       | sh64 | sh64le \

        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
        | strongarm \
        | tahoe | thumb | tic80 | tron \
        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
        | strongarm \
        | tahoe | thumb | tic80 | tron \


@@ -281,34 +293,47 @@ case $basic_machine in
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

-       | arm-*  | armbe-* | armle-* | armv*-* \
+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \

        | avr-* \
        | bs2000-* \
        | avr-* \
        | bs2000-* \

-       | c[123]* | c30-* | [cjt]90-* | c54x-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \

        | clipper-* | cydra-* \
        | clipper-* | cydra-* \

-       | d10v-* | d30v-* \
+       | d10v-* | d30v-* | dlx-* \

        | elxsi-* \
        | elxsi-* \

-       | f30[01]-* | f700-* | fr30-* | fx80-* \
+       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \

        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \

+       | ip2k-* \

        | m32r-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
        | m88110-* | m88k-* | mcore-* \
        | m32r-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
        | m88110-* | m88k-* | mcore-* \

-       | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-       | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-       | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-       | none-* | np1-* | ns16k-* | ns32k-* \
+       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+       | mips16-* \
+       | mips64-* | mips64el-* \
+       | mips64vr-* | mips64vrel-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64vr4100-* | mips64vr4100el-* \
+       | mips64vr4300-* | mips64vr4300el-* \
+       | mips64vr5000-* | mips64vr5000el-* \
+       | mipsisa32-* | mipsisa32el-* \
+       | mipsisa32r2-* | mipsisa32r2el-* \
+       | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64sb1-* | mipsisa64sb1el-* \
+       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+       | mipstx39-* | mipstx39el-* \
+       | msp430-* \
+       | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \

        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \

-       | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+       | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

-       | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+       | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \

        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \


@@ -695,6 +720,10 @@ case $basic_machine in
        np1)
                basic_machine=np1-gould
                ;;
        np1)
                basic_machine=np1-gould
                ;;

+       nv1)
+               basic_machine=nv1-cray
+               os=-unicosmp
+               ;;

        nsr-tandem)
                basic_machine=nsr-tandem
                ;;
        nsr-tandem)
                basic_machine=nsr-tandem
                ;;


@@ -728,13 +757,13 @@ case $basic_machine in
        pbb)
                basic_machine=m68k-tti
                ;;
        pbb)
                basic_machine=m68k-tti
                ;;

-        pc532 | pc532-*)
+       pc532 | pc532-*)

                basic_machine=ns32k-pc532
                ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
                basic_machine=ns32k-pc532
                ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;

-       pentiumpro | p6 | 6x86 | athlon)
+       pentiumpro | p6 | 6x86 | athlon | athlon_*)

                basic_machine=i686-pc
                ;;
        pentiumii | pentium2)
                basic_machine=i686-pc
                ;;
        pentiumii | pentium2)


@@ -755,22 +784,22 @@ case $basic_machine in
        power)  basic_machine=power-ibm
                ;;
        ppc)    basic_machine=powerpc-unknown
        power)  basic_machine=power-ibm
                ;;
        ppc)    basic_machine=powerpc-unknown

-               ;;
+               ;;

        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown
        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown

-               ;;
+               ;;

        ppcle-* | powerpclittle-*)
                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown
        ppcle-* | powerpclittle-*)
                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown

-               ;;
+               ;;

        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown
        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown

-               ;;
+               ;;

        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;


@@ -801,6 +830,12 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
                basic_machine=a29k-amd
                os=-udi
                ;;

+       sb1)
+               basic_machine=mipsisa64sb1-unknown
+               ;;
+       sb1el)
+               basic_machine=mipsisa64sb1el-unknown
+               ;;

        sequent)
                basic_machine=i386-sequent
                ;;
        sequent)
                basic_machine=i386-sequent
                ;;


@@ -866,7 +901,7 @@ case $basic_machine in
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;

-        sv1)
+       sv1)

                basic_machine=sv1-cray
                os=-unicos
                ;;
                basic_machine=sv1-cray
                os=-unicos
                ;;


@@ -874,10 +909,6 @@ case $basic_machine in
                basic_machine=i386-sequent
                os=-dynix
                ;;
                basic_machine=i386-sequent
                os=-dynix
                ;;

-       t3d)
-               basic_machine=alpha-cray
-               os=-unicos
-               ;;

        t3e)
                basic_machine=alphaev5-cray
                os=-unicos
        t3e)
                basic_machine=alphaev5-cray
                os=-unicos


@@ -886,6 +917,10 @@ case $basic_machine in
                basic_machine=t90-cray
                os=-unicos
                ;;
                basic_machine=t90-cray
                os=-unicos
                ;;

+        tic4x | c4x*)
+               basic_machine=tic4x-unknown
+               os=-coff
+               ;;

        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff
        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff


@@ -924,8 +959,8 @@ case $basic_machine in
                os=-vms
                ;;
        vpp*|vx|vx-*)
                os=-vms
                ;;
        vpp*|vx|vx-*)

-               basic_machine=f301-fujitsu
-               ;;
+               basic_machine=f301-fujitsu
+               ;;

        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks


@@ -946,11 +981,7 @@ case $basic_machine in
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;

-       windows32)
-               basic_machine=i386-pc
-               os=-windows32-msvcrt
-               ;;
-        xps | xps100)
+       xps | xps100)

                basic_machine=xps100-honeywell
                ;;
        ymp)
                basic_machine=xps100-honeywell
                ;;
        ymp)


@@ -996,7 +1027,7 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
        we32k)
                basic_machine=we32k-att
                ;;

-       sh3 | sh4 | sh3eb | sh4eb)
+       sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)

                basic_machine=sh-unknown
                ;;
        sh64)
                basic_machine=sh-unknown
                ;;
        sh64)


@@ -1005,7 +1036,7 @@ case $basic_machine in
        sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
        sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;

-        cydra)
+       cydra)

                basic_machine=cydra-cydrome
                ;;
        orion)
                basic_machine=cydra-cydrome
                ;;
        orion)


@@ -1020,10 +1051,6 @@ case $basic_machine in
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;

-       c4x*)
-               basic_machine=c4x-none
-               os=-coff
-               ;;

        *-unknown)
                # Make sure to match an already-canonicalized machine name.
                ;;
        *-unknown)
                # Make sure to match an already-canonicalized machine name.
                ;;


@@ -1086,11 +1113,12 @@ case $os in
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \

-             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \

              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \

-             | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
+             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+             | -powermax* | -dnix* | -microbsd*)

        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)


@@ -1102,8 +1130,10 @@ case $os in
                        ;;
                esac
                ;;
                        ;;
                esac
                ;;

+       -nto-qnx*)
+               ;;

        -nto*)
        -nto*)

-               os=-nto-qnx
+               os=`echo $os | sed -e 's|nto|nto-qnx|'`

                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \


@@ -1155,7 +1185,7 @@ case $os in
                os=-rtmk-nova
                ;;
        -ns2 )
                os=-rtmk-nova
                ;;
        -ns2 )

-               os=-nextstep2
+               os=-nextstep2

                ;;
        -nsk*)
                os=-nsk
                ;;
        -nsk*)
                os=-nsk


@@ -1194,8 +1224,8 @@ case $os in
        -xenix)
                os=-xenix
                ;;
        -xenix)
                os=-xenix
                ;;

-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
+       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+               os=-mint

                ;;
        -none)
                ;;
                ;;
        -none)
                ;;


@@ -1232,7 +1262,7 @@ case $basic_machine in
        pdp10-*)
                os=-tops20
                ;;
        pdp10-*)
                os=-tops20
                ;;

-        pdp11-*)
+       pdp11-*)

                os=-none
                ;;
        *-dec | vax-*)
                os=-none
                ;;
        *-dec | vax-*)


@@ -1325,19 +1355,19 @@ case $basic_machine in
        *-next)
                os=-nextstep3
                ;;
        *-next)
                os=-nextstep3
                ;;

-        *-gould)
+       *-gould)

                os=-sysv
                ;;
                os=-sysv
                ;;

-        *-highlevel)
+       *-highlevel)

                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;
                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;

-        *-sgi)
+       *-sgi)

                os=-irix
                ;;
                os=-irix
                ;;

-        *-siemens)
+       *-siemens)

                os=-sysv4
                ;;
        *-masscomp)
                os=-sysv4
                ;;
        *-masscomp)


@@ -1409,7 +1439,7 @@ case $basic_machine in
                        -ptx*)
                                vendor=sequent
                                ;;
                        -ptx*)
                                vendor=sequent
                                ;;

-                       -vxsim* | -vxworks*)
+                       -vxsim* | -vxworks* | -windiss*)

                                vendor=wrs
                                ;;
                        -aux*)
                                vendor=wrs
                                ;;
                        -aux*)

diff --git a/configure b/configure
index 0b3012d34efb5d0228d44e050881fcc5b568db06..f78b3d60a3f6a1d7fc03d9a19b441382d725f8c7 100755 (executable)
--- a/configure
+++ b/configure
@@ -864,16 +864,16 @@ Optional Features:
   --enable-verbose-warnings
                           Enable verbose compiler warnings.
   --enable-static
   --enable-verbose-warnings
                           Enable verbose compiler warnings.
   --enable-static

-                          Enable static executables.
+                            Enable static executables.

   --enable-dmalloc        Use dmalloc memory allocation
   --enable-efence        Use ElectricFence memory allocation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --enable-dmalloc        Use dmalloc memory allocation
   --enable-efence        Use ElectricFence memory allocation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

-  --with-lam=PATH       Set path of LAM MPI
-  --with-ctn=PATH       Set path of CTN DICOM library
-  --with-cpu=CPU       Set name of CPU for gcc -mcpu=
+  --with-lam=PATH         Set path of LAM MPI
+  --with-ctn=PATH         Set path of CTN DICOM library
+  --with-mcpu=CPU         Set name of CPU for gcc -mcpu

   --with-cgibin-dir=PATH  Set path of CGI binaries directory
   --with-cgibin-url=PATH  Set URL path of CGI binaries
   --with-webdata-dir=PATH Set path of webdata
   --with-cgibin-dir=PATH  Set path of CGI binaries directory
   --with-cgibin-url=PATH  Set URL path of CGI binaries
   --with-webdata-dir=PATH Set path of webdata


@@ -1492,7 +1492,7 @@ fi
 
 PACKAGE=ctsim
 
 
 PACKAGE=ctsim
 

-VERSION=4.0.0
+VERSION=4.0.2

 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5


@@ -7899,20 +7899,25 @@ echo "${ECHO_T}no" >&6
   fi
 fi
 
   fi
 fi
 

+echo "$as_me:$LINENO: checking for CPU specification" >&5
+echo $ECHO_N "checking for CPU specification... $ECHO_C" >&6

 
 

-# Check whether --with-cpu or --without-cpu was given.
-if test "${with_cpu+set}" = set; then
-  withval="$with_cpu"
+# Check whether --with-mcpu or --without-mcpu was given.
+if test "${with_mcpu+set}" = set; then
+  withval="$with_mcpu"

 
 fi;
 
 if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then
 
 fi;
 
 if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then

-  echo "$as_me:$LINENO: checking Setting CPU to $withval" >&5
-echo $ECHO_N "checking Setting CPU to $withval... $ECHO_C" >&6
+  echo "$as_me:$LINENO: result: $withval" >&5
+echo "${ECHO_T}$withval" >&6

   CFLAGS="$CFLAGS -mcpu=$withval"
   CFLAGS="$CFLAGS -mcpu=$withval"

+elif test "$withval" == "no"; then
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 else
 else

-  echo "$as_me:$LINENO: checking Unknown CPU $withval" >&5
-echo $ECHO_N "checking Unknown CPU $withval... $ECHO_C" >&6
+  echo "$as_me:$LINENO: result: Unknown" >&5
+echo "${ECHO_T}Unknown" >&6

 fi
 
 echo "$as_me:$LINENO: checking for web access" >&5
 fi
 
 echo "$as_me:$LINENO: checking for web access" >&5

diff --git a/configure.ac b/configure.ac
index 4ad6678a5978025ac2001a0a8e1c09d2e7c95acf..029dbc41f9f542ffe526a922729ea979e67f8f26 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl CDPATH=
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])

-AM_INIT_AUTOMAKE(ctsim,4.0.0)
+AM_INIT_AUTOMAKE(ctsim,4.0.2)

 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.


@@ -159,7 +159,7 @@ AC_ARG_ENABLE(verbose-warnings,
 AC_MSG_CHECKING(static executables)
 AC_ARG_ENABLE(static,
 [  --enable-static
 AC_MSG_CHECKING(static executables)
 AC_ARG_ENABLE(static,
 [  --enable-static

-                          Enable static executables.],
+                            Enable static executables.],

 [ case "$enableval" in
   yes)
     AC_MSG_RESULT(yes)
 [ case "$enableval" in
   yes)
     AC_MSG_RESULT(yes)


@@ -173,7 +173,7 @@ AC_ARG_ENABLE(static,
 
 dnl Set LAM path
 AC_ARG_WITH(lam,
 
 dnl Set LAM path
 AC_ARG_WITH(lam,

-[  --with-lam[=PATH]       Set path of LAM MPI ],
+[  --with-lam[=PATH]         Set path of LAM MPI ],

 [    if test "$withval" != "no" ; then
          trylamdir=$withval
      fi ]
 [    if test "$withval" != "no" ; then
          trylamdir=$withval
      fi ]


@@ -207,7 +207,7 @@ fi
 
 dnl Set CTN path
 AC_ARG_WITH(ctn,
 
 dnl Set CTN path
 AC_ARG_WITH(ctn,

-[  --with-ctn[=PATH]       Set path of CTN DICOM library ],
+[  --with-ctn[=PATH]         Set path of CTN DICOM library ],

 [    if test "$withval" != "no" ; then
          tryctndir=$withval
      fi ]
 [    if test "$withval" != "no" ; then
          tryctndir=$withval
      fi ]


@@ -242,14 +242,17 @@ else
 fi
 
 dnl Set CPU
 fi
 
 dnl Set CPU

-AC_ARG_WITH(cpu,
-[  --with-cpu[=CPU]       Set name of CPU for gcc -mcpu=])
+AC_MSG_CHECKING([for CPU specification])
+AC_ARG_WITH(mcpu,
+[  --with-mcpu[=CPU]         Set name of CPU for gcc -mcpu])

 
 if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then
 
 if test "$withval" == "pentium4" -o "$withval" == "athlon-mp" ; then

-  AC_MSG_CHECKING([Setting CPU to $withval])
+  AC_MSG_RESULT([$withval])

   CFLAGS="$CFLAGS -mcpu=$withval"
   CFLAGS="$CFLAGS -mcpu=$withval"

+elif test "$withval" == "no"; then
+  AC_MSG_RESULT([no])

 else
 else

-  AC_MSG_CHECKING([Unknown CPU $withval])
+  AC_MSG_RESULT([Unknown])

 fi
 
 AC_MSG_CHECKING([for web access])
 fi
 
 AC_MSG_CHECKING([for web access])