diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1997-12-06 15:44:46 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1997-12-06 15:44:46 +0000 |
commit | 80a16ec48d84d577c76b30b123a1104e35f39be2 (patch) | |
tree | f8ca9b78058c5efff127e9fb5abdb14dcc927aa7 /configure.in | |
parent | Removed need for -follow option to find. (diff) | |
download | rtems-80a16ec48d84d577c76b30b123a1104e35f39be2.tar.bz2 |
Redid hwapi makefile search to remove need for -follow option to find.
Avoid generating Makefiles for KA9Q and C++ when they are disabled.
Diffstat (limited to '')
-rw-r--r-- | configure.in | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 016b650ad4..213eb4a555 100644 --- a/configure.in +++ b/configure.in @@ -267,11 +267,15 @@ dnl RTEMS_HOST=$host_os RTEMS_ROOT=`cd $srcdir/c; pwd` PROJECT_ROOT=`pwd;` -# For now always generate the KA9Q TCP/IP Makefiles -makefiles="$makefiles c/src/lib/libka9q/Makefile" +# If the KA9Q TCP/IP stack is enabled, then find all KA9Q Makefiles +if test "$RTEMS_HAS_KA9Q" = "yes"; then + makefiles="$makefiles c/src/lib/libka9q/Makefile" +fi -# For now always generate the C++ Makefiles -makefiles="$makefiles c/src/lib/librtems++/Makefile" +# If the C++ support is enabled, then include the Makefiles +if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then + makefiles="$makefiles c/src/lib/librtems++/Makefile" +fi # If the tests are enabled, then find all the test suite Makefiles AC_MSG_CHECKING([Are the test suites enabled? ]) @@ -303,7 +307,19 @@ AC_ARG_ENABLE(hwapi, \ [ --enable-hwapi enable hardware API library], \ [case "${enableval}" in yes) AC_MSG_RESULT(yes) - RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi);; + if test -f ${srcdir}/c/src/lib/libhwapi/Makefile.in ; then + makefiles="$makefiles c/src/lib/libhwapi/Makefile" + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/analog) + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/discrete) + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/drivers) + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/eeprom) + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/serial) + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/support) + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/wrapup) + else + AC_MSG_ERROR(No source code found for the HWAPI) + fi + ;; no) AC_MSG_RESULT(no) ;; *) AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;; esac], |