Index: libpwmd-5.0.2/pwmc.c
--- libpwmd-5.0.2/pwmc.c.orig	2008-01-11 02:35:53 +0100
+++ libpwmd-5.0.2/pwmc.c	2008-01-13 09:47:32 +0100
@@ -152,8 +152,10 @@
     char *clientname = NULL;
     char *inquire = NULL;
 
+#ifdef USE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain("libpwmd", LOCALEDIR);
+#endif
 
     while ((opt = getopt(argc, argv, "c:I:XT:N:D:hvP:p:s:Sd:")) != EOF) {
 	switch (opt) {
Index: pwmd-1.7/src/Makefile.am
--- pwmd-1.7/src/Makefile.am.orig	2008-01-02 01:25:17 +0100
+++ pwmd-1.7/src/Makefile.am	2008-01-13 09:47:58 +0100
@@ -1,7 +1,7 @@
 bin_PROGRAMS = pwmd
 pwmd_SOURCES = pwmd.c pwmd.h xml.c xml.h pwmd_error.c pwmd_error.h commands.c \
 	       commands.h common.h cache.c cache.h gettext.h misc.c misc.h
-pwmd_LDFLAGS = @XML_LIBS@ @GLIB_LIBS@ @LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@
+pwmd_LDADD = @XML_LIBS@ @GLIB_LIBS@ @LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@
 pwmd_CFLAGS = -DLOCALEDIR=\"${prefix}/share/locale\" @XML_CPPFLAGS@ @GLIB_CFLAGS@ \
 	      @LIBGCRYPT_CFLAGS@ @LIBASSUAN_PTH_CFLAGS@ @GPG_ERROR_CFLAGS@
 
