From 3fe615bae8402e731846930125b3feff2ef333fc Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sat, 18 Nov 2006 02:28:35 +0000
Subject: Replace AM_CONDITIONAL(HAS_NETWORKING) with
 AM_CONDITIONAL(LIBNETWORKING).

---
 cpukit/Makefile.am               | 6 +++---
 cpukit/configure.ac              | 2 +-
 cpukit/ftpd/Makefile.am          | 2 +-
 cpukit/httpd/Makefile.am         | 2 +-
 cpukit/libnetworking/Makefile.am | 4 ++--
 cpukit/pppd/Makefile.am          | 2 +-
 cpukit/telnetd/Makefile.am       | 2 +-
 cpukit/wrapup/Makefile.am        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 7419b89fc8..3ff2742be3 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -45,7 +45,7 @@ include_HEADERS += backward/asm.h backward/chain.h backward/clockdrv.h \
     backward/ringbuf.h backward/rtc.h backward/spurious.h \
     backward/timerdrv.h backward/vmeintr.h
 
-if HAS_NETWORKING
+if LIBNETWORKING
 include_HEADERS += backward/ftpd.h
 
 include_HEADERS += backward/rtemspppd.h
@@ -83,7 +83,7 @@ include_sys_HEADERS += libcsupport/include/sys/ioccom.h \
     libcsupport/include/sys/termios.h libcsupport/include/sys/utsname.h \
     libcsupport/include/sys/cdefs.h
 
-if HAS_NETWORKING
+if LIBNETWORKING
 include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
 include_rtems_bsdnet_HEADERS = libnetworking/rtems/bsdnet/servers.h
 include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/_types.h
@@ -113,7 +113,7 @@ include_rtems_HEADERS += libblock/include/rtems/bdbuf.h \
 endif
 
 ## ftpd
-if HAS_NETWORKING
+if LIBNETWORKING
 include_rtems_HEADERS += ftpd/ftpd.h
 endif
 
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 87b8fd8c59..5f3e9deee5 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -264,7 +264,7 @@ AM_CONDITIONAL(HAS_MP,test x"$enable_multiprocessing" = x"yes" )
 
 AM_CONDITIONAL(HAS_POSIX,test x"$rtems_cv_HAS_POSIX_API" = x"yes")
 AM_CONDITIONAL(LIBITRON,test x"$rtems_cv_HAS_ITRON_API" = x"yes")
-AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes")
+AM_CONDITIONAL(LIBNETWORKING,test x"$HAS_NETWORKING" = x"yes")
 
 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"])
diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 73f588ae29..2155b23c28 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -4,7 +4,7 @@
 
 include $(top_srcdir)/automake/compile.am
 
-if HAS_NETWORKING
+if LIBNETWORKING
 project_lib_LIBRARIES = libftpd.a
 libftpd_a_SOURCES = ftpd.c ftpd.h
 endif
diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am
index a1aa779bf4..3bf90db859 100644
--- a/cpukit/httpd/Makefile.am
+++ b/cpukit/httpd/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/automake/compile.am
 
 AM_CPPFLAGS += -DWEBS -DUEMF
 
-if HAS_NETWORKING
+if LIBNETWORKING
 if HAS_POSIX
 include_goaheaddir = $(includedir)/goahead
 
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index d475f0de6f..ccc0355c87 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -16,7 +16,7 @@ UNUSED_FILES += sys/poll.h
 
 UNUSED_FILES += net/ppp-deflate.c net/bsd-comp.c
 
-if HAS_NETWORKING
+if LIBNETWORKING
 # Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h
 libnetworking_CPPFLAGS = -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
     -DDIAGNOSTIC -DBOOTP_COMPAT -D_KERNEL -D__BSD_VISIBLE
@@ -179,7 +179,7 @@ libc_mans = libc/addr2ascii.3 libc/byteorder.3 libc/ethers.3 \
     libc/rcmd.3 libc/resolver.3
 EXTRA_DIST += $(libc_mans)
 
-if HAS_NETWORKING
+if LIBNETWORKING
 man_MANS = $(libc_MANS)
 
 ## lib
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
index bca0c59e3f..b41fe1a5ca 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -4,7 +4,7 @@
 
 include $(top_srcdir)/automake/compile.am
 
-if HAS_NETWORKING
+if LIBNETWORKING
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = rtemspppd.h rtemsdialer.h
 
diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am
index 2f48393056..4e0ab4bc2e 100644
--- a/cpukit/telnetd/Makefile.am
+++ b/cpukit/telnetd/Makefile.am
@@ -4,7 +4,7 @@
 
 include $(top_srcdir)/automake/compile.am
 
-if HAS_NETWORKING
+if LIBNETWORKING
 if LIBSHELL
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = pty.h telnetd.h
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 36c8a16290..85db891ef8 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -59,7 +59,7 @@ TMP_LIBS += ../libmisc/libfsmount.a
 
 TMP_LIBS += ../libi2c/libi2c.a
 
-if HAS_NETWORKING
+if LIBNETWORKING
 TMP_LIBS += ../libnetworking/libnetworking.a
 TMP_LIBS += ../libnetworking/libc.a
 TMP_LIBS += ../libnetworking/lib.a
-- 
cgit v1.2.3