| Patrick Williams | 975a06f | 2022-10-21 14:42:47 -0500 | [diff] [blame] | 1 | From 4fe9f6071cd24bcab157a9398adcca474f619f8d Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Kjellerstedt <pkj@axis.com> |
| 3 | Date: Sat, 15 Oct 2022 02:45:26 +0200 |
| 4 | Subject: [PATCH] configure.ac, Makefile.am: Support building without NLS |
| 5 | |
| 6 | Avoid entering the v4l-utils-po and libdvbv5-po directories if NLS |
| 7 | support is disabled, as the generated Makefiles in those directories are |
| 8 | empty then. |
| 9 | |
| 10 | Upstream-Status: Submitted [https://patchwork.linuxtv.org/project/linux-media/patch/20221015010541.688322-1-pkj@axis.com/] |
| 11 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
| 12 | --- |
| 13 | Makefile.am | 6 +++++- |
| 14 | configure.ac | 1 + |
| 15 | 2 files changed, 6 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/Makefile.am b/Makefile.am |
| 18 | index 7fb443ab..8e924af8 100644 |
| 19 | --- a/Makefile.am |
| 20 | +++ b/Makefile.am |
| 21 | @@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign |
| 22 | ACLOCAL_AMFLAGS = -I m4 |
| 23 | AM_MAKEFLAGS = $(word 1, $(subst 1, -w, $(filter 1, $(V))) --no-print-directory) |
| 24 | |
| 25 | -SUBDIRS = v4l-utils-po libdvbv5-po lib |
| 26 | +SUBDIRS = lib |
| 27 | + |
| 28 | +if USE_NLS |
| 29 | +SUBDIRS += v4l-utils-po libdvbv5-po |
| 30 | +endif |
| 31 | |
| 32 | if WITH_V4LUTILS |
| 33 | SUBDIRS += utils contrib |
| 34 | diff --git a/configure.ac b/configure.ac |
| 35 | index 05298981..7c78467f 100644 |
| 36 | --- a/configure.ac |
| 37 | +++ b/configure.ac |
| 38 | @@ -99,6 +99,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg) |
| 39 | ALL_LINGUAS="" |
| 40 | m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])]) |
| 41 | AM_GNU_GETTEXT([external]) |
| 42 | +AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = "yes"]) |
| 43 | |
| 44 | LIBDVBV5_DOMAIN="libdvbv5" |
| 45 | AC_DEFINE([LIBDVBV5_DOMAIN], "libdvbv5", [libdvbv5 domain]) |