[dxr3-cvslog] changeset in dxr3/em8300: Fix overlay build with --no-add-needed.

[Ville S. <vil...@ik...>]

changeset e29666fdd240 in /hgrepo/d/dx/dxr3/em8300
details: http://dxr3.hg.sourceforge.net/hgweb/dxr3/em8300?cmd=changeset;node=e29666fdd240
description:
	Fix overlay build with --no-add-needed.

diffstat:

 configure.ac        |  7 +++++++
 overlay/Makefile.am |  4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r c2608b4c43e0 -r e29666fdd240 configure.ac
--- a/configure.ac	Sun Dec 20 23:28:11 2009 +0100
+++ b/configure.ac	Sun Feb 14 23:28:02 2010 +0200
@@ -45,6 +45,13 @@
 
 if test x$has_gtk = xyes; then
     AC_DEFINE(HAVE_GTK, 1, [Defined if you have GTK])
+    old_LIBS="$LIBS"
+    LIBS=""
+    AC_SEARCH_LIBS([XSetForeground], [X11])
+    AC_SEARCH_LIBS([rint], [m])
+    OVERLAY_LIBS="$LIBS"
+    AC_SUBST(OVERLAY_LIBS)
+    LIBS="$old_LIBS"
 fi
 AM_CONDITIONAL(HAVE_GTK, test x$has_gtk = "xyes")
 
diff -r c2608b4c43e0 -r e29666fdd240 overlay/Makefile.am
--- a/overlay/Makefile.am	Sun Dec 20 23:28:11 2009 +0100
+++ b/overlay/Makefile.am	Sun Feb 14 23:28:02 2010 +0200
@@ -2,7 +2,7 @@
 
 AM_CFLAGS = @GLOBAL_CFLAGS@ $(GTK_CFLAGS)
 INCLUDES = -I@top_srcdir@/include
-AM_LDFLAGS = $(GTK_LIBS)
+AM_LDFLAGS = $(GTK_LIBS) $(OVERLAY_LIBS)
 
 bin_PROGRAMS = autocal dxr3view
 noinst_HEADERS = autocal.h allblackbut.h overlay.h
@@ -12,7 +12,7 @@
 dxr3view_SOURCES = dxr3view.c overlay.c
 
 debug:
-	$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(GTK_LIBS)"
+	$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(GTK_LIBS) $(OVERLAY_LIBS)"
 
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*