From d3223644a23a8727faf451f1dd8d16cf5691dfd6 Mon Sep 17 00:00:00 2001
From: gfk <gfk@users.sourceforge.net>
Date: Sat, 2 Aug 2003 00:37:10 +0000
Subject: [PATCH] Portability: patch by Christian Grigis
 <christian.grigis@smartdata.ch> to allow building the software from a
 directory different

---
 acinclude.m4                | 4 ++--
 configure.in                | 2 +-
 server/Makefile.am          | 1 +
 server/commands/Makefile.am | 2 +-
 shared/Makefile.am          | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 0cf55a8..a8370a8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -183,7 +183,7 @@ dnl				else
 				DRIVERS="$DRIVERS sed1520${SO}"
 				actdrivers=["$actdrivers sed1520"]
 			else
-				AC_MSG_WARN([The sed1330 driver needs a parallel port.])
+				AC_MSG_WARN([The sed1520 driver needs a parallel port.])
 			fi
 			;;
 		stv5730)
@@ -192,7 +192,7 @@ dnl				else
 				DRIVERS="$DRIVERS stv5730${SO}"
 				actdrivers=["$actdrivers stv5730"]
 			else
-				AC_MSG_WARN([The sed1330 driver needs a parallel port.])
+				AC_MSG_WARN([The stv5730 driver needs a parallel port.])
 			fi
 			;;
 		svga)
diff --git a/configure.in b/configure.in
index 2d59a55..ea87adb 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ AC_CHECK_HEADERS(sys/io.h)
 dnl Check if we support this parallel (LPT) port
 dnl IMPORTANT: we must do all the checks used in port.h before doing this test!
 AC_CACHE_CHECK([for a parallel port], ac_cv_port_have_lpt,
-[AC_TRY_COMPILE([#include "server/drivers/port.h"], [char val = port_in(0x350)], ac_cv_port_have_lpt=yes, ac_cv_port_have_lpt=no)])
+[AC_TRY_COMPILE([#include "${srcdir}/server/drivers/port.h"], [char val = port_in(0x350)], ac_cv_port_have_lpt=yes, ac_cv_port_have_lpt=no)])
 
 if test "$ac_cv_port_have_lpt" = yes
 then
diff --git a/server/Makefile.am b/server/Makefile.am
index 5f42824..7dfdff7 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS=drivers commands
 sbin_PROGRAMS=LCDd
 LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h
 LCDd_LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a
+LCDd_LDFLAGS = -rdynamic -uget_args
 INCLUDES = -I$(top_srcdir)
diff --git a/server/commands/Makefile.am b/server/commands/Makefile.am
index e64feb5..b4a2c73 100644
--- a/server/commands/Makefile.am
+++ b/server/commands/Makefile.am
@@ -1,3 +1,3 @@
 noinst_LIBRARIES = libLCDcommands.a
 libLCDcommands_a_SOURCES = command_list.c command_list.h client_commands.c client_commands.h menu_commands.c menu_commands.h screen_commands.c screen_commands.h server_commands.c server_commands.h widget_commands.c widget_commands.h
-INCLUDES = -I$(top_srcdir) -I..
+INCLUDES = -I$(top_srcdir) -I$(srcdir)/..
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 5f06dae..719908c 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -1,2 +1,3 @@
 noinst_LIBRARIES = libLCDstuff.a
 libLCDstuff_a_SOURCES = LL.c LL.h sockets.c sockets.h str.c str.h configfile.c configfile.h debug.h report.c report.h snprintf.c snprintf.h
+INCLUDES = -I$(top_srcdir)