diff options
Diffstat (limited to '')
| -rw-r--r-- | configure | 33 | ||||
| -rw-r--r-- | configure.in | 11 |
2 files changed, 38 insertions, 6 deletions
@@ -18,6 +18,9 @@ ac_help="$ac_help --disable-posix disable posix interface" ac_help="$ac_help \ + --disable-tcpip disable KA9Q TCP/IP stack" +ac_help="$ac_help +\ --disable-rtems-inlines disable RTEMS inline functions (use macros)" ac_help="$ac_help \ @@ -615,6 +618,7 @@ c/src/lib/libbsp/m68k/gen68360/include/Makefile \ c/src/lib/libbsp/m68k/gen68360/start360/Makefile \ c/src/lib/libbsp/m68k/gen68360/startup/Makefile \ c/src/lib/libbsp/m68k/gen68360/timer/Makefile \ +c/src/lib/libbsp/m68k/gen68360/network/Makefile \ c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile \ c/src/lib/libbsp/m68k/idp/Makefile \ c/src/lib/libbsp/m68k/idp/clock/Makefile \ @@ -754,6 +758,8 @@ c/src/lib/libbsp/unix/posix/startup/Makefile \ c/src/lib/libbsp/unix/posix/timer/Makefile \ c/src/lib/libbsp/unix/posix/wrapup/Makefile" +tcpip_mk="c/src/lib/libka9q/Makefile" + tests_mk="c/src/tests/Makefile \ c/src/tests/libtests/Makefile \ c/src/tests/libtests/malloctest/Makefile \ @@ -899,7 +905,7 @@ c/src/tests/tools/unix/Makefile \ c/src/tests/tools/unix/posix/Makefile" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:903: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:909: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -972,7 +978,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:976: checking host system type" >&5 +echo "configure:982: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -993,7 +999,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:997: checking target system type" >&5 +echo "configure:1003: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1011,7 +1017,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1015: checking build system type" >&5 +echo "configure:1021: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1051,6 +1057,16 @@ else fi +# Check whether --enable-tcpip or --disable-tcpip was given. +if test "${enable_tcpip+set}" = set; then + enableval="$enable_tcpip" + \ +RTEMS_HAS_KA9Q=no +else + RTEMS_HAS_KA9Q=yes +fi + + # Check whether --enable-rtems-inlines or --disable-rtems-inlines was given. if test "${enable_rtems_inlines+set}" = set; then enableval="$enable_rtems_inlines" @@ -1131,6 +1147,9 @@ case "${target}" in ;; esac +# until the tcpip is made optional to build, just do this +makefiles="$makefiles $tcpip_mk" + case "${host}" in *-pc-linux*) host_os=Linux ;; sparc-sun-sunos*) host_os=SunOS ;; @@ -1157,7 +1176,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:1161: checking for $ac_word" >&5 +echo "configure:1180: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1186,7 +1205,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1190: checking whether ln -s works" >&5 +echo "configure:1209: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1239,6 +1258,7 @@ fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1461,6 +1481,7 @@ s%@RTEMS_HOST@%$RTEMS_HOST%g s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g s%@RTEMS_ROOT@%$RTEMS_ROOT%g s%@RTEMS_HAS_POSIX_API@%$RTEMS_HAS_POSIX_API%g +s%@RTEMS_HAS_KA9Q@%$RTEMS_HAS_KA9Q%g s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g s%@PROJECT_ROOT@%$PROJECT_ROOT%g s%@program_prefix@%$program_prefix%g diff --git a/configure.in b/configure.in index 8ac769061d..3180569b8e 100644 --- a/configure.in +++ b/configure.in @@ -84,6 +84,7 @@ c/src/lib/libbsp/m68k/gen68360/include/Makefile \ c/src/lib/libbsp/m68k/gen68360/start360/Makefile \ c/src/lib/libbsp/m68k/gen68360/startup/Makefile \ c/src/lib/libbsp/m68k/gen68360/timer/Makefile \ +c/src/lib/libbsp/m68k/gen68360/network/Makefile \ c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile \ c/src/lib/libbsp/m68k/idp/Makefile \ c/src/lib/libbsp/m68k/idp/clock/Makefile \ @@ -223,6 +224,8 @@ c/src/lib/libbsp/unix/posix/startup/Makefile \ c/src/lib/libbsp/unix/posix/timer/Makefile \ c/src/lib/libbsp/unix/posix/wrapup/Makefile" +tcpip_mk="c/src/lib/libka9q/Makefile" + tests_mk="c/src/tests/Makefile \ c/src/tests/libtests/Makefile \ c/src/tests/libtests/malloctest/Makefile \ @@ -377,6 +380,10 @@ AC_ARG_ENABLE(posix, \ [ --disable-posix disable posix interface], \ RTEMS_HAS_POSIX_API=no,RTEMS_HAS_POSIX_API=yes) +AC_ARG_ENABLE(tcpip, \ +[ --disable-tcpip disable KA9Q TCP/IP stack], \ +RTEMS_HAS_KA9Q=no,RTEMS_HAS_KA9Q=yes) + AC_ARG_ENABLE(rtems-inlines, \ [ --disable-rtems-inlines disable RTEMS inline functions (use macros)], \ RTEMS_USE_MACROS=yes,RTEMS_USE_MACROS=no) @@ -451,6 +458,9 @@ case "${target}" in ;; esac +# until the tcpip is made optional to build, just do this +makefiles="$makefiles $tcpip_mk" + case "${host}" in *-pc-linux*) host_os=Linux ;; sparc-sun-sunos*) host_os=SunOS ;; @@ -495,6 +505,7 @@ AC_SUBST(RTEMS_HOST) AC_SUBST(RTEMS_LIBC_DIR) AC_SUBST(RTEMS_ROOT) AC_SUBST(RTEMS_HAS_POSIX_API) +AC_SUBST(RTEMS_HAS_KA9Q) AC_SUBST(RTEMS_USE_MACROS) AC_SUBST(PROJECT_ROOT) AC_SUBST(program_prefix) |