| @@ -1,71 +1,62 @@ | | | @@ -1,71 +1,62 @@ |
1 | $NetBSD: patch-aa,v 1.1 2009/10/29 16:25:57 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.2 2009/10/31 21:42:27 joerg Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2009-07-11 21:36:00.000000000 +0200 | | 3 | --- configure.orig 2009-07-11 21:36:00.000000000 +0200 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -23533,23 +23533,7 @@ _ACEOF | | 5 | @@ -23533,23 +23533,7 @@ _ACEOF |
6 | | | 6 | |
7 | if test "$USE_NLS" = "yes"; then | | 7 | if test "$USE_NLS" = "yes"; then |
8 | gt_use_preinstalled_gnugettext=no | | 8 | gt_use_preinstalled_gnugettext=no |
9 | - | | 9 | - |
10 | - | | 10 | - |
11 | - if test $gt_api_version -ge 3; then | | 11 | - if test $gt_api_version -ge 3; then |
12 | - gt_revision_test_code=' | | 12 | - gt_revision_test_code=' |
13 | -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION | | 13 | -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
14 | -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) | | 14 | -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) |
15 | -#endif | | 15 | -#endif |
16 | -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; | | 16 | -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; |
17 | -' | | 17 | -' |
18 | - else | | 18 | - else |
19 | gt_revision_test_code= | | 19 | gt_revision_test_code= |
20 | - fi | | 20 | - fi |
21 | - if test $gt_api_version -ge 2; then | | 21 | - if test $gt_api_version -ge 2; then |
22 | - gt_expression_test_code=' + * ngettext ("", "", 0)' | | 22 | - gt_expression_test_code=' + * ngettext ("", "", 0)' |
23 | - else | | 23 | - else |
24 | - gt_expression_test_code= | | 24 | - gt_expression_test_code= |
25 | - fi | | 25 | - fi |
26 | | | 26 | |
27 | { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 | | 27 | { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 |
28 | $as_echo_n "checking for GNU gettext in libc... " >&6; } | | 28 | $as_echo_n "checking for GNU gettext in libc... " >&6; } |
29 | @@ -24366,15 +24350,11 @@ cat >>conftest.$ac_ext <<_ACEOF | | 29 | @@ -24366,15 +24350,11 @@ cat >>conftest.$ac_ext <<_ACEOF |
30 | $gt_revision_test_code | | 30 | $gt_revision_test_code |
31 | extern int _nl_msg_cat_cntr; | | 31 | extern int _nl_msg_cat_cntr; |
32 | extern | | 32 | extern |
33 | -#ifdef __cplusplus | | 33 | -#ifdef __cplusplus |
34 | -"C" | | 34 | -"C" |
35 | -#endif | | 35 | -#endif |
36 | -const char *_nl_expand_alias (const char *); | | 36 | -const char *_nl_expand_alias (const char *); |
37 | int | | 37 | int |
38 | main () | | 38 | main () |
39 | { | | 39 | { |
40 | bindtextdomain ("", ""); | | 40 | bindtextdomain ("", ""); |
41 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") | | 41 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
42 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr | | 42 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr |
43 | ; | | 43 | ; |
44 | return 0; | | 44 | return 0; |
45 | } | | 45 | } |
46 | @@ -24423,15 +24403,11 @@ cat >>conftest.$ac_ext <<_ACEOF | | 46 | @@ -24423,15 +24403,11 @@ cat >>conftest.$ac_ext <<_ACEOF |
47 | $gt_revision_test_code | | 47 | $gt_revision_test_code |
48 | extern int _nl_msg_cat_cntr; | | 48 | extern int _nl_msg_cat_cntr; |
49 | extern | | 49 | extern |
50 | -#ifdef __cplusplus | | 50 | -#ifdef __cplusplus |
51 | -"C" | | 51 | -"C" |
52 | -#endif | | 52 | -#endif |
53 | -const char *_nl_expand_alias (const char *); | | 53 | -const char *_nl_expand_alias (const char *); |
54 | int | | 54 | int |
55 | main () | | 55 | main () |
56 | { | | 56 | { |
57 | bindtextdomain ("", ""); | | 57 | bindtextdomain ("", ""); |
58 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") | | 58 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
59 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr | | 59 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr |
60 | ; | | 60 | ; |
61 | return 0; | | 61 | return 0; |
62 | } | | 62 | } |
63 | @@ -25208,6 +25184,8 @@ do | | | |
64 | case $ac_option in | | | |
65 | # Handling of the options. | | | |
66 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | | | |
67 | + : Avoid regenerating within pkgsrc | | | |
68 | + exit 0 | | | |
69 | ac_cs_recheck=: ;; | | | |
70 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | | | |
71 | $as_echo "$ac_cs_version"; exit ;; | | | |