From 9dc666526f6e2ddab539763cdd304ff254f67d47 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 8 Nov 2005 16:43:36 +0000 Subject: [PATCH] Disable NLS support when --disable-nls is passed Disable NLS support when --disable-nls is passed (bug#1514). --- aplay/aplay.c | 2 ++ seq/aconnect/aconnect.c | 2 ++ seq/aseqnet/aseqnet.c | 2 ++ speaker-test/speaker-test.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/aplay/aplay.c b/aplay/aplay.c index 69cb345..04df6e8 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -364,8 +364,10 @@ int main(int argc, char *argv[]) int do_names_list = 0, do_device_list = 0, do_pcm_list = 0; snd_pcm_info_t *info; +#ifdef ENABLE_NLS setlocale(LC_ALL, ""); textdomain(PACKAGE); +#endif snd_pcm_info_alloca(&info); diff --git a/seq/aconnect/aconnect.c b/seq/aconnect/aconnect.c index 2d40bf5..bab501a 100644 --- a/seq/aconnect/aconnect.c +++ b/seq/aconnect/aconnect.c @@ -279,8 +279,10 @@ int main(int argc, char **argv) snd_seq_port_subscribe_t *subs; snd_seq_addr_t sender, dest; +#ifdef ENABLE_NLS setlocale(LC_ALL, ""); textdomain(PACKAGE); +#endif while ((c = getopt_long(argc, argv, "dior:t:elx", long_option, NULL)) != -1) { switch (c) { diff --git a/seq/aseqnet/aseqnet.c b/seq/aseqnet/aseqnet.c index 35b5cc8..9cb61c2 100644 --- a/seq/aseqnet/aseqnet.c +++ b/seq/aseqnet/aseqnet.c @@ -98,8 +98,10 @@ int main(int argc, char **argv) int port = DEFAULT_PORT; char *source = NULL, *dest = NULL; +#ifdef ENABLE_NLS setlocale(LC_ALL, ""); textdomain(PACKAGE); +#endif while ((c = getopt_long(argc, argv, "p:s:d:vi", long_option, NULL)) != -1) { switch (c) { diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c index 57603dd..f15645f 100644 --- a/speaker-test/speaker-test.c +++ b/speaker-test/speaker-test.c @@ -530,8 +530,10 @@ int main(int argc, char *argv[]) { {NULL, 0, NULL, 0 }, }; +#ifdef ENABLE_NLS setlocale(LC_ALL, ""); textdomain(PACKAGE); +#endif snd_pcm_hw_params_alloca(&hwparams); snd_pcm_sw_params_alloca(&swparams);