Clean up gettext on the libalpm side

Remove inclusion of libintl.h from all files, because we can do it once
in util.c where the _() macro is defined.

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

lib/libalpm/add.c

@@ -38,7 +38,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include <limits.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "add.h"

lib/libalpm/alpm.c

@@ -37,7 +37,6 @@
 #include <syslog.h>
 #include <limits.h> /* PATH_MAX */
 #include <stdarg.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "alpm.h"

lib/libalpm/be_files.c

@@ -32,7 +32,6 @@
 #endif
 #include <sys/stat.h>
 #include <dirent.h>
-#include <libintl.h>
 #include <locale.h>
 #ifdef CYGWIN
 #include <limits.h> /* PATH_MAX */

lib/libalpm/cache.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "cache.h"

lib/libalpm/conflict.c

@@ -34,7 +34,6 @@
 #include <sys/syslimits.h>
 #endif
 #include <sys/stat.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "conflict.h"

lib/libalpm/db.c

@@ -36,7 +36,6 @@
 #include <sys/stat.h>
 #endif
 #include <dirent.h>
-#include <libintl.h>
 #include <regex.h>
 #ifdef CYGWIN
 #include <limits.h> /* PATH_MAX */

lib/libalpm/deps.c

@@ -29,7 +29,6 @@
 #ifdef __sun__
 #include <strings.h>
 #endif
-#include <libintl.h>
 #include <math.h>
 
 /* libalpm */

lib/libalpm/error.c

@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#include <libintl.h>
-
 /* libalpm */
 #include "error.h"
 #include "util.h"

lib/libalpm/group.c

@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "group.h"

lib/libalpm/handle.c

@@ -29,7 +29,6 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <syslog.h>
-#include <libintl.h>
 #include <time.h>
 
 /* libalpm */

lib/libalpm/md5driver.c

@@ -24,7 +24,6 @@ documentation and/or software.
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "alpm.h"

lib/libalpm/package.c

@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
-#include <libintl.h>
 #include <locale.h>
 #include <errno.h>
 #include <sys/types.h>

lib/libalpm/remove.c

@@ -39,7 +39,6 @@
 #endif
 #include <unistd.h>
 #include <errno.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "remove.h"

lib/libalpm/server.c

@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <libintl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

lib/libalpm/sha1.c

@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "sha1.h"

lib/libalpm/sync.c

@@ -33,7 +33,6 @@
 #include <limits.h> /* PATH_MAX */
 #endif
 #include <dirent.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "sync.h"

lib/libalpm/trans.c

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "trans.h"

lib/libalpm/util.c

@@ -45,7 +45,6 @@
 #if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__)
 #include <sys/stat.h>
 #endif
-#include <libintl.h>
 #ifdef CYGWIN
 #include <limits.h> /* PATH_MAX */
 #endif

lib/libalpm/util.h

@@ -26,13 +26,9 @@
 #define _ALPM_UTIL_H
 
 #include <stdio.h>
-#if defined(__OpenBSD__)
-#include "/usr/local/include/archive.h"
-#include "/usr/local/include/archive_entry.h"
-#else
+#include <libintl.h> /* here so it doesn't need to be included elsewhere */
 #include <archive.h>
 #include <archive_entry.h>
-#endif
 
 #define FREE(p) do { if (p) { free(p); p = NULL; } } while(0)
 
@@ -45,6 +41,7 @@
 
 #define ARCHIVE_EXTRACT_FLAGS ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_TIME
 
+/* define _() as shortcut for gettext() */
 #ifdef ENABLE_NLS
 #define _(str) dgettext ("libalpm", str)
 #else

lib/libalpm/versioncmp.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <libintl.h>
 
 /* libalpm */
 #include "versioncmp.h"

src/pacman/util.h

@@ -31,7 +31,11 @@
 #define UPDATE_SPEED_SEC 0.2f
 
 /* define _() as shortcut for gettext() */
+#ifdef ENABLE_NLS
 #define _(str) gettext(str)
+#else
+#define _(str) str
+#endif
 
 int getcols();
 int makepath(char *path);