| @@ -1,59 +1,65 @@ | | | @@ -1,59 +1,65 @@ |
1 | $NetBSD: patch-aa,v 1.2 2009/10/31 21:42:27 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.3 2016/06/18 11:30:35 mef Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2009-07-11 21:36:00.000000000 +0200 | | 3 | date: 2009-11-01 06:42:27 +0900; author: joerg; state: Exp; lines: +1 -10; |
4 | +++ configure | | 4 | Drop unneeded fragment from patch. |
5 | @@ -23533,23 +23533,7 @@ _ACEOF | | 5 | |
| | | 6 | date: 2009-10-30 01:25:57 +0900; author: joerg; state: Exp; |
| | | 7 | Do not stupidly insist on GNU gettext, thanks. |
| | | 8 | |
| | | 9 | --- configure.orig 2016-05-17 06:02:07.000000000 +0900 |
| | | 10 | +++ configure 2016-06-18 19:29:50.000000000 +0900 |
| | | 11 | @@ -18179,23 +18179,7 @@ $as_echo "#define HAVE_CFLOCALECOPYCURRE |
6 | | | 12 | |
7 | if test "$USE_NLS" = "yes"; then | | 13 | if test "$USE_NLS" = "yes"; then |
8 | gt_use_preinstalled_gnugettext=no | | 14 | gt_use_preinstalled_gnugettext=no |
9 | - | | 15 | - |
10 | - | | 16 | - |
11 | - if test $gt_api_version -ge 3; then | | 17 | - if test $gt_api_version -ge 3; then |
12 | - gt_revision_test_code=' | | 18 | - gt_revision_test_code=' |
13 | -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION | | 19 | -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
14 | -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) | | 20 | -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) |
15 | -#endif | | 21 | -#endif |
16 | -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; | | 22 | -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; |
17 | -' | | 23 | -' |
18 | - else | | 24 | - else |
19 | gt_revision_test_code= | | 25 | gt_revision_test_code= |
20 | - fi | | 26 | - fi |
21 | - if test $gt_api_version -ge 2; then | | 27 | - if test $gt_api_version -ge 2; then |
22 | - gt_expression_test_code=' + * ngettext ("", "", 0)' | | 28 | - gt_expression_test_code=' + * ngettext ("", "", 0)' |
23 | - else | | 29 | - else |
24 | - gt_expression_test_code= | | 30 | - gt_expression_test_code= |
25 | - fi | | 31 | - fi |
26 | | | 32 | |
27 | { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 | | 33 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 |
28 | $as_echo_n "checking for GNU gettext in libc... " >&6; } | | 34 | $as_echo_n "checking for GNU gettext in libc... " >&6; } |
29 | @@ -24366,15 +24350,11 @@ cat >>conftest.$ac_ext <<_ACEOF | | 35 | @@ -18883,15 +18867,11 @@ else |
30 | $gt_revision_test_code | | 36 | $gt_revision_test_code |
31 | extern int _nl_msg_cat_cntr; | | 37 | extern int _nl_msg_cat_cntr; |
32 | extern | | 38 | extern |
33 | -#ifdef __cplusplus | | 39 | -#ifdef __cplusplus |
34 | -"C" | | 40 | -"C" |
35 | -#endif | | 41 | -#endif |
36 | -const char *_nl_expand_alias (const char *); | | 42 | -const char *_nl_expand_alias (const char *); |
37 | int | | 43 | int |
38 | main () | | 44 | main () |
39 | { | | 45 | { |
40 | bindtextdomain ("", ""); | | 46 | bindtextdomain ("", ""); |
41 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") | | 47 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
42 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr | | 48 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr |
43 | ; | | 49 | ; |
44 | return 0; | | 50 | return 0; |
45 | } | | 51 | } |
46 | @@ -24423,15 +24403,11 @@ cat >>conftest.$ac_ext <<_ACEOF | | 52 | @@ -18911,15 +18891,11 @@ rm -f core conftest.err conftest.$ac_obj |
47 | $gt_revision_test_code | | 53 | $gt_revision_test_code |
48 | extern int _nl_msg_cat_cntr; | | 54 | extern int _nl_msg_cat_cntr; |
49 | extern | | 55 | extern |
50 | -#ifdef __cplusplus | | 56 | -#ifdef __cplusplus |
51 | -"C" | | 57 | -"C" |
52 | -#endif | | 58 | -#endif |
53 | -const char *_nl_expand_alias (const char *); | | 59 | -const char *_nl_expand_alias (const char *); |
54 | int | | 60 | int |
55 | main () | | 61 | main () |
56 | { | | 62 | { |
57 | bindtextdomain ("", ""); | | 63 | bindtextdomain ("", ""); |
58 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") | | 64 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
59 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr | | 65 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr |