From: J. Ali Harlow <ali@juiblex.co.uk>
Date: Sat, 23 Aug 2014 10:13:48 +0000 (+0100)
Subject: Remove INTLLIBS from librazor_la_LIBADD.
X-Git-Tag: 0.6~23
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=236cfc8ecc5c66288e41bf9b72051a3b18326e1c;p=razor.git

Remove INTLLIBS from librazor_la_LIBADD.

This partially reverts 611c84a3f4b4538a65d186050608c17adbf17770.
It's not clear what motivated the initial inclusion of INTLLIBS
here since the net effect is only seen in librazor.la and not
in razor.pc and librazor.la is not normally packaged. Certainly
neither the static nor the dynamic versions of librazor currently
use libintl. At best this would cause the linker to search a
static libintl for undefined symbols without finding any; at worse
it causes a static build of plover using librazor.la to fail if
no static version of libintl is installed.
---

diff --git a/librazor/Makefile.am b/librazor/Makefile.am
index 28c0d26..9531cac 100644
--- a/librazor/Makefile.am
+++ b/librazor/Makefile.am
@@ -46,7 +46,7 @@ if HAVE_LUA
 endif
 
 librazor_la_LIBADD = $(ZLIB_LIBS) types/libtypes.la $(LUA_LIBS) \
-	../gl/libgnu.la $(INTLLIBS) $(EXTRA_LIBS)
+	../gl/libgnu.la $(EXTRA_LIBS)
 librazor_la_LDFLAGS = -no-undefined \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)