Fixing libintl problems on macos

README.md

@@ -167,16 +167,17 @@ Install
 
 	```shell
 	brew update
-	brew install xz binutils coreutils curl gettext libtool openssl pkgconfig meson ninja
+	brew install xz meson ninja curl gettext openssl pkgconfig
 	brew upgrade
 	```
 
-4. Configure, build and install
+4. Configure, build and install *REVISION PENDING*
 
 	```shell
 	export PKG_CONFIG_PATH="$(brew --prefix curl)/lib/pkgconfig:$(brew --prefix openssl)/lib/pkgconfig"
-	./autogen.sh --prefix="$(brew --cellar)/lib3270/5.4" --with-libiconv-prefix=$(brew --prefix gettext)
-	make all && make install
+	meson setup --reconfigure --wipe .build
+	meson compile -C .build
+	meson install -C .build
 	brew link lib3270
 	```
 

src/include/private/intl.h

@@ -29,7 +29,8 @@
 	#include <libintl.h>
 	#define _( x ) 			dgettext(GETTEXT_PACKAGE,x)
 	#define N_( x ) 		x
-	#else
+ #else
 	#define _( x ) 			x
 	#define N_( x ) 		x
+	#define dgettext(p,x)	x
  #endif // HAVE_LIBINTL

src/library/ft/ft.c

@@ -42,6 +42,7 @@
 #include <lib3270/log.h>
 #include <internals.h>
 #include <lib3270/trace.h>
+#include <private/intl.h>
 
 #include <errno.h>
 

src/library/init.c

@@ -101,7 +101,7 @@ int lib3270_loaded(void) {
 	ansictl.vrprnt  = parse_ctlchar("^R");
 	ansictl.vlnext  = parse_ctlchar("^V");
 
-#ifdef _WIN32
+#if defined(_WIN32)
 	{
 		char lpFilename[4096];
 
@@ -116,11 +116,13 @@ int lib3270_loaded(void) {
 		strncat(lpFilename,"locale",4095);
 		bindtextdomain(GETTEXT_PACKAGE,lpFilename);
 	}
-#else
+#elif defined(HAVE_LIBINTL)
 	bindtextdomain(GETTEXT_PACKAGE, LIB3270_STRINGIZE_VALUE_OF(LOCALEDIR));
 #endif // _WIN32
 
+#if defined(HAVE_LIBINTL)
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+#endif // HAVE_LIBINTL
 
 #ifdef HAVE_LIBCURL
 	trace("%s.curl_global_init",__FUNCTION__);