Fix/improve i18n related thing

This contains a fix of the build fail with enabling
NLS support on BSD-based system.

Fixes dov#59

configure.ac

@@ -26,7 +26,8 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Package name for gettext.])
 
 ALL_LINGUAS=""
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.19.7])
+AM_GNU_GETTEXT([external])
 
 datadir='${prefix}/${DATADIRNAME}'
 AC_SUBST(datadir)

meson.build

@@ -41,8 +41,8 @@ endif
 # This is available pretty much everywhere
 cdata.set('HAVE_STRINGIZE', 1)
 
-# Assume we have nls, since paps doesn't compile without it
-cdata.set('ENABLE_NLS',1)
+# i18n support
+i18n = import('i18n')
 
 # Not really sure what this is used for, but paps doesn't compile without it.
 cdata.set_quoted('DATADIR','.')
@@ -69,3 +69,4 @@ install_data(['scripts/src-to-paps'],
              install_dir : 'bin')
 
 subdir('src')
+subdir('po')

po/meson.build

@@ -0,0 +1 @@
+i18n.gettext(meson.project_name())

src/paps.cc

@@ -51,7 +51,7 @@ using namespace fmt;
 #endif
 #include <wchar.h>
 
-#if ENABLE_NLS
+#ifdef ENABLE_NLS
 #include <libintl.h>
 
 #define	_(str)		gettext(str)
@@ -700,9 +700,11 @@ int main(int argc, char *argv[])
   (void) setlocale(LC_ALL, "");
 
   /* Setup i18n */
+#ifdef ENABLE_NLS
   textdomain(GETTEXT_PACKAGE);
   bindtextdomain(GETTEXT_PACKAGE, DATADIR "/locale");
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
 
   /* Setup the paps glyph face */
   paps_glyph_face = cairo_user_font_face_create();