From 9575ac5c63b2c941a9b65f8984b9e96ceaa93762 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Tue, 4 Dec 2012 09:34:14 -0800 Subject: [PATCH] Added makefile message prompt describing available vde networking support when building on Linux and libvdeplug-dev isn't available. --- makefile | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 5cd9d487..944c1b6f 100644 --- a/makefile +++ b/makefile @@ -234,7 +234,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) $(info *** Warning *** Some users have had problems using the www.tcpdump.org libpcap) $(info *** Warning *** components for simh networking. For best results, with) $(info *** Warning *** simh networking, it is recommended that you install the) - $(info *** Warning *** libpcap-dev package from your $(OSTYPE) distribution) + $(info *** Warning *** libpcap-dev package from your $(OSNAME) distribution) $(info *** Warning ***) endif else @@ -244,10 +244,10 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) LIBEXT = $(LIBEXTSAVE) endif ifneq (,$(findstring USE_NETWORK,$(NETWORK_CCDEFS))$(findstring USE_SHARED,$(NETWORK_CCDEFS))) - # Given we have libpcap components, consider other network connections as well + # Given we have libpcap components, consider other network connections as well ifneq (,$(call find_lib,vdeplug)) # libvdeplug requires the use of the OS provided libpcap - ifeq (,$(findstring usr/local,$(NETWORK_CCDEFS))) + ifeq (,$(findstring usr/local,$(NETWORK_CCDEFS))) ifneq (,$(call find_include,libvdeplug)) # Provide support for vde networking NETWORK_CCDEFS += -DUSE_VDE_NETWORK @@ -256,6 +256,23 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) endif endif endif + ifeq (,$(findstring USE_VDE_NETWORK,$(NETWORK_CCDEFS))) + # Support is available on Linux for libvdeplug. Advise on its usage + ifneq (,$(findstring Linux,$(OSTYPE))) + $(info *** Warning ***) + $(info *** Warning *** $(BUILD_SINGLE)Simulator$(BUILD_MULTIPLE) are being built with) + $(info *** Warning *** minimal libpcap networking support) + $(info *** Warning ***) + $(info *** Warning *** Simulators on your $(OSNAME) platform can also be built with) + $(info *** Warning *** extended Ethernet networking support by using VDE Ethernet.) + $(info *** Warning ***) + $(info *** Warning *** To build simulator(s) with extended networking support you) + $(info *** Warning *** should read 0readme_ethernet.txt and follow the instructions) + $(info *** Warning *** regarding the needed libvdeplug components for your $(OSNAME)) + $(info *** Warning *** platform) + $(info *** Warning ***) + endif + endif ifneq (,$(call find_include,linux/if_tun)) # Provide support for Tap networking on Linux NETWORK_CCDEFS += -DUSE_TAP_NETWORK