Ensure all localization stuff is correctly guarded

Anything dealing with libintl and localization should be correctly guarded
inside an ENABLE_NLS block on both the pacman and libalpm sides.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 5 insertions, 0 deletions

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 20d4a746..7bbcc869 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -52,7 +52,10 @@ int SYMEXPORT alpm_initialize(void)
 	if(handle == NULL) {
 		RET_ERR(PM_ERR_MEMORY, -1);
 	}
+
+#ifdef ENABLE_NLS
 	bindtextdomain("libalpm", LOCALEDIR);
+#endif
 
 	return(0);
 }
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 3154f470..d8e6cbd8 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -25,6 +25,8 @@
 #ifndef _ALPM_UTIL_H
 #define _ALPM_UTIL_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <time.h>