diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-09 08:06:26 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-09 08:06:26 +0000 |
| commit | ec6f27c2831c458ae861cb18e36bc8b3e946b349 (patch) | |
| tree | 19d99c389d57714845f39f572c2c734d7404c5fb | |
| parent | Remove. (diff) | |
| download | rtems-ec6f27c2831c458ae861cb18e36bc8b3e946b349.tar.bz2 | |
2010-06-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am, configure.ac: Remove support for shttpd.
* aclocal/enable-shttpd.m4: Remove.
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 1 | ||||
| -rw-r--r-- | cpukit/configure.ac | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8cb86856ff..f7c3bd17ae 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2010-06-09 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am, configure.ac: Remove support for shttpd. + * aclocal/enable-shttpd.m4: Remove. + +2010-06-09 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am, configure.ac: Remove support for httpd (GoAhead). * aclocal/enable-httpd.m4: Remove. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index b62b3a0dd6..3a50f7c1eb 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -23,7 +23,6 @@ SUBDIRS += zlib SUBDIRS += ftpd SUBDIRS += telnetd SUBDIRS += pppd -SUBDIRS += shttpd SUBDIRS += mghttpd noinst_DATA = preinstall-stamp diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 2493b7f29f..22f0b12e00 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -18,7 +18,6 @@ RTEMS_ENABLE_POSIX RTEMS_ENABLE_ITRON RTEMS_ENABLE_RTEMS_DEBUG RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_SHTTPD RTEMS_ENV_RTEMSCPU RTEMS_CHECK_RTEMS_DEBUG @@ -274,8 +273,6 @@ AM_CONDITIONAL(HAS_MP,test x"$enable_multiprocessing" = x"yes" ) AM_CONDITIONAL(HAS_PTHREADS,test x"$rtems_cv_HAS_POSIX_API" = x"yes") AM_CONDITIONAL(LIBITRON,test x"$rtems_cv_HAS_ITRON_API" = x"yes") AM_CONDITIONAL(LIBNETWORKING,test x"$rtems_cv_HAS_NETWORKING" = x"yes") -AM_CONDITIONAL([LIBSHTTPD],[test x"$rtems_cv_HAS_NETWORKING" = xyes \ -&& test x"$enable_shttpd" = xyes]) AM_CONDITIONAL([NEED_SYS_CDEFS_H],[test x"$NEED_SYS_CDEFS_H" = x"yes"]) AM_CONDITIONAL([NEED_SYS_QUEUE_H],[test x"$NEED_SYS_QUEUE_H" = x"yes"]) @@ -339,7 +336,6 @@ zlib/Makefile ftpd/Makefile telnetd/Makefile pppd/Makefile -shttpd/Makefile mghttpd/Makefile wrapup/Makefile]) |