gettext is now optional

CMakeLists.txt

@@ -38,12 +38,16 @@ target_link_libraries(httping ${OPENSSL_LIBRARIES})
 target_include_directories(httping PUBLIC ${OPENSSL_INCLUDE_DIRS})
 target_compile_options(httping PUBLIC ${OPENSSL_CFLAGS_OTHER})
 
+if (USE_GETTEXT)
+add_definitions(-DUSE_GETTEXT=1)
+
 execute_process (
     COMMAND bash -c "msgfmt -o nl.mo ${CMAKE_SOURCE_DIR}/nl.po"
 )
 execute_process (
     COMMAND bash -c "msgfmt -o ru.mo ${CMAKE_SOURCE_DIR}/ru.po"
 )
+endif ()
 
 configure_file(config.h.in config.h)
 target_include_directories(httping PUBLIC "${PROJECT_BINARY_DIR}")
@@ -52,5 +56,7 @@ include(GNUInstallDirs)
 install(TARGETS httping DESTINATION bin)
 install(FILES README.md LICENSE plot-json.py DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES httping.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
+if (USE_GETTEXT)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nl.mo DESTINATION ${CMAKE_INSTALL_LOCALEDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ru.mo DESTINATION ${CMAKE_INSTALL_LOCALEDIR})
+endif ()

README.md

@@ -15,4 +15,5 @@ If you would like the TUI (text user interface) to be included (for -K),
 use:
 * cmake -DUSE_TUI=1 ..
 
-
+If you want httping to use local translations, add "-DUSE_GETTEXT=1" to
+the cmake commandline.

error.c

@@ -1,6 +1,6 @@
 /* Released under AGPL v3 with exception for the OpenSSL library. See license.txt */
 
-#include <libintl.h>
+#include "gen.h"
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>

fft.c

@@ -1,6 +1,6 @@
 #include "config.h"
 #if HAVE_FFTW3
-#include <libintl.h>
+#include "gen.h"
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>

gen.h

@@ -28,6 +28,12 @@
 #define min(x, y) ((x) < (y) ? (x) : (y))
 #define max(x, y) ((x) > (y) ? (x) : (y))
 
+#if USE_GETTEXT
+#include <libintl.h>
+#else
+#define gettext(x) (x)
+#endif
+
 typedef struct
 {
 	double cur, min, avg, max, sd, med;

help.c

@@ -1,5 +1,5 @@
 #include "config.h"
-#include <libintl.h>
+#include "gen.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

io.c

@@ -1,7 +1,7 @@
 /* Released under AGPL v3 with exception for the OpenSSL library. See license.txt */
 
 #include <errno.h>
-#include <libintl.h>
+#include "gen.h"
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>

main.c

@@ -5,7 +5,7 @@
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <locale.h>
-#include <libintl.h>
+#include "gen.h"
 #include <stdlib.h>
 #include <errno.h>
 #include <math.h>

mssl.c

@@ -2,7 +2,7 @@
 #include "config.h"
 #ifndef NO_SSL
 #include <errno.h>
-#include <libintl.h>
+#include "gen.h"
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>

nc.c

@@ -2,7 +2,7 @@
 #if HAVE_NCURSES
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <libintl.h>
+#include "gen.h"
 #include <math.h>
 #include <poll.h>
 #include <stdarg.h>

res.c

@@ -4,7 +4,7 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <libintl.h>
+#include "gen.h"
 #include <netdb.h>
 #include <errno.h>
 #include <stdio.h>

socks5.c

@@ -1,4 +1,4 @@
-#include <libintl.h>
+#include "gen.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

tcp.c

@@ -6,7 +6,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <libintl.h>
+#include "gen.h"
 #include <netdb.h>
 #include <errno.h>
 #include <stdio.h>

utils.c

@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
-#include <libintl.h>
+#include "gen.h"
 
 #include "error.h"
 #include "utils.h"