From 1d84d4051889896e4fd1a7d147fa5ebe8b7c61dd Mon Sep 17 00:00:00 2001
From: Dan Sumorok <dsumorok@gmail.com>
Date: Wed, 16 Mar 2016 18:40:33 -0400
Subject: [PATCH] Linux etherhelper build updates.

---
 BasiliskII/src/Unix/Makefile.in  |  4 +++-
 BasiliskII/src/Unix/configure.ac | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in
index 54ae7fbd..6caa0768 100644
--- a/BasiliskII/src/Unix/Makefile.in
+++ b/BasiliskII/src/Unix/Makefile.in
@@ -43,6 +43,8 @@ GUI_LIBS = @GUI_LIBS@
 GUI_SRCS = ../prefs.cpp prefs_unix.cpp prefs_editor_gtk.cpp ../prefs_items.cpp \
 	../user_strings.cpp user_strings_unix.cpp xpram_unix.cpp sys_unix.cpp rpc_unix.cpp
 
+ETHERHELPERDIR = @ETHERHELPERDIR@
+
 ## Files
 SRCS = ../main.cpp ../prefs.cpp ../prefs_items.cpp \
     sys_unix.cpp ../rom_patches.cpp ../slot_rom.cpp ../rsrc_patches.cpp \
@@ -145,7 +147,7 @@ $(GUI_APP)_app: $(GUI_APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns
 	mkdir -p $(GUI_APP_APP)/Contents/Resources
 	./cpr.sh ../MacOSX/$(APP).icns $(GUI_APP_APP)/Contents/Resources/$(GUI_APP).icns
 
-etherhelpertool: ../MacOSX/etherhelpertool.c
+etherhelpertool: $(ETHERHELPERDIR)/etherhelpertool.c
 	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LIBS) $(LDFLAGS) $<  -o $@
 
 modules:
diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac
index bd7fbd8e..9389f5a1 100644
--- a/BasiliskII/src/Unix/configure.ac
+++ b/BasiliskII/src/Unix/configure.ac
@@ -756,8 +756,18 @@ if [[ "x$WANT_MACOSX_SOUND" = "xyes" ]]; then
 fi
 
 if [[ "x$WANT_MACOSX_ETHERHELPER" = "xyes" ]]; then
-    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/runtool.c"
-    LIBS="$LIBS -framework Security"
+    if [[ ${OS_TYPE} = "linux" ]]; then
+       EXTRASYSSRCS="$EXTRASYSSRCS ../Linux/runtool.c"
+       ETHERHELPERDIR=../Linux
+    fi
+
+    if [[ ${OS_TYPE} = "darwin" ]]; then
+       EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/runtool.c"
+       LIBS="$LIBS -framework Security"
+       ETHERHELPERDIR=../MacOSX
+    fi
+
+    AC_SUBST(ETHERHELPERDIR, ${ETHERHELPERDIR})
     AC_DEFINE(ENABLE_MACOSX_ETHERHELPER, 1, [Define if supporting "etherhelper" network device.])
 fi