[patch] fixing as-needed issues

trophy-1.1.5-asneeded.patch (text/plain), 1002 bytes, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2010-05-04 21:27:48 UTC

Fixing as-needed issues

http://bugs.gentoo.org/show_bug.cgi?id=318139

--- configure.ac
+++ configure.ac
@@ -15,5 +15,6 @@
 # We try to link to clanSignals because this is the only library file that
 # doesn't need another one to be linked with.
 AC_CHECK_LIB(clanSignals, main, , echo "Trophy requires ClanLib to run."; exit 1)
+PKG_CHECK_MODULES([CLAN], [clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8])
 
 AC_OUTPUT(Makefile src/Makefile resources/Makefile)
--- src/Makefile.am
+++ src/Makefile.am
@@ -12,7 +12,6 @@
 		 caslotselectiondialog.cpp cafogbomb.h caimageview.h camenu.cpp canetclient.h capositiontable.cpp \
 		 caslotselectiondialog.h
 
-CLANLIB_MODULES = clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8
-AM_LDFLAGS = `pkg-config --libs $(CLANLIB_MODULES)`
-INCLUDES = `pkg-config --cflags $(CLANLIB_MODULES)`
 AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
+trophy_CXXFLAGS = @CLAN_CFLAGS@
+trophy_LDADD = @CLAN_LIBS@