diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-29 05:15:39 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-29 05:15:39 +0000 |
| commit | c2458a33d5fc579bab79104fb71b83a1bc88d3cc (patch) | |
| tree | 361cfdaf04f8fa00f695dbe21ebff766f2a50191 /cpukit | |
| parent | 2010-04-29 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-c2458a33d5fc579bab79104fb71b83a1bc88d3cc.tar.bz2 | |
2010-04-29 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Add RTEMS_ENABLE_SHTTPD, RTEMS_ENABLE_HTTPD.
Introduce AM_CONDITIONALS LIBHTTPD, LIBSHTTPD.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 2 | ||||
| -rw-r--r-- | cpukit/configure.ac | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ed52fa12d0..6721bad838 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,7 @@ 2010-04-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * configure.ac: Add RTEMS_ENABLE_SHTTPD, RTEMS_ENABLE_HTTPD. + Introduce AM_CONDITIONALS LIBHTTPD, LIBSHTTPD. * aclocal/enable-httpd.m4, aclocal/enable-shttpd.m4: New. 2010-04-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 8ad530ccff..e6f2c68f8b 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -18,6 +18,8 @@ RTEMS_ENABLE_POSIX RTEMS_ENABLE_ITRON RTEMS_ENABLE_RTEMS_DEBUG RTEMS_ENABLE_NETWORKING +RTEMS_ENABLE_HTTPD +RTEMS_ENABLE_SHTTPD RTEMS_ENV_RTEMSCPU RTEMS_CHECK_RTEMS_DEBUG @@ -267,6 +269,10 @@ 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([LIBHTTPD],[test x"$rtems_cv_HAS_NETWORKING" = xyes \ +test x"$enable_httpd" = xyes]) +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"]) |