Merge lp:~noskcaj/ubuntu/trusty/parole/0.6.0 into lp:ubuntu/trusty/parole
- Trusty (14.04)
- 0.6.0
- Merge into trusty
Proposed by
Jackson Doak
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~noskcaj/ubuntu/trusty/parole/0.6.0 | ||||
Merge into: | lp:ubuntu/trusty/parole | ||||
Diff against target: |
83387 lines (+36056/-26164) 182 files modified
ChangeLog (+50/-3) INSTALL (+2/-2) Makefile.in (+12/-6) NEWS (+46/-0) README (+4/-4) TODO (+1/-0) aclocal.m4 (+109/-42) config.h.in (+0/-6) configure (+1468/-1414) configure.ac (+80/-76) data/Makefile.am (+0/-1) data/Makefile.in (+1/-3) data/desktop/Makefile.in (+1/-2) data/desktop/desktop.sh (+6/-6) data/desktop/parole.desktop.in.in (+5/-5) data/gtk-2.0/Makefile.am (+0/-7) data/gtk-2.0/Makefile.in (+0/-612) data/gtk-2.0/parole.gtkrc (+0/-19) data/icons/128x128/Makefile.am (+7/-0) data/icons/128x128/Makefile.in (+613/-0) data/icons/16x16/Makefile.am (+2/-1) data/icons/16x16/Makefile.in (+3/-3) data/icons/16x16/parole-extension-symbolic.svg (+136/-0) data/icons/24x24/Makefile.in (+1/-2) data/icons/32x32/Makefile.in (+1/-2) data/icons/48x48/Makefile.in (+1/-2) data/icons/64x64/Makefile.am (+7/-0) data/icons/64x64/Makefile.in (+613/-0) data/icons/Makefile.am (+3/-1) data/icons/Makefile.in (+4/-3) data/icons/scalable/Makefile.in (+1/-2) data/icons/scalable/parole.svg (+913/-425) data/interfaces/Makefile.am (+4/-4) data/interfaces/Makefile.in (+3/-4) data/interfaces/mediachooser.ui (+41/-69) data/interfaces/mediachooser_ui.h (+48/-60) data/interfaces/open-location.ui (+41/-38) data/interfaces/open-location_ui.h (+77/-75) data/interfaces/parole-settings.ui (+796/-608) data/interfaces/parole-settings_ui.h (+366/-299) data/interfaces/parole.ui (+728/-746) data/interfaces/parole_ui.h (+537/-534) data/interfaces/playlist.ui (+93/-288) data/interfaces/playlist_ui.h (+127/-224) data/interfaces/plugins.ui (+121/-142) data/interfaces/plugins_ui.h (+116/-126) data/interfaces/save-playlist.ui (+28/-22) data/interfaces/save-playlist_ui.h (+64/-60) data/mime/Makefile.in (+1/-2) data/pixmaps/Makefile.am (+2/-1) data/pixmaps/Makefile.in (+3/-3) debian/changelog (+19/-0) debian/control (+10/-10) debian/copyright (+1/-1) debian/rules (+3/-3) docs/Makefile.in (+1/-2) docs/plugin-api/Makefile.am (+5/-0) docs/plugin-api/Makefile.in (+397/-19) docs/plugin-api/Parole-Plugins-docs.sgml (+36/-2) ltmain.sh (+2/-2) missing (+2/-2) po/POTFILES.in (+2/-0) po/ar.po (+494/-337) po/bg.po (+481/-329) po/cs.po (+500/-340) po/da.po (+697/-496) po/de.po (+592/-633) po/el.po (+702/-502) po/en_AU.po (+493/-337) po/es.po (+596/-453) po/eu.po (+577/-573) po/fi.po (+1128/-0) po/fr.po (+500/-343) po/he.po (+657/-509) po/hr.po (+560/-499) po/hu.po (+492/-335) po/id.po (+562/-403) po/it.po (+577/-606) po/ja.po (+509/-495) po/kk.po (+498/-338) po/ko.po (+581/-562) po/nl.po (+483/-331) po/oc.po (+1127/-0) po/pl.po (+590/-576) po/pt.po (+488/-331) po/pt_BR.po (+582/-586) po/ru.po (+520/-359) po/sr.po (+608/-480) po/tr.po (+491/-333) po/ug.po (+491/-335) po/uk.po (+583/-578) po/zh_CN.po (+582/-565) po/zh_TW.po (+576/-562) src/Makefile.in (+3/-4) src/common/Makefile.in (+3/-4) src/common/parole-common.c (+24/-27) src/common/parole-common.h (+11/-11) src/common/parole-rc-utils.c (+13/-13) src/common/parole-rc-utils.h (+21/-21) src/common/parole-screensaver.c (+3/-3) src/common/parole-screensaver.h (+8/-8) src/dbus/Makefile.in (+3/-4) src/dbus/parole-dbus.c (+19/-18) src/dbus/parole-dbus.h (+18/-18) src/gst/Makefile.in (+3/-4) src/gst/gstmarshal.c (+37/-0) src/gst/gstmarshal.h (+8/-0) src/gst/gstmarshal.list (+1/-1) src/gst/parole-gst.c (+1231/-1227) src/gst/parole-gst.h (+118/-108) src/main.c (+157/-165) src/misc/Makefile.in (+3/-4) src/misc/parole-debug.c (+5/-5) src/misc/parole-debug.h (+14/-14) src/misc/parole-file.c (+196/-196) src/misc/parole-file.h (+39/-31) src/misc/parole-filters.c (+16/-17) src/misc/parole-filters.h (+11/-16) src/misc/parole-pl-parser.c (+226/-207) src/misc/parole-pl-parser.h (+13/-13) src/misc/parole-provider-player.c (+230/-69) src/misc/parole-provider-player.h (+96/-62) src/misc/parole-provider-plugin.c (+17/-19) src/misc/parole-provider-plugin.h (+23/-21) src/misc/parole-stream.c (+434/-324) src/misc/parole-stream.h (+12/-11) src/misc/parole.h (+2/-2) src/org.parole.media.player.h (+9/-11) src/org.parole.media.player.xml (+3/-9) src/parole-about.c (+19/-19) src/parole-about.h (+1/-1) src/parole-builder.c (+5/-5) src/parole-builder.h (+3/-3) src/parole-button.c (+35/-35) src/parole-button.h (+7/-7) src/parole-conf-dialog.c (+187/-269) src/parole-conf-dialog.h (+7/-7) src/parole-conf.c (+227/-145) src/parole-conf.h (+5/-5) src/parole-disc.c (+126/-131) src/parole-disc.h (+13/-13) src/parole-mediachooser.c (+83/-54) src/parole-mediachooser.h (+3/-3) src/parole-medialist.c (+842/-1001) src/parole-medialist.h (+137/-103) src/parole-module.c (+55/-44) src/parole-module.h (+27/-27) src/parole-open-location.c (+35/-36) src/parole-open-location.h (+10/-10) src/parole-player.c (+2079/-1861) src/parole-player.h (+36/-24) src/parole-plugin-player.c (+136/-21) src/parole-plugin-player.h (+5/-5) src/parole-plugins-manager.c (+46/-43) src/parole-plugins-manager.h (+15/-15) src/parole-subtitle-encoding.c (+19/-16) src/parole-subtitle-encoding.h (+2/-2) src/parole-utils.c (+244/-244) src/parole-utils.h (+27/-27) src/parole-vis.c (+8/-8) src/parole-vis.h (+1/-1) src/plugins/Makefile.am (+5/-1) src/plugins/Makefile.in (+4/-4) src/plugins/mpris2/Makefile.am (+50/-0) src/plugins/mpris2/Makefile.in (+853/-0) src/plugins/mpris2/mpris2-plugin.c (+47/-0) src/plugins/mpris2/mpris2-provider.c (+1098/-0) src/plugins/mpris2/mpris2-provider.h (+47/-0) src/plugins/mpris2/mpris2.desktop.in (+6/-0) src/plugins/notify/Makefile.in (+3/-4) src/plugins/notify/notify-plugin.c (+6/-4) src/plugins/notify/notify-provider.c (+87/-52) src/plugins/notify/notify-provider.h (+4/-2) src/plugins/sample/Makefile.in (+3/-4) src/plugins/sample/sample-plugin.c (+5/-3) src/plugins/sample/sample-provider.c (+12/-10) src/plugins/sample/sample-provider.h (+4/-2) src/plugins/tray/Makefile.in (+3/-4) src/plugins/tray/tray-plugin.c (+5/-3) src/plugins/tray/tray-provider.c (+115/-96) src/plugins/tray/tray-provider.h (+4/-2) test-driver (+139/-0) |
||||
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/parole/0.6.0 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+203881@code.launchpad.net |
Commit message
Description of the change
New upstream release needed for xubuntu 14.04.
Debian won't upload since it needs a package they have in experimental
To post a comment you must log in.
Unmerged revisions
- 14. By Jackson Doak
-
update-maintainer
- 13. By Jackson Doak
-
Merge the new release in a way bzr likes
- 12. By Jackson Doak
-
Merge packaging for new upstream release from debian svn
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2013-12-05 21:58:41 +0000 |
3 | +++ ChangeLog 2014-01-30 07:12:45 +0000 |
4 | @@ -1,9 +1,56 @@ |
5 | -2013-12-04: bluesabre@xfce.org |
6 | - * Bugfix release 0.5.4 |
7 | +2014-01-25: bluesabre@xfce.org |
8 | + * Stable release 0.6.0 |
9 | + * Fix bug with DIR handles not being closed (bug #10600) |
10 | + * Fix crash for m3u files with all absolute paths |
11 | + * Added 128px appicon |
12 | + * Added Contents menu-item to Help menu |
13 | + |
14 | +2013-12-29: bluesabre@xfce.org |
15 | + * Development release 0.5.91 |
16 | + * Fix untranslatable strings (bug #10418) |
17 | * Fix loading of playlists with relative paths (bug #10436) |
18 | - * Fix file-filters for audio/video mimetypes (bug #10434) |
19 | + * Add realmedia video to supported video mimetypes (bug #10434) |
20 | * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) |
21 | + * Fix building with enable-debug=full on some platforms (bug #10525) |
22 | * Fix "Remove Duplicates" functionality. |
23 | + * Plugin API documentation updates |
24 | + * Fixed playlist search |
25 | + * New MPRIS2 plugin |
26 | + |
27 | +2013-10-19: bluesabre@xfce.org |
28 | + * Development release 0.5.90 |
29 | + * Completed port to GTK+3 |
30 | + - Remove deprecated GTK+2 items |
31 | + - Use GtkOverlay for player controls |
32 | + - Use symbolic icons for menus, plugins |
33 | + * Improved window maximization |
34 | + - Window dimensions are no longer saved when maximizing |
35 | + - Added "window-maximized" setting to xfconf to keep maximization across sessions |
36 | + * Rearranged and improved menubar |
37 | + - Renamed "Edit" menu to "Playback" |
38 | + - Renamed "Languages" menu item to "Audio Track" |
39 | + - Added Tools menu |
40 | + - Moved Plugins and Preferences to Tools menu |
41 | + - Added DVD menu (visible only when a DVD or DVD ISO is being played) |
42 | + - Added "Save Playlist" item to Media menu |
43 | + - Added "Report Bug" item to Help menu |
44 | + * Improved playlist |
45 | + - Use symbolic icons in an inline toolbar |
46 | + - Removed redundant settings button |
47 | + - Added Move Up/Down buttons |
48 | + * Updated/improved included plugins |
49 | + - Added Previous/Next Track menu items to Tray plugin |
50 | + - Added Previous/Next Track menu items to Notification plugin |
51 | + * Other improvements |
52 | + - Updated artwork (background image, icons) |
53 | + - Fixed GStreamer 1.0 support |
54 | + - Added ability to play DVD ISOs from the Open dialog |
55 | + - Plugins now correctly report when they fail to load |
56 | + * Bugs fixed |
57 | + - missing option to open DVD from iso (bug #10300) |
58 | + - Allow a playlist to be sorted and/or items to be moved (bug #10066) |
59 | + - Remember playlist option in GUI not working (bug #10269) |
60 | + - Parole show irritating edge (bug #10081) |
61 | |
62 | 2013-08-03: bluesabre@xfce.org |
63 | * Bugfix release 0.5.3 |
64 | |
65 | === modified file 'INSTALL' |
66 | --- INSTALL 2013-12-05 21:58:41 +0000 |
67 | +++ INSTALL 2014-01-30 07:12:45 +0000 |
68 | @@ -12,8 +12,8 @@ |
69 | Basic Installation |
70 | ================== |
71 | |
72 | - Briefly, the shell commands `./configure; make; make install' should |
73 | -configure, build, and install this package. The following |
74 | + Briefly, the shell command `./configure && make && make install' |
75 | +should configure, build, and install this package. The following |
76 | more-detailed instructions are generic; see the `README' file for |
77 | instructions specific to this package. Some packages provide this |
78 | `INSTALL' file but do not implement all of the features documented |
79 | |
80 | === modified file 'Makefile.in' |
81 | --- Makefile.in 2013-12-05 21:58:41 +0000 |
82 | +++ Makefile.in 2014-01-30 07:12:45 +0000 |
83 | @@ -1,4 +1,4 @@ |
84 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
85 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
86 | # @configure_input@ |
87 | |
88 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
89 | @@ -82,7 +82,7 @@ |
90 | $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
91 | $(top_srcdir)/configure $(am__configure_deps) \ |
92 | $(srcdir)/config.h.in COPYING THANKS TODO compile config.guess \ |
93 | - config.sub depcomp install-sh missing ltmain.sh |
94 | + config.sub install-sh missing ltmain.sh |
95 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
96 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
97 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
98 | @@ -407,7 +407,6 @@ |
99 | docdir = @docdir@ |
100 | dvidir = @dvidir@ |
101 | exec_prefix = @exec_prefix@ |
102 | -gtkrcdir = @gtkrcdir@ |
103 | host = @host@ |
104 | host_alias = @host_alias@ |
105 | host_cpu = @host_cpu@ |
106 | @@ -499,8 +498,8 @@ |
107 | $(am__aclocal_m4_deps): |
108 | |
109 | config.h: stamp-h1 |
110 | - @if test ! -f $@; then rm -f stamp-h1; else :; fi |
111 | - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
112 | + @test -f $@ || rm -f stamp-h1 |
113 | + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
114 | |
115 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
116 | @rm -f stamp-h1 |
117 | @@ -708,10 +707,16 @@ |
118 | $(am__post_remove_distdir) |
119 | |
120 | dist-tarZ: distdir |
121 | + @echo WARNING: "Support for shar distribution archives is" \ |
122 | + "deprecated." >&2 |
123 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
124 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
125 | $(am__post_remove_distdir) |
126 | |
127 | dist-shar: distdir |
128 | + @echo WARNING: "Support for distribution archives compressed with" \ |
129 | + "legacy program 'compress' is deprecated." >&2 |
130 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
131 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
132 | $(am__post_remove_distdir) |
133 | |
134 | @@ -753,9 +758,10 @@ |
135 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
136 | && am__cwd=`pwd` \ |
137 | && $(am__cd) $(distdir)/_build \ |
138 | - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
139 | + && ../configure \ |
140 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
141 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
142 | + --srcdir=.. --prefix="$$dc_install_base" \ |
143 | && $(MAKE) $(AM_MAKEFLAGS) \ |
144 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
145 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
146 | |
147 | === modified file 'NEWS' |
148 | --- NEWS 2013-03-07 14:04:30 +0000 |
149 | +++ NEWS 2014-01-30 07:12:45 +0000 |
150 | @@ -1,3 +1,49 @@ |
151 | +0.6.0 |
152 | +======= |
153 | +- Completed port to GTK+3 |
154 | + - Remove deprecated GTK+2 items |
155 | + - Use GtkOverlay for player controls |
156 | + - Use symbolic icons for menus, plugins |
157 | +- Improved window maximization |
158 | + - Window dimensions are no longer saved when maximizing |
159 | + - Added "window-maximized" setting to xfconf to keep maximization across sessions |
160 | +- Rearranged and improved menubar |
161 | + - Renamed "Edit" menu to "Playback" |
162 | + - Renamed "Languages" menu item to "Audio Track" |
163 | + - Added Tools menu |
164 | + - Moved Plugins and Preferences to Tools menu |
165 | + - Added DVD menu (visible only when a DVD or DVD ISO is being played) |
166 | + - Added "Save Playlist" item to Media menu |
167 | + - Added "Contents" item to Help menu |
168 | + - Added "Report Bug" item to Help menu |
169 | +- Improved playlist |
170 | + - Use symbolic icons in an inline toolbar |
171 | + - Removed redundant settings button |
172 | + - Added Move Up/Down buttons |
173 | + - Improved search |
174 | +- Plugin updates |
175 | + - Added Previous/Next Track menu items to Tray plugin |
176 | + - Added Previous/Next Track menu items to Notification plugin |
177 | + - Added NEW MPRIS2 plugin |
178 | +- Other improvements |
179 | + - Updated artwork (background image, icons) |
180 | + - Fixed GStreamer 1.0 support |
181 | + - Added ability to play DVD ISOs from the Open dialog |
182 | + - Plugins now correctly report when they fail to load |
183 | + - Plugin API documentation updates |
184 | +- Bugs fixed |
185 | + - Fixed missing option to open DVD from iso (bug #10300) |
186 | + - Fixed allowing a playlist to be sorted and/or items to be moved (bug #10066) |
187 | + - Fixed Remember playlist option in GUI not working (bug #10269) |
188 | + - Fixed Parole showing irritating edge (bug #10081) |
189 | + - Fixed untranslatable strings (bug #10418) |
190 | + - Fixed loading of playlists with relative paths (bug #10436) |
191 | + - Added realmedia video to supported video mimetypes (bug #10434) |
192 | + - Fixed IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) |
193 | + - Fixed building with enable-debug=full on some platforms (bug #10525) |
194 | + - Fixed crash for m3u files with all absolute paths |
195 | + - Fixed "Remove Duplicates" functionality. |
196 | + |
197 | 0.5.0 |
198 | ======= |
199 | - Fixed potential file name clash in parole extension (bug #9728) |
200 | |
201 | === modified file 'README' |
202 | --- README 2013-06-03 22:20:52 +0000 |
203 | +++ README 2014-01-30 07:12:45 +0000 |
204 | @@ -10,14 +10,14 @@ |
205 | ================= |
206 | Parole depends on the following packages: |
207 | |
208 | - - Gtk 2.24 or above. |
209 | + - Gtk 3.2 or above. |
210 | - Glib 2.32 or above. |
211 | - - Gio 2.16 or above. |
212 | + - Gio 2.28 or above. |
213 | - DBus 0.60 or above. |
214 | - DBus glib 0.70 or above. |
215 | - GStreamer: base, video, interface and GStreamer X, version 0.10.24 or above. |
216 | - - libxfce4ui 4.8.0 or above. |
217 | - - libxfce4util 4.8.0 or above. |
218 | + - libxfce4ui 4.11.0 or above. |
219 | + - libxfce4util 4.11.0 or above. |
220 | |
221 | How to report bugs? |
222 | =================== |
223 | |
224 | === modified file 'TODO' |
225 | --- TODO 2013-01-09 19:08:53 +0000 |
226 | +++ TODO 2014-01-30 07:12:45 +0000 |
227 | @@ -1,3 +1,4 @@ |
228 | + |
229 | === Media player === |
230 | * Support scale ratio view. |
231 | |
232 | |
233 | === modified file 'aclocal.m4' |
234 | --- aclocal.m4 2013-12-05 21:58:41 +0000 |
235 | +++ aclocal.m4 2014-01-30 07:12:45 +0000 |
236 | @@ -1,4 +1,4 @@ |
237 | -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- |
238 | +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
239 | |
240 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
241 | |
242 | @@ -457,7 +457,7 @@ |
243 | |
244 | |
245 | # nls.m4 serial 5 (gettext-0.18) |
246 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
247 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
248 | dnl Inc. |
249 | dnl This file is free software; the Free Software Foundation |
250 | dnl gives unlimited permission to copy and/or distribute it, |
251 | @@ -661,10 +661,10 @@ |
252 | # generated from the m4 files accompanying Automake X.Y. |
253 | # (This private macro should not be called outside this file.) |
254 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
255 | -[am__api_version='1.13' |
256 | +[am__api_version='1.14' |
257 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
258 | dnl require some minimum version. Point them to the right macro. |
259 | -m4_if([$1], [1.13.3], [], |
260 | +m4_if([$1], [1.14.1], [], |
261 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
262 | ]) |
263 | |
264 | @@ -680,7 +680,7 @@ |
265 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
266 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
267 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
268 | -[AM_AUTOMAKE_VERSION([1.13.3])dnl |
269 | +[AM_AUTOMAKE_VERSION([1.14.1])dnl |
270 | m4_ifndef([AC_AUTOCONF_VERSION], |
271 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
272 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
273 | @@ -1047,6 +1047,12 @@ |
274 | # This macro actually does too much. Some checks are only needed if |
275 | # your package does certain things. But this isn't really a big deal. |
276 | |
277 | +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
278 | +m4_define([AC_PROG_CC], |
279 | +m4_defn([AC_PROG_CC]) |
280 | +[_AM_PROG_CC_C_O |
281 | +]) |
282 | + |
283 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
284 | # AM_INIT_AUTOMAKE([OPTIONS]) |
285 | # ----------------------------------------------- |
286 | @@ -1155,7 +1161,48 @@ |
287 | AC_CONFIG_COMMANDS_PRE(dnl |
288 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
289 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
290 | -]) |
291 | + |
292 | +# POSIX will say in a future version that running "rm -f" with no argument |
293 | +# is OK; and we want to be able to make that assumption in our Makefile |
294 | +# recipes. So use an aggressive probe to check that the usage we want is |
295 | +# actually supported "in the wild" to an acceptable degree. |
296 | +# See automake bug#10828. |
297 | +# To make any issue more visible, cause the running configure to be aborted |
298 | +# by default if the 'rm' program in use doesn't match our expectations; the |
299 | +# user can still override this though. |
300 | +if rm -f && rm -fr && rm -rf; then : OK; else |
301 | + cat >&2 <<'END' |
302 | +Oops! |
303 | + |
304 | +Your 'rm' program seems unable to run without file operands specified |
305 | +on the command line, even when the '-f' option is present. This is contrary |
306 | +to the behaviour of most rm programs out there, and not conforming with |
307 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
308 | + |
309 | +Please tell bug-automake@gnu.org about your system, including the value |
310 | +of your $PATH and any error possibly output before this message. This |
311 | +can help us improve future automake versions. |
312 | + |
313 | +END |
314 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
315 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
316 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
317 | + echo >&2 |
318 | + else |
319 | + cat >&2 <<'END' |
320 | +Aborting the configuration process, to ensure you take notice of the issue. |
321 | + |
322 | +You can download and install GNU coreutils to get an 'rm' implementation |
323 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
324 | + |
325 | +If you want to complete the configuration process using your problematic |
326 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
327 | +to "yes", and re-run configure. |
328 | + |
329 | +END |
330 | + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
331 | + fi |
332 | +fi]) |
333 | |
334 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
335 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
336 | @@ -1163,7 +1210,6 @@ |
337 | m4_define([_AC_COMPILER_EXEEXT], |
338 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
339 | |
340 | - |
341 | # When config.status generates a header, we must update the stamp-h file. |
342 | # This file resides in the same directory as the config header |
343 | # that is generated. The stamp files are numbered to have different names. |
344 | @@ -1311,38 +1357,6 @@ |
345 | rm -f confinc confmf |
346 | ]) |
347 | |
348 | -# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
349 | -# |
350 | -# This file is free software; the Free Software Foundation |
351 | -# gives unlimited permission to copy and/or distribute it, |
352 | -# with or without modifications, as long as this notice is preserved. |
353 | - |
354 | -# AM_PROG_CC_C_O |
355 | -# -------------- |
356 | -# Like AC_PROG_CC_C_O, but changed for automake. |
357 | -AC_DEFUN([AM_PROG_CC_C_O], |
358 | -[AC_REQUIRE([AC_PROG_CC_C_O])dnl |
359 | -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
360 | -AC_REQUIRE_AUX_FILE([compile])dnl |
361 | -# FIXME: we rely on the cache variable name because |
362 | -# there is no other way. |
363 | -set dummy $CC |
364 | -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` |
365 | -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
366 | -if test "$am_t" != yes; then |
367 | - # Losing compiler, so override with the script. |
368 | - # FIXME: It is wrong to rewrite CC. |
369 | - # But if we don't then we get into trouble of one sort or another. |
370 | - # A longer-term fix would be to have automake use am__CC in this case, |
371 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
372 | - CC="$am_aux_dir/compile $CC" |
373 | -fi |
374 | -dnl Make sure AC_PROG_CC is never called again, or it will override our |
375 | -dnl setting of CC. |
376 | -m4_define([AC_PROG_CC], |
377 | - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) |
378 | -]) |
379 | - |
380 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
381 | |
382 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. |
383 | @@ -1442,6 +1456,53 @@ |
384 | AC_DEFUN([_AM_IF_OPTION], |
385 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
386 | |
387 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
388 | +# |
389 | +# This file is free software; the Free Software Foundation |
390 | +# gives unlimited permission to copy and/or distribute it, |
391 | +# with or without modifications, as long as this notice is preserved. |
392 | + |
393 | +# _AM_PROG_CC_C_O |
394 | +# --------------- |
395 | +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
396 | +# to automatically call this. |
397 | +AC_DEFUN([_AM_PROG_CC_C_O], |
398 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
399 | +AC_REQUIRE_AUX_FILE([compile])dnl |
400 | +AC_LANG_PUSH([C])dnl |
401 | +AC_CACHE_CHECK( |
402 | + [whether $CC understands -c and -o together], |
403 | + [am_cv_prog_cc_c_o], |
404 | + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
405 | + # Make sure it works both with $CC and with simple cc. |
406 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
407 | + # compilers refuse to overwrite an existing .o file with -o, |
408 | + # though they will create one. |
409 | + am_cv_prog_cc_c_o=yes |
410 | + for am_i in 1 2; do |
411 | + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
412 | + && test -f conftest2.$ac_objext; then |
413 | + : OK |
414 | + else |
415 | + am_cv_prog_cc_c_o=no |
416 | + break |
417 | + fi |
418 | + done |
419 | + rm -f core conftest* |
420 | + unset am_i]) |
421 | +if test "$am_cv_prog_cc_c_o" != yes; then |
422 | + # Losing compiler, so override with the script. |
423 | + # FIXME: It is wrong to rewrite CC. |
424 | + # But if we don't then we get into trouble of one sort or another. |
425 | + # A longer-term fix would be to have automake use am__CC in this case, |
426 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
427 | + CC="$am_aux_dir/compile $CC" |
428 | +fi |
429 | +AC_LANG_POP([C])]) |
430 | + |
431 | +# For backward compatibility. |
432 | +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
433 | + |
434 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
435 | # |
436 | # This file is free software; the Free Software Foundation |
437 | @@ -3373,7 +3434,7 @@ |
438 | rm -rf conftest* |
439 | ;; |
440 | |
441 | -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
442 | +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
443 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
444 | # Find out which ABI we are using. |
445 | echo 'int i;' > conftest.$ac_ext |
446 | @@ -3394,7 +3455,10 @@ |
447 | ;; |
448 | esac |
449 | ;; |
450 | - ppc64-*linux*|powerpc64-*linux*) |
451 | + powerpc64le-*) |
452 | + LD="${LD-ld} -m elf32lppclinux" |
453 | + ;; |
454 | + powerpc64-*) |
455 | LD="${LD-ld} -m elf32ppclinux" |
456 | ;; |
457 | s390x-*linux*) |
458 | @@ -3413,7 +3477,10 @@ |
459 | x86_64-*linux*) |
460 | LD="${LD-ld} -m elf_x86_64" |
461 | ;; |
462 | - ppc*-*linux*|powerpc*-*linux*) |
463 | + powerpcle-*) |
464 | + LD="${LD-ld} -m elf64lppc" |
465 | + ;; |
466 | + powerpc-*) |
467 | LD="${LD-ld} -m elf64ppc" |
468 | ;; |
469 | s390*-*linux*|s390*-*tpf*) |
470 | |
471 | === modified file 'config.h.in' |
472 | --- config.h.in 2013-03-07 14:04:30 +0000 |
473 | +++ config.h.in 2014-01-30 07:12:45 +0000 |
474 | @@ -15,9 +15,6 @@ |
475 | /* Define the GStreamer+ API version */ |
476 | #undef GSTREAMER_API_VERSION |
477 | |
478 | -/* pixmaps directory */ |
479 | -#undef GTKRC_DIR |
480 | - |
481 | /* Define to 1 if you have the `bind_textdomain_codeset' function. */ |
482 | #undef HAVE_BIND_TEXTDOMAIN_CODESET |
483 | |
484 | @@ -100,9 +97,6 @@ |
485 | */ |
486 | #undef LT_OBJDIR |
487 | |
488 | -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ |
489 | -#undef NO_MINUS_C_MINUS_O |
490 | - |
491 | /* Name of package */ |
492 | #undef PACKAGE |
493 | |
494 | |
495 | === modified file 'configure' |
496 | --- configure 2013-12-05 21:58:41 +0000 |
497 | +++ configure 2014-01-30 07:12:45 +0000 |
498 | @@ -1,8 +1,8 @@ |
499 | #! /bin/sh |
500 | # Guess values for system-dependent variables and create Makefiles. |
501 | -# Generated by GNU Autoconf 2.69 for parole 0.5.4. |
502 | +# Generated by GNU Autoconf 2.69 for parole 0.6.0. |
503 | # |
504 | -# Report bugs to <aliov@xfce.org>. |
505 | +# Report bugs to <http://docs.xfce.org/apps/parole/bugs>. |
506 | # |
507 | # |
508 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
509 | @@ -274,11 +274,11 @@ |
510 | $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" |
511 | $as_echo "$0: be upgraded to zsh 4.3.4 or later." |
512 | else |
513 | - $as_echo "$0: Please tell bug-autoconf@gnu.org and aliov@xfce.org |
514 | -$0: about your system, including any error possibly output |
515 | -$0: before this message. Then install a modern shell, or |
516 | -$0: manually run the script under such a shell if you do |
517 | -$0: have one." |
518 | + $as_echo "$0: Please tell bug-autoconf@gnu.org and |
519 | +$0: http://docs.xfce.org/apps/parole/bugs about your |
520 | +$0: system, including any error possibly output before this |
521 | +$0: message. Then install a modern shell, or manually run |
522 | +$0: the script under such a shell if you do have one." |
523 | fi |
524 | exit 1 |
525 | fi |
526 | @@ -590,9 +590,9 @@ |
527 | # Identity of this package. |
528 | PACKAGE_NAME='parole' |
529 | PACKAGE_TARNAME='parole' |
530 | -PACKAGE_VERSION='0.5.4' |
531 | -PACKAGE_STRING='parole 0.5.4' |
532 | -PACKAGE_BUGREPORT='aliov@xfce.org' |
533 | +PACKAGE_VERSION='0.6.0' |
534 | +PACKAGE_STRING='parole 0.6.0' |
535 | +PACKAGE_BUGREPORT='http://docs.xfce.org/apps/parole/bugs' |
536 | PACKAGE_URL='' |
537 | |
538 | # Factoring default headers for most tests. |
539 | @@ -651,6 +651,8 @@ |
540 | GTKDOC_MKPDF |
541 | GTKDOC_REBASE |
542 | GTKDOC_CHECK |
543 | +PAROLE_MPRIS2_PLUGIN_FALSE |
544 | +PAROLE_MPRIS2_PLUGIN_TRUE |
545 | PAROLE_TRAY_PLUGIN_FALSE |
546 | PAROLE_TRAY_PLUGIN_TRUE |
547 | LIBNOTIFY_REQUIRED_VERSION |
548 | @@ -668,7 +670,6 @@ |
549 | TAGLIB_CFLAGS |
550 | TAGLIB_VERSION |
551 | pixmapsdir |
552 | -gtkrcdir |
553 | LIBX11_LIBS |
554 | LIBX11_LDFLAGS |
555 | LIBX11_CFLAGS |
556 | @@ -677,26 +678,6 @@ |
557 | X_PRE_LIBS |
558 | X_CFLAGS |
559 | XMKMF |
560 | -XFCONF_REQUIRED_VERSION |
561 | -XFCONF_LIBS |
562 | -XFCONF_CFLAGS |
563 | -XFCONF_VERSION |
564 | -LIBXFCE4UTIL_REQUIRED_VERSION |
565 | -LIBXFCE4UTIL_LIBS |
566 | -LIBXFCE4UTIL_CFLAGS |
567 | -LIBXFCE4UTIL_VERSION |
568 | -LIBXFCE4UI_REQUIRED_VERSION |
569 | -LIBXFCE4UI_LIBS |
570 | -LIBXFCE4UI_CFLAGS |
571 | -LIBXFCE4UI_VERSION |
572 | -DBUS_GLIB_REQUIRED_VERSION |
573 | -DBUS_GLIB_LIBS |
574 | -DBUS_GLIB_CFLAGS |
575 | -DBUS_GLIB_VERSION |
576 | -DBUS_REQUIRED_VERSION |
577 | -DBUS_LIBS |
578 | -DBUS_CFLAGS |
579 | -DBUS_VERSION |
580 | GST_INTERFACES_REQUIRED_VERSION |
581 | GST_INTERFACES_LIBS |
582 | GST_INTERFACES_CFLAGS |
583 | @@ -717,6 +698,30 @@ |
584 | GST_LIBS |
585 | GST_CFLAGS |
586 | GST_VERSION |
587 | +GTK_REQUIRED_VERSION |
588 | +GTK_LIBS |
589 | +GTK_CFLAGS |
590 | +GTK_VERSION |
591 | +LIBXFCE4UI_REQUIRED_VERSION |
592 | +LIBXFCE4UI_LIBS |
593 | +LIBXFCE4UI_CFLAGS |
594 | +LIBXFCE4UI_VERSION |
595 | +XFCONF_REQUIRED_VERSION |
596 | +XFCONF_LIBS |
597 | +XFCONF_CFLAGS |
598 | +XFCONF_VERSION |
599 | +LIBXFCE4UTIL_REQUIRED_VERSION |
600 | +LIBXFCE4UTIL_LIBS |
601 | +LIBXFCE4UTIL_CFLAGS |
602 | +LIBXFCE4UTIL_VERSION |
603 | +DBUS_GLIB_REQUIRED_VERSION |
604 | +DBUS_GLIB_LIBS |
605 | +DBUS_GLIB_CFLAGS |
606 | +DBUS_GLIB_VERSION |
607 | +DBUS_REQUIRED_VERSION |
608 | +DBUS_LIBS |
609 | +DBUS_CFLAGS |
610 | +DBUS_VERSION |
611 | GIO_REQUIRED_VERSION |
612 | GIO_LIBS |
613 | GIO_CFLAGS |
614 | @@ -737,10 +742,6 @@ |
615 | GLIB_LIBS |
616 | GLIB_CFLAGS |
617 | GLIB_VERSION |
618 | -GTK_REQUIRED_VERSION |
619 | -GTK_LIBS |
620 | -GTK_CFLAGS |
621 | -GTK_VERSION |
622 | PKG_CONFIG_LIBDIR |
623 | PKG_CONFIG_PATH |
624 | PKG_CONFIG |
625 | @@ -940,6 +941,7 @@ |
626 | enable_taglib |
627 | enable_notify_plugin |
628 | enable_tray_plugin |
629 | +enable_mpris2_plugin |
630 | enable_debug |
631 | with_html_dir |
632 | enable_gtk_doc |
633 | @@ -1505,7 +1507,7 @@ |
634 | # Omit some internal or obsolete options to make the list less imposing. |
635 | # This message is too long to be a string in the A/UX 3.1 sh. |
636 | cat <<_ACEOF |
637 | -\`configure' configures parole 0.5.4 to adapt to many kinds of systems. |
638 | +\`configure' configures parole 0.6.0 to adapt to many kinds of systems. |
639 | |
640 | Usage: $0 [OPTION]... [VAR=VALUE]... |
641 | |
642 | @@ -1579,7 +1581,7 @@ |
643 | |
644 | if test -n "$ac_init_help"; then |
645 | case $ac_init_help in |
646 | - short | recursive ) echo "Configuration of parole 0.5.4:";; |
647 | + short | recursive ) echo "Configuration of parole 0.6.0:";; |
648 | esac |
649 | cat <<\_ACEOF |
650 | |
651 | @@ -1607,6 +1609,7 @@ |
652 | --disable-taglib Disable checking for tag lib |
653 | --disable-notify-plugin Don't build parole notification plugin |
654 | --disable-tray-plugin Don't build parole tray icon plugin |
655 | + --disable-mpris2-plugin Don't build parole mpris2 plugin |
656 | --enable-debug[=no|minimum|yes|full] |
657 | Build with debugging support [default=[]] |
658 | --disable-debug Include no debugging support |
659 | @@ -1627,7 +1630,7 @@ |
660 | |
661 | --with-gstreamer=0.10|1.0 |
662 | which gstreamer version to compile against (default: |
663 | - 0.10) |
664 | + 1.0) |
665 | --with-x use the X Window System |
666 | --with-html-dir=PATH path to installed docs |
667 | |
668 | @@ -1657,7 +1660,7 @@ |
669 | Use these variables to override the choices made by `configure' or to help |
670 | it to find libraries and programs with nonstandard names/locations. |
671 | |
672 | -Report bugs to <aliov@xfce.org>. |
673 | +Report bugs to <http://docs.xfce.org/apps/parole/bugs>. |
674 | _ACEOF |
675 | ac_status=$? |
676 | fi |
677 | @@ -1720,7 +1723,7 @@ |
678 | test -n "$ac_init_help" && exit $ac_status |
679 | if $ac_init_version; then |
680 | cat <<\_ACEOF |
681 | -parole configure 0.5.4 |
682 | +parole configure 0.6.0 |
683 | generated by GNU Autoconf 2.69 |
684 | |
685 | Copyright (C) 2012 Free Software Foundation, Inc. |
686 | @@ -1879,9 +1882,9 @@ |
687 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
688 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
689 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
690 | -( $as_echo "## ----------------------------- ## |
691 | -## Report this to aliov@xfce.org ## |
692 | -## ----------------------------- ##" |
693 | +( $as_echo "## ---------------------------------------------------- ## |
694 | +## Report this to http://docs.xfce.org/apps/parole/bugs ## |
695 | +## ---------------------------------------------------- ##" |
696 | ) | sed "s/^/$as_me: WARNING: /" >&2 |
697 | ;; |
698 | esac |
699 | @@ -2256,7 +2259,7 @@ |
700 | This file contains any messages produced by compilers while |
701 | running configure, to aid debugging if configure makes a mistake. |
702 | |
703 | -It was created by parole $as_me 0.5.4, which was |
704 | +It was created by parole $as_me 0.6.0, which was |
705 | generated by GNU Autoconf 2.69. Invocation command line was |
706 | |
707 | $ $0 $@ |
708 | @@ -2608,7 +2611,7 @@ |
709 | |
710 | |
711 | |
712 | -am__api_version='1.13' |
713 | +am__api_version='1.14' |
714 | |
715 | ac_aux_dir= |
716 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
717 | @@ -3123,7 +3126,7 @@ |
718 | |
719 | # Define the identity of the package. |
720 | PACKAGE='parole' |
721 | - VERSION='0.5.4' |
722 | + VERSION='0.6.0' |
723 | |
724 | |
725 | cat >>confdefs.h <<_ACEOF |
726 | @@ -3290,6 +3293,47 @@ |
727 | |
728 | |
729 | |
730 | +# POSIX will say in a future version that running "rm -f" with no argument |
731 | +# is OK; and we want to be able to make that assumption in our Makefile |
732 | +# recipes. So use an aggressive probe to check that the usage we want is |
733 | +# actually supported "in the wild" to an acceptable degree. |
734 | +# See automake bug#10828. |
735 | +# To make any issue more visible, cause the running configure to be aborted |
736 | +# by default if the 'rm' program in use doesn't match our expectations; the |
737 | +# user can still override this though. |
738 | +if rm -f && rm -fr && rm -rf; then : OK; else |
739 | + cat >&2 <<'END' |
740 | +Oops! |
741 | + |
742 | +Your 'rm' program seems unable to run without file operands specified |
743 | +on the command line, even when the '-f' option is present. This is contrary |
744 | +to the behaviour of most rm programs out there, and not conforming with |
745 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
746 | + |
747 | +Please tell bug-automake@gnu.org about your system, including the value |
748 | +of your $PATH and any error possibly output before this message. This |
749 | +can help us improve future automake versions. |
750 | + |
751 | +END |
752 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
753 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
754 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
755 | + echo >&2 |
756 | + else |
757 | + cat >&2 <<'END' |
758 | +Aborting the configuration process, to ensure you take notice of the issue. |
759 | + |
760 | +You can download and install GNU coreutils to get an 'rm' implementation |
761 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
762 | + |
763 | +If you want to complete the configuration process using your problematic |
764 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
765 | +to "yes", and re-run configure. |
766 | + |
767 | +END |
768 | + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 |
769 | + fi |
770 | +fi |
771 | ac_config_headers="$ac_config_headers config.h" |
772 | |
773 | |
774 | @@ -3318,7 +3362,7 @@ |
775 | |
776 | |
777 | else |
778 | - if test x${enable_debug} != x"no"; then |
779 | + if test x${enable_debug} != x"no"; then |
780 | |
781 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
782 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
783 | @@ -3342,7 +3386,7 @@ |
784 | MAINT=$MAINTAINER_MODE_TRUE |
785 | |
786 | |
787 | - else |
788 | + else |
789 | |
790 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
791 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
792 | @@ -3366,7 +3410,7 @@ |
793 | MAINT=$MAINTAINER_MODE_TRUE |
794 | |
795 | |
796 | - fi |
797 | + fi |
798 | fi |
799 | |
800 | # Check whether --enable-silent-rules was given. |
801 | @@ -4261,6 +4305,65 @@ |
802 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
803 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
804 | |
805 | +ac_ext=c |
806 | +ac_cpp='$CPP $CPPFLAGS' |
807 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
808 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
809 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
810 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
811 | +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
812 | +if ${am_cv_prog_cc_c_o+:} false; then : |
813 | + $as_echo_n "(cached) " >&6 |
814 | +else |
815 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
816 | +/* end confdefs.h. */ |
817 | + |
818 | +int |
819 | +main () |
820 | +{ |
821 | + |
822 | + ; |
823 | + return 0; |
824 | +} |
825 | +_ACEOF |
826 | + # Make sure it works both with $CC and with simple cc. |
827 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
828 | + # compilers refuse to overwrite an existing .o file with -o, |
829 | + # though they will create one. |
830 | + am_cv_prog_cc_c_o=yes |
831 | + for am_i in 1 2; do |
832 | + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
833 | + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
834 | + ac_status=$? |
835 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
836 | + (exit $ac_status); } \ |
837 | + && test -f conftest2.$ac_objext; then |
838 | + : OK |
839 | + else |
840 | + am_cv_prog_cc_c_o=no |
841 | + break |
842 | + fi |
843 | + done |
844 | + rm -f core conftest* |
845 | + unset am_i |
846 | +fi |
847 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
848 | +$as_echo "$am_cv_prog_cc_c_o" >&6; } |
849 | +if test "$am_cv_prog_cc_c_o" != yes; then |
850 | + # Losing compiler, so override with the script. |
851 | + # FIXME: It is wrong to rewrite CC. |
852 | + # But if we don't then we get into trouble of one sort or another. |
853 | + # A longer-term fix would be to have automake use am__CC in this case, |
854 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
855 | + CC="$am_aux_dir/compile $CC" |
856 | +fi |
857 | +ac_ext=c |
858 | +ac_cpp='$CPP $CPPFLAGS' |
859 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
860 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
861 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
862 | + |
863 | + |
864 | depcc="$CC" am_compiler_list= |
865 | |
866 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
867 | @@ -5391,6 +5494,65 @@ |
868 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
869 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
870 | |
871 | +ac_ext=c |
872 | +ac_cpp='$CPP $CPPFLAGS' |
873 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
874 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
875 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
876 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
877 | +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
878 | +if ${am_cv_prog_cc_c_o+:} false; then : |
879 | + $as_echo_n "(cached) " >&6 |
880 | +else |
881 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
882 | +/* end confdefs.h. */ |
883 | + |
884 | +int |
885 | +main () |
886 | +{ |
887 | + |
888 | + ; |
889 | + return 0; |
890 | +} |
891 | +_ACEOF |
892 | + # Make sure it works both with $CC and with simple cc. |
893 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
894 | + # compilers refuse to overwrite an existing .o file with -o, |
895 | + # though they will create one. |
896 | + am_cv_prog_cc_c_o=yes |
897 | + for am_i in 1 2; do |
898 | + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
899 | + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
900 | + ac_status=$? |
901 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
902 | + (exit $ac_status); } \ |
903 | + && test -f conftest2.$ac_objext; then |
904 | + : OK |
905 | + else |
906 | + am_cv_prog_cc_c_o=no |
907 | + break |
908 | + fi |
909 | + done |
910 | + rm -f core conftest* |
911 | + unset am_i |
912 | +fi |
913 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
914 | +$as_echo "$am_cv_prog_cc_c_o" >&6; } |
915 | +if test "$am_cv_prog_cc_c_o" != yes; then |
916 | + # Losing compiler, so override with the script. |
917 | + # FIXME: It is wrong to rewrite CC. |
918 | + # But if we don't then we get into trouble of one sort or another. |
919 | + # A longer-term fix would be to have automake use am__CC in this case, |
920 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
921 | + CC="$am_aux_dir/compile $CC" |
922 | +fi |
923 | +ac_ext=c |
924 | +ac_cpp='$CPP $CPPFLAGS' |
925 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
926 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
927 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
928 | + |
929 | + |
930 | depcc="$CC" am_compiler_list= |
931 | |
932 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
933 | @@ -5904,131 +6066,6 @@ |
934 | fi |
935 | |
936 | |
937 | -if test "x$CC" != xcc; then |
938 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 |
939 | -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } |
940 | -else |
941 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 |
942 | -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } |
943 | -fi |
944 | -set dummy $CC; ac_cc=`$as_echo "$2" | |
945 | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
946 | -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : |
947 | - $as_echo_n "(cached) " >&6 |
948 | -else |
949 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
950 | -/* end confdefs.h. */ |
951 | - |
952 | -int |
953 | -main () |
954 | -{ |
955 | - |
956 | - ; |
957 | - return 0; |
958 | -} |
959 | -_ACEOF |
960 | -# Make sure it works both with $CC and with simple cc. |
961 | -# We do the test twice because some compilers refuse to overwrite an |
962 | -# existing .o file with -o, though they will create one. |
963 | -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
964 | -rm -f conftest2.* |
965 | -if { { case "(($ac_try" in |
966 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
967 | - *) ac_try_echo=$ac_try;; |
968 | -esac |
969 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
970 | -$as_echo "$ac_try_echo"; } >&5 |
971 | - (eval "$ac_try") 2>&5 |
972 | - ac_status=$? |
973 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
974 | - test $ac_status = 0; } && |
975 | - test -f conftest2.$ac_objext && { { case "(($ac_try" in |
976 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
977 | - *) ac_try_echo=$ac_try;; |
978 | -esac |
979 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
980 | -$as_echo "$ac_try_echo"; } >&5 |
981 | - (eval "$ac_try") 2>&5 |
982 | - ac_status=$? |
983 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
984 | - test $ac_status = 0; }; |
985 | -then |
986 | - eval ac_cv_prog_cc_${ac_cc}_c_o=yes |
987 | - if test "x$CC" != xcc; then |
988 | - # Test first that cc exists at all. |
989 | - if { ac_try='cc -c conftest.$ac_ext >&5' |
990 | - { { case "(($ac_try" in |
991 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
992 | - *) ac_try_echo=$ac_try;; |
993 | -esac |
994 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
995 | -$as_echo "$ac_try_echo"; } >&5 |
996 | - (eval "$ac_try") 2>&5 |
997 | - ac_status=$? |
998 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
999 | - test $ac_status = 0; }; }; then |
1000 | - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
1001 | - rm -f conftest2.* |
1002 | - if { { case "(($ac_try" in |
1003 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1004 | - *) ac_try_echo=$ac_try;; |
1005 | -esac |
1006 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1007 | -$as_echo "$ac_try_echo"; } >&5 |
1008 | - (eval "$ac_try") 2>&5 |
1009 | - ac_status=$? |
1010 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1011 | - test $ac_status = 0; } && |
1012 | - test -f conftest2.$ac_objext && { { case "(($ac_try" in |
1013 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1014 | - *) ac_try_echo=$ac_try;; |
1015 | -esac |
1016 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1017 | -$as_echo "$ac_try_echo"; } >&5 |
1018 | - (eval "$ac_try") 2>&5 |
1019 | - ac_status=$? |
1020 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1021 | - test $ac_status = 0; }; |
1022 | - then |
1023 | - # cc works too. |
1024 | - : |
1025 | - else |
1026 | - # cc exists but doesn't like -o. |
1027 | - eval ac_cv_prog_cc_${ac_cc}_c_o=no |
1028 | - fi |
1029 | - fi |
1030 | - fi |
1031 | -else |
1032 | - eval ac_cv_prog_cc_${ac_cc}_c_o=no |
1033 | -fi |
1034 | -rm -f core conftest* |
1035 | - |
1036 | -fi |
1037 | -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then |
1038 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1039 | -$as_echo "yes" >&6; } |
1040 | -else |
1041 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1042 | -$as_echo "no" >&6; } |
1043 | - |
1044 | -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h |
1045 | - |
1046 | -fi |
1047 | - |
1048 | -# FIXME: we rely on the cache variable name because |
1049 | -# there is no other way. |
1050 | -set dummy $CC |
1051 | -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
1052 | -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
1053 | -if test "$am_t" != yes; then |
1054 | - # Losing compiler, so override with the script. |
1055 | - # FIXME: It is wrong to rewrite CC. |
1056 | - # But if we don't then we get into trouble of one sort or another. |
1057 | - # A longer-term fix would be to have automake use am__CC in this case, |
1058 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1059 | - CC="$am_aux_dir/compile $CC" |
1060 | -fi |
1061 | - |
1062 | |
1063 | # Make sure we can run config.sub. |
1064 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
1065 | @@ -7015,7 +7052,7 @@ |
1066 | |
1067 | |
1068 | # ===================================================== # |
1069 | -# Initialize libtool # |
1070 | +# Initialize libtool # |
1071 | # ===================================================== # |
1072 | |
1073 | case `pwd` in |
1074 | @@ -8891,7 +8928,7 @@ |
1075 | rm -rf conftest* |
1076 | ;; |
1077 | |
1078 | -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
1079 | +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
1080 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
1081 | # Find out which ABI we are using. |
1082 | echo 'int i;' > conftest.$ac_ext |
1083 | @@ -8916,7 +8953,10 @@ |
1084 | ;; |
1085 | esac |
1086 | ;; |
1087 | - ppc64-*linux*|powerpc64-*linux*) |
1088 | + powerpc64le-*) |
1089 | + LD="${LD-ld} -m elf32lppclinux" |
1090 | + ;; |
1091 | + powerpc64-*) |
1092 | LD="${LD-ld} -m elf32ppclinux" |
1093 | ;; |
1094 | s390x-*linux*) |
1095 | @@ -8935,7 +8975,10 @@ |
1096 | x86_64-*linux*) |
1097 | LD="${LD-ld} -m elf_x86_64" |
1098 | ;; |
1099 | - ppc*-*linux*|powerpc*-*linux*) |
1100 | + powerpcle-*) |
1101 | + LD="${LD-ld} -m elf64lppc" |
1102 | + ;; |
1103 | + powerpc-*) |
1104 | LD="${LD-ld} -m elf64ppc" |
1105 | ;; |
1106 | s390*-*linux*|s390*-*tpf*) |
1107 | @@ -17409,7 +17452,7 @@ |
1108 | Report bugs to <bug-libtool@gnu.org>." |
1109 | |
1110 | lt_cl_version="\ |
1111 | -parole config.lt 0.5.4 |
1112 | +parole config.lt 0.6.0 |
1113 | configured by $0, generated by GNU Autoconf 2.69. |
1114 | |
1115 | Copyright (C) 2011 Free Software Foundation, Inc. |
1116 | @@ -18638,22 +18681,22 @@ |
1117 | |
1118 | |
1119 | # ===================================================== # |
1120 | -# Version information # |
1121 | +# Version information # |
1122 | # ===================================================== # |
1123 | -PAROLE_VERINFO=0:5:4 |
1124 | +PAROLE_VERINFO=0:6:0 |
1125 | PAROLE_VERSION_API=0 |
1126 | PAROLE_VERSION_MAJOR=0 |
1127 | -PAROLE_VERSION_MINOR=5 |
1128 | -PAROLE_VERSION_MICRO=4 |
1129 | - |
1130 | - |
1131 | - |
1132 | - |
1133 | - |
1134 | - |
1135 | -# ==================================================== # |
1136 | -# Check for headers needed for standard interfaces # |
1137 | -# ==================================================== # |
1138 | +PAROLE_VERSION_MINOR=6 |
1139 | +PAROLE_VERSION_MICRO=0 |
1140 | + |
1141 | + |
1142 | + |
1143 | + |
1144 | + |
1145 | + |
1146 | +# ===================================================== # |
1147 | +# Check for headers needed for standard interfaces # |
1148 | +# ===================================================== # |
1149 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
1150 | $as_echo_n "checking for ANSI C header files... " >&6; } |
1151 | if ${ac_cv_header_stdc+:} false; then : |
1152 | @@ -18783,7 +18826,7 @@ |
1153 | |
1154 | |
1155 | # ===================================================== # |
1156 | -# Check for i18n support # |
1157 | +# Check for i18n support # |
1158 | # ===================================================== # |
1159 | |
1160 | |
1161 | @@ -18795,7 +18838,7 @@ |
1162 | |
1163 | |
1164 | |
1165 | - ALL_LINGUAS="ar ast bg ca cs da de el en_AU en_GB es eu fr gl he hr hu id is it ja kk ko lt lv nl nn pl pt_BR pt ru sk sr sv te tr ug uk zh_CN zh_TW " |
1166 | + ALL_LINGUAS="ar ast bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nl nn oc pl pt_BR pt ru sk sr sv te tr ug uk zh_CN zh_TW " |
1167 | |
1168 | for ac_header in locale.h |
1169 | do : |
1170 | @@ -19543,9 +19586,9 @@ |
1171 | $as_echo "$XGETTEXT_ARGS" >&6; } |
1172 | |
1173 | |
1174 | -#==================================================== # |
1175 | -# Check for required packages # |
1176 | -#=====================================================# |
1177 | +# ===================================================== # |
1178 | +# Check for required packages # |
1179 | +# ===================================================== # |
1180 | |
1181 | |
1182 | |
1183 | @@ -19557,7 +19600,7 @@ |
1184 | *) as_fn_error $? "invalid gstreamer version specified" "$LINENO" 5 ;; |
1185 | esac |
1186 | else |
1187 | - with_gstreamer=0.10 |
1188 | + with_gstreamer=1.0 |
1189 | |
1190 | fi |
1191 | |
1192 | @@ -19730,201 +19773,6 @@ |
1193 | |
1194 | |
1195 | |
1196 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.24.0" >&5 |
1197 | -$as_echo_n "checking for gtk+-2.0 >= 2.24.0... " >&6; } |
1198 | - if $PKG_CONFIG "--atleast-version=2.24.0" "gtk+-2.0" >/dev/null 2>&1; then |
1199 | - GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"` |
1200 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 |
1201 | -$as_echo "$GTK_VERSION" >&6; } |
1202 | - |
1203 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 |
1204 | -$as_echo_n "checking GTK_CFLAGS... " >&6; } |
1205 | - GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` |
1206 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 |
1207 | -$as_echo "$GTK_CFLAGS" >&6; } |
1208 | - |
1209 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 |
1210 | -$as_echo_n "checking GTK_LIBS... " >&6; } |
1211 | - GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` |
1212 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 |
1213 | -$as_echo "$GTK_LIBS" >&6; } |
1214 | - |
1215 | - GTK_REQUIRED_VERSION=2.24.0 |
1216 | - |
1217 | - |
1218 | - |
1219 | - |
1220 | - |
1221 | - |
1222 | - |
1223 | - elif $PKG_CONFIG --exists "gtk+-2.0" >/dev/null 2>&1; then |
1224 | - xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-2.0"` |
1225 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
1226 | -$as_echo "found, but $xdt_cv_version" >&6; } |
1227 | - |
1228 | - |
1229 | - echo "*** The required package gtk+-2.0 was found on your system," |
1230 | - echo "*** but the installed version ($xdt_cv_version) is too old." |
1231 | - echo "*** Please upgrade gtk+-2.0 to atleast version 2.24.0, or adjust" |
1232 | - echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
1233 | - echo "*** the new version of the package in a nonstandard prefix so" |
1234 | - echo "*** pkg-config is able to find it." |
1235 | - exit 1 |
1236 | - |
1237 | - else |
1238 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
1239 | -$as_echo "not found" >&6; } |
1240 | - |
1241 | - |
1242 | - echo "*** The required package gtk+-2.0 was not found on your system." |
1243 | - echo "*** Please install gtk+-2.0 (atleast version 2.24.0) or adjust" |
1244 | - echo "*** the PKG_CONFIG_PATH environment variable if you" |
1245 | - echo "*** installed the package in a nonstandard prefix so that" |
1246 | - echo "*** pkg-config is able to find it." |
1247 | - exit 1 |
1248 | - |
1249 | - fi |
1250 | - |
1251 | - |
1252 | - |
1253 | - # minimum supported version of pkg-config |
1254 | - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
1255 | - |
1256 | - |
1257 | - |
1258 | - |
1259 | - |
1260 | - |
1261 | - |
1262 | - |
1263 | - |
1264 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1265 | - if test -n "$ac_tool_prefix"; then |
1266 | - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
1267 | -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
1268 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1269 | -$as_echo_n "checking for $ac_word... " >&6; } |
1270 | -if ${ac_cv_path_PKG_CONFIG+:} false; then : |
1271 | - $as_echo_n "(cached) " >&6 |
1272 | -else |
1273 | - case $PKG_CONFIG in |
1274 | - [\\/]* | ?:[\\/]*) |
1275 | - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
1276 | - ;; |
1277 | - *) |
1278 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1279 | -for as_dir in $PATH |
1280 | -do |
1281 | - IFS=$as_save_IFS |
1282 | - test -z "$as_dir" && as_dir=. |
1283 | - for ac_exec_ext in '' $ac_executable_extensions; do |
1284 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1285 | - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1286 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1287 | - break 2 |
1288 | - fi |
1289 | -done |
1290 | - done |
1291 | -IFS=$as_save_IFS |
1292 | - |
1293 | - ;; |
1294 | -esac |
1295 | -fi |
1296 | -PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
1297 | -if test -n "$PKG_CONFIG"; then |
1298 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
1299 | -$as_echo "$PKG_CONFIG" >&6; } |
1300 | -else |
1301 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1302 | -$as_echo "no" >&6; } |
1303 | -fi |
1304 | - |
1305 | - |
1306 | -fi |
1307 | -if test -z "$ac_cv_path_PKG_CONFIG"; then |
1308 | - ac_pt_PKG_CONFIG=$PKG_CONFIG |
1309 | - # Extract the first word of "pkg-config", so it can be a program name with args. |
1310 | -set dummy pkg-config; ac_word=$2 |
1311 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1312 | -$as_echo_n "checking for $ac_word... " >&6; } |
1313 | -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
1314 | - $as_echo_n "(cached) " >&6 |
1315 | -else |
1316 | - case $ac_pt_PKG_CONFIG in |
1317 | - [\\/]* | ?:[\\/]*) |
1318 | - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
1319 | - ;; |
1320 | - *) |
1321 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1322 | -for as_dir in $PATH |
1323 | -do |
1324 | - IFS=$as_save_IFS |
1325 | - test -z "$as_dir" && as_dir=. |
1326 | - for ac_exec_ext in '' $ac_executable_extensions; do |
1327 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1328 | - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1329 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1330 | - break 2 |
1331 | - fi |
1332 | -done |
1333 | - done |
1334 | -IFS=$as_save_IFS |
1335 | - |
1336 | - ;; |
1337 | -esac |
1338 | -fi |
1339 | -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
1340 | -if test -n "$ac_pt_PKG_CONFIG"; then |
1341 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
1342 | -$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
1343 | -else |
1344 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1345 | -$as_echo "no" >&6; } |
1346 | -fi |
1347 | - |
1348 | - if test "x$ac_pt_PKG_CONFIG" = x; then |
1349 | - PKG_CONFIG="" |
1350 | - else |
1351 | - case $cross_compiling:$ac_tool_warned in |
1352 | -yes:) |
1353 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
1354 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
1355 | -ac_tool_warned=yes ;; |
1356 | -esac |
1357 | - PKG_CONFIG=$ac_pt_PKG_CONFIG |
1358 | - fi |
1359 | -else |
1360 | - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
1361 | -fi |
1362 | - |
1363 | -fi |
1364 | -if test -n "$PKG_CONFIG"; then |
1365 | - _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
1366 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
1367 | -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
1368 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
1369 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1370 | -$as_echo "yes" >&6; } |
1371 | - else |
1372 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1373 | -$as_echo "no" >&6; } |
1374 | - PKG_CONFIG="" |
1375 | - fi |
1376 | -fi |
1377 | - |
1378 | - if test x"$PKG_CONFIG" = x""; then |
1379 | - echo |
1380 | - echo "*** Your version of pkg-config is too old. You need atleast" |
1381 | - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
1382 | - echo "*** from the freedesktop.org software repository at" |
1383 | - echo "***" |
1384 | - echo "*** http://www.freedesktop.org/software/pkgconfig" |
1385 | - echo "***" |
1386 | - exit 1; |
1387 | - fi |
1388 | - |
1389 | - |
1390 | - |
1391 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.32.0" >&5 |
1392 | $as_echo_n "checking for glib-2.0 >= 2.32.0... " >&6; } |
1393 | if $PKG_CONFIG "--atleast-version=2.32.0" "glib-2.0" >/dev/null 2>&1; then |
1394 | @@ -20901,6 +20749,1179 @@ |
1395 | |
1396 | |
1397 | |
1398 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 0.60" >&5 |
1399 | +$as_echo_n "checking for dbus-1 >= 0.60... " >&6; } |
1400 | + if $PKG_CONFIG "--atleast-version=0.60" "dbus-1" >/dev/null 2>&1; then |
1401 | + DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-1"` |
1402 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_VERSION" >&5 |
1403 | +$as_echo "$DBUS_VERSION" >&6; } |
1404 | + |
1405 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5 |
1406 | +$as_echo_n "checking DBUS_CFLAGS... " >&6; } |
1407 | + DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1"` |
1408 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5 |
1409 | +$as_echo "$DBUS_CFLAGS" >&6; } |
1410 | + |
1411 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5 |
1412 | +$as_echo_n "checking DBUS_LIBS... " >&6; } |
1413 | + DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1"` |
1414 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5 |
1415 | +$as_echo "$DBUS_LIBS" >&6; } |
1416 | + |
1417 | + DBUS_REQUIRED_VERSION=0.60 |
1418 | + |
1419 | + |
1420 | + |
1421 | + |
1422 | + |
1423 | + |
1424 | + |
1425 | + elif $PKG_CONFIG --exists "dbus-1" >/dev/null 2>&1; then |
1426 | + xdt_cv_version=`$PKG_CONFIG --modversion "dbus-1"` |
1427 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
1428 | +$as_echo "found, but $xdt_cv_version" >&6; } |
1429 | + |
1430 | + |
1431 | + echo "*** The required package dbus-1 was found on your system," |
1432 | + echo "*** but the installed version ($xdt_cv_version) is too old." |
1433 | + echo "*** Please upgrade dbus-1 to atleast version 0.60, or adjust" |
1434 | + echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
1435 | + echo "*** the new version of the package in a nonstandard prefix so" |
1436 | + echo "*** pkg-config is able to find it." |
1437 | + exit 1 |
1438 | + |
1439 | + else |
1440 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
1441 | +$as_echo "not found" >&6; } |
1442 | + |
1443 | + |
1444 | + echo "*** The required package dbus-1 was not found on your system." |
1445 | + echo "*** Please install dbus-1 (atleast version 0.60) or adjust" |
1446 | + echo "*** the PKG_CONFIG_PATH environment variable if you" |
1447 | + echo "*** installed the package in a nonstandard prefix so that" |
1448 | + echo "*** pkg-config is able to find it." |
1449 | + exit 1 |
1450 | + |
1451 | + fi |
1452 | + |
1453 | + |
1454 | + |
1455 | + # minimum supported version of pkg-config |
1456 | + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
1457 | + |
1458 | + |
1459 | + |
1460 | + |
1461 | + |
1462 | + |
1463 | + |
1464 | + |
1465 | + |
1466 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1467 | + if test -n "$ac_tool_prefix"; then |
1468 | + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
1469 | +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
1470 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1471 | +$as_echo_n "checking for $ac_word... " >&6; } |
1472 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
1473 | + $as_echo_n "(cached) " >&6 |
1474 | +else |
1475 | + case $PKG_CONFIG in |
1476 | + [\\/]* | ?:[\\/]*) |
1477 | + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
1478 | + ;; |
1479 | + *) |
1480 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1481 | +for as_dir in $PATH |
1482 | +do |
1483 | + IFS=$as_save_IFS |
1484 | + test -z "$as_dir" && as_dir=. |
1485 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1486 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1487 | + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1488 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1489 | + break 2 |
1490 | + fi |
1491 | +done |
1492 | + done |
1493 | +IFS=$as_save_IFS |
1494 | + |
1495 | + ;; |
1496 | +esac |
1497 | +fi |
1498 | +PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
1499 | +if test -n "$PKG_CONFIG"; then |
1500 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
1501 | +$as_echo "$PKG_CONFIG" >&6; } |
1502 | +else |
1503 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1504 | +$as_echo "no" >&6; } |
1505 | +fi |
1506 | + |
1507 | + |
1508 | +fi |
1509 | +if test -z "$ac_cv_path_PKG_CONFIG"; then |
1510 | + ac_pt_PKG_CONFIG=$PKG_CONFIG |
1511 | + # Extract the first word of "pkg-config", so it can be a program name with args. |
1512 | +set dummy pkg-config; ac_word=$2 |
1513 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1514 | +$as_echo_n "checking for $ac_word... " >&6; } |
1515 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
1516 | + $as_echo_n "(cached) " >&6 |
1517 | +else |
1518 | + case $ac_pt_PKG_CONFIG in |
1519 | + [\\/]* | ?:[\\/]*) |
1520 | + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
1521 | + ;; |
1522 | + *) |
1523 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1524 | +for as_dir in $PATH |
1525 | +do |
1526 | + IFS=$as_save_IFS |
1527 | + test -z "$as_dir" && as_dir=. |
1528 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1529 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1530 | + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1531 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1532 | + break 2 |
1533 | + fi |
1534 | +done |
1535 | + done |
1536 | +IFS=$as_save_IFS |
1537 | + |
1538 | + ;; |
1539 | +esac |
1540 | +fi |
1541 | +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
1542 | +if test -n "$ac_pt_PKG_CONFIG"; then |
1543 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
1544 | +$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
1545 | +else |
1546 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1547 | +$as_echo "no" >&6; } |
1548 | +fi |
1549 | + |
1550 | + if test "x$ac_pt_PKG_CONFIG" = x; then |
1551 | + PKG_CONFIG="" |
1552 | + else |
1553 | + case $cross_compiling:$ac_tool_warned in |
1554 | +yes:) |
1555 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
1556 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
1557 | +ac_tool_warned=yes ;; |
1558 | +esac |
1559 | + PKG_CONFIG=$ac_pt_PKG_CONFIG |
1560 | + fi |
1561 | +else |
1562 | + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
1563 | +fi |
1564 | + |
1565 | +fi |
1566 | +if test -n "$PKG_CONFIG"; then |
1567 | + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
1568 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
1569 | +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
1570 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
1571 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1572 | +$as_echo "yes" >&6; } |
1573 | + else |
1574 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1575 | +$as_echo "no" >&6; } |
1576 | + PKG_CONFIG="" |
1577 | + fi |
1578 | +fi |
1579 | + |
1580 | + if test x"$PKG_CONFIG" = x""; then |
1581 | + echo |
1582 | + echo "*** Your version of pkg-config is too old. You need atleast" |
1583 | + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
1584 | + echo "*** from the freedesktop.org software repository at" |
1585 | + echo "***" |
1586 | + echo "*** http://www.freedesktop.org/software/pkgconfig" |
1587 | + echo "***" |
1588 | + exit 1; |
1589 | + fi |
1590 | + |
1591 | + |
1592 | + |
1593 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.70" >&5 |
1594 | +$as_echo_n "checking for dbus-glib-1 >= 0.70... " >&6; } |
1595 | + if $PKG_CONFIG "--atleast-version=0.70" "dbus-glib-1" >/dev/null 2>&1; then |
1596 | + DBUS_GLIB_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"` |
1597 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_VERSION" >&5 |
1598 | +$as_echo "$DBUS_GLIB_VERSION" >&6; } |
1599 | + |
1600 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_CFLAGS" >&5 |
1601 | +$as_echo_n "checking DBUS_GLIB_CFLAGS... " >&6; } |
1602 | + DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` |
1603 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_CFLAGS" >&5 |
1604 | +$as_echo "$DBUS_GLIB_CFLAGS" >&6; } |
1605 | + |
1606 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_LIBS" >&5 |
1607 | +$as_echo_n "checking DBUS_GLIB_LIBS... " >&6; } |
1608 | + DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1"` |
1609 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_LIBS" >&5 |
1610 | +$as_echo "$DBUS_GLIB_LIBS" >&6; } |
1611 | + |
1612 | + DBUS_GLIB_REQUIRED_VERSION=0.70 |
1613 | + |
1614 | + |
1615 | + |
1616 | + |
1617 | + |
1618 | + |
1619 | + |
1620 | + elif $PKG_CONFIG --exists "dbus-glib-1" >/dev/null 2>&1; then |
1621 | + xdt_cv_version=`$PKG_CONFIG --modversion "dbus-glib-1"` |
1622 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
1623 | +$as_echo "found, but $xdt_cv_version" >&6; } |
1624 | + |
1625 | + |
1626 | + echo "*** The required package dbus-glib-1 was found on your system," |
1627 | + echo "*** but the installed version ($xdt_cv_version) is too old." |
1628 | + echo "*** Please upgrade dbus-glib-1 to atleast version 0.70, or adjust" |
1629 | + echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
1630 | + echo "*** the new version of the package in a nonstandard prefix so" |
1631 | + echo "*** pkg-config is able to find it." |
1632 | + exit 1 |
1633 | + |
1634 | + else |
1635 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
1636 | +$as_echo "not found" >&6; } |
1637 | + |
1638 | + |
1639 | + echo "*** The required package dbus-glib-1 was not found on your system." |
1640 | + echo "*** Please install dbus-glib-1 (atleast version 0.70) or adjust" |
1641 | + echo "*** the PKG_CONFIG_PATH environment variable if you" |
1642 | + echo "*** installed the package in a nonstandard prefix so that" |
1643 | + echo "*** pkg-config is able to find it." |
1644 | + exit 1 |
1645 | + |
1646 | + fi |
1647 | + |
1648 | + |
1649 | + |
1650 | + |
1651 | + # minimum supported version of pkg-config |
1652 | + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
1653 | + |
1654 | + |
1655 | + |
1656 | + |
1657 | + |
1658 | + |
1659 | + |
1660 | + |
1661 | + |
1662 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1663 | + if test -n "$ac_tool_prefix"; then |
1664 | + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
1665 | +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
1666 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1667 | +$as_echo_n "checking for $ac_word... " >&6; } |
1668 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
1669 | + $as_echo_n "(cached) " >&6 |
1670 | +else |
1671 | + case $PKG_CONFIG in |
1672 | + [\\/]* | ?:[\\/]*) |
1673 | + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
1674 | + ;; |
1675 | + *) |
1676 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1677 | +for as_dir in $PATH |
1678 | +do |
1679 | + IFS=$as_save_IFS |
1680 | + test -z "$as_dir" && as_dir=. |
1681 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1682 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1683 | + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1684 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1685 | + break 2 |
1686 | + fi |
1687 | +done |
1688 | + done |
1689 | +IFS=$as_save_IFS |
1690 | + |
1691 | + ;; |
1692 | +esac |
1693 | +fi |
1694 | +PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
1695 | +if test -n "$PKG_CONFIG"; then |
1696 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
1697 | +$as_echo "$PKG_CONFIG" >&6; } |
1698 | +else |
1699 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1700 | +$as_echo "no" >&6; } |
1701 | +fi |
1702 | + |
1703 | + |
1704 | +fi |
1705 | +if test -z "$ac_cv_path_PKG_CONFIG"; then |
1706 | + ac_pt_PKG_CONFIG=$PKG_CONFIG |
1707 | + # Extract the first word of "pkg-config", so it can be a program name with args. |
1708 | +set dummy pkg-config; ac_word=$2 |
1709 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1710 | +$as_echo_n "checking for $ac_word... " >&6; } |
1711 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
1712 | + $as_echo_n "(cached) " >&6 |
1713 | +else |
1714 | + case $ac_pt_PKG_CONFIG in |
1715 | + [\\/]* | ?:[\\/]*) |
1716 | + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
1717 | + ;; |
1718 | + *) |
1719 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1720 | +for as_dir in $PATH |
1721 | +do |
1722 | + IFS=$as_save_IFS |
1723 | + test -z "$as_dir" && as_dir=. |
1724 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1725 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1726 | + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1727 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1728 | + break 2 |
1729 | + fi |
1730 | +done |
1731 | + done |
1732 | +IFS=$as_save_IFS |
1733 | + |
1734 | + ;; |
1735 | +esac |
1736 | +fi |
1737 | +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
1738 | +if test -n "$ac_pt_PKG_CONFIG"; then |
1739 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
1740 | +$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
1741 | +else |
1742 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1743 | +$as_echo "no" >&6; } |
1744 | +fi |
1745 | + |
1746 | + if test "x$ac_pt_PKG_CONFIG" = x; then |
1747 | + PKG_CONFIG="" |
1748 | + else |
1749 | + case $cross_compiling:$ac_tool_warned in |
1750 | +yes:) |
1751 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
1752 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
1753 | +ac_tool_warned=yes ;; |
1754 | +esac |
1755 | + PKG_CONFIG=$ac_pt_PKG_CONFIG |
1756 | + fi |
1757 | +else |
1758 | + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
1759 | +fi |
1760 | + |
1761 | +fi |
1762 | +if test -n "$PKG_CONFIG"; then |
1763 | + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
1764 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
1765 | +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
1766 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
1767 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1768 | +$as_echo "yes" >&6; } |
1769 | + else |
1770 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1771 | +$as_echo "no" >&6; } |
1772 | + PKG_CONFIG="" |
1773 | + fi |
1774 | +fi |
1775 | + |
1776 | + if test x"$PKG_CONFIG" = x""; then |
1777 | + echo |
1778 | + echo "*** Your version of pkg-config is too old. You need atleast" |
1779 | + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
1780 | + echo "*** from the freedesktop.org software repository at" |
1781 | + echo "***" |
1782 | + echo "*** http://www.freedesktop.org/software/pkgconfig" |
1783 | + echo "***" |
1784 | + exit 1; |
1785 | + fi |
1786 | + |
1787 | + |
1788 | + |
1789 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.10.0" >&5 |
1790 | +$as_echo_n "checking for libxfce4util-1.0 >= 4.10.0... " >&6; } |
1791 | + if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4util-1.0" >/dev/null 2>&1; then |
1792 | + LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` |
1793 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 |
1794 | +$as_echo "$LIBXFCE4UTIL_VERSION" >&6; } |
1795 | + |
1796 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 |
1797 | +$as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } |
1798 | + LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` |
1799 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 |
1800 | +$as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } |
1801 | + |
1802 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 |
1803 | +$as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } |
1804 | + LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` |
1805 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 |
1806 | +$as_echo "$LIBXFCE4UTIL_LIBS" >&6; } |
1807 | + |
1808 | + LIBXFCE4UTIL_REQUIRED_VERSION=4.10.0 |
1809 | + |
1810 | + |
1811 | + |
1812 | + |
1813 | + |
1814 | + |
1815 | + |
1816 | + elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then |
1817 | + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` |
1818 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
1819 | +$as_echo "found, but $xdt_cv_version" >&6; } |
1820 | + |
1821 | + |
1822 | + echo "*** The required package libxfce4util-1.0 was found on your system," |
1823 | + echo "*** but the installed version ($xdt_cv_version) is too old." |
1824 | + echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.10.0, or adjust" |
1825 | + echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
1826 | + echo "*** the new version of the package in a nonstandard prefix so" |
1827 | + echo "*** pkg-config is able to find it." |
1828 | + exit 1 |
1829 | + |
1830 | + else |
1831 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
1832 | +$as_echo "not found" >&6; } |
1833 | + |
1834 | + |
1835 | + echo "*** The required package libxfce4util-1.0 was not found on your system." |
1836 | + echo "*** Please install libxfce4util-1.0 (atleast version 4.10.0) or adjust" |
1837 | + echo "*** the PKG_CONFIG_PATH environment variable if you" |
1838 | + echo "*** installed the package in a nonstandard prefix so that" |
1839 | + echo "*** pkg-config is able to find it." |
1840 | + exit 1 |
1841 | + |
1842 | + fi |
1843 | + |
1844 | + |
1845 | + |
1846 | + # minimum supported version of pkg-config |
1847 | + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
1848 | + |
1849 | + |
1850 | + |
1851 | + |
1852 | + |
1853 | + |
1854 | + |
1855 | + |
1856 | + |
1857 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1858 | + if test -n "$ac_tool_prefix"; then |
1859 | + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
1860 | +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
1861 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1862 | +$as_echo_n "checking for $ac_word... " >&6; } |
1863 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
1864 | + $as_echo_n "(cached) " >&6 |
1865 | +else |
1866 | + case $PKG_CONFIG in |
1867 | + [\\/]* | ?:[\\/]*) |
1868 | + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
1869 | + ;; |
1870 | + *) |
1871 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1872 | +for as_dir in $PATH |
1873 | +do |
1874 | + IFS=$as_save_IFS |
1875 | + test -z "$as_dir" && as_dir=. |
1876 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1877 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1878 | + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1879 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1880 | + break 2 |
1881 | + fi |
1882 | +done |
1883 | + done |
1884 | +IFS=$as_save_IFS |
1885 | + |
1886 | + ;; |
1887 | +esac |
1888 | +fi |
1889 | +PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
1890 | +if test -n "$PKG_CONFIG"; then |
1891 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
1892 | +$as_echo "$PKG_CONFIG" >&6; } |
1893 | +else |
1894 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1895 | +$as_echo "no" >&6; } |
1896 | +fi |
1897 | + |
1898 | + |
1899 | +fi |
1900 | +if test -z "$ac_cv_path_PKG_CONFIG"; then |
1901 | + ac_pt_PKG_CONFIG=$PKG_CONFIG |
1902 | + # Extract the first word of "pkg-config", so it can be a program name with args. |
1903 | +set dummy pkg-config; ac_word=$2 |
1904 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1905 | +$as_echo_n "checking for $ac_word... " >&6; } |
1906 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
1907 | + $as_echo_n "(cached) " >&6 |
1908 | +else |
1909 | + case $ac_pt_PKG_CONFIG in |
1910 | + [\\/]* | ?:[\\/]*) |
1911 | + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
1912 | + ;; |
1913 | + *) |
1914 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1915 | +for as_dir in $PATH |
1916 | +do |
1917 | + IFS=$as_save_IFS |
1918 | + test -z "$as_dir" && as_dir=. |
1919 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1920 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1921 | + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
1922 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1923 | + break 2 |
1924 | + fi |
1925 | +done |
1926 | + done |
1927 | +IFS=$as_save_IFS |
1928 | + |
1929 | + ;; |
1930 | +esac |
1931 | +fi |
1932 | +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
1933 | +if test -n "$ac_pt_PKG_CONFIG"; then |
1934 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
1935 | +$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
1936 | +else |
1937 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1938 | +$as_echo "no" >&6; } |
1939 | +fi |
1940 | + |
1941 | + if test "x$ac_pt_PKG_CONFIG" = x; then |
1942 | + PKG_CONFIG="" |
1943 | + else |
1944 | + case $cross_compiling:$ac_tool_warned in |
1945 | +yes:) |
1946 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
1947 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
1948 | +ac_tool_warned=yes ;; |
1949 | +esac |
1950 | + PKG_CONFIG=$ac_pt_PKG_CONFIG |
1951 | + fi |
1952 | +else |
1953 | + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
1954 | +fi |
1955 | + |
1956 | +fi |
1957 | +if test -n "$PKG_CONFIG"; then |
1958 | + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
1959 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
1960 | +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
1961 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
1962 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1963 | +$as_echo "yes" >&6; } |
1964 | + else |
1965 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1966 | +$as_echo "no" >&6; } |
1967 | + PKG_CONFIG="" |
1968 | + fi |
1969 | +fi |
1970 | + |
1971 | + if test x"$PKG_CONFIG" = x""; then |
1972 | + echo |
1973 | + echo "*** Your version of pkg-config is too old. You need atleast" |
1974 | + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
1975 | + echo "*** from the freedesktop.org software repository at" |
1976 | + echo "***" |
1977 | + echo "*** http://www.freedesktop.org/software/pkgconfig" |
1978 | + echo "***" |
1979 | + exit 1; |
1980 | + fi |
1981 | + |
1982 | + |
1983 | + |
1984 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.10.0" >&5 |
1985 | +$as_echo_n "checking for libxfconf-0 >= 4.10.0... " >&6; } |
1986 | + if $PKG_CONFIG "--atleast-version=4.10.0" "libxfconf-0" >/dev/null 2>&1; then |
1987 | + XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` |
1988 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 |
1989 | +$as_echo "$XFCONF_VERSION" >&6; } |
1990 | + |
1991 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_CFLAGS" >&5 |
1992 | +$as_echo_n "checking XFCONF_CFLAGS... " >&6; } |
1993 | + XFCONF_CFLAGS=`$PKG_CONFIG --cflags "libxfconf-0"` |
1994 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_CFLAGS" >&5 |
1995 | +$as_echo "$XFCONF_CFLAGS" >&6; } |
1996 | + |
1997 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_LIBS" >&5 |
1998 | +$as_echo_n "checking XFCONF_LIBS... " >&6; } |
1999 | + XFCONF_LIBS=`$PKG_CONFIG --libs "libxfconf-0"` |
2000 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 |
2001 | +$as_echo "$XFCONF_LIBS" >&6; } |
2002 | + |
2003 | + XFCONF_REQUIRED_VERSION=4.10.0 |
2004 | + |
2005 | + |
2006 | + |
2007 | + |
2008 | + |
2009 | + |
2010 | + |
2011 | + elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then |
2012 | + xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` |
2013 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
2014 | +$as_echo "found, but $xdt_cv_version" >&6; } |
2015 | + |
2016 | + |
2017 | + echo "*** The required package libxfconf-0 was found on your system," |
2018 | + echo "*** but the installed version ($xdt_cv_version) is too old." |
2019 | + echo "*** Please upgrade libxfconf-0 to atleast version 4.10.0, or adjust" |
2020 | + echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
2021 | + echo "*** the new version of the package in a nonstandard prefix so" |
2022 | + echo "*** pkg-config is able to find it." |
2023 | + exit 1 |
2024 | + |
2025 | + else |
2026 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
2027 | +$as_echo "not found" >&6; } |
2028 | + |
2029 | + |
2030 | + echo "*** The required package libxfconf-0 was not found on your system." |
2031 | + echo "*** Please install libxfconf-0 (atleast version 4.10.0) or adjust" |
2032 | + echo "*** the PKG_CONFIG_PATH environment variable if you" |
2033 | + echo "*** installed the package in a nonstandard prefix so that" |
2034 | + echo "*** pkg-config is able to find it." |
2035 | + exit 1 |
2036 | + |
2037 | + fi |
2038 | + |
2039 | + |
2040 | + |
2041 | + |
2042 | + # minimum supported version of pkg-config |
2043 | + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
2044 | + |
2045 | + |
2046 | + |
2047 | + |
2048 | + |
2049 | + |
2050 | + |
2051 | + |
2052 | + |
2053 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2054 | + if test -n "$ac_tool_prefix"; then |
2055 | + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2056 | +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2057 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2058 | +$as_echo_n "checking for $ac_word... " >&6; } |
2059 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2060 | + $as_echo_n "(cached) " >&6 |
2061 | +else |
2062 | + case $PKG_CONFIG in |
2063 | + [\\/]* | ?:[\\/]*) |
2064 | + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
2065 | + ;; |
2066 | + *) |
2067 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2068 | +for as_dir in $PATH |
2069 | +do |
2070 | + IFS=$as_save_IFS |
2071 | + test -z "$as_dir" && as_dir=. |
2072 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2073 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2074 | + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2075 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2076 | + break 2 |
2077 | + fi |
2078 | +done |
2079 | + done |
2080 | +IFS=$as_save_IFS |
2081 | + |
2082 | + ;; |
2083 | +esac |
2084 | +fi |
2085 | +PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
2086 | +if test -n "$PKG_CONFIG"; then |
2087 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
2088 | +$as_echo "$PKG_CONFIG" >&6; } |
2089 | +else |
2090 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2091 | +$as_echo "no" >&6; } |
2092 | +fi |
2093 | + |
2094 | + |
2095 | +fi |
2096 | +if test -z "$ac_cv_path_PKG_CONFIG"; then |
2097 | + ac_pt_PKG_CONFIG=$PKG_CONFIG |
2098 | + # Extract the first word of "pkg-config", so it can be a program name with args. |
2099 | +set dummy pkg-config; ac_word=$2 |
2100 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2101 | +$as_echo_n "checking for $ac_word... " >&6; } |
2102 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
2103 | + $as_echo_n "(cached) " >&6 |
2104 | +else |
2105 | + case $ac_pt_PKG_CONFIG in |
2106 | + [\\/]* | ?:[\\/]*) |
2107 | + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
2108 | + ;; |
2109 | + *) |
2110 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2111 | +for as_dir in $PATH |
2112 | +do |
2113 | + IFS=$as_save_IFS |
2114 | + test -z "$as_dir" && as_dir=. |
2115 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2116 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2117 | + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2118 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2119 | + break 2 |
2120 | + fi |
2121 | +done |
2122 | + done |
2123 | +IFS=$as_save_IFS |
2124 | + |
2125 | + ;; |
2126 | +esac |
2127 | +fi |
2128 | +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
2129 | +if test -n "$ac_pt_PKG_CONFIG"; then |
2130 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
2131 | +$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
2132 | +else |
2133 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2134 | +$as_echo "no" >&6; } |
2135 | +fi |
2136 | + |
2137 | + if test "x$ac_pt_PKG_CONFIG" = x; then |
2138 | + PKG_CONFIG="" |
2139 | + else |
2140 | + case $cross_compiling:$ac_tool_warned in |
2141 | +yes:) |
2142 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2143 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2144 | +ac_tool_warned=yes ;; |
2145 | +esac |
2146 | + PKG_CONFIG=$ac_pt_PKG_CONFIG |
2147 | + fi |
2148 | +else |
2149 | + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
2150 | +fi |
2151 | + |
2152 | +fi |
2153 | +if test -n "$PKG_CONFIG"; then |
2154 | + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
2155 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
2156 | +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
2157 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
2158 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2159 | +$as_echo "yes" >&6; } |
2160 | + else |
2161 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2162 | +$as_echo "no" >&6; } |
2163 | + PKG_CONFIG="" |
2164 | + fi |
2165 | +fi |
2166 | + |
2167 | + if test x"$PKG_CONFIG" = x""; then |
2168 | + echo |
2169 | + echo "*** Your version of pkg-config is too old. You need atleast" |
2170 | + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
2171 | + echo "*** from the freedesktop.org software repository at" |
2172 | + echo "***" |
2173 | + echo "*** http://www.freedesktop.org/software/pkgconfig" |
2174 | + echo "***" |
2175 | + exit 1; |
2176 | + fi |
2177 | + |
2178 | + |
2179 | + |
2180 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-2 >= 4.10.0" >&5 |
2181 | +$as_echo_n "checking for libxfce4ui-2 >= 4.10.0... " >&6; } |
2182 | + if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4ui-2" >/dev/null 2>&1; then |
2183 | + LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-2"` |
2184 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 |
2185 | +$as_echo "$LIBXFCE4UI_VERSION" >&6; } |
2186 | + |
2187 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_CFLAGS" >&5 |
2188 | +$as_echo_n "checking LIBXFCE4UI_CFLAGS... " >&6; } |
2189 | + LIBXFCE4UI_CFLAGS=`$PKG_CONFIG --cflags "libxfce4ui-2"` |
2190 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_CFLAGS" >&5 |
2191 | +$as_echo "$LIBXFCE4UI_CFLAGS" >&6; } |
2192 | + |
2193 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_LIBS" >&5 |
2194 | +$as_echo_n "checking LIBXFCE4UI_LIBS... " >&6; } |
2195 | + LIBXFCE4UI_LIBS=`$PKG_CONFIG --libs "libxfce4ui-2"` |
2196 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 |
2197 | +$as_echo "$LIBXFCE4UI_LIBS" >&6; } |
2198 | + |
2199 | + LIBXFCE4UI_REQUIRED_VERSION=4.10.0 |
2200 | + |
2201 | + |
2202 | + |
2203 | + |
2204 | + |
2205 | + |
2206 | + |
2207 | + elif $PKG_CONFIG --exists "libxfce4ui-2" >/dev/null 2>&1; then |
2208 | + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-2"` |
2209 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
2210 | +$as_echo "found, but $xdt_cv_version" >&6; } |
2211 | + |
2212 | + |
2213 | + echo "*** The required package libxfce4ui-2 was found on your system," |
2214 | + echo "*** but the installed version ($xdt_cv_version) is too old." |
2215 | + echo "*** Please upgrade libxfce4ui-2 to atleast version 4.10.0, or adjust" |
2216 | + echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
2217 | + echo "*** the new version of the package in a nonstandard prefix so" |
2218 | + echo "*** pkg-config is able to find it." |
2219 | + exit 1 |
2220 | + |
2221 | + else |
2222 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
2223 | +$as_echo "not found" >&6; } |
2224 | + |
2225 | + |
2226 | + echo "*** The required package libxfce4ui-2 was not found on your system." |
2227 | + echo "*** Please install libxfce4ui-2 (atleast version 4.10.0) or adjust" |
2228 | + echo "*** the PKG_CONFIG_PATH environment variable if you" |
2229 | + echo "*** installed the package in a nonstandard prefix so that" |
2230 | + echo "*** pkg-config is able to find it." |
2231 | + exit 1 |
2232 | + |
2233 | + fi |
2234 | + |
2235 | + |
2236 | + |
2237 | + # minimum supported version of pkg-config |
2238 | + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
2239 | + |
2240 | + |
2241 | + |
2242 | + |
2243 | + |
2244 | + |
2245 | + |
2246 | + |
2247 | + |
2248 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2249 | + if test -n "$ac_tool_prefix"; then |
2250 | + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2251 | +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2252 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2253 | +$as_echo_n "checking for $ac_word... " >&6; } |
2254 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2255 | + $as_echo_n "(cached) " >&6 |
2256 | +else |
2257 | + case $PKG_CONFIG in |
2258 | + [\\/]* | ?:[\\/]*) |
2259 | + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
2260 | + ;; |
2261 | + *) |
2262 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2263 | +for as_dir in $PATH |
2264 | +do |
2265 | + IFS=$as_save_IFS |
2266 | + test -z "$as_dir" && as_dir=. |
2267 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2268 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2269 | + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2270 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2271 | + break 2 |
2272 | + fi |
2273 | +done |
2274 | + done |
2275 | +IFS=$as_save_IFS |
2276 | + |
2277 | + ;; |
2278 | +esac |
2279 | +fi |
2280 | +PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
2281 | +if test -n "$PKG_CONFIG"; then |
2282 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
2283 | +$as_echo "$PKG_CONFIG" >&6; } |
2284 | +else |
2285 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2286 | +$as_echo "no" >&6; } |
2287 | +fi |
2288 | + |
2289 | + |
2290 | +fi |
2291 | +if test -z "$ac_cv_path_PKG_CONFIG"; then |
2292 | + ac_pt_PKG_CONFIG=$PKG_CONFIG |
2293 | + # Extract the first word of "pkg-config", so it can be a program name with args. |
2294 | +set dummy pkg-config; ac_word=$2 |
2295 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2296 | +$as_echo_n "checking for $ac_word... " >&6; } |
2297 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
2298 | + $as_echo_n "(cached) " >&6 |
2299 | +else |
2300 | + case $ac_pt_PKG_CONFIG in |
2301 | + [\\/]* | ?:[\\/]*) |
2302 | + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
2303 | + ;; |
2304 | + *) |
2305 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2306 | +for as_dir in $PATH |
2307 | +do |
2308 | + IFS=$as_save_IFS |
2309 | + test -z "$as_dir" && as_dir=. |
2310 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2311 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2312 | + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2313 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2314 | + break 2 |
2315 | + fi |
2316 | +done |
2317 | + done |
2318 | +IFS=$as_save_IFS |
2319 | + |
2320 | + ;; |
2321 | +esac |
2322 | +fi |
2323 | +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
2324 | +if test -n "$ac_pt_PKG_CONFIG"; then |
2325 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
2326 | +$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
2327 | +else |
2328 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2329 | +$as_echo "no" >&6; } |
2330 | +fi |
2331 | + |
2332 | + if test "x$ac_pt_PKG_CONFIG" = x; then |
2333 | + PKG_CONFIG="" |
2334 | + else |
2335 | + case $cross_compiling:$ac_tool_warned in |
2336 | +yes:) |
2337 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2338 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2339 | +ac_tool_warned=yes ;; |
2340 | +esac |
2341 | + PKG_CONFIG=$ac_pt_PKG_CONFIG |
2342 | + fi |
2343 | +else |
2344 | + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
2345 | +fi |
2346 | + |
2347 | +fi |
2348 | +if test -n "$PKG_CONFIG"; then |
2349 | + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
2350 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
2351 | +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
2352 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
2353 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2354 | +$as_echo "yes" >&6; } |
2355 | + else |
2356 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2357 | +$as_echo "no" >&6; } |
2358 | + PKG_CONFIG="" |
2359 | + fi |
2360 | +fi |
2361 | + |
2362 | + if test x"$PKG_CONFIG" = x""; then |
2363 | + echo |
2364 | + echo "*** Your version of pkg-config is too old. You need atleast" |
2365 | + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
2366 | + echo "*** from the freedesktop.org software repository at" |
2367 | + echo "***" |
2368 | + echo "*** http://www.freedesktop.org/software/pkgconfig" |
2369 | + echo "***" |
2370 | + exit 1; |
2371 | + fi |
2372 | + |
2373 | + |
2374 | + |
2375 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.2.0" >&5 |
2376 | +$as_echo_n "checking for gtk+-3.0 >= 3.2.0... " >&6; } |
2377 | + if $PKG_CONFIG "--atleast-version=3.2.0" "gtk+-3.0" >/dev/null 2>&1; then |
2378 | + GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-3.0"` |
2379 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 |
2380 | +$as_echo "$GTK_VERSION" >&6; } |
2381 | + |
2382 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 |
2383 | +$as_echo_n "checking GTK_CFLAGS... " >&6; } |
2384 | + GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0"` |
2385 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 |
2386 | +$as_echo "$GTK_CFLAGS" >&6; } |
2387 | + |
2388 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 |
2389 | +$as_echo_n "checking GTK_LIBS... " >&6; } |
2390 | + GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0"` |
2391 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 |
2392 | +$as_echo "$GTK_LIBS" >&6; } |
2393 | + |
2394 | + GTK_REQUIRED_VERSION=3.2.0 |
2395 | + |
2396 | + |
2397 | + |
2398 | + |
2399 | + |
2400 | + |
2401 | + |
2402 | + elif $PKG_CONFIG --exists "gtk+-3.0" >/dev/null 2>&1; then |
2403 | + xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-3.0"` |
2404 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
2405 | +$as_echo "found, but $xdt_cv_version" >&6; } |
2406 | + |
2407 | + |
2408 | + echo "*** The required package gtk+-3.0 was found on your system," |
2409 | + echo "*** but the installed version ($xdt_cv_version) is too old." |
2410 | + echo "*** Please upgrade gtk+-3.0 to atleast version 3.2.0, or adjust" |
2411 | + echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
2412 | + echo "*** the new version of the package in a nonstandard prefix so" |
2413 | + echo "*** pkg-config is able to find it." |
2414 | + exit 1 |
2415 | + |
2416 | + else |
2417 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
2418 | +$as_echo "not found" >&6; } |
2419 | + |
2420 | + |
2421 | + echo "*** The required package gtk+-3.0 was not found on your system." |
2422 | + echo "*** Please install gtk+-3.0 (atleast version 3.2.0) or adjust" |
2423 | + echo "*** the PKG_CONFIG_PATH environment variable if you" |
2424 | + echo "*** installed the package in a nonstandard prefix so that" |
2425 | + echo "*** pkg-config is able to find it." |
2426 | + exit 1 |
2427 | + |
2428 | + fi |
2429 | + |
2430 | + |
2431 | + |
2432 | + |
2433 | + # minimum supported version of pkg-config |
2434 | + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
2435 | + |
2436 | + |
2437 | + |
2438 | + |
2439 | + |
2440 | + |
2441 | + |
2442 | + |
2443 | + |
2444 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2445 | + if test -n "$ac_tool_prefix"; then |
2446 | + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2447 | +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2448 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2449 | +$as_echo_n "checking for $ac_word... " >&6; } |
2450 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2451 | + $as_echo_n "(cached) " >&6 |
2452 | +else |
2453 | + case $PKG_CONFIG in |
2454 | + [\\/]* | ?:[\\/]*) |
2455 | + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
2456 | + ;; |
2457 | + *) |
2458 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2459 | +for as_dir in $PATH |
2460 | +do |
2461 | + IFS=$as_save_IFS |
2462 | + test -z "$as_dir" && as_dir=. |
2463 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2464 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2465 | + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2466 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2467 | + break 2 |
2468 | + fi |
2469 | +done |
2470 | + done |
2471 | +IFS=$as_save_IFS |
2472 | + |
2473 | + ;; |
2474 | +esac |
2475 | +fi |
2476 | +PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
2477 | +if test -n "$PKG_CONFIG"; then |
2478 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
2479 | +$as_echo "$PKG_CONFIG" >&6; } |
2480 | +else |
2481 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2482 | +$as_echo "no" >&6; } |
2483 | +fi |
2484 | + |
2485 | + |
2486 | +fi |
2487 | +if test -z "$ac_cv_path_PKG_CONFIG"; then |
2488 | + ac_pt_PKG_CONFIG=$PKG_CONFIG |
2489 | + # Extract the first word of "pkg-config", so it can be a program name with args. |
2490 | +set dummy pkg-config; ac_word=$2 |
2491 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2492 | +$as_echo_n "checking for $ac_word... " >&6; } |
2493 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
2494 | + $as_echo_n "(cached) " >&6 |
2495 | +else |
2496 | + case $ac_pt_PKG_CONFIG in |
2497 | + [\\/]* | ?:[\\/]*) |
2498 | + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
2499 | + ;; |
2500 | + *) |
2501 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2502 | +for as_dir in $PATH |
2503 | +do |
2504 | + IFS=$as_save_IFS |
2505 | + test -z "$as_dir" && as_dir=. |
2506 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2507 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2508 | + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2509 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2510 | + break 2 |
2511 | + fi |
2512 | +done |
2513 | + done |
2514 | +IFS=$as_save_IFS |
2515 | + |
2516 | + ;; |
2517 | +esac |
2518 | +fi |
2519 | +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
2520 | +if test -n "$ac_pt_PKG_CONFIG"; then |
2521 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
2522 | +$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
2523 | +else |
2524 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2525 | +$as_echo "no" >&6; } |
2526 | +fi |
2527 | + |
2528 | + if test "x$ac_pt_PKG_CONFIG" = x; then |
2529 | + PKG_CONFIG="" |
2530 | + else |
2531 | + case $cross_compiling:$ac_tool_warned in |
2532 | +yes:) |
2533 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2534 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2535 | +ac_tool_warned=yes ;; |
2536 | +esac |
2537 | + PKG_CONFIG=$ac_pt_PKG_CONFIG |
2538 | + fi |
2539 | +else |
2540 | + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
2541 | +fi |
2542 | + |
2543 | +fi |
2544 | +if test -n "$PKG_CONFIG"; then |
2545 | + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
2546 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
2547 | +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
2548 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
2549 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2550 | +$as_echo "yes" >&6; } |
2551 | + else |
2552 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2553 | +$as_echo "no" >&6; } |
2554 | + PKG_CONFIG="" |
2555 | + fi |
2556 | +fi |
2557 | + |
2558 | + if test x"$PKG_CONFIG" = x""; then |
2559 | + echo |
2560 | + echo "*** Your version of pkg-config is too old. You need atleast" |
2561 | + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
2562 | + echo "*** from the freedesktop.org software repository at" |
2563 | + echo "***" |
2564 | + echo "*** http://www.freedesktop.org/software/pkgconfig" |
2565 | + echo "***" |
2566 | + exit 1; |
2567 | + fi |
2568 | + |
2569 | + |
2570 | + |
2571 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gstreamer-${gstreamer_api_version} >= ${gstreamer_minimum_version}" >&5 |
2572 | $as_echo_n "checking for gstreamer-${gstreamer_api_version} >= ${gstreamer_minimum_version}... " >&6; } |
2573 | if $PKG_CONFIG "--atleast-version=${gstreamer_minimum_version}" "gstreamer-${gstreamer_api_version}" >/dev/null 2>&1; then |
2574 | @@ -21745,982 +22766,6 @@ |
2575 | |
2576 | |
2577 | |
2578 | - # minimum supported version of pkg-config |
2579 | - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
2580 | - |
2581 | - |
2582 | - |
2583 | - |
2584 | - |
2585 | - |
2586 | - |
2587 | - |
2588 | - |
2589 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2590 | - if test -n "$ac_tool_prefix"; then |
2591 | - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2592 | -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2593 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2594 | -$as_echo_n "checking for $ac_word... " >&6; } |
2595 | -if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2596 | - $as_echo_n "(cached) " >&6 |
2597 | -else |
2598 | - case $PKG_CONFIG in |
2599 | - [\\/]* | ?:[\\/]*) |
2600 | - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
2601 | - ;; |
2602 | - *) |
2603 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2604 | -for as_dir in $PATH |
2605 | -do |
2606 | - IFS=$as_save_IFS |
2607 | - test -z "$as_dir" && as_dir=. |
2608 | - for ac_exec_ext in '' $ac_executable_extensions; do |
2609 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2610 | - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2611 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2612 | - break 2 |
2613 | - fi |
2614 | -done |
2615 | - done |
2616 | -IFS=$as_save_IFS |
2617 | - |
2618 | - ;; |
2619 | -esac |
2620 | -fi |
2621 | -PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
2622 | -if test -n "$PKG_CONFIG"; then |
2623 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
2624 | -$as_echo "$PKG_CONFIG" >&6; } |
2625 | -else |
2626 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2627 | -$as_echo "no" >&6; } |
2628 | -fi |
2629 | - |
2630 | - |
2631 | -fi |
2632 | -if test -z "$ac_cv_path_PKG_CONFIG"; then |
2633 | - ac_pt_PKG_CONFIG=$PKG_CONFIG |
2634 | - # Extract the first word of "pkg-config", so it can be a program name with args. |
2635 | -set dummy pkg-config; ac_word=$2 |
2636 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2637 | -$as_echo_n "checking for $ac_word... " >&6; } |
2638 | -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
2639 | - $as_echo_n "(cached) " >&6 |
2640 | -else |
2641 | - case $ac_pt_PKG_CONFIG in |
2642 | - [\\/]* | ?:[\\/]*) |
2643 | - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
2644 | - ;; |
2645 | - *) |
2646 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2647 | -for as_dir in $PATH |
2648 | -do |
2649 | - IFS=$as_save_IFS |
2650 | - test -z "$as_dir" && as_dir=. |
2651 | - for ac_exec_ext in '' $ac_executable_extensions; do |
2652 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2653 | - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2654 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2655 | - break 2 |
2656 | - fi |
2657 | -done |
2658 | - done |
2659 | -IFS=$as_save_IFS |
2660 | - |
2661 | - ;; |
2662 | -esac |
2663 | -fi |
2664 | -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
2665 | -if test -n "$ac_pt_PKG_CONFIG"; then |
2666 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
2667 | -$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
2668 | -else |
2669 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2670 | -$as_echo "no" >&6; } |
2671 | -fi |
2672 | - |
2673 | - if test "x$ac_pt_PKG_CONFIG" = x; then |
2674 | - PKG_CONFIG="" |
2675 | - else |
2676 | - case $cross_compiling:$ac_tool_warned in |
2677 | -yes:) |
2678 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2679 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2680 | -ac_tool_warned=yes ;; |
2681 | -esac |
2682 | - PKG_CONFIG=$ac_pt_PKG_CONFIG |
2683 | - fi |
2684 | -else |
2685 | - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
2686 | -fi |
2687 | - |
2688 | -fi |
2689 | -if test -n "$PKG_CONFIG"; then |
2690 | - _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
2691 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
2692 | -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
2693 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
2694 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2695 | -$as_echo "yes" >&6; } |
2696 | - else |
2697 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2698 | -$as_echo "no" >&6; } |
2699 | - PKG_CONFIG="" |
2700 | - fi |
2701 | -fi |
2702 | - |
2703 | - if test x"$PKG_CONFIG" = x""; then |
2704 | - echo |
2705 | - echo "*** Your version of pkg-config is too old. You need atleast" |
2706 | - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
2707 | - echo "*** from the freedesktop.org software repository at" |
2708 | - echo "***" |
2709 | - echo "*** http://www.freedesktop.org/software/pkgconfig" |
2710 | - echo "***" |
2711 | - exit 1; |
2712 | - fi |
2713 | - |
2714 | - |
2715 | - |
2716 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 0.60" >&5 |
2717 | -$as_echo_n "checking for dbus-1 >= 0.60... " >&6; } |
2718 | - if $PKG_CONFIG "--atleast-version=0.60" "dbus-1" >/dev/null 2>&1; then |
2719 | - DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-1"` |
2720 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_VERSION" >&5 |
2721 | -$as_echo "$DBUS_VERSION" >&6; } |
2722 | - |
2723 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5 |
2724 | -$as_echo_n "checking DBUS_CFLAGS... " >&6; } |
2725 | - DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1"` |
2726 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5 |
2727 | -$as_echo "$DBUS_CFLAGS" >&6; } |
2728 | - |
2729 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5 |
2730 | -$as_echo_n "checking DBUS_LIBS... " >&6; } |
2731 | - DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1"` |
2732 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5 |
2733 | -$as_echo "$DBUS_LIBS" >&6; } |
2734 | - |
2735 | - DBUS_REQUIRED_VERSION=0.60 |
2736 | - |
2737 | - |
2738 | - |
2739 | - |
2740 | - |
2741 | - |
2742 | - |
2743 | - elif $PKG_CONFIG --exists "dbus-1" >/dev/null 2>&1; then |
2744 | - xdt_cv_version=`$PKG_CONFIG --modversion "dbus-1"` |
2745 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
2746 | -$as_echo "found, but $xdt_cv_version" >&6; } |
2747 | - |
2748 | - |
2749 | - echo "*** The required package dbus-1 was found on your system," |
2750 | - echo "*** but the installed version ($xdt_cv_version) is too old." |
2751 | - echo "*** Please upgrade dbus-1 to atleast version 0.60, or adjust" |
2752 | - echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
2753 | - echo "*** the new version of the package in a nonstandard prefix so" |
2754 | - echo "*** pkg-config is able to find it." |
2755 | - exit 1 |
2756 | - |
2757 | - else |
2758 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
2759 | -$as_echo "not found" >&6; } |
2760 | - |
2761 | - |
2762 | - echo "*** The required package dbus-1 was not found on your system." |
2763 | - echo "*** Please install dbus-1 (atleast version 0.60) or adjust" |
2764 | - echo "*** the PKG_CONFIG_PATH environment variable if you" |
2765 | - echo "*** installed the package in a nonstandard prefix so that" |
2766 | - echo "*** pkg-config is able to find it." |
2767 | - exit 1 |
2768 | - |
2769 | - fi |
2770 | - |
2771 | - |
2772 | - |
2773 | - # minimum supported version of pkg-config |
2774 | - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
2775 | - |
2776 | - |
2777 | - |
2778 | - |
2779 | - |
2780 | - |
2781 | - |
2782 | - |
2783 | - |
2784 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2785 | - if test -n "$ac_tool_prefix"; then |
2786 | - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2787 | -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2788 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2789 | -$as_echo_n "checking for $ac_word... " >&6; } |
2790 | -if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2791 | - $as_echo_n "(cached) " >&6 |
2792 | -else |
2793 | - case $PKG_CONFIG in |
2794 | - [\\/]* | ?:[\\/]*) |
2795 | - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
2796 | - ;; |
2797 | - *) |
2798 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2799 | -for as_dir in $PATH |
2800 | -do |
2801 | - IFS=$as_save_IFS |
2802 | - test -z "$as_dir" && as_dir=. |
2803 | - for ac_exec_ext in '' $ac_executable_extensions; do |
2804 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2805 | - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2806 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2807 | - break 2 |
2808 | - fi |
2809 | -done |
2810 | - done |
2811 | -IFS=$as_save_IFS |
2812 | - |
2813 | - ;; |
2814 | -esac |
2815 | -fi |
2816 | -PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
2817 | -if test -n "$PKG_CONFIG"; then |
2818 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
2819 | -$as_echo "$PKG_CONFIG" >&6; } |
2820 | -else |
2821 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2822 | -$as_echo "no" >&6; } |
2823 | -fi |
2824 | - |
2825 | - |
2826 | -fi |
2827 | -if test -z "$ac_cv_path_PKG_CONFIG"; then |
2828 | - ac_pt_PKG_CONFIG=$PKG_CONFIG |
2829 | - # Extract the first word of "pkg-config", so it can be a program name with args. |
2830 | -set dummy pkg-config; ac_word=$2 |
2831 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2832 | -$as_echo_n "checking for $ac_word... " >&6; } |
2833 | -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
2834 | - $as_echo_n "(cached) " >&6 |
2835 | -else |
2836 | - case $ac_pt_PKG_CONFIG in |
2837 | - [\\/]* | ?:[\\/]*) |
2838 | - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
2839 | - ;; |
2840 | - *) |
2841 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2842 | -for as_dir in $PATH |
2843 | -do |
2844 | - IFS=$as_save_IFS |
2845 | - test -z "$as_dir" && as_dir=. |
2846 | - for ac_exec_ext in '' $ac_executable_extensions; do |
2847 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2848 | - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2849 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2850 | - break 2 |
2851 | - fi |
2852 | -done |
2853 | - done |
2854 | -IFS=$as_save_IFS |
2855 | - |
2856 | - ;; |
2857 | -esac |
2858 | -fi |
2859 | -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
2860 | -if test -n "$ac_pt_PKG_CONFIG"; then |
2861 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
2862 | -$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
2863 | -else |
2864 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2865 | -$as_echo "no" >&6; } |
2866 | -fi |
2867 | - |
2868 | - if test "x$ac_pt_PKG_CONFIG" = x; then |
2869 | - PKG_CONFIG="" |
2870 | - else |
2871 | - case $cross_compiling:$ac_tool_warned in |
2872 | -yes:) |
2873 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2874 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2875 | -ac_tool_warned=yes ;; |
2876 | -esac |
2877 | - PKG_CONFIG=$ac_pt_PKG_CONFIG |
2878 | - fi |
2879 | -else |
2880 | - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
2881 | -fi |
2882 | - |
2883 | -fi |
2884 | -if test -n "$PKG_CONFIG"; then |
2885 | - _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
2886 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
2887 | -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
2888 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
2889 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2890 | -$as_echo "yes" >&6; } |
2891 | - else |
2892 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2893 | -$as_echo "no" >&6; } |
2894 | - PKG_CONFIG="" |
2895 | - fi |
2896 | -fi |
2897 | - |
2898 | - if test x"$PKG_CONFIG" = x""; then |
2899 | - echo |
2900 | - echo "*** Your version of pkg-config is too old. You need atleast" |
2901 | - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
2902 | - echo "*** from the freedesktop.org software repository at" |
2903 | - echo "***" |
2904 | - echo "*** http://www.freedesktop.org/software/pkgconfig" |
2905 | - echo "***" |
2906 | - exit 1; |
2907 | - fi |
2908 | - |
2909 | - |
2910 | - |
2911 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.70" >&5 |
2912 | -$as_echo_n "checking for dbus-glib-1 >= 0.70... " >&6; } |
2913 | - if $PKG_CONFIG "--atleast-version=0.70" "dbus-glib-1" >/dev/null 2>&1; then |
2914 | - DBUS_GLIB_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"` |
2915 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_VERSION" >&5 |
2916 | -$as_echo "$DBUS_GLIB_VERSION" >&6; } |
2917 | - |
2918 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_CFLAGS" >&5 |
2919 | -$as_echo_n "checking DBUS_GLIB_CFLAGS... " >&6; } |
2920 | - DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` |
2921 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_CFLAGS" >&5 |
2922 | -$as_echo "$DBUS_GLIB_CFLAGS" >&6; } |
2923 | - |
2924 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_GLIB_LIBS" >&5 |
2925 | -$as_echo_n "checking DBUS_GLIB_LIBS... " >&6; } |
2926 | - DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1"` |
2927 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_GLIB_LIBS" >&5 |
2928 | -$as_echo "$DBUS_GLIB_LIBS" >&6; } |
2929 | - |
2930 | - DBUS_GLIB_REQUIRED_VERSION=0.70 |
2931 | - |
2932 | - |
2933 | - |
2934 | - |
2935 | - |
2936 | - |
2937 | - |
2938 | - elif $PKG_CONFIG --exists "dbus-glib-1" >/dev/null 2>&1; then |
2939 | - xdt_cv_version=`$PKG_CONFIG --modversion "dbus-glib-1"` |
2940 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
2941 | -$as_echo "found, but $xdt_cv_version" >&6; } |
2942 | - |
2943 | - |
2944 | - echo "*** The required package dbus-glib-1 was found on your system," |
2945 | - echo "*** but the installed version ($xdt_cv_version) is too old." |
2946 | - echo "*** Please upgrade dbus-glib-1 to atleast version 0.70, or adjust" |
2947 | - echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
2948 | - echo "*** the new version of the package in a nonstandard prefix so" |
2949 | - echo "*** pkg-config is able to find it." |
2950 | - exit 1 |
2951 | - |
2952 | - else |
2953 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
2954 | -$as_echo "not found" >&6; } |
2955 | - |
2956 | - |
2957 | - echo "*** The required package dbus-glib-1 was not found on your system." |
2958 | - echo "*** Please install dbus-glib-1 (atleast version 0.70) or adjust" |
2959 | - echo "*** the PKG_CONFIG_PATH environment variable if you" |
2960 | - echo "*** installed the package in a nonstandard prefix so that" |
2961 | - echo "*** pkg-config is able to find it." |
2962 | - exit 1 |
2963 | - |
2964 | - fi |
2965 | - |
2966 | - |
2967 | - |
2968 | - |
2969 | - # minimum supported version of pkg-config |
2970 | - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
2971 | - |
2972 | - |
2973 | - |
2974 | - |
2975 | - |
2976 | - |
2977 | - |
2978 | - |
2979 | - |
2980 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2981 | - if test -n "$ac_tool_prefix"; then |
2982 | - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2983 | -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2984 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2985 | -$as_echo_n "checking for $ac_word... " >&6; } |
2986 | -if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2987 | - $as_echo_n "(cached) " >&6 |
2988 | -else |
2989 | - case $PKG_CONFIG in |
2990 | - [\\/]* | ?:[\\/]*) |
2991 | - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
2992 | - ;; |
2993 | - *) |
2994 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2995 | -for as_dir in $PATH |
2996 | -do |
2997 | - IFS=$as_save_IFS |
2998 | - test -z "$as_dir" && as_dir=. |
2999 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3000 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3001 | - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
3002 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3003 | - break 2 |
3004 | - fi |
3005 | -done |
3006 | - done |
3007 | -IFS=$as_save_IFS |
3008 | - |
3009 | - ;; |
3010 | -esac |
3011 | -fi |
3012 | -PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
3013 | -if test -n "$PKG_CONFIG"; then |
3014 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
3015 | -$as_echo "$PKG_CONFIG" >&6; } |
3016 | -else |
3017 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3018 | -$as_echo "no" >&6; } |
3019 | -fi |
3020 | - |
3021 | - |
3022 | -fi |
3023 | -if test -z "$ac_cv_path_PKG_CONFIG"; then |
3024 | - ac_pt_PKG_CONFIG=$PKG_CONFIG |
3025 | - # Extract the first word of "pkg-config", so it can be a program name with args. |
3026 | -set dummy pkg-config; ac_word=$2 |
3027 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3028 | -$as_echo_n "checking for $ac_word... " >&6; } |
3029 | -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
3030 | - $as_echo_n "(cached) " >&6 |
3031 | -else |
3032 | - case $ac_pt_PKG_CONFIG in |
3033 | - [\\/]* | ?:[\\/]*) |
3034 | - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
3035 | - ;; |
3036 | - *) |
3037 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3038 | -for as_dir in $PATH |
3039 | -do |
3040 | - IFS=$as_save_IFS |
3041 | - test -z "$as_dir" && as_dir=. |
3042 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3043 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3044 | - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
3045 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3046 | - break 2 |
3047 | - fi |
3048 | -done |
3049 | - done |
3050 | -IFS=$as_save_IFS |
3051 | - |
3052 | - ;; |
3053 | -esac |
3054 | -fi |
3055 | -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
3056 | -if test -n "$ac_pt_PKG_CONFIG"; then |
3057 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
3058 | -$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
3059 | -else |
3060 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3061 | -$as_echo "no" >&6; } |
3062 | -fi |
3063 | - |
3064 | - if test "x$ac_pt_PKG_CONFIG" = x; then |
3065 | - PKG_CONFIG="" |
3066 | - else |
3067 | - case $cross_compiling:$ac_tool_warned in |
3068 | -yes:) |
3069 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3070 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3071 | -ac_tool_warned=yes ;; |
3072 | -esac |
3073 | - PKG_CONFIG=$ac_pt_PKG_CONFIG |
3074 | - fi |
3075 | -else |
3076 | - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
3077 | -fi |
3078 | - |
3079 | -fi |
3080 | -if test -n "$PKG_CONFIG"; then |
3081 | - _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
3082 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
3083 | -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
3084 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
3085 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3086 | -$as_echo "yes" >&6; } |
3087 | - else |
3088 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3089 | -$as_echo "no" >&6; } |
3090 | - PKG_CONFIG="" |
3091 | - fi |
3092 | -fi |
3093 | - |
3094 | - if test x"$PKG_CONFIG" = x""; then |
3095 | - echo |
3096 | - echo "*** Your version of pkg-config is too old. You need atleast" |
3097 | - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
3098 | - echo "*** from the freedesktop.org software repository at" |
3099 | - echo "***" |
3100 | - echo "*** http://www.freedesktop.org/software/pkgconfig" |
3101 | - echo "***" |
3102 | - exit 1; |
3103 | - fi |
3104 | - |
3105 | - |
3106 | - |
3107 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.8.0" >&5 |
3108 | -$as_echo_n "checking for libxfce4ui-1 >= 4.8.0... " >&6; } |
3109 | - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4ui-1" >/dev/null 2>&1; then |
3110 | - LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-1"` |
3111 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 |
3112 | -$as_echo "$LIBXFCE4UI_VERSION" >&6; } |
3113 | - |
3114 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_CFLAGS" >&5 |
3115 | -$as_echo_n "checking LIBXFCE4UI_CFLAGS... " >&6; } |
3116 | - LIBXFCE4UI_CFLAGS=`$PKG_CONFIG --cflags "libxfce4ui-1"` |
3117 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_CFLAGS" >&5 |
3118 | -$as_echo "$LIBXFCE4UI_CFLAGS" >&6; } |
3119 | - |
3120 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_LIBS" >&5 |
3121 | -$as_echo_n "checking LIBXFCE4UI_LIBS... " >&6; } |
3122 | - LIBXFCE4UI_LIBS=`$PKG_CONFIG --libs "libxfce4ui-1"` |
3123 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 |
3124 | -$as_echo "$LIBXFCE4UI_LIBS" >&6; } |
3125 | - |
3126 | - LIBXFCE4UI_REQUIRED_VERSION=4.8.0 |
3127 | - |
3128 | - |
3129 | - |
3130 | - |
3131 | - |
3132 | - |
3133 | - |
3134 | - elif $PKG_CONFIG --exists "libxfce4ui-1" >/dev/null 2>&1; then |
3135 | - xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-1"` |
3136 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
3137 | -$as_echo "found, but $xdt_cv_version" >&6; } |
3138 | - |
3139 | - |
3140 | - echo "*** The required package libxfce4ui-1 was found on your system," |
3141 | - echo "*** but the installed version ($xdt_cv_version) is too old." |
3142 | - echo "*** Please upgrade libxfce4ui-1 to atleast version 4.8.0, or adjust" |
3143 | - echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
3144 | - echo "*** the new version of the package in a nonstandard prefix so" |
3145 | - echo "*** pkg-config is able to find it." |
3146 | - exit 1 |
3147 | - |
3148 | - else |
3149 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
3150 | -$as_echo "not found" >&6; } |
3151 | - |
3152 | - |
3153 | - echo "*** The required package libxfce4ui-1 was not found on your system." |
3154 | - echo "*** Please install libxfce4ui-1 (atleast version 4.8.0) or adjust" |
3155 | - echo "*** the PKG_CONFIG_PATH environment variable if you" |
3156 | - echo "*** installed the package in a nonstandard prefix so that" |
3157 | - echo "*** pkg-config is able to find it." |
3158 | - exit 1 |
3159 | - |
3160 | - fi |
3161 | - |
3162 | - |
3163 | - |
3164 | - # minimum supported version of pkg-config |
3165 | - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
3166 | - |
3167 | - |
3168 | - |
3169 | - |
3170 | - |
3171 | - |
3172 | - |
3173 | - |
3174 | - |
3175 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
3176 | - if test -n "$ac_tool_prefix"; then |
3177 | - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
3178 | -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
3179 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3180 | -$as_echo_n "checking for $ac_word... " >&6; } |
3181 | -if ${ac_cv_path_PKG_CONFIG+:} false; then : |
3182 | - $as_echo_n "(cached) " >&6 |
3183 | -else |
3184 | - case $PKG_CONFIG in |
3185 | - [\\/]* | ?:[\\/]*) |
3186 | - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
3187 | - ;; |
3188 | - *) |
3189 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3190 | -for as_dir in $PATH |
3191 | -do |
3192 | - IFS=$as_save_IFS |
3193 | - test -z "$as_dir" && as_dir=. |
3194 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3195 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3196 | - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
3197 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3198 | - break 2 |
3199 | - fi |
3200 | -done |
3201 | - done |
3202 | -IFS=$as_save_IFS |
3203 | - |
3204 | - ;; |
3205 | -esac |
3206 | -fi |
3207 | -PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
3208 | -if test -n "$PKG_CONFIG"; then |
3209 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
3210 | -$as_echo "$PKG_CONFIG" >&6; } |
3211 | -else |
3212 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3213 | -$as_echo "no" >&6; } |
3214 | -fi |
3215 | - |
3216 | - |
3217 | -fi |
3218 | -if test -z "$ac_cv_path_PKG_CONFIG"; then |
3219 | - ac_pt_PKG_CONFIG=$PKG_CONFIG |
3220 | - # Extract the first word of "pkg-config", so it can be a program name with args. |
3221 | -set dummy pkg-config; ac_word=$2 |
3222 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3223 | -$as_echo_n "checking for $ac_word... " >&6; } |
3224 | -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
3225 | - $as_echo_n "(cached) " >&6 |
3226 | -else |
3227 | - case $ac_pt_PKG_CONFIG in |
3228 | - [\\/]* | ?:[\\/]*) |
3229 | - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
3230 | - ;; |
3231 | - *) |
3232 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3233 | -for as_dir in $PATH |
3234 | -do |
3235 | - IFS=$as_save_IFS |
3236 | - test -z "$as_dir" && as_dir=. |
3237 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3238 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3239 | - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
3240 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3241 | - break 2 |
3242 | - fi |
3243 | -done |
3244 | - done |
3245 | -IFS=$as_save_IFS |
3246 | - |
3247 | - ;; |
3248 | -esac |
3249 | -fi |
3250 | -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
3251 | -if test -n "$ac_pt_PKG_CONFIG"; then |
3252 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
3253 | -$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
3254 | -else |
3255 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3256 | -$as_echo "no" >&6; } |
3257 | -fi |
3258 | - |
3259 | - if test "x$ac_pt_PKG_CONFIG" = x; then |
3260 | - PKG_CONFIG="" |
3261 | - else |
3262 | - case $cross_compiling:$ac_tool_warned in |
3263 | -yes:) |
3264 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3265 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3266 | -ac_tool_warned=yes ;; |
3267 | -esac |
3268 | - PKG_CONFIG=$ac_pt_PKG_CONFIG |
3269 | - fi |
3270 | -else |
3271 | - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
3272 | -fi |
3273 | - |
3274 | -fi |
3275 | -if test -n "$PKG_CONFIG"; then |
3276 | - _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
3277 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
3278 | -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
3279 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
3280 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3281 | -$as_echo "yes" >&6; } |
3282 | - else |
3283 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3284 | -$as_echo "no" >&6; } |
3285 | - PKG_CONFIG="" |
3286 | - fi |
3287 | -fi |
3288 | - |
3289 | - if test x"$PKG_CONFIG" = x""; then |
3290 | - echo |
3291 | - echo "*** Your version of pkg-config is too old. You need atleast" |
3292 | - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
3293 | - echo "*** from the freedesktop.org software repository at" |
3294 | - echo "***" |
3295 | - echo "*** http://www.freedesktop.org/software/pkgconfig" |
3296 | - echo "***" |
3297 | - exit 1; |
3298 | - fi |
3299 | - |
3300 | - |
3301 | - |
3302 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 |
3303 | -$as_echo_n "checking for libxfce4util-1.0 >= 4.8.0... " >&6; } |
3304 | - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4util-1.0" >/dev/null 2>&1; then |
3305 | - LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` |
3306 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 |
3307 | -$as_echo "$LIBXFCE4UTIL_VERSION" >&6; } |
3308 | - |
3309 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 |
3310 | -$as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } |
3311 | - LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` |
3312 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 |
3313 | -$as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } |
3314 | - |
3315 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 |
3316 | -$as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } |
3317 | - LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` |
3318 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 |
3319 | -$as_echo "$LIBXFCE4UTIL_LIBS" >&6; } |
3320 | - |
3321 | - LIBXFCE4UTIL_REQUIRED_VERSION=4.8.0 |
3322 | - |
3323 | - |
3324 | - |
3325 | - |
3326 | - |
3327 | - |
3328 | - |
3329 | - elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then |
3330 | - xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` |
3331 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
3332 | -$as_echo "found, but $xdt_cv_version" >&6; } |
3333 | - |
3334 | - |
3335 | - echo "*** The required package libxfce4util-1.0 was found on your system," |
3336 | - echo "*** but the installed version ($xdt_cv_version) is too old." |
3337 | - echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.8.0, or adjust" |
3338 | - echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
3339 | - echo "*** the new version of the package in a nonstandard prefix so" |
3340 | - echo "*** pkg-config is able to find it." |
3341 | - exit 1 |
3342 | - |
3343 | - else |
3344 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
3345 | -$as_echo "not found" >&6; } |
3346 | - |
3347 | - |
3348 | - echo "*** The required package libxfce4util-1.0 was not found on your system." |
3349 | - echo "*** Please install libxfce4util-1.0 (atleast version 4.8.0) or adjust" |
3350 | - echo "*** the PKG_CONFIG_PATH environment variable if you" |
3351 | - echo "*** installed the package in a nonstandard prefix so that" |
3352 | - echo "*** pkg-config is able to find it." |
3353 | - exit 1 |
3354 | - |
3355 | - fi |
3356 | - |
3357 | - |
3358 | - |
3359 | - |
3360 | - # minimum supported version of pkg-config |
3361 | - xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 |
3362 | - |
3363 | - |
3364 | - |
3365 | - |
3366 | - |
3367 | - |
3368 | - |
3369 | - |
3370 | - |
3371 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
3372 | - if test -n "$ac_tool_prefix"; then |
3373 | - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
3374 | -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
3375 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3376 | -$as_echo_n "checking for $ac_word... " >&6; } |
3377 | -if ${ac_cv_path_PKG_CONFIG+:} false; then : |
3378 | - $as_echo_n "(cached) " >&6 |
3379 | -else |
3380 | - case $PKG_CONFIG in |
3381 | - [\\/]* | ?:[\\/]*) |
3382 | - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
3383 | - ;; |
3384 | - *) |
3385 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3386 | -for as_dir in $PATH |
3387 | -do |
3388 | - IFS=$as_save_IFS |
3389 | - test -z "$as_dir" && as_dir=. |
3390 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3391 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3392 | - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
3393 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3394 | - break 2 |
3395 | - fi |
3396 | -done |
3397 | - done |
3398 | -IFS=$as_save_IFS |
3399 | - |
3400 | - ;; |
3401 | -esac |
3402 | -fi |
3403 | -PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
3404 | -if test -n "$PKG_CONFIG"; then |
3405 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
3406 | -$as_echo "$PKG_CONFIG" >&6; } |
3407 | -else |
3408 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3409 | -$as_echo "no" >&6; } |
3410 | -fi |
3411 | - |
3412 | - |
3413 | -fi |
3414 | -if test -z "$ac_cv_path_PKG_CONFIG"; then |
3415 | - ac_pt_PKG_CONFIG=$PKG_CONFIG |
3416 | - # Extract the first word of "pkg-config", so it can be a program name with args. |
3417 | -set dummy pkg-config; ac_word=$2 |
3418 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3419 | -$as_echo_n "checking for $ac_word... " >&6; } |
3420 | -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
3421 | - $as_echo_n "(cached) " >&6 |
3422 | -else |
3423 | - case $ac_pt_PKG_CONFIG in |
3424 | - [\\/]* | ?:[\\/]*) |
3425 | - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
3426 | - ;; |
3427 | - *) |
3428 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3429 | -for as_dir in $PATH |
3430 | -do |
3431 | - IFS=$as_save_IFS |
3432 | - test -z "$as_dir" && as_dir=. |
3433 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3434 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3435 | - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
3436 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3437 | - break 2 |
3438 | - fi |
3439 | -done |
3440 | - done |
3441 | -IFS=$as_save_IFS |
3442 | - |
3443 | - ;; |
3444 | -esac |
3445 | -fi |
3446 | -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
3447 | -if test -n "$ac_pt_PKG_CONFIG"; then |
3448 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
3449 | -$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
3450 | -else |
3451 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3452 | -$as_echo "no" >&6; } |
3453 | -fi |
3454 | - |
3455 | - if test "x$ac_pt_PKG_CONFIG" = x; then |
3456 | - PKG_CONFIG="" |
3457 | - else |
3458 | - case $cross_compiling:$ac_tool_warned in |
3459 | -yes:) |
3460 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3461 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3462 | -ac_tool_warned=yes ;; |
3463 | -esac |
3464 | - PKG_CONFIG=$ac_pt_PKG_CONFIG |
3465 | - fi |
3466 | -else |
3467 | - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
3468 | -fi |
3469 | - |
3470 | -fi |
3471 | -if test -n "$PKG_CONFIG"; then |
3472 | - _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION |
3473 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
3474 | -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
3475 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
3476 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3477 | -$as_echo "yes" >&6; } |
3478 | - else |
3479 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3480 | -$as_echo "no" >&6; } |
3481 | - PKG_CONFIG="" |
3482 | - fi |
3483 | -fi |
3484 | - |
3485 | - if test x"$PKG_CONFIG" = x""; then |
3486 | - echo |
3487 | - echo "*** Your version of pkg-config is too old. You need atleast" |
3488 | - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" |
3489 | - echo "*** from the freedesktop.org software repository at" |
3490 | - echo "***" |
3491 | - echo "*** http://www.freedesktop.org/software/pkgconfig" |
3492 | - echo "***" |
3493 | - exit 1; |
3494 | - fi |
3495 | - |
3496 | - |
3497 | - |
3498 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.10.0" >&5 |
3499 | -$as_echo_n "checking for libxfconf-0 >= 4.10.0... " >&6; } |
3500 | - if $PKG_CONFIG "--atleast-version=4.10.0" "libxfconf-0" >/dev/null 2>&1; then |
3501 | - XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` |
3502 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 |
3503 | -$as_echo "$XFCONF_VERSION" >&6; } |
3504 | - |
3505 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_CFLAGS" >&5 |
3506 | -$as_echo_n "checking XFCONF_CFLAGS... " >&6; } |
3507 | - XFCONF_CFLAGS=`$PKG_CONFIG --cflags "libxfconf-0"` |
3508 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_CFLAGS" >&5 |
3509 | -$as_echo "$XFCONF_CFLAGS" >&6; } |
3510 | - |
3511 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_LIBS" >&5 |
3512 | -$as_echo_n "checking XFCONF_LIBS... " >&6; } |
3513 | - XFCONF_LIBS=`$PKG_CONFIG --libs "libxfconf-0"` |
3514 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 |
3515 | -$as_echo "$XFCONF_LIBS" >&6; } |
3516 | - |
3517 | - XFCONF_REQUIRED_VERSION=4.10.0 |
3518 | - |
3519 | - |
3520 | - |
3521 | - |
3522 | - |
3523 | - |
3524 | - |
3525 | - elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then |
3526 | - xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` |
3527 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 |
3528 | -$as_echo "found, but $xdt_cv_version" >&6; } |
3529 | - |
3530 | - |
3531 | - echo "*** The required package libxfconf-0 was found on your system," |
3532 | - echo "*** but the installed version ($xdt_cv_version) is too old." |
3533 | - echo "*** Please upgrade libxfconf-0 to atleast version 4.10.0, or adjust" |
3534 | - echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
3535 | - echo "*** the new version of the package in a nonstandard prefix so" |
3536 | - echo "*** pkg-config is able to find it." |
3537 | - exit 1 |
3538 | - |
3539 | - else |
3540 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
3541 | -$as_echo "not found" >&6; } |
3542 | - |
3543 | - |
3544 | - echo "*** The required package libxfconf-0 was not found on your system." |
3545 | - echo "*** Please install libxfconf-0 (atleast version 4.10.0) or adjust" |
3546 | - echo "*** the PKG_CONFIG_PATH environment variable if you" |
3547 | - echo "*** installed the package in a nonstandard prefix so that" |
3548 | - echo "*** pkg-config is able to find it." |
3549 | - exit 1 |
3550 | - |
3551 | - fi |
3552 | - |
3553 | - |
3554 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 |
3555 | $as_echo_n "checking for X... " >&6; } |
3556 | |
3557 | @@ -23470,31 +23515,10 @@ |
3558 | |
3559 | |
3560 | |
3561 | -#=======================================================# |
3562 | -# Gtkrc files # |
3563 | -#=======================================================# |
3564 | -if test "x${prefix}" = "xNONE"; then |
3565 | - |
3566 | -cat >>confdefs.h <<_ACEOF |
3567 | -#define GTKRC_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" |
3568 | -_ACEOF |
3569 | - |
3570 | - gtkrcdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" |
3571 | -else |
3572 | - |
3573 | -cat >>confdefs.h <<_ACEOF |
3574 | -#define GTKRC_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" |
3575 | -_ACEOF |
3576 | - |
3577 | - gtkrcdir="${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" |
3578 | -fi |
3579 | - |
3580 | - |
3581 | - |
3582 | # Taken from Gnome system tools |
3583 | -#=======================================================# |
3584 | -# Pixmaps files # |
3585 | -#=======================================================# |
3586 | +# ===================================================== # |
3587 | +# Pixmaps files # |
3588 | +# ===================================================== # |
3589 | if test "x${prefix}" = "xNONE"; then |
3590 | |
3591 | cat >>confdefs.h <<_ACEOF |
3592 | @@ -23513,9 +23537,9 @@ |
3593 | |
3594 | |
3595 | |
3596 | -#=======================================================# |
3597 | -# Check XF86keysysm # |
3598 | -#=======================================================# |
3599 | +# ===================================================== # |
3600 | +# Check XF86keysysm # |
3601 | +# ===================================================== # |
3602 | # Check for the AudioPlay sym other should exist |
3603 | # if this one exists. |
3604 | ac_fn_c_check_decl "$LINENO" "XF86XK_AudioPlay" "ac_cv_have_decl_XF86XK_AudioPlay" "#include <X11/XF86keysym.h> |
3605 | @@ -23532,9 +23556,9 @@ |
3606 | |
3607 | fi |
3608 | |
3609 | -#=======================================================# |
3610 | -# TagLib support # |
3611 | -#=======================================================# |
3612 | +# ===================================================== # |
3613 | +# TagLib support # |
3614 | +# ===================================================== # |
3615 | TAGLIB_FOUND="no" |
3616 | |
3617 | |
3618 | @@ -23816,7 +23840,7 @@ |
3619 | ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default" |
3620 | if test "x$ac_cv_header_taglib_tag_c_h" = xyes; then : |
3621 | |
3622 | - TAGLIBC_LIBS="-ltag_c" |
3623 | + TAGLIBC_LIBS="-ltag_c" |
3624 | |
3625 | $as_echo "#define HAVE_TAGLIBC 1" >>confdefs.h |
3626 | |
3627 | @@ -23833,9 +23857,9 @@ |
3628 | |
3629 | fi |
3630 | |
3631 | -#=======================================================# |
3632 | -# Check plugins to build # |
3633 | -#=======================================================# |
3634 | +# ===================================================== # |
3635 | +# Check plugins to build # |
3636 | +# ===================================================== # |
3637 | |
3638 | # Notify plugin. |
3639 | #-------------------------- |
3640 | @@ -24080,9 +24104,31 @@ |
3641 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_tray_plugin" >&5 |
3642 | $as_echo "$ac_tray_plugin" >&6; } |
3643 | |
3644 | -#=======================================================# |
3645 | -# Check for debugging support # |
3646 | -#=======================================================# |
3647 | +# MPRIS2 plugin. |
3648 | +#-------------------------- |
3649 | +# Check whether --enable-mpris2-plugin was given. |
3650 | +if test "${enable_mpris2_plugin+set}" = set; then : |
3651 | + enableval=$enable_mpris2_plugin; ac_mpris2_plugin=$enableval |
3652 | +else |
3653 | + ac_mpris2_plugin=yes |
3654 | +fi |
3655 | + |
3656 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the mpris2 plugin" >&5 |
3657 | +$as_echo_n "checking whether to build the mpris2 plugin... " >&6; } |
3658 | + if test x"$ac_mpris2_plugin" = x"yes"; then |
3659 | + PAROLE_MPRIS2_PLUGIN_TRUE= |
3660 | + PAROLE_MPRIS2_PLUGIN_FALSE='#' |
3661 | +else |
3662 | + PAROLE_MPRIS2_PLUGIN_TRUE='#' |
3663 | + PAROLE_MPRIS2_PLUGIN_FALSE= |
3664 | +fi |
3665 | + |
3666 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_mpris2_plugin" >&5 |
3667 | +$as_echo "$ac_mpris2_plugin" >&6; } |
3668 | + |
3669 | +# ===================================================== # |
3670 | +# Check for debugging support # |
3671 | +# ===================================================== # |
3672 | |
3673 | # Check whether --enable-debug was given. |
3674 | if test "${enable_debug+set}" = set; then : |
3675 | @@ -24179,9 +24225,9 @@ |
3676 | fi |
3677 | |
3678 | |
3679 | -#=======================================================# |
3680 | -# Check for Gtk doc # |
3681 | -#=======================================================# |
3682 | +# ===================================================== # |
3683 | +# Check for Gtk doc # |
3684 | +# ===================================================== # |
3685 | |
3686 | |
3687 | |
3688 | @@ -24488,7 +24534,7 @@ |
3689 | |
3690 | |
3691 | |
3692 | -ac_config_files="$ac_config_files Makefile data/Makefile data/gtk-2.0/Makefile data/pixmaps/Makefile data/interfaces/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile data/mime/Makefile data/desktop/Makefile src/Makefile src/misc/Makefile src/misc/parole.h src/common/Makefile src/gst/Makefile src/dbus/Makefile src/plugins/Makefile src/plugins/sample/Makefile src/plugins/notify/Makefile src/plugins/tray/Makefile docs/Makefile docs/plugin-api/version.xml docs/plugin-api/Makefile po/Makefile.in" |
3693 | +ac_config_files="$ac_config_files Makefile data/Makefile data/pixmaps/Makefile data/interfaces/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/64x64/Makefile data/icons/128x128/Makefile data/icons/scalable/Makefile data/mime/Makefile data/desktop/Makefile src/Makefile src/misc/Makefile src/misc/parole.h src/common/Makefile src/gst/Makefile src/dbus/Makefile src/plugins/Makefile src/plugins/sample/Makefile src/plugins/notify/Makefile src/plugins/tray/Makefile src/plugins/mpris2/Makefile docs/Makefile docs/plugin-api/version.xml docs/plugin-api/Makefile po/Makefile.in" |
3694 | |
3695 | cat >confcache <<\_ACEOF |
3696 | # This file is a shell script that caches the results of configure |
3697 | @@ -24658,6 +24704,10 @@ |
3698 | as_fn_error $? "conditional \"PAROLE_TRAY_PLUGIN\" was never defined. |
3699 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
3700 | fi |
3701 | +if test -z "${PAROLE_MPRIS2_PLUGIN_TRUE}" && test -z "${PAROLE_MPRIS2_PLUGIN_FALSE}"; then |
3702 | + as_fn_error $? "conditional \"PAROLE_MPRIS2_PLUGIN\" was never defined. |
3703 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
3704 | +fi |
3705 | if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then |
3706 | as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. |
3707 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
3708 | @@ -25075,7 +25125,7 @@ |
3709 | # report actual input values of CONFIG_FILES etc. instead of their |
3710 | # values after options handling. |
3711 | ac_log=" |
3712 | -This file was extended by parole $as_me 0.5.4, which was |
3713 | +This file was extended by parole $as_me 0.6.0, which was |
3714 | generated by GNU Autoconf 2.69. Invocation command line was |
3715 | |
3716 | CONFIG_FILES = $CONFIG_FILES |
3717 | @@ -25135,13 +25185,13 @@ |
3718 | Configuration commands: |
3719 | $config_commands |
3720 | |
3721 | -Report bugs to <aliov@xfce.org>." |
3722 | +Report bugs to <http://docs.xfce.org/apps/parole/bugs>." |
3723 | |
3724 | _ACEOF |
3725 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3726 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
3727 | ac_cs_version="\\ |
3728 | -parole config.status 0.5.4 |
3729 | +parole config.status 0.6.0 |
3730 | configured by $0, generated by GNU Autoconf 2.69, |
3731 | with options \\"\$ac_cs_config\\" |
3732 | |
3733 | @@ -25653,7 +25703,6 @@ |
3734 | "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; |
3735 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
3736 | "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; |
3737 | - "data/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES data/gtk-2.0/Makefile" ;; |
3738 | "data/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES data/pixmaps/Makefile" ;; |
3739 | "data/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES data/interfaces/Makefile" ;; |
3740 | "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; |
3741 | @@ -25661,6 +25710,8 @@ |
3742 | "data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/Makefile" ;; |
3743 | "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;; |
3744 | "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;; |
3745 | + "data/icons/64x64/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/64x64/Makefile" ;; |
3746 | + "data/icons/128x128/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/128x128/Makefile" ;; |
3747 | "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;; |
3748 | "data/mime/Makefile") CONFIG_FILES="$CONFIG_FILES data/mime/Makefile" ;; |
3749 | "data/desktop/Makefile") CONFIG_FILES="$CONFIG_FILES data/desktop/Makefile" ;; |
3750 | @@ -25674,6 +25725,7 @@ |
3751 | "src/plugins/sample/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sample/Makefile" ;; |
3752 | "src/plugins/notify/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/notify/Makefile" ;; |
3753 | "src/plugins/tray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/tray/Makefile" ;; |
3754 | + "src/plugins/mpris2/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/mpris2/Makefile" ;; |
3755 | "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; |
3756 | "docs/plugin-api/version.xml") CONFIG_FILES="$CONFIG_FILES docs/plugin-api/version.xml" ;; |
3757 | "docs/plugin-api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/plugin-api/Makefile" ;; |
3758 | @@ -27238,6 +27290,7 @@ |
3759 | Debug: $enable_debug |
3760 | Building plugin api docs: ${enable_gtk_doc} |
3761 | GStreamer API version: ${gstreamer_api_version} |
3762 | + GTK+ version: GTK+-3 |
3763 | |
3764 | Optional dependencies: |
3765 | ====================== |
3766 | @@ -27247,6 +27300,7 @@ |
3767 | ================= |
3768 | Notify: ${ac_notify_plugin} |
3769 | System Tray icon: ${ac_tray_plugin} |
3770 | + MPRIS2: ${ac_mpris2_plugin} |
3771 | |
3772 | ------------------------------------------------------ |
3773 | |
3774 | |
3775 | === modified file 'configure.ac' |
3776 | --- configure.ac 2013-12-05 21:58:41 +0000 |
3777 | +++ configure.ac 2014-01-30 07:12:45 +0000 |
3778 | @@ -4,16 +4,16 @@ |
3779 | dnl |
3780 | |
3781 | m4_define([intltool_minimum_version], [0.31]) |
3782 | -m4_define([parole_verinfo], [0:5:4]) |
3783 | -m4_define([parole_version_api], [0]) |
3784 | -m4_define([parole_version_major], [0]) |
3785 | -m4_define([parole_version_minor], [5]) |
3786 | -m4_define([parole_version_micro], [4]) |
3787 | -m4_define([parole_version_build], []) |
3788 | -m4_define([parole_version_tag], []) |
3789 | +m4_define([parole_verinfo], [0:6:0]) |
3790 | +m4_define([parole_version_api], [0]) |
3791 | +m4_define([parole_version_major], [0]) |
3792 | +m4_define([parole_version_minor], [6]) |
3793 | +m4_define([parole_version_micro], [0]) |
3794 | +m4_define([parole_version_build], []) |
3795 | +m4_define([parole_version_tag], []) |
3796 | m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) |
3797 | |
3798 | -AC_INIT([parole], [parole_version], [aliov@xfce.org]) |
3799 | +AC_INIT([parole], [parole_version], [http://docs.xfce.org/apps/parole/bugs]) |
3800 | AC_PREREQ(2.59c) |
3801 | |
3802 | AC_CONFIG_MACRO_DIR([m4]) |
3803 | @@ -22,13 +22,13 @@ |
3804 | AM_CONFIG_HEADER([config.h]) |
3805 | |
3806 | if test x${enable_gtk_doc} = x"yes"; then |
3807 | - AM_MAINTAINER_MODE([enable]) |
3808 | + AM_MAINTAINER_MODE([enable]) |
3809 | else |
3810 | - if test x${enable_debug} != x"no"; then |
3811 | - AM_MAINTAINER_MODE([enable]) |
3812 | - else |
3813 | - AM_MAINTAINER_MODE() |
3814 | - fi |
3815 | + if test x${enable_debug} != x"no"; then |
3816 | + AM_MAINTAINER_MODE([enable]) |
3817 | + else |
3818 | + AM_MAINTAINER_MODE() |
3819 | + fi |
3820 | fi |
3821 | |
3822 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
3823 | @@ -46,14 +46,14 @@ |
3824 | AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) |
3825 | |
3826 | # ===================================================== # |
3827 | -# Initialize libtool # |
3828 | +# Initialize libtool # |
3829 | # ===================================================== # |
3830 | LT_PREREQ([2.2.6]) |
3831 | LT_INIT([disable-static]) |
3832 | m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) |
3833 | |
3834 | # ===================================================== # |
3835 | -# Version information # |
3836 | +# Version information # |
3837 | # ===================================================== # |
3838 | PAROLE_VERINFO=parole_verinfo() |
3839 | PAROLE_VERSION_API=parole_version_api() |
3840 | @@ -66,34 +66,34 @@ |
3841 | AC_SUBST([PAROLE_VERSION_MINOR]) |
3842 | AC_SUBST([PAROLE_VERSION_MICRO]) |
3843 | |
3844 | -# ==================================================== # |
3845 | -# Check for headers needed for standard interfaces # |
3846 | -# ==================================================== # |
3847 | +# ===================================================== # |
3848 | +# Check for headers needed for standard interfaces # |
3849 | +# ===================================================== # |
3850 | AC_HEADER_STDC |
3851 | AC_CHECK_HEADERS([errno.h signal.h stddef.h sys/ioctl.h fcntl.h\ |
3852 | string.h sys/stat.h sys/types.h sys/wait.h time.h \ |
3853 | unistd.h]) |
3854 | |
3855 | # ===================================================== # |
3856 | -# Check for i18n support # |
3857 | -# ===================================================== # |
3858 | - |
3859 | -XDT_I18N([ar ast bg ca cs da de el en_AU en_GB es eu fr gl he hr hu id is it ja kk ko lt lv nl nn pl pt_BR pt ru sk sr sv te tr ug uk zh_CN zh_TW ]) |
3860 | - |
3861 | -#==================================================== # |
3862 | -# Check for required packages # |
3863 | -#=====================================================# |
3864 | -m4_define([gtk_minimum_version], [2.24.0]) |
3865 | +# Check for i18n support # |
3866 | +# ===================================================== # |
3867 | + |
3868 | +XDT_I18N([ar ast bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nl nn oc pl pt_BR pt ru sk sr sv te tr ug uk zh_CN zh_TW ]) |
3869 | + |
3870 | +# ===================================================== # |
3871 | +# Check for required packages # |
3872 | +# ===================================================== # |
3873 | +m4_define([gtk_minimum_version], [3.2.0]) |
3874 | m4_define([glib_minimum_version], [2.32.0]) |
3875 | |
3876 | dnl gstreamer version |
3877 | AC_ARG_WITH([gstreamer], |
3878 | - [AS_HELP_STRING([--with-gstreamer=0.10|1.0],[which gstreamer version to compile against (default: 0.10)])], |
3879 | + [AS_HELP_STRING([--with-gstreamer=0.10|1.0],[which gstreamer version to compile against (default: 1.0)])], |
3880 | [case "$with_gstreamer" in |
3881 | 0.10|1.0) ;; |
3882 | *) AC_MSG_ERROR([invalid gstreamer version specified]) ;; |
3883 | esac], |
3884 | - [with_gstreamer=0.10] |
3885 | + [with_gstreamer=1.0] |
3886 | ) |
3887 | |
3888 | case "$with_gstreamer" in |
3889 | @@ -115,18 +115,29 @@ |
3890 | m4_define([dbus_minimum_version], [0.60]) |
3891 | m4_define([dbus_glib_minimum_version], [0.70]) |
3892 | |
3893 | -m4_define([libxfce4ui_minimum_version],[4.8.0]) |
3894 | -m4_define([libxfce4util_minimum_version],[4.8.0]) |
3895 | +m4_define([libxfce4ui_minimum_version],[4.10.0]) |
3896 | +m4_define([libxfce4util_minimum_version],[4.10.0]) |
3897 | |
3898 | m4_define([libnotify_minimum_version], [0.4.1]) |
3899 | |
3900 | -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version]) |
3901 | XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version]) |
3902 | XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version]) |
3903 | XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version]) |
3904 | XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version]) |
3905 | XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version]) |
3906 | |
3907 | +XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version]) |
3908 | +XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version]) |
3909 | + |
3910 | +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version]) |
3911 | +XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) |
3912 | + |
3913 | +dnl ************************************ |
3914 | +dnl *** Compile against GTK3 *** |
3915 | +dnl ************************************ |
3916 | +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0]) |
3917 | +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0]) |
3918 | + |
3919 | XDT_CHECK_PACKAGE([GST], [gstreamer-${gstreamer_api_version}], [${gstreamer_minimum_version}]) |
3920 | XDT_CHECK_PACKAGE([GST_BASE], [gstreamer-base-${gstreamer_api_version}], [${gstreamer_minimum_version}]) |
3921 | XDT_CHECK_PACKAGE([GST_VIDEO], [gstreamer-video-${gstreamer_api_version}], [${gstreamer_minimum_version}]) |
3922 | @@ -139,33 +150,14 @@ |
3923 | GST_LIBS="$GST_LIBS -lgstbase-$GST_API_VERSION -lgstvideo-$GST_API_VERSION -lgstaudio-$GST_API_VERSION -lgstpbutils-$GST_API_VERSION -lgsttag-$GST_API_VERSION" |
3924 | fi |
3925 | |
3926 | -XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version]) |
3927 | -XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version]) |
3928 | - |
3929 | -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],[libxfce4ui_minimum_version]) |
3930 | -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version]) |
3931 | - |
3932 | -XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) |
3933 | + |
3934 | |
3935 | XDT_CHECK_LIBX11() |
3936 | |
3937 | -#=======================================================# |
3938 | -# Gtkrc files # |
3939 | -#=======================================================# |
3940 | -if test "x${prefix}" = "xNONE"; then |
3941 | - AC_DEFINE_UNQUOTED(GTKRC_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0", [gtkrc directory]) |
3942 | - gtkrcdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" |
3943 | -else |
3944 | - AC_DEFINE_UNQUOTED(GTKRC_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0", [pixmaps directory]) |
3945 | - gtkrcdir="${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0" |
3946 | -fi |
3947 | - |
3948 | -AC_SUBST(gtkrcdir) |
3949 | - |
3950 | # Taken from Gnome system tools |
3951 | -#=======================================================# |
3952 | -# Pixmaps files # |
3953 | -#=======================================================# |
3954 | +# ===================================================== # |
3955 | +# Pixmaps files # |
3956 | +# ===================================================== # |
3957 | if test "x${prefix}" = "xNONE"; then |
3958 | AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory]) |
3959 | pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" |
3960 | @@ -176,9 +168,9 @@ |
3961 | |
3962 | AC_SUBST(pixmapsdir) |
3963 | |
3964 | -#=======================================================# |
3965 | -# Check XF86keysysm # |
3966 | -#=======================================================# |
3967 | +# ===================================================== # |
3968 | +# Check XF86keysysm # |
3969 | +# ===================================================== # |
3970 | # Check for the AudioPlay sym other should exist |
3971 | # if this one exists. |
3972 | AC_CHECK_DECL(XF86XK_AudioPlay,have_XF86XK_AudioPlay=1,have_XF86XK_AudioPlay=0,[#include <X11/XF86keysym.h>]) |
3973 | @@ -186,9 +178,9 @@ |
3974 | AC_DEFINE(HAVE_XF86_KEYSYM, 1, [Define if XF86keysysm.h is available]) |
3975 | fi |
3976 | |
3977 | -#=======================================================# |
3978 | -# TagLib support # |
3979 | -#=======================================================# |
3980 | +# ===================================================== # |
3981 | +# TagLib support # |
3982 | +# ===================================================== # |
3983 | TAGLIB_FOUND="no" |
3984 | XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB], |
3985 | [taglib], [1.4], |
3986 | @@ -202,17 +194,17 @@ |
3987 | [ |
3988 | AC_CHECK_HEADER([taglib/tag_c.h], |
3989 | [ |
3990 | - TAGLIBC_LIBS="-ltag_c" |
3991 | - AC_DEFINE([HAVE_TAGLIBC], [1], [Define to 1 if tag_c is found]) |
3992 | + TAGLIBC_LIBS="-ltag_c" |
3993 | + AC_DEFINE([HAVE_TAGLIBC], [1], [Define to 1 if tag_c is found]) |
3994 | ]) |
3995 | ], [-lm]) |
3996 | AC_SUBST([TAGLIBC_CFLAGS]) |
3997 | AC_SUBST([TAGLIBC_LIBS]) |
3998 | fi |
3999 | |
4000 | -#=======================================================# |
4001 | -# Check plugins to build # |
4002 | -#=======================================================# |
4003 | +# ===================================================== # |
4004 | +# Check plugins to build # |
4005 | +# ===================================================== # |
4006 | |
4007 | # Notify plugin. |
4008 | #-------------------------- |
4009 | @@ -224,8 +216,8 @@ |
4010 | # Depends on Libnotify - if not found cannot build |
4011 | LIBNOTIFY_FOUND="no" |
4012 | if test x"$ac_notify_plugin" = x"yes"; then |
4013 | - XDT_CHECK_PACKAGE([LIBNOTIFY], |
4014 | - [libnotify], [libnotify_minimum_version]) |
4015 | + XDT_CHECK_PACKAGE([LIBNOTIFY], |
4016 | + [libnotify], [libnotify_minimum_version]) |
4017 | fi |
4018 | |
4019 | # Tray plugin. |
4020 | @@ -236,20 +228,27 @@ |
4021 | AM_CONDITIONAL([PAROLE_TRAY_PLUGIN], [test x"$ac_tray_plugin" = x"yes"]) |
4022 | AC_MSG_RESULT([$ac_tray_plugin]) |
4023 | |
4024 | -#=======================================================# |
4025 | -# Check for debugging support # |
4026 | -#=======================================================# |
4027 | +# MPRIS2 plugin. |
4028 | +#-------------------------- |
4029 | +AC_ARG_ENABLE([mpris2-plugin], AC_HELP_STRING([--disable-mpris2-plugin], [Don't build parole mpris2 plugin]), |
4030 | + [ac_mpris2_plugin=$enableval], [ac_mpris2_plugin=yes]) |
4031 | +AC_MSG_CHECKING([whether to build the mpris2 plugin]) |
4032 | +AM_CONDITIONAL([PAROLE_MPRIS2_PLUGIN], [test x"$ac_mpris2_plugin" = x"yes"]) |
4033 | +AC_MSG_RESULT([$ac_mpris2_plugin]) |
4034 | + |
4035 | +# ===================================================== # |
4036 | +# Check for debugging support # |
4037 | +# ===================================================== # |
4038 | XDT_FEATURE_DEBUG() |
4039 | |
4040 | -#=======================================================# |
4041 | -# Check for Gtk doc # |
4042 | -#=======================================================# |
4043 | +# ===================================================== # |
4044 | +# Check for Gtk doc # |
4045 | +# ===================================================== # |
4046 | GTK_DOC_CHECK(1.9) |
4047 | |
4048 | AC_OUTPUT([ |
4049 | Makefile |
4050 | data/Makefile |
4051 | -data/gtk-2.0/Makefile |
4052 | data/pixmaps/Makefile |
4053 | data/interfaces/Makefile |
4054 | data/icons/Makefile |
4055 | @@ -257,6 +256,8 @@ |
4056 | data/icons/24x24/Makefile |
4057 | data/icons/32x32/Makefile |
4058 | data/icons/48x48/Makefile |
4059 | +data/icons/64x64/Makefile |
4060 | +data/icons/128x128/Makefile |
4061 | data/icons/scalable/Makefile |
4062 | data/mime/Makefile |
4063 | data/desktop/Makefile |
4064 | @@ -270,6 +271,7 @@ |
4065 | src/plugins/sample/Makefile |
4066 | src/plugins/notify/Makefile |
4067 | src/plugins/tray/Makefile |
4068 | +src/plugins/mpris2/Makefile |
4069 | docs/Makefile |
4070 | docs/plugin-api/version.xml |
4071 | docs/plugin-api/Makefile |
4072 | @@ -288,6 +290,7 @@ |
4073 | Debug: $enable_debug |
4074 | Building plugin api docs: ${enable_gtk_doc} |
4075 | GStreamer API version: ${gstreamer_api_version} |
4076 | + GTK+ version: GTK+-3 |
4077 | |
4078 | Optional dependencies: |
4079 | ====================== |
4080 | @@ -297,6 +300,7 @@ |
4081 | ================= |
4082 | Notify: ${ac_notify_plugin} |
4083 | System Tray icon: ${ac_tray_plugin} |
4084 | + MPRIS2: ${ac_mpris2_plugin} |
4085 | |
4086 | ------------------------------------------------------ |
4087 | |
4088 | |
4089 | === modified file 'data/Makefile.am' |
4090 | --- data/Makefile.am 2013-03-07 14:04:30 +0000 |
4091 | +++ data/Makefile.am 2014-01-30 07:12:45 +0000 |
4092 | @@ -1,5 +1,4 @@ |
4093 | SUBDIRS = \ |
4094 | - gtk-2.0 \ |
4095 | interfaces \ |
4096 | pixmaps \ |
4097 | icons \ |
4098 | |
4099 | === modified file 'data/Makefile.in' |
4100 | --- data/Makefile.in 2013-12-05 21:58:41 +0000 |
4101 | +++ data/Makefile.in 2014-01-30 07:12:45 +0000 |
4102 | @@ -1,4 +1,4 @@ |
4103 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
4104 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
4105 | # @configure_input@ |
4106 | |
4107 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4108 | @@ -384,7 +384,6 @@ |
4109 | docdir = @docdir@ |
4110 | dvidir = @dvidir@ |
4111 | exec_prefix = @exec_prefix@ |
4112 | -gtkrcdir = @gtkrcdir@ |
4113 | host = @host@ |
4114 | host_alias = @host_alias@ |
4115 | host_cpu = @host_cpu@ |
4116 | @@ -417,7 +416,6 @@ |
4117 | top_builddir = @top_builddir@ |
4118 | top_srcdir = @top_srcdir@ |
4119 | SUBDIRS = \ |
4120 | - gtk-2.0 \ |
4121 | interfaces \ |
4122 | pixmaps \ |
4123 | icons \ |
4124 | |
4125 | === modified file 'data/desktop/Makefile.in' |
4126 | --- data/desktop/Makefile.in 2013-12-05 21:58:41 +0000 |
4127 | +++ data/desktop/Makefile.in 2014-01-30 07:12:45 +0000 |
4128 | @@ -1,4 +1,4 @@ |
4129 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
4130 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
4131 | # @configure_input@ |
4132 | |
4133 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4134 | @@ -354,7 +354,6 @@ |
4135 | docdir = @docdir@ |
4136 | dvidir = @dvidir@ |
4137 | exec_prefix = @exec_prefix@ |
4138 | -gtkrcdir = @gtkrcdir@ |
4139 | host = @host@ |
4140 | host_alias = @host_alias@ |
4141 | host_cpu = @host_cpu@ |
4142 | |
4143 | === modified file 'data/desktop/desktop.sh' |
4144 | --- data/desktop/desktop.sh 2013-03-07 14:04:30 +0000 |
4145 | +++ data/desktop/desktop.sh 2014-01-30 07:12:45 +0000 |
4146 | @@ -17,18 +17,18 @@ |
4147 | echo "[Desktop Action Play]" |
4148 | echo "Exec=parole --play" |
4149 | echo "_Name=Play/Pause" |
4150 | -echo "Icon=media-playback-start" |
4151 | +echo "Icon=media-playback-start-symbolic" |
4152 | echo "OnlyShowIn=Unity;" |
4153 | echo "" |
4154 | echo "[Desktop Action Previous]" |
4155 | -echo "Exec=parole --previous-track" |
4156 | +echo "Exec=parole --previous" |
4157 | echo "_Name=Previous Track" |
4158 | -echo "Icon=media-skip-backward" |
4159 | +echo "Icon=media-skip-backward-symbolic" |
4160 | echo "OnlyShowIn=Unity;" |
4161 | echo "" |
4162 | echo "[Desktop Action Next]" |
4163 | -echo "Exec=parole --next-track" |
4164 | +echo "Exec=parole --next" |
4165 | echo "_Name=Next Track" |
4166 | -echo "Icon=media-skip-forward" |
4167 | +echo "Icon=media-skip-forward-symbolic" |
4168 | echo "OnlyShowIn=Unity;" |
4169 | -echo "" |
4170 | \ No newline at end of file |
4171 | +echo "" |
4172 | |
4173 | === modified file 'data/desktop/parole.desktop.in.in' |
4174 | --- data/desktop/parole.desktop.in.in 2013-03-07 14:04:30 +0000 |
4175 | +++ data/desktop/parole.desktop.in.in 2014-01-30 07:12:45 +0000 |
4176 | @@ -13,17 +13,17 @@ |
4177 | [Desktop Action Play] |
4178 | Exec=parole --play |
4179 | _Name=Play/Pause |
4180 | -Icon=media-playback-start |
4181 | +Icon=media-playback-start-symbolic |
4182 | OnlyShowIn=Unity; |
4183 | |
4184 | [Desktop Action Previous] |
4185 | -Exec=parole --previous-track |
4186 | +Exec=parole --previous |
4187 | _Name=Previous Track |
4188 | -Icon=media-skip-backward |
4189 | +Icon=media-skip-backward-symbolic |
4190 | OnlyShowIn=Unity; |
4191 | |
4192 | [Desktop Action Next] |
4193 | -Exec=parole --next-track |
4194 | +Exec=parole --next |
4195 | _Name=Next Track |
4196 | -Icon=media-skip-forward |
4197 | +Icon=media-skip-forward-symbolic |
4198 | OnlyShowIn=Unity; |
4199 | |
4200 | === removed directory 'data/gtk-2.0' |
4201 | === removed file 'data/gtk-2.0/Makefile.am' |
4202 | --- data/gtk-2.0/Makefile.am 2013-03-07 14:04:30 +0000 |
4203 | +++ data/gtk-2.0/Makefile.am 1970-01-01 00:00:00 +0000 |
4204 | @@ -1,7 +0,0 @@ |
4205 | -EXTRA_DIST = \ |
4206 | - $(gtkrc_DATA) |
4207 | - |
4208 | -gtkrcdir = $(datadir)/parole/gtk-2.0 |
4209 | - |
4210 | -gtkrc_DATA = \ |
4211 | - parole.gtkrc |
4212 | |
4213 | === removed file 'data/gtk-2.0/Makefile.in' |
4214 | --- data/gtk-2.0/Makefile.in 2013-12-05 21:58:41 +0000 |
4215 | +++ data/gtk-2.0/Makefile.in 1970-01-01 00:00:00 +0000 |
4216 | @@ -1,612 +0,0 @@ |
4217 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
4218 | -# @configure_input@ |
4219 | - |
4220 | -# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4221 | - |
4222 | -# This Makefile.in is free software; the Free Software Foundation |
4223 | -# gives unlimited permission to copy and/or distribute it, |
4224 | -# with or without modifications, as long as this notice is preserved. |
4225 | - |
4226 | -# This program is distributed in the hope that it will be useful, |
4227 | -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
4228 | -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4229 | -# PARTICULAR PURPOSE. |
4230 | - |
4231 | -@SET_MAKE@ |
4232 | - |
4233 | -VPATH = @srcdir@ |
4234 | -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4235 | -am__make_running_with_option = \ |
4236 | - case $${target_option-} in \ |
4237 | - ?) ;; \ |
4238 | - *) echo "am__make_running_with_option: internal error: invalid" \ |
4239 | - "target option '$${target_option-}' specified" >&2; \ |
4240 | - exit 1;; \ |
4241 | - esac; \ |
4242 | - has_opt=no; \ |
4243 | - sane_makeflags=$$MAKEFLAGS; \ |
4244 | - if $(am__is_gnu_make); then \ |
4245 | - sane_makeflags=$$MFLAGS; \ |
4246 | - else \ |
4247 | - case $$MAKEFLAGS in \ |
4248 | - *\\[\ \ ]*) \ |
4249 | - bs=\\; \ |
4250 | - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4251 | - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4252 | - esac; \ |
4253 | - fi; \ |
4254 | - skip_next=no; \ |
4255 | - strip_trailopt () \ |
4256 | - { \ |
4257 | - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4258 | - }; \ |
4259 | - for flg in $$sane_makeflags; do \ |
4260 | - test $$skip_next = yes && { skip_next=no; continue; }; \ |
4261 | - case $$flg in \ |
4262 | - *=*|--*) continue;; \ |
4263 | - -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4264 | - -*I?*) strip_trailopt 'I';; \ |
4265 | - -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4266 | - -*O?*) strip_trailopt 'O';; \ |
4267 | - -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4268 | - -*l?*) strip_trailopt 'l';; \ |
4269 | - -[dEDm]) skip_next=yes;; \ |
4270 | - -[JT]) skip_next=yes;; \ |
4271 | - esac; \ |
4272 | - case $$flg in \ |
4273 | - *$$target_option*) has_opt=yes; break;; \ |
4274 | - esac; \ |
4275 | - done; \ |
4276 | - test $$has_opt = yes |
4277 | -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4278 | -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4279 | -pkgdatadir = $(datadir)/@PACKAGE@ |
4280 | -pkgincludedir = $(includedir)/@PACKAGE@ |
4281 | -pkglibdir = $(libdir)/@PACKAGE@ |
4282 | -pkglibexecdir = $(libexecdir)/@PACKAGE@ |
4283 | -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
4284 | -install_sh_DATA = $(install_sh) -c -m 644 |
4285 | -install_sh_PROGRAM = $(install_sh) -c |
4286 | -install_sh_SCRIPT = $(install_sh) -c |
4287 | -INSTALL_HEADER = $(INSTALL_DATA) |
4288 | -transform = $(program_transform_name) |
4289 | -NORMAL_INSTALL = : |
4290 | -PRE_INSTALL = : |
4291 | -POST_INSTALL = : |
4292 | -NORMAL_UNINSTALL = : |
4293 | -PRE_UNINSTALL = : |
4294 | -POST_UNINSTALL = : |
4295 | -build_triplet = @build@ |
4296 | -host_triplet = @host@ |
4297 | -subdir = data/gtk-2.0 |
4298 | -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
4299 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4300 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
4301 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
4302 | - $(ACLOCAL_M4) |
4303 | -mkinstalldirs = $(install_sh) -d |
4304 | -CONFIG_HEADER = $(top_builddir)/config.h |
4305 | -CONFIG_CLEAN_FILES = |
4306 | -CONFIG_CLEAN_VPATH_FILES = |
4307 | -AM_V_P = $(am__v_P_@AM_V@) |
4308 | -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
4309 | -am__v_P_0 = false |
4310 | -am__v_P_1 = : |
4311 | -AM_V_GEN = $(am__v_GEN_@AM_V@) |
4312 | -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
4313 | -am__v_GEN_0 = @echo " GEN " $@; |
4314 | -am__v_GEN_1 = |
4315 | -AM_V_at = $(am__v_at_@AM_V@) |
4316 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
4317 | -am__v_at_0 = @ |
4318 | -am__v_at_1 = |
4319 | -SOURCES = |
4320 | -DIST_SOURCES = |
4321 | -am__can_run_installinfo = \ |
4322 | - case $$AM_UPDATE_INFO_DIR in \ |
4323 | - n|no|NO) false;; \ |
4324 | - *) (install-info --version) >/dev/null 2>&1;; \ |
4325 | - esac |
4326 | -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
4327 | -am__vpath_adj = case $$p in \ |
4328 | - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
4329 | - *) f=$$p;; \ |
4330 | - esac; |
4331 | -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
4332 | -am__install_max = 40 |
4333 | -am__nobase_strip_setup = \ |
4334 | - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
4335 | -am__nobase_strip = \ |
4336 | - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
4337 | -am__nobase_list = $(am__nobase_strip_setup); \ |
4338 | - for p in $$list; do echo "$$p $$p"; done | \ |
4339 | - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
4340 | - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
4341 | - if (++n[$$2] == $(am__install_max)) \ |
4342 | - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
4343 | - END { for (dir in files) print dir, files[dir] }' |
4344 | -am__base_list = \ |
4345 | - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
4346 | - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
4347 | -am__uninstall_files_from_dir = { \ |
4348 | - test -z "$$files" \ |
4349 | - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
4350 | - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
4351 | - $(am__cd) "$$dir" && rm -f $$files; }; \ |
4352 | - } |
4353 | -am__installdirs = "$(DESTDIR)$(gtkrcdir)" |
4354 | -DATA = $(gtkrc_DATA) |
4355 | -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
4356 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4357 | -ACLOCAL = @ACLOCAL@ |
4358 | -ALL_LINGUAS = @ALL_LINGUAS@ |
4359 | -AMTAR = @AMTAR@ |
4360 | -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
4361 | -AR = @AR@ |
4362 | -AUTOCONF = @AUTOCONF@ |
4363 | -AUTOHEADER = @AUTOHEADER@ |
4364 | -AUTOMAKE = @AUTOMAKE@ |
4365 | -AWK = @AWK@ |
4366 | -CATALOGS = @CATALOGS@ |
4367 | -CATOBJEXT = @CATOBJEXT@ |
4368 | -CC = @CC@ |
4369 | -CCDEPMODE = @CCDEPMODE@ |
4370 | -CFLAGS = @CFLAGS@ |
4371 | -CPP = @CPP@ |
4372 | -CPPFLAGS = @CPPFLAGS@ |
4373 | -CXX = @CXX@ |
4374 | -CXXCPP = @CXXCPP@ |
4375 | -CXXDEPMODE = @CXXDEPMODE@ |
4376 | -CXXFLAGS = @CXXFLAGS@ |
4377 | -CYGPATH_W = @CYGPATH_W@ |
4378 | -DATADIRNAME = @DATADIRNAME@ |
4379 | -DBUS_CFLAGS = @DBUS_CFLAGS@ |
4380 | -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ |
4381 | -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ |
4382 | -DBUS_GLIB_REQUIRED_VERSION = @DBUS_GLIB_REQUIRED_VERSION@ |
4383 | -DBUS_GLIB_VERSION = @DBUS_GLIB_VERSION@ |
4384 | -DBUS_LIBS = @DBUS_LIBS@ |
4385 | -DBUS_REQUIRED_VERSION = @DBUS_REQUIRED_VERSION@ |
4386 | -DBUS_VERSION = @DBUS_VERSION@ |
4387 | -DEFS = @DEFS@ |
4388 | -DEPDIR = @DEPDIR@ |
4389 | -DLLTOOL = @DLLTOOL@ |
4390 | -DSYMUTIL = @DSYMUTIL@ |
4391 | -DUMPBIN = @DUMPBIN@ |
4392 | -ECHO_C = @ECHO_C@ |
4393 | -ECHO_N = @ECHO_N@ |
4394 | -ECHO_T = @ECHO_T@ |
4395 | -EGREP = @EGREP@ |
4396 | -EXEEXT = @EXEEXT@ |
4397 | -FGREP = @FGREP@ |
4398 | -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
4399 | -GIO_CFLAGS = @GIO_CFLAGS@ |
4400 | -GIO_LIBS = @GIO_LIBS@ |
4401 | -GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@ |
4402 | -GIO_VERSION = @GIO_VERSION@ |
4403 | -GLIB_CFLAGS = @GLIB_CFLAGS@ |
4404 | -GLIB_LIBS = @GLIB_LIBS@ |
4405 | -GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@ |
4406 | -GLIB_VERSION = @GLIB_VERSION@ |
4407 | -GMODULE_CFLAGS = @GMODULE_CFLAGS@ |
4408 | -GMODULE_LIBS = @GMODULE_LIBS@ |
4409 | -GMODULE_REQUIRED_VERSION = @GMODULE_REQUIRED_VERSION@ |
4410 | -GMODULE_VERSION = @GMODULE_VERSION@ |
4411 | -GMOFILES = @GMOFILES@ |
4412 | -GMSGFMT = @GMSGFMT@ |
4413 | -GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ |
4414 | -GOBJECT_LIBS = @GOBJECT_LIBS@ |
4415 | -GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ |
4416 | -GOBJECT_VERSION = @GOBJECT_VERSION@ |
4417 | -GREP = @GREP@ |
4418 | -GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ |
4419 | -GST_BASE_LIBS = @GST_BASE_LIBS@ |
4420 | -GST_BASE_REQUIRED_VERSION = @GST_BASE_REQUIRED_VERSION@ |
4421 | -GST_BASE_VERSION = @GST_BASE_VERSION@ |
4422 | -GST_CFLAGS = @GST_CFLAGS@ |
4423 | -GST_INTERFACES_CFLAGS = @GST_INTERFACES_CFLAGS@ |
4424 | -GST_INTERFACES_LIBS = @GST_INTERFACES_LIBS@ |
4425 | -GST_INTERFACES_REQUIRED_VERSION = @GST_INTERFACES_REQUIRED_VERSION@ |
4426 | -GST_INTERFACES_VERSION = @GST_INTERFACES_VERSION@ |
4427 | -GST_LIBS = @GST_LIBS@ |
4428 | -GST_PBUTILS_CFLAGS = @GST_PBUTILS_CFLAGS@ |
4429 | -GST_PBUTILS_LIBS = @GST_PBUTILS_LIBS@ |
4430 | -GST_PBUTILS_REQUIRED_VERSION = @GST_PBUTILS_REQUIRED_VERSION@ |
4431 | -GST_PBUTILS_VERSION = @GST_PBUTILS_VERSION@ |
4432 | -GST_REQUIRED_VERSION = @GST_REQUIRED_VERSION@ |
4433 | -GST_VERSION = @GST_VERSION@ |
4434 | -GST_VIDEO_CFLAGS = @GST_VIDEO_CFLAGS@ |
4435 | -GST_VIDEO_LIBS = @GST_VIDEO_LIBS@ |
4436 | -GST_VIDEO_REQUIRED_VERSION = @GST_VIDEO_REQUIRED_VERSION@ |
4437 | -GST_VIDEO_VERSION = @GST_VIDEO_VERSION@ |
4438 | -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ |
4439 | -GTHREAD_LIBS = @GTHREAD_LIBS@ |
4440 | -GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@ |
4441 | -GTHREAD_VERSION = @GTHREAD_VERSION@ |
4442 | -GTKDOC_CHECK = @GTKDOC_CHECK@ |
4443 | -GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ |
4444 | -GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ |
4445 | -GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
4446 | -GTKDOC_REBASE = @GTKDOC_REBASE@ |
4447 | -GTK_CFLAGS = @GTK_CFLAGS@ |
4448 | -GTK_LIBS = @GTK_LIBS@ |
4449 | -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ |
4450 | -GTK_VERSION = @GTK_VERSION@ |
4451 | -HTML_DIR = @HTML_DIR@ |
4452 | -INSTALL = @INSTALL@ |
4453 | -INSTALL_DATA = @INSTALL_DATA@ |
4454 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
4455 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
4456 | -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
4457 | -INSTOBJEXT = @INSTOBJEXT@ |
4458 | -INTLLIBS = @INTLLIBS@ |
4459 | -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
4460 | -INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
4461 | -INTLTOOL_PERL = @INTLTOOL_PERL@ |
4462 | -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
4463 | -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
4464 | -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
4465 | -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
4466 | -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
4467 | -LD = @LD@ |
4468 | -LDFLAGS = @LDFLAGS@ |
4469 | -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ |
4470 | -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ |
4471 | -LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@ |
4472 | -LIBNOTIFY_VERSION = @LIBNOTIFY_VERSION@ |
4473 | -LIBOBJS = @LIBOBJS@ |
4474 | -LIBS = @LIBS@ |
4475 | -LIBTOOL = @LIBTOOL@ |
4476 | -LIBX11_CFLAGS = @LIBX11_CFLAGS@ |
4477 | -LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ |
4478 | -LIBX11_LIBS = @LIBX11_LIBS@ |
4479 | -LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ |
4480 | -LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ |
4481 | -LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ |
4482 | -LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ |
4483 | -LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ |
4484 | -LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ |
4485 | -LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ |
4486 | -LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@ |
4487 | -LIPO = @LIPO@ |
4488 | -LN_S = @LN_S@ |
4489 | -LTLIBOBJS = @LTLIBOBJS@ |
4490 | -MAINT = @MAINT@ |
4491 | -MAKEINFO = @MAKEINFO@ |
4492 | -MANIFEST_TOOL = @MANIFEST_TOOL@ |
4493 | -MKDIR_P = @MKDIR_P@ |
4494 | -MKINSTALLDIRS = @MKINSTALLDIRS@ |
4495 | -MSGFMT = @MSGFMT@ |
4496 | -MSGFMT_OPTS = @MSGFMT_OPTS@ |
4497 | -MSGMERGE = @MSGMERGE@ |
4498 | -NM = @NM@ |
4499 | -NMEDIT = @NMEDIT@ |
4500 | -OBJDUMP = @OBJDUMP@ |
4501 | -OBJEXT = @OBJEXT@ |
4502 | -OTOOL = @OTOOL@ |
4503 | -OTOOL64 = @OTOOL64@ |
4504 | -PACKAGE = @PACKAGE@ |
4505 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
4506 | -PACKAGE_NAME = @PACKAGE_NAME@ |
4507 | -PACKAGE_STRING = @PACKAGE_STRING@ |
4508 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
4509 | -PACKAGE_URL = @PACKAGE_URL@ |
4510 | -PACKAGE_VERSION = @PACKAGE_VERSION@ |
4511 | -PAROLE_VERINFO = @PAROLE_VERINFO@ |
4512 | -PAROLE_VERSION_API = @PAROLE_VERSION_API@ |
4513 | -PAROLE_VERSION_MAJOR = @PAROLE_VERSION_MAJOR@ |
4514 | -PAROLE_VERSION_MICRO = @PAROLE_VERSION_MICRO@ |
4515 | -PAROLE_VERSION_MINOR = @PAROLE_VERSION_MINOR@ |
4516 | -PATH_SEPARATOR = @PATH_SEPARATOR@ |
4517 | -PKG_CONFIG = @PKG_CONFIG@ |
4518 | -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
4519 | -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
4520 | -POFILES = @POFILES@ |
4521 | -POSUB = @POSUB@ |
4522 | -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
4523 | -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ |
4524 | -RANLIB = @RANLIB@ |
4525 | -SED = @SED@ |
4526 | -SET_MAKE = @SET_MAKE@ |
4527 | -SHELL = @SHELL@ |
4528 | -STRIP = @STRIP@ |
4529 | -TAGLIBC_CFLAGS = @TAGLIBC_CFLAGS@ |
4530 | -TAGLIBC_LIBS = @TAGLIBC_LIBS@ |
4531 | -TAGLIB_CFLAGS = @TAGLIB_CFLAGS@ |
4532 | -TAGLIB_LIBS = @TAGLIB_LIBS@ |
4533 | -TAGLIB_REQUIRED_VERSION = @TAGLIB_REQUIRED_VERSION@ |
4534 | -TAGLIB_VERSION = @TAGLIB_VERSION@ |
4535 | -USE_NLS = @USE_NLS@ |
4536 | -VERSION = @VERSION@ |
4537 | -XFCONF_CFLAGS = @XFCONF_CFLAGS@ |
4538 | -XFCONF_LIBS = @XFCONF_LIBS@ |
4539 | -XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ |
4540 | -XFCONF_VERSION = @XFCONF_VERSION@ |
4541 | -XGETTEXT = @XGETTEXT@ |
4542 | -XGETTEXT_ARGS = @XGETTEXT_ARGS@ |
4543 | -XMKMF = @XMKMF@ |
4544 | -X_CFLAGS = @X_CFLAGS@ |
4545 | -X_EXTRA_LIBS = @X_EXTRA_LIBS@ |
4546 | -X_LIBS = @X_LIBS@ |
4547 | -X_PRE_LIBS = @X_PRE_LIBS@ |
4548 | -abs_builddir = @abs_builddir@ |
4549 | -abs_srcdir = @abs_srcdir@ |
4550 | -abs_top_builddir = @abs_top_builddir@ |
4551 | -abs_top_srcdir = @abs_top_srcdir@ |
4552 | -ac_ct_AR = @ac_ct_AR@ |
4553 | -ac_ct_CC = @ac_ct_CC@ |
4554 | -ac_ct_CXX = @ac_ct_CXX@ |
4555 | -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
4556 | -am__include = @am__include@ |
4557 | -am__leading_dot = @am__leading_dot@ |
4558 | -am__quote = @am__quote@ |
4559 | -am__tar = @am__tar@ |
4560 | -am__untar = @am__untar@ |
4561 | -bindir = @bindir@ |
4562 | -build = @build@ |
4563 | -build_alias = @build_alias@ |
4564 | -build_cpu = @build_cpu@ |
4565 | -build_os = @build_os@ |
4566 | -build_vendor = @build_vendor@ |
4567 | -builddir = @builddir@ |
4568 | -datadir = @datadir@ |
4569 | -datarootdir = @datarootdir@ |
4570 | -docdir = @docdir@ |
4571 | -dvidir = @dvidir@ |
4572 | -exec_prefix = @exec_prefix@ |
4573 | -gtkrcdir = $(datadir)/parole/gtk-2.0 |
4574 | -host = @host@ |
4575 | -host_alias = @host_alias@ |
4576 | -host_cpu = @host_cpu@ |
4577 | -host_os = @host_os@ |
4578 | -host_vendor = @host_vendor@ |
4579 | -htmldir = @htmldir@ |
4580 | -includedir = @includedir@ |
4581 | -infodir = @infodir@ |
4582 | -install_sh = @install_sh@ |
4583 | -intltool__v_merge_options_ = @intltool__v_merge_options_@ |
4584 | -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
4585 | -libdir = @libdir@ |
4586 | -libexecdir = @libexecdir@ |
4587 | -localedir = @localedir@ |
4588 | -localstatedir = @localstatedir@ |
4589 | -mandir = @mandir@ |
4590 | -mkdir_p = @mkdir_p@ |
4591 | -oldincludedir = @oldincludedir@ |
4592 | -pdfdir = @pdfdir@ |
4593 | -pixmapsdir = @pixmapsdir@ |
4594 | -prefix = @prefix@ |
4595 | -program_transform_name = @program_transform_name@ |
4596 | -psdir = @psdir@ |
4597 | -sbindir = @sbindir@ |
4598 | -sharedstatedir = @sharedstatedir@ |
4599 | -srcdir = @srcdir@ |
4600 | -sysconfdir = @sysconfdir@ |
4601 | -target_alias = @target_alias@ |
4602 | -top_build_prefix = @top_build_prefix@ |
4603 | -top_builddir = @top_builddir@ |
4604 | -top_srcdir = @top_srcdir@ |
4605 | -EXTRA_DIST = \ |
4606 | - $(gtkrc_DATA) |
4607 | - |
4608 | -gtkrc_DATA = \ |
4609 | - parole.gtkrc |
4610 | - |
4611 | -all: all-am |
4612 | - |
4613 | -.SUFFIXES: |
4614 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
4615 | - @for dep in $?; do \ |
4616 | - case '$(am__configure_deps)' in \ |
4617 | - *$$dep*) \ |
4618 | - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ |
4619 | - && { if test -f $@; then exit 0; else break; fi; }; \ |
4620 | - exit 1;; \ |
4621 | - esac; \ |
4622 | - done; \ |
4623 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/gtk-2.0/Makefile'; \ |
4624 | - $(am__cd) $(top_srcdir) && \ |
4625 | - $(AUTOMAKE) --gnu data/gtk-2.0/Makefile |
4626 | -.PRECIOUS: Makefile |
4627 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
4628 | - @case '$?' in \ |
4629 | - *config.status*) \ |
4630 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ |
4631 | - *) \ |
4632 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ |
4633 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ |
4634 | - esac; |
4635 | - |
4636 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
4637 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
4638 | - |
4639 | -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
4640 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
4641 | -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
4642 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
4643 | -$(am__aclocal_m4_deps): |
4644 | - |
4645 | -mostlyclean-libtool: |
4646 | - -rm -f *.lo |
4647 | - |
4648 | -clean-libtool: |
4649 | - -rm -rf .libs _libs |
4650 | -install-gtkrcDATA: $(gtkrc_DATA) |
4651 | - @$(NORMAL_INSTALL) |
4652 | - @list='$(gtkrc_DATA)'; test -n "$(gtkrcdir)" || list=; \ |
4653 | - if test -n "$$list"; then \ |
4654 | - echo " $(MKDIR_P) '$(DESTDIR)$(gtkrcdir)'"; \ |
4655 | - $(MKDIR_P) "$(DESTDIR)$(gtkrcdir)" || exit 1; \ |
4656 | - fi; \ |
4657 | - for p in $$list; do \ |
4658 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
4659 | - echo "$$d$$p"; \ |
4660 | - done | $(am__base_list) | \ |
4661 | - while read files; do \ |
4662 | - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gtkrcdir)'"; \ |
4663 | - $(INSTALL_DATA) $$files "$(DESTDIR)$(gtkrcdir)" || exit $$?; \ |
4664 | - done |
4665 | - |
4666 | -uninstall-gtkrcDATA: |
4667 | - @$(NORMAL_UNINSTALL) |
4668 | - @list='$(gtkrc_DATA)'; test -n "$(gtkrcdir)" || list=; \ |
4669 | - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
4670 | - dir='$(DESTDIR)$(gtkrcdir)'; $(am__uninstall_files_from_dir) |
4671 | -tags TAGS: |
4672 | - |
4673 | -ctags CTAGS: |
4674 | - |
4675 | -cscope cscopelist: |
4676 | - |
4677 | - |
4678 | -distdir: $(DISTFILES) |
4679 | - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
4680 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
4681 | - list='$(DISTFILES)'; \ |
4682 | - dist_files=`for file in $$list; do echo $$file; done | \ |
4683 | - sed -e "s|^$$srcdirstrip/||;t" \ |
4684 | - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
4685 | - case $$dist_files in \ |
4686 | - */*) $(MKDIR_P) `echo "$$dist_files" | \ |
4687 | - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
4688 | - sort -u` ;; \ |
4689 | - esac; \ |
4690 | - for file in $$dist_files; do \ |
4691 | - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
4692 | - if test -d $$d/$$file; then \ |
4693 | - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
4694 | - if test -d "$(distdir)/$$file"; then \ |
4695 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
4696 | - fi; \ |
4697 | - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
4698 | - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
4699 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
4700 | - fi; \ |
4701 | - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
4702 | - else \ |
4703 | - test -f "$(distdir)/$$file" \ |
4704 | - || cp -p $$d/$$file "$(distdir)/$$file" \ |
4705 | - || exit 1; \ |
4706 | - fi; \ |
4707 | - done |
4708 | -check-am: all-am |
4709 | -check: check-am |
4710 | -all-am: Makefile $(DATA) |
4711 | -installdirs: |
4712 | - for dir in "$(DESTDIR)$(gtkrcdir)"; do \ |
4713 | - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
4714 | - done |
4715 | -install: install-am |
4716 | -install-exec: install-exec-am |
4717 | -install-data: install-data-am |
4718 | -uninstall: uninstall-am |
4719 | - |
4720 | -install-am: all-am |
4721 | - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
4722 | - |
4723 | -installcheck: installcheck-am |
4724 | -install-strip: |
4725 | - if test -z '$(STRIP)'; then \ |
4726 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4727 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4728 | - install; \ |
4729 | - else \ |
4730 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4731 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4732 | - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
4733 | - fi |
4734 | -mostlyclean-generic: |
4735 | - |
4736 | -clean-generic: |
4737 | - |
4738 | -distclean-generic: |
4739 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
4740 | - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
4741 | - |
4742 | -maintainer-clean-generic: |
4743 | - @echo "This command is intended for maintainers to use" |
4744 | - @echo "it deletes files that may require special tools to rebuild." |
4745 | -clean: clean-am |
4746 | - |
4747 | -clean-am: clean-generic clean-libtool mostlyclean-am |
4748 | - |
4749 | -distclean: distclean-am |
4750 | - -rm -f Makefile |
4751 | -distclean-am: clean-am distclean-generic |
4752 | - |
4753 | -dvi: dvi-am |
4754 | - |
4755 | -dvi-am: |
4756 | - |
4757 | -html: html-am |
4758 | - |
4759 | -html-am: |
4760 | - |
4761 | -info: info-am |
4762 | - |
4763 | -info-am: |
4764 | - |
4765 | -install-data-am: install-gtkrcDATA |
4766 | - |
4767 | -install-dvi: install-dvi-am |
4768 | - |
4769 | -install-dvi-am: |
4770 | - |
4771 | -install-exec-am: |
4772 | - |
4773 | -install-html: install-html-am |
4774 | - |
4775 | -install-html-am: |
4776 | - |
4777 | -install-info: install-info-am |
4778 | - |
4779 | -install-info-am: |
4780 | - |
4781 | -install-man: |
4782 | - |
4783 | -install-pdf: install-pdf-am |
4784 | - |
4785 | -install-pdf-am: |
4786 | - |
4787 | -install-ps: install-ps-am |
4788 | - |
4789 | -install-ps-am: |
4790 | - |
4791 | -installcheck-am: |
4792 | - |
4793 | -maintainer-clean: maintainer-clean-am |
4794 | - -rm -f Makefile |
4795 | -maintainer-clean-am: distclean-am maintainer-clean-generic |
4796 | - |
4797 | -mostlyclean: mostlyclean-am |
4798 | - |
4799 | -mostlyclean-am: mostlyclean-generic mostlyclean-libtool |
4800 | - |
4801 | -pdf: pdf-am |
4802 | - |
4803 | -pdf-am: |
4804 | - |
4805 | -ps: ps-am |
4806 | - |
4807 | -ps-am: |
4808 | - |
4809 | -uninstall-am: uninstall-gtkrcDATA |
4810 | - |
4811 | -.MAKE: install-am install-strip |
4812 | - |
4813 | -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
4814 | - cscopelist-am ctags-am distclean distclean-generic \ |
4815 | - distclean-libtool distdir dvi dvi-am html html-am info info-am \ |
4816 | - install install-am install-data install-data-am install-dvi \ |
4817 | - install-dvi-am install-exec install-exec-am install-gtkrcDATA \ |
4818 | - install-html install-html-am install-info install-info-am \ |
4819 | - install-man install-pdf install-pdf-am install-ps \ |
4820 | - install-ps-am install-strip installcheck installcheck-am \ |
4821 | - installdirs maintainer-clean maintainer-clean-generic \ |
4822 | - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
4823 | - ps ps-am tags-am uninstall uninstall-am uninstall-gtkrcDATA |
4824 | - |
4825 | - |
4826 | -# Tell versions [3.59,3.63) of GNU make to not export all variables. |
4827 | -# Otherwise a system limit (for SysV at least) may be exceeded. |
4828 | -.NOEXPORT: |
4829 | |
4830 | === removed file 'data/gtk-2.0/parole.gtkrc' |
4831 | --- data/gtk-2.0/parole.gtkrc 2013-03-07 14:04:30 +0000 |
4832 | +++ data/gtk-2.0/parole.gtkrc 1970-01-01 00:00:00 +0000 |
4833 | @@ -1,19 +0,0 @@ |
4834 | -style "parole-fullscreen" |
4835 | -{ |
4836 | - fg[NORMAL] = "#EEEEEE" |
4837 | - fg[PRELIGHT] = "#FFFFFF" |
4838 | - |
4839 | - bg[NORMAL] = "#000000" |
4840 | - bg[ACTIVE] = "#6D6D6D" |
4841 | - bg[PRELIGHT] = "#505050" |
4842 | - bg[SELECTED] = "#398EE7" |
4843 | - bg[INSENSITIVE] = "#C4C4C4" |
4844 | -} |
4845 | - |
4846 | -style "parole-scale" = "parole-fullscreen" |
4847 | -{ |
4848 | - bg[NORMAL] = "#CECECE" |
4849 | -} |
4850 | - |
4851 | -widget "*ParoleFullscreen*" style "parole-fullscreen" |
4852 | -widget "*ParoleFullscreen*ParoleScale*" style "parole-scale" |
4853 | |
4854 | === added directory 'data/icons/128x128' |
4855 | === added file 'data/icons/128x128/Makefile.am' |
4856 | --- data/icons/128x128/Makefile.am 1970-01-01 00:00:00 +0000 |
4857 | +++ data/icons/128x128/Makefile.am 2014-01-30 07:12:45 +0000 |
4858 | @@ -0,0 +1,7 @@ |
4859 | +EXTRA_DIST = \ |
4860 | + $(Data_DATA) |
4861 | + |
4862 | +Datadir = $(datadir)/icons/hicolor/128x128/apps |
4863 | + |
4864 | +Data_DATA = \ |
4865 | + parole.png |
4866 | |
4867 | === added file 'data/icons/128x128/Makefile.in' |
4868 | --- data/icons/128x128/Makefile.in 1970-01-01 00:00:00 +0000 |
4869 | +++ data/icons/128x128/Makefile.in 2014-01-30 07:12:45 +0000 |
4870 | @@ -0,0 +1,613 @@ |
4871 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
4872 | +# @configure_input@ |
4873 | + |
4874 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4875 | + |
4876 | +# This Makefile.in is free software; the Free Software Foundation |
4877 | +# gives unlimited permission to copy and/or distribute it, |
4878 | +# with or without modifications, as long as this notice is preserved. |
4879 | + |
4880 | +# This program is distributed in the hope that it will be useful, |
4881 | +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
4882 | +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
4883 | +# PARTICULAR PURPOSE. |
4884 | + |
4885 | +@SET_MAKE@ |
4886 | + |
4887 | +VPATH = @srcdir@ |
4888 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4889 | +am__make_running_with_option = \ |
4890 | + case $${target_option-} in \ |
4891 | + ?) ;; \ |
4892 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4893 | + "target option '$${target_option-}' specified" >&2; \ |
4894 | + exit 1;; \ |
4895 | + esac; \ |
4896 | + has_opt=no; \ |
4897 | + sane_makeflags=$$MAKEFLAGS; \ |
4898 | + if $(am__is_gnu_make); then \ |
4899 | + sane_makeflags=$$MFLAGS; \ |
4900 | + else \ |
4901 | + case $$MAKEFLAGS in \ |
4902 | + *\\[\ \ ]*) \ |
4903 | + bs=\\; \ |
4904 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4905 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4906 | + esac; \ |
4907 | + fi; \ |
4908 | + skip_next=no; \ |
4909 | + strip_trailopt () \ |
4910 | + { \ |
4911 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4912 | + }; \ |
4913 | + for flg in $$sane_makeflags; do \ |
4914 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4915 | + case $$flg in \ |
4916 | + *=*|--*) continue;; \ |
4917 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4918 | + -*I?*) strip_trailopt 'I';; \ |
4919 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4920 | + -*O?*) strip_trailopt 'O';; \ |
4921 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4922 | + -*l?*) strip_trailopt 'l';; \ |
4923 | + -[dEDm]) skip_next=yes;; \ |
4924 | + -[JT]) skip_next=yes;; \ |
4925 | + esac; \ |
4926 | + case $$flg in \ |
4927 | + *$$target_option*) has_opt=yes; break;; \ |
4928 | + esac; \ |
4929 | + done; \ |
4930 | + test $$has_opt = yes |
4931 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4932 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4933 | +pkgdatadir = $(datadir)/@PACKAGE@ |
4934 | +pkgincludedir = $(includedir)/@PACKAGE@ |
4935 | +pkglibdir = $(libdir)/@PACKAGE@ |
4936 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ |
4937 | +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
4938 | +install_sh_DATA = $(install_sh) -c -m 644 |
4939 | +install_sh_PROGRAM = $(install_sh) -c |
4940 | +install_sh_SCRIPT = $(install_sh) -c |
4941 | +INSTALL_HEADER = $(INSTALL_DATA) |
4942 | +transform = $(program_transform_name) |
4943 | +NORMAL_INSTALL = : |
4944 | +PRE_INSTALL = : |
4945 | +POST_INSTALL = : |
4946 | +NORMAL_UNINSTALL = : |
4947 | +PRE_UNINSTALL = : |
4948 | +POST_UNINSTALL = : |
4949 | +build_triplet = @build@ |
4950 | +host_triplet = @host@ |
4951 | +subdir = data/icons/128x128 |
4952 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
4953 | +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4954 | +am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
4955 | +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
4956 | + $(ACLOCAL_M4) |
4957 | +mkinstalldirs = $(install_sh) -d |
4958 | +CONFIG_HEADER = $(top_builddir)/config.h |
4959 | +CONFIG_CLEAN_FILES = |
4960 | +CONFIG_CLEAN_VPATH_FILES = |
4961 | +AM_V_P = $(am__v_P_@AM_V@) |
4962 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
4963 | +am__v_P_0 = false |
4964 | +am__v_P_1 = : |
4965 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
4966 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
4967 | +am__v_GEN_0 = @echo " GEN " $@; |
4968 | +am__v_GEN_1 = |
4969 | +AM_V_at = $(am__v_at_@AM_V@) |
4970 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
4971 | +am__v_at_0 = @ |
4972 | +am__v_at_1 = |
4973 | +SOURCES = |
4974 | +DIST_SOURCES = |
4975 | +am__can_run_installinfo = \ |
4976 | + case $$AM_UPDATE_INFO_DIR in \ |
4977 | + n|no|NO) false;; \ |
4978 | + *) (install-info --version) >/dev/null 2>&1;; \ |
4979 | + esac |
4980 | +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
4981 | +am__vpath_adj = case $$p in \ |
4982 | + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
4983 | + *) f=$$p;; \ |
4984 | + esac; |
4985 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
4986 | +am__install_max = 40 |
4987 | +am__nobase_strip_setup = \ |
4988 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
4989 | +am__nobase_strip = \ |
4990 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
4991 | +am__nobase_list = $(am__nobase_strip_setup); \ |
4992 | + for p in $$list; do echo "$$p $$p"; done | \ |
4993 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
4994 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
4995 | + if (++n[$$2] == $(am__install_max)) \ |
4996 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
4997 | + END { for (dir in files) print dir, files[dir] }' |
4998 | +am__base_list = \ |
4999 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
5000 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
The diff has been truncated for viewing.
Thanks. Uploaded.