Merge lp:~jamesodhunt/ubuntu/saucy/upstart/1.9.1 into lp:ubuntu/saucy/upstart
- Saucy (13.10)
- 1.9.1
- Merge into saucy
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 1480 | ||||
Proposed branch: | lp:~jamesodhunt/ubuntu/saucy/upstart/1.9.1 | ||||
Merge into: | lp:ubuntu/saucy/upstart | ||||
Diff against target: |
33646 lines (+1118/-29511) 118 files modified
ChangeLog (+27/-0) Makefile.am (+1/-1) Makefile.in (+11/-52) NEWS (+9/-0) aclocal.m4 (+0/-19) conf/Makefile.in (+6/-44) config.h.in (+2/-270) configure (+292/-3317) configure.ac (+4/-4) contrib/Makefile.in (+6/-44) dbus/Makefile.in (+6/-44) debian/changelog (+13/-2) debian/control (+26/-1) debian/copyright (+1/-1) debian/libupstart-dev.install (+5/-0) debian/libupstart1.install (+1/-0) debian/libupstart1.symbols (+2/-0) debian/rules (+6/-0) debian/upstart.postinst (+5/-0) doc/Makefile.in (+6/-44) extra/Makefile.in (+6/-44) init/Makefile.in (+105/-489) init/tests/libwrap_inotify.la (+0/-41) intl/ChangeLog (+0/-4) intl/Makefile.in (+0/-587) intl/VERSION (+0/-1) intl/bindtextdom.c (+0/-340) intl/config.charset (+0/-640) intl/dcgettext.c (+0/-56) intl/dcigettext.c (+0/-1689) intl/dcngettext.c (+0/-57) intl/dgettext.c (+0/-58) intl/dngettext.c (+0/-59) intl/eval-plural.h (+0/-108) intl/explodename.c (+0/-135) intl/export.h (+0/-6) intl/finddomain.c (+0/-212) intl/gettext.c (+0/-63) intl/gettextP.h (+0/-297) intl/gmo.h (+0/-152) intl/hash-string.c (+0/-51) intl/hash-string.h (+0/-36) intl/intl-compat.c (+0/-133) intl/intl-exports.c (+0/-36) intl/l10nflist.c (+0/-400) intl/langprefs.c (+0/-130) intl/libgnuintl.h.in (+0/-419) intl/libintl.rc (+0/-38) intl/loadinfo.h (+0/-132) intl/loadmsgcat.c (+0/-1336) intl/localcharset.c (+0/-461) intl/localcharset.h (+0/-42) intl/locale.alias (+0/-77) intl/localealias.c (+0/-439) intl/localename.c (+0/-1507) intl/lock.c (+0/-922) intl/lock.h (+0/-1105) intl/log.c (+0/-116) intl/ngettext.c (+0/-65) intl/os2compat.c (+0/-98) intl/os2compat.h (+0/-46) intl/osdep.c (+0/-26) intl/plural-exp.c (+0/-155) intl/plural-exp.h (+0/-129) intl/plural.c (+0/-1961) intl/plural.y (+0/-385) intl/printf-args.c (+0/-188) intl/printf-args.h (+0/-155) intl/printf-parse.c (+0/-590) intl/printf-parse.h (+0/-75) intl/printf.c (+0/-427) intl/ref-add.sin (+0/-31) intl/ref-del.sin (+0/-26) intl/relocatable.c (+0/-468) intl/relocatable.h (+0/-79) intl/textdomain.c (+0/-127) intl/tsearch.c (+0/-684) intl/tsearch.h (+0/-83) intl/vasnprintf.c (+0/-4677) intl/vasnprintf.h (+0/-78) intl/vasnwprintf.h (+0/-46) intl/version.c (+0/-26) intl/wprintf-parse.h (+0/-75) intl/xsize.h (+0/-109) lib/Makefile.am (+37/-10) lib/Makefile.in (+229/-398) lib/libupstart.la (+0/-41) lib/libupstart.pc.in.in (+1/-1) lib/tests/test_libupstart.c (+0/-2) lib/upstart.h (+4/-3) ltmain.sh (+2/-2) m4/codeset.m4 (+0/-21) m4/glibc2.m4 (+0/-30) m4/glibc21.m4 (+0/-30) m4/intdiv0.m4 (+0/-84) m4/intl.m4 (+0/-285) m4/intmax.m4 (+0/-33) m4/inttypes-pri.m4 (+0/-36) m4/inttypes_h.m4 (+0/-26) m4/lcmessage.m4 (+0/-30) m4/lock.m4 (+0/-316) m4/longlong.m4 (+0/-109) m4/printf-posix.m4 (+0/-44) m4/size_max.m4 (+0/-68) m4/stdint_h.m4 (+0/-26) m4/uintmax_t.m4 (+0/-30) m4/visibility.m4 (+0/-52) m4/wchar_t.m4 (+0/-20) m4/wint_t.m4 (+0/-28) m4/xsize.m4 (+0/-13) po/en@boldquot.po (+55/-55) po/en@quot.po (+55/-55) po/upstart.pot (+60/-60) scripts/Makefile.in (+6/-44) scripts/data/Makefile.in (+6/-44) scripts/initctl2dot.py (+15/-11) test/Makefile.in (+6/-44) util/Makefile.in (+102/-390) |
||||
To merge this branch: | bzr merge lp:~jamesodhunt/ubuntu/saucy/upstart/1.9.1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Approve | ||
James Hunt (community) | Needs Resubmitting | ||
Ubuntu branches | Pending | ||
Review via email: mp+173221@code.launchpad.net |
Commit message
Description of the change
Dimitri John Ledkov (xnox) wrote : | # |
* I noticed SELINUX support is in ubuntu branch, but not
upstream. Yet, apparmor support is upstream. Is SELINUX not needed
upstream?
* libupstart1 control:
One shouldn't normally use Pre-Depends, typically one uses
Depends. Pre-Depends are used only in very unusual circumstances
when additional guarantees are needed (all dependencies configured
before this package is unpacked). Instead the fields should look
like:
Pre-Depends: $(misc:Pre-Depends)
Depends: $(misc:Depends), $(shlibs:Depends)
There is no need to list libnih-dbus1 dependancy, as the correct one
is already genereated by shlibs:Depends, see libupstart1.
"shlibs:
* upstart-
Since it's a conffile, it will not be automatically removed from
disk by dpkg, such that upgrading to this version of upstart will
keep that file. Thus it needs to be properly removed as done with
dbus-
the "old" way of doing it, it's now possible to use
dpkg-
* Incomplete Multi-Arch:
Packages marked as Multi-Arch, clashing files must be identical, if
they are different they should be shipped in arch-qualified
locations. One file /usr/lib/
-libdir=
+libdir=
Thus it should be instead shipped in /usr/lib/
- 1477. By James Hunt
-
* debian/control: Simplify dependencies and avoid hard-coding those
which can be auto-generated.
* debian/rules: Install libupstart.pc to correct multi-arch location.
* debian/upstart. postinst: Handle safe removal of
upstart-dbus-bridge. conf (which is not used at the system level). - 1478. By James Hunt
-
debian/control: Add build-depends on automake >= 1.12 for serial-tests
in configure.ac (LP: #1197529). - 1479. By James Hunt
-
debian/control: Correct automake relation.
- 1480. By James Hunt
-
debian/
libupstart- dev.install: Specify wildcarded path (for multi-arch).
James Hunt (jamesodhunt) wrote : | # |
Branch updated.
James Hunt (jamesodhunt) wrote : | # |
Oh - and yes of course we *do* want to support SELinux upstream: slangasek is handling this as a separate activity I believe.
Dimitri John Ledkov (xnox) wrote : | # |
* I think we do need to override dh_makeshlibs call and specify wanted version number (1.9.1) similar to libnih, since at the moment the symbols ended up to be over-versioned =)
libupstart.so.1 libupstart1 #MINVER#
LIBUPSTART_
job_class_
job_class_
job_class_
job_class_
job_class_
job_class_
job_class_
....
* dpkg-maintainer
Otherwise looks good. I guess it's ok to merge this branch now, but above two issues need to be fixed up. You or me can do that on lp:ubuntu/upstart directly.
Preview Diff
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2013-07-03 08:38:58 +0000 |
3 | +++ ChangeLog 2013-07-08 13:07:28 +0000 |
4 | @@ -1,3 +1,12 @@ |
5 | +2013-07-04 James Hunt <james.hunt@ubuntu.com> |
6 | + |
7 | + * NEWS: Release 1.9.1 |
8 | + |
9 | +2013-07-04 James Hunt <james.hunt@ubuntu.com> |
10 | + |
11 | + * Perform 2-pass generation of libupstart.pc to ensure library |
12 | + version specified correctly. |
13 | + |
14 | 2013-07-03 James Hunt <james.hunt@ubuntu.com> |
15 | |
16 | * extra/upstart-dbus-bridge.c: main(): Check nih_str_split() return. |
17 | @@ -6,6 +15,24 @@ |
18 | - Check nih_str_split() return. |
19 | - Only attempt to extract PID from UPSTART_SESSION |
20 | in user mode (LP: #1197225). |
21 | + * Makefile.am: Remove intl directory. |
22 | + * configure.ac: Use external gettext library. |
23 | + |
24 | +2013-07-02 James Hunt <james.hunt@ubuntu.com> |
25 | + |
26 | + * lib/Makefile.am: Make nih-dbus-tool generate code into the |
27 | + upstart/ directory as we need it there to allow the tests to run |
28 | + against a simulated installed header directory. |
29 | + * lib/tests/test_libupstart.c: Remove unecessary include (which |
30 | + is now included automatically by upstart.h). |
31 | + |
32 | +2013-07-01 James Hunt <james.hunt@ubuntu.com> |
33 | + |
34 | + * lib/Makefile.am: |
35 | + - Install client library headers. |
36 | + - Add missing backslash. |
37 | + * lib/upstart.h: Look in upstart/ sub-directory for |
38 | + auto-generated header files. |
39 | |
40 | 2013-06-28 James Hunt <james.hunt@ubuntu.com> |
41 | |
42 | |
43 | === modified file 'Makefile.am' |
44 | --- Makefile.am 2013-06-28 15:57:37 +0000 |
45 | +++ Makefile.am 2013-07-08 13:07:28 +0000 |
46 | @@ -1,6 +1,6 @@ |
47 | ## Process this file with automake to produce Makefile.in |
48 | |
49 | -SUBDIRS = test intl dbus init util extra lib conf doc contrib po scripts |
50 | +SUBDIRS = test dbus init util extra lib conf doc contrib po scripts |
51 | |
52 | EXTRA_DIST = HACKING |
53 | |
54 | |
55 | === modified file 'Makefile.in' |
56 | --- Makefile.in 2013-06-28 15:36:50 +0000 |
57 | +++ Makefile.in 2013-07-08 13:07:28 +0000 |
58 | @@ -81,36 +81,26 @@ |
59 | DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
60 | $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
61 | $(top_srcdir)/configure $(am__configure_deps) \ |
62 | - $(srcdir)/config.h.in $(top_srcdir)/intl/Makefile.in ABOUT-NLS \ |
63 | - COPYING TODO compile config.guess config.rpath config.sub \ |
64 | - depcomp install-sh missing ltmain.sh |
65 | + $(srcdir)/config.h.in ABOUT-NLS COPYING TODO compile \ |
66 | + config.guess config.rpath config.sub depcomp install-sh \ |
67 | + missing ltmain.sh |
68 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
69 | -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ |
70 | - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ |
71 | - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ |
72 | - $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ |
73 | - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \ |
74 | - $(top_srcdir)/m4/inttypes-pri.m4 \ |
75 | - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ |
76 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
77 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
78 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
79 | $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \ |
80 | - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ |
81 | - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
82 | + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
83 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
84 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ |
85 | $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ |
86 | - $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ |
87 | - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ |
88 | - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \ |
89 | - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ |
90 | - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac |
91 | + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
92 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
93 | $(ACLOCAL_M4) |
94 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
95 | configure.lineno config.status.lineno |
96 | mkinstalldirs = $(install_sh) -d |
97 | CONFIG_HEADER = config.h |
98 | -CONFIG_CLEAN_FILES = intl/Makefile |
99 | +CONFIG_CLEAN_FILES = |
100 | CONFIG_CLEAN_VPATH_FILES = |
101 | AM_V_P = $(am__v_P_@AM_V@) |
102 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
103 | @@ -213,7 +203,6 @@ |
104 | distcleancheck_listfiles = find . -type f -print |
105 | ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@ |
106 | ACLOCAL = @ACLOCAL@ |
107 | -ALLOCA = @ALLOCA@ |
108 | AMTAR = @AMTAR@ |
109 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
110 | AR = @AR@ |
111 | @@ -221,16 +210,12 @@ |
112 | AUTOHEADER = @AUTOHEADER@ |
113 | AUTOMAKE = @AUTOMAKE@ |
114 | AWK = @AWK@ |
115 | -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ |
116 | -CATOBJEXT = @CATOBJEXT@ |
117 | CC = @CC@ |
118 | CCDEPMODE = @CCDEPMODE@ |
119 | CFLAGS = @CFLAGS@ |
120 | -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ |
121 | CPP = @CPP@ |
122 | CPPFLAGS = @CPPFLAGS@ |
123 | CYGPATH_W = @CYGPATH_W@ |
124 | -DATADIRNAME = @DATADIRNAME@ |
125 | DBUS_CFLAGS = @DBUS_CFLAGS@ |
126 | DBUS_LIBS = @DBUS_LIBS@ |
127 | DEFS = @DEFS@ |
128 | @@ -244,28 +229,16 @@ |
129 | EGREP = @EGREP@ |
130 | EXEEXT = @EXEEXT@ |
131 | FGREP = @FGREP@ |
132 | -GENCAT = @GENCAT@ |
133 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
134 | -GLIBC2 = @GLIBC2@ |
135 | -GLIBC21 = @GLIBC21@ |
136 | GMSGFMT = @GMSGFMT@ |
137 | GMSGFMT_015 = @GMSGFMT_015@ |
138 | GREP = @GREP@ |
139 | -HAVE_ASPRINTF = @HAVE_ASPRINTF@ |
140 | -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ |
141 | -HAVE_SNPRINTF = @HAVE_SNPRINTF@ |
142 | -HAVE_VISIBILITY = @HAVE_VISIBILITY@ |
143 | -HAVE_WPRINTF = @HAVE_WPRINTF@ |
144 | INSTALL = @INSTALL@ |
145 | INSTALL_DATA = @INSTALL_DATA@ |
146 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
147 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
148 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
149 | -INSTOBJEXT = @INSTOBJEXT@ |
150 | -INTLBISON = @INTLBISON@ |
151 | INTLLIBS = @INTLLIBS@ |
152 | -INTLOBJS = @INTLOBJS@ |
153 | -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ |
154 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
155 | JSON_CFLAGS = @JSON_CFLAGS@ |
156 | JSON_LIBS = @JSON_LIBS@ |
157 | @@ -273,22 +246,14 @@ |
158 | LDFLAGS = @LDFLAGS@ |
159 | LIBICONV = @LIBICONV@ |
160 | LIBINTL = @LIBINTL@ |
161 | -LIBMULTITHREAD = @LIBMULTITHREAD@ |
162 | LIBOBJS = @LIBOBJS@ |
163 | -LIBPTH = @LIBPTH@ |
164 | -LIBPTH_PREFIX = @LIBPTH_PREFIX@ |
165 | LIBS = @LIBS@ |
166 | -LIBTHREAD = @LIBTHREAD@ |
167 | LIBTOOL = @LIBTOOL@ |
168 | LIPO = @LIPO@ |
169 | LN_S = @LN_S@ |
170 | -LTLIBC = @LTLIBC@ |
171 | LTLIBICONV = @LTLIBICONV@ |
172 | LTLIBINTL = @LTLIBINTL@ |
173 | -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ |
174 | LTLIBOBJS = @LTLIBOBJS@ |
175 | -LTLIBPTH = @LTLIBPTH@ |
176 | -LTLIBTHREAD = @LTLIBTHREAD@ |
177 | MAINT = @MAINT@ |
178 | MAKEINFO = @MAKEINFO@ |
179 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
180 | @@ -320,20 +285,17 @@ |
181 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
182 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
183 | POSUB = @POSUB@ |
184 | -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ |
185 | RANLIB = @RANLIB@ |
186 | SED = @SED@ |
187 | +SELINUX_CFLAGS = @SELINUX_CFLAGS@ |
188 | +SELINUX_LIBS = @SELINUX_LIBS@ |
189 | SET_MAKE = @SET_MAKE@ |
190 | SHELL = @SHELL@ |
191 | STRIP = @STRIP@ |
192 | UDEV_CFLAGS = @UDEV_CFLAGS@ |
193 | UDEV_LIBS = @UDEV_LIBS@ |
194 | -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ |
195 | USE_NLS = @USE_NLS@ |
196 | VERSION = @VERSION@ |
197 | -WINDRES = @WINDRES@ |
198 | -WOE32 = @WOE32@ |
199 | -WOE32DLL = @WOE32DLL@ |
200 | XGETTEXT = @XGETTEXT@ |
201 | XGETTEXT_015 = @XGETTEXT_015@ |
202 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
203 | @@ -389,7 +351,7 @@ |
204 | top_build_prefix = @top_build_prefix@ |
205 | top_builddir = @top_builddir@ |
206 | top_srcdir = @top_srcdir@ |
207 | -SUBDIRS = test intl dbus init util extra lib conf doc contrib po scripts |
208 | +SUBDIRS = test dbus init util extra lib conf doc contrib po scripts |
209 | EXTRA_DIST = HACKING |
210 | ACLOCAL_AMFLAGS = --install -I m4 |
211 | |
212 | @@ -448,8 +410,6 @@ |
213 | |
214 | distclean-hdr: |
215 | -rm -f config.h stamp-h1 |
216 | -intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in |
217 | - cd $(top_builddir) && $(SHELL) ./config.status $@ |
218 | |
219 | mostlyclean-libtool: |
220 | -rm -f *.lo |
221 | @@ -699,7 +659,6 @@ |
222 | && am__cwd=`pwd` \ |
223 | && $(am__cd) $(distdir)/_build \ |
224 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
225 | - --with-included-gettext \ |
226 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
227 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
228 | && $(MAKE) $(AM_MAKEFLAGS) \ |
229 | |
230 | === modified file 'NEWS' |
231 | --- NEWS 2013-06-28 15:57:37 +0000 |
232 | +++ NEWS 2013-07-08 13:07:28 +0000 |
233 | @@ -1,3 +1,12 @@ |
234 | +1.9.1 2013-07-04 "The all-inclusive deal" |
235 | + |
236 | + * Fix respawn behaviour regression (introduced in version 1.8) affecting |
237 | + jobs which also specify shell meta-characters in the exec stanza |
238 | + (LP: #1181789). |
239 | + * Fix common bug which could cause a bridge to crash (LP: #1197225). |
240 | + * Various fixes for libupstart. |
241 | + * initctl2dot: Layout improvements. |
242 | + |
243 | 1.9 2013-06-28 "This village isn't even on the map" |
244 | |
245 | * Apparmor support added by means of two new stanzas: 'apparmor load' |
246 | |
247 | === modified file 'aclocal.m4' |
248 | --- aclocal.m4 2013-06-28 15:36:50 +0000 |
249 | +++ aclocal.m4 2013-07-08 13:07:28 +0000 |
250 | @@ -1137,25 +1137,14 @@ |
251 | AC_SUBST([am__untar]) |
252 | ]) # _AM_PROG_TAR |
253 | |
254 | -m4_include([m4/codeset.m4]) |
255 | m4_include([m4/gettext.m4]) |
256 | -m4_include([m4/glibc2.m4]) |
257 | -m4_include([m4/glibc21.m4]) |
258 | m4_include([m4/iconv.m4]) |
259 | -m4_include([m4/intdiv0.m4]) |
260 | -m4_include([m4/intl.m4]) |
261 | m4_include([m4/intlmacosx.m4]) |
262 | -m4_include([m4/intmax.m4]) |
263 | -m4_include([m4/inttypes-pri.m4]) |
264 | -m4_include([m4/inttypes_h.m4]) |
265 | -m4_include([m4/lcmessage.m4]) |
266 | m4_include([m4/lib-ld.m4]) |
267 | m4_include([m4/lib-link.m4]) |
268 | m4_include([m4/lib-prefix.m4]) |
269 | m4_include([m4/libnih.m4]) |
270 | m4_include([m4/libtool.m4]) |
271 | -m4_include([m4/lock.m4]) |
272 | -m4_include([m4/longlong.m4]) |
273 | m4_include([m4/ltoptions.m4]) |
274 | m4_include([m4/ltsugar.m4]) |
275 | m4_include([m4/ltversion.m4]) |
276 | @@ -1163,12 +1152,4 @@ |
277 | m4_include([m4/nls.m4]) |
278 | m4_include([m4/pkg.m4]) |
279 | m4_include([m4/po.m4]) |
280 | -m4_include([m4/printf-posix.m4]) |
281 | m4_include([m4/progtest.m4]) |
282 | -m4_include([m4/size_max.m4]) |
283 | -m4_include([m4/stdint_h.m4]) |
284 | -m4_include([m4/uintmax_t.m4]) |
285 | -m4_include([m4/visibility.m4]) |
286 | -m4_include([m4/wchar_t.m4]) |
287 | -m4_include([m4/wint_t.m4]) |
288 | -m4_include([m4/xsize.m4]) |
289 | |
290 | === modified file 'conf/Makefile.in' |
291 | --- conf/Makefile.in 2013-06-28 15:36:50 +0000 |
292 | +++ conf/Makefile.in 2013-07-08 13:07:28 +0000 |
293 | @@ -82,25 +82,15 @@ |
294 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
295 | $(dist_init_DATA) |
296 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
297 | -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ |
298 | - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ |
299 | - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ |
300 | - $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ |
301 | - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \ |
302 | - $(top_srcdir)/m4/inttypes-pri.m4 \ |
303 | - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ |
304 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
305 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
306 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
307 | $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \ |
308 | - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ |
309 | - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
310 | + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
311 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
312 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ |
313 | $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ |
314 | - $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ |
315 | - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ |
316 | - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \ |
317 | - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ |
318 | - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac |
319 | + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
320 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
321 | $(ACLOCAL_M4) |
322 | mkinstalldirs = $(install_sh) -d |
323 | @@ -159,7 +149,6 @@ |
324 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
325 | ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@ |
326 | ACLOCAL = @ACLOCAL@ |
327 | -ALLOCA = @ALLOCA@ |
328 | AMTAR = @AMTAR@ |
329 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
330 | AR = @AR@ |
331 | @@ -167,16 +156,12 @@ |
332 | AUTOHEADER = @AUTOHEADER@ |
333 | AUTOMAKE = @AUTOMAKE@ |
334 | AWK = @AWK@ |
335 | -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ |
336 | -CATOBJEXT = @CATOBJEXT@ |
337 | CC = @CC@ |
338 | CCDEPMODE = @CCDEPMODE@ |
339 | CFLAGS = @CFLAGS@ |
340 | -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ |
341 | CPP = @CPP@ |
342 | CPPFLAGS = @CPPFLAGS@ |
343 | CYGPATH_W = @CYGPATH_W@ |
344 | -DATADIRNAME = @DATADIRNAME@ |
345 | DBUS_CFLAGS = @DBUS_CFLAGS@ |
346 | DBUS_LIBS = @DBUS_LIBS@ |
347 | DEFS = @DEFS@ |
348 | @@ -190,28 +175,16 @@ |
349 | EGREP = @EGREP@ |
350 | EXEEXT = @EXEEXT@ |
351 | FGREP = @FGREP@ |
352 | -GENCAT = @GENCAT@ |
353 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
354 | -GLIBC2 = @GLIBC2@ |
355 | -GLIBC21 = @GLIBC21@ |
356 | GMSGFMT = @GMSGFMT@ |
357 | GMSGFMT_015 = @GMSGFMT_015@ |
358 | GREP = @GREP@ |
359 | -HAVE_ASPRINTF = @HAVE_ASPRINTF@ |
360 | -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ |
361 | -HAVE_SNPRINTF = @HAVE_SNPRINTF@ |
362 | -HAVE_VISIBILITY = @HAVE_VISIBILITY@ |
363 | -HAVE_WPRINTF = @HAVE_WPRINTF@ |
364 | INSTALL = @INSTALL@ |
365 | INSTALL_DATA = @INSTALL_DATA@ |
366 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
367 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
368 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
369 | -INSTOBJEXT = @INSTOBJEXT@ |
370 | -INTLBISON = @INTLBISON@ |
371 | INTLLIBS = @INTLLIBS@ |
372 | -INTLOBJS = @INTLOBJS@ |
373 | -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ |
374 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
375 | JSON_CFLAGS = @JSON_CFLAGS@ |
376 | JSON_LIBS = @JSON_LIBS@ |
377 | @@ -219,22 +192,14 @@ |
378 | LDFLAGS = @LDFLAGS@ |
379 | LIBICONV = @LIBICONV@ |
380 | LIBINTL = @LIBINTL@ |
381 | -LIBMULTITHREAD = @LIBMULTITHREAD@ |
382 | LIBOBJS = @LIBOBJS@ |
383 | -LIBPTH = @LIBPTH@ |
384 | -LIBPTH_PREFIX = @LIBPTH_PREFIX@ |
385 | LIBS = @LIBS@ |
386 | -LIBTHREAD = @LIBTHREAD@ |
387 | LIBTOOL = @LIBTOOL@ |
388 | LIPO = @LIPO@ |
389 | LN_S = @LN_S@ |
390 | -LTLIBC = @LTLIBC@ |
391 | LTLIBICONV = @LTLIBICONV@ |
392 | LTLIBINTL = @LTLIBINTL@ |
393 | -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ |
394 | LTLIBOBJS = @LTLIBOBJS@ |
395 | -LTLIBPTH = @LTLIBPTH@ |
396 | -LTLIBTHREAD = @LTLIBTHREAD@ |
397 | MAINT = @MAINT@ |
398 | MAKEINFO = @MAKEINFO@ |
399 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
400 | @@ -266,20 +231,17 @@ |
401 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
402 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
403 | POSUB = @POSUB@ |
404 | -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ |
405 | RANLIB = @RANLIB@ |
406 | SED = @SED@ |
407 | +SELINUX_CFLAGS = @SELINUX_CFLAGS@ |
408 | +SELINUX_LIBS = @SELINUX_LIBS@ |
409 | SET_MAKE = @SET_MAKE@ |
410 | SHELL = @SHELL@ |
411 | STRIP = @STRIP@ |
412 | UDEV_CFLAGS = @UDEV_CFLAGS@ |
413 | UDEV_LIBS = @UDEV_LIBS@ |
414 | -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ |
415 | USE_NLS = @USE_NLS@ |
416 | VERSION = @VERSION@ |
417 | -WINDRES = @WINDRES@ |
418 | -WOE32 = @WOE32@ |
419 | -WOE32DLL = @WOE32DLL@ |
420 | XGETTEXT = @XGETTEXT@ |
421 | XGETTEXT_015 = @XGETTEXT_015@ |
422 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
423 | |
424 | === modified file 'config.h.in' |
425 | --- config.h.in 2013-04-09 06:45:29 +0000 |
426 | +++ config.h.in 2013-07-08 13:07:28 +0000 |
427 | @@ -1,13 +1,5 @@ |
428 | /* config.h.in. Generated from configure.ac by autoheader. */ |
429 | |
430 | -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP |
431 | - systems. This function is required for `alloca.c' support on those systems. |
432 | - */ |
433 | -#undef CRAY_STACKSEG_END |
434 | - |
435 | -/* Define to 1 if using `alloca.c'. */ |
436 | -#undef C_ALLOCA |
437 | - |
438 | /* Define to 1 if translation of program messages to the user's native |
439 | language is requested. */ |
440 | #undef ENABLE_NLS |
441 | @@ -15,31 +7,6 @@ |
442 | /* Directory to append to path. */ |
443 | #undef EXTRA_PATH |
444 | |
445 | -/* Define to 1 if you have `alloca', as a function or macro. */ |
446 | -#undef HAVE_ALLOCA |
447 | - |
448 | -/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). |
449 | - */ |
450 | -#undef HAVE_ALLOCA_H |
451 | - |
452 | -/* Define to 1 if you have the `argz_count' function. */ |
453 | -#undef HAVE_ARGZ_COUNT |
454 | - |
455 | -/* Define to 1 if you have the <argz.h> header file. */ |
456 | -#undef HAVE_ARGZ_H |
457 | - |
458 | -/* Define to 1 if you have the `argz_next' function. */ |
459 | -#undef HAVE_ARGZ_NEXT |
460 | - |
461 | -/* Define to 1 if you have the `argz_stringify' function. */ |
462 | -#undef HAVE_ARGZ_STRINGIFY |
463 | - |
464 | -/* Define to 1 if you have the `asprintf' function. */ |
465 | -#undef HAVE_ASPRINTF |
466 | - |
467 | -/* Define to 1 if the compiler understands __builtin_expect. */ |
468 | -#undef HAVE_BUILTIN_EXPECT |
469 | - |
470 | /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the |
471 | CoreFoundation framework. */ |
472 | #undef HAVE_CFLOCALECOPYCURRENT |
473 | @@ -52,149 +19,36 @@ |
474 | */ |
475 | #undef HAVE_DCGETTEXT |
476 | |
477 | -/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you |
478 | - don't. */ |
479 | -#undef HAVE_DECL_FEOF_UNLOCKED |
480 | - |
481 | -/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if |
482 | - you don't. */ |
483 | -#undef HAVE_DECL_FGETS_UNLOCKED |
484 | - |
485 | -/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you |
486 | - don't. */ |
487 | -#undef HAVE_DECL_GETC_UNLOCKED |
488 | - |
489 | -/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you |
490 | - don't. */ |
491 | -#undef HAVE_DECL__SNPRINTF |
492 | - |
493 | -/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you |
494 | - don't. */ |
495 | -#undef HAVE_DECL__SNWPRINTF |
496 | - |
497 | /* Define to 1 if you have the <dlfcn.h> header file. */ |
498 | #undef HAVE_DLFCN_H |
499 | |
500 | -/* Define to 1 if you have the `fwprintf' function. */ |
501 | -#undef HAVE_FWPRINTF |
502 | - |
503 | -/* Define to 1 if you have the `getcwd' function. */ |
504 | -#undef HAVE_GETCWD |
505 | - |
506 | -/* Define to 1 if you have the `getegid' function. */ |
507 | -#undef HAVE_GETEGID |
508 | - |
509 | -/* Define to 1 if you have the `geteuid' function. */ |
510 | -#undef HAVE_GETEUID |
511 | - |
512 | -/* Define to 1 if you have the `getgid' function. */ |
513 | -#undef HAVE_GETGID |
514 | - |
515 | -/* Define to 1 if you have the `getpagesize' function. */ |
516 | -#undef HAVE_GETPAGESIZE |
517 | - |
518 | /* Define if the GNU gettext() function is already present or preinstalled. */ |
519 | #undef HAVE_GETTEXT |
520 | |
521 | -/* Define to 1 if you have the `getuid' function. */ |
522 | -#undef HAVE_GETUID |
523 | - |
524 | /* Define if you have the iconv() function and it works. */ |
525 | #undef HAVE_ICONV |
526 | |
527 | -/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */ |
528 | -#undef HAVE_INTMAX_T |
529 | - |
530 | /* Define to 1 if you have the <inttypes.h> header file. */ |
531 | #undef HAVE_INTTYPES_H |
532 | |
533 | -/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and |
534 | - declares uintmax_t. */ |
535 | -#undef HAVE_INTTYPES_H_WITH_UINTMAX |
536 | - |
537 | -/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ |
538 | -#undef HAVE_LANGINFO_CODESET |
539 | - |
540 | -/* Define if your <locale.h> file defines LC_MESSAGES. */ |
541 | -#undef HAVE_LC_MESSAGES |
542 | - |
543 | -/* Define to 1 if you have the <limits.h> header file. */ |
544 | -#undef HAVE_LIMITS_H |
545 | - |
546 | -/* Define to 1 if the system has the type `long long int'. */ |
547 | -#undef HAVE_LONG_LONG_INT |
548 | - |
549 | /* Define to 1 if you have the <memory.h> header file. */ |
550 | #undef HAVE_MEMORY_H |
551 | |
552 | -/* Define to 1 if you have the `mempcpy' function. */ |
553 | -#undef HAVE_MEMPCPY |
554 | - |
555 | -/* Define to 1 if you have a working `mmap' system call. */ |
556 | -#undef HAVE_MMAP |
557 | - |
558 | -/* Define to 1 if you have the `munmap' function. */ |
559 | -#undef HAVE_MUNMAP |
560 | - |
561 | -/* Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if |
562 | - _GNU_SOURCE is defined. */ |
563 | -#undef HAVE_NL_LOCALE_NAME |
564 | - |
565 | -/* Define if your printf() function supports format strings with positions. */ |
566 | -#undef HAVE_POSIX_PRINTF |
567 | - |
568 | -/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */ |
569 | -#undef HAVE_PTHREAD_MUTEX_RECURSIVE |
570 | - |
571 | -/* Define if the POSIX multithreading library has read/write locks. */ |
572 | -#undef HAVE_PTHREAD_RWLOCK |
573 | - |
574 | -/* Define to 1 if you have the `putenv' function. */ |
575 | -#undef HAVE_PUTENV |
576 | - |
577 | -/* Define to 1 if you have the `setenv' function. */ |
578 | -#undef HAVE_SETENV |
579 | - |
580 | -/* Define to 1 if you have the `setlocale' function. */ |
581 | -#undef HAVE_SETLOCALE |
582 | - |
583 | -/* Define to 1 if you have the `snprintf' function. */ |
584 | -#undef HAVE_SNPRINTF |
585 | - |
586 | -/* Define to 1 if you have the <stddef.h> header file. */ |
587 | -#undef HAVE_STDDEF_H |
588 | +/* Define if we have SELinux */ |
589 | +#undef HAVE_SELINUX |
590 | |
591 | /* Define to 1 if you have the <stdint.h> header file. */ |
592 | #undef HAVE_STDINT_H |
593 | |
594 | -/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares |
595 | - uintmax_t. */ |
596 | -#undef HAVE_STDINT_H_WITH_UINTMAX |
597 | - |
598 | /* Define to 1 if you have the <stdlib.h> header file. */ |
599 | #undef HAVE_STDLIB_H |
600 | |
601 | -/* Define to 1 if you have the `stpcpy' function. */ |
602 | -#undef HAVE_STPCPY |
603 | - |
604 | -/* Define to 1 if you have the `strcasecmp' function. */ |
605 | -#undef HAVE_STRCASECMP |
606 | - |
607 | -/* Define to 1 if you have the `strdup' function. */ |
608 | -#undef HAVE_STRDUP |
609 | - |
610 | /* Define to 1 if you have the <strings.h> header file. */ |
611 | #undef HAVE_STRINGS_H |
612 | |
613 | /* Define to 1 if you have the <string.h> header file. */ |
614 | #undef HAVE_STRING_H |
615 | |
616 | -/* Define to 1 if you have the `strtoul' function. */ |
617 | -#undef HAVE_STRTOUL |
618 | - |
619 | -/* Define to 1 if you have the <sys/param.h> header file. */ |
620 | -#undef HAVE_SYS_PARAM_H |
621 | - |
622 | /* Define to 1 if you have the <sys/prctl.h> header file. */ |
623 | #undef HAVE_SYS_PRCTL_H |
624 | |
625 | @@ -204,43 +58,12 @@ |
626 | /* Define to 1 if you have the <sys/types.h> header file. */ |
627 | #undef HAVE_SYS_TYPES_H |
628 | |
629 | -/* Define to 1 if you have the `tsearch' function. */ |
630 | -#undef HAVE_TSEARCH |
631 | - |
632 | -/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */ |
633 | -#undef HAVE_UINTMAX_T |
634 | - |
635 | /* Define to 1 if you have the <unistd.h> header file. */ |
636 | #undef HAVE_UNISTD_H |
637 | |
638 | -/* Define to 1 if the system has the type `unsigned long long int'. */ |
639 | -#undef HAVE_UNSIGNED_LONG_LONG_INT |
640 | - |
641 | /* Define to 1 if you have the <valgrind/valgrind.h,> header file. */ |
642 | #undef HAVE_VALGRIND_VALGRIND_H_ |
643 | |
644 | -/* Define to 1 or 0, depending whether the compiler supports simple visibility |
645 | - declarations. */ |
646 | -#undef HAVE_VISIBILITY |
647 | - |
648 | -/* Define if you have the 'wchar_t' type. */ |
649 | -#undef HAVE_WCHAR_T |
650 | - |
651 | -/* Define to 1 if you have the `wcslen' function. */ |
652 | -#undef HAVE_WCSLEN |
653 | - |
654 | -/* Define if you have the 'wint_t' type. */ |
655 | -#undef HAVE_WINT_T |
656 | - |
657 | -/* Define to 1 if you have the `__fsetlocking' function. */ |
658 | -#undef HAVE___FSETLOCKING |
659 | - |
660 | -/* Define as const if the declaration of iconv() needs const. */ |
661 | -#undef ICONV_CONST |
662 | - |
663 | -/* Define if integer division by zero raises signal SIGFPE. */ |
664 | -#undef INTDIV0_RAISES_SIGFPE |
665 | - |
666 | /* Define to the sub-directory in which libtool stores uninstalled libraries. |
667 | */ |
668 | #undef LT_OBJDIR |
669 | @@ -272,12 +95,6 @@ |
670 | /* Define to the version of this package. */ |
671 | #undef PACKAGE_VERSION |
672 | |
673 | -/* Define if <inttypes.h> exists and defines unusable PRI* macros. */ |
674 | -#undef PRI_MACROS_BROKEN |
675 | - |
676 | -/* Define if the pthread_in_use() detection is hard. */ |
677 | -#undef PTHREAD_IN_USE_DETECTION_HARD |
678 | - |
679 | /* The size of `int', as computed by sizeof. */ |
680 | #undef SIZEOF_INT |
681 | |
682 | @@ -299,42 +116,9 @@ |
683 | /* The size of `uid_t', as computed by sizeof. */ |
684 | #undef SIZEOF_UID_T |
685 | |
686 | -/* Define as the maximum value of type 'size_t', if the system doesn't define |
687 | - it. */ |
688 | -#undef SIZE_MAX |
689 | - |
690 | -/* If using the C implementation of alloca, define if you know the |
691 | - direction of stack growth for your system; otherwise it will be |
692 | - automatically deduced at runtime. |
693 | - STACK_DIRECTION > 0 => grows toward higher addresses |
694 | - STACK_DIRECTION < 0 => grows toward lower addresses |
695 | - STACK_DIRECTION = 0 => direction of growth unknown */ |
696 | -#undef STACK_DIRECTION |
697 | - |
698 | /* Define to 1 if you have the ANSI C header files. */ |
699 | #undef STDC_HEADERS |
700 | |
701 | -/* Define if the POSIX multithreading library can be used. */ |
702 | -#undef USE_POSIX_THREADS |
703 | - |
704 | -/* Define if references to the POSIX multithreading library should be made |
705 | - weak. */ |
706 | -#undef USE_POSIX_THREADS_WEAK |
707 | - |
708 | -/* Define if the GNU Pth multithreading library can be used. */ |
709 | -#undef USE_PTH_THREADS |
710 | - |
711 | -/* Define if references to the GNU Pth multithreading library should be made |
712 | - weak. */ |
713 | -#undef USE_PTH_THREADS_WEAK |
714 | - |
715 | -/* Define if the old Solaris multithreading library can be used. */ |
716 | -#undef USE_SOLARIS_THREADS |
717 | - |
718 | -/* Define if references to the old Solaris multithreading library should be |
719 | - made weak. */ |
720 | -#undef USE_SOLARIS_THREADS_WEAK |
721 | - |
722 | /* Enable extensions on AIX 3, Interix. */ |
723 | #ifndef _ALL_SOURCE |
724 | # undef _ALL_SOURCE |
725 | @@ -357,9 +141,6 @@ |
726 | #endif |
727 | |
728 | |
729 | -/* Define if the Win32 multithreading API can be used. */ |
730 | -#undef USE_WIN32_THREADS |
731 | - |
732 | /* Version number of package */ |
733 | #undef VERSION |
734 | |
735 | @@ -375,52 +156,3 @@ |
736 | |
737 | /* Define to empty if `__thread' is not supported. */ |
738 | #undef __thread |
739 | - |
740 | -/* Define to `__inline__' or `__inline' if that's what the C compiler |
741 | - calls it, or to nothing if 'inline' is not supported under any name. */ |
742 | -#ifndef __cplusplus |
743 | -#undef inline |
744 | -#endif |
745 | - |
746 | -/* Define as the type of the result of subtracting two pointers, if the system |
747 | - doesn't define it. */ |
748 | -#undef ptrdiff_t |
749 | - |
750 | -/* Define to `unsigned int' if <sys/types.h> does not define. */ |
751 | -#undef size_t |
752 | - |
753 | -/* Define to unsigned long or unsigned long long if <stdint.h> and |
754 | - <inttypes.h> don't define. */ |
755 | -#undef uintmax_t |
756 | - |
757 | - |
758 | -#define __libc_lock_t gl_lock_t |
759 | -#define __libc_lock_define gl_lock_define |
760 | -#define __libc_lock_define_initialized gl_lock_define_initialized |
761 | -#define __libc_lock_init gl_lock_init |
762 | -#define __libc_lock_lock gl_lock_lock |
763 | -#define __libc_lock_unlock gl_lock_unlock |
764 | -#define __libc_lock_recursive_t gl_recursive_lock_t |
765 | -#define __libc_lock_define_recursive gl_recursive_lock_define |
766 | -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized |
767 | -#define __libc_lock_init_recursive gl_recursive_lock_init |
768 | -#define __libc_lock_lock_recursive gl_recursive_lock_lock |
769 | -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock |
770 | -#define glthread_in_use libintl_thread_in_use |
771 | -#define glthread_lock_init libintl_lock_init |
772 | -#define glthread_lock_lock libintl_lock_lock |
773 | -#define glthread_lock_unlock libintl_lock_unlock |
774 | -#define glthread_lock_destroy libintl_lock_destroy |
775 | -#define glthread_rwlock_init libintl_rwlock_init |
776 | -#define glthread_rwlock_rdlock libintl_rwlock_rdlock |
777 | -#define glthread_rwlock_wrlock libintl_rwlock_wrlock |
778 | -#define glthread_rwlock_unlock libintl_rwlock_unlock |
779 | -#define glthread_rwlock_destroy libintl_rwlock_destroy |
780 | -#define glthread_recursive_lock_init libintl_recursive_lock_init |
781 | -#define glthread_recursive_lock_lock libintl_recursive_lock_lock |
782 | -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock |
783 | -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy |
784 | -#define glthread_once libintl_once |
785 | -#define glthread_once_call libintl_once_call |
786 | -#define glthread_once_singlethreaded libintl_once_singlethreaded |
787 | - |
788 | |
789 | === modified file 'configure' |
790 | --- configure 2013-06-28 15:36:50 +0000 |
791 | +++ configure 2013-07-08 13:07:28 +0000 |
792 | @@ -1,6 +1,6 @@ |
793 | #! /bin/sh |
794 | # Guess values for system-dependent variables and create Makefiles. |
795 | -# Generated by GNU Autoconf 2.69 for upstart 1.9. |
796 | +# Generated by GNU Autoconf 2.69 for upstart 1.9.1. |
797 | # |
798 | # Report bugs to <upstart-devel@lists.ubuntu.com>. |
799 | # |
800 | @@ -592,8 +592,8 @@ |
801 | # Identity of this package. |
802 | PACKAGE_NAME='upstart' |
803 | PACKAGE_TARNAME='upstart' |
804 | -PACKAGE_VERSION='1.9' |
805 | -PACKAGE_STRING='upstart 1.9' |
806 | +PACKAGE_VERSION='1.9.1' |
807 | +PACKAGE_STRING='upstart 1.9.1' |
808 | PACKAGE_BUGREPORT='upstart-devel@lists.ubuntu.com' |
809 | PACKAGE_URL='' |
810 | |
811 | @@ -635,11 +635,12 @@ |
812 | #endif" |
813 | |
814 | gt_needs= |
815 | -ac_header_list= |
816 | ac_subst_vars='am__EXEEXT_FALSE |
817 | am__EXEEXT_TRUE |
818 | LTLIBOBJS |
819 | LIBOBJS |
820 | +SELINUX_LIBS |
821 | +SELINUX_CFLAGS |
822 | HAVE_ABI_CHECKER_FALSE |
823 | HAVE_ABI_CHECKER_TRUE |
824 | ABI_COMPLIANCE_CHECKER |
825 | @@ -663,39 +664,9 @@ |
826 | LTLIBINTL |
827 | LIBINTL |
828 | INTLLIBS |
829 | -INTL_LIBTOOL_SUFFIX_PREFIX |
830 | -INTLOBJS |
831 | -GENCAT |
832 | -INSTOBJEXT |
833 | -DATADIRNAME |
834 | -CATOBJEXT |
835 | -USE_INCLUDED_LIBINTL |
836 | -BUILD_INCLUDED_LIBINTL |
837 | -LTLIBC |
838 | -WINDRES |
839 | -WOE32 |
840 | -WOE32DLL |
841 | -HAVE_WPRINTF |
842 | -HAVE_SNPRINTF |
843 | -HAVE_ASPRINTF |
844 | -HAVE_POSIX_PRINTF |
845 | -INTL_MACOSX_LIBS |
846 | -GLIBC21 |
847 | -INTLBISON |
848 | LTLIBICONV |
849 | LIBICONV |
850 | -LTLIBMULTITHREAD |
851 | -LIBMULTITHREAD |
852 | -LTLIBTHREAD |
853 | -LIBTHREAD |
854 | -LIBPTH_PREFIX |
855 | -LTLIBPTH |
856 | -LIBPTH |
857 | -PRI_MACROS_BROKEN |
858 | -ALLOCA |
859 | -HAVE_VISIBILITY |
860 | -CFLAG_VISIBILITY |
861 | -GLIBC2 |
862 | +INTL_MACOSX_LIBS |
863 | XGETTEXT_EXTRA_OPTIONS |
864 | MSGMERGE |
865 | XGETTEXT_015 |
866 | @@ -836,14 +807,12 @@ |
867 | with_sysroot |
868 | enable_libtool_lock |
869 | enable_nls |
870 | -enable_threads |
871 | enable_rpath |
872 | -with_libpth_prefix |
873 | with_libiconv_prefix |
874 | -with_included_gettext |
875 | with_libintl_prefix |
876 | with_local_libnih |
877 | enable_abi_check |
878 | +enable_selinux |
879 | enable_threading |
880 | enable_compiler_warnings |
881 | enable_compiler_optimisations |
882 | @@ -871,7 +840,9 @@ |
883 | UDEV_CFLAGS |
884 | UDEV_LIBS |
885 | JSON_CFLAGS |
886 | -JSON_LIBS' |
887 | +JSON_LIBS |
888 | +SELINUX_CFLAGS |
889 | +SELINUX_LIBS' |
890 | |
891 | |
892 | # Initialize some variables set by options. |
893 | @@ -1412,7 +1383,7 @@ |
894 | # Omit some internal or obsolete options to make the list less imposing. |
895 | # This message is too long to be a string in the A/UX 3.1 sh. |
896 | cat <<_ACEOF |
897 | -\`configure' configures upstart 1.9 to adapt to many kinds of systems. |
898 | +\`configure' configures upstart 1.9.1 to adapt to many kinds of systems. |
899 | |
900 | Usage: $0 [OPTION]... [VAR=VALUE]... |
901 | |
902 | @@ -1482,7 +1453,7 @@ |
903 | |
904 | if test -n "$ac_init_help"; then |
905 | case $ac_init_help in |
906 | - short | recursive ) echo "Configuration of upstart 1.9:";; |
907 | + short | recursive ) echo "Configuration of upstart 1.9.1:";; |
908 | esac |
909 | cat <<\_ACEOF |
910 | |
911 | @@ -1505,12 +1476,10 @@ |
912 | optimize for fast installation [default=yes] |
913 | --disable-libtool-lock avoid locking (might break parallel builds) |
914 | --disable-nls do not use Native Language Support |
915 | - --enable-threads={posix|solaris|pth|win32} |
916 | - specify multithreading API |
917 | - --disable-threads build without multithread safety |
918 | --disable-rpath do not hardcode runtime library paths |
919 | --disable-abi-check Disable libupstart ABI check performed if |
920 | abi-compliance-checker available |
921 | + --enable-selinux enable SELinux support |
922 | --enable-threading Enable support for multi-threading |
923 | --enable-compiler-warnings |
924 | Enable additional compiler warnings |
925 | @@ -1530,11 +1499,8 @@ |
926 | --with-sysroot=DIR Search for dependent libraries within DIR |
927 | (or the compiler's sysroot if not specified). |
928 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
929 | - --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib |
930 | - --without-libpth-prefix don't search for libpth in includedir and libdir |
931 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
932 | --without-libiconv-prefix don't search for libiconv in includedir and libdir |
933 | - --with-included-gettext use the GNU gettext library included here |
934 | --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib |
935 | --without-libintl-prefix don't search for libintl in includedir and libdir |
936 | --with-local-libnih[=DIR] |
937 | @@ -1566,6 +1532,10 @@ |
938 | UDEV_LIBS linker flags for UDEV, overriding pkg-config |
939 | JSON_CFLAGS C compiler flags for JSON, overriding pkg-config |
940 | JSON_LIBS linker flags for JSON, overriding pkg-config |
941 | + SELINUX_CFLAGS |
942 | + C compiler flags for SELINUX, overriding pkg-config |
943 | + SELINUX_LIBS |
944 | + linker flags for SELINUX, overriding pkg-config |
945 | |
946 | Use these variables to override the choices made by `configure' or to help |
947 | it to find libraries and programs with nonstandard names/locations. |
948 | @@ -1633,7 +1603,7 @@ |
949 | test -n "$ac_init_help" && exit $ac_status |
950 | if $ac_init_version; then |
951 | cat <<\_ACEOF |
952 | -upstart configure 1.9 |
953 | +upstart configure 1.9.1 |
954 | generated by GNU Autoconf 2.69 |
955 | |
956 | Copyright (C) 2012 Free Software Foundation, Inc. |
957 | @@ -2001,60 +1971,6 @@ |
958 | |
959 | } # ac_fn_c_check_func |
960 | |
961 | -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES |
962 | -# ------------------------------------------- |
963 | -# Tests whether TYPE exists after having included INCLUDES, setting cache |
964 | -# variable VAR accordingly. |
965 | -ac_fn_c_check_type () |
966 | -{ |
967 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
968 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
969 | -$as_echo_n "checking for $2... " >&6; } |
970 | -if eval \${$3+:} false; then : |
971 | - $as_echo_n "(cached) " >&6 |
972 | -else |
973 | - eval "$3=no" |
974 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
975 | -/* end confdefs.h. */ |
976 | -$4 |
977 | -int |
978 | -main () |
979 | -{ |
980 | -if (sizeof ($2)) |
981 | - return 0; |
982 | - ; |
983 | - return 0; |
984 | -} |
985 | -_ACEOF |
986 | -if ac_fn_c_try_compile "$LINENO"; then : |
987 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
988 | -/* end confdefs.h. */ |
989 | -$4 |
990 | -int |
991 | -main () |
992 | -{ |
993 | -if (sizeof (($2))) |
994 | - return 0; |
995 | - ; |
996 | - return 0; |
997 | -} |
998 | -_ACEOF |
999 | -if ac_fn_c_try_compile "$LINENO"; then : |
1000 | - |
1001 | -else |
1002 | - eval "$3=yes" |
1003 | -fi |
1004 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1005 | -fi |
1006 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1007 | -fi |
1008 | -eval ac_res=\$$3 |
1009 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1010 | -$as_echo "$ac_res" >&6; } |
1011 | - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1012 | - |
1013 | -} # ac_fn_c_check_type |
1014 | - |
1015 | # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES |
1016 | # -------------------------------------------- |
1017 | # Tries to find the compile-time value of EXPR in a program that includes |
1018 | @@ -2241,7 +2157,7 @@ |
1019 | This file contains any messages produced by compilers while |
1020 | running configure, to aid debugging if configure makes a mistake. |
1021 | |
1022 | -It was created by upstart $as_me 1.9, which was |
1023 | +It was created by upstart $as_me 1.9.1, which was |
1024 | generated by GNU Autoconf 2.69. Invocation command line was |
1025 | |
1026 | $ $0 $@ |
1027 | @@ -2522,9 +2438,6 @@ |
1028 | fi |
1029 | |
1030 | gt_needs="$gt_needs " |
1031 | -as_fn_append ac_header_list " stdlib.h" |
1032 | -as_fn_append ac_header_list " unistd.h" |
1033 | -as_fn_append ac_header_list " sys/param.h" |
1034 | # Check that the precious variables saved in the cache have kept the same |
1035 | # value. |
1036 | ac_cache_corrupted=false |
1037 | @@ -4432,7 +4345,7 @@ |
1038 | |
1039 | # Define the identity of the package. |
1040 | PACKAGE='upstart' |
1041 | - VERSION='1.9' |
1042 | + VERSION='1.9.1' |
1043 | |
1044 | |
1045 | cat >>confdefs.h <<_ACEOF |
1046 | @@ -12178,959 +12091,6 @@ |
1047 | |
1048 | |
1049 | |
1050 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2 or newer" >&5 |
1051 | -$as_echo_n "checking whether we are using the GNU C Library 2 or newer... " >&6; } |
1052 | -if ${ac_cv_gnu_library_2+:} false; then : |
1053 | - $as_echo_n "(cached) " >&6 |
1054 | -else |
1055 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1056 | -/* end confdefs.h. */ |
1057 | - |
1058 | -#include <features.h> |
1059 | -#ifdef __GNU_LIBRARY__ |
1060 | - #if (__GLIBC__ >= 2) |
1061 | - Lucky GNU user |
1062 | - #endif |
1063 | -#endif |
1064 | - |
1065 | -_ACEOF |
1066 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
1067 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then : |
1068 | - ac_cv_gnu_library_2=yes |
1069 | -else |
1070 | - ac_cv_gnu_library_2=no |
1071 | -fi |
1072 | -rm -f conftest* |
1073 | - |
1074 | - |
1075 | - |
1076 | -fi |
1077 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2" >&5 |
1078 | -$as_echo "$ac_cv_gnu_library_2" >&6; } |
1079 | - |
1080 | - GLIBC2="$ac_cv_gnu_library_2" |
1081 | - |
1082 | - |
1083 | -if test -n "$ac_tool_prefix"; then |
1084 | - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. |
1085 | -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
1086 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1087 | -$as_echo_n "checking for $ac_word... " >&6; } |
1088 | -if ${ac_cv_prog_RANLIB+:} false; then : |
1089 | - $as_echo_n "(cached) " >&6 |
1090 | -else |
1091 | - if test -n "$RANLIB"; then |
1092 | - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. |
1093 | -else |
1094 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1095 | -for as_dir in $PATH |
1096 | -do |
1097 | - IFS=$as_save_IFS |
1098 | - test -z "$as_dir" && as_dir=. |
1099 | - for ac_exec_ext in '' $ac_executable_extensions; do |
1100 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1101 | - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
1102 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1103 | - break 2 |
1104 | - fi |
1105 | -done |
1106 | - done |
1107 | -IFS=$as_save_IFS |
1108 | - |
1109 | -fi |
1110 | -fi |
1111 | -RANLIB=$ac_cv_prog_RANLIB |
1112 | -if test -n "$RANLIB"; then |
1113 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 |
1114 | -$as_echo "$RANLIB" >&6; } |
1115 | -else |
1116 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1117 | -$as_echo "no" >&6; } |
1118 | -fi |
1119 | - |
1120 | - |
1121 | -fi |
1122 | -if test -z "$ac_cv_prog_RANLIB"; then |
1123 | - ac_ct_RANLIB=$RANLIB |
1124 | - # Extract the first word of "ranlib", so it can be a program name with args. |
1125 | -set dummy ranlib; ac_word=$2 |
1126 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1127 | -$as_echo_n "checking for $ac_word... " >&6; } |
1128 | -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
1129 | - $as_echo_n "(cached) " >&6 |
1130 | -else |
1131 | - if test -n "$ac_ct_RANLIB"; then |
1132 | - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. |
1133 | -else |
1134 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1135 | -for as_dir in $PATH |
1136 | -do |
1137 | - IFS=$as_save_IFS |
1138 | - test -z "$as_dir" && as_dir=. |
1139 | - for ac_exec_ext in '' $ac_executable_extensions; do |
1140 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1141 | - ac_cv_prog_ac_ct_RANLIB="ranlib" |
1142 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1143 | - break 2 |
1144 | - fi |
1145 | -done |
1146 | - done |
1147 | -IFS=$as_save_IFS |
1148 | - |
1149 | -fi |
1150 | -fi |
1151 | -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB |
1152 | -if test -n "$ac_ct_RANLIB"; then |
1153 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 |
1154 | -$as_echo "$ac_ct_RANLIB" >&6; } |
1155 | -else |
1156 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1157 | -$as_echo "no" >&6; } |
1158 | -fi |
1159 | - |
1160 | - if test "x$ac_ct_RANLIB" = x; then |
1161 | - RANLIB=":" |
1162 | - else |
1163 | - case $cross_compiling:$ac_tool_warned in |
1164 | -yes:) |
1165 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
1166 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
1167 | -ac_tool_warned=yes ;; |
1168 | -esac |
1169 | - RANLIB=$ac_ct_RANLIB |
1170 | - fi |
1171 | -else |
1172 | - RANLIB="$ac_cv_prog_RANLIB" |
1173 | -fi |
1174 | - |
1175 | - |
1176 | - |
1177 | - CFLAG_VISIBILITY= |
1178 | - HAVE_VISIBILITY=0 |
1179 | - if test -n "$GCC"; then |
1180 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 |
1181 | -$as_echo_n "checking for simple visibility declarations... " >&6; } |
1182 | - if ${gl_cv_cc_visibility+:} false; then : |
1183 | - $as_echo_n "(cached) " >&6 |
1184 | -else |
1185 | - |
1186 | - gl_save_CFLAGS="$CFLAGS" |
1187 | - CFLAGS="$CFLAGS -fvisibility=hidden" |
1188 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1189 | -/* end confdefs.h. */ |
1190 | -extern __attribute__((__visibility__("hidden"))) int hiddenvar; |
1191 | - extern __attribute__((__visibility__("default"))) int exportedvar; |
1192 | - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); |
1193 | - extern __attribute__((__visibility__("default"))) int exportedfunc (void); |
1194 | -int |
1195 | -main () |
1196 | -{ |
1197 | - |
1198 | - ; |
1199 | - return 0; |
1200 | -} |
1201 | -_ACEOF |
1202 | -if ac_fn_c_try_compile "$LINENO"; then : |
1203 | - gl_cv_cc_visibility=yes |
1204 | -else |
1205 | - gl_cv_cc_visibility=no |
1206 | -fi |
1207 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1208 | - CFLAGS="$gl_save_CFLAGS" |
1209 | -fi |
1210 | - |
1211 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 |
1212 | -$as_echo "$gl_cv_cc_visibility" >&6; } |
1213 | - if test $gl_cv_cc_visibility = yes; then |
1214 | - CFLAG_VISIBILITY="-fvisibility=hidden" |
1215 | - HAVE_VISIBILITY=1 |
1216 | - fi |
1217 | - fi |
1218 | - |
1219 | - |
1220 | - |
1221 | -cat >>confdefs.h <<_ACEOF |
1222 | -#define HAVE_VISIBILITY $HAVE_VISIBILITY |
1223 | -_ACEOF |
1224 | - |
1225 | - |
1226 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 |
1227 | -$as_echo_n "checking for inline... " >&6; } |
1228 | -if ${ac_cv_c_inline+:} false; then : |
1229 | - $as_echo_n "(cached) " >&6 |
1230 | -else |
1231 | - ac_cv_c_inline=no |
1232 | -for ac_kw in inline __inline__ __inline; do |
1233 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1234 | -/* end confdefs.h. */ |
1235 | -#ifndef __cplusplus |
1236 | -typedef int foo_t; |
1237 | -static $ac_kw foo_t static_foo () {return 0; } |
1238 | -$ac_kw foo_t foo () {return 0; } |
1239 | -#endif |
1240 | - |
1241 | -_ACEOF |
1242 | -if ac_fn_c_try_compile "$LINENO"; then : |
1243 | - ac_cv_c_inline=$ac_kw |
1244 | -fi |
1245 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1246 | - test "$ac_cv_c_inline" != no && break |
1247 | -done |
1248 | - |
1249 | -fi |
1250 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 |
1251 | -$as_echo "$ac_cv_c_inline" >&6; } |
1252 | - |
1253 | -case $ac_cv_c_inline in |
1254 | - inline | yes) ;; |
1255 | - *) |
1256 | - case $ac_cv_c_inline in |
1257 | - no) ac_val=;; |
1258 | - *) ac_val=$ac_cv_c_inline;; |
1259 | - esac |
1260 | - cat >>confdefs.h <<_ACEOF |
1261 | -#ifndef __cplusplus |
1262 | -#define inline $ac_val |
1263 | -#endif |
1264 | -_ACEOF |
1265 | - ;; |
1266 | -esac |
1267 | - |
1268 | -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" |
1269 | -if test "x$ac_cv_type_size_t" = xyes; then : |
1270 | - |
1271 | -else |
1272 | - |
1273 | -cat >>confdefs.h <<_ACEOF |
1274 | -#define size_t unsigned int |
1275 | -_ACEOF |
1276 | - |
1277 | -fi |
1278 | - |
1279 | - |
1280 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5 |
1281 | -$as_echo_n "checking for stdint.h... " >&6; } |
1282 | -if ${gl_cv_header_stdint_h+:} false; then : |
1283 | - $as_echo_n "(cached) " >&6 |
1284 | -else |
1285 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1286 | -/* end confdefs.h. */ |
1287 | -#include <sys/types.h> |
1288 | -#include <stdint.h> |
1289 | -int |
1290 | -main () |
1291 | -{ |
1292 | -uintmax_t i = (uintmax_t) -1; return !i; |
1293 | - ; |
1294 | - return 0; |
1295 | -} |
1296 | -_ACEOF |
1297 | -if ac_fn_c_try_compile "$LINENO"; then : |
1298 | - gl_cv_header_stdint_h=yes |
1299 | -else |
1300 | - gl_cv_header_stdint_h=no |
1301 | -fi |
1302 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1303 | -fi |
1304 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_h" >&5 |
1305 | -$as_echo "$gl_cv_header_stdint_h" >&6; } |
1306 | - if test $gl_cv_header_stdint_h = yes; then |
1307 | - |
1308 | -cat >>confdefs.h <<_ACEOF |
1309 | -#define HAVE_STDINT_H_WITH_UINTMAX 1 |
1310 | -_ACEOF |
1311 | - |
1312 | - fi |
1313 | - |
1314 | -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works |
1315 | -# for constant arguments. Useless! |
1316 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 |
1317 | -$as_echo_n "checking for working alloca.h... " >&6; } |
1318 | -if ${ac_cv_working_alloca_h+:} false; then : |
1319 | - $as_echo_n "(cached) " >&6 |
1320 | -else |
1321 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1322 | -/* end confdefs.h. */ |
1323 | -#include <alloca.h> |
1324 | -int |
1325 | -main () |
1326 | -{ |
1327 | -char *p = (char *) alloca (2 * sizeof (int)); |
1328 | - if (p) return 0; |
1329 | - ; |
1330 | - return 0; |
1331 | -} |
1332 | -_ACEOF |
1333 | -if ac_fn_c_try_link "$LINENO"; then : |
1334 | - ac_cv_working_alloca_h=yes |
1335 | -else |
1336 | - ac_cv_working_alloca_h=no |
1337 | -fi |
1338 | -rm -f core conftest.err conftest.$ac_objext \ |
1339 | - conftest$ac_exeext conftest.$ac_ext |
1340 | -fi |
1341 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 |
1342 | -$as_echo "$ac_cv_working_alloca_h" >&6; } |
1343 | -if test $ac_cv_working_alloca_h = yes; then |
1344 | - |
1345 | -$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h |
1346 | - |
1347 | -fi |
1348 | - |
1349 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 |
1350 | -$as_echo_n "checking for alloca... " >&6; } |
1351 | -if ${ac_cv_func_alloca_works+:} false; then : |
1352 | - $as_echo_n "(cached) " >&6 |
1353 | -else |
1354 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1355 | -/* end confdefs.h. */ |
1356 | -#ifdef __GNUC__ |
1357 | -# define alloca __builtin_alloca |
1358 | -#else |
1359 | -# ifdef _MSC_VER |
1360 | -# include <malloc.h> |
1361 | -# define alloca _alloca |
1362 | -# else |
1363 | -# ifdef HAVE_ALLOCA_H |
1364 | -# include <alloca.h> |
1365 | -# else |
1366 | -# ifdef _AIX |
1367 | - #pragma alloca |
1368 | -# else |
1369 | -# ifndef alloca /* predefined by HP cc +Olibcalls */ |
1370 | -void *alloca (size_t); |
1371 | -# endif |
1372 | -# endif |
1373 | -# endif |
1374 | -# endif |
1375 | -#endif |
1376 | - |
1377 | -int |
1378 | -main () |
1379 | -{ |
1380 | -char *p = (char *) alloca (1); |
1381 | - if (p) return 0; |
1382 | - ; |
1383 | - return 0; |
1384 | -} |
1385 | -_ACEOF |
1386 | -if ac_fn_c_try_link "$LINENO"; then : |
1387 | - ac_cv_func_alloca_works=yes |
1388 | -else |
1389 | - ac_cv_func_alloca_works=no |
1390 | -fi |
1391 | -rm -f core conftest.err conftest.$ac_objext \ |
1392 | - conftest$ac_exeext conftest.$ac_ext |
1393 | -fi |
1394 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 |
1395 | -$as_echo "$ac_cv_func_alloca_works" >&6; } |
1396 | - |
1397 | -if test $ac_cv_func_alloca_works = yes; then |
1398 | - |
1399 | -$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h |
1400 | - |
1401 | -else |
1402 | - # The SVR3 libPW and SVR4 libucb both contain incompatible functions |
1403 | -# that cause trouble. Some versions do not even contain alloca or |
1404 | -# contain a buggy version. If you still want to use their alloca, |
1405 | -# use ar to extract alloca.o from them instead of compiling alloca.c. |
1406 | - |
1407 | -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext |
1408 | - |
1409 | -$as_echo "#define C_ALLOCA 1" >>confdefs.h |
1410 | - |
1411 | - |
1412 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 |
1413 | -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } |
1414 | -if ${ac_cv_os_cray+:} false; then : |
1415 | - $as_echo_n "(cached) " >&6 |
1416 | -else |
1417 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1418 | -/* end confdefs.h. */ |
1419 | -#if defined CRAY && ! defined CRAY2 |
1420 | -webecray |
1421 | -#else |
1422 | -wenotbecray |
1423 | -#endif |
1424 | - |
1425 | -_ACEOF |
1426 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
1427 | - $EGREP "webecray" >/dev/null 2>&1; then : |
1428 | - ac_cv_os_cray=yes |
1429 | -else |
1430 | - ac_cv_os_cray=no |
1431 | -fi |
1432 | -rm -f conftest* |
1433 | - |
1434 | -fi |
1435 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 |
1436 | -$as_echo "$ac_cv_os_cray" >&6; } |
1437 | -if test $ac_cv_os_cray = yes; then |
1438 | - for ac_func in _getb67 GETB67 getb67; do |
1439 | - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
1440 | -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
1441 | -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
1442 | - |
1443 | -cat >>confdefs.h <<_ACEOF |
1444 | -#define CRAY_STACKSEG_END $ac_func |
1445 | -_ACEOF |
1446 | - |
1447 | - break |
1448 | -fi |
1449 | - |
1450 | - done |
1451 | -fi |
1452 | - |
1453 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 |
1454 | -$as_echo_n "checking stack direction for C alloca... " >&6; } |
1455 | -if ${ac_cv_c_stack_direction+:} false; then : |
1456 | - $as_echo_n "(cached) " >&6 |
1457 | -else |
1458 | - if test "$cross_compiling" = yes; then : |
1459 | - ac_cv_c_stack_direction=0 |
1460 | -else |
1461 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1462 | -/* end confdefs.h. */ |
1463 | -$ac_includes_default |
1464 | -int |
1465 | -find_stack_direction (int *addr, int depth) |
1466 | -{ |
1467 | - int dir, dummy = 0; |
1468 | - if (! addr) |
1469 | - addr = &dummy; |
1470 | - *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; |
1471 | - dir = depth ? find_stack_direction (addr, depth - 1) : 0; |
1472 | - return dir + dummy; |
1473 | -} |
1474 | - |
1475 | -int |
1476 | -main (int argc, char **argv) |
1477 | -{ |
1478 | - return find_stack_direction (0, argc + !argv + 20) < 0; |
1479 | -} |
1480 | -_ACEOF |
1481 | -if ac_fn_c_try_run "$LINENO"; then : |
1482 | - ac_cv_c_stack_direction=1 |
1483 | -else |
1484 | - ac_cv_c_stack_direction=-1 |
1485 | -fi |
1486 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
1487 | - conftest.$ac_objext conftest.beam conftest.$ac_ext |
1488 | -fi |
1489 | - |
1490 | -fi |
1491 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 |
1492 | -$as_echo "$ac_cv_c_stack_direction" >&6; } |
1493 | -cat >>confdefs.h <<_ACEOF |
1494 | -#define STACK_DIRECTION $ac_cv_c_stack_direction |
1495 | -_ACEOF |
1496 | - |
1497 | - |
1498 | -fi |
1499 | - |
1500 | - |
1501 | - |
1502 | - |
1503 | - for ac_header in $ac_header_list |
1504 | -do : |
1505 | - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
1506 | -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
1507 | -" |
1508 | -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
1509 | - cat >>confdefs.h <<_ACEOF |
1510 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
1511 | -_ACEOF |
1512 | - |
1513 | -fi |
1514 | - |
1515 | -done |
1516 | - |
1517 | - |
1518 | - |
1519 | - |
1520 | - |
1521 | - |
1522 | - |
1523 | - |
1524 | -for ac_func in getpagesize |
1525 | -do : |
1526 | - ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" |
1527 | -if test "x$ac_cv_func_getpagesize" = xyes; then : |
1528 | - cat >>confdefs.h <<_ACEOF |
1529 | -#define HAVE_GETPAGESIZE 1 |
1530 | -_ACEOF |
1531 | - |
1532 | -fi |
1533 | -done |
1534 | - |
1535 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 |
1536 | -$as_echo_n "checking for working mmap... " >&6; } |
1537 | -if ${ac_cv_func_mmap_fixed_mapped+:} false; then : |
1538 | - $as_echo_n "(cached) " >&6 |
1539 | -else |
1540 | - if test "$cross_compiling" = yes; then : |
1541 | - ac_cv_func_mmap_fixed_mapped=no |
1542 | -else |
1543 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1544 | -/* end confdefs.h. */ |
1545 | -$ac_includes_default |
1546 | -/* malloc might have been renamed as rpl_malloc. */ |
1547 | -#undef malloc |
1548 | - |
1549 | -/* Thanks to Mike Haertel and Jim Avera for this test. |
1550 | - Here is a matrix of mmap possibilities: |
1551 | - mmap private not fixed |
1552 | - mmap private fixed at somewhere currently unmapped |
1553 | - mmap private fixed at somewhere already mapped |
1554 | - mmap shared not fixed |
1555 | - mmap shared fixed at somewhere currently unmapped |
1556 | - mmap shared fixed at somewhere already mapped |
1557 | - For private mappings, we should verify that changes cannot be read() |
1558 | - back from the file, nor mmap's back from the file at a different |
1559 | - address. (There have been systems where private was not correctly |
1560 | - implemented like the infamous i386 svr4.0, and systems where the |
1561 | - VM page cache was not coherent with the file system buffer cache |
1562 | - like early versions of FreeBSD and possibly contemporary NetBSD.) |
1563 | - For shared mappings, we should conversely verify that changes get |
1564 | - propagated back to all the places they're supposed to be. |
1565 | - |
1566 | - Grep wants private fixed already mapped. |
1567 | - The main things grep needs to know about mmap are: |
1568 | - * does it exist and is it safe to write into the mmap'd area |
1569 | - * how to use it (BSD variants) */ |
1570 | - |
1571 | -#include <fcntl.h> |
1572 | -#include <sys/mman.h> |
1573 | - |
1574 | -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H |
1575 | -char *malloc (); |
1576 | -#endif |
1577 | - |
1578 | -/* This mess was copied from the GNU getpagesize.h. */ |
1579 | -#ifndef HAVE_GETPAGESIZE |
1580 | -# ifdef _SC_PAGESIZE |
1581 | -# define getpagesize() sysconf(_SC_PAGESIZE) |
1582 | -# else /* no _SC_PAGESIZE */ |
1583 | -# ifdef HAVE_SYS_PARAM_H |
1584 | -# include <sys/param.h> |
1585 | -# ifdef EXEC_PAGESIZE |
1586 | -# define getpagesize() EXEC_PAGESIZE |
1587 | -# else /* no EXEC_PAGESIZE */ |
1588 | -# ifdef NBPG |
1589 | -# define getpagesize() NBPG * CLSIZE |
1590 | -# ifndef CLSIZE |
1591 | -# define CLSIZE 1 |
1592 | -# endif /* no CLSIZE */ |
1593 | -# else /* no NBPG */ |
1594 | -# ifdef NBPC |
1595 | -# define getpagesize() NBPC |
1596 | -# else /* no NBPC */ |
1597 | -# ifdef PAGESIZE |
1598 | -# define getpagesize() PAGESIZE |
1599 | -# endif /* PAGESIZE */ |
1600 | -# endif /* no NBPC */ |
1601 | -# endif /* no NBPG */ |
1602 | -# endif /* no EXEC_PAGESIZE */ |
1603 | -# else /* no HAVE_SYS_PARAM_H */ |
1604 | -# define getpagesize() 8192 /* punt totally */ |
1605 | -# endif /* no HAVE_SYS_PARAM_H */ |
1606 | -# endif /* no _SC_PAGESIZE */ |
1607 | - |
1608 | -#endif /* no HAVE_GETPAGESIZE */ |
1609 | - |
1610 | -int |
1611 | -main () |
1612 | -{ |
1613 | - char *data, *data2, *data3; |
1614 | - const char *cdata2; |
1615 | - int i, pagesize; |
1616 | - int fd, fd2; |
1617 | - |
1618 | - pagesize = getpagesize (); |
1619 | - |
1620 | - /* First, make a file with some known garbage in it. */ |
1621 | - data = (char *) malloc (pagesize); |
1622 | - if (!data) |
1623 | - return 1; |
1624 | - for (i = 0; i < pagesize; ++i) |
1625 | - *(data + i) = rand (); |
1626 | - umask (0); |
1627 | - fd = creat ("conftest.mmap", 0600); |
1628 | - if (fd < 0) |
1629 | - return 2; |
1630 | - if (write (fd, data, pagesize) != pagesize) |
1631 | - return 3; |
1632 | - close (fd); |
1633 | - |
1634 | - /* Next, check that the tail of a page is zero-filled. File must have |
1635 | - non-zero length, otherwise we risk SIGBUS for entire page. */ |
1636 | - fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); |
1637 | - if (fd2 < 0) |
1638 | - return 4; |
1639 | - cdata2 = ""; |
1640 | - if (write (fd2, cdata2, 1) != 1) |
1641 | - return 5; |
1642 | - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); |
1643 | - if (data2 == MAP_FAILED) |
1644 | - return 6; |
1645 | - for (i = 0; i < pagesize; ++i) |
1646 | - if (*(data2 + i)) |
1647 | - return 7; |
1648 | - close (fd2); |
1649 | - if (munmap (data2, pagesize)) |
1650 | - return 8; |
1651 | - |
1652 | - /* Next, try to mmap the file at a fixed address which already has |
1653 | - something else allocated at it. If we can, also make sure that |
1654 | - we see the same garbage. */ |
1655 | - fd = open ("conftest.mmap", O_RDWR); |
1656 | - if (fd < 0) |
1657 | - return 9; |
1658 | - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, |
1659 | - MAP_PRIVATE | MAP_FIXED, fd, 0L)) |
1660 | - return 10; |
1661 | - for (i = 0; i < pagesize; ++i) |
1662 | - if (*(data + i) != *(data2 + i)) |
1663 | - return 11; |
1664 | - |
1665 | - /* Finally, make sure that changes to the mapped area do not |
1666 | - percolate back to the file as seen by read(). (This is a bug on |
1667 | - some variants of i386 svr4.0.) */ |
1668 | - for (i = 0; i < pagesize; ++i) |
1669 | - *(data2 + i) = *(data2 + i) + 1; |
1670 | - data3 = (char *) malloc (pagesize); |
1671 | - if (!data3) |
1672 | - return 12; |
1673 | - if (read (fd, data3, pagesize) != pagesize) |
1674 | - return 13; |
1675 | - for (i = 0; i < pagesize; ++i) |
1676 | - if (*(data + i) != *(data3 + i)) |
1677 | - return 14; |
1678 | - close (fd); |
1679 | - return 0; |
1680 | -} |
1681 | -_ACEOF |
1682 | -if ac_fn_c_try_run "$LINENO"; then : |
1683 | - ac_cv_func_mmap_fixed_mapped=yes |
1684 | -else |
1685 | - ac_cv_func_mmap_fixed_mapped=no |
1686 | -fi |
1687 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
1688 | - conftest.$ac_objext conftest.beam conftest.$ac_ext |
1689 | -fi |
1690 | - |
1691 | -fi |
1692 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 |
1693 | -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } |
1694 | -if test $ac_cv_func_mmap_fixed_mapped = yes; then |
1695 | - |
1696 | -$as_echo "#define HAVE_MMAP 1" >>confdefs.h |
1697 | - |
1698 | -fi |
1699 | -rm -f conftest.mmap conftest.txt |
1700 | - |
1701 | - |
1702 | - |
1703 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5 |
1704 | -$as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; } |
1705 | -if ${gt_cv_int_divbyzero_sigfpe+:} false; then : |
1706 | - $as_echo_n "(cached) " >&6 |
1707 | -else |
1708 | - |
1709 | - gt_cv_int_divbyzero_sigfpe= |
1710 | - case "$host_os" in |
1711 | - macos* | darwin[6-9]* | darwin[1-9][0-9]*) |
1712 | - # On MacOS X 10.2 or newer, just assume the same as when cross- |
1713 | - # compiling. If we were to perform the real test, 1 Crash Report |
1714 | - # dialog window would pop up. |
1715 | - case "$host_cpu" in |
1716 | - i[34567]86 | x86_64) |
1717 | - gt_cv_int_divbyzero_sigfpe="guessing yes" ;; |
1718 | - esac |
1719 | - ;; |
1720 | - esac |
1721 | - if test -z "$gt_cv_int_divbyzero_sigfpe"; then |
1722 | - if test "$cross_compiling" = yes; then : |
1723 | - |
1724 | - # Guess based on the CPU. |
1725 | - case "$host_cpu" in |
1726 | - alpha* | i[34567]86 | x86_64 | m68k | s390*) |
1727 | - gt_cv_int_divbyzero_sigfpe="guessing yes";; |
1728 | - *) |
1729 | - gt_cv_int_divbyzero_sigfpe="guessing no";; |
1730 | - esac |
1731 | - |
1732 | -else |
1733 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1734 | -/* end confdefs.h. */ |
1735 | - |
1736 | -#include <stdlib.h> |
1737 | -#include <signal.h> |
1738 | - |
1739 | -static void |
1740 | -sigfpe_handler (int sig) |
1741 | -{ |
1742 | - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ |
1743 | - exit (sig != SIGFPE); |
1744 | -} |
1745 | - |
1746 | -int x = 1; |
1747 | -int y = 0; |
1748 | -int z; |
1749 | -int nan; |
1750 | - |
1751 | -int main () |
1752 | -{ |
1753 | - signal (SIGFPE, sigfpe_handler); |
1754 | -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ |
1755 | -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) |
1756 | - signal (SIGTRAP, sigfpe_handler); |
1757 | -#endif |
1758 | -/* Linux/SPARC yields signal SIGILL. */ |
1759 | -#if defined (__sparc__) && defined (__linux__) |
1760 | - signal (SIGILL, sigfpe_handler); |
1761 | -#endif |
1762 | - |
1763 | - z = x / y; |
1764 | - nan = y / y; |
1765 | - exit (1); |
1766 | -} |
1767 | - |
1768 | -_ACEOF |
1769 | -if ac_fn_c_try_run "$LINENO"; then : |
1770 | - gt_cv_int_divbyzero_sigfpe=yes |
1771 | -else |
1772 | - gt_cv_int_divbyzero_sigfpe=no |
1773 | -fi |
1774 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
1775 | - conftest.$ac_objext conftest.beam conftest.$ac_ext |
1776 | -fi |
1777 | - |
1778 | - fi |
1779 | - |
1780 | -fi |
1781 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_int_divbyzero_sigfpe" >&5 |
1782 | -$as_echo "$gt_cv_int_divbyzero_sigfpe" >&6; } |
1783 | - case "$gt_cv_int_divbyzero_sigfpe" in |
1784 | - *yes) value=1;; |
1785 | - *) value=0;; |
1786 | - esac |
1787 | - |
1788 | -cat >>confdefs.h <<_ACEOF |
1789 | -#define INTDIV0_RAISES_SIGFPE $value |
1790 | -_ACEOF |
1791 | - |
1792 | - |
1793 | - |
1794 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5 |
1795 | -$as_echo_n "checking for inttypes.h... " >&6; } |
1796 | -if ${gl_cv_header_inttypes_h+:} false; then : |
1797 | - $as_echo_n "(cached) " >&6 |
1798 | -else |
1799 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1800 | -/* end confdefs.h. */ |
1801 | -#include <sys/types.h> |
1802 | -#include <inttypes.h> |
1803 | -int |
1804 | -main () |
1805 | -{ |
1806 | -uintmax_t i = (uintmax_t) -1; return !i; |
1807 | - ; |
1808 | - return 0; |
1809 | -} |
1810 | -_ACEOF |
1811 | -if ac_fn_c_try_compile "$LINENO"; then : |
1812 | - gl_cv_header_inttypes_h=yes |
1813 | -else |
1814 | - gl_cv_header_inttypes_h=no |
1815 | -fi |
1816 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1817 | -fi |
1818 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_inttypes_h" >&5 |
1819 | -$as_echo "$gl_cv_header_inttypes_h" >&6; } |
1820 | - if test $gl_cv_header_inttypes_h = yes; then |
1821 | - |
1822 | -cat >>confdefs.h <<_ACEOF |
1823 | -#define HAVE_INTTYPES_H_WITH_UINTMAX 1 |
1824 | -_ACEOF |
1825 | - |
1826 | - fi |
1827 | - |
1828 | - |
1829 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 |
1830 | -$as_echo_n "checking for unsigned long long int... " >&6; } |
1831 | -if ${ac_cv_type_unsigned_long_long_int+:} false; then : |
1832 | - $as_echo_n "(cached) " >&6 |
1833 | -else |
1834 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1835 | -/* end confdefs.h. */ |
1836 | - |
1837 | - /* Test preprocessor. */ |
1838 | - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) |
1839 | - error in preprocessor; |
1840 | - #endif |
1841 | - #if ! (18446744073709551615ULL <= -1ull) |
1842 | - error in preprocessor; |
1843 | - #endif |
1844 | - /* Test literals. */ |
1845 | - long long int ll = 9223372036854775807ll; |
1846 | - long long int nll = -9223372036854775807LL; |
1847 | - unsigned long long int ull = 18446744073709551615ULL; |
1848 | - /* Test constant expressions. */ |
1849 | - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) |
1850 | - ? 1 : -1)]; |
1851 | - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 |
1852 | - ? 1 : -1)]; |
1853 | - int i = 63; |
1854 | -int |
1855 | -main () |
1856 | -{ |
1857 | -/* Test availability of runtime routines for shift and division. */ |
1858 | - long long int llmax = 9223372036854775807ll; |
1859 | - unsigned long long int ullmax = 18446744073709551615ull; |
1860 | - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) |
1861 | - | (llmax / ll) | (llmax % ll) |
1862 | - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) |
1863 | - | (ullmax / ull) | (ullmax % ull)); |
1864 | - ; |
1865 | - return 0; |
1866 | -} |
1867 | - |
1868 | -_ACEOF |
1869 | -if ac_fn_c_try_link "$LINENO"; then : |
1870 | - ac_cv_type_unsigned_long_long_int=yes |
1871 | -else |
1872 | - ac_cv_type_unsigned_long_long_int=no |
1873 | -fi |
1874 | -rm -f core conftest.err conftest.$ac_objext \ |
1875 | - conftest$ac_exeext conftest.$ac_ext |
1876 | -fi |
1877 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 |
1878 | -$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } |
1879 | - if test $ac_cv_type_unsigned_long_long_int = yes; then |
1880 | - |
1881 | -$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h |
1882 | - |
1883 | - fi |
1884 | - |
1885 | - |
1886 | - |
1887 | - |
1888 | - if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then |
1889 | - |
1890 | - test $ac_cv_type_unsigned_long_long_int = yes \ |
1891 | - && ac_type='unsigned long long' \ |
1892 | - || ac_type='unsigned long' |
1893 | - |
1894 | -cat >>confdefs.h <<_ACEOF |
1895 | -#define uintmax_t $ac_type |
1896 | -_ACEOF |
1897 | - |
1898 | - else |
1899 | - |
1900 | -$as_echo "#define HAVE_UINTMAX_T 1" >>confdefs.h |
1901 | - |
1902 | - fi |
1903 | - |
1904 | - |
1905 | - for ac_header in inttypes.h |
1906 | -do : |
1907 | - ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" |
1908 | -if test "x$ac_cv_header_inttypes_h" = xyes; then : |
1909 | - cat >>confdefs.h <<_ACEOF |
1910 | -#define HAVE_INTTYPES_H 1 |
1911 | -_ACEOF |
1912 | - |
1913 | -fi |
1914 | - |
1915 | -done |
1916 | - |
1917 | - if test $ac_cv_header_inttypes_h = yes; then |
1918 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5 |
1919 | -$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; } |
1920 | -if ${gt_cv_inttypes_pri_broken+:} false; then : |
1921 | - $as_echo_n "(cached) " >&6 |
1922 | -else |
1923 | - |
1924 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1925 | -/* end confdefs.h. */ |
1926 | -#include <inttypes.h> |
1927 | -#ifdef PRId32 |
1928 | -char *p = PRId32; |
1929 | -#endif |
1930 | - |
1931 | -int |
1932 | -main () |
1933 | -{ |
1934 | - |
1935 | - ; |
1936 | - return 0; |
1937 | -} |
1938 | -_ACEOF |
1939 | -if ac_fn_c_try_compile "$LINENO"; then : |
1940 | - gt_cv_inttypes_pri_broken=no |
1941 | -else |
1942 | - gt_cv_inttypes_pri_broken=yes |
1943 | -fi |
1944 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1945 | - |
1946 | -fi |
1947 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5 |
1948 | -$as_echo "$gt_cv_inttypes_pri_broken" >&6; } |
1949 | - fi |
1950 | - if test "$gt_cv_inttypes_pri_broken" = yes; then |
1951 | - |
1952 | -cat >>confdefs.h <<_ACEOF |
1953 | -#define PRI_MACROS_BROKEN 1 |
1954 | -_ACEOF |
1955 | - |
1956 | - PRI_MACROS_BROKEN=1 |
1957 | - else |
1958 | - PRI_MACROS_BROKEN=0 |
1959 | - fi |
1960 | - |
1961 | - |
1962 | - |
1963 | - |
1964 | - |
1965 | - |
1966 | - # Check whether --enable-threads was given. |
1967 | -if test "${enable_threads+set}" = set; then : |
1968 | - enableval=$enable_threads; gl_use_threads=$enableval |
1969 | -else |
1970 | - case "$host_os" in |
1971 | - osf*) gl_use_threads=no ;; |
1972 | - *) gl_use_threads=yes ;; |
1973 | - esac |
1974 | - |
1975 | -fi |
1976 | - |
1977 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then |
1978 | - # For using <pthread.h>: |
1979 | - case "$host_os" in |
1980 | - osf*) |
1981 | - # On OSF/1, the compiler needs the flag -D_REENTRANT so that it |
1982 | - # groks <pthread.h>. cc also understands the flag -pthread, but |
1983 | - # we don't use it because 1. gcc-2.95 doesn't understand -pthread, |
1984 | - # 2. putting a flag into CPPFLAGS that has an effect on the linker |
1985 | - # causes the AC_TRY_LINK test below to succeed unexpectedly, |
1986 | - # leading to wrong values of LIBTHREAD and LTLIBTHREAD. |
1987 | - CPPFLAGS="$CPPFLAGS -D_REENTRANT" |
1988 | - ;; |
1989 | - esac |
1990 | - # Some systems optimize for single-threaded programs by default, and |
1991 | - # need special flags to disable these optimizations. For example, the |
1992 | - # definition of 'errno' in <errno.h>. |
1993 | - case "$host_os" in |
1994 | - aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; |
1995 | - solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; |
1996 | - esac |
1997 | - fi |
1998 | - |
1999 | - |
2000 | - |
2001 | - |
2002 | - |
2003 | if test "X$prefix" = "XNONE"; then |
2004 | acl_final_prefix="$ac_default_prefix" |
2005 | else |
2006 | @@ -13314,873 +12274,6 @@ |
2007 | |
2008 | |
2009 | |
2010 | - gl_threads_api=none |
2011 | - LIBTHREAD= |
2012 | - LTLIBTHREAD= |
2013 | - LIBMULTITHREAD= |
2014 | - LTLIBMULTITHREAD= |
2015 | - if test "$gl_use_threads" != no; then |
2016 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 |
2017 | -$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } |
2018 | - gl_have_weak=no |
2019 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2020 | -/* end confdefs.h. */ |
2021 | -extern void xyzzy (); |
2022 | -#pragma weak xyzzy |
2023 | -int |
2024 | -main () |
2025 | -{ |
2026 | -xyzzy(); |
2027 | - ; |
2028 | - return 0; |
2029 | -} |
2030 | -_ACEOF |
2031 | -if ac_fn_c_try_link "$LINENO"; then : |
2032 | - gl_have_weak=yes |
2033 | -fi |
2034 | -rm -f core conftest.err conftest.$ac_objext \ |
2035 | - conftest$ac_exeext conftest.$ac_ext |
2036 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_weak" >&5 |
2037 | -$as_echo "$gl_have_weak" >&6; } |
2038 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then |
2039 | - # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that |
2040 | - # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY. |
2041 | - ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" |
2042 | -if test "x$ac_cv_header_pthread_h" = xyes; then : |
2043 | - gl_have_pthread_h=yes |
2044 | -else |
2045 | - gl_have_pthread_h=no |
2046 | -fi |
2047 | - |
2048 | - |
2049 | - if test "$gl_have_pthread_h" = yes; then |
2050 | - # Other possible tests: |
2051 | - # -lpthreads (FSU threads, PCthreads) |
2052 | - # -lgthreads |
2053 | - gl_have_pthread= |
2054 | - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist |
2055 | - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but |
2056 | - # the second one only in libpthread, and lock.c needs it. |
2057 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2058 | -/* end confdefs.h. */ |
2059 | -#include <pthread.h> |
2060 | -int |
2061 | -main () |
2062 | -{ |
2063 | -pthread_mutex_lock((pthread_mutex_t*)0); |
2064 | - pthread_mutexattr_init((pthread_mutexattr_t*)0); |
2065 | - ; |
2066 | - return 0; |
2067 | -} |
2068 | -_ACEOF |
2069 | -if ac_fn_c_try_link "$LINENO"; then : |
2070 | - gl_have_pthread=yes |
2071 | -fi |
2072 | -rm -f core conftest.err conftest.$ac_objext \ |
2073 | - conftest$ac_exeext conftest.$ac_ext |
2074 | - # Test for libpthread by looking for pthread_kill. (Not pthread_self, |
2075 | - # since it is defined as a macro on OSF/1.) |
2076 | - if test -n "$gl_have_pthread"; then |
2077 | - # The program links fine without libpthread. But it may actually |
2078 | - # need to link with libpthread in order to create multiple threads. |
2079 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 |
2080 | -$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } |
2081 | -if ${ac_cv_lib_pthread_pthread_kill+:} false; then : |
2082 | - $as_echo_n "(cached) " >&6 |
2083 | -else |
2084 | - ac_check_lib_save_LIBS=$LIBS |
2085 | -LIBS="-lpthread $LIBS" |
2086 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2087 | -/* end confdefs.h. */ |
2088 | - |
2089 | -/* Override any GCC internal prototype to avoid an error. |
2090 | - Use char because int might match the return type of a GCC |
2091 | - builtin and then its argument prototype would still apply. */ |
2092 | -#ifdef __cplusplus |
2093 | -extern "C" |
2094 | -#endif |
2095 | -char pthread_kill (); |
2096 | -int |
2097 | -main () |
2098 | -{ |
2099 | -return pthread_kill (); |
2100 | - ; |
2101 | - return 0; |
2102 | -} |
2103 | -_ACEOF |
2104 | -if ac_fn_c_try_link "$LINENO"; then : |
2105 | - ac_cv_lib_pthread_pthread_kill=yes |
2106 | -else |
2107 | - ac_cv_lib_pthread_pthread_kill=no |
2108 | -fi |
2109 | -rm -f core conftest.err conftest.$ac_objext \ |
2110 | - conftest$ac_exeext conftest.$ac_ext |
2111 | -LIBS=$ac_check_lib_save_LIBS |
2112 | -fi |
2113 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 |
2114 | -$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } |
2115 | -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : |
2116 | - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread |
2117 | - # On Solaris and HP-UX, most pthread functions exist also in libc. |
2118 | - # Therefore pthread_in_use() needs to actually try to create a |
2119 | - # thread: pthread_create from libc will fail, whereas |
2120 | - # pthread_create will actually create a thread. |
2121 | - case "$host_os" in |
2122 | - solaris* | hpux*) |
2123 | - |
2124 | -$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h |
2125 | - |
2126 | - esac |
2127 | - |
2128 | -fi |
2129 | - |
2130 | - else |
2131 | - # Some library is needed. Try libpthread and libc_r. |
2132 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 |
2133 | -$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } |
2134 | -if ${ac_cv_lib_pthread_pthread_kill+:} false; then : |
2135 | - $as_echo_n "(cached) " >&6 |
2136 | -else |
2137 | - ac_check_lib_save_LIBS=$LIBS |
2138 | -LIBS="-lpthread $LIBS" |
2139 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2140 | -/* end confdefs.h. */ |
2141 | - |
2142 | -/* Override any GCC internal prototype to avoid an error. |
2143 | - Use char because int might match the return type of a GCC |
2144 | - builtin and then its argument prototype would still apply. */ |
2145 | -#ifdef __cplusplus |
2146 | -extern "C" |
2147 | -#endif |
2148 | -char pthread_kill (); |
2149 | -int |
2150 | -main () |
2151 | -{ |
2152 | -return pthread_kill (); |
2153 | - ; |
2154 | - return 0; |
2155 | -} |
2156 | -_ACEOF |
2157 | -if ac_fn_c_try_link "$LINENO"; then : |
2158 | - ac_cv_lib_pthread_pthread_kill=yes |
2159 | -else |
2160 | - ac_cv_lib_pthread_pthread_kill=no |
2161 | -fi |
2162 | -rm -f core conftest.err conftest.$ac_objext \ |
2163 | - conftest$ac_exeext conftest.$ac_ext |
2164 | -LIBS=$ac_check_lib_save_LIBS |
2165 | -fi |
2166 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 |
2167 | -$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } |
2168 | -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : |
2169 | - gl_have_pthread=yes |
2170 | - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread |
2171 | - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread |
2172 | -fi |
2173 | - |
2174 | - if test -z "$gl_have_pthread"; then |
2175 | - # For FreeBSD 4. |
2176 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 |
2177 | -$as_echo_n "checking for pthread_kill in -lc_r... " >&6; } |
2178 | -if ${ac_cv_lib_c_r_pthread_kill+:} false; then : |
2179 | - $as_echo_n "(cached) " >&6 |
2180 | -else |
2181 | - ac_check_lib_save_LIBS=$LIBS |
2182 | -LIBS="-lc_r $LIBS" |
2183 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2184 | -/* end confdefs.h. */ |
2185 | - |
2186 | -/* Override any GCC internal prototype to avoid an error. |
2187 | - Use char because int might match the return type of a GCC |
2188 | - builtin and then its argument prototype would still apply. */ |
2189 | -#ifdef __cplusplus |
2190 | -extern "C" |
2191 | -#endif |
2192 | -char pthread_kill (); |
2193 | -int |
2194 | -main () |
2195 | -{ |
2196 | -return pthread_kill (); |
2197 | - ; |
2198 | - return 0; |
2199 | -} |
2200 | -_ACEOF |
2201 | -if ac_fn_c_try_link "$LINENO"; then : |
2202 | - ac_cv_lib_c_r_pthread_kill=yes |
2203 | -else |
2204 | - ac_cv_lib_c_r_pthread_kill=no |
2205 | -fi |
2206 | -rm -f core conftest.err conftest.$ac_objext \ |
2207 | - conftest$ac_exeext conftest.$ac_ext |
2208 | -LIBS=$ac_check_lib_save_LIBS |
2209 | -fi |
2210 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 |
2211 | -$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } |
2212 | -if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then : |
2213 | - gl_have_pthread=yes |
2214 | - LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r |
2215 | - LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r |
2216 | -fi |
2217 | - |
2218 | - fi |
2219 | - fi |
2220 | - if test -n "$gl_have_pthread"; then |
2221 | - gl_threads_api=posix |
2222 | - |
2223 | -$as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h |
2224 | - |
2225 | - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then |
2226 | - if test $gl_have_weak = yes; then |
2227 | - |
2228 | -$as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h |
2229 | - |
2230 | - LIBTHREAD= |
2231 | - LTLIBTHREAD= |
2232 | - fi |
2233 | - fi |
2234 | - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the |
2235 | - # pthread_rwlock_* functions. |
2236 | - ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h> |
2237 | -" |
2238 | -if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then : |
2239 | - |
2240 | -$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h |
2241 | - |
2242 | -fi |
2243 | - |
2244 | - # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. |
2245 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2246 | -/* end confdefs.h. */ |
2247 | -#include <pthread.h> |
2248 | -int |
2249 | -main () |
2250 | -{ |
2251 | -#if __FreeBSD__ == 4 |
2252 | -error "No, in FreeBSD 4.0 recursive mutexes actually don't work." |
2253 | -#else |
2254 | -int x = (int)PTHREAD_MUTEX_RECURSIVE; |
2255 | -return !x; |
2256 | -#endif |
2257 | - ; |
2258 | - return 0; |
2259 | -} |
2260 | -_ACEOF |
2261 | -if ac_fn_c_try_compile "$LINENO"; then : |
2262 | - |
2263 | -$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h |
2264 | - |
2265 | -fi |
2266 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2267 | - fi |
2268 | - fi |
2269 | - fi |
2270 | - if test -z "$gl_have_pthread"; then |
2271 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then |
2272 | - gl_have_solaristhread= |
2273 | - gl_save_LIBS="$LIBS" |
2274 | - LIBS="$LIBS -lthread" |
2275 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2276 | -/* end confdefs.h. */ |
2277 | -#include <thread.h> |
2278 | -#include <synch.h> |
2279 | -int |
2280 | -main () |
2281 | -{ |
2282 | -thr_self(); |
2283 | - ; |
2284 | - return 0; |
2285 | -} |
2286 | -_ACEOF |
2287 | -if ac_fn_c_try_link "$LINENO"; then : |
2288 | - gl_have_solaristhread=yes |
2289 | -fi |
2290 | -rm -f core conftest.err conftest.$ac_objext \ |
2291 | - conftest$ac_exeext conftest.$ac_ext |
2292 | - LIBS="$gl_save_LIBS" |
2293 | - if test -n "$gl_have_solaristhread"; then |
2294 | - gl_threads_api=solaris |
2295 | - LIBTHREAD=-lthread |
2296 | - LTLIBTHREAD=-lthread |
2297 | - LIBMULTITHREAD="$LIBTHREAD" |
2298 | - LTLIBMULTITHREAD="$LTLIBTHREAD" |
2299 | - |
2300 | -$as_echo "#define USE_SOLARIS_THREADS 1" >>confdefs.h |
2301 | - |
2302 | - if test $gl_have_weak = yes; then |
2303 | - |
2304 | -$as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h |
2305 | - |
2306 | - LIBTHREAD= |
2307 | - LTLIBTHREAD= |
2308 | - fi |
2309 | - fi |
2310 | - fi |
2311 | - fi |
2312 | - if test "$gl_use_threads" = pth; then |
2313 | - gl_save_CPPFLAGS="$CPPFLAGS" |
2314 | - |
2315 | - |
2316 | - |
2317 | - |
2318 | - |
2319 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5 |
2320 | -$as_echo_n "checking how to link with libpth... " >&6; } |
2321 | -if ${ac_cv_libpth_libs+:} false; then : |
2322 | - $as_echo_n "(cached) " >&6 |
2323 | -else |
2324 | - |
2325 | - |
2326 | - |
2327 | - |
2328 | - |
2329 | - use_additional=yes |
2330 | - |
2331 | - acl_save_prefix="$prefix" |
2332 | - prefix="$acl_final_prefix" |
2333 | - acl_save_exec_prefix="$exec_prefix" |
2334 | - exec_prefix="$acl_final_exec_prefix" |
2335 | - |
2336 | - eval additional_includedir=\"$includedir\" |
2337 | - eval additional_libdir=\"$libdir\" |
2338 | - |
2339 | - exec_prefix="$acl_save_exec_prefix" |
2340 | - prefix="$acl_save_prefix" |
2341 | - |
2342 | - |
2343 | -# Check whether --with-libpth-prefix was given. |
2344 | -if test "${with_libpth_prefix+set}" = set; then : |
2345 | - withval=$with_libpth_prefix; |
2346 | - if test "X$withval" = "Xno"; then |
2347 | - use_additional=no |
2348 | - else |
2349 | - if test "X$withval" = "X"; then |
2350 | - |
2351 | - acl_save_prefix="$prefix" |
2352 | - prefix="$acl_final_prefix" |
2353 | - acl_save_exec_prefix="$exec_prefix" |
2354 | - exec_prefix="$acl_final_exec_prefix" |
2355 | - |
2356 | - eval additional_includedir=\"$includedir\" |
2357 | - eval additional_libdir=\"$libdir\" |
2358 | - |
2359 | - exec_prefix="$acl_save_exec_prefix" |
2360 | - prefix="$acl_save_prefix" |
2361 | - |
2362 | - else |
2363 | - additional_includedir="$withval/include" |
2364 | - additional_libdir="$withval/$acl_libdirstem" |
2365 | - fi |
2366 | - fi |
2367 | - |
2368 | -fi |
2369 | - |
2370 | - LIBPTH= |
2371 | - LTLIBPTH= |
2372 | - INCPTH= |
2373 | - LIBPTH_PREFIX= |
2374 | - rpathdirs= |
2375 | - ltrpathdirs= |
2376 | - names_already_handled= |
2377 | - names_next_round='pth ' |
2378 | - while test -n "$names_next_round"; do |
2379 | - names_this_round="$names_next_round" |
2380 | - names_next_round= |
2381 | - for name in $names_this_round; do |
2382 | - already_handled= |
2383 | - for n in $names_already_handled; do |
2384 | - if test "$n" = "$name"; then |
2385 | - already_handled=yes |
2386 | - break |
2387 | - fi |
2388 | - done |
2389 | - if test -z "$already_handled"; then |
2390 | - names_already_handled="$names_already_handled $name" |
2391 | - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
2392 | - eval value=\"\$HAVE_LIB$uppername\" |
2393 | - if test -n "$value"; then |
2394 | - if test "$value" = yes; then |
2395 | - eval value=\"\$LIB$uppername\" |
2396 | - test -z "$value" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value" |
2397 | - eval value=\"\$LTLIB$uppername\" |
2398 | - test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value" |
2399 | - else |
2400 | - : |
2401 | - fi |
2402 | - else |
2403 | - found_dir= |
2404 | - found_la= |
2405 | - found_so= |
2406 | - found_a= |
2407 | - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name |
2408 | - if test -n "$acl_shlibext"; then |
2409 | - shrext=".$acl_shlibext" # typically: shrext=.so |
2410 | - else |
2411 | - shrext= |
2412 | - fi |
2413 | - if test $use_additional = yes; then |
2414 | - dir="$additional_libdir" |
2415 | - if test -n "$acl_shlibext"; then |
2416 | - if test -f "$dir/$libname$shrext"; then |
2417 | - found_dir="$dir" |
2418 | - found_so="$dir/$libname$shrext" |
2419 | - else |
2420 | - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
2421 | - ver=`(cd "$dir" && \ |
2422 | - for f in "$libname$shrext".*; do echo "$f"; done \ |
2423 | - | sed -e "s,^$libname$shrext\\\\.,," \ |
2424 | - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
2425 | - | sed 1q ) 2>/dev/null` |
2426 | - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
2427 | - found_dir="$dir" |
2428 | - found_so="$dir/$libname$shrext.$ver" |
2429 | - fi |
2430 | - else |
2431 | - eval library_names=\"$acl_library_names_spec\" |
2432 | - for f in $library_names; do |
2433 | - if test -f "$dir/$f"; then |
2434 | - found_dir="$dir" |
2435 | - found_so="$dir/$f" |
2436 | - break |
2437 | - fi |
2438 | - done |
2439 | - fi |
2440 | - fi |
2441 | - fi |
2442 | - if test "X$found_dir" = "X"; then |
2443 | - if test -f "$dir/$libname.$acl_libext"; then |
2444 | - found_dir="$dir" |
2445 | - found_a="$dir/$libname.$acl_libext" |
2446 | - fi |
2447 | - fi |
2448 | - if test "X$found_dir" != "X"; then |
2449 | - if test -f "$dir/$libname.la"; then |
2450 | - found_la="$dir/$libname.la" |
2451 | - fi |
2452 | - fi |
2453 | - fi |
2454 | - if test "X$found_dir" = "X"; then |
2455 | - for x in $LDFLAGS $LTLIBPTH; do |
2456 | - |
2457 | - acl_save_prefix="$prefix" |
2458 | - prefix="$acl_final_prefix" |
2459 | - acl_save_exec_prefix="$exec_prefix" |
2460 | - exec_prefix="$acl_final_exec_prefix" |
2461 | - eval x=\"$x\" |
2462 | - exec_prefix="$acl_save_exec_prefix" |
2463 | - prefix="$acl_save_prefix" |
2464 | - |
2465 | - case "$x" in |
2466 | - -L*) |
2467 | - dir=`echo "X$x" | sed -e 's/^X-L//'` |
2468 | - if test -n "$acl_shlibext"; then |
2469 | - if test -f "$dir/$libname$shrext"; then |
2470 | - found_dir="$dir" |
2471 | - found_so="$dir/$libname$shrext" |
2472 | - else |
2473 | - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
2474 | - ver=`(cd "$dir" && \ |
2475 | - for f in "$libname$shrext".*; do echo "$f"; done \ |
2476 | - | sed -e "s,^$libname$shrext\\\\.,," \ |
2477 | - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
2478 | - | sed 1q ) 2>/dev/null` |
2479 | - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
2480 | - found_dir="$dir" |
2481 | - found_so="$dir/$libname$shrext.$ver" |
2482 | - fi |
2483 | - else |
2484 | - eval library_names=\"$acl_library_names_spec\" |
2485 | - for f in $library_names; do |
2486 | - if test -f "$dir/$f"; then |
2487 | - found_dir="$dir" |
2488 | - found_so="$dir/$f" |
2489 | - break |
2490 | - fi |
2491 | - done |
2492 | - fi |
2493 | - fi |
2494 | - fi |
2495 | - if test "X$found_dir" = "X"; then |
2496 | - if test -f "$dir/$libname.$acl_libext"; then |
2497 | - found_dir="$dir" |
2498 | - found_a="$dir/$libname.$acl_libext" |
2499 | - fi |
2500 | - fi |
2501 | - if test "X$found_dir" != "X"; then |
2502 | - if test -f "$dir/$libname.la"; then |
2503 | - found_la="$dir/$libname.la" |
2504 | - fi |
2505 | - fi |
2506 | - ;; |
2507 | - esac |
2508 | - if test "X$found_dir" != "X"; then |
2509 | - break |
2510 | - fi |
2511 | - done |
2512 | - fi |
2513 | - if test "X$found_dir" != "X"; then |
2514 | - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name" |
2515 | - if test "X$found_so" != "X"; then |
2516 | - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then |
2517 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" |
2518 | - else |
2519 | - haveit= |
2520 | - for x in $ltrpathdirs; do |
2521 | - if test "X$x" = "X$found_dir"; then |
2522 | - haveit=yes |
2523 | - break |
2524 | - fi |
2525 | - done |
2526 | - if test -z "$haveit"; then |
2527 | - ltrpathdirs="$ltrpathdirs $found_dir" |
2528 | - fi |
2529 | - if test "$acl_hardcode_direct" = yes; then |
2530 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" |
2531 | - else |
2532 | - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
2533 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" |
2534 | - haveit= |
2535 | - for x in $rpathdirs; do |
2536 | - if test "X$x" = "X$found_dir"; then |
2537 | - haveit=yes |
2538 | - break |
2539 | - fi |
2540 | - done |
2541 | - if test -z "$haveit"; then |
2542 | - rpathdirs="$rpathdirs $found_dir" |
2543 | - fi |
2544 | - else |
2545 | - haveit= |
2546 | - for x in $LDFLAGS $LIBPTH; do |
2547 | - |
2548 | - acl_save_prefix="$prefix" |
2549 | - prefix="$acl_final_prefix" |
2550 | - acl_save_exec_prefix="$exec_prefix" |
2551 | - exec_prefix="$acl_final_exec_prefix" |
2552 | - eval x=\"$x\" |
2553 | - exec_prefix="$acl_save_exec_prefix" |
2554 | - prefix="$acl_save_prefix" |
2555 | - |
2556 | - if test "X$x" = "X-L$found_dir"; then |
2557 | - haveit=yes |
2558 | - break |
2559 | - fi |
2560 | - done |
2561 | - if test -z "$haveit"; then |
2562 | - LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir" |
2563 | - fi |
2564 | - if test "$acl_hardcode_minus_L" != no; then |
2565 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" |
2566 | - else |
2567 | - LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name" |
2568 | - fi |
2569 | - fi |
2570 | - fi |
2571 | - fi |
2572 | - else |
2573 | - if test "X$found_a" != "X"; then |
2574 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a" |
2575 | - else |
2576 | - LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name" |
2577 | - fi |
2578 | - fi |
2579 | - additional_includedir= |
2580 | - case "$found_dir" in |
2581 | - */$acl_libdirstem | */$acl_libdirstem/) |
2582 | - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
2583 | - LIBPTH_PREFIX="$basedir" |
2584 | - additional_includedir="$basedir/include" |
2585 | - ;; |
2586 | - esac |
2587 | - if test "X$additional_includedir" != "X"; then |
2588 | - if test "X$additional_includedir" != "X/usr/include"; then |
2589 | - haveit= |
2590 | - if test "X$additional_includedir" = "X/usr/local/include"; then |
2591 | - if test -n "$GCC"; then |
2592 | - case $host_os in |
2593 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
2594 | - esac |
2595 | - fi |
2596 | - fi |
2597 | - if test -z "$haveit"; then |
2598 | - for x in $CPPFLAGS $INCPTH; do |
2599 | - |
2600 | - acl_save_prefix="$prefix" |
2601 | - prefix="$acl_final_prefix" |
2602 | - acl_save_exec_prefix="$exec_prefix" |
2603 | - exec_prefix="$acl_final_exec_prefix" |
2604 | - eval x=\"$x\" |
2605 | - exec_prefix="$acl_save_exec_prefix" |
2606 | - prefix="$acl_save_prefix" |
2607 | - |
2608 | - if test "X$x" = "X-I$additional_includedir"; then |
2609 | - haveit=yes |
2610 | - break |
2611 | - fi |
2612 | - done |
2613 | - if test -z "$haveit"; then |
2614 | - if test -d "$additional_includedir"; then |
2615 | - INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir" |
2616 | - fi |
2617 | - fi |
2618 | - fi |
2619 | - fi |
2620 | - fi |
2621 | - if test -n "$found_la"; then |
2622 | - save_libdir="$libdir" |
2623 | - case "$found_la" in |
2624 | - */* | *\\*) . "$found_la" ;; |
2625 | - *) . "./$found_la" ;; |
2626 | - esac |
2627 | - libdir="$save_libdir" |
2628 | - for dep in $dependency_libs; do |
2629 | - case "$dep" in |
2630 | - -L*) |
2631 | - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` |
2632 | - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then |
2633 | - haveit= |
2634 | - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then |
2635 | - if test -n "$GCC"; then |
2636 | - case $host_os in |
2637 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
2638 | - esac |
2639 | - fi |
2640 | - fi |
2641 | - if test -z "$haveit"; then |
2642 | - haveit= |
2643 | - for x in $LDFLAGS $LIBPTH; do |
2644 | - |
2645 | - acl_save_prefix="$prefix" |
2646 | - prefix="$acl_final_prefix" |
2647 | - acl_save_exec_prefix="$exec_prefix" |
2648 | - exec_prefix="$acl_final_exec_prefix" |
2649 | - eval x=\"$x\" |
2650 | - exec_prefix="$acl_save_exec_prefix" |
2651 | - prefix="$acl_save_prefix" |
2652 | - |
2653 | - if test "X$x" = "X-L$additional_libdir"; then |
2654 | - haveit=yes |
2655 | - break |
2656 | - fi |
2657 | - done |
2658 | - if test -z "$haveit"; then |
2659 | - if test -d "$additional_libdir"; then |
2660 | - LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir" |
2661 | - fi |
2662 | - fi |
2663 | - haveit= |
2664 | - for x in $LDFLAGS $LTLIBPTH; do |
2665 | - |
2666 | - acl_save_prefix="$prefix" |
2667 | - prefix="$acl_final_prefix" |
2668 | - acl_save_exec_prefix="$exec_prefix" |
2669 | - exec_prefix="$acl_final_exec_prefix" |
2670 | - eval x=\"$x\" |
2671 | - exec_prefix="$acl_save_exec_prefix" |
2672 | - prefix="$acl_save_prefix" |
2673 | - |
2674 | - if test "X$x" = "X-L$additional_libdir"; then |
2675 | - haveit=yes |
2676 | - break |
2677 | - fi |
2678 | - done |
2679 | - if test -z "$haveit"; then |
2680 | - if test -d "$additional_libdir"; then |
2681 | - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir" |
2682 | - fi |
2683 | - fi |
2684 | - fi |
2685 | - fi |
2686 | - ;; |
2687 | - -R*) |
2688 | - dir=`echo "X$dep" | sed -e 's/^X-R//'` |
2689 | - if test "$enable_rpath" != no; then |
2690 | - haveit= |
2691 | - for x in $rpathdirs; do |
2692 | - if test "X$x" = "X$dir"; then |
2693 | - haveit=yes |
2694 | - break |
2695 | - fi |
2696 | - done |
2697 | - if test -z "$haveit"; then |
2698 | - rpathdirs="$rpathdirs $dir" |
2699 | - fi |
2700 | - haveit= |
2701 | - for x in $ltrpathdirs; do |
2702 | - if test "X$x" = "X$dir"; then |
2703 | - haveit=yes |
2704 | - break |
2705 | - fi |
2706 | - done |
2707 | - if test -z "$haveit"; then |
2708 | - ltrpathdirs="$ltrpathdirs $dir" |
2709 | - fi |
2710 | - fi |
2711 | - ;; |
2712 | - -l*) |
2713 | - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` |
2714 | - ;; |
2715 | - *.la) |
2716 | - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` |
2717 | - ;; |
2718 | - *) |
2719 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$dep" |
2720 | - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep" |
2721 | - ;; |
2722 | - esac |
2723 | - done |
2724 | - fi |
2725 | - else |
2726 | - LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name" |
2727 | - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name" |
2728 | - fi |
2729 | - fi |
2730 | - fi |
2731 | - done |
2732 | - done |
2733 | - if test "X$rpathdirs" != "X"; then |
2734 | - if test -n "$acl_hardcode_libdir_separator"; then |
2735 | - alldirs= |
2736 | - for found_dir in $rpathdirs; do |
2737 | - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" |
2738 | - done |
2739 | - acl_save_libdir="$libdir" |
2740 | - libdir="$alldirs" |
2741 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
2742 | - libdir="$acl_save_libdir" |
2743 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$flag" |
2744 | - else |
2745 | - for found_dir in $rpathdirs; do |
2746 | - acl_save_libdir="$libdir" |
2747 | - libdir="$found_dir" |
2748 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
2749 | - libdir="$acl_save_libdir" |
2750 | - LIBPTH="${LIBPTH}${LIBPTH:+ }$flag" |
2751 | - done |
2752 | - fi |
2753 | - fi |
2754 | - if test "X$ltrpathdirs" != "X"; then |
2755 | - for found_dir in $ltrpathdirs; do |
2756 | - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir" |
2757 | - done |
2758 | - fi |
2759 | - |
2760 | - ac_cv_libpth_libs="$LIBPTH" |
2761 | - ac_cv_libpth_ltlibs="$LTLIBPTH" |
2762 | - ac_cv_libpth_cppflags="$INCPTH" |
2763 | - ac_cv_libpth_prefix="$LIBPTH_PREFIX" |
2764 | - |
2765 | -fi |
2766 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libpth_libs" >&5 |
2767 | -$as_echo "$ac_cv_libpth_libs" >&6; } |
2768 | - LIBPTH="$ac_cv_libpth_libs" |
2769 | - LTLIBPTH="$ac_cv_libpth_ltlibs" |
2770 | - INCPTH="$ac_cv_libpth_cppflags" |
2771 | - LIBPTH_PREFIX="$ac_cv_libpth_prefix" |
2772 | - |
2773 | - for element in $INCPTH; do |
2774 | - haveit= |
2775 | - for x in $CPPFLAGS; do |
2776 | - |
2777 | - acl_save_prefix="$prefix" |
2778 | - prefix="$acl_final_prefix" |
2779 | - acl_save_exec_prefix="$exec_prefix" |
2780 | - exec_prefix="$acl_final_exec_prefix" |
2781 | - eval x=\"$x\" |
2782 | - exec_prefix="$acl_save_exec_prefix" |
2783 | - prefix="$acl_save_prefix" |
2784 | - |
2785 | - if test "X$x" = "X$element"; then |
2786 | - haveit=yes |
2787 | - break |
2788 | - fi |
2789 | - done |
2790 | - if test -z "$haveit"; then |
2791 | - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" |
2792 | - fi |
2793 | - done |
2794 | - |
2795 | - |
2796 | - |
2797 | - |
2798 | - HAVE_LIBPTH=yes |
2799 | - |
2800 | - |
2801 | - |
2802 | - gl_have_pth= |
2803 | - gl_save_LIBS="$LIBS" |
2804 | - LIBS="$LIBS -lpth" |
2805 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2806 | -/* end confdefs.h. */ |
2807 | -#include <pth.h> |
2808 | -int |
2809 | -main () |
2810 | -{ |
2811 | -pth_self(); |
2812 | - ; |
2813 | - return 0; |
2814 | -} |
2815 | -_ACEOF |
2816 | -if ac_fn_c_try_link "$LINENO"; then : |
2817 | - gl_have_pth=yes |
2818 | -fi |
2819 | -rm -f core conftest.err conftest.$ac_objext \ |
2820 | - conftest$ac_exeext conftest.$ac_ext |
2821 | - LIBS="$gl_save_LIBS" |
2822 | - if test -n "$gl_have_pth"; then |
2823 | - gl_threads_api=pth |
2824 | - LIBTHREAD="$LIBPTH" |
2825 | - LTLIBTHREAD="$LTLIBPTH" |
2826 | - LIBMULTITHREAD="$LIBTHREAD" |
2827 | - LTLIBMULTITHREAD="$LTLIBTHREAD" |
2828 | - |
2829 | -$as_echo "#define USE_PTH_THREADS 1" >>confdefs.h |
2830 | - |
2831 | - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then |
2832 | - if test $gl_have_weak = yes; then |
2833 | - |
2834 | -$as_echo "#define USE_PTH_THREADS_WEAK 1" >>confdefs.h |
2835 | - |
2836 | - LIBTHREAD= |
2837 | - LTLIBTHREAD= |
2838 | - fi |
2839 | - fi |
2840 | - else |
2841 | - CPPFLAGS="$gl_save_CPPFLAGS" |
2842 | - fi |
2843 | - fi |
2844 | - if test -z "$gl_have_pthread"; then |
2845 | - if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then |
2846 | - if { case "$host_os" in |
2847 | - mingw*) true;; |
2848 | - *) false;; |
2849 | - esac |
2850 | - }; then |
2851 | - gl_threads_api=win32 |
2852 | - |
2853 | -$as_echo "#define USE_WIN32_THREADS 1" >>confdefs.h |
2854 | - |
2855 | - fi |
2856 | - fi |
2857 | - fi |
2858 | - fi |
2859 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5 |
2860 | -$as_echo_n "checking for multithread API to use... " >&6; } |
2861 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5 |
2862 | -$as_echo "$gl_threads_api" >&6; } |
2863 | - |
2864 | - |
2865 | - |
2866 | - |
2867 | - |
2868 | - |
2869 | - |
2870 | - |
2871 | - |
2872 | - |
2873 | - |
2874 | - |
2875 | - |
2876 | - |
2877 | |
2878 | |
2879 | |
2880 | @@ -14622,136 +12715,169 @@ |
2881 | |
2882 | |
2883 | |
2884 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2885 | -/* end confdefs.h. */ |
2886 | -int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; } |
2887 | -int |
2888 | -main () |
2889 | -{ |
2890 | - |
2891 | - ; |
2892 | - return 0; |
2893 | -} |
2894 | -_ACEOF |
2895 | -if ac_fn_c_try_link "$LINENO"; then : |
2896 | - |
2897 | -$as_echo "#define HAVE_BUILTIN_EXPECT 1" >>confdefs.h |
2898 | - |
2899 | -fi |
2900 | -rm -f core conftest.err conftest.$ac_objext \ |
2901 | - conftest$ac_exeext conftest.$ac_ext |
2902 | - |
2903 | - for ac_header in argz.h inttypes.h limits.h unistd.h sys/param.h |
2904 | -do : |
2905 | - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
2906 | -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
2907 | -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
2908 | - cat >>confdefs.h <<_ACEOF |
2909 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
2910 | -_ACEOF |
2911 | - |
2912 | -fi |
2913 | - |
2914 | -done |
2915 | - |
2916 | - for ac_func in getcwd getegid geteuid getgid getuid mempcpy munmap \ |
2917 | - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ |
2918 | - argz_next __fsetlocking |
2919 | -do : |
2920 | - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
2921 | -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
2922 | -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
2923 | - cat >>confdefs.h <<_ACEOF |
2924 | -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
2925 | -_ACEOF |
2926 | - |
2927 | -fi |
2928 | -done |
2929 | - |
2930 | - |
2931 | - |
2932 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5 |
2933 | -$as_echo_n "checking whether feof_unlocked is declared... " >&6; } |
2934 | -if ${ac_cv_have_decl_feof_unlocked+:} false; then : |
2935 | - $as_echo_n "(cached) " >&6 |
2936 | -else |
2937 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2938 | -/* end confdefs.h. */ |
2939 | -#include <stdio.h> |
2940 | -int |
2941 | -main () |
2942 | -{ |
2943 | - |
2944 | -#ifndef feof_unlocked |
2945 | - char *p = (char *) feof_unlocked; |
2946 | -#endif |
2947 | - |
2948 | - ; |
2949 | - return 0; |
2950 | -} |
2951 | -_ACEOF |
2952 | -if ac_fn_c_try_compile "$LINENO"; then : |
2953 | - ac_cv_have_decl_feof_unlocked=yes |
2954 | -else |
2955 | - ac_cv_have_decl_feof_unlocked=no |
2956 | -fi |
2957 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2958 | -fi |
2959 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5 |
2960 | -$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; } |
2961 | - if test $ac_cv_have_decl_feof_unlocked = yes; then |
2962 | - gt_value=1 |
2963 | - else |
2964 | - gt_value=0 |
2965 | - fi |
2966 | - |
2967 | -cat >>confdefs.h <<_ACEOF |
2968 | -#define HAVE_DECL_FEOF_UNLOCKED $gt_value |
2969 | -_ACEOF |
2970 | - |
2971 | - |
2972 | - |
2973 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5 |
2974 | -$as_echo_n "checking whether fgets_unlocked is declared... " >&6; } |
2975 | -if ${ac_cv_have_decl_fgets_unlocked+:} false; then : |
2976 | - $as_echo_n "(cached) " >&6 |
2977 | -else |
2978 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2979 | -/* end confdefs.h. */ |
2980 | -#include <stdio.h> |
2981 | -int |
2982 | -main () |
2983 | -{ |
2984 | - |
2985 | -#ifndef fgets_unlocked |
2986 | - char *p = (char *) fgets_unlocked; |
2987 | -#endif |
2988 | - |
2989 | - ; |
2990 | - return 0; |
2991 | -} |
2992 | -_ACEOF |
2993 | -if ac_fn_c_try_compile "$LINENO"; then : |
2994 | - ac_cv_have_decl_fgets_unlocked=yes |
2995 | -else |
2996 | - ac_cv_have_decl_fgets_unlocked=no |
2997 | -fi |
2998 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2999 | -fi |
3000 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5 |
3001 | -$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; } |
3002 | - if test $ac_cv_have_decl_fgets_unlocked = yes; then |
3003 | - gt_value=1 |
3004 | - else |
3005 | - gt_value=0 |
3006 | - fi |
3007 | - |
3008 | -cat >>confdefs.h <<_ACEOF |
3009 | -#define HAVE_DECL_FGETS_UNLOCKED $gt_value |
3010 | -_ACEOF |
3011 | - |
3012 | - |
3013 | - |
3014 | + |
3015 | + |
3016 | + |
3017 | + |
3018 | + |
3019 | + |
3020 | + |
3021 | + |
3022 | + |
3023 | + |
3024 | + |
3025 | + |
3026 | + |
3027 | + |
3028 | + |
3029 | + |
3030 | + |
3031 | + |
3032 | + |
3033 | + |
3034 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 |
3035 | +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } |
3036 | +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : |
3037 | + $as_echo_n "(cached) " >&6 |
3038 | +else |
3039 | + gt_save_LIBS="$LIBS" |
3040 | + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
3041 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3042 | +/* end confdefs.h. */ |
3043 | +#include <CoreFoundation/CFPreferences.h> |
3044 | +int |
3045 | +main () |
3046 | +{ |
3047 | +CFPreferencesCopyAppValue(NULL, NULL) |
3048 | + ; |
3049 | + return 0; |
3050 | +} |
3051 | +_ACEOF |
3052 | +if ac_fn_c_try_link "$LINENO"; then : |
3053 | + gt_cv_func_CFPreferencesCopyAppValue=yes |
3054 | +else |
3055 | + gt_cv_func_CFPreferencesCopyAppValue=no |
3056 | +fi |
3057 | +rm -f core conftest.err conftest.$ac_objext \ |
3058 | + conftest$ac_exeext conftest.$ac_ext |
3059 | + LIBS="$gt_save_LIBS" |
3060 | +fi |
3061 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 |
3062 | +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } |
3063 | + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
3064 | + |
3065 | +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h |
3066 | + |
3067 | + fi |
3068 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 |
3069 | +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } |
3070 | +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : |
3071 | + $as_echo_n "(cached) " >&6 |
3072 | +else |
3073 | + gt_save_LIBS="$LIBS" |
3074 | + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
3075 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3076 | +/* end confdefs.h. */ |
3077 | +#include <CoreFoundation/CFLocale.h> |
3078 | +int |
3079 | +main () |
3080 | +{ |
3081 | +CFLocaleCopyCurrent(); |
3082 | + ; |
3083 | + return 0; |
3084 | +} |
3085 | +_ACEOF |
3086 | +if ac_fn_c_try_link "$LINENO"; then : |
3087 | + gt_cv_func_CFLocaleCopyCurrent=yes |
3088 | +else |
3089 | + gt_cv_func_CFLocaleCopyCurrent=no |
3090 | +fi |
3091 | +rm -f core conftest.err conftest.$ac_objext \ |
3092 | + conftest$ac_exeext conftest.$ac_ext |
3093 | + LIBS="$gt_save_LIBS" |
3094 | +fi |
3095 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 |
3096 | +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } |
3097 | + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
3098 | + |
3099 | +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h |
3100 | + |
3101 | + fi |
3102 | + INTL_MACOSX_LIBS= |
3103 | + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
3104 | + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
3105 | + fi |
3106 | + |
3107 | + |
3108 | + |
3109 | + |
3110 | + |
3111 | + |
3112 | + LIBINTL= |
3113 | + LTLIBINTL= |
3114 | + POSUB= |
3115 | + |
3116 | + case " $gt_needs " in |
3117 | + *" need-formatstring-macros "*) gt_api_version=3 ;; |
3118 | + *" need-ngettext "*) gt_api_version=2 ;; |
3119 | + *) gt_api_version=1 ;; |
3120 | + esac |
3121 | + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" |
3122 | + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" |
3123 | + |
3124 | + if test "$USE_NLS" = "yes"; then |
3125 | + gt_use_preinstalled_gnugettext=no |
3126 | + |
3127 | + |
3128 | + if test $gt_api_version -ge 3; then |
3129 | + gt_revision_test_code=' |
3130 | +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
3131 | +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) |
3132 | +#endif |
3133 | +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; |
3134 | +' |
3135 | + else |
3136 | + gt_revision_test_code= |
3137 | + fi |
3138 | + if test $gt_api_version -ge 2; then |
3139 | + gt_expression_test_code=' + * ngettext ("", "", 0)' |
3140 | + else |
3141 | + gt_expression_test_code= |
3142 | + fi |
3143 | + |
3144 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 |
3145 | +$as_echo_n "checking for GNU gettext in libc... " >&6; } |
3146 | +if eval \${$gt_func_gnugettext_libc+:} false; then : |
3147 | + $as_echo_n "(cached) " >&6 |
3148 | +else |
3149 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3150 | +/* end confdefs.h. */ |
3151 | +#include <libintl.h> |
3152 | +$gt_revision_test_code |
3153 | +extern int _nl_msg_cat_cntr; |
3154 | +extern int *_nl_domain_bindings; |
3155 | +int |
3156 | +main () |
3157 | +{ |
3158 | +bindtextdomain ("", ""); |
3159 | +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings |
3160 | + ; |
3161 | + return 0; |
3162 | +} |
3163 | +_ACEOF |
3164 | +if ac_fn_c_try_link "$LINENO"; then : |
3165 | + eval "$gt_func_gnugettext_libc=yes" |
3166 | +else |
3167 | + eval "$gt_func_gnugettext_libc=no" |
3168 | +fi |
3169 | +rm -f core conftest.err conftest.$ac_objext \ |
3170 | + conftest$ac_exeext conftest.$ac_ext |
3171 | +fi |
3172 | +eval ac_res=\$$gt_func_gnugettext_libc |
3173 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
3174 | +$as_echo "$ac_res" >&6; } |
3175 | + |
3176 | + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then |
3177 | |
3178 | |
3179 | |
3180 | @@ -14954,1213 +13080,6 @@ |
3181 | |
3182 | |
3183 | |
3184 | - if test "$am_cv_func_iconv" = yes; then |
3185 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 |
3186 | -$as_echo_n "checking for iconv declaration... " >&6; } |
3187 | - if ${am_cv_proto_iconv+:} false; then : |
3188 | - $as_echo_n "(cached) " >&6 |
3189 | -else |
3190 | - |
3191 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3192 | -/* end confdefs.h. */ |
3193 | - |
3194 | -#include <stdlib.h> |
3195 | -#include <iconv.h> |
3196 | -extern |
3197 | -#ifdef __cplusplus |
3198 | -"C" |
3199 | -#endif |
3200 | -#if defined(__STDC__) || defined(__cplusplus) |
3201 | -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); |
3202 | -#else |
3203 | -size_t iconv(); |
3204 | -#endif |
3205 | - |
3206 | -int |
3207 | -main () |
3208 | -{ |
3209 | - |
3210 | - ; |
3211 | - return 0; |
3212 | -} |
3213 | -_ACEOF |
3214 | -if ac_fn_c_try_compile "$LINENO"; then : |
3215 | - am_cv_proto_iconv_arg1="" |
3216 | -else |
3217 | - am_cv_proto_iconv_arg1="const" |
3218 | -fi |
3219 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3220 | - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" |
3221 | -fi |
3222 | - |
3223 | - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` |
3224 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- |
3225 | - }$am_cv_proto_iconv" >&5 |
3226 | -$as_echo "${ac_t:- |
3227 | - }$am_cv_proto_iconv" >&6; } |
3228 | - |
3229 | -cat >>confdefs.h <<_ACEOF |
3230 | -#define ICONV_CONST $am_cv_proto_iconv_arg1 |
3231 | -_ACEOF |
3232 | - |
3233 | - fi |
3234 | - |
3235 | - |
3236 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NL_LOCALE_NAME macro" >&5 |
3237 | -$as_echo_n "checking for NL_LOCALE_NAME macro... " >&6; } |
3238 | -if ${gt_cv_nl_locale_name+:} false; then : |
3239 | - $as_echo_n "(cached) " >&6 |
3240 | -else |
3241 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3242 | -/* end confdefs.h. */ |
3243 | -#include <langinfo.h> |
3244 | -#include <locale.h> |
3245 | -int |
3246 | -main () |
3247 | -{ |
3248 | -char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)); |
3249 | - return !cs; |
3250 | - |
3251 | - ; |
3252 | - return 0; |
3253 | -} |
3254 | -_ACEOF |
3255 | -if ac_fn_c_try_link "$LINENO"; then : |
3256 | - gt_cv_nl_locale_name=yes |
3257 | -else |
3258 | - gt_cv_nl_locale_name=no |
3259 | -fi |
3260 | -rm -f core conftest.err conftest.$ac_objext \ |
3261 | - conftest$ac_exeext conftest.$ac_ext |
3262 | - |
3263 | -fi |
3264 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_nl_locale_name" >&5 |
3265 | -$as_echo "$gt_cv_nl_locale_name" >&6; } |
3266 | - if test $gt_cv_nl_locale_name = yes; then |
3267 | - |
3268 | -$as_echo "#define HAVE_NL_LOCALE_NAME 1" >>confdefs.h |
3269 | - |
3270 | - fi |
3271 | - |
3272 | - for ac_prog in bison |
3273 | -do |
3274 | - # Extract the first word of "$ac_prog", so it can be a program name with args. |
3275 | -set dummy $ac_prog; ac_word=$2 |
3276 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3277 | -$as_echo_n "checking for $ac_word... " >&6; } |
3278 | -if ${ac_cv_prog_INTLBISON+:} false; then : |
3279 | - $as_echo_n "(cached) " >&6 |
3280 | -else |
3281 | - if test -n "$INTLBISON"; then |
3282 | - ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. |
3283 | -else |
3284 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3285 | -for as_dir in $PATH |
3286 | -do |
3287 | - IFS=$as_save_IFS |
3288 | - test -z "$as_dir" && as_dir=. |
3289 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3290 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3291 | - ac_cv_prog_INTLBISON="$ac_prog" |
3292 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3293 | - break 2 |
3294 | - fi |
3295 | -done |
3296 | - done |
3297 | -IFS=$as_save_IFS |
3298 | - |
3299 | -fi |
3300 | -fi |
3301 | -INTLBISON=$ac_cv_prog_INTLBISON |
3302 | -if test -n "$INTLBISON"; then |
3303 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5 |
3304 | -$as_echo "$INTLBISON" >&6; } |
3305 | -else |
3306 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3307 | -$as_echo "no" >&6; } |
3308 | -fi |
3309 | - |
3310 | - |
3311 | - test -n "$INTLBISON" && break |
3312 | -done |
3313 | - |
3314 | - if test -z "$INTLBISON"; then |
3315 | - ac_verc_fail=yes |
3316 | - else |
3317 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5 |
3318 | -$as_echo_n "checking version of bison... " >&6; } |
3319 | - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` |
3320 | - case $ac_prog_version in |
3321 | - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; |
3322 | - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) |
3323 | - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; |
3324 | - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; |
3325 | - esac |
3326 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 |
3327 | -$as_echo "$ac_prog_version" >&6; } |
3328 | - fi |
3329 | - if test $ac_verc_fail = yes; then |
3330 | - INTLBISON=: |
3331 | - fi |
3332 | - |
3333 | - |
3334 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 |
3335 | -$as_echo_n "checking for long long int... " >&6; } |
3336 | -if ${ac_cv_type_long_long_int+:} false; then : |
3337 | - $as_echo_n "(cached) " >&6 |
3338 | -else |
3339 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3340 | -/* end confdefs.h. */ |
3341 | - |
3342 | - /* Test preprocessor. */ |
3343 | - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) |
3344 | - error in preprocessor; |
3345 | - #endif |
3346 | - #if ! (18446744073709551615ULL <= -1ull) |
3347 | - error in preprocessor; |
3348 | - #endif |
3349 | - /* Test literals. */ |
3350 | - long long int ll = 9223372036854775807ll; |
3351 | - long long int nll = -9223372036854775807LL; |
3352 | - unsigned long long int ull = 18446744073709551615ULL; |
3353 | - /* Test constant expressions. */ |
3354 | - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) |
3355 | - ? 1 : -1)]; |
3356 | - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 |
3357 | - ? 1 : -1)]; |
3358 | - int i = 63; |
3359 | -int |
3360 | -main () |
3361 | -{ |
3362 | -/* Test availability of runtime routines for shift and division. */ |
3363 | - long long int llmax = 9223372036854775807ll; |
3364 | - unsigned long long int ullmax = 18446744073709551615ull; |
3365 | - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) |
3366 | - | (llmax / ll) | (llmax % ll) |
3367 | - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) |
3368 | - | (ullmax / ull) | (ullmax % ull)); |
3369 | - ; |
3370 | - return 0; |
3371 | -} |
3372 | - |
3373 | -_ACEOF |
3374 | -if ac_fn_c_try_link "$LINENO"; then : |
3375 | - if test "$cross_compiling" = yes; then : |
3376 | - ac_cv_type_long_long_int=yes |
3377 | -else |
3378 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3379 | -/* end confdefs.h. */ |
3380 | -#include <limits.h> |
3381 | - #ifndef LLONG_MAX |
3382 | - # define HALF \ |
3383 | - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) |
3384 | - # define LLONG_MAX (HALF - 1 + HALF) |
3385 | - #endif |
3386 | -int |
3387 | -main () |
3388 | -{ |
3389 | -long long int n = 1; |
3390 | - int i; |
3391 | - for (i = 0; ; i++) |
3392 | - { |
3393 | - long long int m = n << i; |
3394 | - if (m >> i != n) |
3395 | - return 1; |
3396 | - if (LLONG_MAX / 2 < m) |
3397 | - break; |
3398 | - } |
3399 | - return 0; |
3400 | - ; |
3401 | - return 0; |
3402 | -} |
3403 | -_ACEOF |
3404 | -if ac_fn_c_try_run "$LINENO"; then : |
3405 | - ac_cv_type_long_long_int=yes |
3406 | -else |
3407 | - ac_cv_type_long_long_int=no |
3408 | -fi |
3409 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
3410 | - conftest.$ac_objext conftest.beam conftest.$ac_ext |
3411 | -fi |
3412 | - |
3413 | -else |
3414 | - ac_cv_type_long_long_int=no |
3415 | -fi |
3416 | -rm -f core conftest.err conftest.$ac_objext \ |
3417 | - conftest$ac_exeext conftest.$ac_ext |
3418 | -fi |
3419 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 |
3420 | -$as_echo "$ac_cv_type_long_long_int" >&6; } |
3421 | - if test $ac_cv_type_long_long_int = yes; then |
3422 | - |
3423 | -$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h |
3424 | - |
3425 | - fi |
3426 | - |
3427 | - |
3428 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 |
3429 | -$as_echo_n "checking for wchar_t... " >&6; } |
3430 | -if ${gt_cv_c_wchar_t+:} false; then : |
3431 | - $as_echo_n "(cached) " >&6 |
3432 | -else |
3433 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3434 | -/* end confdefs.h. */ |
3435 | -#include <stddef.h> |
3436 | - wchar_t foo = (wchar_t)'\0'; |
3437 | -int |
3438 | -main () |
3439 | -{ |
3440 | - |
3441 | - ; |
3442 | - return 0; |
3443 | -} |
3444 | -_ACEOF |
3445 | -if ac_fn_c_try_compile "$LINENO"; then : |
3446 | - gt_cv_c_wchar_t=yes |
3447 | -else |
3448 | - gt_cv_c_wchar_t=no |
3449 | -fi |
3450 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3451 | -fi |
3452 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5 |
3453 | -$as_echo "$gt_cv_c_wchar_t" >&6; } |
3454 | - if test $gt_cv_c_wchar_t = yes; then |
3455 | - |
3456 | -$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h |
3457 | - |
3458 | - fi |
3459 | - |
3460 | - |
3461 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 |
3462 | -$as_echo_n "checking for wint_t... " >&6; } |
3463 | -if ${gt_cv_c_wint_t+:} false; then : |
3464 | - $as_echo_n "(cached) " >&6 |
3465 | -else |
3466 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3467 | -/* end confdefs.h. */ |
3468 | - |
3469 | -/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before |
3470 | - <wchar.h>. |
3471 | - BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included |
3472 | - before <wchar.h>. */ |
3473 | -#include <stddef.h> |
3474 | -#include <stdio.h> |
3475 | -#include <time.h> |
3476 | -#include <wchar.h> |
3477 | - wint_t foo = (wchar_t)'\0'; |
3478 | -int |
3479 | -main () |
3480 | -{ |
3481 | - |
3482 | - ; |
3483 | - return 0; |
3484 | -} |
3485 | -_ACEOF |
3486 | -if ac_fn_c_try_compile "$LINENO"; then : |
3487 | - gt_cv_c_wint_t=yes |
3488 | -else |
3489 | - gt_cv_c_wint_t=no |
3490 | -fi |
3491 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3492 | -fi |
3493 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 |
3494 | -$as_echo "$gt_cv_c_wint_t" >&6; } |
3495 | - if test $gt_cv_c_wint_t = yes; then |
3496 | - |
3497 | -$as_echo "#define HAVE_WINT_T 1" >>confdefs.h |
3498 | - |
3499 | - fi |
3500 | - |
3501 | - |
3502 | - |
3503 | - |
3504 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5 |
3505 | -$as_echo_n "checking for intmax_t... " >&6; } |
3506 | -if ${gt_cv_c_intmax_t+:} false; then : |
3507 | - $as_echo_n "(cached) " >&6 |
3508 | -else |
3509 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3510 | -/* end confdefs.h. */ |
3511 | - |
3512 | -#include <stddef.h> |
3513 | -#include <stdlib.h> |
3514 | -#if HAVE_STDINT_H_WITH_UINTMAX |
3515 | -#include <stdint.h> |
3516 | -#endif |
3517 | -#if HAVE_INTTYPES_H_WITH_UINTMAX |
3518 | -#include <inttypes.h> |
3519 | -#endif |
3520 | - |
3521 | -int |
3522 | -main () |
3523 | -{ |
3524 | -intmax_t x = -1; |
3525 | - return !x; |
3526 | - ; |
3527 | - return 0; |
3528 | -} |
3529 | -_ACEOF |
3530 | -if ac_fn_c_try_compile "$LINENO"; then : |
3531 | - gt_cv_c_intmax_t=yes |
3532 | -else |
3533 | - gt_cv_c_intmax_t=no |
3534 | -fi |
3535 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3536 | -fi |
3537 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5 |
3538 | -$as_echo "$gt_cv_c_intmax_t" >&6; } |
3539 | - if test $gt_cv_c_intmax_t = yes; then |
3540 | - |
3541 | -$as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h |
3542 | - |
3543 | - fi |
3544 | - |
3545 | - |
3546 | - |
3547 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5 |
3548 | -$as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; } |
3549 | -if ${gt_cv_func_printf_posix+:} false; then : |
3550 | - $as_echo_n "(cached) " >&6 |
3551 | -else |
3552 | - |
3553 | - if test "$cross_compiling" = yes; then : |
3554 | - |
3555 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3556 | -/* end confdefs.h. */ |
3557 | - |
3558 | -#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ |
3559 | - notposix |
3560 | -#endif |
3561 | - |
3562 | -_ACEOF |
3563 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
3564 | - $EGREP "notposix" >/dev/null 2>&1; then : |
3565 | - gt_cv_func_printf_posix="guessing no" |
3566 | -else |
3567 | - gt_cv_func_printf_posix="guessing yes" |
3568 | -fi |
3569 | -rm -f conftest* |
3570 | - |
3571 | - |
3572 | -else |
3573 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3574 | -/* end confdefs.h. */ |
3575 | - |
3576 | -#include <stdio.h> |
3577 | -#include <string.h> |
3578 | -/* The string "%2$d %1$d", with dollar characters protected from the shell's |
3579 | - dollar expansion (possibly an autoconf bug). */ |
3580 | -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; |
3581 | -static char buf[100]; |
3582 | -int main () |
3583 | -{ |
3584 | - sprintf (buf, format, 33, 55); |
3585 | - return (strcmp (buf, "55 33") != 0); |
3586 | -} |
3587 | -_ACEOF |
3588 | -if ac_fn_c_try_run "$LINENO"; then : |
3589 | - gt_cv_func_printf_posix=yes |
3590 | -else |
3591 | - gt_cv_func_printf_posix=no |
3592 | -fi |
3593 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
3594 | - conftest.$ac_objext conftest.beam conftest.$ac_ext |
3595 | -fi |
3596 | - |
3597 | - |
3598 | -fi |
3599 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_printf_posix" >&5 |
3600 | -$as_echo "$gt_cv_func_printf_posix" >&6; } |
3601 | - case $gt_cv_func_printf_posix in |
3602 | - *yes) |
3603 | - |
3604 | -$as_echo "#define HAVE_POSIX_PRINTF 1" >>confdefs.h |
3605 | - |
3606 | - ;; |
3607 | - esac |
3608 | - |
3609 | - |
3610 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5 |
3611 | -$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; } |
3612 | -if ${ac_cv_gnu_library_2_1+:} false; then : |
3613 | - $as_echo_n "(cached) " >&6 |
3614 | -else |
3615 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3616 | -/* end confdefs.h. */ |
3617 | - |
3618 | -#include <features.h> |
3619 | -#ifdef __GNU_LIBRARY__ |
3620 | - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) |
3621 | - Lucky GNU user |
3622 | - #endif |
3623 | -#endif |
3624 | - |
3625 | -_ACEOF |
3626 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
3627 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then : |
3628 | - ac_cv_gnu_library_2_1=yes |
3629 | -else |
3630 | - ac_cv_gnu_library_2_1=no |
3631 | -fi |
3632 | -rm -f conftest* |
3633 | - |
3634 | - |
3635 | - |
3636 | -fi |
3637 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5 |
3638 | -$as_echo "$ac_cv_gnu_library_2_1" >&6; } |
3639 | - |
3640 | - GLIBC21="$ac_cv_gnu_library_2_1" |
3641 | - |
3642 | - |
3643 | - |
3644 | - for ac_header in stdint.h |
3645 | -do : |
3646 | - ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" |
3647 | -if test "x$ac_cv_header_stdint_h" = xyes; then : |
3648 | - cat >>confdefs.h <<_ACEOF |
3649 | -#define HAVE_STDINT_H 1 |
3650 | -_ACEOF |
3651 | - |
3652 | -fi |
3653 | - |
3654 | -done |
3655 | - |
3656 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5 |
3657 | -$as_echo_n "checking for SIZE_MAX... " >&6; } |
3658 | - if ${gl_cv_size_max+:} false; then : |
3659 | - $as_echo_n "(cached) " >&6 |
3660 | -else |
3661 | - |
3662 | - gl_cv_size_max= |
3663 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3664 | -/* end confdefs.h. */ |
3665 | - |
3666 | -#include <limits.h> |
3667 | -#if HAVE_STDINT_H |
3668 | -#include <stdint.h> |
3669 | -#endif |
3670 | -#ifdef SIZE_MAX |
3671 | -Found it |
3672 | -#endif |
3673 | - |
3674 | -_ACEOF |
3675 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
3676 | - $EGREP "Found it" >/dev/null 2>&1; then : |
3677 | - gl_cv_size_max=yes |
3678 | -fi |
3679 | -rm -f conftest* |
3680 | - |
3681 | - if test -z "$gl_cv_size_max"; then |
3682 | - if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) * CHAR_BIT - 1" "size_t_bits_minus_1" "#include <stddef.h> |
3683 | -#include <limits.h>"; then : |
3684 | - |
3685 | -else |
3686 | - size_t_bits_minus_1= |
3687 | -fi |
3688 | - |
3689 | - if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint" "#include <stddef.h>"; then : |
3690 | - |
3691 | -else |
3692 | - fits_in_uint= |
3693 | -fi |
3694 | - |
3695 | - if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then |
3696 | - if test $fits_in_uint = 1; then |
3697 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3698 | -/* end confdefs.h. */ |
3699 | -#include <stddef.h> |
3700 | - extern size_t foo; |
3701 | - extern unsigned long foo; |
3702 | - |
3703 | -int |
3704 | -main () |
3705 | -{ |
3706 | - |
3707 | - ; |
3708 | - return 0; |
3709 | -} |
3710 | -_ACEOF |
3711 | -if ac_fn_c_try_compile "$LINENO"; then : |
3712 | - fits_in_uint=0 |
3713 | -fi |
3714 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3715 | - fi |
3716 | - if test $fits_in_uint = 1; then |
3717 | - gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" |
3718 | - else |
3719 | - gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" |
3720 | - fi |
3721 | - else |
3722 | - gl_cv_size_max='((size_t)~(size_t)0)' |
3723 | - fi |
3724 | - fi |
3725 | - |
3726 | -fi |
3727 | - |
3728 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5 |
3729 | -$as_echo "$gl_cv_size_max" >&6; } |
3730 | - if test "$gl_cv_size_max" != yes; then |
3731 | - |
3732 | -cat >>confdefs.h <<_ACEOF |
3733 | -#define SIZE_MAX $gl_cv_size_max |
3734 | -_ACEOF |
3735 | - |
3736 | - fi |
3737 | - |
3738 | - |
3739 | - |
3740 | - |
3741 | - for ac_header in stdint.h |
3742 | -do : |
3743 | - ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" |
3744 | -if test "x$ac_cv_header_stdint_h" = xyes; then : |
3745 | - cat >>confdefs.h <<_ACEOF |
3746 | -#define HAVE_STDINT_H 1 |
3747 | -_ACEOF |
3748 | - |
3749 | -fi |
3750 | - |
3751 | -done |
3752 | - |
3753 | - |
3754 | - |
3755 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 |
3756 | -$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } |
3757 | -if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : |
3758 | - $as_echo_n "(cached) " >&6 |
3759 | -else |
3760 | - gt_save_LIBS="$LIBS" |
3761 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
3762 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3763 | -/* end confdefs.h. */ |
3764 | -#include <CoreFoundation/CFPreferences.h> |
3765 | -int |
3766 | -main () |
3767 | -{ |
3768 | -CFPreferencesCopyAppValue(NULL, NULL) |
3769 | - ; |
3770 | - return 0; |
3771 | -} |
3772 | -_ACEOF |
3773 | -if ac_fn_c_try_link "$LINENO"; then : |
3774 | - gt_cv_func_CFPreferencesCopyAppValue=yes |
3775 | -else |
3776 | - gt_cv_func_CFPreferencesCopyAppValue=no |
3777 | -fi |
3778 | -rm -f core conftest.err conftest.$ac_objext \ |
3779 | - conftest$ac_exeext conftest.$ac_ext |
3780 | - LIBS="$gt_save_LIBS" |
3781 | -fi |
3782 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 |
3783 | -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } |
3784 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
3785 | - |
3786 | -$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h |
3787 | - |
3788 | - fi |
3789 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 |
3790 | -$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } |
3791 | -if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : |
3792 | - $as_echo_n "(cached) " >&6 |
3793 | -else |
3794 | - gt_save_LIBS="$LIBS" |
3795 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
3796 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3797 | -/* end confdefs.h. */ |
3798 | -#include <CoreFoundation/CFLocale.h> |
3799 | -int |
3800 | -main () |
3801 | -{ |
3802 | -CFLocaleCopyCurrent(); |
3803 | - ; |
3804 | - return 0; |
3805 | -} |
3806 | -_ACEOF |
3807 | -if ac_fn_c_try_link "$LINENO"; then : |
3808 | - gt_cv_func_CFLocaleCopyCurrent=yes |
3809 | -else |
3810 | - gt_cv_func_CFLocaleCopyCurrent=no |
3811 | -fi |
3812 | -rm -f core conftest.err conftest.$ac_objext \ |
3813 | - conftest$ac_exeext conftest.$ac_ext |
3814 | - LIBS="$gt_save_LIBS" |
3815 | -fi |
3816 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 |
3817 | -$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } |
3818 | - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
3819 | - |
3820 | -$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h |
3821 | - |
3822 | - fi |
3823 | - INTL_MACOSX_LIBS= |
3824 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
3825 | - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
3826 | - fi |
3827 | - |
3828 | - |
3829 | - |
3830 | - |
3831 | - |
3832 | - |
3833 | - |
3834 | - ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" |
3835 | -if test "x$ac_cv_type_ptrdiff_t" = xyes; then : |
3836 | - |
3837 | -else |
3838 | - |
3839 | -$as_echo "#define ptrdiff_t long" >>confdefs.h |
3840 | - |
3841 | - |
3842 | -fi |
3843 | - |
3844 | - for ac_header in stddef.h stdlib.h string.h |
3845 | -do : |
3846 | - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
3847 | -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
3848 | -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
3849 | - cat >>confdefs.h <<_ACEOF |
3850 | -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
3851 | -_ACEOF |
3852 | - |
3853 | -fi |
3854 | - |
3855 | -done |
3856 | - |
3857 | - for ac_func in asprintf fwprintf putenv setenv setlocale snprintf wcslen |
3858 | -do : |
3859 | - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
3860 | -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
3861 | -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
3862 | - cat >>confdefs.h <<_ACEOF |
3863 | -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
3864 | -_ACEOF |
3865 | - |
3866 | -fi |
3867 | -done |
3868 | - |
3869 | - |
3870 | - |
3871 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snprintf is declared" >&5 |
3872 | -$as_echo_n "checking whether _snprintf is declared... " >&6; } |
3873 | -if ${ac_cv_have_decl__snprintf+:} false; then : |
3874 | - $as_echo_n "(cached) " >&6 |
3875 | -else |
3876 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3877 | -/* end confdefs.h. */ |
3878 | -#include <stdio.h> |
3879 | -int |
3880 | -main () |
3881 | -{ |
3882 | - |
3883 | -#ifndef _snprintf |
3884 | - char *p = (char *) _snprintf; |
3885 | -#endif |
3886 | - |
3887 | - ; |
3888 | - return 0; |
3889 | -} |
3890 | -_ACEOF |
3891 | -if ac_fn_c_try_compile "$LINENO"; then : |
3892 | - ac_cv_have_decl__snprintf=yes |
3893 | -else |
3894 | - ac_cv_have_decl__snprintf=no |
3895 | -fi |
3896 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3897 | -fi |
3898 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snprintf" >&5 |
3899 | -$as_echo "$ac_cv_have_decl__snprintf" >&6; } |
3900 | - if test $ac_cv_have_decl__snprintf = yes; then |
3901 | - gt_value=1 |
3902 | - else |
3903 | - gt_value=0 |
3904 | - fi |
3905 | - |
3906 | -cat >>confdefs.h <<_ACEOF |
3907 | -#define HAVE_DECL__SNPRINTF $gt_value |
3908 | -_ACEOF |
3909 | - |
3910 | - |
3911 | - |
3912 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snwprintf is declared" >&5 |
3913 | -$as_echo_n "checking whether _snwprintf is declared... " >&6; } |
3914 | -if ${ac_cv_have_decl__snwprintf+:} false; then : |
3915 | - $as_echo_n "(cached) " >&6 |
3916 | -else |
3917 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3918 | -/* end confdefs.h. */ |
3919 | -#include <stdio.h> |
3920 | -int |
3921 | -main () |
3922 | -{ |
3923 | - |
3924 | -#ifndef _snwprintf |
3925 | - char *p = (char *) _snwprintf; |
3926 | -#endif |
3927 | - |
3928 | - ; |
3929 | - return 0; |
3930 | -} |
3931 | -_ACEOF |
3932 | -if ac_fn_c_try_compile "$LINENO"; then : |
3933 | - ac_cv_have_decl__snwprintf=yes |
3934 | -else |
3935 | - ac_cv_have_decl__snwprintf=no |
3936 | -fi |
3937 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3938 | -fi |
3939 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snwprintf" >&5 |
3940 | -$as_echo "$ac_cv_have_decl__snwprintf" >&6; } |
3941 | - if test $ac_cv_have_decl__snwprintf = yes; then |
3942 | - gt_value=1 |
3943 | - else |
3944 | - gt_value=0 |
3945 | - fi |
3946 | - |
3947 | -cat >>confdefs.h <<_ACEOF |
3948 | -#define HAVE_DECL__SNWPRINTF $gt_value |
3949 | -_ACEOF |
3950 | - |
3951 | - |
3952 | - |
3953 | - |
3954 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getc_unlocked is declared" >&5 |
3955 | -$as_echo_n "checking whether getc_unlocked is declared... " >&6; } |
3956 | -if ${ac_cv_have_decl_getc_unlocked+:} false; then : |
3957 | - $as_echo_n "(cached) " >&6 |
3958 | -else |
3959 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3960 | -/* end confdefs.h. */ |
3961 | -#include <stdio.h> |
3962 | -int |
3963 | -main () |
3964 | -{ |
3965 | - |
3966 | -#ifndef getc_unlocked |
3967 | - char *p = (char *) getc_unlocked; |
3968 | -#endif |
3969 | - |
3970 | - ; |
3971 | - return 0; |
3972 | -} |
3973 | -_ACEOF |
3974 | -if ac_fn_c_try_compile "$LINENO"; then : |
3975 | - ac_cv_have_decl_getc_unlocked=yes |
3976 | -else |
3977 | - ac_cv_have_decl_getc_unlocked=no |
3978 | -fi |
3979 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3980 | -fi |
3981 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_getc_unlocked" >&5 |
3982 | -$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; } |
3983 | - if test $ac_cv_have_decl_getc_unlocked = yes; then |
3984 | - gt_value=1 |
3985 | - else |
3986 | - gt_value=0 |
3987 | - fi |
3988 | - |
3989 | -cat >>confdefs.h <<_ACEOF |
3990 | -#define HAVE_DECL_GETC_UNLOCKED $gt_value |
3991 | -_ACEOF |
3992 | - |
3993 | - |
3994 | - |
3995 | - case $gt_cv_func_printf_posix in |
3996 | - *yes) HAVE_POSIX_PRINTF=1 ;; |
3997 | - *) HAVE_POSIX_PRINTF=0 ;; |
3998 | - esac |
3999 | - |
4000 | - if test "$ac_cv_func_asprintf" = yes; then |
4001 | - HAVE_ASPRINTF=1 |
4002 | - else |
4003 | - HAVE_ASPRINTF=0 |
4004 | - fi |
4005 | - |
4006 | - if test "$ac_cv_func_snprintf" = yes; then |
4007 | - HAVE_SNPRINTF=1 |
4008 | - else |
4009 | - HAVE_SNPRINTF=0 |
4010 | - fi |
4011 | - |
4012 | - if test "$ac_cv_func_wprintf" = yes; then |
4013 | - HAVE_WPRINTF=1 |
4014 | - else |
4015 | - HAVE_WPRINTF=0 |
4016 | - fi |
4017 | - |
4018 | - |
4019 | - |
4020 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 |
4021 | -$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } |
4022 | -if ${am_cv_langinfo_codeset+:} false; then : |
4023 | - $as_echo_n "(cached) " >&6 |
4024 | -else |
4025 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4026 | -/* end confdefs.h. */ |
4027 | -#include <langinfo.h> |
4028 | -int |
4029 | -main () |
4030 | -{ |
4031 | -char* cs = nl_langinfo(CODESET); return !cs; |
4032 | - ; |
4033 | - return 0; |
4034 | -} |
4035 | -_ACEOF |
4036 | -if ac_fn_c_try_link "$LINENO"; then : |
4037 | - am_cv_langinfo_codeset=yes |
4038 | -else |
4039 | - am_cv_langinfo_codeset=no |
4040 | -fi |
4041 | -rm -f core conftest.err conftest.$ac_objext \ |
4042 | - conftest$ac_exeext conftest.$ac_ext |
4043 | - |
4044 | -fi |
4045 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 |
4046 | -$as_echo "$am_cv_langinfo_codeset" >&6; } |
4047 | - if test $am_cv_langinfo_codeset = yes; then |
4048 | - |
4049 | -$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h |
4050 | - |
4051 | - fi |
4052 | - |
4053 | - |
4054 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 |
4055 | -$as_echo_n "checking for LC_MESSAGES... " >&6; } |
4056 | -if ${gt_cv_val_LC_MESSAGES+:} false; then : |
4057 | - $as_echo_n "(cached) " >&6 |
4058 | -else |
4059 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4060 | -/* end confdefs.h. */ |
4061 | -#include <locale.h> |
4062 | -int |
4063 | -main () |
4064 | -{ |
4065 | -return LC_MESSAGES |
4066 | - ; |
4067 | - return 0; |
4068 | -} |
4069 | -_ACEOF |
4070 | -if ac_fn_c_try_link "$LINENO"; then : |
4071 | - gt_cv_val_LC_MESSAGES=yes |
4072 | -else |
4073 | - gt_cv_val_LC_MESSAGES=no |
4074 | -fi |
4075 | -rm -f core conftest.err conftest.$ac_objext \ |
4076 | - conftest$ac_exeext conftest.$ac_ext |
4077 | -fi |
4078 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_val_LC_MESSAGES" >&5 |
4079 | -$as_echo "$gt_cv_val_LC_MESSAGES" >&6; } |
4080 | - if test $gt_cv_val_LC_MESSAGES = yes; then |
4081 | - |
4082 | -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h |
4083 | - |
4084 | - fi |
4085 | - |
4086 | - |
4087 | - if test "$enable_shared" = yes; then |
4088 | - case "$host_os" in |
4089 | - mingw* | cygwin*) is_woe32dll=yes ;; |
4090 | - *) is_woe32dll=no ;; |
4091 | - esac |
4092 | - else |
4093 | - is_woe32dll=no |
4094 | - fi |
4095 | - WOE32DLL=$is_woe32dll |
4096 | - |
4097 | - |
4098 | - case "$host_os" in |
4099 | - mingw* | cygwin*) is_woe32=yes ;; |
4100 | - *) is_woe32=no ;; |
4101 | - esac |
4102 | - WOE32=$is_woe32 |
4103 | - |
4104 | - if test $WOE32 = yes; then |
4105 | - if test -n "$ac_tool_prefix"; then |
4106 | - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. |
4107 | -set dummy ${ac_tool_prefix}windres; ac_word=$2 |
4108 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4109 | -$as_echo_n "checking for $ac_word... " >&6; } |
4110 | -if ${ac_cv_prog_WINDRES+:} false; then : |
4111 | - $as_echo_n "(cached) " >&6 |
4112 | -else |
4113 | - if test -n "$WINDRES"; then |
4114 | - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. |
4115 | -else |
4116 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4117 | -for as_dir in $PATH |
4118 | -do |
4119 | - IFS=$as_save_IFS |
4120 | - test -z "$as_dir" && as_dir=. |
4121 | - for ac_exec_ext in '' $ac_executable_extensions; do |
4122 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4123 | - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" |
4124 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4125 | - break 2 |
4126 | - fi |
4127 | -done |
4128 | - done |
4129 | -IFS=$as_save_IFS |
4130 | - |
4131 | -fi |
4132 | -fi |
4133 | -WINDRES=$ac_cv_prog_WINDRES |
4134 | -if test -n "$WINDRES"; then |
4135 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 |
4136 | -$as_echo "$WINDRES" >&6; } |
4137 | -else |
4138 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4139 | -$as_echo "no" >&6; } |
4140 | -fi |
4141 | - |
4142 | - |
4143 | -fi |
4144 | -if test -z "$ac_cv_prog_WINDRES"; then |
4145 | - ac_ct_WINDRES=$WINDRES |
4146 | - # Extract the first word of "windres", so it can be a program name with args. |
4147 | -set dummy windres; ac_word=$2 |
4148 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4149 | -$as_echo_n "checking for $ac_word... " >&6; } |
4150 | -if ${ac_cv_prog_ac_ct_WINDRES+:} false; then : |
4151 | - $as_echo_n "(cached) " >&6 |
4152 | -else |
4153 | - if test -n "$ac_ct_WINDRES"; then |
4154 | - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. |
4155 | -else |
4156 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4157 | -for as_dir in $PATH |
4158 | -do |
4159 | - IFS=$as_save_IFS |
4160 | - test -z "$as_dir" && as_dir=. |
4161 | - for ac_exec_ext in '' $ac_executable_extensions; do |
4162 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4163 | - ac_cv_prog_ac_ct_WINDRES="windres" |
4164 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4165 | - break 2 |
4166 | - fi |
4167 | -done |
4168 | - done |
4169 | -IFS=$as_save_IFS |
4170 | - |
4171 | -fi |
4172 | -fi |
4173 | -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES |
4174 | -if test -n "$ac_ct_WINDRES"; then |
4175 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 |
4176 | -$as_echo "$ac_ct_WINDRES" >&6; } |
4177 | -else |
4178 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4179 | -$as_echo "no" >&6; } |
4180 | -fi |
4181 | - |
4182 | - if test "x$ac_ct_WINDRES" = x; then |
4183 | - WINDRES="" |
4184 | - else |
4185 | - case $cross_compiling:$ac_tool_warned in |
4186 | -yes:) |
4187 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
4188 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
4189 | -ac_tool_warned=yes ;; |
4190 | -esac |
4191 | - WINDRES=$ac_ct_WINDRES |
4192 | - fi |
4193 | -else |
4194 | - WINDRES="$ac_cv_prog_WINDRES" |
4195 | -fi |
4196 | - |
4197 | - fi |
4198 | - |
4199 | - case "$host_os" in |
4200 | - hpux*) LTLIBC="" ;; |
4201 | - *) LTLIBC="-lc" ;; |
4202 | - esac |
4203 | - |
4204 | - |
4205 | - |
4206 | - |
4207 | - |
4208 | - |
4209 | - |
4210 | - |
4211 | - |
4212 | - |
4213 | - |
4214 | - |
4215 | - |
4216 | - |
4217 | - |
4218 | - |
4219 | - |
4220 | - |
4221 | - |
4222 | - |
4223 | - |
4224 | - |
4225 | - |
4226 | - |
4227 | - |
4228 | - |
4229 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 |
4230 | -$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } |
4231 | -if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : |
4232 | - $as_echo_n "(cached) " >&6 |
4233 | -else |
4234 | - gt_save_LIBS="$LIBS" |
4235 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
4236 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4237 | -/* end confdefs.h. */ |
4238 | -#include <CoreFoundation/CFPreferences.h> |
4239 | -int |
4240 | -main () |
4241 | -{ |
4242 | -CFPreferencesCopyAppValue(NULL, NULL) |
4243 | - ; |
4244 | - return 0; |
4245 | -} |
4246 | -_ACEOF |
4247 | -if ac_fn_c_try_link "$LINENO"; then : |
4248 | - gt_cv_func_CFPreferencesCopyAppValue=yes |
4249 | -else |
4250 | - gt_cv_func_CFPreferencesCopyAppValue=no |
4251 | -fi |
4252 | -rm -f core conftest.err conftest.$ac_objext \ |
4253 | - conftest$ac_exeext conftest.$ac_ext |
4254 | - LIBS="$gt_save_LIBS" |
4255 | -fi |
4256 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 |
4257 | -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } |
4258 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
4259 | - |
4260 | -$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h |
4261 | - |
4262 | - fi |
4263 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 |
4264 | -$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } |
4265 | -if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : |
4266 | - $as_echo_n "(cached) " >&6 |
4267 | -else |
4268 | - gt_save_LIBS="$LIBS" |
4269 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
4270 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4271 | -/* end confdefs.h. */ |
4272 | -#include <CoreFoundation/CFLocale.h> |
4273 | -int |
4274 | -main () |
4275 | -{ |
4276 | -CFLocaleCopyCurrent(); |
4277 | - ; |
4278 | - return 0; |
4279 | -} |
4280 | -_ACEOF |
4281 | -if ac_fn_c_try_link "$LINENO"; then : |
4282 | - gt_cv_func_CFLocaleCopyCurrent=yes |
4283 | -else |
4284 | - gt_cv_func_CFLocaleCopyCurrent=no |
4285 | -fi |
4286 | -rm -f core conftest.err conftest.$ac_objext \ |
4287 | - conftest$ac_exeext conftest.$ac_ext |
4288 | - LIBS="$gt_save_LIBS" |
4289 | -fi |
4290 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 |
4291 | -$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } |
4292 | - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
4293 | - |
4294 | -$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h |
4295 | - |
4296 | - fi |
4297 | - INTL_MACOSX_LIBS= |
4298 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
4299 | - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
4300 | - fi |
4301 | - |
4302 | - |
4303 | - |
4304 | - |
4305 | - |
4306 | - |
4307 | - BUILD_INCLUDED_LIBINTL=no |
4308 | - USE_INCLUDED_LIBINTL=no |
4309 | - |
4310 | - LIBINTL= |
4311 | - LTLIBINTL= |
4312 | - POSUB= |
4313 | - |
4314 | - case " $gt_needs " in |
4315 | - *" need-formatstring-macros "*) gt_api_version=3 ;; |
4316 | - *" need-ngettext "*) gt_api_version=2 ;; |
4317 | - *) gt_api_version=1 ;; |
4318 | - esac |
4319 | - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" |
4320 | - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" |
4321 | - |
4322 | - if test "$USE_NLS" = "yes"; then |
4323 | - gt_use_preinstalled_gnugettext=no |
4324 | - |
4325 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5 |
4326 | -$as_echo_n "checking whether included gettext is requested... " >&6; } |
4327 | - |
4328 | -# Check whether --with-included-gettext was given. |
4329 | -if test "${with_included_gettext+set}" = set; then : |
4330 | - withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval |
4331 | -else |
4332 | - nls_cv_force_use_gnu_gettext=no |
4333 | -fi |
4334 | - |
4335 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5 |
4336 | -$as_echo "$nls_cv_force_use_gnu_gettext" >&6; } |
4337 | - |
4338 | - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" |
4339 | - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then |
4340 | - |
4341 | - |
4342 | - if test $gt_api_version -ge 3; then |
4343 | - gt_revision_test_code=' |
4344 | -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
4345 | -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) |
4346 | -#endif |
4347 | -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; |
4348 | -' |
4349 | - else |
4350 | - gt_revision_test_code= |
4351 | - fi |
4352 | - if test $gt_api_version -ge 2; then |
4353 | - gt_expression_test_code=' + * ngettext ("", "", 0)' |
4354 | - else |
4355 | - gt_expression_test_code= |
4356 | - fi |
4357 | - |
4358 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 |
4359 | -$as_echo_n "checking for GNU gettext in libc... " >&6; } |
4360 | -if eval \${$gt_func_gnugettext_libc+:} false; then : |
4361 | - $as_echo_n "(cached) " >&6 |
4362 | -else |
4363 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4364 | -/* end confdefs.h. */ |
4365 | -#include <libintl.h> |
4366 | -$gt_revision_test_code |
4367 | -extern int _nl_msg_cat_cntr; |
4368 | -extern int *_nl_domain_bindings; |
4369 | -int |
4370 | -main () |
4371 | -{ |
4372 | -bindtextdomain ("", ""); |
4373 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings |
4374 | - ; |
4375 | - return 0; |
4376 | -} |
4377 | -_ACEOF |
4378 | -if ac_fn_c_try_link "$LINENO"; then : |
4379 | - eval "$gt_func_gnugettext_libc=yes" |
4380 | -else |
4381 | - eval "$gt_func_gnugettext_libc=no" |
4382 | -fi |
4383 | -rm -f core conftest.err conftest.$ac_objext \ |
4384 | - conftest$ac_exeext conftest.$ac_ext |
4385 | -fi |
4386 | -eval ac_res=\$$gt_func_gnugettext_libc |
4387 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
4388 | -$as_echo "$ac_res" >&6; } |
4389 | - |
4390 | - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then |
4391 | |
4392 | |
4393 | |
4394 | @@ -16682,25 +13601,6 @@ |
4395 | fi |
4396 | |
4397 | |
4398 | - if test "$gt_use_preinstalled_gnugettext" != "yes"; then |
4399 | - nls_cv_use_gnu_gettext=yes |
4400 | - fi |
4401 | - fi |
4402 | - |
4403 | - if test "$nls_cv_use_gnu_gettext" = "yes"; then |
4404 | - BUILD_INCLUDED_LIBINTL=yes |
4405 | - USE_INCLUDED_LIBINTL=yes |
4406 | - LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV $LIBTHREAD" |
4407 | - LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV $LTLIBTHREAD" |
4408 | - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` |
4409 | - fi |
4410 | - |
4411 | - CATOBJEXT= |
4412 | - if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
4413 | - || test "$nls_cv_use_gnu_gettext" = "yes"; then |
4414 | - CATOBJEXT=.gmo |
4415 | - fi |
4416 | - |
4417 | |
4418 | if test -n "$INTL_MACOSX_LIBS"; then |
4419 | if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
4420 | @@ -16785,35 +13685,6 @@ |
4421 | fi |
4422 | |
4423 | |
4424 | - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then |
4425 | - BUILD_INCLUDED_LIBINTL=yes |
4426 | - fi |
4427 | - |
4428 | - |
4429 | - |
4430 | - |
4431 | - |
4432 | - nls_cv_header_intl= |
4433 | - nls_cv_header_libgt= |
4434 | - |
4435 | - DATADIRNAME=share |
4436 | - |
4437 | - |
4438 | - INSTOBJEXT=.mo |
4439 | - |
4440 | - |
4441 | - GENCAT=gencat |
4442 | - |
4443 | - |
4444 | - INTLOBJS= |
4445 | - if test "$USE_INCLUDED_LIBINTL" = yes; then |
4446 | - INTLOBJS="\$(GETTOBJS)" |
4447 | - fi |
4448 | - |
4449 | - |
4450 | - INTL_LIBTOOL_SUFFIX_PREFIX= |
4451 | - |
4452 | - |
4453 | |
4454 | INTLLIBS="$LIBINTL" |
4455 | |
4456 | @@ -18070,6 +14941,111 @@ |
4457 | fi |
4458 | |
4459 | |
4460 | +# Check whether --enable-selinux was given. |
4461 | +if test "${enable_selinux+set}" = set; then : |
4462 | + enableval=$enable_selinux; |
4463 | +else |
4464 | + enable_selinux=no |
4465 | +fi |
4466 | + |
4467 | + |
4468 | +if test "x$enable_selinux" = "xyes" ; then |
4469 | + |
4470 | +pkg_failed=no |
4471 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5 |
4472 | +$as_echo_n "checking for SELINUX... " >&6; } |
4473 | + |
4474 | +if test -n "$SELINUX_CFLAGS"; then |
4475 | + pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" |
4476 | + elif test -n "$PKG_CONFIG"; then |
4477 | + if test -n "$PKG_CONFIG" && \ |
4478 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 |
4479 | + ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 |
4480 | + ac_status=$? |
4481 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4482 | + test $ac_status = 0; }; then |
4483 | + pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null` |
4484 | + test "x$?" != "x0" && pkg_failed=yes |
4485 | +else |
4486 | + pkg_failed=yes |
4487 | +fi |
4488 | + else |
4489 | + pkg_failed=untried |
4490 | +fi |
4491 | +if test -n "$SELINUX_LIBS"; then |
4492 | + pkg_cv_SELINUX_LIBS="$SELINUX_LIBS" |
4493 | + elif test -n "$PKG_CONFIG"; then |
4494 | + if test -n "$PKG_CONFIG" && \ |
4495 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 |
4496 | + ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 |
4497 | + ac_status=$? |
4498 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4499 | + test $ac_status = 0; }; then |
4500 | + pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 2>/dev/null` |
4501 | + test "x$?" != "x0" && pkg_failed=yes |
4502 | +else |
4503 | + pkg_failed=yes |
4504 | +fi |
4505 | + else |
4506 | + pkg_failed=untried |
4507 | +fi |
4508 | + |
4509 | + |
4510 | + |
4511 | +if test $pkg_failed = yes; then |
4512 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4513 | +$as_echo "no" >&6; } |
4514 | + |
4515 | +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
4516 | + _pkg_short_errors_supported=yes |
4517 | +else |
4518 | + _pkg_short_errors_supported=no |
4519 | +fi |
4520 | + if test $_pkg_short_errors_supported = yes; then |
4521 | + SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1` |
4522 | + else |
4523 | + SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1` |
4524 | + fi |
4525 | + # Put the nasty error message in config.log where it belongs |
4526 | + echo "$SELINUX_PKG_ERRORS" >&5 |
4527 | + |
4528 | + as_fn_error $? "Package requirements (libselinux) were not met: |
4529 | + |
4530 | +$SELINUX_PKG_ERRORS |
4531 | + |
4532 | +Consider adjusting the PKG_CONFIG_PATH environment variable if you |
4533 | +installed software in a non-standard prefix. |
4534 | + |
4535 | +Alternatively, you may set the environment variables SELINUX_CFLAGS |
4536 | +and SELINUX_LIBS to avoid the need to call pkg-config. |
4537 | +See the pkg-config man page for more details." "$LINENO" 5 |
4538 | +elif test $pkg_failed = untried; then |
4539 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4540 | +$as_echo "no" >&6; } |
4541 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4542 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4543 | +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
4544 | +is in your PATH or set the PKG_CONFIG environment variable to the full |
4545 | +path to pkg-config. |
4546 | + |
4547 | +Alternatively, you may set the environment variables SELINUX_CFLAGS |
4548 | +and SELINUX_LIBS to avoid the need to call pkg-config. |
4549 | +See the pkg-config man page for more details. |
4550 | + |
4551 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
4552 | +See \`config.log' for more details" "$LINENO" 5; } |
4553 | +else |
4554 | + SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS |
4555 | + SELINUX_LIBS=$pkg_cv_SELINUX_LIBS |
4556 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
4557 | +$as_echo "yes" >&6; } |
4558 | + |
4559 | +fi |
4560 | + |
4561 | +$as_echo "#define HAVE_SELINUX 1" >>confdefs.h |
4562 | + |
4563 | +fi |
4564 | + |
4565 | # Checks for header files. |
4566 | for ac_header in valgrind/valgrind.h, sys/prctl.h |
4567 | do : |
4568 | @@ -18740,7 +15716,7 @@ |
4569 | |
4570 | |
4571 | |
4572 | -ac_config_files="$ac_config_files Makefile intl/Makefile dbus/Makefile init/Makefile util/Makefile conf/Makefile extra/Makefile doc/Makefile contrib/Makefile po/Makefile.in scripts/Makefile scripts/data/Makefile test/Makefile lib/Makefile lib/libupstart.pc" |
4573 | +ac_config_files="$ac_config_files Makefile dbus/Makefile init/Makefile util/Makefile conf/Makefile extra/Makefile doc/Makefile contrib/Makefile po/Makefile.in scripts/Makefile scripts/data/Makefile test/Makefile lib/Makefile lib/libupstart.pc.in" |
4574 | |
4575 | ac_config_headers="$ac_config_headers config.h" |
4576 | |
4577 | @@ -19286,7 +16262,7 @@ |
4578 | # report actual input values of CONFIG_FILES etc. instead of their |
4579 | # values after options handling. |
4580 | ac_log=" |
4581 | -This file was extended by upstart $as_me 1.9, which was |
4582 | +This file was extended by upstart $as_me 1.9.1, which was |
4583 | generated by GNU Autoconf 2.69. Invocation command line was |
4584 | |
4585 | CONFIG_FILES = $CONFIG_FILES |
4586 | @@ -19352,7 +16328,7 @@ |
4587 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4588 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4589 | ac_cs_version="\\ |
4590 | -upstart config.status 1.9 |
4591 | +upstart config.status 1.9.1 |
4592 | configured by $0, generated by GNU Autoconf 2.69, |
4593 | with options \\"\$ac_cs_config\\" |
4594 | |
4595 | @@ -19769,7 +16745,6 @@ |
4596 | "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |
4597 | "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; |
4598 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
4599 | - "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; |
4600 | "dbus/Makefile") CONFIG_FILES="$CONFIG_FILES dbus/Makefile" ;; |
4601 | "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;; |
4602 | "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; |
4603 | @@ -19782,7 +16757,7 @@ |
4604 | "scripts/data/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/data/Makefile" ;; |
4605 | "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; |
4606 | "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; |
4607 | - "lib/libupstart.pc") CONFIG_FILES="$CONFIG_FILES lib/libupstart.pc" ;; |
4608 | + "lib/libupstart.pc.in") CONFIG_FILES="$CONFIG_FILES lib/libupstart.pc.in" ;; |
4609 | "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; |
4610 | |
4611 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
4612 | |
4613 | === modified file 'configure.ac' |
4614 | --- configure.ac 2013-06-28 15:57:37 +0000 |
4615 | +++ configure.ac 2013-07-08 13:07:28 +0000 |
4616 | @@ -1,7 +1,7 @@ |
4617 | # Process this file with autoconf to produce a configure script. |
4618 | |
4619 | AC_PREREQ(2.61) |
4620 | -AC_INIT([upstart], [1.9], [upstart-devel@lists.ubuntu.com]) |
4621 | +AC_INIT([upstart], [1.9.1], [upstart-devel@lists.ubuntu.com]) |
4622 | NIH_COPYRIGHT([[Copyright © 2013 Scott James Remnant, Canonical Ltd.]]) |
4623 | AC_CONFIG_SRCDIR([init/main.c]) |
4624 | AC_CONFIG_MACRO_DIR([m4]) |
4625 | @@ -16,7 +16,7 @@ |
4626 | LT_INIT |
4627 | |
4628 | AM_GNU_GETTEXT_VERSION([0.17]) |
4629 | -AM_GNU_GETTEXT() |
4630 | +AM_GNU_GETTEXT([external]) |
4631 | |
4632 | # Checks for programs. |
4633 | AC_PROG_CC |
4634 | @@ -118,10 +118,10 @@ |
4635 | NIH_LINKER_OPTIMISATIONS |
4636 | |
4637 | |
4638 | -AC_CONFIG_FILES([ Makefile intl/Makefile |
4639 | +AC_CONFIG_FILES([ Makefile |
4640 | dbus/Makefile init/Makefile util/Makefile conf/Makefile |
4641 | extra/Makefile doc/Makefile contrib/Makefile po/Makefile.in |
4642 | scripts/Makefile scripts/data/Makefile |
4643 | - test/Makefile lib/Makefile lib/libupstart.pc ]) |
4644 | + test/Makefile lib/Makefile lib/libupstart.pc.in ]) |
4645 | AC_CONFIG_HEADERS([config.h]) |
4646 | AC_OUTPUT |
4647 | |
4648 | === modified file 'contrib/Makefile.in' |
4649 | --- contrib/Makefile.in 2013-06-28 15:36:50 +0000 |
4650 | +++ contrib/Makefile.in 2013-07-08 13:07:28 +0000 |
4651 | @@ -80,25 +80,15 @@ |
4652 | subdir = contrib |
4653 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
4654 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4655 | -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ |
4656 | - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ |
4657 | - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ |
4658 | - $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ |
4659 | - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \ |
4660 | - $(top_srcdir)/m4/inttypes-pri.m4 \ |
4661 | - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ |
4662 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
4663 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
4664 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
4665 | $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \ |
4666 | - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ |
4667 | - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
4668 | + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
4669 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
4670 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ |
4671 | $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ |
4672 | - $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ |
4673 | - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ |
4674 | - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \ |
4675 | - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ |
4676 | - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac |
4677 | + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
4678 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
4679 | $(ACLOCAL_M4) |
4680 | mkinstalldirs = $(install_sh) -d |
4681 | @@ -128,7 +118,6 @@ |
4682 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4683 | ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@ |
4684 | ACLOCAL = @ACLOCAL@ |
4685 | -ALLOCA = @ALLOCA@ |
4686 | AMTAR = @AMTAR@ |
4687 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
4688 | AR = @AR@ |
4689 | @@ -136,16 +125,12 @@ |
4690 | AUTOHEADER = @AUTOHEADER@ |
4691 | AUTOMAKE = @AUTOMAKE@ |
4692 | AWK = @AWK@ |
4693 | -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ |
4694 | -CATOBJEXT = @CATOBJEXT@ |
4695 | CC = @CC@ |
4696 | CCDEPMODE = @CCDEPMODE@ |
4697 | CFLAGS = @CFLAGS@ |
4698 | -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ |
4699 | CPP = @CPP@ |
4700 | CPPFLAGS = @CPPFLAGS@ |
4701 | CYGPATH_W = @CYGPATH_W@ |
4702 | -DATADIRNAME = @DATADIRNAME@ |
4703 | DBUS_CFLAGS = @DBUS_CFLAGS@ |
4704 | DBUS_LIBS = @DBUS_LIBS@ |
4705 | DEFS = @DEFS@ |
4706 | @@ -159,28 +144,16 @@ |
4707 | EGREP = @EGREP@ |
4708 | EXEEXT = @EXEEXT@ |
4709 | FGREP = @FGREP@ |
4710 | -GENCAT = @GENCAT@ |
4711 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
4712 | -GLIBC2 = @GLIBC2@ |
4713 | -GLIBC21 = @GLIBC21@ |
4714 | GMSGFMT = @GMSGFMT@ |
4715 | GMSGFMT_015 = @GMSGFMT_015@ |
4716 | GREP = @GREP@ |
4717 | -HAVE_ASPRINTF = @HAVE_ASPRINTF@ |
4718 | -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ |
4719 | -HAVE_SNPRINTF = @HAVE_SNPRINTF@ |
4720 | -HAVE_VISIBILITY = @HAVE_VISIBILITY@ |
4721 | -HAVE_WPRINTF = @HAVE_WPRINTF@ |
4722 | INSTALL = @INSTALL@ |
4723 | INSTALL_DATA = @INSTALL_DATA@ |
4724 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
4725 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
4726 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
4727 | -INSTOBJEXT = @INSTOBJEXT@ |
4728 | -INTLBISON = @INTLBISON@ |
4729 | INTLLIBS = @INTLLIBS@ |
4730 | -INTLOBJS = @INTLOBJS@ |
4731 | -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ |
4732 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
4733 | JSON_CFLAGS = @JSON_CFLAGS@ |
4734 | JSON_LIBS = @JSON_LIBS@ |
4735 | @@ -188,22 +161,14 @@ |
4736 | LDFLAGS = @LDFLAGS@ |
4737 | LIBICONV = @LIBICONV@ |
4738 | LIBINTL = @LIBINTL@ |
4739 | -LIBMULTITHREAD = @LIBMULTITHREAD@ |
4740 | LIBOBJS = @LIBOBJS@ |
4741 | -LIBPTH = @LIBPTH@ |
4742 | -LIBPTH_PREFIX = @LIBPTH_PREFIX@ |
4743 | LIBS = @LIBS@ |
4744 | -LIBTHREAD = @LIBTHREAD@ |
4745 | LIBTOOL = @LIBTOOL@ |
4746 | LIPO = @LIPO@ |
4747 | LN_S = @LN_S@ |
4748 | -LTLIBC = @LTLIBC@ |
4749 | LTLIBICONV = @LTLIBICONV@ |
4750 | LTLIBINTL = @LTLIBINTL@ |
4751 | -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ |
4752 | LTLIBOBJS = @LTLIBOBJS@ |
4753 | -LTLIBPTH = @LTLIBPTH@ |
4754 | -LTLIBTHREAD = @LTLIBTHREAD@ |
4755 | MAINT = @MAINT@ |
4756 | MAKEINFO = @MAKEINFO@ |
4757 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
4758 | @@ -235,20 +200,17 @@ |
4759 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
4760 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
4761 | POSUB = @POSUB@ |
4762 | -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ |
4763 | RANLIB = @RANLIB@ |
4764 | SED = @SED@ |
4765 | +SELINUX_CFLAGS = @SELINUX_CFLAGS@ |
4766 | +SELINUX_LIBS = @SELINUX_LIBS@ |
4767 | SET_MAKE = @SET_MAKE@ |
4768 | SHELL = @SHELL@ |
4769 | STRIP = @STRIP@ |
4770 | UDEV_CFLAGS = @UDEV_CFLAGS@ |
4771 | UDEV_LIBS = @UDEV_LIBS@ |
4772 | -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ |
4773 | USE_NLS = @USE_NLS@ |
4774 | VERSION = @VERSION@ |
4775 | -WINDRES = @WINDRES@ |
4776 | -WOE32 = @WOE32@ |
4777 | -WOE32DLL = @WOE32DLL@ |
4778 | XGETTEXT = @XGETTEXT@ |
4779 | XGETTEXT_015 = @XGETTEXT_015@ |
4780 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
4781 | |
4782 | === modified file 'dbus/Makefile.in' |
4783 | --- dbus/Makefile.in 2013-06-28 15:36:50 +0000 |
4784 | +++ dbus/Makefile.in 2013-07-08 13:07:28 +0000 |
4785 | @@ -82,25 +82,15 @@ |
4786 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
4787 | $(dist_dbus1system_DATA) |
4788 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4789 | -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ |
4790 | - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ |
4791 | - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ |
4792 | - $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ |
4793 | - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \ |
4794 | - $(top_srcdir)/m4/inttypes-pri.m4 \ |
4795 | - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ |
4796 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
4797 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
4798 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
4799 | $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \ |
4800 | - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ |
4801 | - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
4802 | + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
4803 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
4804 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ |
4805 | $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ |
4806 | - $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ |
4807 | - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ |
4808 | - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \ |
4809 | - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ |
4810 | - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac |
4811 | + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
4812 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
4813 | $(ACLOCAL_M4) |
4814 | mkinstalldirs = $(install_sh) -d |
4815 | @@ -159,7 +149,6 @@ |
4816 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4817 | ABI_COMPLIANCE_CHECKER = @ABI_COMPLIANCE_CHECKER@ |
4818 | ACLOCAL = @ACLOCAL@ |
4819 | -ALLOCA = @ALLOCA@ |
4820 | AMTAR = @AMTAR@ |
4821 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
4822 | AR = @AR@ |
4823 | @@ -167,16 +156,12 @@ |
4824 | AUTOHEADER = @AUTOHEADER@ |
4825 | AUTOMAKE = @AUTOMAKE@ |
4826 | AWK = @AWK@ |
4827 | -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ |
4828 | -CATOBJEXT = @CATOBJEXT@ |
4829 | CC = @CC@ |
4830 | CCDEPMODE = @CCDEPMODE@ |
4831 | CFLAGS = @CFLAGS@ |
4832 | -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ |
4833 | CPP = @CPP@ |
4834 | CPPFLAGS = @CPPFLAGS@ |
4835 | CYGPATH_W = @CYGPATH_W@ |
4836 | -DATADIRNAME = @DATADIRNAME@ |
4837 | DBUS_CFLAGS = @DBUS_CFLAGS@ |
4838 | DBUS_LIBS = @DBUS_LIBS@ |
4839 | DEFS = @DEFS@ |
4840 | @@ -190,28 +175,16 @@ |
4841 | EGREP = @EGREP@ |
4842 | EXEEXT = @EXEEXT@ |
4843 | FGREP = @FGREP@ |
4844 | -GENCAT = @GENCAT@ |
4845 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
4846 | -GLIBC2 = @GLIBC2@ |
4847 | -GLIBC21 = @GLIBC21@ |
4848 | GMSGFMT = @GMSGFMT@ |
4849 | GMSGFMT_015 = @GMSGFMT_015@ |
4850 | GREP = @GREP@ |
4851 | -HAVE_ASPRINTF = @HAVE_ASPRINTF@ |
4852 | -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ |
4853 | -HAVE_SNPRINTF = @HAVE_SNPRINTF@ |
4854 | -HAVE_VISIBILITY = @HAVE_VISIBILITY@ |
4855 | -HAVE_WPRINTF = @HAVE_WPRINTF@ |
4856 | INSTALL = @INSTALL@ |
4857 | INSTALL_DATA = @INSTALL_DATA@ |
4858 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
4859 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
4860 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
4861 | -INSTOBJEXT = @INSTOBJEXT@ |
4862 | -INTLBISON = @INTLBISON@ |
4863 | INTLLIBS = @INTLLIBS@ |
4864 | -INTLOBJS = @INTLOBJS@ |
4865 | -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ |
4866 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
4867 | JSON_CFLAGS = @JSON_CFLAGS@ |
4868 | JSON_LIBS = @JSON_LIBS@ |
4869 | @@ -219,22 +192,14 @@ |
4870 | LDFLAGS = @LDFLAGS@ |
4871 | LIBICONV = @LIBICONV@ |
4872 | LIBINTL = @LIBINTL@ |
4873 | -LIBMULTITHREAD = @LIBMULTITHREAD@ |
4874 | LIBOBJS = @LIBOBJS@ |
4875 | -LIBPTH = @LIBPTH@ |
4876 | -LIBPTH_PREFIX = @LIBPTH_PREFIX@ |
4877 | LIBS = @LIBS@ |
4878 | -LIBTHREAD = @LIBTHREAD@ |
4879 | LIBTOOL = @LIBTOOL@ |
4880 | LIPO = @LIPO@ |
4881 | LN_S = @LN_S@ |
4882 | -LTLIBC = @LTLIBC@ |
4883 | LTLIBICONV = @LTLIBICONV@ |
4884 | LTLIBINTL = @LTLIBINTL@ |
4885 | -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ |
4886 | LTLIBOBJS = @LTLIBOBJS@ |
4887 | -LTLIBPTH = @LTLIBPTH@ |
4888 | -LTLIBTHREAD = @LTLIBTHREAD@ |
4889 | MAINT = @MAINT@ |
4890 | MAKEINFO = @MAKEINFO@ |
4891 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
4892 | @@ -266,20 +231,17 @@ |
4893 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
4894 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
4895 | POSUB = @POSUB@ |
4896 | -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ |
4897 | RANLIB = @RANLIB@ |
4898 | SED = @SED@ |
4899 | +SELINUX_CFLAGS = @SELINUX_CFLAGS@ |
4900 | +SELINUX_LIBS = @SELINUX_LIBS@ |
4901 | SET_MAKE = @SET_MAKE@ |
4902 | SHELL = @SHELL@ |
4903 | STRIP = @STRIP@ |
4904 | UDEV_CFLAGS = @UDEV_CFLAGS@ |
4905 | UDEV_LIBS = @UDEV_LIBS@ |
4906 | -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ |
4907 | USE_NLS = @USE_NLS@ |
4908 | VERSION = @VERSION@ |
4909 | -WINDRES = @WINDRES@ |
4910 | -WOE32 = @WOE32@ |
4911 | -WOE32DLL = @WOE32DLL@ |
4912 | XGETTEXT = @XGETTEXT@ |
4913 | XGETTEXT_015 = @XGETTEXT_015@ |
4914 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
4915 | |
4916 | === modified file 'debian/changelog' |
4917 | --- debian/changelog 2013-07-03 11:28:37 +0000 |
4918 | +++ debian/changelog 2013-07-08 13:07:28 +0000 |
4919 | @@ -1,11 +1,22 @@ |
4920 | -upstart (1.9-0ubuntu3) UNRELEASED; urgency=low |
4921 | +upstart (1.9.1-0ubuntu1) saucy; urgency=low |
4922 | |
4923 | * debian/upstart.apport: |
4924 | - Added session count to report ('UpstartRunningSessionCount'). |
4925 | - Join Upstart session to ensure 'UpstartRunningSessionJobs' shows |
4926 | session jobs and doesn't default to showing system ones. |
4927 | + * debian/copyright: Update year. |
4928 | + * New upstream release. |
4929 | + * debian/{control,libupstart*}: Add libupstart packaging. |
4930 | + * debian/rules: |
4931 | + - Delete upstart-dbus-bridge.conf to avoid running it at the system level. |
4932 | + - Install libupstart.pc to correct multi-arch location. |
4933 | + * debian/upstart.postinst: Handle safe removal of |
4934 | + upstart-dbus-bridge.conf (which is not used at the system level). |
4935 | + * debian/control: Add build-depends on automake >= 1.12 for serial-tests |
4936 | + in configure.ac (LP: #1197529). |
4937 | + * debian/libupstart-dev.install: Specify wildcarded path (for multi-arch). |
4938 | |
4939 | - -- James Hunt <james.hunt@ubuntu.com> Wed, 03 Jul 2013 12:27:36 +0100 |
4940 | + -- James Hunt <james.hunt@ubuntu.com> Mon, 08 Jul 2013 14:04:28 +0100 |
4941 | |
4942 | upstart (1.9-0ubuntu2) saucy; urgency=low |
4943 | |
4944 | |
4945 | === modified file 'debian/control' |
4946 | --- debian/control 2013-03-26 15:13:08 +0000 |
4947 | +++ debian/control 2013-07-08 13:07:28 +0000 |
4948 | @@ -4,7 +4,7 @@ |
4949 | Maintainer: James Hunt <james.hunt@ubuntu.com> |
4950 | Uploaders: Scott James Remnant <scott@ubuntu.com> |
4951 | Standards-Version: 3.8.4 |
4952 | -Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libnih-dev (>= 1.0.3), libnih-dbus-dev (>= 1.0.3), nih-dbus-tool (>= 1.0.3), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 151-5), libjson0-dev (>= 0.10), dbus, bash-completion, dh-autoreconf, autopoint, python3 |
4953 | +Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libnih-dev (>= 1.0.3), libnih-dbus-dev (>= 1.0.3), nih-dbus-tool (>= 1.0.3), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 151-5), libjson0-dev (>= 0.10), dbus, bash-completion, dh-autoreconf, autopoint, python3, automake (>= 1.12) |
4954 | X-Python3-Version: 3.3 |
4955 | XS-Debian-Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/collab-maint/upstart/trunk/ |
4956 | XS-Debian-Vcs-Browser: http://anonscm.debian.org/loggerhead/collab-maint/upstart/trunk/ |
4957 | @@ -36,3 +36,28 @@ |
4958 | command-line tool or as a graphical one that displays upstart |
4959 | events as they are emitted. It is useful for observing system |
4960 | changes and for determining appropriate events for new jobs. |
4961 | + |
4962 | +Package: libupstart1 |
4963 | +Priority: optional |
4964 | +Architecture: any |
4965 | +Pre-Depends: ${misc:Pre-Depends} |
4966 | +Depends: ${misc:Depends}, ${shlibs:Depends} |
4967 | +Multi-Arch: same |
4968 | +Description: Upstart Client Library |
4969 | + The libupstart library allows access to services provided by the Upstart init |
4970 | + daemon without having to use low-level D-Bus calls. |
4971 | + . |
4972 | + This package contains the shared library. |
4973 | + |
4974 | +Package: libupstart-dev |
4975 | +Priority: optional |
4976 | +Section: libdevel |
4977 | +Architecture: any |
4978 | +Multi-Arch: same |
4979 | +Depends: libupstart1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} |
4980 | +Description: Upstart Client Library (development files) |
4981 | + The libupstart library allows access to services provided by the Upstart init |
4982 | + daemon without having to use low-level D-Bus calls. |
4983 | + . |
4984 | + This package contains the static library and C header files which are |
4985 | + needed for developing software using libupstart. |
4986 | |
4987 | === modified file 'debian/copyright' |
4988 | --- debian/copyright 2012-12-08 00:25:38 +0000 |
4989 | +++ debian/copyright 2013-07-08 13:07:28 +0000 |
4990 | @@ -4,7 +4,7 @@ |
4991 | Source: http://http://launchpad.net/upstart |
4992 | |
4993 | Files: * |
4994 | -Copyright: 2009-2012 Canonical Ltd. |
4995 | +Copyright: 2009-2013 Canonical Ltd. |
4996 | License: GPL-2 |
4997 | This program is free software; you can redistribute it and/or modify |
4998 | it under the terms of the GNU General Public License version 2, as |
4999 | |
5000 | === added file 'debian/libupstart-dev.install' |
Argh... launchpad lost my review. Will retype in a moment.