Annotation of pkgsrc/inputmethod/libtabe/patches/patch-aa, revision 1.2
1.2 ! jlam 1: $NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:47:55 jlam Exp $
1.1 uebayasi 2:
3: --- configure.orig Tue Dec 4 23:05:00 2001
4: +++ configure Fri Dec 7 23:17:32 2001
5: @@ -5477,6 +5477,37 @@
6: done
7:
8:
9: +echo $ac_n "checking DB3 API""... $ac_c" 1>&6
10: +echo "configure:5482: checking DB3 API" >&5
11: +if test x$USE_DB = xDB3; then
12: + cat > conftest.$ac_ext <<EOF
13: +#line 5485 "configure"
14: +#include "confdefs.h"
15: +
16: +#include <stdlib.h>
17: +#include <db.h>
18: +int main() {
19: +
20: +DB dbs;
21: +dbs.stat(&dbs, NULL, 0);
22: +; return 0; }
23: +EOF
24: +if { (eval echo configure:5496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
25: + rm -rf conftest*
26: + cat >> confdefs.h <<\EOF
27: +#define HAVE_DB3_STAT3 1
28: +EOF
29: +
30: + echo "$ac_t""DB->stat() take 3 arguements." 1>&6
31: +else
32: + echo "configure: failed program was:" >&5
33: + cat conftest.$ac_ext >&5
34: + rm -rf conftest*
35: + echo "$ac_t""DB->stat() take 4 arguements." 1>&6
36: +fi
37: +rm -f conftest*
38: +fi
39: +
40: if test x$with_db_lib = x; then
41: with_db_lib="$test_db_lib"
42: else
43: @@ -5497,7 +5528,7 @@
44: # Uses ac_ vars as temps to allow command line to override cache and checks.
45: # --without-x overrides everything else, but does not touch the cache.
46: echo $ac_n "checking for X""... $ac_c" 1>&6
47: -echo "configure:5501: checking for X" >&5
48: +echo "configure:5532: checking for X" >&5
49:
50: # Check whether --with-x or --without-x was given.
51: if test "${with_x+set}" = set; then
52: @@ -5559,12 +5590,12 @@
53:
54: # First, try using that file with no special directory specified.
55: cat > conftest.$ac_ext <<EOF
56: -#line 5563 "configure"
57: +#line 5594 "configure"
58: #include "confdefs.h"
59: #include <$x_direct_test_include>
60: EOF
61: ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
62: -{ (eval echo configure:5568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63: +{ (eval echo configure:5599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
64: ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
65: if test -z "$ac_err"; then
66: rm -rf conftest*
67: @@ -5633,14 +5664,14 @@
68: ac_save_LIBS="$LIBS"
69: LIBS="-l$x_direct_test_library $LIBS"
70: cat > conftest.$ac_ext <<EOF
71: -#line 5637 "configure"
72: +#line 5668 "configure"
73: #include "confdefs.h"
74:
75: int main() {
76: ${x_direct_test_function}()
77: ; return 0; }
78: EOF
79: -if { (eval echo configure:5644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
80: +if { (eval echo configure:5675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
81: rm -rf conftest*
82: LIBS="$ac_save_LIBS"
83: # We can link X programs with no special library path.
84: @@ -5735,12 +5766,12 @@
85:
86:
87: echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
88: -echo "configure:5739: checking for ANSI C header files" >&5
89: +echo "configure:5770: checking for ANSI C header files" >&5
90: if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
91: echo $ac_n "(cached) $ac_c" 1>&6
92: else
93: cat > conftest.$ac_ext <<EOF
94: -#line 5744 "configure"
95: +#line 5775 "configure"
96: #include "confdefs.h"
97: #include <stdlib.h>
98: #include <stdarg.h>
99: @@ -5748,7 +5779,7 @@
100: #include <float.h>
101: EOF
102: ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
103: -{ (eval echo configure:5752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
104: +{ (eval echo configure:5783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
105: ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
106: if test -z "$ac_err"; then
107: rm -rf conftest*
108: @@ -5765,7 +5796,7 @@
109: if test $ac_cv_header_stdc = yes; then
110: # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
111: cat > conftest.$ac_ext <<EOF
112: -#line 5769 "configure"
113: +#line 5800 "configure"
114: #include "confdefs.h"
115: #include <string.h>
116: EOF
117: @@ -5783,7 +5814,7 @@
118: if test $ac_cv_header_stdc = yes; then
119: # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
120: cat > conftest.$ac_ext <<EOF
121: -#line 5787 "configure"
122: +#line 5818 "configure"
123: #include "confdefs.h"
124: #include <stdlib.h>
125: EOF
126: @@ -5804,7 +5835,7 @@
127: :
128: else
129: cat > conftest.$ac_ext <<EOF
130: -#line 5808 "configure"
131: +#line 5839 "configure"
132: #include "confdefs.h"
133: #include <ctype.h>
134: #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
135: @@ -5815,7 +5846,7 @@
136: exit (0); }
137:
138: EOF
139: -if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
140: +if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
141: then
142: :
143: else
144: @@ -5842,17 +5873,17 @@
145: do
146: ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
147: echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
148: -echo "configure:5846: checking for $ac_hdr" >&5
149: +echo "configure:5877: checking for $ac_hdr" >&5
150: if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
151: echo $ac_n "(cached) $ac_c" 1>&6
152: else
153: cat > conftest.$ac_ext <<EOF
154: -#line 5851 "configure"
155: +#line 5882 "configure"
156: #include "confdefs.h"
157: #include <$ac_hdr>
158: EOF
159: ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
160: -{ (eval echo configure:5856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
161: +{ (eval echo configure:5887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
162: ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
163: if test -z "$ac_err"; then
164: rm -rf conftest*
165: @@ -5880,12 +5911,12 @@
166:
167:
168: echo $ac_n "checking for working const""... $ac_c" 1>&6
169: -echo "configure:5884: checking for working const" >&5
170: +echo "configure:5915: checking for working const" >&5
171: if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
172: echo $ac_n "(cached) $ac_c" 1>&6
173: else
174: cat > conftest.$ac_ext <<EOF
175: -#line 5889 "configure"
176: +#line 5920 "configure"
177: #include "confdefs.h"
178:
179: int main() {
180: @@ -5934,7 +5965,7 @@
181:
182: ; return 0; }
183: EOF
184: -if { (eval echo configure:5938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
185: +if { (eval echo configure:5969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
186: rm -rf conftest*
187: ac_cv_c_const=yes
188: else
189: @@ -5956,7 +5987,7 @@
190:
191:
192: echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
193: -echo "configure:5960: checking for 8-bit clean memcmp" >&5
194: +echo "configure:5991: checking for 8-bit clean memcmp" >&5
195: if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
196: echo $ac_n "(cached) $ac_c" 1>&6
197: else
198: @@ -5964,7 +5995,7 @@
199: ac_cv_func_memcmp_clean=no
200: else
201: cat > conftest.$ac_ext <<EOF
202: -#line 5968 "configure"
203: +#line 5999 "configure"
204: #include "confdefs.h"
205:
206: main()
207: @@ -5974,7 +6005,7 @@
208: }
209:
210: EOF
211: -if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
212: +if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
213: then
214: ac_cv_func_memcmp_clean=yes
215: else
216: @@ -5994,12 +6025,12 @@
217: for ac_func in strdup strerror strstr
218: do
219: echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
220: -echo "configure:5998: checking for $ac_func" >&5
221: +echo "configure:6029: checking for $ac_func" >&5
222: if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
223: echo $ac_n "(cached) $ac_c" 1>&6
224: else
225: cat > conftest.$ac_ext <<EOF
226: -#line 6003 "configure"
227: +#line 6034 "configure"
228: #include "confdefs.h"
229: /* System header to define __stub macros and hopefully few prototypes,
230: which can conflict with char $ac_func(); below. */
231: @@ -6022,7 +6053,7 @@
232:
233: ; return 0; }
234: EOF
235: -if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
236: +if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
237: rm -rf conftest*
238: eval "ac_cv_func_$ac_func=yes"
239: else
240: --- script/acconfig.h.orig Mon Aug 20 11:53:03 2001
241: +++ script/acconfig.h Fri Dec 7 23:13:28 2001
242: @@ -21,6 +21,8 @@
243:
244: #undef HAVE_DB3
245:
246: +#undef HAVE_DB3_STAT3
247: +
248: #undef LINUX
249:
250: #undef FREEBSD
251: --- script/config.h.in.orig Sat Oct 20 19:22:07 2001
252: +++ script/config.h.in Fri Dec 7 23:17:32 2001
253: @@ -13,6 +13,8 @@
254:
255: #undef HAVE_DB3
256:
257: +#undef HAVE_DB3_STAT3
258: +
259: #undef LINUX
260:
261: #undef FREEBSD
262: --- script/configure.in.orig Tue Dec 4 23:05:00 2001
263: +++ script/configure.in Fri Dec 7 23:17:29 2001
264: @@ -178,6 +178,18 @@
265: AC_MSG_RESULT([Please use --with-db-inc to configure.])
266: exit 1 ])
267:
268: +AC_MSG_CHECKING([DB3 API])
269: +if test x$USE_DB = xDB3; then
270: + AC_TRY_LINK([
271: +#include <stdlib.h>
272: +#include <db.h>], [
273: +DB dbs;
274: +dbs.stat(&dbs, NULL, 0); ],
275: + [ AC_DEFINE(HAVE_DB3_STAT3)
276: + AC_MSG_RESULT([DB->stat() take 3 arguements.]) ],
277: + [ AC_MSG_RESULT([DB->stat() take 4 arguements.]) ])
278: +fi
279: +
280: if test x$with_db_lib = x; then
281: with_db_lib="$test_db_lib"
282: else
283: --- src/tabe_tsidbint.c.orig Sun Nov 11 19:15:46 2001
284: +++ src/tabe_tsidbint.c Fri Dec 7 23:13:15 2001
285: @@ -265,7 +265,11 @@
286: switch(tsidb->type) {
287: case DB_TYPE_DB:
288: dbp = (DB *)tsidb->dbp;
289: +#ifdef HAVE_DB3_STAT3
290: + errno = dbp->stat(dbp, &sp, 0);
291: +#else
292: errno = dbp->stat(dbp, &sp, NULL, 0);
293: +#endif
294: if (!errno) {
295: #ifndef HAVE_DB3
296: return(sp->bt_nrecs);
297: --- src/tabe_tsiyindbint.c.orig Sun Nov 11 19:16:32 2001
298: +++ src/tabe_tsiyindbint.c Fri Dec 7 23:15:21 2001
299: @@ -268,7 +268,11 @@
300: switch(tsiyindb->type) {
301: case DB_TYPE_DB:
302: dbp = (DB *)tsiyindb->dbp;
303: +#ifdef HAVE_DB3_STAT3
304: + errno = dbp->stat(dbp, &sp, 0);
305: +#else
306: errno = dbp->stat(dbp, &sp, NULL, 0);
307: +#endif
308: if (!errno) {
309: #ifndef HAVE_DB3
310: return(sp->bt_nrecs);
CVSweb <webmaster@jp.NetBSD.org>