diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-06 15:16:53 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-06 15:16:53 +0000 |
| commit | 6bfe51205ea172063621ef7ba3634642b1f2e99e (patch) | |
| tree | 6395bd1550e5af63a2d14cd2c35fcfba45d266ea | |
| parent | 5c0f2e97af414aede952199f21dda6c4b3e4b942 (diff) | |
2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile, init.c: Make sure POSIX threading is enabled if using
GoAhead.
| -rw-r--r-- | http/ChangeLog | 5 | ||||
| -rw-r--r-- | http/Makefile | 1 | ||||
| -rw-r--r-- | http/init.c | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/http/ChangeLog b/http/ChangeLog index bc8a46a..e808706 100644 --- a/http/ChangeLog +++ b/http/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile, init.c: Make sure POSIX threading is enabled if using + GoAhead. + 2007-11-09 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile: bin2c now rtems-bin2c. diff --git a/http/Makefile b/http/Makefile index ddbcb86..737bf74 100644 --- a/http/Makefile +++ b/http/Makefile @@ -40,6 +40,7 @@ CFLAGS_DEBUG_V += -v -qrtems_debug LD_PATHS += +## FYI GoAhead requires POSIX to be enabled USE_GOHEAD=no USE_SIMPLE=yes USE_FTPD=yes diff --git a/http/init.c b/http/init.c index af71c9a..dc56e41 100644 --- a/http/init.c +++ b/http/init.c @@ -70,6 +70,12 @@ boolean FTPD_enabled = FALSE; #endif +#if defined(USE_GOAHEAD_HTTPD) && !defined(RTEMS_POSIX_API) + #warning "GoAhead server requires POSIX API - switching to SHTTPD" + #undef USE_GOAHEAD_HTTPD + #undef USE_SIMPLE_HTTPD +#endif + #if defined(USE_GOAHEAD_HTTPD) boolean GoAhead_HTTPD_enabled = TRUE; |