diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-06 17:55:25 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-06 17:55:25 +0000 |
commit | 3a8915e6ee7974d832994d218c6a90b83cd86323 (patch) | |
tree | 3dde98ccb6120fb27412044b6b951c2af13a2781 /c/src/exec/aclocal.m4 | |
parent | Typo -- removed blank line at top of file. (diff) | |
download | rtems-3a8915e6ee7974d832994d218c6a90b83cd86323.tar.bz2 |
Patch rtems-rc-19990709-6-diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
applied. This modified many Makefiles and custom files and makes many more
settings (network, multiprocessing, etc) gnerated by autoconf.
Diffstat (limited to 'c/src/exec/aclocal.m4')
-rw-r--r-- | c/src/exec/aclocal.m4 | 111 |
1 files changed, 31 insertions, 80 deletions
diff --git a/c/src/exec/aclocal.m4 b/c/src/exec/aclocal.m4 index 35722142d8..836355604e 100644 --- a/c/src/exec/aclocal.m4 +++ b/c/src/exec/aclocal.m4 @@ -519,84 +519,6 @@ fi dnl dnl $Id$ -dnl -dnl Check for target g++ -dnl -dnl 98/05/20 Ralf Corsepius (corsepiu@faw.uni-ulm.de) -dnl Completely reworked - -AC_DEFUN(RTEMS_PROG_CXX, -[ -AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl -AC_BEFORE([$0], [AC_PROG_CXX])dnl -AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl - -dnl Only accept g++ and c++ -dnl NOTE: This might be too restrictive for native compilation -AC_PATH_PROGS(CXX_FOR_TARGET, "$program_prefix"g++ "$program_prefix"c++) -test -z "$CXX_FOR_TARGET" \ - && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) - -dnl backup -rtems_save_CXX=$CXX -rtems_save_CXXFLAGS=$CXXFLAGS - -dnl temporarily set CXX -CXX=$CXX_FOR_TARGET - -AC_PROG_CXX_WORKS -AC_PROG_CXX_GNU - -if test $ac_cv_prog_gxx = yes; then - GXX=yes -dnl Check whether -g works, even if CXXFLAGS is set, in case the package -dnl plays around with CXXFLAGS (such as to build both debugging and -dnl normal versions of a library), tasteless as that idea is. - ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - AC_PROG_CXX_G - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" - elif test $ac_cv_prog_cxx_g = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-O2" - fi -else - GXX= - test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" -fi - -rtems_cv_prog_gxx=$ac_cv_prog_gxx -rtems_cv_prog_cxx_g=$ac_cv_prog_cxx_g -rtems_cv_prog_cxx_works=$ac_cv_prog_cxx_works -rtems_cv_prog_cxx_cross=$ac_cv_prog_cxx_cross - -CXX=$rtems_save_CXX -CXXFLAGS=$rtems_save_CXXFLAGS - -dnl restore initial values -unset ac_cv_prog_gxx -unset ac_cv_prog_cc_g -unset ac_cv_prog_cxx_works -unset ac_cv_prog_cxx_cross -]) - -AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET, -[ - RTEMS_PROG_CXX - if test "$rtems_cv_prog_cc_cross" != "$rtems_cv_prog_cxx_cross"; then - AC_MSG_ERROR([***] - [Inconsistency in compiler configuration:] - [Target C compiler and Target C++ compiler] - [must both either be cross compilers or native compilers] - [Hint: If building a posix bsp: LD_LIBRARY_PATH?] ) - fi -]) - -dnl -dnl $Id$ dnl dnl Set target tools dnl @@ -943,7 +865,9 @@ else fi ])dnl +dnl dnl $Id$ +dnl AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING, [dnl @@ -960,8 +884,7 @@ AC_CACHE_CHECK([whether BSP supports multiprocessing], fi else rtems_cv_HAS_MP="no"; - fi - ]) + fi]) if test "$rtems_cv_HAS_MP" = "yes"; then HAS_MP="yes" else @@ -970,6 +893,34 @@ fi AC_SUBST(HAS_MP) ]) +dnl $Id$ +dnl +AC_DEFUN(RTEMS_CHECK_POSIX_API, +[dnl +AC_REQUIRE([RTEMS_CHECK_CPU])dnl +AC_CACHE_CHECK([whether BSP supports libposix], + rtems_cv_HAS_POSIX_API, + [dnl + case "$RTEMS_CPU" in + unix*) + rtems_cv_HAS_POSIX_API="no" + ;; + *) + if test "${RTEMS_HAS_POSIX_API}" = "yes"; then + rtems_cv_HAS_POSIX_API="yes"; + else + rtems_cv_HAS_POSIX_API="disabled"; + fi + ;; + esac]) +if test "$rtems_cv_HAS_POSIX_API" = "yes"; then + HAS_POSIX_API="yes"; +else + HAS_POSIX_API="no"; +fi +AC_SUBST(HAS_POSIX_API)dnl +]) + dnl dnl $Id$ dnl |