diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
commit | 1896a650fc382d343844b56f4b79efe31562755e (patch) | |
tree | 922de4dd1237cfcf6c7be0a8050e1e964fceadad /c/src/tests/configure | |
parent | Fixed typos. (diff) | |
download | rtems-1896a650fc382d343844b56f4b79efe31562755e.tar.bz2 |
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
The main topic is replacing the hard-coded values for HAS_MP and
HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks
(This is the patch I had mentioned before earlier this week).
CHANGES
* HAS_MP removed from custom/*.cfg, replaced with configuration time
autoconf check
* HAS_RDBG removed from custom/*.cfg, replaced with configuration-time
autoconf check
* NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp
values (i.e. HAS_MP, HAS_RDBG), gets installed as
$(prefix)/<bsp>/make/bsp.cfg
* NEW: default.cfg includes bsp.cfg - this change is backward
compatible.
* IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory
Makefile.ins
* HACK: a bug in acpolish mis-handles addtions to makefile variables
which are enclosed in gmake conditionals:
c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in
* Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of
unneeded subdirectories in various configure.in files.
* Several minor changes in Makefile.ins and configure.ins, wrt. to the
order of including *.cfg and defining Makefile variables
APPLYING THE PATCH:
patch -p1 < rtems-rc-19990709-4.diff
./autogen
Diffstat (limited to '')
-rw-r--r-- | c/src/tests/configure | 242 | ||||
-rw-r--r-- | c/src/tests/configure.in | 31 |
2 files changed, 135 insertions, 138 deletions
diff --git a/c/src/tests/configure b/c/src/tests/configure index 26725ac28b..3ea0f81a78 100644 --- a/c/src/tests/configure +++ b/c/src/tests/configure @@ -955,41 +955,6 @@ echo "$ac_t""${RTEMS_BSP}" 1>&6 -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:962: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$RM" in - /*) - ac_cv_path_RM="$RM" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_RM="$RM" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_RM="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -RM="$ac_cv_path_RM" -if test -n "$RM"; then - echo "$ac_t""$RM" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1002,7 +967,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1006: checking for a BSD compatible install" >&5 +echo "configure:971: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1060,7 +1025,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Is this a supported CPU? echo $ac_n "checking if cpu $RTEMS_CPU is supported""... $ac_c" 1>&6 -echo "configure:1064: checking if cpu $RTEMS_CPU is supported" >&5 +echo "configure:1029: checking if cpu $RTEMS_CPU is supported" >&5 if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then echo "$ac_t""yes" 1>&6 else @@ -1121,7 +1086,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1125: checking for $ac_word" >&5 +echo "configure:1090: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1165,7 +1130,7 @@ rtems_save_CFLAGS=$CFLAGS CC=$CC_FOR_TARGET echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1169: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1134: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1176,12 +1141,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1180 "configure" +#line 1145 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1207,12 +1172,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1211: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1176: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1216: checking whether we are using GNU C" >&5 +echo "configure:1181: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1221,7 +1186,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1236,7 +1201,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1240: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1205: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1278,7 +1243,7 @@ unset ac_cv_prog_cc_cross echo $ac_n "checking whether $CC_FOR_TARGET accepts -specs""... $ac_c" 1>&6 -echo "configure:1282: checking whether $CC_FOR_TARGET accepts -specs" >&5 +echo "configure:1247: checking whether $CC_FOR_TARGET accepts -specs" >&5 if eval "test \"`echo '$''{'rtems_cv_gcc_specs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1299,7 +1264,7 @@ echo "$ac_t""$rtems_cv_gcc_specs" 1>&6 echo $ac_n "checking whether $CC_FOR_TARGET accepts --pipe""... $ac_c" 1>&6 -echo "configure:1303: checking whether $CC_FOR_TARGET accepts --pipe" >&5 +echo "configure:1268: checking whether $CC_FOR_TARGET accepts --pipe" >&5 if eval "test \"`echo '$''{'rtems_cv_gcc_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1347,7 +1312,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1351: checking for $ac_word" >&5 +echo "configure:1316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CXX_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1356,7 @@ rtems_save_CXXFLAGS=$CXXFLAGS CXX=$CXX_FOR_TARGET echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1395: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1360: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1402,12 +1367,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1406 "configure" +#line 1371 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1433,12 +1398,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1437: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1402: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1442: checking whether we are using GNU C++" >&5 +echo "configure:1407: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1447,7 +1412,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1462,7 +1427,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1466: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1431: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1515,7 +1480,7 @@ fi echo $ac_n "checking target's ar""... $ac_c" 1>&6 -echo "configure:1519: checking target's ar" >&5 +echo "configure:1484: checking target's ar" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1548,7 +1513,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable AR_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1552: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5 +echo "configure:1517: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5 case "$AR_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1565,7 +1530,7 @@ echo "configure:1552: checking whether environment variable AR_FOR_TARGET is an # Extract the first word of ""$program_prefix"ar", so it can be a program name with args. set dummy "$program_prefix"ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1569: checking for $ac_word" >&5 +echo "configure:1534: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1602,7 +1567,7 @@ fi echo $ac_n "checking target's as""... $ac_c" 1>&6 -echo "configure:1606: checking target's as" >&5 +echo "configure:1571: checking target's as" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1635,7 +1600,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable AS_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1639: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5 +echo "configure:1604: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5 case "$AS_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1652,7 +1617,7 @@ echo "configure:1639: checking whether environment variable AS_FOR_TARGET is an # Extract the first word of ""$program_prefix"as", so it can be a program name with args. set dummy "$program_prefix"as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1656: checking for $ac_word" >&5 +echo "configure:1621: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1689,7 +1654,7 @@ fi echo $ac_n "checking target's ld""... $ac_c" 1>&6 -echo "configure:1693: checking target's ld" >&5 +echo "configure:1658: checking target's ld" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1722,7 +1687,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable LD_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1726: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5 +echo "configure:1691: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5 case "$LD_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1739,7 +1704,7 @@ echo "configure:1726: checking whether environment variable LD_FOR_TARGET is an # Extract the first word of ""$program_prefix"ld", so it can be a program name with args. set dummy "$program_prefix"ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1743: checking for $ac_word" >&5 +echo "configure:1708: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1776,7 +1741,7 @@ fi echo $ac_n "checking target's nm""... $ac_c" 1>&6 -echo "configure:1780: checking target's nm" >&5 +echo "configure:1745: checking target's nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1809,7 +1774,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable NM_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1813: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5 +echo "configure:1778: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5 case "$NM_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1826,7 +1791,7 @@ echo "configure:1813: checking whether environment variable NM_FOR_TARGET is an # Extract the first word of ""$program_prefix"nm", so it can be a program name with args. set dummy "$program_prefix"nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1830: checking for $ac_word" >&5 +echo "configure:1795: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1864,7 +1829,7 @@ fi echo $ac_n "checking target's ranlib""... $ac_c" 1>&6 -echo "configure:1868: checking target's ranlib" >&5 +echo "configure:1833: checking target's ranlib" >&5 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1897,7 +1862,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable RANLIB_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1901: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5 +echo "configure:1866: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5 case "$RANLIB_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1914,7 +1879,7 @@ echo "configure:1901: checking whether environment variable RANLIB_FOR_TARGET is # Extract the first word of ""$program_prefix"ranlib", so it can be a program name with args. set dummy "$program_prefix"ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1918: checking for $ac_word" >&5 +echo "configure:1883: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1953,7 +1918,7 @@ fi # ranlib wasn't found; check if ar -s is available echo $ac_n "checking whether $AR_FOR_TARGET -s works""... $ac_c" 1>&6 -echo "configure:1957: checking whether $AR_FOR_TARGET -s works" >&5 +echo "configure:1922: checking whether $AR_FOR_TARGET -s works" >&5 if eval "test \"`echo '$''{'rtems_cv_AR_FOR_TARGET_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1962,8 +1927,8 @@ cat > conftest.$ac_ext <<EOF int foo( int b ) { return b; } EOF -if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:1966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ - && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ +if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:1931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ + && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:1932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ && test -s conftest.a ; \ then rtems_cv_AR_FOR_TARGET_S="yes" @@ -1988,7 +1953,7 @@ echo "$ac_t""$rtems_cv_AR_FOR_TARGET_S" 1>&6 echo $ac_n "checking target's objcopy""... $ac_c" 1>&6 -echo "configure:1992: checking target's objcopy" >&5 +echo "configure:1957: checking target's objcopy" >&5 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +1986,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2025: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5 +echo "configure:1990: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5 case "$OBJCOPY_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2038,7 +2003,7 @@ echo "configure:2025: checking whether environment variable OBJCOPY_FOR_TARGET i # Extract the first word of ""$program_prefix"objcopy", so it can be a program name with args. set dummy "$program_prefix"objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2042: checking for $ac_word" >&5 +echo "configure:2007: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2075,7 +2040,7 @@ fi echo $ac_n "checking target's size""... $ac_c" 1>&6 -echo "configure:2079: checking target's size" >&5 +echo "configure:2044: checking target's size" >&5 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2108,7 +2073,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable SIZE_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2112: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5 +echo "configure:2077: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5 case "$SIZE_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2125,7 +2090,7 @@ echo "configure:2112: checking whether environment variable SIZE_FOR_TARGET is a # Extract the first word of ""$program_prefix"size", so it can be a program name with args. set dummy "$program_prefix"size; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2129: checking for $ac_word" >&5 +echo "configure:2094: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2162,7 +2127,7 @@ fi echo $ac_n "checking target's strip""... $ac_c" 1>&6 -echo "configure:2166: checking target's strip" >&5 +echo "configure:2131: checking target's strip" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2195,7 +2160,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable STRIP_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2199: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5 +echo "configure:2164: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5 case "$STRIP_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2212,7 +2177,7 @@ echo "configure:2199: checking whether environment variable STRIP_FOR_TARGET is # Extract the first word of ""$program_prefix"strip", so it can be a program name with args. set dummy "$program_prefix"strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2216: checking for $ac_word" >&5 +echo "configure:2181: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2251,7 +2216,7 @@ fi if test "${target_cpu}" = "i386"; then echo $ac_n "checking for 16 bit mode assembler support""... $ac_c" 1>&6 -echo "configure:2255: checking for 16 bit mode assembler support" >&5 +echo "configure:2220: checking for 16 bit mode assembler support" >&5 if eval "test \"`echo '$''{'rtems_cv_prog_gas_code16'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2261,7 +2226,7 @@ else addr32 lgdt 0 EOF - if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then rtems_cv_prog_gas_code16=yes else rtems_cv_prog_gas_code16=no @@ -2277,7 +2242,7 @@ echo "$ac_t""$rtems_cv_prog_gas_code16" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2281: checking for $ac_word" >&5 +echo "configure:2246: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2272,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2311: checking for $ac_word" >&5 +echo "configure:2276: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2358,7 +2323,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2362: checking for $ac_word" >&5 +echo "configure:2327: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2390,7 +2355,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2394: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2359: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2401,12 +2366,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2405 "configure" +#line 2370 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2432,12 +2397,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2436: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2401: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2441: checking whether we are using GNU C" >&5 +echo "configure:2406: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2446,7 +2411,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2465,7 +2430,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2469: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2434: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2501,7 +2466,7 @@ if test "$RTEMS_CPU" = "unix" ; then echo $ac_n "checking whether $RTEMS_HOST supports System V semaphores""... $ac_c" 1>&6 -echo "configure:2505: checking whether $RTEMS_HOST supports System V semaphores" >&5 +echo "configure:2470: checking whether $RTEMS_HOST supports System V semaphores" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_sem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2510,7 +2475,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2514 "configure" +#line 2479 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2536,7 +2501,7 @@ int main () { } EOF -if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_sem="yes" else @@ -2559,7 +2524,7 @@ echo "$ac_t""$rtems_cv_sysv_sem" 1>&6 echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6 -echo "configure:2563: checking whether $RTEMS_HOST supports System V shared memory" >&5 +echo "configure:2528: checking whether $RTEMS_HOST supports System V shared memory" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2568,7 +2533,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2572 "configure" +#line 2537 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2584,7 +2549,7 @@ int main () { } EOF -if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_shm="yes" else @@ -2607,7 +2572,7 @@ echo "$ac_t""$rtems_cv_sysv_shm" 1>&6 echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6 -echo "configure:2611: checking whether $RTEMS_HOST supports System V messages" >&5 +echo "configure:2576: checking whether $RTEMS_HOST supports System V messages" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2616,7 +2581,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2620 "configure" +#line 2585 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2632,7 +2597,7 @@ int main () { } EOF -if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_msg="yes" else @@ -2656,20 +2621,53 @@ fi echo $ac_n "checking for make/custom/$RTEMS_BSP.cfg""... $ac_c" 1>&6 -echo "configure:2660: checking for make/custom/$RTEMS_BSP.cfg" >&5 +echo "configure:2625: checking for make/custom/$RTEMS_BSP.cfg" >&5 if test -r "$srcdir/$RTEMS_TOPdir/make/custom/$RTEMS_BSP.cfg"; then echo "$ac_t""yes" 1>&6 else { echo "configure: error: no" 1>&2; exit 1; } fi +echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6 +echo "configure:2633: checking whether BSP supports multiprocessing" >&5 +if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP}/shmsupp"; then + if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then + rtems_cv_HAS_MP="yes" ; + else + rtems_cv_HAS_MP="disabled"; + fi + else + rtems_cv_HAS_MP="no"; + fi + +fi + +echo "$ac_t""$rtems_cv_HAS_MP" 1>&6 +if test "$rtems_cv_HAS_MP" = "yes"; then +HAS_MP="yes" +else +HAS_MP="no" +fi + + # always build the test tools testtools_cfgdirs="tools/generic" + +if test "$HAS_MP" = "yes"; then + makefiles="$makefiles samples/base_mp/Makefile" + makefiles="$makefiles samples/base_mp/node1/Makefile" + makefiles="$makefiles samples/base_mp/node2/Makefile" + makefiles="$makefiles samples/base_sp/Makefile" +fi + if test "$tests_enabled" = "yes"; then - + echo $ac_n "checking for Makefile.in in libtests""... $ac_c" 1>&6 -echo "configure:2673: checking for Makefile.in in libtests" >&5 +echo "configure:2671: checking for Makefile.in in libtests" >&5 if test -d $srcdir/libtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2682,9 +2680,9 @@ else fi - + echo $ac_n "checking for Makefile.in in sptests""... $ac_c" 1>&6 -echo "configure:2688: checking for Makefile.in in sptests" >&5 +echo "configure:2686: checking for Makefile.in in sptests" >&5 if test -d $srcdir/sptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2697,9 +2695,9 @@ else fi - + echo $ac_n "checking for Makefile.in in tmtests""... $ac_c" 1>&6 -echo "configure:2703: checking for Makefile.in in tmtests" >&5 +echo "configure:2701: checking for Makefile.in in tmtests" >&5 if test -d $srcdir/tmtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2712,10 +2710,10 @@ else fi - if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then - + if test "$HAS_MP" = "yes"; then + echo $ac_n "checking for Makefile.in in mptests""... $ac_c" 1>&6 -echo "configure:2719: checking for Makefile.in in mptests" >&5 +echo "configure:2717: checking for Makefile.in in mptests" >&5 if test -d $srcdir/mptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2728,11 +2726,11 @@ else fi - fi - if test "$RTEMS_HAS_POSIX_API" = "yes"; then - + fi + if test "$RTEMS_HAS_POSIX_API" = "yes"; then + echo $ac_n "checking for Makefile.in in psxtests""... $ac_c" 1>&6 -echo "configure:2736: checking for Makefile.in in psxtests" >&5 +echo "configure:2734: checking for Makefile.in in psxtests" >&5 if test -d $srcdir/psxtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2745,7 +2743,7 @@ else fi - fi + fi if test -d "$srcdir/tools/$RTEMS_CPU"; then testtools_cfgdirs="$testtools_cfgdirs tools/$RTEMS_CPU" fi @@ -2886,9 +2884,6 @@ support/stubdr/Makefile support/wrapup/Makefile tools/Makefile samples/Makefile -samples/base_mp/Makefile -samples/base_mp/node1/Makefile -samples/base_mp/node2/Makefile samples/base_sp/Makefile samples/cdtest/Makefile samples/hello/Makefile @@ -2956,7 +2951,6 @@ s%@RTEMS_HAS_RDBG@%$RTEMS_HAS_RDBG%g s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g s%@RTEMS_BSP@%$RTEMS_BSP%g -s%@RM@%$RM%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g @@ -2978,6 +2972,7 @@ s%@SIZE_FOR_TARGET@%$SIZE_FOR_TARGET%g s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g s%@CC@%$CC%g +s%@HAS_MP@%$HAS_MP%g s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g s%@RTEMS_USE_GCC272@%$RTEMS_USE_GCC272%g @@ -3037,9 +3032,6 @@ support/stubdr/Makefile support/wrapup/Makefile tools/Makefile samples/Makefile -samples/base_mp/Makefile -samples/base_mp/node1/Makefile -samples/base_mp/node2/Makefile samples/base_sp/Makefile samples/cdtest/Makefile samples/hello/Makefile diff --git a/c/src/tests/configure.in b/c/src/tests/configure.in index a1a6d9a818..78e9b685a9 100644 --- a/c/src/tests/configure.in +++ b/c/src/tests/configure.in @@ -28,7 +28,6 @@ RTEMS_ENV_RTEMSBSP dnl BEGIN configure.host.in -AC_PATH_PROG(RM,rm) AC_PROG_INSTALL dnl BEGIN configure.target.in @@ -54,19 +53,28 @@ RTEMS_I386_GAS_CODE16 RTEMS_CHECK_SYSV_UNIX RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) # always build the test tools testtools_cfgdirs="tools/generic" + +if test "$HAS_MP" = "yes"; then + makefiles="$makefiles samples/base_mp/Makefile" + makefiles="$makefiles samples/base_mp/node1/Makefile" + makefiles="$makefiles samples/base_mp/node2/Makefile" + makefiles="$makefiles samples/base_sp/Makefile" +fi + if test "$tests_enabled" = "yes"; then - RTEMS_CHECK_MAKEFILE(libtests) - RTEMS_CHECK_MAKEFILE(sptests) - RTEMS_CHECK_MAKEFILE(tmtests) - if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then - RTEMS_CHECK_MAKEFILE(mptests) - fi - if test "$RTEMS_HAS_POSIX_API" = "yes"; then - RTEMS_CHECK_MAKEFILE(psxtests) - fi + RTEMS_CHECK_MAKEFILE(libtests) + RTEMS_CHECK_MAKEFILE(sptests) + RTEMS_CHECK_MAKEFILE(tmtests) + if test "$HAS_MP" = "yes"; then + RTEMS_CHECK_MAKEFILE(mptests) + fi + if test "$RTEMS_HAS_POSIX_API" = "yes"; then + RTEMS_CHECK_MAKEFILE(psxtests) + fi if test -d "$srcdir/tools/$RTEMS_CPU"; then testtools_cfgdirs="$testtools_cfgdirs tools/$RTEMS_CPU" fi @@ -94,9 +102,6 @@ support/stubdr/Makefile support/wrapup/Makefile tools/Makefile samples/Makefile -samples/base_mp/Makefile -samples/base_mp/node1/Makefile -samples/base_mp/node2/Makefile samples/base_sp/Makefile samples/cdtest/Makefile samples/hello/Makefile |