Ubuntu
kazehakase package

Merge lp:~ubuntu-branches/ubuntu/lucid/kazehakase/lucid-201002122350 into lp:ubuntu/lucid/kazehakase

  1. Lucid (10.04)
  2. lucid-201002122350
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/kazehakase/lucid-201002122350
Merge into: lp:ubuntu/lucid/kazehakase
Diff against target: 8312 lines (+6882/-627) (has conflicts)
18 files modified
debian/NEWS (+0/-25)
debian/README.source (+0/-12)
debian/changelog (+37/-0)
debian/patches/10_link-gcrypt.dpatch (+0/-31)
debian/patches/25_url-if-no-smartbookmarks.dpatch (+0/-19)
debian/patches/30_xulrunner-1.9.1.dpatch (+0/-67)
debian/patches/35_PATH_MAX.dpatch (+0/-71)
debian/patches/40_AM_PATH_GLIB.dpatch (+0/-46)
debian/patches/42_gtk_action_disconnect_proxy.dpatch (+0/-44)
debian/patches/43_AC_USE_SYSTEM_EXTENSIONS.dpatch (+0/-31)
debian/patches/45_link_gtk_libs.dpatch (+0/-19)
debian/patches/47_ldflags-rpath.dpatch (+146/-0)
debian/patches/50_autoreconf.dpatch (+6699/-0)
debian/patches/60_desktop-entry.dpatch (+0/-24)
debian/patches/99_ltmain_as-needed.dpatch (+0/-37)
debian/watch (+0/-5)
module/embed/gecko/kz-mozcookiepromptservice.cpp (+0/-149)
module/embed/gecko/kz-mozcookiepromptservice.h (+0/-47)
Text conflict in debian/changelog
Contents conflict in debian/patches/47_ldflags-rpath.dpatch
Contents conflict in debian/patches/50_autoreconf.dpatch
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/kazehakase/lucid-201002122350
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/kazehakase now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/kazehakase/lucid-201002122350. A merge should be performed if necessary.

Reply

Unmerged revisions

16. By Steve Langasek

merge 0.5.8-2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/NEWS'
2--- debian/NEWS 1970-01-01 00:00:00 +0000
3+++ debian/NEWS 2010-02-12 23:56:16 +0000
4@@ -0,0 +1,25 @@
5+kazehakase (0.5.8-1) unstable; urgency=low
6+
7+ * The kazehakase-webkit package, which was removed in 0.5.4-2.2, is now
8+ reinstated. The usual regressions reported for Epiphany at #548567
9+ apply here as well.
10+
11+ * A new pseudo-engine "per_process" is available, which spawns separate
12+ per-tab and per-window processes via D-Bus. Currently it relies on
13+ the Gecko engine. To enable it, select "per_process" from
14+ Preference->Browser.
15+
16+ -- Yavor Doganov <yavor@gnu.org> Sun, 04 Oct 2009 19:11:03 +0300
17+
18+kazehakase (0.5.4-1) unstable; urgency=low
19+
20+ * WebKit is now supported by Kazehakase. The browser itself is still
21+ in the 'kazehakase' package, while the gecko rendering engine has been
22+ broken out into 'kazehakase-gecko'. Installing the 'kazehakase-webkit'
23+ package and selecting 'webkit_gtk' as the layout engine (or removing
24+ the 'kazehakase-gecko' package) will switch you to the new engine.
25+ IT IS STILL EXPERIMENTAL. It has not been widely tested, and I've
26+ noticed a number of bugs while using it. If you're looking for
27+ stability: STICK WITH GECKO FOR NOW.
28+
29+ -- Andres Salomon <dilinger@debian.org> Wed, 16 Apr 2008 17:33:32 +0000
30
31=== removed file 'debian/NEWS'
32--- debian/NEWS 2009-10-04 11:40:32 +0000
33+++ debian/NEWS 1970-01-01 00:00:00 +0000
34@@ -1,25 +0,0 @@
35-kazehakase (0.5.8-1) unstable; urgency=low
36-
37- * The kazehakase-webkit package, which was removed in 0.5.4-2.2, is now
38- reinstated. The usual regressions reported for Epiphany at #548567
39- apply here as well.
40-
41- * A new pseudo-engine "per_process" is available, which spawns separate
42- per-tab and per-window processes via D-Bus. Currently it relies on
43- the Gecko engine. To enable it, select "per_process" from
44- Preference->Browser.
45-
46- -- Yavor Doganov <yavor@gnu.org> Sun, 04 Oct 2009 19:11:03 +0300
47-
48-kazehakase (0.5.4-1) unstable; urgency=low
49-
50- * WebKit is now supported by Kazehakase. The browser itself is still
51- in the 'kazehakase' package, while the gecko rendering engine has been
52- broken out into 'kazehakase-gecko'. Installing the 'kazehakase-webkit'
53- package and selecting 'webkit_gtk' as the layout engine (or removing
54- the 'kazehakase-gecko' package) will switch you to the new engine.
55- IT IS STILL EXPERIMENTAL. It has not been widely tested, and I've
56- noticed a number of bugs while using it. If you're looking for
57- stability: STICK WITH GECKO FOR NOW.
58-
59- -- Andres Salomon <dilinger@debian.org> Wed, 16 Apr 2008 17:33:32 +0000
60
61=== added file 'debian/README.source'
62--- debian/README.source 1970-01-01 00:00:00 +0000
63+++ debian/README.source 2010-02-12 23:56:16 +0000
64@@ -0,0 +1,12 @@
65+This package uses dpatch (in a fairly standard/straightforward way) to
66+manage all modifications to the upstrean source. Please see
67+
68+ /usr/share/doc/dpatch/README.source.gz
69+
70+for further instructions.
71+
72+Please make sure to put any patch that modifies the build system
73+before 50_autoreconf.dpatch (the numbers at the beginning don't
74+actually matter) and regenerate it after that.
75+
76+ -- Yavor Doganov <yavor@gnu.org>, Wed, 19 Aug 2009 23:41:30 +0300
77
78=== removed file 'debian/README.source'
79--- debian/README.source 2009-08-20 01:13:49 +0000
80+++ debian/README.source 1970-01-01 00:00:00 +0000
81@@ -1,12 +0,0 @@
82-This package uses dpatch (in a fairly standard/straightforward way) to
83-manage all modifications to the upstrean source. Please see
84-
85- /usr/share/doc/dpatch/README.source.gz
86-
87-for further instructions.
88-
89-Please make sure to put any patch that modifies the build system
90-before 50_autoreconf.dpatch (the numbers at the beginning don't
91-actually matter) and regenerate it after that.
92-
93- -- Yavor Doganov <yavor@gnu.org>, Wed, 19 Aug 2009 23:41:30 +0300
94
95=== modified file 'debian/changelog'
96--- debian/changelog 2009-12-24 21:16:26 +0000
97+++ debian/changelog 2010-02-12 23:56:16 +0000
98@@ -1,3 +1,4 @@
99+<<<<<<< TREE
100 kazehakase (0.5.8-2ubuntu1) lucid; urgency=low
101
102 * Merge from Debian testing, remaining changes:
103@@ -32,6 +33,42 @@
104
105 -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 18 Oct 2009 02:06:18 +0000
106
107+=======
108+kazehakase (0.5.8-2ubuntu1) UNRELEASED; urgency=low
109+
110+ * Merge from Debian testing, remaining changes:
111+ - Hard-code the dep on xulrunner 1.9.1 again instead of using
112+ dh_xulrunner, which we don't yet have in Ubuntu.
113+ * Dropped changes, no longer needed:
114+ - Relax ruby-gnome2-dev build-dependency to 0.19.0-2ubuntu4.
115+
116+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 24 Dec 2009 20:11:43 -0800
117+
118+kazehakase (0.5.8-2) unstable; urgency=medium
119+
120+ * debian/patches/CVE-2007-1084.dpatch: New; disallow adding bookmarks
121+ with data:/javascript: URIs (CVE-2007-1084, Closes: #556271).
122+ * debian/patches/webkit-uri.dpatch: New; prepend "http://" to URIs
123+ if missing, thanks Andres Salomon (Closes: #551268).
124+ * debian/patches/47_ldflags-rpath.dpatch: Link kz-embed-process with
125+ $(GTK_LIBS) to avoid FTBFS with GNU gold, thanks Peter Fritzsche
126+ (Closes: #554935).
127+ * debian/patches/50_autoreconf.dpatch: Regenerate.
128+ * debian/patches/00list: Update.
129+
130+ -- Yavor Doganov <yavor@gnu.org> Mon, 07 Dec 2009 21:31:11 +0200
131+
132+kazehakase (0.5.8-1ubuntu1) karmic; urgency=low
133+
134+ * Freeze exception for new upstream version; LP: #454342.
135+ * Relax ruby-gnome2-dev build-dependency to 0.19.0-2ubuntu4, which has the
136+ missing headers.
137+ * Hard-code the dep on xulrunner 1.9.1 again instead of using dh_xulrunner,
138+ which we don't yet have in Ubuntu.
139+
140+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 18 Oct 2009 02:06:18 +0000
141+
142+>>>>>>> MERGE-SOURCE
143 kazehakase (0.5.8-1) unstable; urgency=low
144
145 * New upstream release.
146
147=== added file 'debian/patches/10_link-gcrypt.dpatch'
148--- debian/patches/10_link-gcrypt.dpatch 1970-01-01 00:00:00 +0000
149+++ debian/patches/10_link-gcrypt.dpatch 2010-02-12 23:56:17 +0000
150@@ -0,0 +1,31 @@
151+#! /bin/sh /usr/share/dpatch/dpatch-run
152+## 10_link-gcrypt.dpatch by Yavor Doganov <yavor@gnu.org>
153+##
154+## DP: Detect libgcrypt and link with it.
155+
156+
157+@DPATCH@
158+diff -urNad kazehakase-0.5.4~/configure.ac kazehakase-0.5.4/configure.ac
159+--- kazehakase-0.5.4~/configure.ac 2008-03-29 10:20:42.000000000 +0200
160++++ kazehakase-0.5.4/configure.ac 2008-05-16 00:51:04.000000000 +0300
161+@@ -171,6 +171,9 @@
162+ AM_PATH_LIBGNUTLS(1.2.0,
163+ AC_DEFINE(USE_SSL, 1, [Define using GNU TLS]),
164+ AC_MSG_WARN([[libgnutls was not found.]]))
165++
166++ AM_PATH_LIBGCRYPT([1.2.0], [],
167++ [AC_MSG_WARN([libgcrypt was not found.])])
168+ fi
169+ AM_CONDITIONAL(ENABLE_SSL, test x"$disable_ssl" = "xno")
170+
171+diff -urNad kazehakase-0.5.4~/src/Makefile.am kazehakase-0.5.4/src/Makefile.am
172+--- kazehakase-0.5.4~/src/Makefile.am 2008-03-29 10:20:42.000000000 +0200
173++++ kazehakase-0.5.4/src/Makefile.am 2008-05-16 00:51:59.000000000 +0300
174+@@ -203,6 +203,7 @@
175+ $(GTK_LIBS) \
176+ $(SM_LIBS) \
177+ $(LIBGNUTLS_LIBS) \
178++ $(LIBGCRYPT_LIBS) \
179+ -lz \
180+ $(libraries)
181+
182
183=== removed file 'debian/patches/10_link-gcrypt.dpatch'
184--- debian/patches/10_link-gcrypt.dpatch 2009-08-20 01:13:49 +0000
185+++ debian/patches/10_link-gcrypt.dpatch 1970-01-01 00:00:00 +0000
186@@ -1,31 +0,0 @@
187-#! /bin/sh /usr/share/dpatch/dpatch-run
188-## 10_link-gcrypt.dpatch by Yavor Doganov <yavor@gnu.org>
189-##
190-## DP: Detect libgcrypt and link with it.
191-
192-
193-@DPATCH@
194-diff -urNad kazehakase-0.5.4~/configure.ac kazehakase-0.5.4/configure.ac
195---- kazehakase-0.5.4~/configure.ac 2008-03-29 10:20:42.000000000 +0200
196-+++ kazehakase-0.5.4/configure.ac 2008-05-16 00:51:04.000000000 +0300
197-@@ -171,6 +171,9 @@
198- AM_PATH_LIBGNUTLS(1.2.0,
199- AC_DEFINE(USE_SSL, 1, [Define using GNU TLS]),
200- AC_MSG_WARN([[libgnutls was not found.]]))
201-+
202-+ AM_PATH_LIBGCRYPT([1.2.0], [],
203-+ [AC_MSG_WARN([libgcrypt was not found.])])
204- fi
205- AM_CONDITIONAL(ENABLE_SSL, test x"$disable_ssl" = "xno")
206-
207-diff -urNad kazehakase-0.5.4~/src/Makefile.am kazehakase-0.5.4/src/Makefile.am
208---- kazehakase-0.5.4~/src/Makefile.am 2008-03-29 10:20:42.000000000 +0200
209-+++ kazehakase-0.5.4/src/Makefile.am 2008-05-16 00:51:59.000000000 +0300
210-@@ -203,6 +203,7 @@
211- $(GTK_LIBS) \
212- $(SM_LIBS) \
213- $(LIBGNUTLS_LIBS) \
214-+ $(LIBGCRYPT_LIBS) \
215- -lz \
216- $(libraries)
217-
218
219=== added file 'debian/patches/25_url-if-no-smartbookmarks.dpatch'
220--- debian/patches/25_url-if-no-smartbookmarks.dpatch 1970-01-01 00:00:00 +0000
221+++ debian/patches/25_url-if-no-smartbookmarks.dpatch 2010-02-12 23:56:16 +0000
222@@ -0,0 +1,19 @@
223+#! /bin/sh /usr/share/dpatch/dpatch-run
224+## 25_url-if-no-smartbookmarks.dpatch by Yavor Doganov <yavor@gnu.org>
225+##
226+## DP: Don't fail miserable if all smart bookmarks are deleted.
227+## DP: Workaround for #442448.
228+
229+@DPATCH@
230+diff -urNad kazehakase-0.5.6~/src/bookmarks/kz-smart-bookmark.c kazehakase-0.5.6/src/bookmarks/kz-smart-bookmark.c
231+--- kazehakase-0.5.6~/src/bookmarks/kz-smart-bookmark.c 2009-08-17 17:24:43.000000000 +0300
232++++ kazehakase-0.5.6/src/bookmarks/kz-smart-bookmark.c 2009-08-19 23:19:55.000000000 +0300
233+@@ -252,7 +252,7 @@
234+ GMatchInfo *match_info = NULL;
235+ GError *error = NULL;
236+
237+- g_return_val_if_fail(KZ_IS_BOOKMARK(bookmark), NULL);
238++ g_return_val_if_fail(KZ_IS_BOOKMARK(bookmark), g_strdup(text));
239+
240+ if (!text)
241+ return g_strdup("");
242
243=== removed file 'debian/patches/25_url-if-no-smartbookmarks.dpatch'
244--- debian/patches/25_url-if-no-smartbookmarks.dpatch 2009-08-20 01:13:49 +0000
245+++ debian/patches/25_url-if-no-smartbookmarks.dpatch 1970-01-01 00:00:00 +0000
246@@ -1,19 +0,0 @@
247-#! /bin/sh /usr/share/dpatch/dpatch-run
248-## 25_url-if-no-smartbookmarks.dpatch by Yavor Doganov <yavor@gnu.org>
249-##
250-## DP: Don't fail miserable if all smart bookmarks are deleted.
251-## DP: Workaround for #442448.
252-
253-@DPATCH@
254-diff -urNad kazehakase-0.5.6~/src/bookmarks/kz-smart-bookmark.c kazehakase-0.5.6/src/bookmarks/kz-smart-bookmark.c
255---- kazehakase-0.5.6~/src/bookmarks/kz-smart-bookmark.c 2009-08-17 17:24:43.000000000 +0300
256-+++ kazehakase-0.5.6/src/bookmarks/kz-smart-bookmark.c 2009-08-19 23:19:55.000000000 +0300
257-@@ -252,7 +252,7 @@
258- GMatchInfo *match_info = NULL;
259- GError *error = NULL;
260-
261-- g_return_val_if_fail(KZ_IS_BOOKMARK(bookmark), NULL);
262-+ g_return_val_if_fail(KZ_IS_BOOKMARK(bookmark), g_strdup(text));
263-
264- if (!text)
265- return g_strdup("");
266
267=== added file 'debian/patches/30_xulrunner-1.9.1.dpatch'
268--- debian/patches/30_xulrunner-1.9.1.dpatch 1970-01-01 00:00:00 +0000
269+++ debian/patches/30_xulrunner-1.9.1.dpatch 2010-02-12 23:56:16 +0000
270@@ -0,0 +1,67 @@
271+#! /bin/sh /usr/share/dpatch/dpatch-run
272+## 30_xulrunner-1.9.1.dpatch by Mike Hommey <mh+reportbug@glandium.org>
273+## and Yavor Doganov <yavor@gnu.org
274+##
275+## DP: Support for xulrunner 1.9.1.
276+
277+@DPATCH@
278+diff -urNad kazehakase-0.5.8~/macros/gecko.m4 kazehakase-0.5.8/macros/gecko.m4
279+--- kazehakase-0.5.8~/macros/gecko.m4 2009-10-01 21:07:00.000000000 +0300
280++++ kazehakase-0.5.8/macros/gecko.m4 2009-10-02 00:46:00.000000000 +0300
281+@@ -54,26 +54,31 @@
282+
283+ gecko_version_major=`echo $gecko_version | awk '{ print $[1]; }'`
284+ gecko_version_minor=`echo $gecko_version | awk '{ print $[2]; }'`
285++gecko_version_micro=`echo $gecko_version | awk '{ print $[3]; }'`
286+
287+-if test -n "$gecko_version_major" -a -n "$gecko_version_minor"; then
288+- AC_MSG_RESULT([$gecko_version_major.$gecko_version_minor])
289++## The test options -a and -o are not portable.
290++if test -n "$gecko_version_major" && test -n "$gecko_version_minor"; then
291++ AC_MSG_RESULT([$gecko_version_major.$gecko_version_minor.$gecko_version_micro])
292+ else
293+ AC_MSG_RESULT([no])
294+ AC_MSG_ERROR([Can't detect Gecko version])
295+ fi
296+
297+-if test $gecko_version_major -ne 1 -o \
298+- $gecko_version_minor -lt 7 -o \
299+- $gecko_version_minor -gt 9; then
300++if test $gecko_version_major -ne 1 || \
301++ test $gecko_version_minor -lt 7 || \
302++ test $gecko_version_minor -gt 9; then
303+ AC_MSG_ERROR([Unsupported Gecko version $gecko_version_major.$gecko_version_minor])
304+ fi
305+
306+-if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 8; then
307++if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 8; then
308+ AC_DEFINE([HAVE_GECKO_1_8],[1],[Define if we have gecko 1.8])
309+ fi
310+-if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 9; then
311++if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 9; then
312+ AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
313+ fi
314++if test $gecko_version_minor -eq 9 && test $gecko_version_micro -eq 1; then
315++ AC_DEFINE([HAVE_GECKO_1_9_1],[1],[Define if we have gecko 1.9.1])
316++fi
317+
318+ AC_MSG_CHECKING([whether nsPIDOMWindow methods return nsPIDOMWindow*])
319+
320+diff -urNad kazehakase-0.5.8~/module/embed/gecko/mozilla.cpp kazehakase-0.5.8/module/embed/gecko/mozilla.cpp
321+--- kazehakase-0.5.8~/module/embed/gecko/mozilla.cpp 2009-10-01 21:07:00.000000000 +0300
322++++ kazehakase-0.5.8/module/embed/gecko/mozilla.cpp 2009-10-02 00:48:47.000000000 +0300
323+@@ -131,8 +131,13 @@
324+ xulrunner_init (void)
325+ {
326+ static const GREVersionRange greVersion = {
327++#ifdef HAVE_GECKO_1_9_1
328+ "1.9.1", PR_TRUE,
329+- "2.0", PR_TRUE,
330++ "1.9.2", PR_FALSE
331++#else
332++ "1.9a", PR_TRUE,
333++ "1.9.1", PR_FALSE
334++#endif
335+ };
336+
337+ char xpcomPath[PATH_MAX];
338
339=== removed file 'debian/patches/30_xulrunner-1.9.1.dpatch'
340--- debian/patches/30_xulrunner-1.9.1.dpatch 2009-10-04 11:40:32 +0000
341+++ debian/patches/30_xulrunner-1.9.1.dpatch 1970-01-01 00:00:00 +0000
342@@ -1,67 +0,0 @@
343-#! /bin/sh /usr/share/dpatch/dpatch-run
344-## 30_xulrunner-1.9.1.dpatch by Mike Hommey <mh+reportbug@glandium.org>
345-## and Yavor Doganov <yavor@gnu.org
346-##
347-## DP: Support for xulrunner 1.9.1.
348-
349-@DPATCH@
350-diff -urNad kazehakase-0.5.8~/macros/gecko.m4 kazehakase-0.5.8/macros/gecko.m4
351---- kazehakase-0.5.8~/macros/gecko.m4 2009-10-01 21:07:00.000000000 +0300
352-+++ kazehakase-0.5.8/macros/gecko.m4 2009-10-02 00:46:00.000000000 +0300
353-@@ -54,26 +54,31 @@
354-
355- gecko_version_major=`echo $gecko_version | awk '{ print $[1]; }'`
356- gecko_version_minor=`echo $gecko_version | awk '{ print $[2]; }'`
357-+gecko_version_micro=`echo $gecko_version | awk '{ print $[3]; }'`
358-
359--if test -n "$gecko_version_major" -a -n "$gecko_version_minor"; then
360-- AC_MSG_RESULT([$gecko_version_major.$gecko_version_minor])
361-+## The test options -a and -o are not portable.
362-+if test -n "$gecko_version_major" && test -n "$gecko_version_minor"; then
363-+ AC_MSG_RESULT([$gecko_version_major.$gecko_version_minor.$gecko_version_micro])
364- else
365- AC_MSG_RESULT([no])
366- AC_MSG_ERROR([Can't detect Gecko version])
367- fi
368-
369--if test $gecko_version_major -ne 1 -o \
370-- $gecko_version_minor -lt 7 -o \
371-- $gecko_version_minor -gt 9; then
372-+if test $gecko_version_major -ne 1 || \
373-+ test $gecko_version_minor -lt 7 || \
374-+ test $gecko_version_minor -gt 9; then
375- AC_MSG_ERROR([Unsupported Gecko version $gecko_version_major.$gecko_version_minor])
376- fi
377-
378--if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 8; then
379-+if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 8; then
380- AC_DEFINE([HAVE_GECKO_1_8],[1],[Define if we have gecko 1.8])
381- fi
382--if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 9; then
383-+if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 9; then
384- AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
385- fi
386-+if test $gecko_version_minor -eq 9 && test $gecko_version_micro -eq 1; then
387-+ AC_DEFINE([HAVE_GECKO_1_9_1],[1],[Define if we have gecko 1.9.1])
388-+fi
389-
390- AC_MSG_CHECKING([whether nsPIDOMWindow methods return nsPIDOMWindow*])
391-
392-diff -urNad kazehakase-0.5.8~/module/embed/gecko/mozilla.cpp kazehakase-0.5.8/module/embed/gecko/mozilla.cpp
393---- kazehakase-0.5.8~/module/embed/gecko/mozilla.cpp 2009-10-01 21:07:00.000000000 +0300
394-+++ kazehakase-0.5.8/module/embed/gecko/mozilla.cpp 2009-10-02 00:48:47.000000000 +0300
395-@@ -131,8 +131,13 @@
396- xulrunner_init (void)
397- {
398- static const GREVersionRange greVersion = {
399-+#ifdef HAVE_GECKO_1_9_1
400- "1.9.1", PR_TRUE,
401-- "2.0", PR_TRUE,
402-+ "1.9.2", PR_FALSE
403-+#else
404-+ "1.9a", PR_TRUE,
405-+ "1.9.1", PR_FALSE
406-+#endif
407- };
408-
409- char xpcomPath[PATH_MAX];
410
411=== added file 'debian/patches/35_PATH_MAX.dpatch'
412--- debian/patches/35_PATH_MAX.dpatch 1970-01-01 00:00:00 +0000
413+++ debian/patches/35_PATH_MAX.dpatch 2010-02-12 23:56:16 +0000
414@@ -0,0 +1,71 @@
415+#! /bin/sh /usr/share/dpatch/dpatch-run
416+## 35_PATH_MAX.dpatch by Yavor Doganov <yavor@gnu.org>
417+##
418+## DP: Avoid PATH_MAX, which is undefined on GNU/Hurd.
419+
420+@DPATCH@
421+diff -urNad kazehakase-0.5.6~/module/embed/gecko/mozilla.cpp kazehakase-0.5.6/module/embed/gecko/mozilla.cpp
422+--- kazehakase-0.5.6~/module/embed/gecko/mozilla.cpp 2009-08-24 11:26:28.000000000 +0300
423++++ kazehakase-0.5.6/module/embed/gecko/mozilla.cpp 2009-08-24 11:27:02.000000000 +0300
424+@@ -136,32 +136,53 @@
425+#endif
426+ };
427+
428+- char xpcomPath[PATH_MAX];
429++ char *xpcomPath, *lastSlash;
430++ gsize allocated = 128;
431++ nsresult rv;
432++
433++ while (1)
434++ {
435++ xpcomPath = (char *) g_malloc0(allocated);
436++
437++ rv = GRE_GetGREPathWithProperties(&greVersion, 1,
438++ nsnull, 0,
439++ xpcomPath,
440++ allocated);
441++
442++ if (strlen(xpcomPath) < allocated - 1)
443++ break;
444++
445++ g_free(xpcomPath);
446++ allocated *= 2;
447++ }
448+
449+- nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0,
450+- xpcomPath, sizeof(xpcomPath));
451+ if (NS_FAILED(rv))
452+- return FALSE;
453++ goto out;
454+
455+ rv = XPCOMGlueStartup(xpcomPath);
456+ if (NS_FAILED(rv))
457+- return FALSE;
458++ goto out;
459+
460+ rv = GTKEmbedGlueStartup();
461+ if (NS_FAILED(rv))
462+- return FALSE;
463++ goto out;
464+
465+ rv = GTKEmbedGlueStartupInternal();
466+ if (NS_FAILED(rv))
467+- return FALSE;
468++ goto out;
469+
470+- char *lastSlash = strrchr(xpcomPath, '/');
471++ lastSlash = strrchr(xpcomPath, '/');
472+ if (lastSlash)
473+ *lastSlash = '\0';
474+
475+ gtk_moz_embed_set_path(xpcomPath);
476+
477++ g_free(xpcomPath);
478+ return TRUE;
479++
480++ out:
481++ g_free(xpcomPath);
482++ return FALSE;
483+ }
484+
485+ static nsresult
486
487=== removed file 'debian/patches/35_PATH_MAX.dpatch'
488--- debian/patches/35_PATH_MAX.dpatch 2009-10-04 11:40:32 +0000
489+++ debian/patches/35_PATH_MAX.dpatch 1970-01-01 00:00:00 +0000
490@@ -1,71 +0,0 @@
491-#! /bin/sh /usr/share/dpatch/dpatch-run
492-## 35_PATH_MAX.dpatch by Yavor Doganov <yavor@gnu.org>
493-##
494-## DP: Avoid PATH_MAX, which is undefined on GNU/Hurd.
495-
496-@DPATCH@
497-diff -urNad kazehakase-0.5.6~/module/embed/gecko/mozilla.cpp kazehakase-0.5.6/module/embed/gecko/mozilla.cpp
498---- kazehakase-0.5.6~/module/embed/gecko/mozilla.cpp 2009-08-24 11:26:28.000000000 +0300
499-+++ kazehakase-0.5.6/module/embed/gecko/mozilla.cpp 2009-08-24 11:27:02.000000000 +0300
500-@@ -136,32 +136,53 @@
501-#endif
502- };
503-
504-- char xpcomPath[PATH_MAX];
505-+ char *xpcomPath, *lastSlash;
506-+ gsize allocated = 128;
507-+ nsresult rv;
508-+
509-+ while (1)
510-+ {
511-+ xpcomPath = (char *) g_malloc0(allocated);
512-+
513-+ rv = GRE_GetGREPathWithProperties(&greVersion, 1,
514-+ nsnull, 0,
515-+ xpcomPath,
516-+ allocated);
517-+
518-+ if (strlen(xpcomPath) < allocated - 1)
519-+ break;
520-+
521-+ g_free(xpcomPath);
522-+ allocated *= 2;
523-+ }
524-
525-- nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0,
526-- xpcomPath, sizeof(xpcomPath));
527- if (NS_FAILED(rv))
528-- return FALSE;
529-+ goto out;
530-
531- rv = XPCOMGlueStartup(xpcomPath);
532- if (NS_FAILED(rv))
533-- return FALSE;
534-+ goto out;
535-
536- rv = GTKEmbedGlueStartup();
537- if (NS_FAILED(rv))
538-- return FALSE;
539-+ goto out;
540-
541- rv = GTKEmbedGlueStartupInternal();
542- if (NS_FAILED(rv))
543-- return FALSE;
544-+ goto out;
545-
546-- char *lastSlash = strrchr(xpcomPath, '/');
547-+ lastSlash = strrchr(xpcomPath, '/');
548- if (lastSlash)
549- *lastSlash = '\0';
550-
551- gtk_moz_embed_set_path(xpcomPath);
552-
553-+ g_free(xpcomPath);
554- return TRUE;
555-+
556-+ out:
557-+ g_free(xpcomPath);
558-+ return FALSE;
559- }
560-
561- static nsresult
562
563=== added file 'debian/patches/40_AM_PATH_GLIB.dpatch'
564--- debian/patches/40_AM_PATH_GLIB.dpatch 1970-01-01 00:00:00 +0000
565+++ debian/patches/40_AM_PATH_GLIB.dpatch 2010-02-12 23:56:17 +0000
566@@ -0,0 +1,46 @@
567+#! /bin/sh /usr/share/dpatch/dpatch-run
568+## 40_GLIB_LIBS.dpatch by Yavor Doganov <yavor@gnu.org>
569+##
570+## DP: Check for Glib in order to define GLIB_CFLAGS and GLIB_LIBS.
571+
572+@DPATCH@
573+diff -urNad kazehakase-0.5.8~/configure.ac kazehakase-0.5.8/configure.ac
574+--- kazehakase-0.5.8~/configure.ac 2009-10-03 19:06:38.000000000 +0300
575++++ kazehakase-0.5.8/configure.ac 2009-10-03 19:08:23.000000000 +0300
576+@@ -96,6 +96,14 @@
577+ KAZEHAKASE_GECKO_CHECK
578+
579+ dnl **************************************************************
580++dnl Check for Glib.
581++dnl **************************************************************
582++dnl GLIB_CFLAGS and GLIB_LIBS are needed for the search module and
583++dnl kz-embed-process.
584++AM_PATH_GLIB_2_0([2.13.5], [], [AC_MSG_ERROR([GLib is required.])],
585++ [gmodule gobject gthread])
586++
587++dnl **************************************************************
588+ dnl Check for Gtk+2.
589+ dnl **************************************************************
590+ dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
591+diff -urNad kazehakase-0.5.8~/dbus/Makefile.am kazehakase-0.5.8/dbus/Makefile.am
592+--- kazehakase-0.5.8~/dbus/Makefile.am 2009-10-01 21:06:58.000000000 +0300
593++++ kazehakase-0.5.8/dbus/Makefile.am 2009-10-03 19:06:40.000000000 +0300
594+@@ -36,6 +36,7 @@
595+
596+ kz_embed_process_LDADD = \
597+ $(DBUS_GLIB_LIBS) \
598++ $(GLIB_LIBS) \
599+ $(top_builddir)/src/libkazehakase.la
600+ sample_browser_LDADD = \
601+ $(GTK_LIBS) \
602+diff -urNad kazehakase-0.5.8~/module/embed/per-process/Makefile.am kazehakase-0.5.8/module/embed/per-process/Makefile.am
603+--- kazehakase-0.5.8~/module/embed/per-process/Makefile.am 2009-10-01 21:06:58.000000000 +0300
604++++ kazehakase-0.5.8/module/embed/per-process/Makefile.am 2009-10-03 19:06:40.000000000 +0300
605+@@ -52,6 +52,7 @@
606+
607+ kz_embed_process_LDADD = \
608+ $(DBUS_GLIB_LIBS) \
609++ $(GLIB_LIBS) \
610+ $(top_builddir)/src/libkazehakase.la
611+
612+ kz_embed_process_SOURCES = kz-embed-process.c
613
614=== removed file 'debian/patches/40_AM_PATH_GLIB.dpatch'
615--- debian/patches/40_AM_PATH_GLIB.dpatch 2009-10-04 11:40:32 +0000
616+++ debian/patches/40_AM_PATH_GLIB.dpatch 1970-01-01 00:00:00 +0000
617@@ -1,46 +0,0 @@
618-#! /bin/sh /usr/share/dpatch/dpatch-run
619-## 40_GLIB_LIBS.dpatch by Yavor Doganov <yavor@gnu.org>
620-##
621-## DP: Check for Glib in order to define GLIB_CFLAGS and GLIB_LIBS.
622-
623-@DPATCH@
624-diff -urNad kazehakase-0.5.8~/configure.ac kazehakase-0.5.8/configure.ac
625---- kazehakase-0.5.8~/configure.ac 2009-10-03 19:06:38.000000000 +0300
626-+++ kazehakase-0.5.8/configure.ac 2009-10-03 19:08:23.000000000 +0300
627-@@ -96,6 +96,14 @@
628- KAZEHAKASE_GECKO_CHECK
629-
630- dnl **************************************************************
631-+dnl Check for Glib.
632-+dnl **************************************************************
633-+dnl GLIB_CFLAGS and GLIB_LIBS are needed for the search module and
634-+dnl kz-embed-process.
635-+AM_PATH_GLIB_2_0([2.13.5], [], [AC_MSG_ERROR([GLib is required.])],
636-+ [gmodule gobject gthread])
637-+
638-+dnl **************************************************************
639- dnl Check for Gtk+2.
640- dnl **************************************************************
641- dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
642-diff -urNad kazehakase-0.5.8~/dbus/Makefile.am kazehakase-0.5.8/dbus/Makefile.am
643---- kazehakase-0.5.8~/dbus/Makefile.am 2009-10-01 21:06:58.000000000 +0300
644-+++ kazehakase-0.5.8/dbus/Makefile.am 2009-10-03 19:06:40.000000000 +0300
645-@@ -36,6 +36,7 @@
646-
647- kz_embed_process_LDADD = \
648- $(DBUS_GLIB_LIBS) \
649-+ $(GLIB_LIBS) \
650- $(top_builddir)/src/libkazehakase.la
651- sample_browser_LDADD = \
652- $(GTK_LIBS) \
653-diff -urNad kazehakase-0.5.8~/module/embed/per-process/Makefile.am kazehakase-0.5.8/module/embed/per-process/Makefile.am
654---- kazehakase-0.5.8~/module/embed/per-process/Makefile.am 2009-10-01 21:06:58.000000000 +0300
655-+++ kazehakase-0.5.8/module/embed/per-process/Makefile.am 2009-10-03 19:06:40.000000000 +0300
656-@@ -52,6 +52,7 @@
657-
658- kz_embed_process_LDADD = \
659- $(DBUS_GLIB_LIBS) \
660-+ $(GLIB_LIBS) \
661- $(top_builddir)/src/libkazehakase.la
662-
663- kz_embed_process_SOURCES = kz-embed-process.c
664
665=== added file 'debian/patches/42_gtk_action_disconnect_proxy.dpatch'
666--- debian/patches/42_gtk_action_disconnect_proxy.dpatch 1970-01-01 00:00:00 +0000
667+++ debian/patches/42_gtk_action_disconnect_proxy.dpatch 2010-02-12 23:56:16 +0000
668@@ -0,0 +1,44 @@
669+#! /bin/sh /usr/share/dpatch/dpatch-run
670+## 42_gtk_action_disconnect_proxy.dpatch by Yavor Doganov <yavor@gnu.org>
671+## Thanks to Dimitur Kirov <dkirov@gmail.com>
672+##
673+## DP: Check if GTK+ is new enough to have
674+## DP: gtk_activatable_set_related_action, otherwise fall back to
675+## DP: gtk_action_disconnect_proxy (declaration faded by
676+## DP: GTK_DISABLE_DEPRECATED).
677+
678+@DPATCH@
679+diff -urNad kazehakase-0.5.6~/configure.ac kazehakase-0.5.6/configure.ac
680+--- kazehakase-0.5.6~/configure.ac 2009-08-19 22:52:59.000000000 +0300
681++++ kazehakase-0.5.6/configure.ac 2009-08-19 22:59:48.000000000 +0300
682+@@ -370,6 +370,15 @@
683+ AC_DEFINE(HAVE_STRPTIME, 1, [Define strptime])
684+ fi
685+
686++## This function is available only in GTK+ >= 2.15.x.
687++TEMP_CFLAGS="$CFLAGS"
688++TEMP_LIBS="$LIBS"
689++CFLAGS="$CFLAGS $GTK_CFLAGS"
690++LIBS="$LIBS $GTK_LIBS"
691++AC_CHECK_FUNCS([gtk_activatable_set_related_action])
692++CFLAGS="$TEMP_CFLAGS"
693++LIBS="$TEMP_LIBS"
694++
695+ dnl **************************************************************
696+ dnl Migemo
697+ dnl **************************************************************
698+diff -urNad kazehakase-0.5.6~/src/actions/kz-actions.c kazehakase-0.5.6/src/actions/kz-actions.c
699+--- kazehakase-0.5.6~/src/actions/kz-actions.c 2009-08-17 17:24:42.000000000 +0300
700++++ kazehakase-0.5.6/src/actions/kz-actions.c 2009-08-19 23:02:11.000000000 +0300
701+@@ -2716,7 +2716,11 @@
702+ {
703+ if (p_node->data && GTK_IS_WIDGET(p_node->data))
704+ {
705++#if HAVE_GTK_ACTIVATABLE_SET_RELATED_ACTION
706++ gtk_activatable_set_related_action(GTK_ACTIVATABLE(p_node->data), NULL);
707++#else
708+ gtk_action_disconnect_proxy(action, GTK_WIDGET(p_node->data));
709++#endif
710+ }
711+ }
712+ g_slist_free(copy);
713
714=== removed file 'debian/patches/42_gtk_action_disconnect_proxy.dpatch'
715--- debian/patches/42_gtk_action_disconnect_proxy.dpatch 2009-08-20 01:13:49 +0000
716+++ debian/patches/42_gtk_action_disconnect_proxy.dpatch 1970-01-01 00:00:00 +0000
717@@ -1,44 +0,0 @@
718-#! /bin/sh /usr/share/dpatch/dpatch-run
719-## 42_gtk_action_disconnect_proxy.dpatch by Yavor Doganov <yavor@gnu.org>
720-## Thanks to Dimitur Kirov <dkirov@gmail.com>
721-##
722-## DP: Check if GTK+ is new enough to have
723-## DP: gtk_activatable_set_related_action, otherwise fall back to
724-## DP: gtk_action_disconnect_proxy (declaration faded by
725-## DP: GTK_DISABLE_DEPRECATED).
726-
727-@DPATCH@
728-diff -urNad kazehakase-0.5.6~/configure.ac kazehakase-0.5.6/configure.ac
729---- kazehakase-0.5.6~/configure.ac 2009-08-19 22:52:59.000000000 +0300
730-+++ kazehakase-0.5.6/configure.ac 2009-08-19 22:59:48.000000000 +0300
731-@@ -370,6 +370,15 @@
732- AC_DEFINE(HAVE_STRPTIME, 1, [Define strptime])
733- fi
734-
735-+## This function is available only in GTK+ >= 2.15.x.
736-+TEMP_CFLAGS="$CFLAGS"
737-+TEMP_LIBS="$LIBS"
738-+CFLAGS="$CFLAGS $GTK_CFLAGS"
739-+LIBS="$LIBS $GTK_LIBS"
740-+AC_CHECK_FUNCS([gtk_activatable_set_related_action])
741-+CFLAGS="$TEMP_CFLAGS"
742-+LIBS="$TEMP_LIBS"
743-+
744- dnl **************************************************************
745- dnl Migemo
746- dnl **************************************************************
747-diff -urNad kazehakase-0.5.6~/src/actions/kz-actions.c kazehakase-0.5.6/src/actions/kz-actions.c
748---- kazehakase-0.5.6~/src/actions/kz-actions.c 2009-08-17 17:24:42.000000000 +0300
749-+++ kazehakase-0.5.6/src/actions/kz-actions.c 2009-08-19 23:02:11.000000000 +0300
750-@@ -2716,7 +2716,11 @@
751- {
752- if (p_node->data && GTK_IS_WIDGET(p_node->data))
753- {
754-+#if HAVE_GTK_ACTIVATABLE_SET_RELATED_ACTION
755-+ gtk_activatable_set_related_action(GTK_ACTIVATABLE(p_node->data), NULL);
756-+#else
757- gtk_action_disconnect_proxy(action, GTK_WIDGET(p_node->data));
758-+#endif
759- }
760- }
761- g_slist_free(copy);
762
763=== added file 'debian/patches/43_AC_USE_SYSTEM_EXTENSIONS.dpatch'
764--- debian/patches/43_AC_USE_SYSTEM_EXTENSIONS.dpatch 1970-01-01 00:00:00 +0000
765+++ debian/patches/43_AC_USE_SYSTEM_EXTENSIONS.dpatch 2010-02-12 23:56:17 +0000
766@@ -0,0 +1,31 @@
767+#! /bin/sh /usr/share/dpatch/dpatch-run
768+## 43_AC_USE_SYSTEM_EXTENSIONS.dpatch by Yavor Doganov <yavor@gnu.org>
769+##
770+## DP: AC_USE_SYSTEM_EXTENSIONS is needed for the declaration of
771+## DP: `strptime'.
772+
773+@DPATCH@
774+diff -urNad kazehakase-0.5.6~/configure.ac kazehakase-0.5.6/configure.ac
775+--- kazehakase-0.5.6~/configure.ac 2009-08-24 11:59:02.000000000 +0300
776++++ kazehakase-0.5.6/configure.ac 2009-08-24 11:59:37.000000000 +0300
777+@@ -32,6 +32,8 @@
778+ AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
779+ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
780+
781++AC_USE_SYSTEM_EXTENSIONS
782++
783+ AC_ENABLE_SHARED(yes)
784+ AC_ENABLE_STATIC(no)
785+
786+diff -urNad kazehakase-0.5.6~/src/net/kz-http.c kazehakase-0.5.6/src/net/kz-http.c
787+--- kazehakase-0.5.6~/src/net/kz-http.c 2009-08-17 17:24:43.000000000 +0300
788++++ kazehakase-0.5.6/src/net/kz-http.c 2009-08-24 11:59:04.000000000 +0300
789+@@ -29,7 +29,5 @@
790+ # include "config.h"
791+ #endif /* HAVE_CONFIG_H */
792+
793+-#include <features.h>
794+-#define __USE_XOPEN
795+ #include <time.h>
796+ #include "gnet.h"
797+
798
799=== removed file 'debian/patches/43_AC_USE_SYSTEM_EXTENSIONS.dpatch'
800--- debian/patches/43_AC_USE_SYSTEM_EXTENSIONS.dpatch 2009-10-04 11:40:32 +0000
801+++ debian/patches/43_AC_USE_SYSTEM_EXTENSIONS.dpatch 1970-01-01 00:00:00 +0000
802@@ -1,31 +0,0 @@
803-#! /bin/sh /usr/share/dpatch/dpatch-run
804-## 43_AC_USE_SYSTEM_EXTENSIONS.dpatch by Yavor Doganov <yavor@gnu.org>
805-##
806-## DP: AC_USE_SYSTEM_EXTENSIONS is needed for the declaration of
807-## DP: `strptime'.
808-
809-@DPATCH@
810-diff -urNad kazehakase-0.5.6~/configure.ac kazehakase-0.5.6/configure.ac
811---- kazehakase-0.5.6~/configure.ac 2009-08-24 11:59:02.000000000 +0300
812-+++ kazehakase-0.5.6/configure.ac 2009-08-24 11:59:37.000000000 +0300
813-@@ -32,6 +32,8 @@
814- AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
815- AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
816-
817-+AC_USE_SYSTEM_EXTENSIONS
818-+
819- AC_ENABLE_SHARED(yes)
820- AC_ENABLE_STATIC(no)
821-
822-diff -urNad kazehakase-0.5.6~/src/net/kz-http.c kazehakase-0.5.6/src/net/kz-http.c
823---- kazehakase-0.5.6~/src/net/kz-http.c 2009-08-17 17:24:43.000000000 +0300
824-+++ kazehakase-0.5.6/src/net/kz-http.c 2009-08-24 11:59:04.000000000 +0300
825-@@ -29,7 +29,5 @@
826- # include "config.h"
827- #endif /* HAVE_CONFIG_H */
828-
829--#include <features.h>
830--#define __USE_XOPEN
831- #include <time.h>
832- #include "gnet.h"
833-
834
835=== added file 'debian/patches/45_link_gtk_libs.dpatch'
836--- debian/patches/45_link_gtk_libs.dpatch 1970-01-01 00:00:00 +0000
837+++ debian/patches/45_link_gtk_libs.dpatch 2010-02-12 23:56:16 +0000
838@@ -0,0 +1,19 @@
839+#! /bin/sh /usr/share/dpatch/dpatch-run
840+## 45_link_gtk_libs.dpatch by Yavor Doganov <yavor@gnu.org>
841+##
842+## DP: Link the kazehakase binary against the GTK libs.
843+
844+@DPATCH@
845+diff -urNad kazehakase-0.4.8~/src/Makefile.am kazehakase-0.4.8/src/Makefile.am
846+--- kazehakase-0.4.8~/src/Makefile.am 2007-08-29 18:45:10.000000000 +0300
847++++ kazehakase-0.4.8/src/Makefile.am 2008-04-03 23:35:31.000000000 +0300
848+@@ -109,7 +109,8 @@
849+ kazehakase_LDADD = \
850+ $(DBUS_GLIB_LIBS) \
851+ libkazehakase.la \
852+- $(KAZEHAKASE_RES)
853++ $(KAZEHAKASE_RES) \
854++ $(GTK_LIBS)
855+
856+ if WITH_GECKO
857+ kazehakase_LDFLAGS = -R$(MOZILLA_HOME)
858
859=== removed file 'debian/patches/45_link_gtk_libs.dpatch'
860--- debian/patches/45_link_gtk_libs.dpatch 2009-10-04 11:40:32 +0000
861+++ debian/patches/45_link_gtk_libs.dpatch 1970-01-01 00:00:00 +0000
862@@ -1,19 +0,0 @@
863-#! /bin/sh /usr/share/dpatch/dpatch-run
864-## 45_link_gtk_libs.dpatch by Yavor Doganov <yavor@gnu.org>
865-##
866-## DP: Link the kazehakase binary against the GTK libs.
867-
868-@DPATCH@
869-diff -urNad kazehakase-0.4.8~/src/Makefile.am kazehakase-0.4.8/src/Makefile.am
870---- kazehakase-0.4.8~/src/Makefile.am 2007-08-29 18:45:10.000000000 +0300
871-+++ kazehakase-0.4.8/src/Makefile.am 2008-04-03 23:35:31.000000000 +0300
872-@@ -109,7 +109,8 @@
873- kazehakase_LDADD = \
874- $(DBUS_GLIB_LIBS) \
875- libkazehakase.la \
876-- $(KAZEHAKASE_RES)
877-+ $(KAZEHAKASE_RES) \
878-+ $(GTK_LIBS)
879-
880- if WITH_GECKO
881- kazehakase_LDFLAGS = -R$(MOZILLA_HOME)
882
883=== added file 'debian/patches/47_ldflags-rpath.dpatch'
884--- debian/patches/47_ldflags-rpath.dpatch 1970-01-01 00:00:00 +0000
885+++ debian/patches/47_ldflags-rpath.dpatch 2010-02-12 23:56:17 +0000
886@@ -0,0 +1,146 @@
887+#! /bin/sh /usr/share/dpatch/dpatch-run
888+## 47_ldflags-rpath.dpatch by Yavor Doganov <yavor@gnu.org>
889+##
890+## DP: Do not use LDFLAGS directly and remove RPATH. Misc fixes to
891+## DP: avoid undefined symbols.
892+
893+@DPATCH@
894+diff -urNad kazehakase-0.5.8~/dbus/Makefile.am kazehakase-0.5.8/dbus/Makefile.am
895+--- kazehakase-0.5.8~/dbus/Makefile.am 2009-12-07 21:17:56.000000000 +0200
896++++ kazehakase-0.5.8/dbus/Makefile.am 2009-12-07 21:17:59.000000000 +0200
897+@@ -35,6 +35,7 @@
898+ kz_embed_process_LDADD = \
899+ $(DBUS_GLIB_LIBS) \
900+ $(GLIB_LIBS) \
901++ $(GTK_LIBS) \
902+ $(top_builddir)/src/libkazehakase.la
903+ sample_browser_LDADD = \
904+ $(GTK_LIBS) \
905+diff -urNad kazehakase-0.5.8~/ext/ruby/Makefile.am kazehakase-0.5.8/ext/ruby/Makefile.am
906+--- kazehakase-0.5.8~/ext/ruby/Makefile.am 2009-12-07 21:17:42.000000000 +0200
907++++ kazehakase-0.5.8/ext/ruby/Makefile.am 2009-12-07 21:17:59.000000000 +0200
908+@@ -8,7 +8,6 @@
909+ -DG_DISABLE_DEPRECATED=1
910+
911+ INCLUDES = \
912+- $(MOZILLA_COMPONENT_CFLAGS) \
913+ $(GTK_CFLAGS) \
914+ $(LIBGNUTLS_CFLAGS) \
915+ $(RUBY_CFLAGS) \
916+@@ -47,14 +46,12 @@
917+ kz-rb-sidebar.c \
918+ kz-rb-web.c
919+
920+-LDFLAGS = \
921++AM_LDFLAGS = \
922+ -rpath $(extdir) \
923+ -avoid-version \
924+ -module \
925+ -export-dynamic $(no_undefined) \
926+- $(LIBTOOL_EXPORT_OPTIONS)
927+-
928+-ruby_la_LDFLAGS = \
929++ $(LIBTOOL_EXPORT_OPTIONS) \
930+ $(RUBY_LDFLAGS) \
931+ $(RUBY_EXT_LDFLAGS)
932+
933+@@ -63,5 +60,4 @@
934+ $(GTK_LIBS) \
935+ $(LIBGNUTLS_LIBS) \
936+ $(RUBY_LIBS) \
937+- $(MOZILLA_COMPONENT_LIBS) \
938+ $(top_builddir)/src/libkazehakase.la
939+diff -urNad kazehakase-0.5.8~/module/embed/gecko/Makefile.am kazehakase-0.5.8/module/embed/gecko/Makefile.am
940+--- kazehakase-0.5.8~/module/embed/gecko/Makefile.am 2009-12-07 21:17:42.000000000 +0200
941++++ kazehakase-0.5.8/module/embed/gecko/Makefile.am 2009-12-07 21:17:59.000000000 +0200
942+@@ -99,12 +99,11 @@
943+ $(GTK_LIBS) \
944+ $(top_builddir)/src/libkazehakase.la
945+
946+-LDFLAGS = \
947++AM_LDFLAGS = \
948+ -rpath $(embeddir) \
949+ -avoid-version \
950+ -module \
951+ -export-dynamic $(no_undefined) \
952+- -R$(MOZILLA_HOME) \
953+ $(LIBTOOL_EXPORT_OPTIONS)
954+
955+ AM_CXXFLAGS = \
956+diff -urNad kazehakase-0.5.8~/module/embed/gecko/gtkmozembed/Makefile.am kazehakase-0.5.8/module/embed/gecko/gtkmozembed/Makefile.am
957+--- kazehakase-0.5.8~/module/embed/gecko/gtkmozembed/Makefile.am 2009-12-07 21:17:42.000000000 +0200
958++++ kazehakase-0.5.8/module/embed/gecko/gtkmozembed/Makefile.am 2009-12-07 21:17:59.000000000 +0200
959+@@ -59,8 +59,6 @@
960+ -I$(top_srcdir)/src/utils \
961+ -I$(top_srcdir)/module/embed/gecko
962+
963+-LDFLAGS = -R$(MOZILLA_HOME)
964+-
965+ if HAVE_GECKO_1_8
966+ PROFILEDIRSERVICE_SOURCES=nsProfileDirServiceProvider2.cpp
967+ else
968+diff -urNad kazehakase-0.5.8~/module/embed/per-process/Makefile.am kazehakase-0.5.8/module/embed/per-process/Makefile.am
969+--- kazehakase-0.5.8~/module/embed/per-process/Makefile.am 2009-12-07 21:17:56.000000000 +0200
970++++ kazehakase-0.5.8/module/embed/per-process/Makefile.am 2009-12-07 21:18:48.000000000 +0200
971+@@ -49,11 +49,14 @@
972+ kz-dbus-embed-delegate.h
973+
974+ per_process_la_LIBADD = \
975+- $(DBUS_GLIB_LIBS)
976++ $(DBUS_GLIB_LIBS) \
977++ $(GTK_LIBS) \
978++ $(top_builddir)/src/libkazehakase.la
979+
980+ kz_embed_process_LDADD = \
981+ $(DBUS_GLIB_LIBS) \
982+ $(GLIB_LIBS) \
983++ $(GTK_LIBS) \
984+ $(top_builddir)/src/libkazehakase.la
985+
986+ kz_embed_process_SOURCES = kz-embed-process.c
987+diff -urNad kazehakase-0.5.8~/module/embed/webkit-gtk/Makefile.am kazehakase-0.5.8/module/embed/webkit-gtk/Makefile.am
988+--- kazehakase-0.5.8~/module/embed/webkit-gtk/Makefile.am 2009-12-07 21:17:42.000000000 +0200
989++++ kazehakase-0.5.8/module/embed/webkit-gtk/Makefile.am 2009-12-07 21:17:59.000000000 +0200
990+@@ -31,4 +31,5 @@
991+ kz-webkit-gtk.h
992+
993+ webkit_gtk_la_LIBADD = \
994+- $(WEBKITGTK_LIBS)
995++ $(WEBKITGTK_LIBS) \
996++ $(top_builddir)/src/libkazehakase.la
997+diff -urNad kazehakase-0.5.8~/module/search/Makefile.am kazehakase-0.5.8/module/search/Makefile.am
998+--- kazehakase-0.5.8~/module/search/Makefile.am 2009-12-07 21:17:42.000000000 +0200
999++++ kazehakase-0.5.8/module/search/Makefile.am 2009-12-07 21:17:59.000000000 +0200
1000+@@ -20,7 +20,7 @@
1001+
1002+ LIBADD = $(GLIB_LIBS)
1003+
1004+-LDFLAGS = \
1005++AM_LDFLAGS = \
1006+ -rpath $(searchdir) \
1007+ -avoid-version \
1008+ -module \
1009+@@ -39,7 +39,8 @@
1010+ hyper_estraier_la_SOURCES = \
1011+ $(search_common_sources) \
1012+ kz-hyper-estraier-search.c
1013+-hyper_estraier_la_LIBADD = $(EST_LIBS)
1014++hyper_estraier_la_LIBADD = $(EST_LIBS) $(GLIB_LIBS) \
1015++ $(top_builddir)/src/libkazehakase.la
1016+ hyper_estraier_la_CPPFLAGS = \
1017+ $(EST_CFLAGS) \
1018+ $(AM_CPPFLAGS) \
1019+diff -urNad kazehakase-0.5.8~/src/Makefile.am kazehakase-0.5.8/src/Makefile.am
1020+--- kazehakase-0.5.8~/src/Makefile.am 2009-12-07 21:17:57.000000000 +0200
1021++++ kazehakase-0.5.8/src/Makefile.am 2009-12-07 21:17:59.000000000 +0200
1022+@@ -100,10 +100,6 @@
1023+ $(KAZEHAKASE_RES) \
1024+ $(GTK_LIBS)
1025+
1026+-if WITH_GECKO
1027+-kazehakase_LDFLAGS = -R$(MOZILLA_HOME)
1028+-endif
1029+-
1030+ libkazehakase_public_h_sources = \
1031+ kazehakase.h \
1032+ kz-objects.h \
1033
1034=== renamed file 'debian/patches/47_ldflags-rpath.dpatch' => 'debian/patches/47_ldflags-rpath.dpatch.THIS'
1035=== added file 'debian/patches/50_autoreconf.dpatch'
1036--- debian/patches/50_autoreconf.dpatch 1970-01-01 00:00:00 +0000
1037+++ debian/patches/50_autoreconf.dpatch 2010-02-12 23:56:16 +0000
1038@@ -0,0 +1,6699 @@
1039+#! /bin/sh /usr/share/dpatch/dpatch-run
1040+## 50_autoreconf.dpatch by Yavor Doganov <yavor@gnu.org>
1041+##
1042+## DP: Regenerate the build system with ./autogen.sh.
1043+
1044+@DPATCH@
1045+diff -urNad kazehakase-0.5.8~/Makefile.in kazehakase-0.5.8/Makefile.in
1046+--- kazehakase-0.5.8~/Makefile.in 2009-12-07 21:17:42.000000000 +0200
1047++++ kazehakase-0.5.8/Makefile.in 2009-12-07 21:19:59.000000000 +0200
1048+@@ -134,14 +134,8 @@
1049+ CC = @CC@
1050+ CCDEPMODE = @CCDEPMODE@
1051+ CFLAGS = @CFLAGS@
1052+-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
1053+-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@
1054+-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@
1055+ CPP = @CPP@
1056+ CPPFLAGS = @CPPFLAGS@
1057+-CUTTER = @CUTTER@
1058+-CUTTER_CFLAGS = @CUTTER_CFLAGS@
1059+-CUTTER_LIBS = @CUTTER_LIBS@
1060+ CXX = @CXX@
1061+ CXXCPP = @CXXCPP@
1062+ CXXDEPMODE = @CXXDEPMODE@
1063+@@ -168,19 +162,18 @@
1064+ F77 = @F77@
1065+ FC = @FC@
1066+ FGREP = @FGREP@
1067+-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@
1068+-GCUTTER_LIBS = @GCUTTER_LIBS@
1069+ GECKO = @GECKO@
1070+ GECKO_VERSION = @GECKO_VERSION@
1071+-GENHTML = @GENHTML@
1072+-GENHTML_OPTIONS = @GENHTML_OPTIONS@
1073+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1074+ GIO_CFLAGS = @GIO_CFLAGS@
1075+ GIO_LIBS = @GIO_LIBS@
1076++GLIB_CFLAGS = @GLIB_CFLAGS@
1077+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
1078++GLIB_LIBS = @GLIB_LIBS@
1079+ GLIB_MKENUMS = @GLIB_MKENUMS@
1080+ GMOFILES = @GMOFILES@
1081+ GMSGFMT = @GMSGFMT@
1082++GOBJECT_QUERY = @GOBJECT_QUERY@
1083+ GREP = @GREP@
1084+ GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@
1085+ GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@
1086+@@ -198,9 +191,11 @@
1087+ INTLTOOL_PERL = @INTLTOOL_PERL@
1088+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
1089+ KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@
1090+-LCOV = @LCOV@
1091+ LD = @LD@
1092+ LDFLAGS = @LDFLAGS@
1093++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
1094++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
1095++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
1096+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
1097+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
1098+ LIBOBJS = @LIBOBJS@
1099+diff -urNad kazehakase-0.5.8~/aclocal.m4 kazehakase-0.5.8/aclocal.m4
1100+--- kazehakase-0.5.8~/aclocal.m4 2009-12-07 21:17:42.000000000 +0200
1101++++ kazehakase-0.5.8/aclocal.m4 2009-12-07 21:19:42.000000000 +0200
1102+@@ -13,156 +13,223 @@
1103+
1104+ m4_ifndef([AC_AUTOCONF_VERSION],
1105+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1106+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
1107+-[m4_warning([this file was generated for autoconf 2.64.
1108++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
1109++[m4_warning([this file was generated for autoconf 2.65.
1110+ You have another version of autoconf. It may work, but is not guaranteed to.
1111+ If you have problems, you may need to regenerate the build system entirely.
1112+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
1113+
1114+-AC_DEFUN([AC_CHECK_COVERAGE],
1115+-[
1116+- dnl **************************************************************
1117+- dnl Configure for coverage.
1118+- dnl **************************************************************
1119+-
1120+- AC_ARG_ENABLE([coverage],
1121+- AS_HELP_STRING([--enable-coverage],
1122+- [Enable coverage]),
1123+- [ac_cv_enable_coverage=$enableval],
1124+- [ac_cv_enable_coverage=no])
1125+- if test "x$GCC" != "xyes"; then
1126+- ac_cv_enable_coverage=no
1127+- fi
1128++# Configure paths for GLIB
1129++# Owen Taylor 1997-2001
1130+
1131+- cutter_has_lcov=no
1132+- ltp_version_list="1.6 1.7"
1133+- AC_CHECK_PROG(LCOV, lcov, lcov)
1134+- AC_CHECK_PROG(GENHTML, genhtml, genhtml)
1135++dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
1136++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
1137++dnl gthread, or gio is specified in MODULES, pass to pkg-config
1138++dnl
1139++AC_DEFUN([AM_PATH_GLIB_2_0],
1140++[dnl
1141++dnl Get the cflags and libraries from pkg-config
1142++dnl
1143++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
1144++ , enable_glibtest=yes)
1145+
1146+- if test "$LCOV"; then
1147+- AC_CACHE_CHECK([for ltp version], cutter_cv_ltp_version, [
1148+- cutter_cv_ltp_version=invalid
1149+- ltp_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
1150+- for ltp_check_version in $ltp_version_list; do
1151+- if test "$ltp_version" = "$ltp_check_version"; then
1152+- cutter_cv_ltp_version="$ltp_check_version (ok)"
1153+- fi
1154+- done
1155+- ])
1156+- fi
1157++ pkg_config_args=glib-2.0
1158++ for module in . $4
1159++ do
1160++ case "$module" in
1161++ gmodule)
1162++ pkg_config_args="$pkg_config_args gmodule-2.0"
1163++ ;;
1164++ gmodule-no-export)
1165++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
1166++ ;;
1167++ gobject)
1168++ pkg_config_args="$pkg_config_args gobject-2.0"
1169++ ;;
1170++ gthread)
1171++ pkg_config_args="$pkg_config_args gthread-2.0"
1172++ ;;
1173++ gio*)
1174++ pkg_config_args="$pkg_config_args $module-2.0"
1175++ ;;
1176++ esac
1177++ done
1178+
1179+- case $cutter_cv_ltp_version in
1180+- ""|invalid[)]
1181+- ;;
1182+- *)
1183+- cutter_has_lcov=yes
1184+- ;;
1185+- esac
1186++ PKG_PROG_PKG_CONFIG([0.16])
1187+
1188+- if test "x$cutter_has_lcov" != "xyes"; then
1189+- ac_cv_enable_coverage=no
1190+- fi
1191++ no_glib=""
1192+
1193+- COVERAGE_CFLAGS=
1194+- if test "x$ac_cv_enable_coverage" = "xyes"; then
1195+- COVERAGE_CFLAGS="--coverage"
1196++ if test "x$PKG_CONFIG" = x ; then
1197++ no_glib=yes
1198++ PKG_CONFIG=no
1199+ fi
1200+- AC_SUBST(COVERAGE_CFLAGS)
1201+- AM_CONDITIONAL([ENABLE_COVERAGE], [test "x$ac_cv_enable_coverage" = "xyes"])
1202+
1203+- COVERAGE_INFO_FILE="coverage.info"
1204+- AC_SUBST(COVERAGE_INFO_FILE)
1205++ min_glib_version=ifelse([$1], ,2.0.0,$1)
1206++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
1207+
1208+- COVERAGE_REPORT_DIR="coverage"
1209+- AC_SUBST(COVERAGE_REPORT_DIR)
1210++ if test x$PKG_CONFIG != xno ; then
1211++ ## don't try to run the test against uninstalled libtool libs
1212++ if $PKG_CONFIG --uninstalled $pkg_config_args; then
1213++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
1214++ enable_glibtest=no
1215++ fi
1216+
1217+- if test "$GENHTML_OPTIONS" = ""; then
1218+- GENHTML_OPTIONS=""
1219++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
1220++ :
1221++ else
1222++ no_glib=yes
1223++ fi
1224+ fi
1225+- AC_SUBST(GENHTML_OPTIONS)
1226+-
1227+- if test "x$ac_cv_enable_coverage" = "xyes"; then
1228+- AC_CONFIG_COMMANDS([coverage], [
1229+- if grep '^coverage:' Makefile > /dev/null; then
1230+- : # do nothing
1231+- else
1232+- cat >>Makefile <<EOS
1233+
1234+-coverage-clean:
1235+- \$(LCOV) --compat-libtool --zerocounters --directory . \\
1236+- --output-file \$(COVERAGE_INFO_FILE)
1237++ if test x"$no_glib" = x ; then
1238++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
1239++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
1240++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
1241+
1242+-coverage: coverage-clean check
1243+- \$(LCOV) --compat-libtool --directory . \\
1244+- --capture --output-file \$(COVERAGE_INFO_FILE)
1245+- \$(LCOV) --compat-libtool --directory . \\
1246+- --extract \$(COVERAGE_INFO_FILE) "\`(cd '\$(top_srcdir)'; pwd)\`/*" \\
1247+- --output-file \$(COVERAGE_INFO_FILE)
1248+- \$(GENHTML) --highlight --legend \\
1249+- --output-directory \$(COVERAGE_REPORT_DIR) \\
1250+- --prefix "\`(cd '\$(top_srcdir)'; pwd)\`" \\
1251+- \$(GENHTML_OPTIONS) \$(COVERAGE_INFO_FILE)
1252+-EOS
1253+- fi
1254+- ])
1255+- fi
1256+-])
1257++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
1258++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
1259++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
1260++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
1261++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
1262++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
1263++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
1264++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
1265++ if test "x$enable_glibtest" = "xyes" ; then
1266++ ac_save_CFLAGS="$CFLAGS"
1267++ ac_save_LIBS="$LIBS"
1268++ CFLAGS="$CFLAGS $GLIB_CFLAGS"
1269++ LIBS="$GLIB_LIBS $LIBS"
1270++dnl
1271++dnl Now check if the installed GLIB is sufficiently new. (Also sanity
1272++dnl checks the results of pkg-config to some extent)
1273++dnl
1274++ rm -f conf.glibtest
1275++ AC_TRY_RUN([
1276++#include <glib.h>
1277++#include <stdio.h>
1278++#include <stdlib.h>
1279+
1280+-AC_DEFUN([AC_CHECK_CUTTER],
1281+-[
1282+- AC_ARG_WITH([cutter],
1283+- AS_HELP_STRING([--with-cutter],
1284+- [Use Cutter (default: auto)]),
1285+- [ac_cv_use_cutter=$withval],
1286+- [ac_cv_use_cutter=auto])
1287+- AC_CACHE_CHECK([whether to use Cutter],
1288+- [ac_cv_use_cutter], [ac_cv_use_cutter=auto])
1289+- if test "$ac_cv_use_cutter" != "no"; then
1290+- PKG_CHECK_MODULES(CUTTER, cutter $1, [], [ac_cv_use_cutter=no])
1291+- AC_SUBST([CUTTER_CFLAGS])
1292+- AC_SUBST([CUTTER_LIBS])
1293+- fi
1294++int
1295++main ()
1296++{
1297++ int major, minor, micro;
1298++ char *tmp_version;
1299++ int ignored;
1300+
1301+- if test "$ac_cv_use_cutter" != "no"; then
1302+- _PKG_CONFIG(CUTTER, variable=cutter, cutter)
1303+- CUTTER=$pkg_cv_CUTTER
1304+- AC_SUBST([CUTTER])
1305+- fi
1306+-])
1307++ ignored = system ("touch conf.glibtest");
1308+
1309+-AC_DEFUN([AC_CHECK_GCUTTER],
1310+-[
1311+- AC_CHECK_CUTTER($1)
1312+- ac_cv_use_gcutter=no
1313+- if test "$ac_cv_use_cutter" != "no"; then
1314+- PKG_CHECK_MODULES(GCUTTER, gcutter $1, [ac_cv_use_gcutter=yes], [:])
1315+- AC_SUBST([GCUTTER_CFLAGS])
1316+- AC_SUBST([GCUTTER_LIBS])
1317+- fi
1318+-])
1319++ /* HP/UX 9 (%@#!) writes to sscanf strings */
1320++ tmp_version = g_strdup("$min_glib_version");
1321++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
1322++ printf("%s, bad version string\n", "$min_glib_version");
1323++ exit(1);
1324++ }
1325+
1326+-AC_DEFUN([AC_CHECK_GDKCUTTER_PIXBUF],
1327+-[
1328+- AC_CHECK_GCUTTER($1)
1329+- ac_cv_use_gdkcutter_pixbuf=no
1330+- if test "$ac_cv_use_cutter" != "no"; then
1331+- PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1,
1332+- [ac_cv_use_gdkcutter_pixbuf=yes], [:])
1333+- AC_SUBST([GDKCUTTER_PIXBUF_CFLAGS])
1334+- AC_SUBST([GDKCUTTER_PIXBUF_LIBS])
1335++ if ((glib_major_version != $glib_config_major_version) ||
1336++ (glib_minor_version != $glib_config_minor_version) ||
1337++ (glib_micro_version != $glib_config_micro_version))
1338++ {
1339++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
1340++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
1341++ glib_major_version, glib_minor_version, glib_micro_version);
1342++ printf ("*** was found! If pkg-config was correct, then it is best\n");
1343++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
1344++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
1345++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
1346++ printf("*** required on your system.\n");
1347++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
1348++ printf("*** to point to the correct configuration files\n");
1349++ }
1350++ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
1351++ (glib_minor_version != GLIB_MINOR_VERSION) ||
1352++ (glib_micro_version != GLIB_MICRO_VERSION))
1353++ {
1354++ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
1355++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
1356++ printf("*** library (version %d.%d.%d)\n",
1357++ glib_major_version, glib_minor_version, glib_micro_version);
1358++ }
1359++ else
1360++ {
1361++ if ((glib_major_version > major) ||
1362++ ((glib_major_version == major) && (glib_minor_version > minor)) ||
1363++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
1364++ {
1365++ return 0;
1366++ }
1367++ else
1368++ {
1369++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
1370++ glib_major_version, glib_minor_version, glib_micro_version);
1371++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
1372++ major, minor, micro);
1373++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
1374++ printf("***\n");
1375++ printf("*** If you have already installed a sufficiently new version, this error\n");
1376++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
1377++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
1378++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
1379++ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
1380++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
1381++ printf("*** so that the correct libraries are found at run-time))\n");
1382++ }
1383++ }
1384++ return 1;
1385++}
1386++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
1387++ CFLAGS="$ac_save_CFLAGS"
1388++ LIBS="$ac_save_LIBS"
1389++ fi
1390+ fi
1391+-])
1392+-
1393+-AC_DEFUN([AC_CHECK_SOUPCUTTER],
1394+-[
1395+- AC_CHECK_GCUTTER($1)
1396+- ac_cv_use_soupcutter=no
1397+- if test "$ac_cv_use_cutter" != "no"; then
1398+- PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1,
1399+- [ac_cv_use_soupcutter=yes], [:])
1400+- AC_SUBST([SOUPCUTTER_CFLAGS])
1401+- AC_SUBST([SOUPCUTTER_LIBS])
1402++ if test "x$no_glib" = x ; then
1403++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
1404++ ifelse([$2], , :, [$2])
1405++ else
1406++ AC_MSG_RESULT(no)
1407++ if test "$PKG_CONFIG" = "no" ; then
1408++ echo "*** A new enough version of pkg-config was not found."
1409++ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
1410++ else
1411++ if test -f conf.glibtest ; then
1412++ :
1413++ else
1414++ echo "*** Could not run GLIB test program, checking why..."
1415++ ac_save_CFLAGS="$CFLAGS"
1416++ ac_save_LIBS="$LIBS"
1417++ CFLAGS="$CFLAGS $GLIB_CFLAGS"
1418++ LIBS="$LIBS $GLIB_LIBS"
1419++ AC_TRY_LINK([
1420++#include <glib.h>
1421++#include <stdio.h>
1422++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
1423++ [ echo "*** The test program compiled, but did not run. This usually means"
1424++ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
1425++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
1426++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
1427++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
1428++ echo "*** is required on your system"
1429++ echo "***"
1430++ echo "*** If you have an old version installed, it is best to remove it, although"
1431++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
1432++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
1433++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
1434++ CFLAGS="$ac_save_CFLAGS"
1435++ LIBS="$ac_save_LIBS"
1436++ fi
1437++ fi
1438++ GLIB_CFLAGS=""
1439++ GLIB_LIBS=""
1440++ GLIB_GENMARSHAL=""
1441++ GOBJECT_QUERY=""
1442++ GLIB_MKENUMS=""
1443++ ifelse([$3], , :, [$3])
1444+ fi
1445++ AC_SUBST(GLIB_CFLAGS)
1446++ AC_SUBST(GLIB_LIBS)
1447++ AC_SUBST(GLIB_GENMARSHAL)
1448++ AC_SUBST(GOBJECT_QUERY)
1449++ AC_SUBST(GLIB_MKENUMS)
1450++ rm -f conf.glibtest
1451+ ])
1452+
1453+ # Copyright (C) 1995-2002 Free Software Foundation, Inc.
1454+@@ -989,6 +1056,115 @@
1455+ # AC_DEFUN([AC_PROG_INTLTOOL], ...)
1456+
1457+
1458++dnl Autoconf macros for libgcrypt
1459++dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
1460++dnl
1461++dnl This file is free software; as a special exception the author gives
1462++dnl unlimited permission to copy and/or distribute it, with or without
1463++dnl modifications, as long as this notice is preserved.
1464++dnl
1465++dnl This file is distributed in the hope that it will be useful, but
1466++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
1467++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1468++
1469++
1470++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
1471++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
1472++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
1473++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
1474++dnl with the API version to also check the API compatibility. Example:
1475++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
1476++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
1477++dnl this features allows to prevent build against newer versions of libgcrypt
1478++dnl with a changed API.
1479++dnl
1480++AC_DEFUN([AM_PATH_LIBGCRYPT],
1481++[ AC_ARG_WITH(libgcrypt-prefix,
1482++ AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
1483++ [prefix where LIBGCRYPT is installed (optional)]),
1484++ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
1485++ if test x$libgcrypt_config_prefix != x ; then
1486++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then
1487++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
1488++ fi
1489++ fi
1490++
1491++ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
1492++ tmp=ifelse([$1], ,1:1.2.0,$1)
1493++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
1494++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
1495++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
1496++ else
1497++ req_libgcrypt_api=0
1498++ min_libgcrypt_version="$tmp"
1499++ fi
1500++
1501++ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
1502++ ok=no
1503++ if test "$LIBGCRYPT_CONFIG" != "no" ; then
1504++ req_major=`echo $min_libgcrypt_version | \
1505++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
1506++ req_minor=`echo $min_libgcrypt_version | \
1507++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
1508++ req_micro=`echo $min_libgcrypt_version | \
1509++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
1510++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
1511++ major=`echo $libgcrypt_config_version | \
1512++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
1513++ minor=`echo $libgcrypt_config_version | \
1514++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
1515++ micro=`echo $libgcrypt_config_version | \
1516++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
1517++ if test "$major" -gt "$req_major"; then
1518++ ok=yes
1519++ else
1520++ if test "$major" -eq "$req_major"; then
1521++ if test "$minor" -gt "$req_minor"; then
1522++ ok=yes
1523++ else
1524++ if test "$minor" -eq "$req_minor"; then
1525++ if test "$micro" -ge "$req_micro"; then
1526++ ok=yes
1527++ fi
1528++ fi
1529++ fi
1530++ fi
1531++ fi
1532++ fi
1533++ if test $ok = yes; then
1534++ AC_MSG_RESULT([yes ($libgcrypt_config_version)])
1535++ else
1536++ AC_MSG_RESULT(no)
1537++ fi
1538++ if test $ok = yes; then
1539++ # If we have a recent libgcrypt, we should also check that the
1540++ # API is compatible
1541++ if test "$req_libgcrypt_api" -gt 0 ; then
1542++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
1543++ if test "$tmp" -gt 0 ; then
1544++ AC_MSG_CHECKING([LIBGCRYPT API version])
1545++ if test "$req_libgcrypt_api" -eq "$tmp" ; then
1546++ AC_MSG_RESULT([okay])
1547++ else
1548++ ok=no
1549++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
1550++ fi
1551++ fi
1552++ fi
1553++ fi
1554++ if test $ok = yes; then
1555++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
1556++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
1557++ ifelse([$2], , :, [$2])
1558++ else
1559++ LIBGCRYPT_CFLAGS=""
1560++ LIBGCRYPT_LIBS=""
1561++ ifelse([$3], , :, [$3])
1562++ fi
1563++ AC_SUBST(LIBGCRYPT_CFLAGS)
1564++ AC_SUBST(LIBGCRYPT_LIBS)
1565++])
1566++
1567+ # nls.m4 serial 3 (gettext-0.15)
1568+ dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
1569+ dnl This file is free software; the Free Software Foundation
1570+diff -urNad kazehakase-0.5.8~/config.h.in kazehakase-0.5.8/config.h.in
1571+--- kazehakase-0.5.8~/config.h.in 2009-12-07 21:17:42.000000000 +0200
1572++++ kazehakase-0.5.8/config.h.in 2009-12-07 21:19:12.000000000 +0200
1573+@@ -24,9 +24,16 @@
1574+ /* Define if we have gecko 1.9 */
1575+ #undef HAVE_GECKO_1_9
1576+
1577++/* Define if we have gecko 1.9.1 */
1578++#undef HAVE_GECKO_1_9_1
1579++
1580+ /* Define if the GNU gettext() function is already present or preinstalled. */
1581+ #undef HAVE_GETTEXT
1582+
1583++/* Define to 1 if you have the `gtk_activatable_set_related_action' function.
1584++ */
1585++#undef HAVE_GTK_ACTIVATABLE_SET_RELATED_ACTION
1586++
1587+ /* Define to 1 if you have the <inttypes.h> header file. */
1588+ #undef HAVE_INTTYPES_H
1589+
1590+@@ -166,6 +173,28 @@
1591+ /* Define using GNU TLS */
1592+ #undef USE_SSL
1593+
1594++/* Enable extensions on AIX 3, Interix. */
1595++#ifndef _ALL_SOURCE
1596++# undef _ALL_SOURCE
1597++#endif
1598++/* Enable GNU extensions on systems that have them. */
1599++#ifndef _GNU_SOURCE
1600++# undef _GNU_SOURCE
1601++#endif
1602++/* Enable threading extensions on Solaris. */
1603++#ifndef _POSIX_PTHREAD_SEMANTICS
1604++# undef _POSIX_PTHREAD_SEMANTICS
1605++#endif
1606++/* Enable extensions on HP NonStop. */
1607++#ifndef _TANDEM_SOURCE
1608++# undef _TANDEM_SOURCE
1609++#endif
1610++/* Enable general extensions on Solaris. */
1611++#ifndef __EXTENSIONS__
1612++# undef __EXTENSIONS__
1613++#endif
1614++
1615++
1616+ /* Version number of package */
1617+ #undef VERSION
1618+
1619+@@ -187,5 +216,15 @@
1620+ /* Define to 1 if the X Window System is missing or not being used. */
1621+ #undef X_DISPLAY_MISSING
1622+
1623++/* Define to 1 if on MINIX. */
1624++#undef _MINIX
1625++
1626++/* Define to 2 if the system does not provide POSIX.1 features except with
1627++ this defined. */
1628++#undef _POSIX_1_SOURCE
1629++
1630++/* Define to 1 if you need to in order for `stat' and other things to work. */
1631++#undef _POSIX_SOURCE
1632++
1633+ /* Define to empty if `const' does not conform to ANSI C. */
1634+ #undef const
1635+diff -urNad kazehakase-0.5.8~/configure kazehakase-0.5.8/configure
1636+--- kazehakase-0.5.8~/configure 2009-12-07 21:17:42.000000000 +0200
1637++++ kazehakase-0.5.8/configure 2009-12-07 21:20:01.000000000 +0200
1638+@@ -1,10 +1,12 @@
1639+ #! /bin/sh
1640+ # Guess values for system-dependent variables and create Makefiles.
1641+-# Generated by GNU Autoconf 2.64 for kazehakase 0.5.8.
1642++# Generated by GNU Autoconf 2.65 for kazehakase 0.5.8.
1643++#
1644+ #
1645+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1646+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
1647+-# Foundation, Inc.
1648++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1649++# Inc.
1650++#
1651+ #
1652+ # This configure script is free software; the Free Software Foundation
1653+ # gives unlimited permission to copy, distribute and modify it.
1654+@@ -673,7 +675,8 @@
1655+
1656+
1657+
1658+-exec 7<&0 </dev/null 6>&1
1659++test -n "$DJDIR" || exec 7<&0 </dev/null
1660++exec 6>&1
1661+
1662+ # Name of the host.
1663+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
1664+@@ -752,21 +755,8 @@
1665+ AM_CFLAGS
1666+ AM_CPPFLAGS
1667+ KAZEHAKASE_CFLAGS
1668+-GENHTML_OPTIONS
1669+-COVERAGE_REPORT_DIR
1670+-COVERAGE_INFO_FILE
1671+-ENABLE_COVERAGE_FALSE
1672+-ENABLE_COVERAGE_TRUE
1673+-COVERAGE_CFLAGS
1674+-GENHTML
1675+-LCOV
1676+ WITH_CUTTER_FALSE
1677+ WITH_CUTTER_TRUE
1678+-GCUTTER_LIBS
1679+-GCUTTER_CFLAGS
1680+-CUTTER
1681+-CUTTER_LIBS
1682+-CUTTER_CFLAGS
1683+ HAVE_WINDRES_FALSE
1684+ HAVE_WINDRES_TRUE
1685+ WINDRES
1686+@@ -850,6 +840,9 @@
1687+ EGG_CFLAGS
1688+ ENABLE_SSL_FALSE
1689+ ENABLE_SSL_TRUE
1690++LIBGCRYPT_LIBS
1691++LIBGCRYPT_CFLAGS
1692++LIBGCRYPT_CONFIG
1693+ LIBGNUTLS_LIBS
1694+ LIBGNUTLS_CFLAGS
1695+ WITH_WEBKIT_GTK_FALSE
1696+@@ -868,10 +861,13 @@
1697+ DBUS_GLIB_CFLAGS
1698+ GIO_LIBS
1699+ GIO_CFLAGS
1700+-GLIB_MKENUMS
1701+-GLIB_GENMARSHAL
1702+ GTK_LIBS
1703+ GTK_CFLAGS
1704++GLIB_MKENUMS
1705++GOBJECT_QUERY
1706++GLIB_GENMARSHAL
1707++GLIB_LIBS
1708++GLIB_CFLAGS
1709+ HAVE_NSIBADCERTLISTENER_H_FALSE
1710+ HAVE_NSIBADCERTLISTENER_H_TRUE
1711+ HAVE_GECKO_1_9_FALSE
1712+@@ -908,7 +904,6 @@
1713+ LTCXXCOMPILE
1714+ LTCOMPILE
1715+ DOLT_BASH
1716+-CPP
1717+ OTOOL64
1718+ OTOOL
1719+ LIPO
1720+@@ -923,9 +918,14 @@
1721+ DUMPBIN
1722+ LD
1723+ FGREP
1724++SED
1725++LIBTOOL
1726++OBJDUMP
1727++DLLTOOL
1728++AS
1729+ EGREP
1730+ GREP
1731+-SED
1732++CPP
1733+ am__fastdepCC_FALSE
1734+ am__fastdepCC_TRUE
1735+ CCDEPMODE
1736+@@ -942,10 +942,6 @@
1737+ LDFLAGS
1738+ CFLAGS
1739+ CC
1740+-LIBTOOL
1741+-OBJDUMP
1742+-DLLTOOL
1743+-AS
1744+ PLATFORM_OSX_FALSE
1745+ PLATFORM_OSX_TRUE
1746+ PLATFORM_WIN32_FALSE
1747+@@ -1024,18 +1020,20 @@
1748+ ac_subst_files=''
1749+ ac_user_opts='
1750+ enable_option_checking
1751++enable_dependency_tracking
1752+ enable_shared
1753+ enable_static
1754+ with_pic
1755+ enable_fast_install
1756+-enable_dependency_tracking
1757+ with_gnu_ld
1758+ enable_libtool_lock
1759+ enable_cpp_rtti
1760+ with_gecko_engine
1761+ enable_gtkmozembed
1762++enable_glibtest
1763+ enable_gtktest
1764+ enable_ssl
1765++with_libgcrypt_prefix
1766+ with_x
1767+ enable_nls
1768+ enable_Werror
1769+@@ -1044,8 +1042,6 @@
1770+ with_rgettext
1771+ enable_heyper_estraier
1772+ enable_mingw_debug
1773+-with_cutter
1774+-enable_coverage
1775+ enable_shave
1776+ '
1777+ ac_precious_vars='build_alias
1778+@@ -1080,11 +1076,7 @@
1779+ EST_CFLAGS
1780+ EST_LIBS
1781+ ANTHY_CFLAGS
1782+-ANTHY_LIBS
1783+-CUTTER_CFLAGS
1784+-CUTTER_LIBS
1785+-GCUTTER_CFLAGS
1786+-GCUTTER_LIBS'
1787++ANTHY_LIBS'
1788+
1789+
1790+ # Initialize some variables set by options.
1791+@@ -1708,16 +1700,17 @@
1792+ --disable-option-checking ignore unrecognized --enable/--with options
1793+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1794+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1795++ --disable-dependency-tracking speeds up one-time build
1796++ --enable-dependency-tracking do not reject slow dependency extractors
1797+ --enable-shared[=PKGS] build shared libraries [default=yes]
1798+ --enable-static[=PKGS] build static libraries [default=no]
1799+ --enable-fast-install[=PKGS]
1800+ optimize for fast installation [default=yes]
1801+- --disable-dependency-tracking speeds up one-time build
1802+- --enable-dependency-tracking do not reject slow dependency extractors
1803+ --disable-libtool-lock avoid locking (might break parallel builds)
1804+ --enable-cpp-rtti Enable C++ RTTI (for cvs gcc)
1805+ --enable-gtkmozembed
1806+ Enable including GtkMozEmbed module
1807++ --disable-glibtest do not try to compile and run a test GLIB program
1808+ --disable-gtktest do not try to compile and run a test GTK+ program
1809+ --disable-ssl
1810+ Disable GNU TLS suport
1811+@@ -1729,8 +1722,7 @@
1812+ --disable-hyper-estraier
1813+ Disable Hyper Estraier support
1814+ --enable-mingw-debug Enable MinGW debug
1815+- --enable-coverage Enable coverage
1816+- --enable-shave use shave to make the build pretty [default=yes]
1817++ --enable-shave use shave to make the build pretty [[default=yes]]
1818+
1819+ Optional Packages:
1820+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1821+@@ -1741,10 +1733,11 @@
1822+ --with-gecko-engine[=mozilla|seamonkey|firefox|xulrunner]
1823+ Whether to use mozilla, firefox seamonkey xpcom
1824+ (default: mozilla)
1825++ --with-libgcrypt-prefix=PFX
1826++ prefix where LIBGCRYPT is installed (optional)
1827+ --with-x use the X Window System
1828+ --with-ruby=PATH Ruby interpreter path (default: auto-detect)
1829+ --with-rgettext=PATH rgettext path (default: auto-detect)
1830+- --with-cutter Use Cutter (default: auto)
1831+
1832+ Some influential environment variables:
1833+ CC C compiler command
1834+@@ -1752,7 +1745,7 @@
1835+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
1836+ nonstandard directory <lib dir>
1837+ LIBS libraries to pass to the linker, e.g. -l<library>
1838+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
1839++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1840+ you have headers in a nonstandard directory <include dir>
1841+ CPP C preprocessor
1842+ CXX C++ compiler command
1843+@@ -1791,13 +1784,6 @@
1844+ ANTHY_CFLAGS
1845+ C compiler flags for ANTHY, overriding pkg-config
1846+ ANTHY_LIBS linker flags for ANTHY, overriding pkg-config
1847+- CUTTER_CFLAGS
1848+- C compiler flags for CUTTER, overriding pkg-config
1849+- CUTTER_LIBS linker flags for CUTTER, overriding pkg-config
1850+- GCUTTER_CFLAGS
1851+- C compiler flags for GCUTTER, overriding pkg-config
1852+- GCUTTER_LIBS
1853+- linker flags for GCUTTER, overriding pkg-config
1854+
1855+ Use these variables to override the choices made by `configure' or to help
1856+ it to find libraries and programs with nonstandard names/locations.
1857+@@ -1866,7 +1852,7 @@
1858+ if $ac_init_version; then
1859+ cat <<\_ACEOF
1860+ kazehakase configure 0.5.8
1861+-generated by GNU Autoconf 2.64
1862++generated by GNU Autoconf 2.65
1863+
1864+ Copyright (C) 2009 Free Software Foundation, Inc.
1865+ This configure script is free software; the Free Software Foundation
1866+@@ -1913,25 +1899,24 @@
1867+ ac_retval=1
1868+ fi
1869+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1870+- return $ac_retval
1871++ as_fn_set_status $ac_retval
1872+
1873+ } # ac_fn_c_try_compile
1874+
1875+-# ac_fn_c_try_link LINENO
1876+-# -----------------------
1877+-# Try to link conftest.$ac_ext, and return whether this succeeded.
1878+-ac_fn_c_try_link ()
1879++# ac_fn_c_try_cpp LINENO
1880++# ----------------------
1881++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1882++ac_fn_c_try_cpp ()
1883+ {
1884+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1885+- rm -f conftest.$ac_objext conftest$ac_exeext
1886+- if { { ac_try="$ac_link"
1887++ if { { ac_try="$ac_cpp conftest.$ac_ext"
1888+ case "(($ac_try" in
1889+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1890+ *) ac_try_echo=$ac_try;;
1891+ esac
1892+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1893+ $as_echo "$ac_try_echo"; } >&5
1894+- (eval "$ac_link") 2>conftest.err
1895++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1896+ ac_status=$?
1897+ if test -s conftest.err; then
1898+ grep -v '^ *+' conftest.err >conftest.er1
1899+@@ -1939,97 +1924,108 @@
1900+ mv -f conftest.er1 conftest.err
1901+ fi
1902+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1903+- test $ac_status = 0; } && {
1904+- test -z "$ac_c_werror_flag" ||
1905++ test $ac_status = 0; } >/dev/null && {
1906++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1907+ test ! -s conftest.err
1908+- } && test -s conftest$ac_exeext && {
1909+- test "$cross_compiling" = yes ||
1910+- $as_test_x conftest$ac_exeext
1911+ }; then :
1912+ ac_retval=0
1913+ else
1914+ $as_echo "$as_me: failed program was:" >&5
1915+ sed 's/^/| /' conftest.$ac_ext >&5
1916+
1917+- ac_retval=1
1918++ ac_retval=1
1919+ fi
1920+- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
1921+- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
1922+- # interfere with the next link command; also delete a directory that is
1923+- # left behind by Apple's compiler. We do this before executing the actions.
1924+- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1925+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1926+- return $ac_retval
1927++ as_fn_set_status $ac_retval
1928+
1929+-} # ac_fn_c_try_link
1930++} # ac_fn_c_try_cpp
1931+
1932+-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
1933++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1934+ # -------------------------------------------------------
1935+-# Tests whether HEADER exists and can be compiled using the include files in
1936+-# INCLUDES, setting the cache variable VAR accordingly.
1937+-ac_fn_c_check_header_compile ()
1938++# Tests whether HEADER exists, giving a warning if it cannot be compiled using
1939++# the include files in INCLUDES and setting the cache variable VAR
1940++# accordingly.
1941++ac_fn_c_check_header_mongrel ()
1942+ {
1943+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1944++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1945+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1946+ $as_echo_n "checking for $2... " >&6; }
1947+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1948+ $as_echo_n "(cached) " >&6
1949++fi
1950++eval ac_res=\$$3
1951++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1952++$as_echo "$ac_res" >&6; }
1953+ else
1954+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1955++ # Is the header compilable?
1956++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
1957++$as_echo_n "checking $2 usability... " >&6; }
1958++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1959+ /* end confdefs.h. */
1960+ $4
1961+ #include <$2>
1962+ _ACEOF
1963+ if ac_fn_c_try_compile "$LINENO"; then :
1964+- eval "$3=yes"
1965++ ac_header_compiler=yes
1966+ else
1967+- eval "$3=no"
1968++ ac_header_compiler=no
1969+ fi
1970+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1971+-fi
1972+-eval ac_res=\$$3
1973+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1974+-$as_echo "$ac_res" >&6; }
1975+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1976++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
1977++$as_echo "$ac_header_compiler" >&6; }
1978+
1979+-} # ac_fn_c_check_header_compile
1980++# Is the header present?
1981++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
1982++$as_echo_n "checking $2 presence... " >&6; }
1983++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1984++/* end confdefs.h. */
1985++#include <$2>
1986++_ACEOF
1987++if ac_fn_c_try_cpp "$LINENO"; then :
1988++ ac_header_preproc=yes
1989++else
1990++ ac_header_preproc=no
1991++fi
1992++rm -f conftest.err conftest.$ac_ext
1993++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1994++$as_echo "$ac_header_preproc" >&6; }
1995+
1996+-# ac_fn_c_try_cpp LINENO
1997+-# ----------------------
1998+-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1999+-ac_fn_c_try_cpp ()
2000+-{
2001+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2002+- if { { ac_try="$ac_cpp conftest.$ac_ext"
2003+-case "(($ac_try" in
2004+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2005+- *) ac_try_echo=$ac_try;;
2006++# So? What about this header?
2007++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
2008++ yes:no: )
2009++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
2010++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
2011++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2012++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2013++ ;;
2014++ no:yes:* )
2015++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
2016++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
2017++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
2018++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
2019++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
2020++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2021++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
2022++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2023++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2024++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2025++ ;;
2026+ esac
2027+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2028+-$as_echo "$ac_try_echo"; } >&5
2029+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
2030+- ac_status=$?
2031+- if test -s conftest.err; then
2032+- grep -v '^ *+' conftest.err >conftest.er1
2033+- cat conftest.er1 >&5
2034+- mv -f conftest.er1 conftest.err
2035+- fi
2036+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2037+- test $ac_status = 0; } >/dev/null && {
2038+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2039+- test ! -s conftest.err
2040+- }; then :
2041+- ac_retval=0
2042++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2043++$as_echo_n "checking for $2... " >&6; }
2044++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2045++ $as_echo_n "(cached) " >&6
2046+ else
2047+- $as_echo "$as_me: failed program was:" >&5
2048+-sed 's/^/| /' conftest.$ac_ext >&5
2049+-
2050+- ac_retval=1
2051++ eval "$3=\$ac_header_compiler"
2052++fi
2053++eval ac_res=\$$3
2054++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2055++$as_echo "$ac_res" >&6; }
2056+ fi
2057+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2058+- return $ac_retval
2059+
2060+-} # ac_fn_c_try_cpp
2061++} # ac_fn_c_check_header_mongrel
2062+
2063+ # ac_fn_c_try_run LINENO
2064+ # ----------------------
2065+@@ -2069,10 +2065,87 @@
2066+ fi
2067+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2068+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2069+- return $ac_retval
2070++ as_fn_set_status $ac_retval
2071+
2072+ } # ac_fn_c_try_run
2073+
2074++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
2075++# -------------------------------------------------------
2076++# Tests whether HEADER exists and can be compiled using the include files in
2077++# INCLUDES, setting the cache variable VAR accordingly.
2078++ac_fn_c_check_header_compile ()
2079++{
2080++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2081++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2082++$as_echo_n "checking for $2... " >&6; }
2083++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2084++ $as_echo_n "(cached) " >&6
2085++else
2086++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2087++/* end confdefs.h. */
2088++$4
2089++#include <$2>
2090++_ACEOF
2091++if ac_fn_c_try_compile "$LINENO"; then :
2092++ eval "$3=yes"
2093++else
2094++ eval "$3=no"
2095++fi
2096++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2097++fi
2098++eval ac_res=\$$3
2099++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2100++$as_echo "$ac_res" >&6; }
2101++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2102++
2103++} # ac_fn_c_check_header_compile
2104++
2105++# ac_fn_c_try_link LINENO
2106++# -----------------------
2107++# Try to link conftest.$ac_ext, and return whether this succeeded.
2108++ac_fn_c_try_link ()
2109++{
2110++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2111++ rm -f conftest.$ac_objext conftest$ac_exeext
2112++ if { { ac_try="$ac_link"
2113++case "(($ac_try" in
2114++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2115++ *) ac_try_echo=$ac_try;;
2116++esac
2117++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2118++$as_echo "$ac_try_echo"; } >&5
2119++ (eval "$ac_link") 2>conftest.err
2120++ ac_status=$?
2121++ if test -s conftest.err; then
2122++ grep -v '^ *+' conftest.err >conftest.er1
2123++ cat conftest.er1 >&5
2124++ mv -f conftest.er1 conftest.err
2125++ fi
2126++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2127++ test $ac_status = 0; } && {
2128++ test -z "$ac_c_werror_flag" ||
2129++ test ! -s conftest.err
2130++ } && test -s conftest$ac_exeext && {
2131++ test "$cross_compiling" = yes ||
2132++ $as_test_x conftest$ac_exeext
2133++ }; then :
2134++ ac_retval=0
2135++else
2136++ $as_echo "$as_me: failed program was:" >&5
2137++sed 's/^/| /' conftest.$ac_ext >&5
2138++
2139++ ac_retval=1
2140++fi
2141++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
2142++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
2143++ # interfere with the next link command; also delete a directory that is
2144++ # left behind by Apple's compiler. We do this before executing the actions.
2145++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2146++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2147++ as_fn_set_status $ac_retval
2148++
2149++} # ac_fn_c_try_link
2150++
2151+ # ac_fn_c_check_func LINENO FUNC VAR
2152+ # ----------------------------------
2153+ # Tests whether FUNC exists, setting the cache variable VAR accordingly
2154+@@ -2174,7 +2247,7 @@
2155+ ac_retval=1
2156+ fi
2157+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2158+- return $ac_retval
2159++ as_fn_set_status $ac_retval
2160+
2161+ } # ac_fn_cxx_try_compile
2162+
2163+@@ -2211,7 +2284,7 @@
2164+ ac_retval=1
2165+ fi
2166+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2167+- return $ac_retval
2168++ as_fn_set_status $ac_retval
2169+
2170+ } # ac_fn_cxx_try_cpp
2171+
2172+@@ -2257,7 +2330,7 @@
2173+ # left behind by Apple's compiler. We do this before executing the actions.
2174+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2175+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2176+- return $ac_retval
2177++ as_fn_set_status $ac_retval
2178+
2179+ } # ac_fn_cxx_try_link
2180+
2181+@@ -2299,102 +2372,15 @@
2182+ fi
2183+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2184+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2185+- return $ac_retval
2186++ as_fn_set_status $ac_retval
2187+
2188+ } # ac_fn_cxx_try_run
2189+-
2190+-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
2191+-# -------------------------------------------------------
2192+-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
2193+-# the include files in INCLUDES and setting the cache variable VAR
2194+-# accordingly.
2195+-ac_fn_c_check_header_mongrel ()
2196+-{
2197+- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2198+- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2199+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2200+-$as_echo_n "checking for $2... " >&6; }
2201+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2202+- $as_echo_n "(cached) " >&6
2203+-fi
2204+-eval ac_res=\$$3
2205+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2206+-$as_echo "$ac_res" >&6; }
2207+-else
2208+- # Is the header compilable?
2209+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
2210+-$as_echo_n "checking $2 usability... " >&6; }
2211+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2212+-/* end confdefs.h. */
2213+-$4
2214+-#include <$2>
2215+-_ACEOF
2216+-if ac_fn_c_try_compile "$LINENO"; then :
2217+- ac_header_compiler=yes
2218+-else
2219+- ac_header_compiler=no
2220+-fi
2221+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2222+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
2223+-$as_echo "$ac_header_compiler" >&6; }
2224+-
2225+-# Is the header present?
2226+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
2227+-$as_echo_n "checking $2 presence... " >&6; }
2228+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2229+-/* end confdefs.h. */
2230+-#include <$2>
2231+-_ACEOF
2232+-if ac_fn_c_try_cpp "$LINENO"; then :
2233+- ac_header_preproc=yes
2234+-else
2235+- ac_header_preproc=no
2236+-fi
2237+-rm -f conftest.err conftest.$ac_ext
2238+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2239+-$as_echo "$ac_header_preproc" >&6; }
2240+-
2241+-# So? What about this header?
2242+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
2243+- yes:no: )
2244+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
2245+-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
2246+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2247+-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2248+- ;;
2249+- no:yes:* )
2250+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
2251+-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
2252+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
2253+-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
2254+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
2255+-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2256+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
2257+-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2258+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2259+-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2260+- ;;
2261+-esac
2262+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2263+-$as_echo_n "checking for $2... " >&6; }
2264+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2265+- $as_echo_n "(cached) " >&6
2266+-else
2267+- eval "$3=\$ac_header_compiler"
2268+-fi
2269+-eval ac_res=\$$3
2270+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2271+-$as_echo "$ac_res" >&6; }
2272+-fi
2273+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2274+-
2275+-} # ac_fn_c_check_header_mongrel
2276+ cat >config.log <<_ACEOF
2277+ This file contains any messages produced by compilers while
2278+ running configure, to aid debugging if configure makes a mistake.
2279+
2280+ It was created by kazehakase $as_me 0.5.8, which was
2281+-generated by GNU Autoconf 2.64. Invocation command line was
2282++generated by GNU Autoconf 2.65. Invocation command line was
2283+
2284+ $ $0 $@
2285+
2286+@@ -2647,7 +2633,7 @@
2287+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
2288+ do
2289+ test "x$ac_site_file" = xNONE && continue
2290+- if test -r "$ac_site_file"; then
2291++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
2292+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2293+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
2294+ sed 's/^/| /' "$ac_site_file" >&5
2295+@@ -2656,9 +2642,9 @@
2296+ done
2297+
2298+ if test -r "$cache_file"; then
2299+- # Some versions of bash will fail to source /dev/null (special
2300+- # files actually), so we avoid doing that.
2301+- if test -f "$cache_file"; then
2302++ # Some versions of bash will fail to source /dev/null (special files
2303++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
2304++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
2305+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
2306+ $as_echo "$as_me: loading cache $cache_file" >&6;}
2307+ case $cache_file in
2308+@@ -2740,6 +2726,7 @@
2309+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
2310+
2311+
2312++## The variable pkglibexecdir was introduced in Automake 1.11.
2313+ am__api_version='1.11'
2314+
2315+ ac_aux_dir=
2316+@@ -3077,6 +3064,7 @@
2317+
2318+ fi
2319+
2320++ test -d ./--version && rmdir ./--version
2321+ if test "${ac_cv_path_mkdir+set}" = set; then
2322+ MKDIR_P="$ac_cv_path_mkdir -p"
2323+ else
2324+@@ -3084,7 +3072,6 @@
2325+ # value for MKDIR_P within a source directory, because that will
2326+ # break other packages using the cache if that directory is
2327+ # removed, or if the value is a relative name.
2328+- test -d ./--version && rmdir ./--version
2329+ MKDIR_P="$ac_install_sh -d"
2330+ fi
2331+ fi
2332+@@ -3370,397 +3357,6 @@
2333+ fi
2334+
2335+
2336+-# Check whether --enable-shared was given.
2337+-if test "${enable_shared+set}" = set; then :
2338+- enableval=$enable_shared; p=${PACKAGE-default}
2339+- case $enableval in
2340+- yes) enable_shared=yes ;;
2341+- no) enable_shared=no ;;
2342+- *)
2343+- enable_shared=no
2344+- # Look at the argument we got. We use all the common list separators.
2345+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
2346+- for pkg in $enableval; do
2347+- IFS="$lt_save_ifs"
2348+- if test "X$pkg" = "X$p"; then
2349+- enable_shared=yes
2350+- fi
2351+- done
2352+- IFS="$lt_save_ifs"
2353+- ;;
2354+- esac
2355+-else
2356+- enable_shared=yes
2357+-fi
2358+-
2359+-
2360+-
2361+-
2362+-
2363+-
2364+-
2365+-
2366+-
2367+-# Check whether --enable-static was given.
2368+-if test "${enable_static+set}" = set; then :
2369+- enableval=$enable_static; p=${PACKAGE-default}
2370+- case $enableval in
2371+- yes) enable_static=yes ;;
2372+- no) enable_static=no ;;
2373+- *)
2374+- enable_static=no
2375+- # Look at the argument we got. We use all the common list separators.
2376+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
2377+- for pkg in $enableval; do
2378+- IFS="$lt_save_ifs"
2379+- if test "X$pkg" = "X$p"; then
2380+- enable_static=yes
2381+- fi
2382+- done
2383+- IFS="$lt_save_ifs"
2384+- ;;
2385+- esac
2386+-else
2387+- enable_static=no
2388+-fi
2389+-
2390+-
2391+-
2392+-
2393+-
2394+-
2395+-
2396+-
2397+-
2398+-
2399+-enable_win32_dll=yes
2400+-
2401+-case $host in
2402+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
2403+- if test -n "$ac_tool_prefix"; then
2404+- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
2405+-set dummy ${ac_tool_prefix}as; ac_word=$2
2406+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2407+-$as_echo_n "checking for $ac_word... " >&6; }
2408+-if test "${ac_cv_prog_AS+set}" = set; then :
2409+- $as_echo_n "(cached) " >&6
2410+-else
2411+- if test -n "$AS"; then
2412+- ac_cv_prog_AS="$AS" # Let the user override the test.
2413+-else
2414+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2415+-for as_dir in $PATH
2416+-do
2417+- IFS=$as_save_IFS
2418+- test -z "$as_dir" && as_dir=.
2419+- for ac_exec_ext in '' $ac_executable_extensions; do
2420+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2421+- ac_cv_prog_AS="${ac_tool_prefix}as"
2422+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2423+- break 2
2424+- fi
2425+-done
2426+- done
2427+-IFS=$as_save_IFS
2428+-
2429+-fi
2430+-fi
2431+-AS=$ac_cv_prog_AS
2432+-if test -n "$AS"; then
2433+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
2434+-$as_echo "$AS" >&6; }
2435+-else
2436+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2437+-$as_echo "no" >&6; }
2438+-fi
2439+-
2440+-
2441+-fi
2442+-if test -z "$ac_cv_prog_AS"; then
2443+- ac_ct_AS=$AS
2444+- # Extract the first word of "as", so it can be a program name with args.
2445+-set dummy as; ac_word=$2
2446+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2447+-$as_echo_n "checking for $ac_word... " >&6; }
2448+-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
2449+- $as_echo_n "(cached) " >&6
2450+-else
2451+- if test -n "$ac_ct_AS"; then
2452+- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
2453+-else
2454+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2455+-for as_dir in $PATH
2456+-do
2457+- IFS=$as_save_IFS
2458+- test -z "$as_dir" && as_dir=.
2459+- for ac_exec_ext in '' $ac_executable_extensions; do
2460+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2461+- ac_cv_prog_ac_ct_AS="as"
2462+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2463+- break 2
2464+- fi
2465+-done
2466+- done
2467+-IFS=$as_save_IFS
2468+-
2469+-fi
2470+-fi
2471+-ac_ct_AS=$ac_cv_prog_ac_ct_AS
2472+-if test -n "$ac_ct_AS"; then
2473+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
2474+-$as_echo "$ac_ct_AS" >&6; }
2475+-else
2476+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2477+-$as_echo "no" >&6; }
2478+-fi
2479+-
2480+- if test "x$ac_ct_AS" = x; then
2481+- AS="false"
2482+- else
2483+- case $cross_compiling:$ac_tool_warned in
2484+-yes:)
2485+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2486+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2487+-ac_tool_warned=yes ;;
2488+-esac
2489+- AS=$ac_ct_AS
2490+- fi
2491+-else
2492+- AS="$ac_cv_prog_AS"
2493+-fi
2494+-
2495+- if test -n "$ac_tool_prefix"; then
2496+- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2497+-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2498+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2499+-$as_echo_n "checking for $ac_word... " >&6; }
2500+-if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
2501+- $as_echo_n "(cached) " >&6
2502+-else
2503+- if test -n "$DLLTOOL"; then
2504+- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2505+-else
2506+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2507+-for as_dir in $PATH
2508+-do
2509+- IFS=$as_save_IFS
2510+- test -z "$as_dir" && as_dir=.
2511+- for ac_exec_ext in '' $ac_executable_extensions; do
2512+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2513+- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2514+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2515+- break 2
2516+- fi
2517+-done
2518+- done
2519+-IFS=$as_save_IFS
2520+-
2521+-fi
2522+-fi
2523+-DLLTOOL=$ac_cv_prog_DLLTOOL
2524+-if test -n "$DLLTOOL"; then
2525+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2526+-$as_echo "$DLLTOOL" >&6; }
2527+-else
2528+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2529+-$as_echo "no" >&6; }
2530+-fi
2531+-
2532+-
2533+-fi
2534+-if test -z "$ac_cv_prog_DLLTOOL"; then
2535+- ac_ct_DLLTOOL=$DLLTOOL
2536+- # Extract the first word of "dlltool", so it can be a program name with args.
2537+-set dummy dlltool; ac_word=$2
2538+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2539+-$as_echo_n "checking for $ac_word... " >&6; }
2540+-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
2541+- $as_echo_n "(cached) " >&6
2542+-else
2543+- if test -n "$ac_ct_DLLTOOL"; then
2544+- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2545+-else
2546+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2547+-for as_dir in $PATH
2548+-do
2549+- IFS=$as_save_IFS
2550+- test -z "$as_dir" && as_dir=.
2551+- for ac_exec_ext in '' $ac_executable_extensions; do
2552+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2553+- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2554+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2555+- break 2
2556+- fi
2557+-done
2558+- done
2559+-IFS=$as_save_IFS
2560+-
2561+-fi
2562+-fi
2563+-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2564+-if test -n "$ac_ct_DLLTOOL"; then
2565+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2566+-$as_echo "$ac_ct_DLLTOOL" >&6; }
2567+-else
2568+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2569+-$as_echo "no" >&6; }
2570+-fi
2571+-
2572+- if test "x$ac_ct_DLLTOOL" = x; then
2573+- DLLTOOL="false"
2574+- else
2575+- case $cross_compiling:$ac_tool_warned in
2576+-yes:)
2577+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2578+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2579+-ac_tool_warned=yes ;;
2580+-esac
2581+- DLLTOOL=$ac_ct_DLLTOOL
2582+- fi
2583+-else
2584+- DLLTOOL="$ac_cv_prog_DLLTOOL"
2585+-fi
2586+-
2587+- if test -n "$ac_tool_prefix"; then
2588+- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
2589+-set dummy ${ac_tool_prefix}objdump; ac_word=$2
2590+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2591+-$as_echo_n "checking for $ac_word... " >&6; }
2592+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
2593+- $as_echo_n "(cached) " >&6
2594+-else
2595+- if test -n "$OBJDUMP"; then
2596+- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
2597+-else
2598+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2599+-for as_dir in $PATH
2600+-do
2601+- IFS=$as_save_IFS
2602+- test -z "$as_dir" && as_dir=.
2603+- for ac_exec_ext in '' $ac_executable_extensions; do
2604+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2605+- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
2606+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2607+- break 2
2608+- fi
2609+-done
2610+- done
2611+-IFS=$as_save_IFS
2612+-
2613+-fi
2614+-fi
2615+-OBJDUMP=$ac_cv_prog_OBJDUMP
2616+-if test -n "$OBJDUMP"; then
2617+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
2618+-$as_echo "$OBJDUMP" >&6; }
2619+-else
2620+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2621+-$as_echo "no" >&6; }
2622+-fi
2623+-
2624+-
2625+-fi
2626+-if test -z "$ac_cv_prog_OBJDUMP"; then
2627+- ac_ct_OBJDUMP=$OBJDUMP
2628+- # Extract the first word of "objdump", so it can be a program name with args.
2629+-set dummy objdump; ac_word=$2
2630+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2631+-$as_echo_n "checking for $ac_word... " >&6; }
2632+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
2633+- $as_echo_n "(cached) " >&6
2634+-else
2635+- if test -n "$ac_ct_OBJDUMP"; then
2636+- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
2637+-else
2638+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2639+-for as_dir in $PATH
2640+-do
2641+- IFS=$as_save_IFS
2642+- test -z "$as_dir" && as_dir=.
2643+- for ac_exec_ext in '' $ac_executable_extensions; do
2644+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2645+- ac_cv_prog_ac_ct_OBJDUMP="objdump"
2646+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2647+- break 2
2648+- fi
2649+-done
2650+- done
2651+-IFS=$as_save_IFS
2652+-
2653+-fi
2654+-fi
2655+-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
2656+-if test -n "$ac_ct_OBJDUMP"; then
2657+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
2658+-$as_echo "$ac_ct_OBJDUMP" >&6; }
2659+-else
2660+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2661+-$as_echo "no" >&6; }
2662+-fi
2663+-
2664+- if test "x$ac_ct_OBJDUMP" = x; then
2665+- OBJDUMP="false"
2666+- else
2667+- case $cross_compiling:$ac_tool_warned in
2668+-yes:)
2669+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2670+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2671+-ac_tool_warned=yes ;;
2672+-esac
2673+- OBJDUMP=$ac_ct_OBJDUMP
2674+- fi
2675+-else
2676+- OBJDUMP="$ac_cv_prog_OBJDUMP"
2677+-fi
2678+-
2679+- ;;
2680+-esac
2681+-
2682+-test -z "$AS" && AS=as
2683+-
2684+-
2685+-
2686+-
2687+-
2688+-test -z "$DLLTOOL" && DLLTOOL=dlltool
2689+-
2690+-
2691+-
2692+-
2693+-
2694+-test -z "$OBJDUMP" && OBJDUMP=objdump
2695+-
2696+-
2697+-
2698+-
2699+-
2700+-
2701+-
2702+-case `pwd` in
2703+- *\ * | *\ *)
2704+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
2705+-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
2706+-esac
2707+-
2708+-
2709+-
2710+-macro_version='2.2.6'
2711+-macro_revision='1.3012'
2712+-
2713+-
2714+-
2715+-
2716+-
2717+-
2718+-
2719+-
2720+-
2721+-
2722+-
2723+-
2724+-
2725+-ltmain="$ac_aux_dir/ltmain.sh"
2726+-
2727+ DEPDIR="${am__leading_dot}deps"
2728+
2729+ ac_config_commands="$ac_config_commands depfiles"
2730+@@ -4145,32 +3741,30 @@
2731+ ... rest of stderr output deleted ...
2732+ 10q' conftest.err >conftest.er1
2733+ cat conftest.er1 >&5
2734+- rm -f conftest.er1 conftest.err
2735+ fi
2736++ rm -f conftest.er1 conftest.err
2737+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2738+ test $ac_status = 0; }
2739+ done
2740+
2741+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2742+ /* end confdefs.h. */
2743+-#include <stdio.h>
2744++
2745+ int
2746+ main ()
2747+ {
2748+-FILE *f = fopen ("conftest.out", "w");
2749+- return ferror (f) || fclose (f) != 0;
2750+
2751+ ;
2752+ return 0;
2753+ }
2754+ _ACEOF
2755+ ac_clean_files_save=$ac_clean_files
2756+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
2757++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
2758+ # Try to create an executable without -o first, disregard a.out.
2759+ # It will help us diagnose broken compilers, and finding out an intuition
2760+ # of exeext.
2761+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
2762+-$as_echo_n "checking for C compiler default output file name... " >&6; }
2763++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
2764++$as_echo_n "checking whether the C compiler works... " >&6; }
2765+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2766+
2767+ # The possible output files:
2768+@@ -4232,10 +3826,10 @@
2769+ else
2770+ ac_file=''
2771+ fi
2772+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
2773+-$as_echo "$ac_file" >&6; }
2774+ if test -z "$ac_file"; then :
2775+- $as_echo "$as_me: failed program was:" >&5
2776++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2777++$as_echo "no" >&6; }
2778++$as_echo "$as_me: failed program was:" >&5
2779+ sed 's/^/| /' conftest.$ac_ext >&5
2780+
2781+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2782+@@ -4243,51 +3837,18 @@
2783+ { as_fn_set_status 77
2784+ as_fn_error "C compiler cannot create executables
2785+ See \`config.log' for more details." "$LINENO" 5; }; }
2786++else
2787++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2788++$as_echo "yes" >&6; }
2789+ fi
2790++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
2791++$as_echo_n "checking for C compiler default output file name... " >&6; }
2792++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
2793++$as_echo "$ac_file" >&6; }
2794+ ac_exeext=$ac_cv_exeext
2795+
2796+-# Check that the compiler produces executables we can run. If not, either
2797+-# the compiler is broken, or we cross compile.
2798+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
2799+-$as_echo_n "checking whether the C compiler works... " >&6; }
2800+-# If not cross compiling, check that we can run a simple program.
2801+-if test "$cross_compiling" != yes; then
2802+- if { ac_try='./$ac_file'
2803+- { { case "(($ac_try" in
2804+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2805+- *) ac_try_echo=$ac_try;;
2806+-esac
2807+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2808+-$as_echo "$ac_try_echo"; } >&5
2809+- (eval "$ac_try") 2>&5
2810+- ac_status=$?
2811+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2812+- test $ac_status = 0; }; }; then
2813+- cross_compiling=no
2814+- else
2815+- if test "$cross_compiling" = maybe; then
2816+- cross_compiling=yes
2817+- else
2818+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2819+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2820+-as_fn_error "cannot run C compiled programs.
2821+-If you meant to cross compile, use \`--host'.
2822+-See \`config.log' for more details." "$LINENO" 5; }
2823+- fi
2824+- fi
2825+-fi
2826+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2827+-$as_echo "yes" >&6; }
2828+-
2829+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
2830++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
2831+ ac_clean_files=$ac_clean_files_save
2832+-# Check that the compiler produces executables we can run. If not, either
2833+-# the compiler is broken, or we cross compile.
2834+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
2835+-$as_echo_n "checking whether we are cross compiling... " >&6; }
2836+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
2837+-$as_echo "$cross_compiling" >&6; }
2838+-
2839+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
2840+ $as_echo_n "checking for suffix of executables... " >&6; }
2841+ if { { ac_try="$ac_link"
2842+@@ -4320,13 +3881,72 @@
2843+ as_fn_error "cannot compute suffix of executables: cannot compile and link
2844+ See \`config.log' for more details." "$LINENO" 5; }
2845+ fi
2846+-rm -f conftest$ac_cv_exeext
2847++rm -f conftest conftest$ac_cv_exeext
2848+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
2849+ $as_echo "$ac_cv_exeext" >&6; }
2850+
2851+ rm -f conftest.$ac_ext
2852+ EXEEXT=$ac_cv_exeext
2853+ ac_exeext=$EXEEXT
2854++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2855++/* end confdefs.h. */
2856++#include <stdio.h>
2857++int
2858++main ()
2859++{
2860++FILE *f = fopen ("conftest.out", "w");
2861++ return ferror (f) || fclose (f) != 0;
2862++
2863++ ;
2864++ return 0;
2865++}
2866++_ACEOF
2867++ac_clean_files="$ac_clean_files conftest.out"
2868++# Check that the compiler produces executables we can run. If not, either
2869++# the compiler is broken, or we cross compile.
2870++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
2871++$as_echo_n "checking whether we are cross compiling... " >&6; }
2872++if test "$cross_compiling" != yes; then
2873++ { { ac_try="$ac_link"
2874++case "(($ac_try" in
2875++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2876++ *) ac_try_echo=$ac_try;;
2877++esac
2878++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2879++$as_echo "$ac_try_echo"; } >&5
2880++ (eval "$ac_link") 2>&5
2881++ ac_status=$?
2882++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2883++ test $ac_status = 0; }
2884++ if { ac_try='./conftest$ac_cv_exeext'
2885++ { { case "(($ac_try" in
2886++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2887++ *) ac_try_echo=$ac_try;;
2888++esac
2889++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2890++$as_echo "$ac_try_echo"; } >&5
2891++ (eval "$ac_try") 2>&5
2892++ ac_status=$?
2893++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2894++ test $ac_status = 0; }; }; then
2895++ cross_compiling=no
2896++ else
2897++ if test "$cross_compiling" = maybe; then
2898++ cross_compiling=yes
2899++ else
2900++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2901++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2902++as_fn_error "cannot run C compiled programs.
2903++If you meant to cross compile, use \`--host'.
2904++See \`config.log' for more details." "$LINENO" 5; }
2905++ fi
2906++ fi
2907++fi
2908++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
2909++$as_echo "$cross_compiling" >&6; }
2910++
2911++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
2912++ac_clean_files=$ac_clean_files_save
2913+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
2914+ $as_echo_n "checking for suffix of object files... " >&6; }
2915+ if test "${ac_cv_objext+set}" = set; then :
2916+@@ -4717,86 +4337,143 @@
2917+ fi
2918+
2919+
2920+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
2921+-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
2922+-if test "${ac_cv_path_SED+set}" = set; then :
2923++
2924++ac_ext=c
2925++ac_cpp='$CPP $CPPFLAGS'
2926++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2927++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2928++ac_compiler_gnu=$ac_cv_c_compiler_gnu
2929++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
2930++$as_echo_n "checking how to run the C preprocessor... " >&6; }
2931++# On Suns, sometimes $CPP names a directory.
2932++if test -n "$CPP" && test -d "$CPP"; then
2933++ CPP=
2934++fi
2935++if test -z "$CPP"; then
2936++ if test "${ac_cv_prog_CPP+set}" = set; then :
2937+ $as_echo_n "(cached) " >&6
2938+ else
2939+- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
2940+- for ac_i in 1 2 3 4 5 6 7; do
2941+- ac_script="$ac_script$as_nl$ac_script"
2942+- done
2943+- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
2944+- { ac_script=; unset ac_script;}
2945+- if test -z "$SED"; then
2946+- ac_path_SED_found=false
2947+- # Loop through the user's path and test for each of PROGNAME-LIST
2948+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2949+-for as_dir in $PATH
2950++ # Double quotes because CPP needs to be expanded
2951++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
2952++ do
2953++ ac_preproc_ok=false
2954++for ac_c_preproc_warn_flag in '' yes
2955+ do
2956+- IFS=$as_save_IFS
2957+- test -z "$as_dir" && as_dir=.
2958+- for ac_prog in sed gsed; do
2959+- for ac_exec_ext in '' $ac_executable_extensions; do
2960+- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
2961+- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
2962+-# Check for GNU ac_path_SED and select it if it is found.
2963+- # Check for GNU $ac_path_SED
2964+-case `"$ac_path_SED" --version 2>&1` in
2965+-*GNU*)
2966+- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
2967+-*)
2968+- ac_count=0
2969+- $as_echo_n 0123456789 >"conftest.in"
2970+- while :
2971+- do
2972+- cat "conftest.in" "conftest.in" >"conftest.tmp"
2973+- mv "conftest.tmp" "conftest.in"
2974+- cp "conftest.in" "conftest.nl"
2975+- $as_echo '' >> "conftest.nl"
2976+- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
2977+- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
2978+- as_fn_arith $ac_count + 1 && ac_count=$as_val
2979+- if test $ac_count -gt ${ac_path_SED_max-0}; then
2980+- # Best one so far, save it but keep looking for a better one
2981+- ac_cv_path_SED="$ac_path_SED"
2982+- ac_path_SED_max=$ac_count
2983+- fi
2984+- # 10*(2^10) chars as input seems more than enough
2985+- test $ac_count -gt 10 && break
2986+- done
2987+- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
2988+-esac
2989++ # Use a header file that comes with gcc, so configuring glibc
2990++ # with a fresh cross-compiler works.
2991++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
2992++ # <limits.h> exists even on freestanding compilers.
2993++ # On the NeXT, cc -E runs the code through the compiler's parser,
2994++ # not just through cpp. "Syntax error" is here to catch this case.
2995++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2996++/* end confdefs.h. */
2997++#ifdef __STDC__
2998++# include <limits.h>
2999++#else
3000++# include <assert.h>
3001++#endif
3002++ Syntax error
3003++_ACEOF
3004++if ac_fn_c_try_cpp "$LINENO"; then :
3005+
3006+- $ac_path_SED_found && break 3
3007+- done
3008+- done
3009+- done
3010+-IFS=$as_save_IFS
3011+- if test -z "$ac_cv_path_SED"; then
3012+- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
3013+- fi
3014+ else
3015+- ac_cv_path_SED=$SED
3016++ # Broken: fails on valid input.
3017++continue
3018+ fi
3019++rm -f conftest.err conftest.$ac_ext
3020+
3021++ # OK, works on sane cases. Now check whether nonexistent headers
3022++ # can be detected and how.
3023++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3024++/* end confdefs.h. */
3025++#include <ac_nonexistent.h>
3026++_ACEOF
3027++if ac_fn_c_try_cpp "$LINENO"; then :
3028++ # Broken: success on invalid input.
3029++continue
3030++else
3031++ # Passes both tests.
3032++ac_preproc_ok=:
3033++break
3034+ fi
3035+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
3036+-$as_echo "$ac_cv_path_SED" >&6; }
3037+- SED="$ac_cv_path_SED"
3038+- rm -f conftest.sed
3039+-
3040+-test -z "$SED" && SED=sed
3041+-Xsed="$SED -e 1s/^X//"
3042+-
3043++rm -f conftest.err conftest.$ac_ext
3044+
3045++done
3046++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
3047++rm -f conftest.err conftest.$ac_ext
3048++if $ac_preproc_ok; then :
3049++ break
3050++fi
3051+
3052++ done
3053++ ac_cv_prog_CPP=$CPP
3054+
3055++fi
3056++ CPP=$ac_cv_prog_CPP
3057++else
3058++ ac_cv_prog_CPP=$CPP
3059++fi
3060++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
3061++$as_echo "$CPP" >&6; }
3062++ac_preproc_ok=false
3063++for ac_c_preproc_warn_flag in '' yes
3064++do
3065++ # Use a header file that comes with gcc, so configuring glibc
3066++ # with a fresh cross-compiler works.
3067++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3068++ # <limits.h> exists even on freestanding compilers.
3069++ # On the NeXT, cc -E runs the code through the compiler's parser,
3070++ # not just through cpp. "Syntax error" is here to catch this case.
3071++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3072++/* end confdefs.h. */
3073++#ifdef __STDC__
3074++# include <limits.h>
3075++#else
3076++# include <assert.h>
3077++#endif
3078++ Syntax error
3079++_ACEOF
3080++if ac_fn_c_try_cpp "$LINENO"; then :
3081+
3082++else
3083++ # Broken: fails on valid input.
3084++continue
3085++fi
3086++rm -f conftest.err conftest.$ac_ext
3087+
3088++ # OK, works on sane cases. Now check whether nonexistent headers
3089++ # can be detected and how.
3090++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3091++/* end confdefs.h. */
3092++#include <ac_nonexistent.h>
3093++_ACEOF
3094++if ac_fn_c_try_cpp "$LINENO"; then :
3095++ # Broken: success on invalid input.
3096++continue
3097++else
3098++ # Passes both tests.
3099++ac_preproc_ok=:
3100++break
3101++fi
3102++rm -f conftest.err conftest.$ac_ext
3103+
3104++done
3105++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
3106++rm -f conftest.err conftest.$ac_ext
3107++if $ac_preproc_ok; then :
3108+
3109++else
3110++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3111++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3112++as_fn_error "C preprocessor \"$CPP\" fails sanity check
3113++See \`config.log' for more details." "$LINENO" 5; }
3114++fi
3115+
3116++ac_ext=c
3117++ac_cpp='$CPP $CPPFLAGS'
3118++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3119++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3120++ac_compiler_gnu=$ac_cv_c_compiler_gnu
3121+
3122+
3123+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
3124+@@ -4929,6 +4606,671 @@
3125+ EGREP="$ac_cv_path_EGREP"
3126+
3127+
3128++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
3129++$as_echo_n "checking for ANSI C header files... " >&6; }
3130++if test "${ac_cv_header_stdc+set}" = set; then :
3131++ $as_echo_n "(cached) " >&6
3132++else
3133++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3134++/* end confdefs.h. */
3135++#include <stdlib.h>
3136++#include <stdarg.h>
3137++#include <string.h>
3138++#include <float.h>
3139++
3140++int
3141++main ()
3142++{
3143++
3144++ ;
3145++ return 0;
3146++}
3147++_ACEOF
3148++if ac_fn_c_try_compile "$LINENO"; then :
3149++ ac_cv_header_stdc=yes
3150++else
3151++ ac_cv_header_stdc=no
3152++fi
3153++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3154++
3155++if test $ac_cv_header_stdc = yes; then
3156++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3157++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3158++/* end confdefs.h. */
3159++#include <string.h>
3160++
3161++_ACEOF
3162++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3163++ $EGREP "memchr" >/dev/null 2>&1; then :
3164++
3165++else
3166++ ac_cv_header_stdc=no
3167++fi
3168++rm -f conftest*
3169++
3170++fi
3171++
3172++if test $ac_cv_header_stdc = yes; then
3173++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3174++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3175++/* end confdefs.h. */
3176++#include <stdlib.h>
3177++
3178++_ACEOF
3179++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3180++ $EGREP "free" >/dev/null 2>&1; then :
3181++
3182++else
3183++ ac_cv_header_stdc=no
3184++fi
3185++rm -f conftest*
3186++
3187++fi
3188++
3189++if test $ac_cv_header_stdc = yes; then
3190++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
3191++ if test "$cross_compiling" = yes; then :
3192++ :
3193++else
3194++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3195++/* end confdefs.h. */
3196++#include <ctype.h>
3197++#include <stdlib.h>
3198++#if ((' ' & 0x0FF) == 0x020)
3199++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
3200++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
3201++#else
3202++# define ISLOWER(c) \
3203++ (('a' <= (c) && (c) <= 'i') \
3204++ || ('j' <= (c) && (c) <= 'r') \
3205++ || ('s' <= (c) && (c) <= 'z'))
3206++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
3207++#endif
3208++
3209++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
3210++int
3211++main ()
3212++{
3213++ int i;
3214++ for (i = 0; i < 256; i++)
3215++ if (XOR (islower (i), ISLOWER (i))
3216++ || toupper (i) != TOUPPER (i))
3217++ return 2;
3218++ return 0;
3219++}
3220++_ACEOF
3221++if ac_fn_c_try_run "$LINENO"; then :
3222++
3223++else
3224++ ac_cv_header_stdc=no
3225++fi
3226++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
3227++ conftest.$ac_objext conftest.beam conftest.$ac_ext
3228++fi
3229++
3230++fi
3231++fi
3232++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
3233++$as_echo "$ac_cv_header_stdc" >&6; }
3234++if test $ac_cv_header_stdc = yes; then
3235++
3236++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
3237++
3238++fi
3239++
3240++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
3241++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
3242++ inttypes.h stdint.h unistd.h
3243++do :
3244++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3245++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
3246++"
3247++eval as_val=\$$as_ac_Header
3248++ if test "x$as_val" = x""yes; then :
3249++ cat >>confdefs.h <<_ACEOF
3250++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3251++_ACEOF
3252++
3253++fi
3254++
3255++done
3256++
3257++
3258++
3259++ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
3260++if test "x$ac_cv_header_minix_config_h" = x""yes; then :
3261++ MINIX=yes
3262++else
3263++ MINIX=
3264++fi
3265++
3266++
3267++ if test "$MINIX" = yes; then
3268++
3269++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
3270++
3271++
3272++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
3273++
3274++
3275++$as_echo "#define _MINIX 1" >>confdefs.h
3276++
3277++ fi
3278++
3279++
3280++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
3281++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
3282++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
3283++ $as_echo_n "(cached) " >&6
3284++else
3285++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3286++/* end confdefs.h. */
3287++
3288++# define __EXTENSIONS__ 1
3289++ $ac_includes_default
3290++int
3291++main ()
3292++{
3293++
3294++ ;
3295++ return 0;
3296++}
3297++_ACEOF
3298++if ac_fn_c_try_compile "$LINENO"; then :
3299++ ac_cv_safe_to_define___extensions__=yes
3300++else
3301++ ac_cv_safe_to_define___extensions__=no
3302++fi
3303++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3304++fi
3305++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
3306++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
3307++ test $ac_cv_safe_to_define___extensions__ = yes &&
3308++ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
3309++
3310++ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
3311++
3312++ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
3313++
3314++ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
3315++
3316++ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
3317++
3318++
3319++
3320++# Check whether --enable-shared was given.
3321++if test "${enable_shared+set}" = set; then :
3322++ enableval=$enable_shared; p=${PACKAGE-default}
3323++ case $enableval in
3324++ yes) enable_shared=yes ;;
3325++ no) enable_shared=no ;;
3326++ *)
3327++ enable_shared=no
3328++ # Look at the argument we got. We use all the common list separators.
3329++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
3330++ for pkg in $enableval; do
3331++ IFS="$lt_save_ifs"
3332++ if test "X$pkg" = "X$p"; then
3333++ enable_shared=yes
3334++ fi
3335++ done
3336++ IFS="$lt_save_ifs"
3337++ ;;
3338++ esac
3339++else
3340++ enable_shared=yes
3341++fi
3342++
3343++
3344++
3345++
3346++
3347++
3348++
3349++
3350++
3351++# Check whether --enable-static was given.
3352++if test "${enable_static+set}" = set; then :
3353++ enableval=$enable_static; p=${PACKAGE-default}
3354++ case $enableval in
3355++ yes) enable_static=yes ;;
3356++ no) enable_static=no ;;
3357++ *)
3358++ enable_static=no
3359++ # Look at the argument we got. We use all the common list separators.
3360++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
3361++ for pkg in $enableval; do
3362++ IFS="$lt_save_ifs"
3363++ if test "X$pkg" = "X$p"; then
3364++ enable_static=yes
3365++ fi
3366++ done
3367++ IFS="$lt_save_ifs"
3368++ ;;
3369++ esac
3370++else
3371++ enable_static=no
3372++fi
3373++
3374++
3375++
3376++
3377++
3378++
3379++
3380++
3381++
3382++
3383++enable_win32_dll=yes
3384++
3385++case $host in
3386++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
3387++ if test -n "$ac_tool_prefix"; then
3388++ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
3389++set dummy ${ac_tool_prefix}as; ac_word=$2
3390++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3391++$as_echo_n "checking for $ac_word... " >&6; }
3392++if test "${ac_cv_prog_AS+set}" = set; then :
3393++ $as_echo_n "(cached) " >&6
3394++else
3395++ if test -n "$AS"; then
3396++ ac_cv_prog_AS="$AS" # Let the user override the test.
3397++else
3398++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3399++for as_dir in $PATH
3400++do
3401++ IFS=$as_save_IFS
3402++ test -z "$as_dir" && as_dir=.
3403++ for ac_exec_ext in '' $ac_executable_extensions; do
3404++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3405++ ac_cv_prog_AS="${ac_tool_prefix}as"
3406++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3407++ break 2
3408++ fi
3409++done
3410++ done
3411++IFS=$as_save_IFS
3412++
3413++fi
3414++fi
3415++AS=$ac_cv_prog_AS
3416++if test -n "$AS"; then
3417++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
3418++$as_echo "$AS" >&6; }
3419++else
3420++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3421++$as_echo "no" >&6; }
3422++fi
3423++
3424++
3425++fi
3426++if test -z "$ac_cv_prog_AS"; then
3427++ ac_ct_AS=$AS
3428++ # Extract the first word of "as", so it can be a program name with args.
3429++set dummy as; ac_word=$2
3430++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3431++$as_echo_n "checking for $ac_word... " >&6; }
3432++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
3433++ $as_echo_n "(cached) " >&6
3434++else
3435++ if test -n "$ac_ct_AS"; then
3436++ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
3437++else
3438++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3439++for as_dir in $PATH
3440++do
3441++ IFS=$as_save_IFS
3442++ test -z "$as_dir" && as_dir=.
3443++ for ac_exec_ext in '' $ac_executable_extensions; do
3444++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3445++ ac_cv_prog_ac_ct_AS="as"
3446++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3447++ break 2
3448++ fi
3449++done
3450++ done
3451++IFS=$as_save_IFS
3452++
3453++fi
3454++fi
3455++ac_ct_AS=$ac_cv_prog_ac_ct_AS
3456++if test -n "$ac_ct_AS"; then
3457++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
3458++$as_echo "$ac_ct_AS" >&6; }
3459++else
3460++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3461++$as_echo "no" >&6; }
3462++fi
3463++
3464++ if test "x$ac_ct_AS" = x; then
3465++ AS="false"
3466++ else
3467++ case $cross_compiling:$ac_tool_warned in
3468++yes:)
3469++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3470++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3471++ac_tool_warned=yes ;;
3472++esac
3473++ AS=$ac_ct_AS
3474++ fi
3475++else
3476++ AS="$ac_cv_prog_AS"
3477++fi
3478++
3479++ if test -n "$ac_tool_prefix"; then
3480++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
3481++set dummy ${ac_tool_prefix}dlltool; ac_word=$2
3482++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3483++$as_echo_n "checking for $ac_word... " >&6; }
3484++if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
3485++ $as_echo_n "(cached) " >&6
3486++else
3487++ if test -n "$DLLTOOL"; then
3488++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
3489++else
3490++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3491++for as_dir in $PATH
3492++do
3493++ IFS=$as_save_IFS
3494++ test -z "$as_dir" && as_dir=.
3495++ for ac_exec_ext in '' $ac_executable_extensions; do
3496++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3497++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
3498++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3499++ break 2
3500++ fi
3501++done
3502++ done
3503++IFS=$as_save_IFS
3504++
3505++fi
3506++fi
3507++DLLTOOL=$ac_cv_prog_DLLTOOL
3508++if test -n "$DLLTOOL"; then
3509++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
3510++$as_echo "$DLLTOOL" >&6; }
3511++else
3512++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3513++$as_echo "no" >&6; }
3514++fi
3515++
3516++
3517++fi
3518++if test -z "$ac_cv_prog_DLLTOOL"; then
3519++ ac_ct_DLLTOOL=$DLLTOOL
3520++ # Extract the first word of "dlltool", so it can be a program name with args.
3521++set dummy dlltool; ac_word=$2
3522++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3523++$as_echo_n "checking for $ac_word... " >&6; }
3524++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
3525++ $as_echo_n "(cached) " >&6
3526++else
3527++ if test -n "$ac_ct_DLLTOOL"; then
3528++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
3529++else
3530++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3531++for as_dir in $PATH
3532++do
3533++ IFS=$as_save_IFS
3534++ test -z "$as_dir" && as_dir=.
3535++ for ac_exec_ext in '' $ac_executable_extensions; do
3536++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3537++ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
3538++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3539++ break 2
3540++ fi
3541++done
3542++ done
3543++IFS=$as_save_IFS
3544++
3545++fi
3546++fi
3547++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
3548++if test -n "$ac_ct_DLLTOOL"; then
3549++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
3550++$as_echo "$ac_ct_DLLTOOL" >&6; }
3551++else
3552++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3553++$as_echo "no" >&6; }
3554++fi
3555++
3556++ if test "x$ac_ct_DLLTOOL" = x; then
3557++ DLLTOOL="false"
3558++ else
3559++ case $cross_compiling:$ac_tool_warned in
3560++yes:)
3561++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3562++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3563++ac_tool_warned=yes ;;
3564++esac
3565++ DLLTOOL=$ac_ct_DLLTOOL
3566++ fi
3567++else
3568++ DLLTOOL="$ac_cv_prog_DLLTOOL"
3569++fi
3570++
3571++ if test -n "$ac_tool_prefix"; then
3572++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
3573++set dummy ${ac_tool_prefix}objdump; ac_word=$2
3574++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3575++$as_echo_n "checking for $ac_word... " >&6; }
3576++if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
3577++ $as_echo_n "(cached) " >&6
3578++else
3579++ if test -n "$OBJDUMP"; then
3580++ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
3581++else
3582++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3583++for as_dir in $PATH
3584++do
3585++ IFS=$as_save_IFS
3586++ test -z "$as_dir" && as_dir=.
3587++ for ac_exec_ext in '' $ac_executable_extensions; do
3588++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3589++ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
3590++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3591++ break 2
3592++ fi
3593++done
3594++ done
3595++IFS=$as_save_IFS
3596++
3597++fi
3598++fi
3599++OBJDUMP=$ac_cv_prog_OBJDUMP
3600++if test -n "$OBJDUMP"; then
3601++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
3602++$as_echo "$OBJDUMP" >&6; }
3603++else
3604++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3605++$as_echo "no" >&6; }
3606++fi
3607++
3608++
3609++fi
3610++if test -z "$ac_cv_prog_OBJDUMP"; then
3611++ ac_ct_OBJDUMP=$OBJDUMP
3612++ # Extract the first word of "objdump", so it can be a program name with args.
3613++set dummy objdump; ac_word=$2
3614++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3615++$as_echo_n "checking for $ac_word... " >&6; }
3616++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
3617++ $as_echo_n "(cached) " >&6
3618++else
3619++ if test -n "$ac_ct_OBJDUMP"; then
3620++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
3621++else
3622++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3623++for as_dir in $PATH
3624++do
3625++ IFS=$as_save_IFS
3626++ test -z "$as_dir" && as_dir=.
3627++ for ac_exec_ext in '' $ac_executable_extensions; do
3628++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3629++ ac_cv_prog_ac_ct_OBJDUMP="objdump"
3630++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3631++ break 2
3632++ fi
3633++done
3634++ done
3635++IFS=$as_save_IFS
3636++
3637++fi
3638++fi
3639++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
3640++if test -n "$ac_ct_OBJDUMP"; then
3641++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
3642++$as_echo "$ac_ct_OBJDUMP" >&6; }
3643++else
3644++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3645++$as_echo "no" >&6; }
3646++fi
3647++
3648++ if test "x$ac_ct_OBJDUMP" = x; then
3649++ OBJDUMP="false"
3650++ else
3651++ case $cross_compiling:$ac_tool_warned in
3652++yes:)
3653++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3654++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3655++ac_tool_warned=yes ;;
3656++esac
3657++ OBJDUMP=$ac_ct_OBJDUMP
3658++ fi
3659++else
3660++ OBJDUMP="$ac_cv_prog_OBJDUMP"
3661++fi
3662++
3663++ ;;
3664++esac
3665++
3666++test -z "$AS" && AS=as
3667++
3668++
3669++
3670++
3671++
3672++test -z "$DLLTOOL" && DLLTOOL=dlltool
3673++
3674++
3675++
3676++
3677++
3678++test -z "$OBJDUMP" && OBJDUMP=objdump
3679++
3680++
3681++
3682++
3683++
3684++
3685++
3686++case `pwd` in
3687++ *\ * | *\ *)
3688++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3689++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
3690++esac
3691++
3692++
3693++
3694++macro_version='2.2.6'
3695++macro_revision='1.3012'
3696++
3697++
3698++
3699++
3700++
3701++
3702++
3703++
3704++
3705++
3706++
3707++
3708++
3709++ltmain="$ac_aux_dir/ltmain.sh"
3710++
3711++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
3712++$as_echo_n "checking for a sed that does not truncate output... " >&6; }
3713++if test "${ac_cv_path_SED+set}" = set; then :
3714++ $as_echo_n "(cached) " >&6
3715++else
3716++ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
3717++ for ac_i in 1 2 3 4 5 6 7; do
3718++ ac_script="$ac_script$as_nl$ac_script"
3719++ done
3720++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
3721++ { ac_script=; unset ac_script;}
3722++ if test -z "$SED"; then
3723++ ac_path_SED_found=false
3724++ # Loop through the user's path and test for each of PROGNAME-LIST
3725++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3726++for as_dir in $PATH
3727++do
3728++ IFS=$as_save_IFS
3729++ test -z "$as_dir" && as_dir=.
3730++ for ac_prog in sed gsed; do
3731++ for ac_exec_ext in '' $ac_executable_extensions; do
3732++ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
3733++ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
3734++# Check for GNU ac_path_SED and select it if it is found.
3735++ # Check for GNU $ac_path_SED
3736++case `"$ac_path_SED" --version 2>&1` in
3737++*GNU*)
3738++ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
3739++*)
3740++ ac_count=0
3741++ $as_echo_n 0123456789 >"conftest.in"
3742++ while :
3743++ do
3744++ cat "conftest.in" "conftest.in" >"conftest.tmp"
3745++ mv "conftest.tmp" "conftest.in"
3746++ cp "conftest.in" "conftest.nl"
3747++ $as_echo '' >> "conftest.nl"
3748++ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
3749++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3750++ as_fn_arith $ac_count + 1 && ac_count=$as_val
3751++ if test $ac_count -gt ${ac_path_SED_max-0}; then
3752++ # Best one so far, save it but keep looking for a better one
3753++ ac_cv_path_SED="$ac_path_SED"
3754++ ac_path_SED_max=$ac_count
3755++ fi
3756++ # 10*(2^10) chars as input seems more than enough
3757++ test $ac_count -gt 10 && break
3758++ done
3759++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
3760++esac
3761++
3762++ $ac_path_SED_found && break 3
3763++ done
3764++ done
3765++ done
3766++IFS=$as_save_IFS
3767++ if test -z "$ac_cv_path_SED"; then
3768++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
3769++ fi
3770++else
3771++ ac_cv_path_SED=$SED
3772++fi
3773++
3774++fi
3775++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
3776++$as_echo "$ac_cv_path_SED" >&6; }
3777++ SED="$ac_cv_path_SED"
3778++ rm -f conftest.sed
3779++
3780++test -z "$SED" && SED=sed
3781++Xsed="$SED -e 1s/^X//"
3782++
3783++
3784++
3785++
3786++
3787++
3788++
3789++
3790++
3791++
3792++
3793+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
3794+ $as_echo_n "checking for fgrep... " >&6; }
3795+ if test "${ac_cv_path_FGREP+set}" = set; then :
3796+@@ -5301,13 +5643,13 @@
3797+ else
3798+ lt_cv_nm_interface="BSD nm"
3799+ echo "int some_variable = 0;" > conftest.$ac_ext
3800+- (eval echo "\"\$as_me:5304: $ac_compile\"" >&5)
3801++ (eval echo "\"\$as_me:5646: $ac_compile\"" >&5)
3802+ (eval "$ac_compile" 2>conftest.err)
3803+ cat conftest.err >&5
3804+- (eval echo "\"\$as_me:5307: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3805++ (eval echo "\"\$as_me:5649: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3806+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
3807+ cat conftest.err >&5
3808+- (eval echo "\"\$as_me:5310: output\"" >&5)
3809++ (eval echo "\"\$as_me:5652: output\"" >&5)
3810+ cat conftest.out >&5
3811+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
3812+ lt_cv_nm_interface="MS dumpbin"
3813+@@ -6478,7 +6820,6 @@
3814+
3815+
3816+
3817+-
3818+ # Check whether --enable-libtool-lock was given.
3819+ if test "${enable_libtool_lock+set}" = set; then :
3820+ enableval=$enable_libtool_lock;
3821+@@ -6510,7 +6851,7 @@
3822+ ;;
3823+ *-*-irix6*)
3824+ # Find out which ABI we are using.
3825+- echo '#line 6513 "configure"' > conftest.$ac_ext
3826++ echo '#line 6854 "configure"' > conftest.$ac_ext
3827+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
3828+ (eval $ac_compile) 2>&5
3829+ ac_status=$?
3830+@@ -7257,274 +7598,6 @@
3831+ ;;
3832+ esac
3833+
3834+-ac_ext=c
3835+-ac_cpp='$CPP $CPPFLAGS'
3836+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3837+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3838+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
3839+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
3840+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
3841+-# On Suns, sometimes $CPP names a directory.
3842+-if test -n "$CPP" && test -d "$CPP"; then
3843+- CPP=
3844+-fi
3845+-if test -z "$CPP"; then
3846+- if test "${ac_cv_prog_CPP+set}" = set; then :
3847+- $as_echo_n "(cached) " >&6
3848+-else
3849+- # Double quotes because CPP needs to be expanded
3850+- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
3851+- do
3852+- ac_preproc_ok=false
3853+-for ac_c_preproc_warn_flag in '' yes
3854+-do
3855+- # Use a header file that comes with gcc, so configuring glibc
3856+- # with a fresh cross-compiler works.
3857+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3858+- # <limits.h> exists even on freestanding compilers.
3859+- # On the NeXT, cc -E runs the code through the compiler's parser,
3860+- # not just through cpp. "Syntax error" is here to catch this case.
3861+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3862+-/* end confdefs.h. */
3863+-#ifdef __STDC__
3864+-# include <limits.h>
3865+-#else
3866+-# include <assert.h>
3867+-#endif
3868+- Syntax error
3869+-_ACEOF
3870+-if ac_fn_c_try_cpp "$LINENO"; then :
3871+-
3872+-else
3873+- # Broken: fails on valid input.
3874+-continue
3875+-fi
3876+-rm -f conftest.err conftest.$ac_ext
3877+-
3878+- # OK, works on sane cases. Now check whether nonexistent headers
3879+- # can be detected and how.
3880+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3881+-/* end confdefs.h. */
3882+-#include <ac_nonexistent.h>
3883+-_ACEOF
3884+-if ac_fn_c_try_cpp "$LINENO"; then :
3885+- # Broken: success on invalid input.
3886+-continue
3887+-else
3888+- # Passes both tests.
3889+-ac_preproc_ok=:
3890+-break
3891+-fi
3892+-rm -f conftest.err conftest.$ac_ext
3893+-
3894+-done
3895+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
3896+-rm -f conftest.err conftest.$ac_ext
3897+-if $ac_preproc_ok; then :
3898+- break
3899+-fi
3900+-
3901+- done
3902+- ac_cv_prog_CPP=$CPP
3903+-
3904+-fi
3905+- CPP=$ac_cv_prog_CPP
3906+-else
3907+- ac_cv_prog_CPP=$CPP
3908+-fi
3909+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
3910+-$as_echo "$CPP" >&6; }
3911+-ac_preproc_ok=false
3912+-for ac_c_preproc_warn_flag in '' yes
3913+-do
3914+- # Use a header file that comes with gcc, so configuring glibc
3915+- # with a fresh cross-compiler works.
3916+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3917+- # <limits.h> exists even on freestanding compilers.
3918+- # On the NeXT, cc -E runs the code through the compiler's parser,
3919+- # not just through cpp. "Syntax error" is here to catch this case.
3920+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3921+-/* end confdefs.h. */
3922+-#ifdef __STDC__
3923+-# include <limits.h>
3924+-#else
3925+-# include <assert.h>
3926+-#endif
3927+- Syntax error
3928+-_ACEOF
3929+-if ac_fn_c_try_cpp "$LINENO"; then :
3930+-
3931+-else
3932+- # Broken: fails on valid input.
3933+-continue
3934+-fi
3935+-rm -f conftest.err conftest.$ac_ext
3936+-
3937+- # OK, works on sane cases. Now check whether nonexistent headers
3938+- # can be detected and how.
3939+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3940+-/* end confdefs.h. */
3941+-#include <ac_nonexistent.h>
3942+-_ACEOF
3943+-if ac_fn_c_try_cpp "$LINENO"; then :
3944+- # Broken: success on invalid input.
3945+-continue
3946+-else
3947+- # Passes both tests.
3948+-ac_preproc_ok=:
3949+-break
3950+-fi
3951+-rm -f conftest.err conftest.$ac_ext
3952+-
3953+-done
3954+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
3955+-rm -f conftest.err conftest.$ac_ext
3956+-if $ac_preproc_ok; then :
3957+-
3958+-else
3959+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3960+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3961+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
3962+-See \`config.log' for more details." "$LINENO" 5; }
3963+-fi
3964+-
3965+-ac_ext=c
3966+-ac_cpp='$CPP $CPPFLAGS'
3967+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3968+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3969+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
3970+-
3971+-
3972+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
3973+-$as_echo_n "checking for ANSI C header files... " >&6; }
3974+-if test "${ac_cv_header_stdc+set}" = set; then :
3975+- $as_echo_n "(cached) " >&6
3976+-else
3977+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3978+-/* end confdefs.h. */
3979+-#include <stdlib.h>
3980+-#include <stdarg.h>
3981+-#include <string.h>
3982+-#include <float.h>
3983+-
3984+-int
3985+-main ()
3986+-{
3987+-
3988+- ;
3989+- return 0;
3990+-}
3991+-_ACEOF
3992+-if ac_fn_c_try_compile "$LINENO"; then :
3993+- ac_cv_header_stdc=yes
3994+-else
3995+- ac_cv_header_stdc=no
3996+-fi
3997+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3998+-
3999+-if test $ac_cv_header_stdc = yes; then
4000+- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
4001+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4002+-/* end confdefs.h. */
4003+-#include <string.h>
4004+-
4005+-_ACEOF
4006+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
4007+- $EGREP "memchr" >/dev/null 2>&1; then :
4008+-
4009+-else
4010+- ac_cv_header_stdc=no
4011+-fi
4012+-rm -f conftest*
4013+-
4014+-fi
4015+-
4016+-if test $ac_cv_header_stdc = yes; then
4017+- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
4018+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4019+-/* end confdefs.h. */
4020+-#include <stdlib.h>
4021+-
4022+-_ACEOF
4023+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
4024+- $EGREP "free" >/dev/null 2>&1; then :
4025+-
4026+-else
4027+- ac_cv_header_stdc=no
4028+-fi
4029+-rm -f conftest*
4030+-
4031+-fi
4032+-
4033+-if test $ac_cv_header_stdc = yes; then
4034+- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
4035+- if test "$cross_compiling" = yes; then :
4036+- :
4037+-else
4038+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4039+-/* end confdefs.h. */
4040+-#include <ctype.h>
4041+-#include <stdlib.h>
4042+-#if ((' ' & 0x0FF) == 0x020)
4043+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
4044+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
4045+-#else
4046+-# define ISLOWER(c) \
4047+- (('a' <= (c) && (c) <= 'i') \
4048+- || ('j' <= (c) && (c) <= 'r') \
4049+- || ('s' <= (c) && (c) <= 'z'))
4050+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
4051+-#endif
4052+-
4053+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
4054+-int
4055+-main ()
4056+-{
4057+- int i;
4058+- for (i = 0; i < 256; i++)
4059+- if (XOR (islower (i), ISLOWER (i))
4060+- || toupper (i) != TOUPPER (i))
4061+- return 2;
4062+- return 0;
4063+-}
4064+-_ACEOF
4065+-if ac_fn_c_try_run "$LINENO"; then :
4066+-
4067+-else
4068+- ac_cv_header_stdc=no
4069+-fi
4070+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
4071+- conftest.$ac_objext conftest.beam conftest.$ac_ext
4072+-fi
4073+-
4074+-fi
4075+-fi
4076+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
4077+-$as_echo "$ac_cv_header_stdc" >&6; }
4078+-if test $ac_cv_header_stdc = yes; then
4079+-
4080+-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
4081+-
4082+-fi
4083+-
4084+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
4085+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
4086+- inttypes.h stdint.h unistd.h
4087+-do :
4088+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
4089+-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
4090+-"
4091+-eval as_val=\$$as_ac_Header
4092+- if test "x$as_val" = x""yes; then :
4093+- cat >>confdefs.h <<_ACEOF
4094+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
4095+-_ACEOF
4096+-
4097+-fi
4098+-
4099+-done
4100+-
4101+-
4102+ for ac_header in dlfcn.h
4103+ do :
4104+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
4105+@@ -7978,11 +8051,11 @@
4106+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4107+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4108+ -e 's:$: $lt_compiler_flag:'`
4109+- (eval echo "\"\$as_me:7981: $lt_compile\"" >&5)
4110++ (eval echo "\"\$as_me:8054: $lt_compile\"" >&5)
4111+ (eval "$lt_compile" 2>conftest.err)
4112+ ac_status=$?
4113+ cat conftest.err >&5
4114+- echo "$as_me:7985: \$? = $ac_status" >&5
4115++ echo "$as_me:8058: \$? = $ac_status" >&5
4116+ if (exit $ac_status) && test -s "$ac_outfile"; then
4117+ # The compiler can only warn and ignore the option if not recognized
4118+ # So say no if there are warnings other than the usual output.
4119+@@ -8317,11 +8390,11 @@
4120+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4121+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4122+ -e 's:$: $lt_compiler_flag:'`
4123+- (eval echo "\"\$as_me:8320: $lt_compile\"" >&5)
4124++ (eval echo "\"\$as_me:8393: $lt_compile\"" >&5)
4125+ (eval "$lt_compile" 2>conftest.err)
4126+ ac_status=$?
4127+ cat conftest.err >&5
4128+- echo "$as_me:8324: \$? = $ac_status" >&5
4129++ echo "$as_me:8397: \$? = $ac_status" >&5
4130+ if (exit $ac_status) && test -s "$ac_outfile"; then
4131+ # The compiler can only warn and ignore the option if not recognized
4132+ # So say no if there are warnings other than the usual output.
4133+@@ -8422,11 +8495,11 @@
4134+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4135+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4136+ -e 's:$: $lt_compiler_flag:'`
4137+- (eval echo "\"\$as_me:8425: $lt_compile\"" >&5)
4138++ (eval echo "\"\$as_me:8498: $lt_compile\"" >&5)
4139+ (eval "$lt_compile" 2>out/conftest.err)
4140+ ac_status=$?
4141+ cat out/conftest.err >&5
4142+- echo "$as_me:8429: \$? = $ac_status" >&5
4143++ echo "$as_me:8502: \$? = $ac_status" >&5
4144+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
4145+ then
4146+ # The compiler can only warn and ignore the option if not recognized
4147+@@ -8477,11 +8550,11 @@
4148+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4149+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4150+ -e 's:$: $lt_compiler_flag:'`
4151+- (eval echo "\"\$as_me:8480: $lt_compile\"" >&5)
4152++ (eval echo "\"\$as_me:8553: $lt_compile\"" >&5)
4153+ (eval "$lt_compile" 2>out/conftest.err)
4154+ ac_status=$?
4155+ cat out/conftest.err >&5
4156+- echo "$as_me:8484: \$? = $ac_status" >&5
4157++ echo "$as_me:8557: \$? = $ac_status" >&5
4158+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
4159+ then
4160+ # The compiler can only warn and ignore the option if not recognized
4161+@@ -10860,7 +10933,7 @@
4162+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4163+ lt_status=$lt_dlunknown
4164+ cat > conftest.$ac_ext <<_LT_EOF
4165+-#line 10863 "configure"
4166++#line 10936 "configure"
4167+ #include "confdefs.h"
4168+
4169+ #if HAVE_DLFCN_H
4170+@@ -10956,7 +11029,7 @@
4171+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4172+ lt_status=$lt_dlunknown
4173+ cat > conftest.$ac_ext <<_LT_EOF
4174+-#line 10959 "configure"
4175++#line 11032 "configure"
4176+ #include "confdefs.h"
4177+
4178+ #if HAVE_DLFCN_H
4179+@@ -11569,8 +11642,8 @@
4180+ ... rest of stderr output deleted ...
4181+ 10q' conftest.err >conftest.er1
4182+ cat conftest.er1 >&5
4183+- rm -f conftest.er1 conftest.err
4184+ fi
4185++ rm -f conftest.er1 conftest.err
4186+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4187+ test $ac_status = 0; }
4188+ done
4189+@@ -11954,8 +12027,8 @@
4190+ ... rest of stderr output deleted ...
4191+ 10q' conftest.err >conftest.er1
4192+ cat conftest.er1 >&5
4193+- rm -f conftest.er1 conftest.err
4194+ fi
4195++ rm -f conftest.er1 conftest.err
4196+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4197+ test $ac_status = 0; }
4198+ done
4199+@@ -14098,11 +14171,11 @@
4200+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4201+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4202+ -e 's:$: $lt_compiler_flag:'`
4203+- (eval echo "\"\$as_me:14101: $lt_compile\"" >&5)
4204++ (eval echo "\"\$as_me:14174: $lt_compile\"" >&5)
4205+ (eval "$lt_compile" 2>conftest.err)
4206+ ac_status=$?
4207+ cat conftest.err >&5
4208+- echo "$as_me:14105: \$? = $ac_status" >&5
4209++ echo "$as_me:14178: \$? = $ac_status" >&5
4210+ if (exit $ac_status) && test -s "$ac_outfile"; then
4211+ # The compiler can only warn and ignore the option if not recognized
4212+ # So say no if there are warnings other than the usual output.
4213+@@ -14197,11 +14270,11 @@
4214+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4215+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4216+ -e 's:$: $lt_compiler_flag:'`
4217+- (eval echo "\"\$as_me:14200: $lt_compile\"" >&5)
4218++ (eval echo "\"\$as_me:14273: $lt_compile\"" >&5)
4219+ (eval "$lt_compile" 2>out/conftest.err)
4220+ ac_status=$?
4221+ cat out/conftest.err >&5
4222+- echo "$as_me:14204: \$? = $ac_status" >&5
4223++ echo "$as_me:14277: \$? = $ac_status" >&5
4224+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
4225+ then
4226+ # The compiler can only warn and ignore the option if not recognized
4227+@@ -14249,11 +14322,11 @@
4228+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4229+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4230+ -e 's:$: $lt_compiler_flag:'`
4231+- (eval echo "\"\$as_me:14252: $lt_compile\"" >&5)
4232++ (eval echo "\"\$as_me:14325: $lt_compile\"" >&5)
4233+ (eval "$lt_compile" 2>out/conftest.err)
4234+ ac_status=$?
4235+ cat out/conftest.err >&5
4236+- echo "$as_me:14256: \$? = $ac_status" >&5
4237++ echo "$as_me:14329: \$? = $ac_status" >&5
4238+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
4239+ then
4240+ # The compiler can only warn and ignore the option if not recognized
4241+@@ -15519,8 +15592,8 @@
4242+ ... rest of stderr output deleted ...
4243+ 10q' conftest.err >conftest.er1
4244+ cat conftest.er1 >&5
4245+- rm -f conftest.er1 conftest.err
4246+ fi
4247++ rm -f conftest.er1 conftest.err
4248+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4249+ test $ac_status = 0; }
4250+ done
4251+@@ -16484,32 +16557,39 @@
4252+
4253+ gecko_version_major=`echo $gecko_version | awk '{ print $1; }'`
4254+ gecko_version_minor=`echo $gecko_version | awk '{ print $2; }'`
4255++gecko_version_micro=`echo $gecko_version | awk '{ print $3; }'`
4256+
4257+-if test -n "$gecko_version_major" -a -n "$gecko_version_minor"; then
4258+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gecko_version_major.$gecko_version_minor" >&5
4259+-$as_echo "$gecko_version_major.$gecko_version_minor" >&6; }
4260++## The test options -a and -o are not portable.
4261++if test -n "$gecko_version_major" && test -n "$gecko_version_minor"; then
4262++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gecko_version_major.$gecko_version_minor.$gecko_version_micro" >&5
4263++$as_echo "$gecko_version_major.$gecko_version_minor.$gecko_version_micro" >&6; }
4264+ else
4265+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4266+ $as_echo "no" >&6; }
4267+ as_fn_error "Can't detect Gecko version" "$LINENO" 5
4268+ fi
4269+
4270+-if test $gecko_version_major -ne 1 -o \
4271+- $gecko_version_minor -lt 7 -o \
4272+- $gecko_version_minor -gt 9; then
4273++if test $gecko_version_major -ne 1 || \
4274++ test $gecko_version_minor -lt 7 || \
4275++ test $gecko_version_minor -gt 9; then
4276+ as_fn_error "Unsupported Gecko version $gecko_version_major.$gecko_version_minor" "$LINENO" 5
4277+ fi
4278+
4279+-if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 8; then
4280++if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 8; then
4281+
4282+ $as_echo "#define HAVE_GECKO_1_8 1" >>confdefs.h
4283+
4284+ fi
4285+-if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 9; then
4286++if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 9; then
4287+
4288+ $as_echo "#define HAVE_GECKO_1_9 1" >>confdefs.h
4289+
4290+ fi
4291++if test $gecko_version_minor -eq 9 && test $gecko_version_micro -eq 1; then
4292++
4293++$as_echo "#define HAVE_GECKO_1_9_1 1" >>confdefs.h
4294++
4295++fi
4296+
4297+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether nsPIDOMWindow methods return nsPIDOMWindow*" >&5
4298+ $as_echo_n "checking whether nsPIDOMWindow methods return nsPIDOMWindow*... " >&6; }
4299+@@ -16946,6 +17026,357 @@
4300+
4301+
4302+
4303++# Check whether --enable-glibtest was given.
4304++if test "${enable_glibtest+set}" = set; then :
4305++ enableval=$enable_glibtest;
4306++else
4307++ enable_glibtest=yes
4308++fi
4309++
4310++
4311++ pkg_config_args=glib-2.0
4312++ for module in . gmodule gobject gthread
4313++ do
4314++ case "$module" in
4315++ gmodule)
4316++ pkg_config_args="$pkg_config_args gmodule-2.0"
4317++ ;;
4318++ gmodule-no-export)
4319++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
4320++ ;;
4321++ gobject)
4322++ pkg_config_args="$pkg_config_args gobject-2.0"
4323++ ;;
4324++ gthread)
4325++ pkg_config_args="$pkg_config_args gthread-2.0"
4326++ ;;
4327++ gio*)
4328++ pkg_config_args="$pkg_config_args $module-2.0"
4329++ ;;
4330++ esac
4331++ done
4332++
4333++
4334++
4335++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
4336++ if test -n "$ac_tool_prefix"; then
4337++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
4338++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
4339++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4340++$as_echo_n "checking for $ac_word... " >&6; }
4341++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
4342++ $as_echo_n "(cached) " >&6
4343++else
4344++ case $PKG_CONFIG in
4345++ [\\/]* | ?:[\\/]*)
4346++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
4347++ ;;
4348++ *)
4349++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4350++for as_dir in $PATH
4351++do
4352++ IFS=$as_save_IFS
4353++ test -z "$as_dir" && as_dir=.
4354++ for ac_exec_ext in '' $ac_executable_extensions; do
4355++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4356++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
4357++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4358++ break 2
4359++ fi
4360++done
4361++ done
4362++IFS=$as_save_IFS
4363++
4364++ ;;
4365++esac
4366++fi
4367++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
4368++if test -n "$PKG_CONFIG"; then
4369++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
4370++$as_echo "$PKG_CONFIG" >&6; }
4371++else
4372++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4373++$as_echo "no" >&6; }
4374++fi
4375++
4376++
4377++fi
4378++if test -z "$ac_cv_path_PKG_CONFIG"; then
4379++ ac_pt_PKG_CONFIG=$PKG_CONFIG
4380++ # Extract the first word of "pkg-config", so it can be a program name with args.
4381++set dummy pkg-config; ac_word=$2
4382++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4383++$as_echo_n "checking for $ac_word... " >&6; }
4384++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
4385++ $as_echo_n "(cached) " >&6
4386++else
4387++ case $ac_pt_PKG_CONFIG in
4388++ [\\/]* | ?:[\\/]*)
4389++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
4390++ ;;
4391++ *)
4392++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4393++for as_dir in $PATH
4394++do
4395++ IFS=$as_save_IFS
4396++ test -z "$as_dir" && as_dir=.
4397++ for ac_exec_ext in '' $ac_executable_extensions; do
4398++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4399++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
4400++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4401++ break 2
4402++ fi
4403++done
4404++ done
4405++IFS=$as_save_IFS
4406++
4407++ ;;
4408++esac
4409++fi
4410++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
4411++if test -n "$ac_pt_PKG_CONFIG"; then
4412++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
4413++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
4414++else
4415++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4416++$as_echo "no" >&6; }
4417++fi
4418++
4419++ if test "x$ac_pt_PKG_CONFIG" = x; then
4420++ PKG_CONFIG=""
4421++ else
4422++ case $cross_compiling:$ac_tool_warned in
4423++yes:)
4424++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4425++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4426++ac_tool_warned=yes ;;
4427++esac
4428++ PKG_CONFIG=$ac_pt_PKG_CONFIG
4429++ fi
4430++else
4431++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
4432++fi
4433++
4434++fi
4435++if test -n "$PKG_CONFIG"; then
4436++ _pkg_min_version=0.16
4437++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
4438++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
4439++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
4440++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4441++$as_echo "yes" >&6; }
4442++ else
4443++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4444++$as_echo "no" >&6; }
4445++ PKG_CONFIG=""
4446++ fi
4447++
4448++fi
4449++
4450++ no_glib=""
4451++
4452++ if test "x$PKG_CONFIG" = x ; then
4453++ no_glib=yes
4454++ PKG_CONFIG=no
4455++ fi
4456++
4457++ min_glib_version=2.13.5
4458++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
4459++$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
4460++
4461++ if test x$PKG_CONFIG != xno ; then
4462++ ## don't try to run the test against uninstalled libtool libs
4463++ if $PKG_CONFIG --uninstalled $pkg_config_args; then
4464++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
4465++ enable_glibtest=no
4466++ fi
4467++
4468++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
4469++ :
4470++ else
4471++ no_glib=yes
4472++ fi
4473++ fi
4474++
4475++ if test x"$no_glib" = x ; then
4476++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
4477++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
4478++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
4479++
4480++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
4481++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
4482++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
4483++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
4484++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
4485++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
4486++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
4487++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
4488++ if test "x$enable_glibtest" = "xyes" ; then
4489++ ac_save_CFLAGS="$CFLAGS"
4490++ ac_save_LIBS="$LIBS"
4491++ CFLAGS="$CFLAGS $GLIB_CFLAGS"
4492++ LIBS="$GLIB_LIBS $LIBS"
4493++ rm -f conf.glibtest
4494++ if test "$cross_compiling" = yes; then :
4495++ echo $ac_n "cross compiling; assumed OK... $ac_c"
4496++else
4497++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4498++/* end confdefs.h. */
4499++
4500++#include <glib.h>
4501++#include <stdio.h>
4502++#include <stdlib.h>
4503++
4504++int
4505++main ()
4506++{
4507++ int major, minor, micro;
4508++ char *tmp_version;
4509++ int ignored;
4510++
4511++ ignored = system ("touch conf.glibtest");
4512++
4513++ /* HP/UX 9 (%@#!) writes to sscanf strings */
4514++ tmp_version = g_strdup("$min_glib_version");
4515++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
4516++ printf("%s, bad version string\n", "$min_glib_version");
4517++ exit(1);
4518++ }
4519++
4520++ if ((glib_major_version != $glib_config_major_version) ||
4521++ (glib_minor_version != $glib_config_minor_version) ||
4522++ (glib_micro_version != $glib_config_micro_version))
4523++ {
4524++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
4525++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
4526++ glib_major_version, glib_minor_version, glib_micro_version);
4527++ printf ("*** was found! If pkg-config was correct, then it is best\n");
4528++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
4529++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
4530++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
4531++ printf("*** required on your system.\n");
4532++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
4533++ printf("*** to point to the correct configuration files\n");
4534++ }
4535++ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
4536++ (glib_minor_version != GLIB_MINOR_VERSION) ||
4537++ (glib_micro_version != GLIB_MICRO_VERSION))
4538++ {
4539++ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
4540++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
4541++ printf("*** library (version %d.%d.%d)\n",
4542++ glib_major_version, glib_minor_version, glib_micro_version);
4543++ }
4544++ else
4545++ {
4546++ if ((glib_major_version > major) ||
4547++ ((glib_major_version == major) && (glib_minor_version > minor)) ||
4548++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
4549++ {
4550++ return 0;
4551++ }
4552++ else
4553++ {
4554++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
4555++ glib_major_version, glib_minor_version, glib_micro_version);
4556++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
4557++ major, minor, micro);
4558++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
4559++ printf("***\n");
4560++ printf("*** If you have already installed a sufficiently new version, this error\n");
4561++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
4562++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
4563++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
4564++ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
4565++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
4566++ printf("*** so that the correct libraries are found at run-time))\n");
4567++ }
4568++ }
4569++ return 1;
4570++}
4571++
4572++_ACEOF
4573++if ac_fn_c_try_run "$LINENO"; then :
4574++
4575++else
4576++ no_glib=yes
4577++fi
4578++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
4579++ conftest.$ac_objext conftest.beam conftest.$ac_ext
4580++fi
4581++
4582++ CFLAGS="$ac_save_CFLAGS"
4583++ LIBS="$ac_save_LIBS"
4584++ fi
4585++ fi
4586++ if test "x$no_glib" = x ; then
4587++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
4588++$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
4589++ :
4590++ else
4591++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4592++$as_echo "no" >&6; }
4593++ if test "$PKG_CONFIG" = "no" ; then
4594++ echo "*** A new enough version of pkg-config was not found."
4595++ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
4596++ else
4597++ if test -f conf.glibtest ; then
4598++ :
4599++ else
4600++ echo "*** Could not run GLIB test program, checking why..."
4601++ ac_save_CFLAGS="$CFLAGS"
4602++ ac_save_LIBS="$LIBS"
4603++ CFLAGS="$CFLAGS $GLIB_CFLAGS"
4604++ LIBS="$LIBS $GLIB_LIBS"
4605++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4606++/* end confdefs.h. */
4607++
4608++#include <glib.h>
4609++#include <stdio.h>
4610++
4611++int
4612++main ()
4613++{
4614++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
4615++ ;
4616++ return 0;
4617++}
4618++_ACEOF
4619++if ac_fn_c_try_link "$LINENO"; then :
4620++ echo "*** The test program compiled, but did not run. This usually means"
4621++ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
4622++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
4623++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
4624++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
4625++ echo "*** is required on your system"
4626++ echo "***"
4627++ echo "*** If you have an old version installed, it is best to remove it, although"
4628++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
4629++else
4630++ echo "*** The test program failed to compile or link. See the file config.log for the"
4631++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
4632++fi
4633++rm -f core conftest.err conftest.$ac_objext \
4634++ conftest$ac_exeext conftest.$ac_ext
4635++ CFLAGS="$ac_save_CFLAGS"
4636++ LIBS="$ac_save_LIBS"
4637++ fi
4638++ fi
4639++ GLIB_CFLAGS=""
4640++ GLIB_LIBS=""
4641++ GLIB_GENMARSHAL=""
4642++ GOBJECT_QUERY=""
4643++ GLIB_MKENUMS=""
4644++ as_fn_error "GLib is required." "$LINENO" 5
4645++ fi
4646++
4647++
4648++
4649++
4650++
4651++ rm -f conf.glibtest
4652++
4653++
4654+ # Check whether --enable-gtktest was given.
4655+ if test "${enable_gtktest+set}" = set; then :
4656+ enableval=$enable_gtktest;
4657+@@ -17828,6 +18259,143 @@
4658+ $as_echo "#define USE_SSL 1" >>confdefs.h
4659+
4660+ fi
4661++
4662++
4663++# Check whether --with-libgcrypt-prefix was given.
4664++if test "${with_libgcrypt_prefix+set}" = set; then :
4665++ withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval"
4666++else
4667++ libgcrypt_config_prefix=""
4668++fi
4669++
4670++ if test x$libgcrypt_config_prefix != x ; then
4671++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then
4672++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
4673++ fi
4674++ fi
4675++
4676++ # Extract the first word of "libgcrypt-config", so it can be a program name with args.
4677++set dummy libgcrypt-config; ac_word=$2
4678++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4679++$as_echo_n "checking for $ac_word... " >&6; }
4680++if test "${ac_cv_path_LIBGCRYPT_CONFIG+set}" = set; then :
4681++ $as_echo_n "(cached) " >&6
4682++else
4683++ case $LIBGCRYPT_CONFIG in
4684++ [\\/]* | ?:[\\/]*)
4685++ ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path.
4686++ ;;
4687++ *)
4688++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4689++for as_dir in $PATH
4690++do
4691++ IFS=$as_save_IFS
4692++ test -z "$as_dir" && as_dir=.
4693++ for ac_exec_ext in '' $ac_executable_extensions; do
4694++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4695++ ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
4696++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4697++ break 2
4698++ fi
4699++done
4700++ done
4701++IFS=$as_save_IFS
4702++
4703++ test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
4704++ ;;
4705++esac
4706++fi
4707++LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
4708++if test -n "$LIBGCRYPT_CONFIG"; then
4709++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5
4710++$as_echo "$LIBGCRYPT_CONFIG" >&6; }
4711++else
4712++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4713++$as_echo "no" >&6; }
4714++fi
4715++
4716++
4717++ tmp=1.2.0
4718++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
4719++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
4720++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
4721++ else
4722++ req_libgcrypt_api=0
4723++ min_libgcrypt_version="$tmp"
4724++ fi
4725++
4726++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5
4727++$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; }
4728++ ok=no
4729++ if test "$LIBGCRYPT_CONFIG" != "no" ; then
4730++ req_major=`echo $min_libgcrypt_version | \
4731++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
4732++ req_minor=`echo $min_libgcrypt_version | \
4733++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
4734++ req_micro=`echo $min_libgcrypt_version | \
4735++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
4736++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
4737++ major=`echo $libgcrypt_config_version | \
4738++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
4739++ minor=`echo $libgcrypt_config_version | \
4740++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
4741++ micro=`echo $libgcrypt_config_version | \
4742++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
4743++ if test "$major" -gt "$req_major"; then
4744++ ok=yes
4745++ else
4746++ if test "$major" -eq "$req_major"; then
4747++ if test "$minor" -gt "$req_minor"; then
4748++ ok=yes
4749++ else
4750++ if test "$minor" -eq "$req_minor"; then
4751++ if test "$micro" -ge "$req_micro"; then
4752++ ok=yes
4753++ fi
4754++ fi
4755++ fi
4756++ fi
4757++ fi
4758++ fi
4759++ if test $ok = yes; then
4760++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5
4761++$as_echo "yes ($libgcrypt_config_version)" >&6; }
4762++ else
4763++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4764++$as_echo "no" >&6; }
4765++ fi
4766++ if test $ok = yes; then
4767++ # If we have a recent libgcrypt, we should also check that the
4768++ # API is compatible
4769++ if test "$req_libgcrypt_api" -gt 0 ; then
4770++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
4771++ if test "$tmp" -gt 0 ; then
4772++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5
4773++$as_echo_n "checking LIBGCRYPT API version... " >&6; }
4774++ if test "$req_libgcrypt_api" -eq "$tmp" ; then
4775++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
4776++$as_echo "okay" >&6; }
4777++ else
4778++ ok=no
4779++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5
4780++$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
4781++ fi
4782++ fi
4783++ fi
4784++ fi
4785++ if test $ok = yes; then
4786++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
4787++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
4788++ :
4789++ else
4790++ LIBGCRYPT_CFLAGS=""
4791++ LIBGCRYPT_LIBS=""
4792++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgcrypt was not found." >&5
4793++$as_echo "$as_me: WARNING: libgcrypt was not found." >&2;}
4794++ fi
4795++
4796++
4797++
4798+ fi
4799+
4800+
4801+@@ -20409,6 +20977,25 @@
4802+
4803+ fi
4804+
4805++## This function is available only in GTK+ >= 2.15.x.
4806++TEMP_CFLAGS="$CFLAGS"
4807++TEMP_LIBS="$LIBS"
4808++CFLAGS="$CFLAGS $GTK_CFLAGS"
4809++LIBS="$LIBS $GTK_LIBS"
4810++for ac_func in gtk_activatable_set_related_action
4811++do :
4812++ ac_fn_c_check_func "$LINENO" "gtk_activatable_set_related_action" "ac_cv_func_gtk_activatable_set_related_action"
4813++if test "x$ac_cv_func_gtk_activatable_set_related_action" = x""yes; then :
4814++ cat >>confdefs.h <<_ACEOF
4815++#define HAVE_GTK_ACTIVATABLE_SET_RELATED_ACTION 1
4816++_ACEOF
4817++
4818++fi
4819++done
4820++
4821++CFLAGS="$TEMP_CFLAGS"
4822++LIBS="$TEMP_LIBS"
4823++
4824+
4825+ # Check whether --enable-migemo was given.
4826+ if test "${enable_migemo+set}" = set; then :
4827+@@ -21055,203 +21642,7 @@
4828+ fi
4829+
4830+
4831+-
4832+-
4833+-
4834+-
4835+-# Check whether --with-cutter was given.
4836+-if test "${with_cutter+set}" = set; then :
4837+- withval=$with_cutter; ac_cv_use_cutter=$withval
4838+-else
4839+- ac_cv_use_cutter=auto
4840+-fi
4841+-
4842+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Cutter" >&5
4843+-$as_echo_n "checking whether to use Cutter... " >&6; }
4844+-if test "${ac_cv_use_cutter+set}" = set; then :
4845+- $as_echo_n "(cached) " >&6
4846+-else
4847+- ac_cv_use_cutter=auto
4848+-fi
4849+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_use_cutter" >&5
4850+-$as_echo "$ac_cv_use_cutter" >&6; }
4851+- if test "$ac_cv_use_cutter" != "no"; then
4852+-
4853+-pkg_failed=no
4854+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUTTER" >&5
4855+-$as_echo_n "checking for CUTTER... " >&6; }
4856+-
4857+-if test -n "$PKG_CONFIG"; then
4858+- if test -n "$CUTTER_CFLAGS"; then
4859+- pkg_cv_CUTTER_CFLAGS="$CUTTER_CFLAGS"
4860+- else
4861+- if test -n "$PKG_CONFIG" && \
4862+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cutter >= 1.0.6\""; } >&5
4863+- ($PKG_CONFIG --exists --print-errors "cutter >= 1.0.6") 2>&5
4864+- ac_status=$?
4865+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4866+- test $ac_status = 0; }; then
4867+- pkg_cv_CUTTER_CFLAGS=`$PKG_CONFIG --cflags "cutter >= 1.0.6" 2>/dev/null`
4868+-else
4869+- pkg_failed=yes
4870+-fi
4871+- fi
4872+-else
4873+- pkg_failed=untried
4874+-fi
4875+-if test -n "$PKG_CONFIG"; then
4876+- if test -n "$CUTTER_LIBS"; then
4877+- pkg_cv_CUTTER_LIBS="$CUTTER_LIBS"
4878+- else
4879+- if test -n "$PKG_CONFIG" && \
4880+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cutter >= 1.0.6\""; } >&5
4881+- ($PKG_CONFIG --exists --print-errors "cutter >= 1.0.6") 2>&5
4882+- ac_status=$?
4883+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4884+- test $ac_status = 0; }; then
4885+- pkg_cv_CUTTER_LIBS=`$PKG_CONFIG --libs "cutter >= 1.0.6" 2>/dev/null`
4886+-else
4887+- pkg_failed=yes
4888+-fi
4889+- fi
4890+-else
4891+- pkg_failed=untried
4892+-fi
4893+-
4894+-
4895+-
4896+-if test $pkg_failed = yes; then
4897+-
4898+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4899+- _pkg_short_errors_supported=yes
4900+-else
4901+- _pkg_short_errors_supported=no
4902+-fi
4903+- if test $_pkg_short_errors_supported = yes; then
4904+- CUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cutter >= 1.0.6"`
4905+- else
4906+- CUTTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cutter >= 1.0.6"`
4907+- fi
4908+- # Put the nasty error message in config.log where it belongs
4909+- echo "$CUTTER_PKG_ERRORS" >&5
4910+-
4911+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4912+-$as_echo "no" >&6; }
4913+- ac_cv_use_cutter=no
4914+-elif test $pkg_failed = untried; then
4915+- ac_cv_use_cutter=no
4916+-else
4917+- CUTTER_CFLAGS=$pkg_cv_CUTTER_CFLAGS
4918+- CUTTER_LIBS=$pkg_cv_CUTTER_LIBS
4919+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4920+-$as_echo "yes" >&6; }
4921+- :
4922+-fi
4923+-
4924+-
4925+- fi
4926+-
4927+- if test "$ac_cv_use_cutter" != "no"; then
4928+- if test -n "$PKG_CONFIG"; then
4929+- if test -n "$CUTTER"; then
4930+- pkg_cv_CUTTER="$CUTTER"
4931+- else
4932+- if test -n "$PKG_CONFIG" && \
4933+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cutter\""; } >&5
4934+- ($PKG_CONFIG --exists --print-errors "cutter") 2>&5
4935+- ac_status=$?
4936+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4937+- test $ac_status = 0; }; then
4938+- pkg_cv_CUTTER=`$PKG_CONFIG --variable=cutter "cutter" 2>/dev/null`
4939+-else
4940+- pkg_failed=yes
4941+-fi
4942+- fi
4943+-else
4944+- pkg_failed=untried
4945+-fi
4946+- CUTTER=$pkg_cv_CUTTER
4947+-
4948+- fi
4949+-
4950+- ac_cv_use_gcutter=no
4951+- if test "$ac_cv_use_cutter" != "no"; then
4952+-
4953+-pkg_failed=no
4954+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCUTTER" >&5
4955+-$as_echo_n "checking for GCUTTER... " >&6; }
4956+-
4957+-if test -n "$PKG_CONFIG"; then
4958+- if test -n "$GCUTTER_CFLAGS"; then
4959+- pkg_cv_GCUTTER_CFLAGS="$GCUTTER_CFLAGS"
4960+- else
4961+- if test -n "$PKG_CONFIG" && \
4962+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcutter >= 1.0.6\""; } >&5
4963+- ($PKG_CONFIG --exists --print-errors "gcutter >= 1.0.6") 2>&5
4964+- ac_status=$?
4965+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4966+- test $ac_status = 0; }; then
4967+- pkg_cv_GCUTTER_CFLAGS=`$PKG_CONFIG --cflags "gcutter >= 1.0.6" 2>/dev/null`
4968+-else
4969+- pkg_failed=yes
4970+-fi
4971+- fi
4972+-else
4973+- pkg_failed=untried
4974+-fi
4975+-if test -n "$PKG_CONFIG"; then
4976+- if test -n "$GCUTTER_LIBS"; then
4977+- pkg_cv_GCUTTER_LIBS="$GCUTTER_LIBS"
4978+- else
4979+- if test -n "$PKG_CONFIG" && \
4980+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcutter >= 1.0.6\""; } >&5
4981+- ($PKG_CONFIG --exists --print-errors "gcutter >= 1.0.6") 2>&5
4982+- ac_status=$?
4983+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4984+- test $ac_status = 0; }; then
4985+- pkg_cv_GCUTTER_LIBS=`$PKG_CONFIG --libs "gcutter >= 1.0.6" 2>/dev/null`
4986+-else
4987+- pkg_failed=yes
4988+-fi
4989+- fi
4990+-else
4991+- pkg_failed=untried
4992+-fi
4993+-
4994+-
4995+-
4996+-if test $pkg_failed = yes; then
4997+-
4998+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4999+- _pkg_short_errors_supported=yes
5000+-else
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: