xserver/hw/kdrive/neomagic ChangeLog,1.8,1.9 Makefile.am,1.2,1.3

[Phil Blundell]

Committed by: pb

Update of /cvs/xserver/xserver/hw/kdrive/neomagic
In directory pdx:/tmp/cvs-serv16020

Modified Files:
	ChangeLog Makefile.am 
Log Message:
2004-07-21  Phil Blundell  <pb at nexus.co.uk>

	* Makefile.am (Xneomagic_LDADD): Include -lts if appropriate.
	Patch from pattieja at bentham.ispvip.biz.



Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	7 Jun 2004 05:05:10 -0000	1.8
+++ ChangeLog	21 Jul 2004 20:33:35 -0000	1.9
@@ -1,3 +1,8 @@
+2004-07-21  Phil Blundell  <pb at nexus.co.uk>
+
+	* Makefile.am (Xneomagic_LDADD): Include -lts if appropriate.
+	Patch from pattieja at bentham.ispvip.biz.
+
 2004-06-07 Franco Catrin L. <fcatrin at tuxpan.com>
         * Small fix for depth calculation
 

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	4 Apr 2004 07:30:07 -0000	1.2
+++ Makefile.am	21 Jul 2004 20:33:35 -0000	1.3
@@ -16,6 +16,10 @@
 
 bin_PROGRAMS = Xneomagic
 
+if TSLIB
+TSLIB_FLAG = -lts
+endif
+
 noinst_LIBRARIES = libneomagic.a
 
 libneomagic_a_SOURCES =         \
@@ -37,6 +41,7 @@
 Xneomagic_LDADD = \
 	$(NEOMAGIC_LIBS)            \
 	@KDRIVE_LIBS@               \
-	@XSERVER_LIBS@
+	@XSERVER_LIBS@              \
+	$(TSLIB_FLAG)
 
 Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@