diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-16 16:14:37 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-16 16:14:37 +0000 |
| commit | 65a38bcab729d5c3b99546a9790e0646d208724d (patch) | |
| tree | a8b30c22e1fde149dec470682153c0ed6156f171 /c/src | |
| parent | Removed start subdirectory and distributed contents to the appropriate (diff) | |
| download | rtems-65a38bcab729d5c3b99546a9790e0646d208724d.tar.bz2 | |
Web server uses the POSIX API. Therefor, it must be disabled when the
POSIX API is disabled.
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/exec/libnetworking/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/libnetworking/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/libnetworking/configure.in | 9 | ||||
| -rw-r--r-- | c/src/libnetworking/wrapup/Makefile.in | 8 |
4 files changed, 26 insertions, 3 deletions
diff --git a/c/src/exec/libnetworking/Makefile.am b/c/src/exec/libnetworking/Makefile.am index faa250ad31..6ca714c5de 100644 --- a/c/src/exec/libnetworking/Makefile.am +++ b/c/src/exec/libnetworking/Makefile.am @@ -5,8 +5,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal +if HAS_POSIX +POSIX_SUBDIRS = rtems_webserver +endif + SUBDIRS = include kern lib libc net netinet nfs rtems rtems_servers \ -rtems_webserver wrapup +$(POSIX_SUBDIRS) wrapup EXTRA_DIST = \ CHANGELOG \ diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am index faa250ad31..6ca714c5de 100644 --- a/c/src/libnetworking/Makefile.am +++ b/c/src/libnetworking/Makefile.am @@ -5,8 +5,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal +if HAS_POSIX +POSIX_SUBDIRS = rtems_webserver +endif + SUBDIRS = include kern lib libc net netinet nfs rtems rtems_servers \ -rtems_webserver wrapup +$(POSIX_SUBDIRS) wrapup EXTRA_DIST = \ CHANGELOG \ diff --git a/c/src/libnetworking/configure.in b/c/src/libnetworking/configure.in index 7906b85d6a..9ca15c178f 100644 --- a/c/src/libnetworking/configure.in +++ b/c/src/libnetworking/configure.in @@ -15,6 +15,7 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE +RTEMS_ENABLE_POSIX RTEMS_ENV_RTEMSBSP @@ -29,6 +30,14 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_NETWORKING(RTEMS_BSP) +RTEMS_CHECK_POSIX_API(RTEMS_BSP) + +AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes") + +if test "$HAS_POSIX_API" = "yes"; then + cfg_subdirs="posix" +fi +AC_CONFIG_SUBDIRS($cfg_subdirs) # try to explicitly list a Makefile here AC_OUTPUT( diff --git a/c/src/libnetworking/wrapup/Makefile.in b/c/src/libnetworking/wrapup/Makefile.in index cbacaf6ac2..b546f6ea12 100644 --- a/c/src/libnetworking/wrapup/Makefile.in +++ b/c/src/libnetworking/wrapup/Makefile.in @@ -13,7 +13,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers rtems_webserver +NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers $(POSIX_PIECES) OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libnetworking.a @@ -21,6 +21,12 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ +HAS_POSIX_API = @HAS_POSIX_API@ + +ifeq ($(HAS_POSIX),yes) +POSIX_PIECES = rtems_webserver +endif + # # (OPTIONAL) Add local stuff here using += |