Factor out i18n stuff into separate i18n.h files

Factor out the i18n definitions into i18n.h include files:
One include file each for libgphoto2 and for libgphoto2_port.

This removes the complete

    #ifdef ENABLE_NLS
    #  include <libintl.h>
    #  undef _
    #  define _(String) dgettext (GETTEXT_PACKAGE, String)
    #  ifdef gettext_noop
    #    define N_(String) gettext_noop (String)
    #  else
    #    define N_(String) (String)
    #  endif
    #else
    #  define _(String) (String)
    #  define N_(String) (String)
    #endif

block (which in some occasions defines even more macros)
and replaces it with a single line

    #include "libgphoto2/i18n.h"

for camlibs and libgphoto2 itself and with

    #include "libgphoto2_port/i18n.h"

for iolibs and libgphoto2_port itself.

This gives us two central locations to change the defintions.

6 files changed, 39 insertions, 70 deletions

diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am
index dde166998..18809dcfb 100644
--- a/libgphoto2/Makefile.am
+++ b/libgphoto2/Makefile.am
@@ -55,3 +55,5 @@ libgphoto2_la_DEPENDENCIES = \
 	$(srcdir)/libgphoto2.sym
 
 EXTRA_DIST = gphoto2-library.c libgphoto2.sym
+
+EXTRA_DIST += i18n.h
diff --git a/libgphoto2/gphoto2-abilities-list.c b/libgphoto2/gphoto2-abilities-list.c
index 0657e2f41..34292bf10 100644
--- a/libgphoto2/gphoto2-abilities-list.c
+++ b/libgphoto2/gphoto2-abilities-list.c
@@ -36,25 +36,8 @@
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-library.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define bind_textdomain_codeset(Domain,Charset) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 /** \internal */
 #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);}
@@ -85,7 +68,7 @@ const char*
 gp_message_codeset (const char *codeset)
 {
 	gp_port_message_codeset (codeset);
-	return bind_textdomain_codeset (GETTEXT_PACKAGE, codeset);
+	return bind_textdomain_codeset (GETTEXT_PACKAGE_LIBGPHOTO2, codeset);
 }
 
 /**
@@ -109,7 +92,7 @@ gp_abilities_list_new (CameraAbilitiesList **list)
 	 * an other way without introducing a global initialization
 	 * function...
 	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE_LIBGPHOTO2, LOCALEDIR);
 
 	C_MEM (*list = calloc (1, sizeof (CameraAbilitiesList)));
 
diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c
index 36cbeb46c..91828df46 100644
--- a/libgphoto2/gphoto2-camera.c
+++ b/libgphoto2/gphoto2-camera.c
@@ -38,24 +38,8 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #define CAMERA_UNUSED(c,ctx)						\
 {									\
diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c
index 4b98bdfc9..eabb48931 100644
--- a/libgphoto2/gphoto2-filesys.c
+++ b/libgphoto2/gphoto2-filesys.c
@@ -42,24 +42,8 @@
 #  include <libexif/exif-data.h>
 #endif
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #ifndef PATH_MAX
 # define PATH_MAX 4096
diff --git a/libgphoto2/gphoto2-result.c b/libgphoto2/gphoto2-result.c
index 0f37bcefd..5b9770dc9 100644
--- a/libgphoto2/gphoto2-result.c
+++ b/libgphoto2/gphoto2-result.c
@@ -26,19 +26,8 @@
 
 #include <stddef.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#      define N_(String) gettext_noop (String)
-#  else
-#      define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 static struct {
 	int result;
diff --git a/libgphoto2/i18n.h b/libgphoto2/i18n.h
new file mode 100644
index 000000000..03862b791
--- /dev/null
+++ b/libgphoto2/i18n.h
@@ -0,0 +1,27 @@
+#ifndef LIBGPHOTO2_I18N_H
+#define LIBGPHOTO2_I18N_H
+
+#include "config.h"
+
+#ifdef ENABLE_NLS
+#  include <libintl.h>
+#  undef _
+#  define _(String) dgettext (GETTEXT_PACKAGE_LIBGPHOTO2, String)
+#  ifdef gettext_noop
+#      define N_(String) gettext_noop (String)
+#  else
+#      define N_(String) (String)
+#  endif
+#else
+#  define N_(String) (String)
+#  define _(String) (String)
+#  define bind_textdomain_codeset(Domain, codeset) (codeset)
+#  define bindtextdomain(Domain, Directory) (Domain)
+#  define dcgettext(Domain, Message, Type) (Message)
+#  define dgettext(Domain, Message) (Message)
+#  define gettext(String) (String)
+#  define ngettext(String1, String2, Count) ((Count==1)?String1:String2)
+#  define textdomain(String) (String)
+#endif
+
+#endif /* !defined(LIBGPHOTO2_I18N_H) */