github.com/open-simh.simh
1
0
Fork 0
mirror of https://github.com/open-simh/simh.git synced 2026-01-13 23:37:13 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup of readline and static libpcap support after multi-platform testing.

Browse Source
This commit is contained in:
Mark Pizzolato 2011-11-17 13:06:36 -08:00
parent 934836483b
commit db7e04e0df
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -121,7 +121,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
endif
else
NETWORK_CCDEFS = -DUSE_SHARED
$(info using libpcap: $$(call find_include,pcap))
$(info using libpcap: $(call find_include,pcap))
endif
endif
ifneq (,$(call find_lib,vdeplug))
@ -149,14 +149,16 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
# Look for package built from tcpdump.org sources with default install target
LIBPATH += /usr/local/lib
INCPATH += /usr/local/include
LIBEXTSAVE = $(LIBEXT)
LIBEXT = a
ifneq (,$(call find_lib,pcap))
ifneq (,$(call find_include,pcap))
NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
NETWORK_OPT := -DUSE_NETWORK -isystem $(dir $(call find_include,pcap)) $(call find_lib,pcap)
$(info using libpcap: $(call find_lib,pcap) $(call find_include,pcap))
else
$(error using libpcap: $(call find_lib,pcap) missing pcap.h)
endif
LIBEXT = $(LIBEXTSAVE)
else
$(error missing libpcap)
endif

1
scp.c
View File

@ -3852,6 +3852,7 @@ if (!initialized) {
#define __STR_QUOTE(tok) #tok
#define __STR(tok) __STR_QUOTE(tok)
handle = dlopen("libncurses." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL);
handle = dlopen("libcurses." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL);
handle = dlopen("libreadline." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL);
if (handle) {
p_readline = dlsym(handle, "readline");