hal: Branch 'master'

[David Zeuthen]

 libhal/Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree b0402cb222a6f9966947a750d1be39fb04582ff7 (from ff1246c473d915310fb218b1ee8914be5da742fb)
Author: Julio M. Merino Vidal <jmmv at NetBSD.org>
Date:   Wed Aug 2 19:01:32 2006 -0400

    make libhal link against libintl for NetBSD (bug #6471)
    
    libhal uses i18n functions such as bindtextdomain.  These functions are not
    always provided by the standard C library (as happens in Linux).  For example,
    NetBSD has the i18n functions in libintl.
    
    Therefore, libhal should be linked against the appropriate library that provides
    the missing functions.  This library is available in the INTLLIBS variable
    thanks to the AM_GLIB_GNU_GETTEXT variable used in configure.
    
    If libhal is not linked to libintl, any program using libhal fails to build
    because the missing functions cannot be found.  This happens while trying to
    build the tools directory.

diff --git a/libhal/Makefile.am b/libhal/Makefile.am
index 8e39636..e3ae82f 100644
--- a/libhal/Makefile.am
+++ b/libhal/Makefile.am
@@ -21,7 +21,7 @@ LIBGCOV = -lgcov
 else
 LIBGCOV = 
 endif
-libhal_la_LIBADD = @DBUS_LIBS@ $(LIBGCOV)
+libhal_la_LIBADD = @DBUS_LIBS@ $(LIBGCOV) $(INTLLIBS)
 
 libhal_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)