mirror of OpenBSD xenocara tree
github.com/openbsd/xenocara
openbsd
Update to xwininfo 1.1.5
+1631
-406
+92
app/xwininfo/ChangeLog
+92
app/xwininfo/ChangeLog
···
1
+
commit 985a3a70918038bf2569e0a5ebe3fa14d720e4de
2
+
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
3
+
Date: Sun Jul 14 13:51:36 2019 -0700
4
+
5
+
xwininfo 1.1.5
6
+
7
+
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
8
+
9
+
commit 1a50edf62c9511a2bee8b7cc3b72e5185f7b593f
10
+
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
11
+
Date: Sun Jun 9 10:21:39 2019 -0700
12
+
13
+
Clear -Wsign-compare warnings from gcc 7.3
14
+
15
+
dsimple.c: In function ‘recursive_Window_With_Name’:
16
+
dsimple.c:298:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
17
+
if ((namelen == prop_name_len) &&
18
+
^~
19
+
dsimple.c:336:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
20
+
if ((namelen == prop_name_len) &&
21
+
^~
22
+
dsimple.c:371:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
23
+
for (i = 0; i < nchildren; i++) {
24
+
^
25
+
dsimple.c:380:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
26
+
for (i = 0; i < nchildren; i++) {
27
+
^
28
+
dsimple.c:390:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
29
+
for (/* keep previous i */; i < nchildren; i++) {
30
+
^
31
+
dsimple.c: In function ‘Get_Atom’:
32
+
dsimple.c:616:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
33
+
if (a->atom == -1) /* internal error */
34
+
^~
35
+
36
+
xwininfo.c: In function ‘wm_size_hints_reply’:
37
+
xwininfo.c:730:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
38
+
if (length > sizeof(wm_size_hints_t))
39
+
^
40
+
xwininfo.c: In function ‘Display_Event_Mask’:
41
+
xwininfo.c:1229:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
42
+
for (bit=0, bit_mask=1; bit < sizeof(long)*8; bit++, bit_mask <<= 1)
43
+
^
44
+
xwininfo.c: In function ‘wm_hints_reply’:
45
+
xwininfo.c:1633:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
46
+
if (length > sizeof(wm_hints_t))
47
+
^
48
+
xwininfo.c: In function ‘is_valid_utf8’:
49
+
xwininfo.c:1843:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
50
+
for (i = 0; i < len; i++) {
51
+
^
52
+
53
+
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
54
+
55
+
commit 58213a0cd39dc4ba044f48fab52ed3256ab9a9bd
56
+
Author: Stéphane Aulery <lkppo@free.fr>
57
+
Date: Wed Jul 3 00:29:17 2013 +0200
58
+
59
+
Improve manpage and -h option
60
+
61
+
- Rename windows and display args.
62
+
- Mention of short (-d) -display option.
63
+
64
+
Signed-off-by: Stéphane Aulery <lkppo@free.fr>
65
+
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
66
+
67
+
commit d19200c0b0ff638edbb16555e711d2353625bd4a
68
+
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
69
+
Date: Wed Nov 21 17:21:49 2018 -0800
70
+
71
+
Update configure.ac bug URL for gitlab migration
72
+
73
+
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
74
+
75
+
commit 015b29ca761102c95c722928557336e101a4a6e1
76
+
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
77
+
Date: Fri Nov 16 23:32:24 2018 -0800
78
+
79
+
Update README for gitlab migration
80
+
81
+
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
82
+
83
+
commit f8c9f340421883f659b820214ddf8a21d5022a3a
84
+
Author: David Hill <dhill@mindcry.org>
85
+
Date: Wed Dec 11 04:05:19 2013 +0000
86
+
87
+
In Find_Client, if (win == XCB_WINDOW_NONE), roots should be freed.
88
+
89
+
https://bugs.freedesktop.org/show_bug.cgi?id=72583
90
+
91
+
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
92
+
1
93
commit 919665db8ceb8e2c38a1a4ce4686eb224ddf5234
2
94
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
3
95
Date: Fri Mar 9 20:41:31 2018 -0800
+1
-1
app/xwininfo/Makefile.am
+1
-1
app/xwininfo/Makefile.am
+2
-2
app/xwininfo/Makefile.in
+2
-2
app/xwininfo/Makefile.in
···
73
73
host_triplet = @host@
74
74
bin_PROGRAMS = xwininfo$(EXEEXT)
75
75
subdir = .
76
-
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
76
+
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
77
77
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
78
78
$(top_srcdir)/configure COPYING ChangeLog INSTALL compile \
79
79
config.guess config.rpath config.sub depcomp install-sh \
···
323
323
dsimple.h \
324
324
xwininfo.c
325
325
326
-
EXTRA_DIST = strnlen.h
326
+
EXTRA_DIST = strnlen.h README.md
327
327
MAINTAINERCLEANFILES = ChangeLog INSTALL
328
328
all: config.h
329
329
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-26
app/xwininfo/README
-26
app/xwininfo/README
···
1
-
xwininfo prints information about windows on an X server.
2
-
Various information is displayed depending on which options are selected.
3
-
4
-
All questions regarding this software should be directed at the
5
-
Xorg mailing list:
6
-
7
-
http://lists.freedesktop.org/mailman/listinfo/xorg
8
-
9
-
Please submit bug reports to the Xorg bugzilla:
10
-
11
-
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
12
-
13
-
The master development code repository can be found at:
14
-
15
-
git://anongit.freedesktop.org/git/xorg/app/xwininfo
16
-
17
-
http://cgit.freedesktop.org/xorg/app/xwininfo
18
-
19
-
For patch submission instructions, see:
20
-
21
-
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
22
-
23
-
For more information on the git code manager, see:
24
-
25
-
http://wiki.x.org/wiki/GitPage
26
-
+18
app/xwininfo/README.md
+18
app/xwininfo/README.md
···
1
+
xwininfo prints information about windows on an X server.
2
+
Various information is displayed depending on which options are selected.
3
+
4
+
All questions regarding this software should be directed at the
5
+
Xorg mailing list:
6
+
7
+
https://lists.x.org/mailman/listinfo/xorg
8
+
9
+
The master development code repository can be found at:
10
+
11
+
https://gitlab.freedesktop.org/xorg/app/xwininfo
12
+
13
+
Please submit bug reports and requests to merge patches there.
14
+
15
+
For patch submission instructions, see:
16
+
17
+
https://www.x.org/wiki/Development/Documentation/SubmittingPatches
18
+
+1022
-213
app/xwininfo/aclocal.m4
+1022
-213
app/xwininfo/aclocal.m4
···
19
19
If you have problems, you may need to regenerate the build system entirely.
20
20
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
21
21
22
-
# iconv.m4 serial 19 (gettext-0.18.2)
23
-
dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
22
+
# host-cpu-c-abi.m4 serial 11
23
+
dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
24
+
dnl This file is free software; the Free Software Foundation
25
+
dnl gives unlimited permission to copy and/or distribute it,
26
+
dnl with or without modifications, as long as this notice is preserved.
27
+
28
+
dnl From Bruno Haible and Sam Steingold.
29
+
30
+
dnl Sets the HOST_CPU variable to the canonical name of the CPU.
31
+
dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its
32
+
dnl C language ABI (application binary interface).
33
+
dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in
34
+
dnl config.h.
35
+
dnl
36
+
dnl This canonical name can be used to select a particular assembly language
37
+
dnl source file that will interoperate with C code on the given host.
38
+
dnl
39
+
dnl For example:
40
+
dnl * 'i386' and 'sparc' are different canonical names, because code for i386
41
+
dnl will not run on SPARC CPUs and vice versa. They have different
42
+
dnl instruction sets.
43
+
dnl * 'sparc' and 'sparc64' are different canonical names, because code for
44
+
dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code
45
+
dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit
46
+
dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit
47
+
dnl mode, but not both.
48
+
dnl * 'mips' and 'mipsn32' are different canonical names, because they use
49
+
dnl different argument passing and return conventions for C functions, and
50
+
dnl although the instruction set of 'mips' is a large subset of the
51
+
dnl instruction set of 'mipsn32'.
52
+
dnl * 'mipsn32' and 'mips64' are different canonical names, because they use
53
+
dnl different sizes for the C types like 'int' and 'void *', and although
54
+
dnl the instruction sets of 'mipsn32' and 'mips64' are the same.
55
+
dnl * The same canonical name is used for different endiannesses. You can
56
+
dnl determine the endianness through preprocessor symbols:
57
+
dnl - 'arm': test __ARMEL__.
58
+
dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL.
59
+
dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN.
60
+
dnl * The same name 'i386' is used for CPUs of type i386, i486, i586
61
+
dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because
62
+
dnl - Instructions that do not exist on all of these CPUs (cmpxchg,
63
+
dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your
64
+
dnl assembly language source files use such instructions, you will
65
+
dnl need to make the distinction.
66
+
dnl - Speed of execution of the common instruction set is reasonable across
67
+
dnl the entire family of CPUs. If you have assembly language source files
68
+
dnl that are optimized for particular CPU types (like GNU gmp has), you
69
+
dnl will need to make the distinction.
70
+
dnl See <https://en.wikipedia.org/wiki/X86_instruction_listings>.
71
+
AC_DEFUN([gl_HOST_CPU_C_ABI],
72
+
[
73
+
AC_REQUIRE([AC_CANONICAL_HOST])
74
+
AC_REQUIRE([gl_C_ASM])
75
+
AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
76
+
[case "$host_cpu" in
77
+
78
+
changequote(,)dnl
79
+
i[4567]86 )
80
+
changequote([,])dnl
81
+
gl_cv_host_cpu_c_abi=i386
82
+
;;
83
+
84
+
x86_64 )
85
+
# On x86_64 systems, the C compiler may be generating code in one of
86
+
# these ABIs:
87
+
# - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
88
+
# - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
89
+
# with native Windows (mingw, MSVC).
90
+
# - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
91
+
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
92
+
AC_COMPILE_IFELSE(
93
+
[AC_LANG_SOURCE(
94
+
[[#if (defined __x86_64__ || defined __amd64__ \
95
+
|| defined _M_X64 || defined _M_AMD64)
96
+
int ok;
97
+
#else
98
+
error fail
99
+
#endif
100
+
]])],
101
+
[AC_COMPILE_IFELSE(
102
+
[AC_LANG_SOURCE(
103
+
[[#if defined __ILP32__ || defined _ILP32
104
+
int ok;
105
+
#else
106
+
error fail
107
+
#endif
108
+
]])],
109
+
[gl_cv_host_cpu_c_abi=x86_64-x32],
110
+
[gl_cv_host_cpu_c_abi=x86_64])],
111
+
[gl_cv_host_cpu_c_abi=i386])
112
+
;;
113
+
114
+
changequote(,)dnl
115
+
alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
116
+
changequote([,])dnl
117
+
gl_cv_host_cpu_c_abi=alpha
118
+
;;
119
+
120
+
arm* | aarch64 )
121
+
# Assume arm with EABI.
122
+
# On arm64 systems, the C compiler may be generating code in one of
123
+
# these ABIs:
124
+
# - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
125
+
# - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
126
+
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
127
+
AC_COMPILE_IFELSE(
128
+
[AC_LANG_SOURCE(
129
+
[[#ifdef __aarch64__
130
+
int ok;
131
+
#else
132
+
error fail
133
+
#endif
134
+
]])],
135
+
[AC_COMPILE_IFELSE(
136
+
[AC_LANG_SOURCE(
137
+
[[#if defined __ILP32__ || defined _ILP32
138
+
int ok;
139
+
#else
140
+
error fail
141
+
#endif
142
+
]])],
143
+
[gl_cv_host_cpu_c_abi=arm64-ilp32],
144
+
[gl_cv_host_cpu_c_abi=arm64])],
145
+
[# Don't distinguish little-endian and big-endian arm, since they
146
+
# don't require different machine code for simple operations and
147
+
# since the user can distinguish them through the preprocessor
148
+
# defines __ARMEL__ vs. __ARMEB__.
149
+
# But distinguish arm which passes floating-point arguments and
150
+
# return values in integer registers (r0, r1, ...) - this is
151
+
# gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
152
+
# passes them in float registers (s0, s1, ...) and double registers
153
+
# (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
154
+
# sets the preprocessor defines __ARM_PCS (for the first case) and
155
+
# __ARM_PCS_VFP (for the second case), but older GCC does not.
156
+
echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
157
+
# Look for a reference to the register d0 in the .s file.
158
+
AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
159
+
if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then
160
+
gl_cv_host_cpu_c_abi=armhf
161
+
else
162
+
gl_cv_host_cpu_c_abi=arm
163
+
fi
164
+
rm -f conftest*
165
+
])
166
+
;;
167
+
168
+
hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
169
+
# On hppa, the C compiler may be generating 32-bit code or 64-bit
170
+
# code. In the latter case, it defines _LP64 and __LP64__.
171
+
AC_COMPILE_IFELSE(
172
+
[AC_LANG_SOURCE(
173
+
[[#ifdef __LP64__
174
+
int ok;
175
+
#else
176
+
error fail
177
+
#endif
178
+
]])],
179
+
[gl_cv_host_cpu_c_abi=hppa64],
180
+
[gl_cv_host_cpu_c_abi=hppa])
181
+
;;
182
+
183
+
ia64* )
184
+
# On ia64 on HP-UX, the C compiler may be generating 64-bit code or
185
+
# 32-bit code. In the latter case, it defines _ILP32.
186
+
AC_COMPILE_IFELSE(
187
+
[AC_LANG_SOURCE(
188
+
[[#ifdef _ILP32
189
+
int ok;
190
+
#else
191
+
error fail
192
+
#endif
193
+
]])],
194
+
[gl_cv_host_cpu_c_abi=ia64-ilp32],
195
+
[gl_cv_host_cpu_c_abi=ia64])
196
+
;;
197
+
198
+
mips* )
199
+
# We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
200
+
# at 32.
201
+
AC_COMPILE_IFELSE(
202
+
[AC_LANG_SOURCE(
203
+
[[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
204
+
int ok;
205
+
#else
206
+
error fail
207
+
#endif
208
+
]])],
209
+
[gl_cv_host_cpu_c_abi=mips64],
210
+
[# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
211
+
# may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
212
+
# In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
213
+
# may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
214
+
AC_COMPILE_IFELSE(
215
+
[AC_LANG_SOURCE(
216
+
[[#if (_MIPS_SIM == _ABIN32)
217
+
int ok;
218
+
#else
219
+
error fail
220
+
#endif
221
+
]])],
222
+
[gl_cv_host_cpu_c_abi=mipsn32],
223
+
[gl_cv_host_cpu_c_abi=mips])])
224
+
;;
225
+
226
+
powerpc* )
227
+
# Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
228
+
# No need to distinguish them here; the caller may distinguish
229
+
# them based on the OS.
230
+
# On powerpc64 systems, the C compiler may still be generating
231
+
# 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
232
+
# be generating 64-bit code.
233
+
AC_COMPILE_IFELSE(
234
+
[AC_LANG_SOURCE(
235
+
[[#if defined __powerpc64__ || defined _ARCH_PPC64
236
+
int ok;
237
+
#else
238
+
error fail
239
+
#endif
240
+
]])],
241
+
[# On powerpc64, there are two ABIs on Linux: The AIX compatible
242
+
# one and the ELFv2 one. The latter defines _CALL_ELF=2.
243
+
AC_COMPILE_IFELSE(
244
+
[AC_LANG_SOURCE(
245
+
[[#if defined _CALL_ELF && _CALL_ELF == 2
246
+
int ok;
247
+
#else
248
+
error fail
249
+
#endif
250
+
]])],
251
+
[gl_cv_host_cpu_c_abi=powerpc64-elfv2],
252
+
[gl_cv_host_cpu_c_abi=powerpc64])
253
+
],
254
+
[gl_cv_host_cpu_c_abi=powerpc])
255
+
;;
256
+
257
+
rs6000 )
258
+
gl_cv_host_cpu_c_abi=powerpc
259
+
;;
260
+
261
+
riscv32 | riscv64 )
262
+
# There are 2 architectures (with variants): rv32* and rv64*.
263
+
AC_COMPILE_IFELSE(
264
+
[AC_LANG_SOURCE(
265
+
[[#if __riscv_xlen == 64
266
+
int ok;
267
+
#else
268
+
error fail
269
+
#endif
270
+
]])],
271
+
[cpu=riscv64],
272
+
[cpu=riscv32])
273
+
# There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
274
+
# Size of 'long' and 'void *':
275
+
AC_COMPILE_IFELSE(
276
+
[AC_LANG_SOURCE(
277
+
[[#if defined __LP64__
278
+
int ok;
279
+
#else
280
+
error fail
281
+
#endif
282
+
]])],
283
+
[main_abi=lp64],
284
+
[main_abi=ilp32])
285
+
# Float ABIs:
286
+
# __riscv_float_abi_double:
287
+
# 'float' and 'double' are passed in floating-point registers.
288
+
# __riscv_float_abi_single:
289
+
# 'float' are passed in floating-point registers.
290
+
# __riscv_float_abi_soft:
291
+
# No values are passed in floating-point registers.
292
+
AC_COMPILE_IFELSE(
293
+
[AC_LANG_SOURCE(
294
+
[[#if defined __riscv_float_abi_double
295
+
int ok;
296
+
#else
297
+
error fail
298
+
#endif
299
+
]])],
300
+
[float_abi=d],
301
+
[AC_COMPILE_IFELSE(
302
+
[AC_LANG_SOURCE(
303
+
[[#if defined __riscv_float_abi_single
304
+
int ok;
305
+
#else
306
+
error fail
307
+
#endif
308
+
]])],
309
+
[float_abi=f],
310
+
[float_abi=''])
311
+
])
312
+
gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}"
313
+
;;
314
+
315
+
s390* )
316
+
# On s390x, the C compiler may be generating 64-bit (= s390x) code
317
+
# or 31-bit (= s390) code.
318
+
AC_COMPILE_IFELSE(
319
+
[AC_LANG_SOURCE(
320
+
[[#if defined __LP64__ || defined __s390x__
321
+
int ok;
322
+
#else
323
+
error fail
324
+
#endif
325
+
]])],
326
+
[gl_cv_host_cpu_c_abi=s390x],
327
+
[gl_cv_host_cpu_c_abi=s390])
328
+
;;
329
+
330
+
sparc | sparc64 )
331
+
# UltraSPARCs running Linux have `uname -m` = "sparc64", but the
332
+
# C compiler still generates 32-bit code.
333
+
AC_COMPILE_IFELSE(
334
+
[AC_LANG_SOURCE(
335
+
[[#if defined __sparcv9 || defined __arch64__
336
+
int ok;
337
+
#else
338
+
error fail
339
+
#endif
340
+
]])],
341
+
[gl_cv_host_cpu_c_abi=sparc64],
342
+
[gl_cv_host_cpu_c_abi=sparc])
343
+
;;
344
+
345
+
*)
346
+
gl_cv_host_cpu_c_abi="$host_cpu"
347
+
;;
348
+
esac
349
+
])
350
+
351
+
dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same.
352
+
HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
353
+
HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
354
+
AC_SUBST([HOST_CPU])
355
+
AC_SUBST([HOST_CPU_C_ABI])
356
+
357
+
# This was
358
+
# AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
359
+
# AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
360
+
# earlier, but KAI C++ 3.2d doesn't like this.
361
+
sed -e 's/-/_/g' >> confdefs.h <<EOF
362
+
#ifndef __${HOST_CPU}__
363
+
#define __${HOST_CPU}__ 1
364
+
#endif
365
+
#ifndef __${HOST_CPU_C_ABI}__
366
+
#define __${HOST_CPU_C_ABI}__ 1
367
+
#endif
368
+
EOF
369
+
AH_TOP([/* CPU and C ABI indicator */
370
+
#ifndef __i386__
371
+
#undef __i386__
372
+
#endif
373
+
#ifndef __x86_64_x32__
374
+
#undef __x86_64_x32__
375
+
#endif
376
+
#ifndef __x86_64__
377
+
#undef __x86_64__
378
+
#endif
379
+
#ifndef __alpha__
380
+
#undef __alpha__
381
+
#endif
382
+
#ifndef __arm__
383
+
#undef __arm__
384
+
#endif
385
+
#ifndef __armhf__
386
+
#undef __armhf__
387
+
#endif
388
+
#ifndef __arm64_ilp32__
389
+
#undef __arm64_ilp32__
390
+
#endif
391
+
#ifndef __arm64__
392
+
#undef __arm64__
393
+
#endif
394
+
#ifndef __hppa__
395
+
#undef __hppa__
396
+
#endif
397
+
#ifndef __hppa64__
398
+
#undef __hppa64__
399
+
#endif
400
+
#ifndef __ia64_ilp32__
401
+
#undef __ia64_ilp32__
402
+
#endif
403
+
#ifndef __ia64__
404
+
#undef __ia64__
405
+
#endif
406
+
#ifndef __m68k__
407
+
#undef __m68k__
408
+
#endif
409
+
#ifndef __mips__
410
+
#undef __mips__
411
+
#endif
412
+
#ifndef __mipsn32__
413
+
#undef __mipsn32__
414
+
#endif
415
+
#ifndef __mips64__
416
+
#undef __mips64__
417
+
#endif
418
+
#ifndef __powerpc__
419
+
#undef __powerpc__
420
+
#endif
421
+
#ifndef __powerpc64__
422
+
#undef __powerpc64__
423
+
#endif
424
+
#ifndef __powerpc64_elfv2__
425
+
#undef __powerpc64_elfv2__
426
+
#endif
427
+
#ifndef __riscv32__
428
+
#undef __riscv32__
429
+
#endif
430
+
#ifndef __riscv64__
431
+
#undef __riscv64__
432
+
#endif
433
+
#ifndef __riscv32_ilp32__
434
+
#undef __riscv32_ilp32__
435
+
#endif
436
+
#ifndef __riscv32_ilp32f__
437
+
#undef __riscv32_ilp32f__
438
+
#endif
439
+
#ifndef __riscv32_ilp32d__
440
+
#undef __riscv32_ilp32d__
441
+
#endif
442
+
#ifndef __riscv64_ilp32__
443
+
#undef __riscv64_ilp32__
444
+
#endif
445
+
#ifndef __riscv64_ilp32f__
446
+
#undef __riscv64_ilp32f__
447
+
#endif
448
+
#ifndef __riscv64_ilp32d__
449
+
#undef __riscv64_ilp32d__
450
+
#endif
451
+
#ifndef __riscv64_lp64__
452
+
#undef __riscv64_lp64__
453
+
#endif
454
+
#ifndef __riscv64_lp64f__
455
+
#undef __riscv64_lp64f__
456
+
#endif
457
+
#ifndef __riscv64_lp64d__
458
+
#undef __riscv64_lp64d__
459
+
#endif
460
+
#ifndef __s390__
461
+
#undef __s390__
462
+
#endif
463
+
#ifndef __s390x__
464
+
#undef __s390x__
465
+
#endif
466
+
#ifndef __sh__
467
+
#undef __sh__
468
+
#endif
469
+
#ifndef __sparc__
470
+
#undef __sparc__
471
+
#endif
472
+
#ifndef __sparc64__
473
+
#undef __sparc64__
474
+
#endif
475
+
])
476
+
477
+
])
478
+
479
+
480
+
dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
481
+
dnl (application binary interface) is a 32-bit one, or to 'no' otherwise.
482
+
dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
483
+
AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
484
+
[
485
+
AC_REQUIRE([AC_CANONICAL_HOST])
486
+
AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
487
+
[if test -n "$gl_cv_host_cpu_c_abi"; then
488
+
case "$gl_cv_host_cpu_c_abi" in
489
+
i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
490
+
gl_cv_host_cpu_c_abi_32bit=yes ;;
491
+
*)
492
+
gl_cv_host_cpu_c_abi_32bit=no ;;
493
+
esac
494
+
else
495
+
case "$host_cpu" in
496
+
497
+
changequote(,)dnl
498
+
i[4567]86 )
499
+
changequote([,])dnl
500
+
gl_cv_host_cpu_c_abi_32bit=yes
501
+
;;
502
+
503
+
x86_64 )
504
+
# On x86_64 systems, the C compiler may be generating code in one of
505
+
# these ABIs:
506
+
# - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
507
+
# - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
508
+
# with native Windows (mingw, MSVC).
509
+
# - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
510
+
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
511
+
AC_COMPILE_IFELSE(
512
+
[AC_LANG_SOURCE(
513
+
[[#if (defined __x86_64__ || defined __amd64__ \
514
+
|| defined _M_X64 || defined _M_AMD64) \
515
+
&& !(defined __ILP32__ || defined _ILP32)
516
+
int ok;
517
+
#else
518
+
error fail
519
+
#endif
520
+
]])],
521
+
[gl_cv_host_cpu_c_abi_32bit=no],
522
+
[gl_cv_host_cpu_c_abi_32bit=yes])
523
+
;;
524
+
525
+
arm* | aarch64 )
526
+
# Assume arm with EABI.
527
+
# On arm64 systems, the C compiler may be generating code in one of
528
+
# these ABIs:
529
+
# - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
530
+
# - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
531
+
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
532
+
AC_COMPILE_IFELSE(
533
+
[AC_LANG_SOURCE(
534
+
[[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
535
+
int ok;
536
+
#else
537
+
error fail
538
+
#endif
539
+
]])],
540
+
[gl_cv_host_cpu_c_abi_32bit=no],
541
+
[gl_cv_host_cpu_c_abi_32bit=yes])
542
+
;;
543
+
544
+
hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
545
+
# On hppa, the C compiler may be generating 32-bit code or 64-bit
546
+
# code. In the latter case, it defines _LP64 and __LP64__.
547
+
AC_COMPILE_IFELSE(
548
+
[AC_LANG_SOURCE(
549
+
[[#ifdef __LP64__
550
+
int ok;
551
+
#else
552
+
error fail
553
+
#endif
554
+
]])],
555
+
[gl_cv_host_cpu_c_abi_32bit=no],
556
+
[gl_cv_host_cpu_c_abi_32bit=yes])
557
+
;;
558
+
559
+
ia64* )
560
+
# On ia64 on HP-UX, the C compiler may be generating 64-bit code or
561
+
# 32-bit code. In the latter case, it defines _ILP32.
562
+
AC_COMPILE_IFELSE(
563
+
[AC_LANG_SOURCE(
564
+
[[#ifdef _ILP32
565
+
int ok;
566
+
#else
567
+
error fail
568
+
#endif
569
+
]])],
570
+
[gl_cv_host_cpu_c_abi_32bit=yes],
571
+
[gl_cv_host_cpu_c_abi_32bit=no])
572
+
;;
573
+
574
+
mips* )
575
+
# We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
576
+
# at 32.
577
+
AC_COMPILE_IFELSE(
578
+
[AC_LANG_SOURCE(
579
+
[[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
580
+
int ok;
581
+
#else
582
+
error fail
583
+
#endif
584
+
]])],
585
+
[gl_cv_host_cpu_c_abi_32bit=no],
586
+
[gl_cv_host_cpu_c_abi_32bit=yes])
587
+
;;
588
+
589
+
powerpc* )
590
+
# Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
591
+
# No need to distinguish them here; the caller may distinguish
592
+
# them based on the OS.
593
+
# On powerpc64 systems, the C compiler may still be generating
594
+
# 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
595
+
# be generating 64-bit code.
596
+
AC_COMPILE_IFELSE(
597
+
[AC_LANG_SOURCE(
598
+
[[#if defined __powerpc64__ || defined _ARCH_PPC64
599
+
int ok;
600
+
#else
601
+
error fail
602
+
#endif
603
+
]])],
604
+
[gl_cv_host_cpu_c_abi_32bit=no],
605
+
[gl_cv_host_cpu_c_abi_32bit=yes])
606
+
;;
607
+
608
+
rs6000 )
609
+
gl_cv_host_cpu_c_abi_32bit=yes
610
+
;;
611
+
612
+
riscv32 | riscv64 )
613
+
# There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
614
+
# Size of 'long' and 'void *':
615
+
AC_COMPILE_IFELSE(
616
+
[AC_LANG_SOURCE(
617
+
[[#if defined __LP64__
618
+
int ok;
619
+
#else
620
+
error fail
621
+
#endif
622
+
]])],
623
+
[gl_cv_host_cpu_c_abi_32bit=no],
624
+
[gl_cv_host_cpu_c_abi_32bit=yes])
625
+
;;
626
+
627
+
s390* )
628
+
# On s390x, the C compiler may be generating 64-bit (= s390x) code
629
+
# or 31-bit (= s390) code.
630
+
AC_COMPILE_IFELSE(
631
+
[AC_LANG_SOURCE(
632
+
[[#if defined __LP64__ || defined __s390x__
633
+
int ok;
634
+
#else
635
+
error fail
636
+
#endif
637
+
]])],
638
+
[gl_cv_host_cpu_c_abi_32bit=no],
639
+
[gl_cv_host_cpu_c_abi_32bit=yes])
640
+
;;
641
+
642
+
sparc | sparc64 )
643
+
# UltraSPARCs running Linux have `uname -m` = "sparc64", but the
644
+
# C compiler still generates 32-bit code.
645
+
AC_COMPILE_IFELSE(
646
+
[AC_LANG_SOURCE(
647
+
[[#if defined __sparcv9 || defined __arch64__
648
+
int ok;
649
+
#else
650
+
error fail
651
+
#endif
652
+
]])],
653
+
[gl_cv_host_cpu_c_abi_32bit=no],
654
+
[gl_cv_host_cpu_c_abi_32bit=yes])
655
+
;;
656
+
657
+
*)
658
+
gl_cv_host_cpu_c_abi_32bit=no
659
+
;;
660
+
esac
661
+
fi
662
+
])
663
+
664
+
HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
665
+
])
666
+
667
+
# iconv.m4 serial 21
668
+
dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 Free Software Foundation,
669
+
dnl Inc.
24
670
dnl This file is free software; the Free Software Foundation
25
671
dnl gives unlimited permission to copy and/or distribute it,
26
672
dnl with or without modifications, as long as this notice is preserved.
···
188
834
#endif
189
835
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
190
836
provided. */
191
-
if (/* Try standardized names. */
192
-
iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
193
-
/* Try IRIX, OSF/1 names. */
194
-
&& iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
195
-
/* Try AIX names. */
196
-
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
197
-
/* Try HP-UX names. */
198
-
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
199
-
result |= 16;
837
+
{
838
+
/* Try standardized names. */
839
+
iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
840
+
/* Try IRIX, OSF/1 names. */
841
+
iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
842
+
/* Try AIX names. */
843
+
iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
844
+
/* Try HP-UX names. */
845
+
iconv_t cd4 = iconv_open ("utf8", "eucJP");
846
+
if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
847
+
&& cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
848
+
result |= 16;
849
+
if (cd1 != (iconv_t)(-1))
850
+
iconv_close (cd1);
851
+
if (cd2 != (iconv_t)(-1))
852
+
iconv_close (cd2);
853
+
if (cd3 != (iconv_t)(-1))
854
+
iconv_close (cd3);
855
+
if (cd4 != (iconv_t)(-1))
856
+
iconv_close (cd4);
857
+
}
200
858
return result;
201
859
]])],
202
860
[am_cv_func_iconv_works=yes], ,
···
279
937
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
280
938
AC_MSG_RESULT([
281
939
$am_cv_proto_iconv])
282
-
AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
283
-
[Define as const if the declaration of iconv() needs const.])
284
-
dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
285
-
m4_ifdef([gl_ICONV_H_DEFAULTS],
286
-
[AC_REQUIRE([gl_ICONV_H_DEFAULTS])
287
-
if test -n "$am_cv_proto_iconv_arg1"; then
288
-
ICONV_CONST="const"
289
-
fi
290
-
])
940
+
else
941
+
dnl When compiling GNU libiconv on a system that does not have iconv yet,
942
+
dnl pick the POSIX compliant declaration without 'const'.
943
+
am_cv_proto_iconv_arg1=""
291
944
fi
945
+
AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
946
+
[Define as const if the declaration of iconv() needs const.])
947
+
dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
948
+
m4_ifdef([gl_ICONV_H_DEFAULTS],
949
+
[AC_REQUIRE([gl_ICONV_H_DEFAULTS])
950
+
if test -n "$am_cv_proto_iconv_arg1"; then
951
+
ICONV_CONST="const"
952
+
fi
953
+
])
292
954
])
293
955
294
-
# lib-ld.m4 serial 6
295
-
dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
956
+
# lib-ld.m4 serial 9
957
+
dnl Copyright (C) 1996-2003, 2009-2019 Free Software Foundation, Inc.
296
958
dnl This file is free software; the Free Software Foundation
297
959
dnl gives unlimited permission to copy and/or distribute it,
298
960
dnl with or without modifications, as long as this notice is preserved.
···
340
1002
}
341
1003
fi
342
1004
343
-
ac_prog=ld
344
-
if test "$GCC" = yes; then
345
-
# Check if gcc -print-prog-name=ld gives a path.
1005
+
if test -n "$LD"; then
1006
+
AC_MSG_CHECKING([for ld])
1007
+
elif test "$GCC" = yes; then
346
1008
AC_MSG_CHECKING([for ld used by $CC])
347
-
case $host in
348
-
*-*-mingw*)
349
-
# gcc leaves a trailing carriage return which upsets mingw
350
-
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
351
-
*)
352
-
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
353
-
esac
354
-
case $ac_prog in
355
-
# Accept absolute paths.
356
-
[[\\/]]* | ?:[[\\/]]*)
357
-
re_direlt='/[[^/]][[^/]]*/\.\./'
358
-
# Canonicalize the pathname of ld
359
-
ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
360
-
while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
361
-
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
362
-
done
363
-
test -z "$LD" && LD="$ac_prog"
364
-
;;
365
-
"")
366
-
# If it fails, then pretend we aren't using GCC.
367
-
ac_prog=ld
368
-
;;
369
-
*)
370
-
# If it is relative, then search for the first ld in PATH.
371
-
with_gnu_ld=unknown
372
-
;;
373
-
esac
374
1009
elif test "$with_gnu_ld" = yes; then
375
1010
AC_MSG_CHECKING([for GNU ld])
376
1011
else
377
1012
AC_MSG_CHECKING([for non-GNU ld])
378
1013
fi
379
-
AC_CACHE_VAL([acl_cv_path_LD],
380
-
[if test -z "$LD"; then
381
-
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
382
-
for ac_dir in $PATH; do
383
-
IFS="$acl_save_ifs"
384
-
test -z "$ac_dir" && ac_dir=.
385
-
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
386
-
acl_cv_path_LD="$ac_dir/$ac_prog"
387
-
# Check to see if the program is GNU ld. I'd rather use --version,
388
-
# but apparently some variants of GNU ld only accept -v.
389
-
# Break only if it was the GNU/non-GNU ld that we prefer.
390
-
case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
391
-
*GNU* | *'with BFD'*)
392
-
test "$with_gnu_ld" != no && break
393
-
;;
394
-
*)
395
-
test "$with_gnu_ld" != yes && break
396
-
;;
1014
+
if test -n "$LD"; then
1015
+
# Let the user override the test with a path.
1016
+
:
1017
+
else
1018
+
AC_CACHE_VAL([acl_cv_path_LD],
1019
+
[
1020
+
acl_cv_path_LD= # Final result of this test
1021
+
ac_prog=ld # Program to search in $PATH
1022
+
if test "$GCC" = yes; then
1023
+
# Check if gcc -print-prog-name=ld gives a path.
1024
+
case $host in
1025
+
*-*-mingw*)
1026
+
# gcc leaves a trailing carriage return which upsets mingw
1027
+
acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
1028
+
*)
1029
+
acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
1030
+
esac
1031
+
case $acl_output in
1032
+
# Accept absolute paths.
1033
+
[[\\/]]* | ?:[[\\/]]*)
1034
+
re_direlt='/[[^/]][[^/]]*/\.\./'
1035
+
# Canonicalize the pathname of ld
1036
+
acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
1037
+
while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
1038
+
acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
1039
+
done
1040
+
# Got the pathname. No search in PATH is needed.
1041
+
acl_cv_path_LD="$acl_output"
1042
+
ac_prog=
1043
+
;;
1044
+
"")
1045
+
# If it fails, then pretend we aren't using GCC.
1046
+
;;
1047
+
*)
1048
+
# If it is relative, then search for the first ld in PATH.
1049
+
with_gnu_ld=unknown
1050
+
;;
397
1051
esac
398
1052
fi
399
-
done
400
-
IFS="$acl_save_ifs"
401
-
else
402
-
acl_cv_path_LD="$LD" # Let the user override the test with a path.
403
-
fi])
404
-
LD="$acl_cv_path_LD"
1053
+
if test -n "$ac_prog"; then
1054
+
# Search for $ac_prog in $PATH.
1055
+
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1056
+
for ac_dir in $PATH; do
1057
+
IFS="$acl_save_ifs"
1058
+
test -z "$ac_dir" && ac_dir=.
1059
+
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
1060
+
acl_cv_path_LD="$ac_dir/$ac_prog"
1061
+
# Check to see if the program is GNU ld. I'd rather use --version,
1062
+
# but apparently some variants of GNU ld only accept -v.
1063
+
# Break only if it was the GNU/non-GNU ld that we prefer.
1064
+
case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
1065
+
*GNU* | *'with BFD'*)
1066
+
test "$with_gnu_ld" != no && break
1067
+
;;
1068
+
*)
1069
+
test "$with_gnu_ld" != yes && break
1070
+
;;
1071
+
esac
1072
+
fi
1073
+
done
1074
+
IFS="$acl_save_ifs"
1075
+
fi
1076
+
case $host in
1077
+
*-*-aix*)
1078
+
AC_COMPILE_IFELSE(
1079
+
[AC_LANG_SOURCE(
1080
+
[[#if defined __powerpc64__ || defined _ARCH_PPC64
1081
+
int ok;
1082
+
#else
1083
+
error fail
1084
+
#endif
1085
+
]])],
1086
+
[# The compiler produces 64-bit code. Add option '-b64' so that the
1087
+
# linker groks 64-bit object files.
1088
+
case "$acl_cv_path_LD " in
1089
+
*" -b64 "*) ;;
1090
+
*) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
1091
+
esac
1092
+
], [])
1093
+
;;
1094
+
sparc64-*-netbsd*)
1095
+
AC_COMPILE_IFELSE(
1096
+
[AC_LANG_SOURCE(
1097
+
[[#if defined __sparcv9 || defined __arch64__
1098
+
int ok;
1099
+
#else
1100
+
error fail
1101
+
#endif
1102
+
]])],
1103
+
[],
1104
+
[# The compiler produces 32-bit code. Add option '-m elf32_sparc'
1105
+
# so that the linker groks 32-bit object files.
1106
+
case "$acl_cv_path_LD " in
1107
+
*" -m elf32_sparc "*) ;;
1108
+
*) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
1109
+
esac
1110
+
])
1111
+
;;
1112
+
esac
1113
+
])
1114
+
LD="$acl_cv_path_LD"
1115
+
fi
405
1116
if test -n "$LD"; then
406
1117
AC_MSG_RESULT([$LD])
407
1118
else
408
1119
AC_MSG_RESULT([no])
1120
+
AC_MSG_ERROR([no acceptable ld found in \$PATH])
409
1121
fi
410
-
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
411
1122
AC_LIB_PROG_LD_GNU
412
1123
])
413
1124
414
-
# lib-link.m4 serial 26 (gettext-0.18.2)
415
-
dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
1125
+
# lib-link.m4 serial 28
1126
+
dnl Copyright (C) 2001-2019 Free Software Foundation, Inc.
416
1127
dnl This file is free software; the Free Software Foundation
417
1128
dnl gives unlimited permission to copy and/or distribute it,
418
1129
dnl with or without modifications, as long as this notice is preserved.
419
1130
420
1131
dnl From Bruno Haible.
421
1132
422
-
AC_PREREQ([2.54])
1133
+
AC_PREREQ([2.61])
423
1134
424
1135
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
425
1136
dnl the libraries corresponding to explicit and implicit dependencies.
···
537
1248
dnl acl_hardcode_minus_L.
538
1249
AC_DEFUN([AC_LIB_RPATH],
539
1250
[
540
-
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
541
-
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
1251
+
dnl Complain if config.rpath is missing.
1252
+
AC_REQUIRE_AUX_FILE([config.rpath])
542
1253
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
543
1254
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
544
1255
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
···
600
1311
pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
601
1312
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
602
1313
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
603
-
dnl Autoconf >= 2.61 supports dots in --with options.
604
-
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
605
1314
dnl By default, look in $includedir and $libdir.
606
1315
use_additional=yes
607
1316
AC_LIB_WITH_FINAL_PREFIX([
608
1317
eval additional_includedir=\"$includedir\"
609
1318
eval additional_libdir=\"$libdir\"
610
1319
])
611
-
AC_ARG_WITH(P_A_C_K[-prefix],
612
-
[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
613
-
--without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
1320
+
AC_ARG_WITH(PACK[-prefix],
1321
+
[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
1322
+
--without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
614
1323
[
615
1324
if test "X$withval" = "Xno"; then
616
1325
use_additional=no
···
624
1333
additional_includedir="$withval/include"
625
1334
additional_libdir="$withval/$acl_libdirstem"
626
1335
if test "$acl_libdirstem2" != "$acl_libdirstem" \
627
-
&& ! test -d "$withval/$acl_libdirstem"; then
1336
+
&& test ! -d "$withval/$acl_libdirstem"; then
628
1337
additional_libdir="$withval/$acl_libdirstem2"
629
1338
fi
630
1339
fi
···
1083
1792
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
1084
1793
done
1085
1794
fi
1086
-
popdef([P_A_C_K])
1087
1795
popdef([PACKLIBS])
1088
1796
popdef([PACKUP])
1089
1797
popdef([PACK])
···
1189
1897
AC_SUBST([$1])
1190
1898
])
1191
1899
1192
-
# lib-prefix.m4 serial 7 (gettext-0.18)
1193
-
dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
1900
+
# lib-prefix.m4 serial 14
1901
+
dnl Copyright (C) 2001-2005, 2008-2019 Free Software Foundation, Inc.
1194
1902
dnl This file is free software; the Free Software Foundation
1195
1903
dnl gives unlimited permission to copy and/or distribute it,
1196
1904
dnl with or without modifications, as long as this notice is preserved.
1197
1905
1198
1906
dnl From Bruno Haible.
1199
-
1200
-
dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
1201
-
dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
1202
-
dnl require excessive bracketing.
1203
-
ifdef([AC_HELP_STRING],
1204
-
[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
1205
-
[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
1206
1907
1207
1908
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
1208
1909
dnl to access previously installed libraries. The basic assumption is that
···
1223
1924
eval additional_includedir=\"$includedir\"
1224
1925
eval additional_libdir=\"$libdir\"
1225
1926
])
1226
-
AC_LIB_ARG_WITH([lib-prefix],
1227
-
[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
1228
-
--without-lib-prefix don't search for libraries in includedir and libdir],
1927
+
AC_ARG_WITH([lib-prefix],
1928
+
[[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
1929
+
--without-lib-prefix don't search for libraries in includedir and libdir]],
1229
1930
[
1230
1931
if test "X$withval" = "Xno"; then
1231
1932
use_additional=no
···
1365
2066
dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
1366
2067
dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
1367
2068
AC_REQUIRE([AC_CANONICAL_HOST])
1368
-
acl_libdirstem=lib
1369
-
acl_libdirstem2=
2069
+
AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
2070
+
1370
2071
case "$host_os" in
1371
2072
solaris*)
1372
-
dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
1373
-
dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
1374
-
dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
1375
-
dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
1376
-
dnl symlink is missing, so we set acl_libdirstem2 too.
1377
2073
AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
1378
-
[AC_EGREP_CPP([sixtyfour bits], [
1379
-
#ifdef _LP64
1380
-
sixtyfour bits
1381
-
#endif
1382
-
], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
1383
-
])
1384
-
if test $gl_cv_solaris_64bit = yes; then
1385
-
acl_libdirstem=lib/64
1386
-
case "$host_cpu" in
1387
-
sparc*) acl_libdirstem2=lib/sparcv9 ;;
1388
-
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
1389
-
esac
1390
-
fi
1391
-
;;
1392
-
*)
1393
-
searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
1394
-
if test -n "$searchpath"; then
1395
-
acl_save_IFS="${IFS= }"; IFS=":"
1396
-
for searchdir in $searchpath; do
1397
-
if test -d "$searchdir"; then
1398
-
case "$searchdir" in
1399
-
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
1400
-
*/../ | */.. )
1401
-
# Better ignore directories of this form. They are misleading.
1402
-
;;
1403
-
*) searchdir=`cd "$searchdir" && pwd`
2074
+
[AC_COMPILE_IFELSE(
2075
+
[AC_LANG_SOURCE(
2076
+
[[#ifdef _LP64
2077
+
int ok;
2078
+
#else
2079
+
error fail
2080
+
#endif
2081
+
]])],
2082
+
[gl_cv_solaris_64bit=yes],
2083
+
[gl_cv_solaris_64bit=no])
2084
+
]);;
2085
+
esac
2086
+
2087
+
dnl Allow the user to override the result by setting acl_cv_libdirstems.
2088
+
AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
2089
+
[acl_cv_libdirstems],
2090
+
[acl_libdirstem=lib
2091
+
acl_libdirstem2=
2092
+
case "$host_os" in
2093
+
solaris*)
2094
+
dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
2095
+
dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
2096
+
dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
2097
+
dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
2098
+
dnl symlink is missing, so we set acl_libdirstem2 too.
2099
+
if test $gl_cv_solaris_64bit = yes; then
2100
+
acl_libdirstem=lib/64
2101
+
case "$host_cpu" in
2102
+
sparc*) acl_libdirstem2=lib/sparcv9 ;;
2103
+
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
2104
+
esac
2105
+
fi
2106
+
;;
2107
+
*)
2108
+
dnl If $CC generates code for a 32-bit ABI, the libraries are
2109
+
dnl surely under $prefix/lib, not $prefix/lib64.
2110
+
if test "$HOST_CPU_C_ABI_32BIT" != yes; then
2111
+
dnl The result is a property of the system. However, non-system
2112
+
dnl compilers sometimes have odd library search paths. Therefore
2113
+
dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
2114
+
searchpath=`(if test -f /usr/bin/gcc \
2115
+
&& LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
2116
+
LC_ALL=C /usr/bin/gcc -print-search-dirs; \
2117
+
else \
2118
+
LC_ALL=C $CC -print-search-dirs; \
2119
+
fi) 2>/dev/null \
2120
+
| sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
2121
+
if test -n "$searchpath"; then
2122
+
acl_save_IFS="${IFS= }"; IFS=":"
2123
+
for searchdir in $searchpath; do
2124
+
if test -d "$searchdir"; then
1404
2125
case "$searchdir" in
1405
-
*/lib64 ) acl_libdirstem=lib64 ;;
1406
-
esac ;;
1407
-
esac
1408
-
fi
1409
-
done
1410
-
IFS="$acl_save_IFS"
1411
-
fi
1412
-
;;
1413
-
esac
1414
-
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
2126
+
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
2127
+
*/../ | */.. )
2128
+
# Better ignore directories of this form. They are misleading.
2129
+
;;
2130
+
*) searchdir=`cd "$searchdir" && pwd`
2131
+
case "$searchdir" in
2132
+
*/lib64 ) acl_libdirstem=lib64 ;;
2133
+
esac ;;
2134
+
esac
2135
+
fi
2136
+
done
2137
+
IFS="$acl_save_IFS"
2138
+
fi
2139
+
fi
2140
+
;;
2141
+
esac
2142
+
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
2143
+
acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
2144
+
])
2145
+
# Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
2146
+
acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
2147
+
acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
1415
2148
])
1416
2149
1417
-
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1418
-
# serial 1 (pkg-config-0.24)
1419
-
#
1420
-
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1421
-
#
1422
-
# This program is free software; you can redistribute it and/or modify
1423
-
# it under the terms of the GNU General Public License as published by
1424
-
# the Free Software Foundation; either version 2 of the License, or
1425
-
# (at your option) any later version.
1426
-
#
1427
-
# This program is distributed in the hope that it will be useful, but
1428
-
# WITHOUT ANY WARRANTY; without even the implied warranty of
1429
-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1430
-
# General Public License for more details.
1431
-
#
1432
-
# You should have received a copy of the GNU General Public License
1433
-
# along with this program; if not, write to the Free Software
1434
-
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1435
-
#
1436
-
# As a special exception to the GNU General Public License, if you
1437
-
# distribute this file as part of a program that contains a
1438
-
# configuration script generated by Autoconf, you may include it under
1439
-
# the same distribution terms that you use for the rest of that program.
2150
+
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2151
+
dnl serial 11 (pkg-config-0.29.1)
2152
+
dnl
2153
+
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
2154
+
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
2155
+
dnl
2156
+
dnl This program is free software; you can redistribute it and/or modify
2157
+
dnl it under the terms of the GNU General Public License as published by
2158
+
dnl the Free Software Foundation; either version 2 of the License, or
2159
+
dnl (at your option) any later version.
2160
+
dnl
2161
+
dnl This program is distributed in the hope that it will be useful, but
2162
+
dnl WITHOUT ANY WARRANTY; without even the implied warranty of
2163
+
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2164
+
dnl General Public License for more details.
2165
+
dnl
2166
+
dnl You should have received a copy of the GNU General Public License
2167
+
dnl along with this program; if not, write to the Free Software
2168
+
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2169
+
dnl 02111-1307, USA.
2170
+
dnl
2171
+
dnl As a special exception to the GNU General Public License, if you
2172
+
dnl distribute this file as part of a program that contains a
2173
+
dnl configuration script generated by Autoconf, you may include it under
2174
+
dnl the same distribution terms that you use for the rest of that
2175
+
dnl program.
1440
2176
1441
-
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
1442
-
# ----------------------------------
2177
+
dnl PKG_PREREQ(MIN-VERSION)
2178
+
dnl -----------------------
2179
+
dnl Since: 0.29
2180
+
dnl
2181
+
dnl Verify that the version of the pkg-config macros are at least
2182
+
dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
2183
+
dnl installed version of pkg-config, this checks the developer's version
2184
+
dnl of pkg.m4 when generating configure.
2185
+
dnl
2186
+
dnl To ensure that this macro is defined, also add:
2187
+
dnl m4_ifndef([PKG_PREREQ],
2188
+
dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
2189
+
dnl
2190
+
dnl See the "Since" comment for each macro you use to see what version
2191
+
dnl of the macros you require.
2192
+
m4_defun([PKG_PREREQ],
2193
+
[m4_define([PKG_MACROS_VERSION], [0.29.1])
2194
+
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
2195
+
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
2196
+
])dnl PKG_PREREQ
2197
+
2198
+
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
2199
+
dnl ----------------------------------
2200
+
dnl Since: 0.16
2201
+
dnl
2202
+
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
2203
+
dnl first found in the path. Checks that the version of pkg-config found
2204
+
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
2205
+
dnl used since that's the first version where most current features of
2206
+
dnl pkg-config existed.
1443
2207
AC_DEFUN([PKG_PROG_PKG_CONFIG],
1444
2208
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
1445
2209
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
···
1461
2225
PKG_CONFIG=""
1462
2226
fi
1463
2227
fi[]dnl
1464
-
])# PKG_PROG_PKG_CONFIG
2228
+
])dnl PKG_PROG_PKG_CONFIG
1465
2229
1466
-
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1467
-
#
1468
-
# Check to see whether a particular set of modules exists. Similar
1469
-
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
1470
-
#
1471
-
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1472
-
# only at the first occurence in configure.ac, so if the first place
1473
-
# it's called might be skipped (such as if it is within an "if", you
1474
-
# have to call PKG_CHECK_EXISTS manually
1475
-
# --------------------------------------------------------------
2230
+
dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
2231
+
dnl -------------------------------------------------------------------
2232
+
dnl Since: 0.18
2233
+
dnl
2234
+
dnl Check to see whether a particular set of modules exists. Similar to
2235
+
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
2236
+
dnl
2237
+
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
2238
+
dnl only at the first occurence in configure.ac, so if the first place
2239
+
dnl it's called might be skipped (such as if it is within an "if", you
2240
+
dnl have to call PKG_CHECK_EXISTS manually
1476
2241
AC_DEFUN([PKG_CHECK_EXISTS],
1477
2242
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1478
2243
if test -n "$PKG_CONFIG" && \
···
1482
2247
$3])dnl
1483
2248
fi])
1484
2249
1485
-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1486
-
# ---------------------------------------------
2250
+
dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
2251
+
dnl ---------------------------------------------
2252
+
dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
2253
+
dnl pkg_failed based on the result.
1487
2254
m4_define([_PKG_CONFIG],
1488
2255
[if test -n "$$1"; then
1489
2256
pkg_cv_[]$1="$$1"
···
1495
2262
else
1496
2263
pkg_failed=untried
1497
2264
fi[]dnl
1498
-
])# _PKG_CONFIG
2265
+
])dnl _PKG_CONFIG
1499
2266
1500
-
# _PKG_SHORT_ERRORS_SUPPORTED
1501
-
# -----------------------------
2267
+
dnl _PKG_SHORT_ERRORS_SUPPORTED
2268
+
dnl ---------------------------
2269
+
dnl Internal check to see if pkg-config supports short errors.
1502
2270
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
1503
2271
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1504
2272
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
···
1506
2274
else
1507
2275
_pkg_short_errors_supported=no
1508
2276
fi[]dnl
1509
-
])# _PKG_SHORT_ERRORS_SUPPORTED
2277
+
])dnl _PKG_SHORT_ERRORS_SUPPORTED
1510
2278
1511
2279
1512
-
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
1513
-
# [ACTION-IF-NOT-FOUND])
1514
-
#
1515
-
#
1516
-
# Note that if there is a possibility the first call to
1517
-
# PKG_CHECK_MODULES might not happen, you should be sure to include an
1518
-
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
1519
-
#
1520
-
#
1521
-
# --------------------------------------------------------------
2280
+
dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
2281
+
dnl [ACTION-IF-NOT-FOUND])
2282
+
dnl --------------------------------------------------------------
2283
+
dnl Since: 0.4.0
2284
+
dnl
2285
+
dnl Note that if there is a possibility the first call to
2286
+
dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
2287
+
dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
1522
2288
AC_DEFUN([PKG_CHECK_MODULES],
1523
2289
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1524
2290
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
···
1572
2338
AC_MSG_RESULT([yes])
1573
2339
$3
1574
2340
fi[]dnl
1575
-
])# PKG_CHECK_MODULES
2341
+
])dnl PKG_CHECK_MODULES
2342
+
2343
+
2344
+
dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
2345
+
dnl [ACTION-IF-NOT-FOUND])
2346
+
dnl ---------------------------------------------------------------------
2347
+
dnl Since: 0.29
2348
+
dnl
2349
+
dnl Checks for existence of MODULES and gathers its build flags with
2350
+
dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
2351
+
dnl and VARIABLE-PREFIX_LIBS from --libs.
2352
+
dnl
2353
+
dnl Note that if there is a possibility the first call to
2354
+
dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
2355
+
dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
2356
+
dnl configure.ac.
2357
+
AC_DEFUN([PKG_CHECK_MODULES_STATIC],
2358
+
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
2359
+
_save_PKG_CONFIG=$PKG_CONFIG
2360
+
PKG_CONFIG="$PKG_CONFIG --static"
2361
+
PKG_CHECK_MODULES($@)
2362
+
PKG_CONFIG=$_save_PKG_CONFIG[]dnl
2363
+
])dnl PKG_CHECK_MODULES_STATIC
1576
2364
1577
2365
1578
-
# PKG_INSTALLDIR(DIRECTORY)
1579
-
# -------------------------
1580
-
# Substitutes the variable pkgconfigdir as the location where a module
1581
-
# should install pkg-config .pc files. By default the directory is
1582
-
# $libdir/pkgconfig, but the default can be changed by passing
1583
-
# DIRECTORY. The user can override through the --with-pkgconfigdir
1584
-
# parameter.
2366
+
dnl PKG_INSTALLDIR([DIRECTORY])
2367
+
dnl -------------------------
2368
+
dnl Since: 0.27
2369
+
dnl
2370
+
dnl Substitutes the variable pkgconfigdir as the location where a module
2371
+
dnl should install pkg-config .pc files. By default the directory is
2372
+
dnl $libdir/pkgconfig, but the default can be changed by passing
2373
+
dnl DIRECTORY. The user can override through the --with-pkgconfigdir
2374
+
dnl parameter.
1585
2375
AC_DEFUN([PKG_INSTALLDIR],
1586
2376
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
1587
2377
m4_pushdef([pkg_description],
···
1592
2382
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
1593
2383
m4_popdef([pkg_default])
1594
2384
m4_popdef([pkg_description])
1595
-
]) dnl PKG_INSTALLDIR
2385
+
])dnl PKG_INSTALLDIR
1596
2386
1597
2387
1598
-
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
1599
-
# -------------------------
1600
-
# Substitutes the variable noarch_pkgconfigdir as the location where a
1601
-
# module should install arch-independent pkg-config .pc files. By
1602
-
# default the directory is $datadir/pkgconfig, but the default can be
1603
-
# changed by passing DIRECTORY. The user can override through the
1604
-
# --with-noarch-pkgconfigdir parameter.
2388
+
dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
2389
+
dnl --------------------------------
2390
+
dnl Since: 0.27
2391
+
dnl
2392
+
dnl Substitutes the variable noarch_pkgconfigdir as the location where a
2393
+
dnl module should install arch-independent pkg-config .pc files. By
2394
+
dnl default the directory is $datadir/pkgconfig, but the default can be
2395
+
dnl changed by passing DIRECTORY. The user can override through the
2396
+
dnl --with-noarch-pkgconfigdir parameter.
1605
2397
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
1606
2398
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
1607
2399
m4_pushdef([pkg_description],
···
1612
2404
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
1613
2405
m4_popdef([pkg_default])
1614
2406
m4_popdef([pkg_description])
1615
-
]) dnl PKG_NOARCH_INSTALLDIR
2407
+
])dnl PKG_NOARCH_INSTALLDIR
2408
+
2409
+
2410
+
dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
2411
+
dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
2412
+
dnl -------------------------------------------
2413
+
dnl Since: 0.28
2414
+
dnl
2415
+
dnl Retrieves the value of the pkg-config variable for the given module.
2416
+
AC_DEFUN([PKG_CHECK_VAR],
2417
+
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
2418
+
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
2419
+
2420
+
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
2421
+
AS_VAR_COPY([$1], [pkg_cv_][$1])
2422
+
2423
+
AS_VAR_IF([$1], [""], [$5], [$4])dnl
2424
+
])dnl PKG_CHECK_VAR
1616
2425
1617
2426
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
1618
2427
#
+3
-1
app/xwininfo/clientwin.c
+3
-1
app/xwininfo/clientwin.c
···
219
219
if (subwin != roots[i])
220
220
continue;
221
221
win = Find_Child_At_Pointer(dpy, subwin);
222
-
if (win == XCB_WINDOW_NONE)
222
+
if (win == XCB_WINDOW_NONE) {
223
+
free (roots);
223
224
return subwin; /* No child - Return virtual root. */
225
+
}
224
226
subwin = win;
225
227
break;
226
228
}
+451
-122
app/xwininfo/configure
+451
-122
app/xwininfo/configure
···
1
1
#! /bin/sh
2
2
# Guess values for system-dependent variables and create Makefiles.
3
-
# Generated by GNU Autoconf 2.69 for xwininfo 1.1.4.
3
+
# Generated by GNU Autoconf 2.69 for xwininfo 1.1.5.
4
4
#
5
-
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
5
+
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xwininfo/issues>.
6
6
#
7
7
#
8
8
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
···
267
267
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
268
268
else
269
269
$as_echo "$0: Please tell bug-autoconf@gnu.org and
270
-
$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
270
+
$0: https://gitlab.freedesktop.org/xorg/app/xwininfo/issues
271
271
$0: about your system, including any error possibly output
272
272
$0: before this message. Then install a modern shell, or
273
273
$0: manually run the script under such a shell if you do
···
581
581
# Identity of this package.
582
582
PACKAGE_NAME='xwininfo'
583
583
PACKAGE_TARNAME='xwininfo'
584
-
PACKAGE_VERSION='1.1.4'
585
-
PACKAGE_STRING='xwininfo 1.1.4'
586
-
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
584
+
PACKAGE_VERSION='1.1.5'
585
+
PACKAGE_STRING='xwininfo 1.1.5'
586
+
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xwininfo/issues'
587
587
PACKAGE_URL=''
588
588
589
589
ac_unique_file="Makefile.am"
···
1321
1321
# Omit some internal or obsolete options to make the list less imposing.
1322
1322
# This message is too long to be a string in the A/UX 3.1 sh.
1323
1323
cat <<_ACEOF
1324
-
\`configure' configures xwininfo 1.1.4 to adapt to many kinds of systems.
1324
+
\`configure' configures xwininfo 1.1.5 to adapt to many kinds of systems.
1325
1325
1326
1326
Usage: $0 [OPTION]... [VAR=VALUE]...
1327
1327
···
1391
1391
1392
1392
if test -n "$ac_init_help"; then
1393
1393
case $ac_init_help in
1394
-
short | recursive ) echo "Configuration of xwininfo 1.1.4:";;
1394
+
short | recursive ) echo "Configuration of xwininfo 1.1.5:";;
1395
1395
esac
1396
1396
cat <<\_ACEOF
1397
1397
···
1448
1448
Use these variables to override the choices made by `configure' or to help
1449
1449
it to find libraries and programs with nonstandard names/locations.
1450
1450
1451
-
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
1451
+
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xwininfo/issues>.
1452
1452
_ACEOF
1453
1453
ac_status=$?
1454
1454
fi
···
1511
1511
test -n "$ac_init_help" && exit $ac_status
1512
1512
if $ac_init_version; then
1513
1513
cat <<\_ACEOF
1514
-
xwininfo configure 1.1.4
1514
+
xwininfo configure 1.1.5
1515
1515
generated by GNU Autoconf 2.69
1516
1516
1517
1517
Copyright (C) 2012 Free Software Foundation, Inc.
···
1671
1671
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1672
1672
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1673
1673
( $as_echo "## ---------------------------------------------------------------------- ##
1674
-
## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
1674
+
## Report this to https://gitlab.freedesktop.org/xorg/app/xwininfo/issues ##
1675
1675
## ---------------------------------------------------------------------- ##"
1676
1676
) | sed "s/^/$as_me: WARNING: /" >&2
1677
1677
;;
···
1926
1926
This file contains any messages produced by compilers while
1927
1927
running configure, to aid debugging if configure makes a mistake.
1928
1928
1929
-
It was created by xwininfo $as_me 1.1.4, which was
1929
+
It was created by xwininfo $as_me 1.1.5, which was
1930
1930
generated by GNU Autoconf 2.69. Invocation command line was
1931
1931
1932
1932
$ $0 $@
···
4066
4066
4067
4067
# Define the identity of the package.
4068
4068
PACKAGE='xwininfo'
4069
-
VERSION='1.1.4'
4069
+
VERSION='1.1.5'
4070
4070
4071
4071
4072
4072
cat >>confdefs.h <<_ACEOF
···
4372
4372
}
4373
4373
fi
4374
4374
4375
-
ac_prog=ld
4376
-
if test "$GCC" = yes; then
4377
-
# Check if gcc -print-prog-name=ld gives a path.
4375
+
if test -n "$LD"; then
4376
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
4377
+
$as_echo_n "checking for ld... " >&6; }
4378
+
elif test "$GCC" = yes; then
4378
4379
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
4379
4380
$as_echo_n "checking for ld used by $CC... " >&6; }
4380
-
case $host in
4381
-
*-*-mingw*)
4382
-
# gcc leaves a trailing carriage return which upsets mingw
4383
-
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
4384
-
*)
4385
-
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
4386
-
esac
4387
-
case $ac_prog in
4388
-
# Accept absolute paths.
4389
-
[\\/]* | ?:[\\/]*)
4390
-
re_direlt='/[^/][^/]*/\.\./'
4391
-
# Canonicalize the pathname of ld
4392
-
ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
4393
-
while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
4394
-
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
4395
-
done
4396
-
test -z "$LD" && LD="$ac_prog"
4397
-
;;
4398
-
"")
4399
-
# If it fails, then pretend we aren't using GCC.
4400
-
ac_prog=ld
4401
-
;;
4402
-
*)
4403
-
# If it is relative, then search for the first ld in PATH.
4404
-
with_gnu_ld=unknown
4405
-
;;
4406
-
esac
4407
4381
elif test "$with_gnu_ld" = yes; then
4408
4382
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
4409
4383
$as_echo_n "checking for GNU ld... " >&6; }
···
4411
4385
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
4412
4386
$as_echo_n "checking for non-GNU ld... " >&6; }
4413
4387
fi
4414
-
if ${acl_cv_path_LD+:} false; then :
4388
+
if test -n "$LD"; then
4389
+
# Let the user override the test with a path.
4390
+
:
4391
+
else
4392
+
if ${acl_cv_path_LD+:} false; then :
4415
4393
$as_echo_n "(cached) " >&6
4416
4394
else
4417
-
if test -z "$LD"; then
4418
-
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
4419
-
for ac_dir in $PATH; do
4420
-
IFS="$acl_save_ifs"
4421
-
test -z "$ac_dir" && ac_dir=.
4422
-
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
4423
-
acl_cv_path_LD="$ac_dir/$ac_prog"
4424
-
# Check to see if the program is GNU ld. I'd rather use --version,
4425
-
# but apparently some variants of GNU ld only accept -v.
4426
-
# Break only if it was the GNU/non-GNU ld that we prefer.
4427
-
case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
4428
-
*GNU* | *'with BFD'*)
4429
-
test "$with_gnu_ld" != no && break
4430
-
;;
4431
-
*)
4432
-
test "$with_gnu_ld" != yes && break
4433
-
;;
4395
+
4396
+
acl_cv_path_LD= # Final result of this test
4397
+
ac_prog=ld # Program to search in $PATH
4398
+
if test "$GCC" = yes; then
4399
+
# Check if gcc -print-prog-name=ld gives a path.
4400
+
case $host in
4401
+
*-*-mingw*)
4402
+
# gcc leaves a trailing carriage return which upsets mingw
4403
+
acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
4404
+
*)
4405
+
acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
4406
+
esac
4407
+
case $acl_output in
4408
+
# Accept absolute paths.
4409
+
[\\/]* | ?:[\\/]*)
4410
+
re_direlt='/[^/][^/]*/\.\./'
4411
+
# Canonicalize the pathname of ld
4412
+
acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
4413
+
while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
4414
+
acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
4415
+
done
4416
+
# Got the pathname. No search in PATH is needed.
4417
+
acl_cv_path_LD="$acl_output"
4418
+
ac_prog=
4419
+
;;
4420
+
"")
4421
+
# If it fails, then pretend we aren't using GCC.
4422
+
;;
4423
+
*)
4424
+
# If it is relative, then search for the first ld in PATH.
4425
+
with_gnu_ld=unknown
4426
+
;;
4434
4427
esac
4435
4428
fi
4436
-
done
4437
-
IFS="$acl_save_ifs"
4429
+
if test -n "$ac_prog"; then
4430
+
# Search for $ac_prog in $PATH.
4431
+
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
4432
+
for ac_dir in $PATH; do
4433
+
IFS="$acl_save_ifs"
4434
+
test -z "$ac_dir" && ac_dir=.
4435
+
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
4436
+
acl_cv_path_LD="$ac_dir/$ac_prog"
4437
+
# Check to see if the program is GNU ld. I'd rather use --version,
4438
+
# but apparently some variants of GNU ld only accept -v.
4439
+
# Break only if it was the GNU/non-GNU ld that we prefer.
4440
+
case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
4441
+
*GNU* | *'with BFD'*)
4442
+
test "$with_gnu_ld" != no && break
4443
+
;;
4444
+
*)
4445
+
test "$with_gnu_ld" != yes && break
4446
+
;;
4447
+
esac
4448
+
fi
4449
+
done
4450
+
IFS="$acl_save_ifs"
4451
+
fi
4452
+
case $host in
4453
+
*-*-aix*)
4454
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4455
+
/* end confdefs.h. */
4456
+
#if defined __powerpc64__ || defined _ARCH_PPC64
4457
+
int ok;
4458
+
#else
4459
+
error fail
4460
+
#endif
4461
+
4462
+
_ACEOF
4463
+
if ac_fn_c_try_compile "$LINENO"; then :
4464
+
# The compiler produces 64-bit code. Add option '-b64' so that the
4465
+
# linker groks 64-bit object files.
4466
+
case "$acl_cv_path_LD " in
4467
+
*" -b64 "*) ;;
4468
+
*) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
4469
+
esac
4470
+
4471
+
fi
4472
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4473
+
;;
4474
+
sparc64-*-netbsd*)
4475
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4476
+
/* end confdefs.h. */
4477
+
#if defined __sparcv9 || defined __arch64__
4478
+
int ok;
4479
+
#else
4480
+
error fail
4481
+
#endif
4482
+
4483
+
_ACEOF
4484
+
if ac_fn_c_try_compile "$LINENO"; then :
4485
+
4438
4486
else
4439
-
acl_cv_path_LD="$LD" # Let the user override the test with a path.
4487
+
# The compiler produces 32-bit code. Add option '-m elf32_sparc'
4488
+
# so that the linker groks 32-bit object files.
4489
+
case "$acl_cv_path_LD " in
4490
+
*" -m elf32_sparc "*) ;;
4491
+
*) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
4492
+
esac
4493
+
4440
4494
fi
4495
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4496
+
;;
4497
+
esac
4498
+
4441
4499
fi
4442
4500
4443
-
LD="$acl_cv_path_LD"
4501
+
LD="$acl_cv_path_LD"
4502
+
fi
4444
4503
if test -n "$LD"; then
4445
4504
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
4446
4505
$as_echo "$LD" >&6; }
4447
4506
else
4448
4507
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4449
4508
$as_echo "no" >&6; }
4509
+
as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
4450
4510
fi
4451
-
test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
4452
4511
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
4453
4512
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
4454
4513
if ${acl_cv_prog_gnu_ld+:} false; then :
···
4505
4564
4506
4565
4507
4566
4508
-
acl_libdirstem=lib
4509
-
acl_libdirstem2=
4567
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
4568
+
$as_echo_n "checking 32-bit host C ABI... " >&6; }
4569
+
if ${gl_cv_host_cpu_c_abi_32bit+:} false; then :
4570
+
$as_echo_n "(cached) " >&6
4571
+
else
4572
+
if test -n "$gl_cv_host_cpu_c_abi"; then
4573
+
case "$gl_cv_host_cpu_c_abi" in
4574
+
i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
4575
+
gl_cv_host_cpu_c_abi_32bit=yes ;;
4576
+
*)
4577
+
gl_cv_host_cpu_c_abi_32bit=no ;;
4578
+
esac
4579
+
else
4580
+
case "$host_cpu" in
4581
+
4582
+
i[4567]86 )
4583
+
gl_cv_host_cpu_c_abi_32bit=yes
4584
+
;;
4585
+
4586
+
x86_64 )
4587
+
# On x86_64 systems, the C compiler may be generating code in one of
4588
+
# these ABIs:
4589
+
# - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
4590
+
# - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
4591
+
# with native Windows (mingw, MSVC).
4592
+
# - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
4593
+
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
4594
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4595
+
/* end confdefs.h. */
4596
+
#if (defined __x86_64__ || defined __amd64__ \
4597
+
|| defined _M_X64 || defined _M_AMD64) \
4598
+
&& !(defined __ILP32__ || defined _ILP32)
4599
+
int ok;
4600
+
#else
4601
+
error fail
4602
+
#endif
4603
+
4604
+
_ACEOF
4605
+
if ac_fn_c_try_compile "$LINENO"; then :
4606
+
gl_cv_host_cpu_c_abi_32bit=no
4607
+
else
4608
+
gl_cv_host_cpu_c_abi_32bit=yes
4609
+
fi
4610
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4611
+
;;
4612
+
4613
+
arm* | aarch64 )
4614
+
# Assume arm with EABI.
4615
+
# On arm64 systems, the C compiler may be generating code in one of
4616
+
# these ABIs:
4617
+
# - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
4618
+
# - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
4619
+
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
4620
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4621
+
/* end confdefs.h. */
4622
+
#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
4623
+
int ok;
4624
+
#else
4625
+
error fail
4626
+
#endif
4627
+
4628
+
_ACEOF
4629
+
if ac_fn_c_try_compile "$LINENO"; then :
4630
+
gl_cv_host_cpu_c_abi_32bit=no
4631
+
else
4632
+
gl_cv_host_cpu_c_abi_32bit=yes
4633
+
fi
4634
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4635
+
;;
4636
+
4637
+
hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
4638
+
# On hppa, the C compiler may be generating 32-bit code or 64-bit
4639
+
# code. In the latter case, it defines _LP64 and __LP64__.
4640
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4641
+
/* end confdefs.h. */
4642
+
#ifdef __LP64__
4643
+
int ok;
4644
+
#else
4645
+
error fail
4646
+
#endif
4647
+
4648
+
_ACEOF
4649
+
if ac_fn_c_try_compile "$LINENO"; then :
4650
+
gl_cv_host_cpu_c_abi_32bit=no
4651
+
else
4652
+
gl_cv_host_cpu_c_abi_32bit=yes
4653
+
fi
4654
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4655
+
;;
4656
+
4657
+
ia64* )
4658
+
# On ia64 on HP-UX, the C compiler may be generating 64-bit code or
4659
+
# 32-bit code. In the latter case, it defines _ILP32.
4660
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4661
+
/* end confdefs.h. */
4662
+
#ifdef _ILP32
4663
+
int ok;
4664
+
#else
4665
+
error fail
4666
+
#endif
4667
+
4668
+
_ACEOF
4669
+
if ac_fn_c_try_compile "$LINENO"; then :
4670
+
gl_cv_host_cpu_c_abi_32bit=yes
4671
+
else
4672
+
gl_cv_host_cpu_c_abi_32bit=no
4673
+
fi
4674
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4675
+
;;
4676
+
4677
+
mips* )
4678
+
# We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
4679
+
# at 32.
4680
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4681
+
/* end confdefs.h. */
4682
+
#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
4683
+
int ok;
4684
+
#else
4685
+
error fail
4686
+
#endif
4687
+
4688
+
_ACEOF
4689
+
if ac_fn_c_try_compile "$LINENO"; then :
4690
+
gl_cv_host_cpu_c_abi_32bit=no
4691
+
else
4692
+
gl_cv_host_cpu_c_abi_32bit=yes
4693
+
fi
4694
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4695
+
;;
4696
+
4697
+
powerpc* )
4698
+
# Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
4699
+
# No need to distinguish them here; the caller may distinguish
4700
+
# them based on the OS.
4701
+
# On powerpc64 systems, the C compiler may still be generating
4702
+
# 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
4703
+
# be generating 64-bit code.
4704
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4705
+
/* end confdefs.h. */
4706
+
#if defined __powerpc64__ || defined _ARCH_PPC64
4707
+
int ok;
4708
+
#else
4709
+
error fail
4710
+
#endif
4711
+
4712
+
_ACEOF
4713
+
if ac_fn_c_try_compile "$LINENO"; then :
4714
+
gl_cv_host_cpu_c_abi_32bit=no
4715
+
else
4716
+
gl_cv_host_cpu_c_abi_32bit=yes
4717
+
fi
4718
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4719
+
;;
4720
+
4721
+
rs6000 )
4722
+
gl_cv_host_cpu_c_abi_32bit=yes
4723
+
;;
4724
+
4725
+
riscv32 | riscv64 )
4726
+
# There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
4727
+
# Size of 'long' and 'void *':
4728
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4729
+
/* end confdefs.h. */
4730
+
#if defined __LP64__
4731
+
int ok;
4732
+
#else
4733
+
error fail
4734
+
#endif
4735
+
4736
+
_ACEOF
4737
+
if ac_fn_c_try_compile "$LINENO"; then :
4738
+
gl_cv_host_cpu_c_abi_32bit=no
4739
+
else
4740
+
gl_cv_host_cpu_c_abi_32bit=yes
4741
+
fi
4742
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4743
+
;;
4744
+
4745
+
s390* )
4746
+
# On s390x, the C compiler may be generating 64-bit (= s390x) code
4747
+
# or 31-bit (= s390) code.
4748
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4749
+
/* end confdefs.h. */
4750
+
#if defined __LP64__ || defined __s390x__
4751
+
int ok;
4752
+
#else
4753
+
error fail
4754
+
#endif
4755
+
4756
+
_ACEOF
4757
+
if ac_fn_c_try_compile "$LINENO"; then :
4758
+
gl_cv_host_cpu_c_abi_32bit=no
4759
+
else
4760
+
gl_cv_host_cpu_c_abi_32bit=yes
4761
+
fi
4762
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4763
+
;;
4764
+
4765
+
sparc | sparc64 )
4766
+
# UltraSPARCs running Linux have `uname -m` = "sparc64", but the
4767
+
# C compiler still generates 32-bit code.
4768
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4769
+
/* end confdefs.h. */
4770
+
#if defined __sparcv9 || defined __arch64__
4771
+
int ok;
4772
+
#else
4773
+
error fail
4774
+
#endif
4775
+
4776
+
_ACEOF
4777
+
if ac_fn_c_try_compile "$LINENO"; then :
4778
+
gl_cv_host_cpu_c_abi_32bit=no
4779
+
else
4780
+
gl_cv_host_cpu_c_abi_32bit=yes
4781
+
fi
4782
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4783
+
;;
4784
+
4785
+
*)
4786
+
gl_cv_host_cpu_c_abi_32bit=no
4787
+
;;
4788
+
esac
4789
+
fi
4790
+
4791
+
fi
4792
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
4793
+
$as_echo "$gl_cv_host_cpu_c_abi_32bit" >&6; }
4794
+
4795
+
HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
4796
+
4797
+
4798
+
4799
+
4800
+
4510
4801
case "$host_os" in
4511
4802
solaris*)
4512
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
4803
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
4513
4804
$as_echo_n "checking for 64-bit host... " >&6; }
4514
4805
if ${gl_cv_solaris_64bit+:} false; then :
4515
4806
$as_echo_n "(cached) " >&6
4516
4807
else
4517
4808
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4518
4809
/* end confdefs.h. */
4519
-
4520
4810
#ifdef _LP64
4521
-
sixtyfour bits
4522
-
#endif
4811
+
int ok;
4812
+
#else
4813
+
error fail
4814
+
#endif
4523
4815
4524
4816
_ACEOF
4525
-
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
4526
-
$EGREP "sixtyfour bits" >/dev/null 2>&1; then :
4817
+
if ac_fn_c_try_compile "$LINENO"; then :
4527
4818
gl_cv_solaris_64bit=yes
4528
4819
else
4529
4820
gl_cv_solaris_64bit=no
4530
4821
fi
4531
-
rm -f conftest*
4532
-
4822
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4533
4823
4534
4824
fi
4535
4825
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
4536
-
$as_echo "$gl_cv_solaris_64bit" >&6; }
4537
-
if test $gl_cv_solaris_64bit = yes; then
4538
-
acl_libdirstem=lib/64
4539
-
case "$host_cpu" in
4540
-
sparc*) acl_libdirstem2=lib/sparcv9 ;;
4541
-
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
4542
-
esac
4543
-
fi
4544
-
;;
4545
-
*)
4546
-
searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
4547
-
if test -n "$searchpath"; then
4548
-
acl_save_IFS="${IFS= }"; IFS=":"
4549
-
for searchdir in $searchpath; do
4550
-
if test -d "$searchdir"; then
4551
-
case "$searchdir" in
4552
-
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
4553
-
*/../ | */.. )
4554
-
# Better ignore directories of this form. They are misleading.
4555
-
;;
4556
-
*) searchdir=`cd "$searchdir" && pwd`
4826
+
$as_echo "$gl_cv_solaris_64bit" >&6; };;
4827
+
esac
4828
+
4829
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
4830
+
$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
4831
+
if ${acl_cv_libdirstems+:} false; then :
4832
+
$as_echo_n "(cached) " >&6
4833
+
else
4834
+
acl_libdirstem=lib
4835
+
acl_libdirstem2=
4836
+
case "$host_os" in
4837
+
solaris*)
4838
+
if test $gl_cv_solaris_64bit = yes; then
4839
+
acl_libdirstem=lib/64
4840
+
case "$host_cpu" in
4841
+
sparc*) acl_libdirstem2=lib/sparcv9 ;;
4842
+
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
4843
+
esac
4844
+
fi
4845
+
;;
4846
+
*)
4847
+
if test "$HOST_CPU_C_ABI_32BIT" != yes; then
4848
+
searchpath=`(if test -f /usr/bin/gcc \
4849
+
&& LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
4850
+
LC_ALL=C /usr/bin/gcc -print-search-dirs; \
4851
+
else \
4852
+
LC_ALL=C $CC -print-search-dirs; \
4853
+
fi) 2>/dev/null \
4854
+
| sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
4855
+
if test -n "$searchpath"; then
4856
+
acl_save_IFS="${IFS= }"; IFS=":"
4857
+
for searchdir in $searchpath; do
4858
+
if test -d "$searchdir"; then
4557
4859
case "$searchdir" in
4558
-
*/lib64 ) acl_libdirstem=lib64 ;;
4559
-
esac ;;
4560
-
esac
4561
-
fi
4562
-
done
4563
-
IFS="$acl_save_IFS"
4564
-
fi
4565
-
;;
4566
-
esac
4567
-
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
4860
+
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
4861
+
*/../ | */.. )
4862
+
# Better ignore directories of this form. They are misleading.
4863
+
;;
4864
+
*) searchdir=`cd "$searchdir" && pwd`
4865
+
case "$searchdir" in
4866
+
*/lib64 ) acl_libdirstem=lib64 ;;
4867
+
esac ;;
4868
+
esac
4869
+
fi
4870
+
done
4871
+
IFS="$acl_save_IFS"
4872
+
fi
4873
+
fi
4874
+
;;
4875
+
esac
4876
+
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
4877
+
acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
4568
4878
4879
+
fi
4880
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
4881
+
$as_echo "$acl_cv_libdirstems" >&6; }
4882
+
# Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
4883
+
acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
4884
+
acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
4569
4885
4570
4886
4571
4887
···
4614
4930
additional_includedir="$withval/include"
4615
4931
additional_libdir="$withval/$acl_libdirstem"
4616
4932
if test "$acl_libdirstem2" != "$acl_libdirstem" \
4617
-
&& ! test -d "$withval/$acl_libdirstem"; then
4933
+
&& test ! -d "$withval/$acl_libdirstem"; then
4618
4934
additional_libdir="$withval/$acl_libdirstem2"
4619
4935
fi
4620
4936
fi
···
5036
5352
5037
5353
5038
5354
5039
-
5040
5355
am_save_CPPFLAGS="$CPPFLAGS"
5041
5356
5042
5357
for element in $INCICONV; do
···
5237
5552
#endif
5238
5553
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
5239
5554
provided. */
5240
-
if (/* Try standardized names. */
5241
-
iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
5242
-
/* Try IRIX, OSF/1 names. */
5243
-
&& iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
5244
-
/* Try AIX names. */
5245
-
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
5246
-
/* Try HP-UX names. */
5247
-
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
5248
-
result |= 16;
5555
+
{
5556
+
/* Try standardized names. */
5557
+
iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
5558
+
/* Try IRIX, OSF/1 names. */
5559
+
iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
5560
+
/* Try AIX names. */
5561
+
iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
5562
+
/* Try HP-UX names. */
5563
+
iconv_t cd4 = iconv_open ("utf8", "eucJP");
5564
+
if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
5565
+
&& cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
5566
+
result |= 16;
5567
+
if (cd1 != (iconv_t)(-1))
5568
+
iconv_close (cd1);
5569
+
if (cd2 != (iconv_t)(-1))
5570
+
iconv_close (cd2);
5571
+
if (cd3 != (iconv_t)(-1))
5572
+
iconv_close (cd3);
5573
+
if (cd4 != (iconv_t)(-1))
5574
+
iconv_close (cd4);
5575
+
}
5249
5576
return result;
5250
5577
5251
5578
;
···
5335
5662
$am_cv_proto_iconv" >&5
5336
5663
$as_echo "
5337
5664
$am_cv_proto_iconv" >&6; }
5665
+
else
5666
+
am_cv_proto_iconv_arg1=""
5667
+
fi
5338
5668
5339
5669
cat >>confdefs.h <<_ACEOF
5340
5670
#define ICONV_CONST $am_cv_proto_iconv_arg1
5341
5671
_ACEOF
5342
5672
5343
5673
5344
-
fi
5345
5674
5346
5675
5347
5676
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
···
12496
12825
# report actual input values of CONFIG_FILES etc. instead of their
12497
12826
# values after options handling.
12498
12827
ac_log="
12499
-
This file was extended by xwininfo $as_me 1.1.4, which was
12828
+
This file was extended by xwininfo $as_me 1.1.5, which was
12500
12829
generated by GNU Autoconf 2.69. Invocation command line was
12501
12830
12502
12831
CONFIG_FILES = $CONFIG_FILES
···
12556
12885
Configuration commands:
12557
12886
$config_commands
12558
12887
12559
-
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
12888
+
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xwininfo/issues>."
12560
12889
12561
12890
_ACEOF
12562
12891
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12563
12892
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
12564
12893
ac_cs_version="\\
12565
-
xwininfo config.status 1.1.4
12894
+
xwininfo config.status 1.1.5
12566
12895
configured by $0, generated by GNU Autoconf 2.69,
12567
12896
with options \\"\$ac_cs_config\\"
12568
12897
+2
-2
app/xwininfo/configure.ac
+2
-2
app/xwininfo/configure.ac
···
23
23
24
24
# Initialize Autoconf
25
25
AC_PREREQ([2.60])
26
-
AC_INIT([xwininfo], [1.1.4],
27
-
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xwininfo])
26
+
AC_INIT([xwininfo], [1.1.5],
27
+
[https://gitlab.freedesktop.org/xorg/app/xwininfo/issues], [xwininfo])
28
28
AC_CONFIG_SRCDIR([Makefile.am])
29
29
AC_CONFIG_HEADERS([config.h])
30
30
AC_USE_SYSTEM_EXTENSIONS
+6
-6
app/xwininfo/dsimple.c
+6
-6
app/xwininfo/dsimple.c
···
279
279
{
280
280
xcb_window_t *children;
281
281
unsigned int nchildren;
282
-
int i;
282
+
unsigned int i;
283
283
xcb_window_t w = 0;
284
284
xcb_generic_error_t *err;
285
285
xcb_query_tree_reply_t *tree;
···
295
295
int prop_name_len = xcb_get_property_value_length (prop);
296
296
297
297
/* can't use strcmp, since prop.name is not null terminated */
298
-
if ((namelen == prop_name_len) &&
298
+
if ((namelen == (size_t) prop_name_len) &&
299
299
memcmp (prop_name, name, namelen) == 0) {
300
300
w = window;
301
301
}
···
317
317
if (xcb_icccm_get_wm_name_reply (dpy, cookies->get_wm_name,
318
318
&nameprop, &err)) {
319
319
/* can't use strcmp, since nameprop.name is not null terminated */
320
-
if ((namelen == nameprop.name_len) &&
320
+
if ((namelen == (size_t) nameprop.name_len) &&
321
321
memcmp (nameprop.name, name, namelen) == 0) {
322
322
w = window;
323
323
}
···
333
333
int prop_name_len = xcb_get_property_value_length (prop);
334
334
335
335
/* can't use strcmp, since prop.name is not null terminated */
336
-
if ((namelen == prop_name_len) &&
336
+
if ((namelen == (size_t) prop_name_len) &&
337
337
memcmp (prop_name, name, namelen) == 0) {
338
338
w = window;
339
339
}
···
610
610
a->atom = reply->atom;
611
611
free (reply);
612
612
} else {
613
-
a->atom = -1;
613
+
a->atom = (xcb_atom_t) -1;
614
614
}
615
615
}
616
-
if (a->atom == -1) /* internal error */
616
+
if (a->atom == (xcb_atom_t) -1) /* internal error */
617
617
return XCB_ATOM_NONE;
618
618
619
619
return a->atom;
+8
-8
app/xwininfo/man/xwininfo.man
+8
-8
app/xwininfo/man/xwininfo.man
···
28
28
xwininfo \- window information utility for X
29
29
.SH SYNOPSIS
30
30
.B "xwininfo"
31
-
[\-help] [\-id \fIid\fP] [\-root] [\-name \fIname\fP] [\-int]
31
+
[\-help] [\-id \fIwdid\fP] [\-root] [\-name \fIwdname\fP] [\-int]
32
32
[\-children] [\-tree] [\-stats] [\-bits] [\-events] [\-size] [\-wm] [\-shape]
33
33
[\-frame] [\-all]
34
34
[\-english] [\-metric]
35
-
[\-display \fIdisplay\fP] [\-version]
35
+
[\-display \fIhost:dpy\fP] [\-version]
36
36
.SH DESCRIPTION
37
37
.PP
38
38
.I Xwininfo
···
55
55
Print out the `Usage:' command syntax summary.
56
56
.PP
57
57
.TP 8
58
-
.B "\-id \fIid\fP"
59
-
This option allows the user to specify a target window \fIid\fP on the
58
+
.B "\-id \fIwdid\fP"
59
+
This option allows the user to specify a target window \fIwdid\fP on the
60
60
command line rather than using the mouse to select the target window.
61
61
This is very useful in debugging X applications where the target
62
62
window is not mapped to the screen or where the use of the mouse might
63
63
be impossible or interfere with the application.
64
64
.PP
65
65
.TP 8
66
-
.B "\-name \fIname\fP"
67
-
This option allows the user to specify that the window named \fIname\fP
66
+
.B "\-name \fIwdname\fP"
67
+
This option allows the user to specify that the window named \fIwdname\fP
68
68
is the target window on the command line rather than using the mouse to
69
69
select the target window.
70
70
.PP
···
152
152
This option is a quick way to ask for all information possible.
153
153
.PP
154
154
.TP 8
155
-
.B \-display \fIdisplay\fP
155
+
.B "\-d, \-display" \fIhost:dpy\fP
156
156
This option allows you to specify the server to connect to; see \fIX(__miscmansuffix__)\fP.
157
-
PP
157
+
.PP
158
158
.TP 8
159
159
.B \-version
160
160
This option indicates that
+26
-25
app/xwininfo/xwininfo.c
+26
-25
app/xwininfo/xwininfo.c
···
285
285
fprintf (stderr,
286
286
"usage: %s [-options ...]\n\n"
287
287
"where options include:\n"
288
-
" -help print this message\n"
289
-
" -version print version message\n"
290
-
" -display host:dpy X server to contact\n"
291
-
" -root use the root window\n"
292
-
" -id windowid use the window with the specified id\n"
293
-
" -name windowname use the window with the specified name\n"
294
-
" -int print window id in decimal\n"
295
-
" -children print parent and child identifiers\n"
296
-
" -tree print children identifiers recursively\n"
297
-
" -stats print window geometry [DEFAULT]\n"
298
-
" -bits print window pixel information\n"
299
-
" -events print events selected for on window\n"
300
-
" -size print size hints\n"
301
-
" -wm print window manager hints\n"
302
-
" -shape print shape extents\n"
303
-
" -frame don't ignore window manager frames\n"
304
-
" -english print sizes in english units\n"
305
-
" -metric print sizes in metric units\n"
306
-
" -all -tree, -stats, -bits, -events, -wm, -size, -shape\n"
288
+
" -help print this message\n"
289
+
" -version print version message\n"
290
+
" -d[isplay] <host:dpy> X server to contact\n"
291
+
" -root use the root window\n"
292
+
" -id <wdid> use the window with the specified id\n"
293
+
" -name <wdname> use the window with the specified name\n"
294
+
" -int print window id in decimal\n"
295
+
" -children print parent and child identifiers\n"
296
+
" -tree print children identifiers recursively\n"
297
+
" -stats print window geometry [DEFAULT]\n"
298
+
" -bits print window pixel information\n"
299
+
" -events print events selected for on window\n"
300
+
" -size print size hints\n"
301
+
" -wm print window manager hints\n"
302
+
" -shape print shape extents\n"
303
+
" -frame don't ignore window manager frames\n"
304
+
" -english print sizes in english units\n"
305
+
" -metric print sizes in metric units\n"
306
+
" -all -tree, -stats, -bits, -events, -wm, -size, -shape\n"
307
307
"\n",
308
308
program_name);
309
309
exit (1);
···
716
716
wm_size_hints_t *hints_return, xcb_generic_error_t **wshr_err)
717
717
{
718
718
xcb_get_property_reply_t *prop = xcb_get_property_reply (wshr_dpy, cookie, wshr_err);
719
-
int length;
719
+
size_t length;
720
720
721
721
if (!prop || (prop->type != XCB_ATOM_WM_SIZE_HINTS) ||
722
722
(prop->format != 32)) {
···
726
726
727
727
memset (hints_return, 0, sizeof(wm_size_hints_t));
728
728
729
-
length = xcb_get_property_value_length(prop);
729
+
length = (size_t) xcb_get_property_value_length(prop);
730
730
if (length > sizeof(wm_size_hints_t))
731
731
length = sizeof(wm_size_hints_t);
732
732
memcpy (hints_return, xcb_get_property_value (prop), length);
···
1224
1224
static void
1225
1225
Display_Event_Mask (long mask)
1226
1226
{
1227
-
long bit, bit_mask;
1227
+
unsigned long bit, bit_mask;
1228
1228
1229
1229
for (bit=0, bit_mask=1; bit < sizeof(long)*8; bit++, bit_mask <<= 1)
1230
1230
if (mask & bit_mask)
···
1620
1620
wm_hints_t *hints_return, xcb_generic_error_t **whr_err)
1621
1621
{
1622
1622
xcb_get_property_reply_t *prop = xcb_get_property_reply (whr_dpy, cookie, whr_err);
1623
-
int length;
1623
+
size_t length;
1624
1624
1625
1625
if (!prop || (prop->type != XCB_ATOM_WM_HINTS) || (prop->format != 32)) {
1626
1626
free (prop);
···
1629
1629
1630
1630
memset (hints_return, 0, sizeof(wm_hints_t));
1631
1631
1632
-
length = xcb_get_property_value_length(prop);
1632
+
length = (size_t) xcb_get_property_value_length(prop);
1633
1633
if (length > sizeof(wm_hints_t))
1634
1634
length = sizeof(wm_hints_t);
1635
1635
memcpy (hints_return, xcb_get_property_value (prop), length);
···
1836
1836
is_valid_utf8 (const char *string, size_t len)
1837
1837
{
1838
1838
unsigned long codepoint;
1839
-
int rem, i;
1839
+
int rem;
1840
+
size_t i;
1840
1841
unsigned char c;
1841
1842
1842
1843
rem = 0;