[PATCH] Makefile.am: make sure libintl is in LDFLAGS when needed

The build-system internally builds a couple of static libraries used to
build the final programs.

When linking these libraries and the final programs, we need to
explicitly tell libtool to link with libintl in order to resolve all the
missing symbols.

This is done in the appropriate LDADD/LIBADD variables (or the per-target
*_LDADD/*_LIBADD ones when they do not default to LDADD or LIBADD), for
any sources using gettext/libintl functionalities.

This change fixes build failures [2,3] in cross-compilation, triggered by
Buildroot buildfarms [1].

[1] http://autobuild.buildroot.org/
[2] http://autobuild.buildroot.org/?reason=tpm-tools-1.3.8
[3] http://autobuild.buildroot.org/results/c82/c82a6c1f41c561b15f10e7b7ffcaed15fa0ec895/build-end.log

	Signed-off-by: Samuel Martin <s.martin49@gmail.com>
	Signed-off-by: Hon Ching (Vicky) Lo <honclo@linux.vnet.ibm.com>

Author: Hon Ching(Vicky) Lo

lib/Makefile.am

@@ -44,15 +44,15 @@ libtpm_utils_la_SOURCES	=	tpm_utils.c \
 #
 # TSPI interface library
 libtpm_tspi_la_SOURCES	=	tpm_tspi.c
-libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ldl
+libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ldl @INTLLIBS@
 
 #
 # PKCS#11 interface library
 if P11_SUPPORT
 noinst_LTLIBRARIES	+=	libtpm_pkcs11.la
 
 libtpm_pkcs11_la_SOURCES=	tpm_pkcs11.c
-libtpm_pkcs11_la_LIBADD	=	libtpm_utils.la
+libtpm_pkcs11_la_LIBADD	=	libtpm_utils.la @INTLLIBS@
 endif
 
 #
@@ -80,4 +80,4 @@ endif
 # Unseal library - for addition to existing apps, counter part of seal cmd
 libtpm_unseal_la_SOURCES =	tpm_unseal.c
 libtpm_unseal_la_LDFLAGS =	-shared -version-info 1:0:0
-libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la
+libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la @INTLLIBS@

src/cmds/Makefile.am

@@ -30,7 +30,7 @@ else
 AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
 endif
 
-LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto
+LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
 
 tpm_sealdata_SOURCES = tpm_sealdata.c
 tpm_unsealdata_SOURCES = tpm_unsealdata.c

src/data_mgmt/Makefile.am

@@ -38,7 +38,7 @@ noinst_HEADERS =	data_common.h \
 # Common build flags
 AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
 
-LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl
+LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
 
 
 #

src/tpm_mgmt/Makefile.am

@@ -55,7 +55,7 @@ else
 AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
 endif
 
-LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi
+LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi @INTLLIBS@
 
 tpm_startup_SOURCES =		tpm_startup.c
 tpm_reset_SOURCES =		tpm_reset.c